From: Peter Krempa <pkrempa@redhat.com>
Date: Fri, 11 Jun 2021 08:27:20 +0000 (+0200)
Subject: qemu: domain: Remove hack for 's390-virtio' machine
X-Git-Tag: v7.5.0-rc1~103
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5d83508fe8217179c72556c114f8196968cd72ad;p=thirdparty%2Flibvirt.git

qemu: domain: Remove hack for 's390-virtio' machine

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@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
---

diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
index 6bcd67611e..85d6789707 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;