[libvirt] [PATCH 1/8] tests/qemuxml2argvtest: remove unnecessary machine canonicalization
This is not required to run our tests.
Signed-off-by: Pavel Hrdina <phrdina(a)redhat.com>
---
tests/qemuxml2argvdata/qemuxml2argv-cputune-numatune.args | 2 +-
tests/qemuxml2argvdata/qemuxml2argv-machine-aliases1.args | 2 +-
tests/qemuxml2argvtest.c | 7 -------
3 files changed, 2 insertions(+), 9 deletions(-)
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cputune-numatune.args
b/tests/qemuxml2argvdata/qemuxml2argv-cputune-numatune.args
index 90c2555ce1..eacf9c224f 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-cputune-numatune.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-cputune-numatune.args
@@ -7,7 +7,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name dummy2 \
-S \
--M pc-0.11 \
+-M pc \
-m 128 \
-smp 2,maxcpus=6,sockets=6,cores=1,threads=1 \
-object iothread,id=iothread1 \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-machine-aliases1.args
b/tests/qemuxml2argvdata/qemuxml2argv-machine-aliases1.args
index 5e2d0c0633..78d9539137 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-machine-aliases1.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-machine-aliases1.args
@@ -7,7 +7,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name QEMUGuest1 \
-S \
--M pc-0.11 \
+-M pc \
-m 214 \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
index 0b26cd5c7c..18ff5ad147 100644
--- a/tests/qemuxml2argvtest.c
+++ b/tests/qemuxml2argvtest.c
@@ -474,13 +474,6 @@ testCompareXMLToArgv(const void *data)
if (qemuProcessPrepareMonitorChr(&monitor_chr, priv->libDir) < 0)
goto cleanup;
- if (STREQ(vm->def->os.machine, "pc") &&
- STREQ(vm->def->emulator, "/usr/bin/qemu-system-x86_64")) {
- VIR_FREE(vm->def->os.machine);
- if (VIR_STRDUP(vm->def->os.machine, "pc-0.11") < 0)
- goto cleanup;
- }
-
if (testUpdateQEMUCaps(info, vm, driver.caps) < 0)
goto cleanup;
--
2.12.2