[PATCH 10/22] qemu: domain: Remove hack for 's390-virtio' machine

Peter Krempa pkrempa at redhat.com
Fri Jun 11 14:49:01 UTC 2021


qemuDomainDefAddDefaultDevices skipped adding the memballoon for the
's390-virtio' machine type, but since it was removed in qemu 2.6 we can
remove the hack now.

Signed-off-by: Peter Krempa <pkrempa at redhat.com>
---
 src/qemu/qemu_domain.c | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
index 7f57cae00e..18b5403974 100644
--- a/src/qemu/qemu_domain.c
+++ b/src/qemu/qemu_domain.c
@@ -3883,10 +3883,6 @@ qemuDomainDefAddDefaultDevices(virQEMUDriver *driver,
         def->memballoon = memballoon;
     }

-    if (STRPREFIX(def->os.machine, "s390-virtio") &&
-        virQEMUCapsGet(qemuCaps, QEMU_CAPS_VIRTIO_S390) && def->memballoon)
-        def->memballoon->model = VIR_DOMAIN_MEMBALLOON_MODEL_NONE;
-
     if (addDefaultUSBMouse) {
         bool hasUSBTablet = false;
         size_t j;
-- 
2.31.1




More information about the libvir-list mailing list