]> git.ipfire.org Git - thirdparty/libvirt.git/commitdiff
tests: qemu: Unify fake machine types filled in for KVM and TCG caps of x86_64
authorPeter Krempa <pkrempa@redhat.com>
Wed, 22 Jan 2020 09:28:19 +0000 (10:28 +0100)
committerPeter Krempa <pkrempa@redhat.com>
Mon, 27 Jan 2020 13:55:03 +0000 (14:55 +0100)
For testing with synthetic capabilities we pre-fill the qemu
capabilities with some machine types. Historically there were two arrays
for KVM and TCG but that's not necessary. Make both instances of x86_64
data share the same array as the other architectures do.

This will later on simplify filling in all the other machine types which
are required for the test suite.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
tests/qemuxml2argvdata/default-qemu-host-arch.args
tests/qemuxml2xmloutdata/default-qemu-host-arch.xml
tests/testutilsqemu.c
tests/vircapstest.c

index 5a5a724356e598ce150fb966ff5839e0c1ed26ee..f9e7398a12ec131a4eaa1129a07965c03ac08302 100644 (file)
@@ -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 \
index cd223f1592026526373d9fb78e0cdb393fcdc836..5f433fc047fd82d5e52547593d1f73725defd3a7 100644 (file)
@@ -5,7 +5,7 @@
   <currentMemory unit='KiB'>4194304</currentMemory>
   <vcpu placement='static'>4</vcpu>
   <os>
-    <type arch='x86_64' machine='pc-0.11'>hvm</type>
+    <type arch='x86_64' machine='pc'>hvm</type>
     <boot dev='hd'/>
   </os>
   <clock offset='utc'/>
index 39544c548fb077ec7054eea93acf21975e1a792b..b0d685b04f055313a78132bdd527d0d73e42e87a 100644 (file)
@@ -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,
index 6251ade1a16dcfac45076309e0c4ef9c1ab0441e..08eb017a7613debe0852c8fd9b1104c7a6c7b184 100644 (file)
@@ -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");