[PATCH 09/14] qemu: Always assume QEMU_CAPS_MEM_MERGE

[Peter Krempa <pkrempa@xxxxxxxxxx>]

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@xxxxxxxxxx>
---
 src/qemu/qemu_validate.c | 7 -------
 tests/qemuxml2argvtest.c | 2 +-
 2 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/src/qemu/qemu_validate.c b/src/qemu/qemu_validate.c
index eb985956e4..c4b7269589 100644
--- 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 1cbbf9bd24..77e384f67c 100644
--- 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");
-- 
2.31.1