External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-01-03 19:45:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

tests/qemuxml2argvtest: remove unnecessary machine canonicalization

Browse Source 
This is not required to run our tests.

Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
This commit is contained in:
Pavel Hrdina 2016-12-19 22:52:08 +01:00
parent 9005a64b5c
commit 2bc7600c33
3 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/qemuxml2argvdata/qemuxml2argv-cputune-numatune.args
View File

@ -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 \

2
tests/qemuxml2argvdata/qemuxml2argv-machine-aliases1.args
View File

@ -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 \

7
tests/qemuxml2argvtest.c
View File

@ -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;