diff options
Diffstat (limited to 'hw')
| -rw-r--r-- | hw/s390x/s390-pci-kvm.c | 4 | ||||
| -rw-r--r-- | hw/s390x/s390-virtio-ccw.c | 24 |
2 files changed, 1 insertions, 27 deletions
diff --git a/hw/s390x/s390-pci-kvm.c b/hw/s390x/s390-pci-kvm.c index 5eb7fd12e2..9134fe185f 100644 --- a/hw/s390x/s390-pci-kvm.c +++ b/hw/s390x/s390-pci-kvm.c @@ -22,9 +22,7 @@ bool s390_pci_kvm_interp_allowed(void) { - return (kvm_s390_get_zpci_op() && !s390_is_pv() && - !object_property_get_bool(OBJECT(qdev_get_machine()), - "zpcii-disable", NULL)); + return kvm_s390_get_zpci_op() && !s390_is_pv(); } int s390_pci_kvm_aif_enable(S390PCIBusDevice *pbdev, ZpciFib *fib, bool assist) diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c index 560ddbb6fb..bb98d40792 100644 --- a/hw/s390x/s390-virtio-ccw.c +++ b/hw/s390x/s390-virtio-ccw.c @@ -627,21 +627,6 @@ static inline void machine_set_dea_key_wrap(Object *obj, bool value, ms->dea_key_wrap = value; } -static inline bool machine_get_zpcii_disable(Object *obj, Error **errp) -{ - S390CcwMachineState *ms = S390_CCW_MACHINE(obj); - - return ms->zpcii_disable; -} - -static inline void machine_set_zpcii_disable(Object *obj, bool value, - Error **errp) -{ - S390CcwMachineState *ms = S390_CCW_MACHINE(obj); - - ms->zpcii_disable = value; -} - static S390CcwMachineClass *current_mc; /* @@ -778,12 +763,6 @@ static void ccw_machine_class_init(ObjectClass *oc, void *data) "Up to 8 chars in set of [A-Za-z0-9. ] (lower case chars converted" " to upper case) to pass to machine loader, boot manager," " and guest kernel"); - - object_class_property_add_bool(oc, "zpcii-disable", - machine_get_zpcii_disable, - machine_set_zpcii_disable); - object_class_property_set_description(oc, "zpcii-disable", - "disable zPCI interpretation facilties"); } static inline void s390_machine_initfn(Object *obj) @@ -792,7 +771,6 @@ static inline void s390_machine_initfn(Object *obj) ms->aes_key_wrap = true; ms->dea_key_wrap = true; - ms->zpcii_disable = false; } static const TypeInfo ccw_machine_info = { @@ -857,12 +835,10 @@ DEFINE_CCW_MACHINE(7_2, "7.2", true); static void ccw_machine_7_1_instance_options(MachineState *machine) { static const S390FeatInit qemu_cpu_feat = { S390_FEAT_LIST_QEMU_V7_1 }; - S390CcwMachineState *ms = S390_CCW_MACHINE(machine); ccw_machine_7_2_instance_options(machine); s390_cpudef_featoff_greater(16, 1, S390_FEAT_PAIE); s390_set_qemu_cpu_model(0x8561, 15, 1, qemu_cpu_feat); - ms->zpcii_disable = true; } static void ccw_machine_7_1_class_options(MachineClass *mc) |