From: Peter Krempa Date: Sun, 24 Nov 2019 08:55:42 +0000 (+0100) Subject: qemu: caps: Don't check capability before clearing it X-Git-Tag: v6.0.0-rc1~526 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a64265f440ba1d316f285f86550abfde694d859a;p=thirdparty%2Flibvirt.git qemu: caps: Don't check capability before clearing it Checking whether a qemu capability set right before clearing it without any other logic doesn't make sense. Signed-off-by: Peter Krempa Reviewed-by: Cole Robinson --- diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index f65af5c228..b93fd8310f 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -4602,8 +4602,7 @@ virQEMUCapsInitProcessCaps(virQEMUCapsPtr qemuCaps) /* Prealloc on NVDIMMs is broken on older QEMUs leading to * user data corruption. If we are dealing with such version * of QEMU pretend we don't know how to NVDIMM. */ - if (qemuCaps->version < 2009000 && - virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE_NVDIMM)) + if (qemuCaps->version < 2009000) virQEMUCapsClear(qemuCaps, QEMU_CAPS_DEVICE_NVDIMM); if (ARCH_IS_X86(qemuCaps->arch) &&