From 5d83508fe8217179c72556c114f8196968cd72ad Mon Sep 17 00:00:00 2001 From: Peter Krempa Date: Fri, 11 Jun 2021 10:27:20 +0200 Subject: [PATCH] qemu: domain: Remove hack for 's390-virtio' machine MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 Reviewed-by: Ján Tomko --- 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 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;