[libvirt] [libvirt PATCH v2 12/44] Deprecate QEMU_CAPS_MEM_PATH

Implied by QEMU >= 1.2.0. Signed-off-by: Ján Tomko <jtomko(a)redhat.com&gt; --- src/qemu/qemu_capabilities.c | 1 - src/qemu/qemu_capabilities.h | 2 +- src/qemu/qemu_command.c | 12 ++-------- tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml | 1 - tests/qemuxml2argvtest.c | 28 +++++++++++----------- 29 files changed, 17 insertions(+), 51 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 421d803ead..c06ec422f1 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -3635,7 +3635,6 @@ static qemuMonitorCallbacks callbacks = { static void virQEMUCapsInitQMPBasic(virQEMUCapsPtr qemuCaps) { - virQEMUCapsSet(qemuCaps, QEMU_CAPS_MEM_PATH); virQEMUCapsSet(qemuCaps, QEMU_CAPS_DRIVE_SERIAL); virQEMUCapsSet(qemuCaps, QEMU_CAPS_SDL); virQEMUCapsSet(qemuCaps, QEMU_CAPS_RTC); diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index bdbbad8d6e..8262320a92 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -72,7 +72,7 @@ typedef enum { X_QEMU_CAPS_VGA, /* Is -vga avail */ X_QEMU_CAPS_0_10, /* features added in qemu-0.10.0 or later */ X_QEMU_CAPS_PCIDEVICE, /* PCI device assignment supported */ - QEMU_CAPS_MEM_PATH, /* mmap'ped guest backing supported */ + X_QEMU_CAPS_MEM_PATH, /* mmap'ped guest backing supported */ QEMU_CAPS_DRIVE_SERIAL, /* -driver serial= available */ /* 20 */ diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 59496d32b5..8140b200e3 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -7445,7 +7445,6 @@ qemuBuildSmpCommandLine(virCommandPtr cmd, static int qemuBuildMemPathStr(virQEMUDriverConfigPtr cfg, const virDomainDef *def, - virQEMUCapsPtr qemuCaps, virCommandPtr cmd) { const long system_page_size = virGetSystemPageSizeKB(); @@ -7464,13 +7463,6 @@ qemuBuildMemPathStr(virQEMUDriverConfigPtr cfg, if (def->mem.hugepages[0].size == system_page_size) return 0; - if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_MEM_PATH)) { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("hugepage backing not supported by '%s'"), - def->emulator); - return -1; - } - if (qemuGetDomainHupageMemPath(def, cfg, def->mem.hugepages[0].size, &mem_path) < 0) return -1; @@ -7515,7 +7507,7 @@ qemuBuildMemCommandLine(virCommandPtr cmd, * the hugepages and no numa node is specified. */ if (!virDomainNumaGetNodeCount(def->numa) && - qemuBuildMemPathStr(cfg, def, qemuCaps, cmd) < 0) + qemuBuildMemPathStr(cfg, def, cmd) < 0) return -1; if (def->mem.locked && !virQEMUCapsGet(qemuCaps, QEMU_CAPS_REALTIME_MLOCK)) { @@ -7645,7 +7637,7 @@ qemuBuildNumaArgStr(virQEMUDriverConfigPtr cfg, } if (!needBackend && - qemuBuildMemPathStr(cfg, def, qemuCaps, cmd) < 0) + qemuBuildMemPathStr(cfg, def, cmd) < 0) goto cleanup; for (i = 0; i < ncells; i++) { diff --git a/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml index 8ded417088..891cb25e8b 100644 --- a/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml @@ -4,7 +4,6 @@ <selfvers>0</selfvers> <usedQMP/> <flag name='kvm'/> - <flag name='mem-path'/> <flag name='drive-serial'/> <flag name='sdl'/> <flag name='rtc'/> diff --git a/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml index 6fcc7f1c57..2d9b18c72a 100644 --- a/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml @@ -4,7 +4,6 @@ <selfvers>0</selfvers> <usedQMP/> <flag name='kvm'/> - <flag name='mem-path'/> <flag name='drive-serial'/> <flag name='sdl'/> <flag name='rtc'/> diff --git a/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml index 58227aca1b..dbe56d7465 100644 --- a/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml @@ -4,7 +4,6 @@ <selfvers>0</selfvers> <usedQMP/> <flag name='kvm'/> - <flag name='mem-path'/> <flag name='drive-serial'/> <flag name='sdl'/> <flag name='rtc'/> diff --git a/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml index 3a06c76420..4f4399c7d2 100644 --- a/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml @@ -4,7 +4,6 @@ <selfvers>0</selfvers> <usedQMP/> <flag name='kvm'/> - <flag name='mem-path'/> <flag name='drive-serial'/> <flag name='sdl'/> <flag name='rtc'/> diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml index c13d96c236..325850bcbb 100644 --- a/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml @@ -4,7 +4,6 @@ <selfvers>0</selfvers> <usedQMP/> <flag name='kvm'/> - <flag name='mem-path'/> <flag name='drive-serial'/> <flag name='sdl'/> <flag name='rtc'/> diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml index 4097f89d09..41959fdb96 100644 --- a/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml @@ -4,7 +4,6 @@ <selfvers>0</selfvers> <usedQMP/> <flag name='kvm'/> - <flag name='mem-path'/> <flag name='drive-serial'/> <flag name='sdl'/> <flag name='rtc'/> diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml index 7a3292ee85..9d6c57d8b8 100644 --- a/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml @@ -4,7 +4,6 @@ <selfvers>0</selfvers> <usedQMP/> <flag name='kvm'/> - <flag name='mem-path'/> <flag name='drive-serial'/> <flag name='sdl'/> <flag name='rtc'/> diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml index 02cb1aca77..1203958b0a 100644 --- a/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml @@ -4,7 +4,6 @@ <selfvers>0</selfvers> <usedQMP/> <flag name='kvm'/> - <flag name='mem-path'/> <flag name='drive-serial'/> <flag name='sdl'/> <flag name='rtc'/> diff --git a/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml index 9137af24fa..a2ea35f2e8 100644 --- a/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml @@ -4,7 +4,6 @@ <selfvers>0</selfvers> <usedQMP/> <flag name='kvm'/> - <flag name='mem-path'/> <flag name='drive-serial'/> <flag name='sdl'/> <flag name='rtc'/> diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml index e15972748f..ac3504ed25 100644 --- a/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml @@ -4,7 +4,6 @@ <selfvers>0</selfvers> <usedQMP/> <flag name='kvm'/> - <flag name='mem-path'/> <flag name='drive-serial'/> <flag name='sdl'/> <flag name='rtc'/> diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml index 0216a12852..8eb6f80231 100644 --- a/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml @@ -4,7 +4,6 @@ <selfvers>0</selfvers> <usedQMP/> <flag name='kvm'/> - <flag name='mem-path'/> <flag name='drive-serial'/> <flag name='sdl'/> <flag name='rtc'/> diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml index 1be024cc7c..16f4c4e354 100644 --- a/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml @@ -3,7 +3,6 @@ <selfctime>0</selfctime> <selfvers>0</selfvers> <usedQMP/> - <flag name='mem-path'/> <flag name='drive-serial'/> <flag name='enable-kvm'/> <flag name='sdl'/> diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml index c863bb93c6..bdde9f7733 100644 --- a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml @@ -4,7 +4,6 @@ <selfvers>0</selfvers> <usedQMP/> <flag name='kvm'/> - <flag name='mem-path'/> <flag name='drive-serial'/> <flag name='sdl'/> <flag name='rtc'/> diff --git a/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml index 8c9afec91c..1ad8ce62c6 100644 --- a/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml @@ -4,7 +4,6 @@ <selfvers>0</selfvers> <usedQMP/> <flag name='kvm'/> - <flag name='mem-path'/> <flag name='drive-serial'/> <flag name='sdl'/> <flag name='rtc'/> diff --git a/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml index e1245953bd..fdc6b4b73f 100644 --- a/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml @@ -4,7 +4,6 @@ <selfvers>0</selfvers> <usedQMP/> <flag name='kvm'/> - <flag name='mem-path'/> <flag name='drive-serial'/> <flag name='sdl'/> <flag name='rtc'/> diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml index 136385b868..a3a6400143 100644 --- a/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml @@ -4,7 +4,6 @@ <selfvers>0</selfvers> <usedQMP/> <flag name='kvm'/> - <flag name='mem-path'/> <flag name='drive-serial'/> <flag name='sdl'/> <flag name='rtc'/> diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml index 76c6ab2a68..c8e31f336c 100644 --- a/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml @@ -4,7 +4,6 @@ <selfvers>0</selfvers> <usedQMP/> <flag name='kvm'/> - <flag name='mem-path'/> <flag name='drive-serial'/> <flag name='sdl'/> <flag name='rtc'/> diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml index 2d16d41333..3c4452f7ee 100644 --- a/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml @@ -4,7 +4,6 @@ <selfvers>0</selfvers> <usedQMP/> <flag name='kvm'/> - <flag name='mem-path'/> <flag name='drive-serial'/> <flag name='sdl'/> <flag name='rtc'/> diff --git a/tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml index efe2d4ac4a..96ec062cfc 100644 --- a/tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml @@ -4,7 +4,6 @@ <selfvers>0</selfvers> <usedQMP/> <flag name='kvm'/> - <flag name='mem-path'/> <flag name='drive-serial'/> <flag name='sdl'/> <flag name='rtc'/> diff --git a/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml index 7445253c41..0ed1ab5c53 100644 --- a/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml @@ -4,7 +4,6 @@ <selfvers>0</selfvers> <usedQMP/> <flag name='kvm'/> - <flag name='mem-path'/> <flag name='drive-serial'/> <flag name='sdl'/> <flag name='rtc'/> diff --git a/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml index 4d8d246828..ac01f3d5a5 100644 --- a/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml @@ -4,7 +4,6 @@ <selfvers>0</selfvers> <usedQMP/> <flag name='kvm'/> - <flag name='mem-path'/> <flag name='drive-serial'/> <flag name='sdl'/> <flag name='rtc'/> diff --git a/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml index 584ec78709..a78a6c35c5 100644 --- a/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml @@ -4,7 +4,6 @@ <selfvers>0</selfvers> <usedQMP/> <flag name='kvm'/> - <flag name='mem-path'/> <flag name='drive-serial'/> <flag name='sdl'/> <flag name='rtc'/> diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml index cee011d5f4..15516df5f6 100644 --- a/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml @@ -4,7 +4,6 @@ <selfvers>0</selfvers> <usedQMP/> <flag name='kvm'/> - <flag name='mem-path'/> <flag name='drive-serial'/> <flag name='sdl'/> <flag name='rtc'/> diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml index e4060518b3..ee820d252b 100644 --- a/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml @@ -4,7 +4,6 @@ <selfvers>0</selfvers> <usedQMP/> <flag name='kvm'/> - <flag name='mem-path'/> <flag name='drive-serial'/> <flag name='sdl'/> <flag name='rtc'/> diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml index 6ad3e2b17b..d9ba0e19c3 100644 --- a/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml @@ -4,7 +4,6 @@ <selfvers>0</selfvers> <usedQMP/> <flag name='kvm'/> - <flag name='mem-path'/> <flag name='drive-serial'/> <flag name='sdl'/> <flag name='rtc'/> diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index c87ff2a87a..d283a7a64c 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -869,7 +869,7 @@ mymain(void) DO_TEST("pmu-feature", NONE); DO_TEST("pmu-feature-off", NONE); - DO_TEST("hugepages", QEMU_CAPS_MEM_PATH); + DO_TEST("hugepages", NONE); DO_TEST("hugepages-numa", QEMU_CAPS_RTC, QEMU_CAPS_PIIX_DISABLE_S3, QEMU_CAPS_PIIX_DISABLE_S4, QEMU_CAPS_VIRTIO_SCSI, @@ -878,23 +878,23 @@ mymain(void) QEMU_CAPS_DEVICE_QXL, QEMU_CAPS_HDA_DUPLEX, QEMU_CAPS_USB_REDIR, QEMU_CAPS_DEVICE_PC_DIMM, - QEMU_CAPS_MEM_PATH, QEMU_CAPS_OBJECT_MEMORY_FILE); - DO_TEST_LINUX("hugepages-pages", QEMU_CAPS_MEM_PATH, + QEMU_CAPS_OBJECT_MEMORY_FILE); + DO_TEST_LINUX("hugepages-pages", QEMU_CAPS_OBJECT_MEMORY_RAM, QEMU_CAPS_OBJECT_MEMORY_FILE); - DO_TEST("hugepages-pages2", QEMU_CAPS_MEM_PATH, QEMU_CAPS_OBJECT_MEMORY_RAM, + DO_TEST("hugepages-pages2", QEMU_CAPS_OBJECT_MEMORY_RAM, QEMU_CAPS_OBJECT_MEMORY_FILE); - DO_TEST("hugepages-pages3", QEMU_CAPS_MEM_PATH, QEMU_CAPS_OBJECT_MEMORY_RAM, + DO_TEST("hugepages-pages3", QEMU_CAPS_OBJECT_MEMORY_RAM, QEMU_CAPS_OBJECT_MEMORY_FILE); - DO_TEST_LINUX("hugepages-shared", QEMU_CAPS_MEM_PATH, + DO_TEST_LINUX("hugepages-shared", QEMU_CAPS_OBJECT_MEMORY_RAM, QEMU_CAPS_OBJECT_MEMORY_FILE); DO_TEST_PARSE_ERROR("hugepages-memaccess-invalid", NONE); - DO_TEST_FAILURE("hugepages-pages4", QEMU_CAPS_MEM_PATH, + DO_TEST_FAILURE("hugepages-pages4", QEMU_CAPS_OBJECT_MEMORY_RAM, QEMU_CAPS_OBJECT_MEMORY_FILE); - DO_TEST("hugepages-pages5", QEMU_CAPS_MEM_PATH); + DO_TEST("hugepages-pages5", NONE); DO_TEST("hugepages-pages6", NONE); - DO_TEST("hugepages-pages7", QEMU_CAPS_MEM_PATH, + DO_TEST("hugepages-pages7", QEMU_CAPS_DEVICE_PC_DIMM, QEMU_CAPS_OBJECT_MEMORY_FILE); DO_TEST("hugepages-memaccess", QEMU_CAPS_OBJECT_MEMORY_FILE, QEMU_CAPS_OBJECT_MEMORY_RAM, QEMU_CAPS_DEVICE_PC_DIMM, @@ -902,7 +902,7 @@ mymain(void) DO_TEST("hugepages-memaccess2", QEMU_CAPS_OBJECT_MEMORY_FILE, QEMU_CAPS_OBJECT_MEMORY_RAM, QEMU_CAPS_DEVICE_PC_DIMM, QEMU_CAPS_NUMA); - DO_TEST_FAILURE("hugepages-memaccess3", QEMU_CAPS_MEM_PATH, + DO_TEST_FAILURE("hugepages-memaccess3", QEMU_CAPS_OBJECT_MEMORY_RAM, QEMU_CAPS_OBJECT_MEMORY_FILE, QEMU_CAPS_VIRTIO_SCSI); DO_TEST("nosharepages", QEMU_CAPS_MACHINE_OPT, QEMU_CAPS_MEM_MERGE); @@ -2956,14 +2956,14 @@ mymain(void) QEMU_CAPS_VIRTIO_PCI_IOMMU_PLATFORM, QEMU_CAPS_VIRTIO_PCI_ATS); - DO_TEST("fd-memory-numa-topology", QEMU_CAPS_MEM_PATH, QEMU_CAPS_OBJECT_MEMORY_FILE, + DO_TEST("fd-memory-numa-topology", QEMU_CAPS_OBJECT_MEMORY_FILE, QEMU_CAPS_KVM); - DO_TEST("fd-memory-numa-topology2", QEMU_CAPS_MEM_PATH, QEMU_CAPS_OBJECT_MEMORY_FILE, + DO_TEST("fd-memory-numa-topology2", QEMU_CAPS_OBJECT_MEMORY_FILE, QEMU_CAPS_KVM); - DO_TEST("fd-memory-numa-topology3", QEMU_CAPS_MEM_PATH, QEMU_CAPS_OBJECT_MEMORY_FILE, + DO_TEST("fd-memory-numa-topology3", QEMU_CAPS_OBJECT_MEMORY_FILE, QEMU_CAPS_KVM); - DO_TEST("fd-memory-no-numa-topology", QEMU_CAPS_MEM_PATH, QEMU_CAPS_OBJECT_MEMORY_FILE, + DO_TEST("fd-memory-no-numa-topology", QEMU_CAPS_OBJECT_MEMORY_FILE, QEMU_CAPS_KVM); DO_TEST("cpu-check-none", QEMU_CAPS_KVM); -- 2.16.1