qemu: Always assume QEMU_CAPS_MEM_MERGE

Supported since qemu commit 8490fc78e7 ("add -machine mem-merge=on|off
option") released in qemu-v1.3.0 and can't be compiled out.

Assume that it's present and remove the validation code.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>

diff --git a/src/qemu/qemu_validate.c b/src/qemu/qemu_validate.c
index 8b5b292f542f69c73ca1cb168281c7dbcab60ea9..5db7832a1a4fa954d257ef1916cfc1fcaced684e 100644 (file)
--- a/src/qemu/qemu_validate.c
+++ b/src/qemu/qemu_validate.c
@@ -757,13 +757,6 @@ qemuValidateDomainDefMemory(const virDomainDef *def,
         return -1;
     }
 
-    if (mem->nosharepages && !virQEMUCapsGet(qemuCaps, QEMU_CAPS_MEM_MERGE)) {
-         virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
-                        _("disable shared memory is not available "
-                          "with this QEMU binary"));
-        return -1;
-    }
-
     return 0;
 }
 

diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
index d8ff18771f0c58767b5524c1484a61737733ae38..1d262c23c1a0078cb548a084b765b378e51c468c 100644 (file)
--- a/tests/qemuxml2argvtest.c
+++ b/tests/qemuxml2argvtest.c
@@ -1291,7 +1291,7 @@ mymain(void)
                         QEMU_CAPS_OBJECT_MEMORY_FILE);
     DO_TEST_CAPS_LATEST("hugepages-memaccess3");
     DO_TEST_CAPS_LATEST("hugepages-nvdimm");
-    DO_TEST("nosharepages", QEMU_CAPS_MEM_MERGE);
+    DO_TEST_NOCAPS("nosharepages");
     DO_TEST_NOCAPS("disk-cdrom");
     DO_TEST_CAPS_VER("disk-cdrom", "2.12.0");
     DO_TEST_CAPS_LATEST("disk-cdrom");