diff --git a/tests/qemuxml2argvdata/default-qemu-host-arch.args b/tests/qemuxml2argvdata/default-qemu-host-arch.args index 5a5a724356..f9e7398a12 100644 --- a/tests/qemuxml2argvdata/default-qemu-host-arch.args +++ b/tests/qemuxml2argvdata/default-qemu-host-arch.args @@ -10,7 +10,7 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-x86_64 \ -name qemu-host \ -S \ --machine pc-0.11,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc,accel=tcg,usb=off,dump-guest-core=off \ -m 4096 \ -realtime mlock=off \ -smp 4,sockets=4,cores=1,threads=1 \ diff --git a/tests/qemuxml2xmloutdata/default-qemu-host-arch.xml b/tests/qemuxml2xmloutdata/default-qemu-host-arch.xml index cd223f1592..5f433fc047 100644 --- a/tests/qemuxml2xmloutdata/default-qemu-host-arch.xml +++ b/tests/qemuxml2xmloutdata/default-qemu-host-arch.xml @@ -5,7 +5,7 @@ 4194304 4 - hvm + hvm diff --git a/tests/testutilsqemu.c b/tests/testutilsqemu.c index 39544c548f..b0d685b04f 100644 --- a/tests/testutilsqemu.c +++ b/tests/testutilsqemu.c @@ -41,11 +41,8 @@ static const virArch arch_alias[VIR_ARCH_LAST] = { static const char *const i386_machines[] = { "pc", "isapc", NULL }; -static const char *const x86_64_machines_kvm[] = { - "pc", "isapc", NULL -}; -static const char *const x86_64_machines_qemu[] = { - "pc-0.11", "pc", "pc-0.10", "isapc", NULL +static const char *const x86_64_machines[] = { + "pc", "pc-0.11", "pc-0.10", "isapc", NULL }; static const char *const aarch64_machines[] = { "virt", NULL @@ -71,7 +68,7 @@ static const char *const s390x_machines[] = { static const char *const *qemu_machines[VIR_ARCH_LAST] = { [VIR_ARCH_I686] = i386_machines, - [VIR_ARCH_X86_64] = x86_64_machines_qemu, + [VIR_ARCH_X86_64] = x86_64_machines, [VIR_ARCH_AARCH64] = aarch64_machines, [VIR_ARCH_ARMV7L] = arm_machines, [VIR_ARCH_PPC64] = ppc64_machines, @@ -83,7 +80,7 @@ static const char *const *qemu_machines[VIR_ARCH_LAST] = { static const char *const *kvm_machines[VIR_ARCH_LAST] = { [VIR_ARCH_I686] = i386_machines, - [VIR_ARCH_X86_64] = x86_64_machines_kvm, + [VIR_ARCH_X86_64] = x86_64_machines, [VIR_ARCH_AARCH64] = aarch64_machines, [VIR_ARCH_ARMV7L] = arm_machines, [VIR_ARCH_PPC64] = ppc64_machines, diff --git a/tests/vircapstest.c b/tests/vircapstest.c index 6251ade1a1..08eb017a76 100644 --- a/tests/vircapstest.c +++ b/tests/vircapstest.c @@ -161,10 +161,10 @@ test_virCapsDomainDataLookupQEMU(const void *data G_GNUC_UNUSED) /* Checking each parameter individually */ CAPSCOMP(-1, VIR_ARCH_NONE, VIR_DOMAIN_VIRT_NONE, NULL, NULL, VIR_DOMAIN_OSTYPE_HVM, VIR_ARCH_X86_64, - VIR_DOMAIN_VIRT_QEMU, "/usr/bin/qemu-system-x86_64", "pc-0.11"); + VIR_DOMAIN_VIRT_QEMU, "/usr/bin/qemu-system-x86_64", "pc"); CAPSCOMP(VIR_DOMAIN_OSTYPE_HVM, VIR_ARCH_NONE, VIR_DOMAIN_VIRT_NONE, NULL, NULL, VIR_DOMAIN_OSTYPE_HVM, VIR_ARCH_X86_64, - VIR_DOMAIN_VIRT_QEMU, "/usr/bin/qemu-system-x86_64", "pc-0.11"); + VIR_DOMAIN_VIRT_QEMU, "/usr/bin/qemu-system-x86_64", "pc"); CAPSCOMP(-1, VIR_ARCH_AARCH64, VIR_DOMAIN_VIRT_NONE, NULL, NULL, VIR_DOMAIN_OSTYPE_HVM, VIR_ARCH_AARCH64, VIR_DOMAIN_VIRT_QEMU, "/usr/bin/qemu-system-aarch64", "virt");