diff options
| author | Matthew Rosato <mjrosato@linux.ibm.com> | 2022-09-02 13:27:37 -0400 |
|---|---|---|
| committer | Thomas Huth <thuth@redhat.com> | 2022-09-26 17:23:47 +0200 |
| commit | 59d1ce44396e3ad2330dc3261ff3da7ad3a16184 (patch) | |
| tree | 40c39918509ee762d7563aa2c270b9018f47fd71 /hw/s390x/s390-pci-kvm.c | |
| parent | 9ee8f7e46a7d42ede69a4780200129bf1acb0d01 (diff) | |
s390x/s390-virtio-ccw: add zpcii-disable machine property
The zpcii-disable machine property can be used to force-disable the use
of zPCI interpretation facilities for a VM. By default, this setting
will be off for machine 7.2 and newer.
Signed-off-by: Matthew Rosato <mjrosato@linux.ibm.com>
Message-Id: <20220902172737.170349-9-mjrosato@linux.ibm.com>
Reviewed-by: Thomas Huth <thuth@redhat.com>
[thuth: Fix contextual conflict in ccw_machine_7_1_instance_options()]
Signed-off-by: Thomas Huth <thuth@redhat.com>
Diffstat (limited to 'hw/s390x/s390-pci-kvm.c')
| -rw-r--r-- | hw/s390x/s390-pci-kvm.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/hw/s390x/s390-pci-kvm.c b/hw/s390x/s390-pci-kvm.c index 9134fe185f..5eb7fd12e2 100644 --- a/hw/s390x/s390-pci-kvm.c +++ b/hw/s390x/s390-pci-kvm.c @@ -22,7 +22,9 @@ bool s390_pci_kvm_interp_allowed(void) { - return kvm_s390_get_zpci_op() && !s390_is_pv(); + return (kvm_s390_get_zpci_op() && !s390_is_pv() && + !object_property_get_bool(OBJECT(qdev_get_machine()), + "zpcii-disable", NULL)); } int s390_pci_kvm_aif_enable(S390PCIBusDevice *pbdev, ZpciFib *fib, bool assist) |