[libvirt] [PATCH v2 2/3] qemu: Drop QEMU_CAPS_CPU_HOST

The only QEMU versions that don't have such capability are <0.11, which we no longer support anyway --- src/qemu/qemu_capabilities.c | 12 ++---- src/qemu/qemu_capabilities.h | 2 +- src/qemu/qemu_command.c | 9 +---- tests/qemucapabilitiesdata/caps_1.2.2.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_1.3.1.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_1.4.2.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_1.6.50.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml | 1 - .../caps_2.6.0-gicv2.aarch64.xml | 1 - .../caps_2.6.0-gicv3.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_2.6.0.ppc64le.xml | 1 - tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml | 1 - tests/qemuhelptest.c | 8 ---- tests/qemuxml2argvtest.c | 45 +++++++++++----------- 18 files changed, 27 insertions(+), 62 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index d3fa9c7..e55e9d0 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -928,11 +928,9 @@ virQEMUCapsInitGuestFromBinary(virCapsPtr caps, machines = NULL; nmachines = 0; - if ((virQEMUCapsGet(qemubinCaps, QEMU_CAPS_CPU_HOST) || - (caps->host.cpu && - caps->host.cpu->model && - virQEMUCapsGetCPUDefinitions(qemubinCaps, NULL) > 0)) && - !virCapabilitiesAddGuestFeature(guest, "cpuselection", true, false)) + /* CPU selection is always available, because all QEMU versions + * we support can use at least '-cpu host' */ + if (!virCapabilitiesAddGuestFeature(guest, "cpuselection", true, false)) goto cleanup; if (virQEMUCapsGet(qemubinCaps, QEMU_CAPS_BOOTINDEX) && @@ -1302,9 +1300,6 @@ virQEMUCapsComputeCmdFlags(const char *help, if (version >= 13000) virQEMUCapsSet(qemuCaps, QEMU_CAPS_PCI_MULTIFUNCTION); - if (version >= 11000) - virQEMUCapsSet(qemuCaps, QEMU_CAPS_CPU_HOST); - if (version >= 1001000) { virQEMUCapsSet(qemuCaps, QEMU_CAPS_IPV6_MIGRATION); virQEMUCapsSet(qemuCaps, QEMU_CAPS_VNC_SHARE_POLICY); @@ -3389,7 +3384,6 @@ virQEMUCapsInitQMPBasic(virQEMUCapsPtr qemuCaps) virQEMUCapsSet(qemuCaps, QEMU_CAPS_FSDEV_READONLY); virQEMUCapsSet(qemuCaps, QEMU_CAPS_VIRTIO_BLK_SG_IO); virQEMUCapsSet(qemuCaps, QEMU_CAPS_DRIVE_COPY_ON_READ); - virQEMUCapsSet(qemuCaps, QEMU_CAPS_CPU_HOST); virQEMUCapsSet(qemuCaps, QEMU_CAPS_FSDEV_WRITEOUT); virQEMUCapsSet(qemuCaps, QEMU_CAPS_DRIVE_IOTUNE); virQEMUCapsSet(qemuCaps, QEMU_CAPS_WAKEUP); diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index 604154d..30e811f 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -161,7 +161,7 @@ typedef enum { QEMU_CAPS_VIRTIO_BLK_SCSI, /* virtio-blk-pci.scsi */ QEMU_CAPS_VIRTIO_BLK_SG_IO, /* SG_IO commands, since 0.11 */ QEMU_CAPS_DRIVE_COPY_ON_READ, /* -drive copy-on-read */ - QEMU_CAPS_CPU_HOST, /* support for -cpu host */ + X_QEMU_CAPS_CPU_HOST, /* support for -cpu host */ QEMU_CAPS_FSDEV_WRITEOUT, /* -fsdev writeout supported */ /* 85 */ diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index e48e722..b68e32f 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -6461,17 +6461,10 @@ qemuBuildCpuModelArgStr(virQEMUDriverPtr driver, if ((cpu->mode == VIR_CPU_MODE_HOST_PASSTHROUGH) || ((cpu->mode == VIR_CPU_MODE_HOST_MODEL) && ARCH_IS_PPC64(def->os.arch))) { - const char *mode = virCPUModeTypeToString(cpu->mode); - if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_CPU_HOST)) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("CPU mode '%s' is not supported by QEMU" - " binary"), mode); - goto cleanup; - } if (def->virtType != VIR_DOMAIN_VIRT_KVM) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("CPU mode '%s' is only supported with kvm"), - mode); + virCPUModeTypeToString(cpu->mode)); goto cleanup; } virBufferAddLit(buf, "host"); diff --git a/tests/qemucapabilitiesdata/caps_1.2.2.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.2.2.x86_64.xml index 257a123..80b7ab8 100644 --- a/tests/qemucapabilitiesdata/caps_1.2.2.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_1.2.2.x86_64.xml @@ -55,7 +55,6 @@ <flag name='virtio-blk-pci.scsi'/> <flag name='blk-sg-io'/> <flag name='drive-copy-on-read'/> - <flag name='cpu-host'/> <flag name='fsdev-writeout'/> <flag name='drive-iotune'/> <flag name='system_wakeup'/> diff --git a/tests/qemucapabilitiesdata/caps_1.3.1.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.3.1.x86_64.xml index 39d4cc3..452b05f 100644 --- a/tests/qemucapabilitiesdata/caps_1.3.1.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_1.3.1.x86_64.xml @@ -57,7 +57,6 @@ <flag name='virtio-blk-pci.scsi'/> <flag name='blk-sg-io'/> <flag name='drive-copy-on-read'/> - <flag name='cpu-host'/> <flag name='fsdev-writeout'/> <flag name='drive-iotune'/> <flag name='system_wakeup'/> diff --git a/tests/qemucapabilitiesdata/caps_1.4.2.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.4.2.x86_64.xml index cbb6d88..c185d9a 100644 --- a/tests/qemucapabilitiesdata/caps_1.4.2.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_1.4.2.x86_64.xml @@ -57,7 +57,6 @@ <flag name='virtio-blk-pci.scsi'/> <flag name='blk-sg-io'/> <flag name='drive-copy-on-read'/> - <flag name='cpu-host'/> <flag name='fsdev-writeout'/> <flag name='drive-iotune'/> <flag name='system_wakeup'/> diff --git a/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml index cb3aa68..8bf550b 100644 --- a/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml @@ -56,7 +56,6 @@ <flag name='virtio-blk-pci.scsi'/> <flag name='blk-sg-io'/> <flag name='drive-copy-on-read'/> - <flag name='cpu-host'/> <flag name='fsdev-writeout'/> <flag name='drive-iotune'/> <flag name='system_wakeup'/> diff --git a/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml index bdd7f5f..d5664fa 100644 --- a/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml @@ -57,7 +57,6 @@ <flag name='virtio-blk-pci.scsi'/> <flag name='blk-sg-io'/> <flag name='drive-copy-on-read'/> - <flag name='cpu-host'/> <flag name='fsdev-writeout'/> <flag name='drive-iotune'/> <flag name='system_wakeup'/> diff --git a/tests/qemucapabilitiesdata/caps_1.6.50.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.6.50.x86_64.xml index 122082d..6649196 100644 --- a/tests/qemucapabilitiesdata/caps_1.6.50.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_1.6.50.x86_64.xml @@ -57,7 +57,6 @@ <flag name='virtio-blk-pci.scsi'/> <flag name='blk-sg-io'/> <flag name='drive-copy-on-read'/> - <flag name='cpu-host'/> <flag name='fsdev-writeout'/> <flag name='drive-iotune'/> <flag name='system_wakeup'/> diff --git a/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml index 79a93bf..581b38c 100644 --- a/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml @@ -58,7 +58,6 @@ <flag name='virtio-blk-pci.scsi'/> <flag name='blk-sg-io'/> <flag name='drive-copy-on-read'/> - <flag name='cpu-host'/> <flag name='fsdev-writeout'/> <flag name='drive-iotune'/> <flag name='system_wakeup'/> diff --git a/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml index b72d87f..15b6c34 100644 --- a/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml @@ -57,7 +57,6 @@ <flag name='virtio-blk-pci.scsi'/> <flag name='blk-sg-io'/> <flag name='drive-copy-on-read'/> - <flag name='cpu-host'/> <flag name='fsdev-writeout'/> <flag name='drive-iotune'/> <flag name='system_wakeup'/> diff --git a/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml index 3a35733..08b734d 100644 --- a/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml @@ -57,7 +57,6 @@ <flag name='virtio-blk-pci.scsi'/> <flag name='blk-sg-io'/> <flag name='drive-copy-on-read'/> - <flag name='cpu-host'/> <flag name='fsdev-writeout'/> <flag name='drive-iotune'/> <flag name='system_wakeup'/> diff --git a/tests/qemucapabilitiesdata/caps_2.6.0-gicv2.aarch64.xml b/tests/qemucapabilitiesdata/caps_2.6.0-gicv2.aarch64.xml index f4e6db1..a14b73d 100644 --- a/tests/qemucapabilitiesdata/caps_2.6.0-gicv2.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_2.6.0-gicv2.aarch64.xml @@ -48,7 +48,6 @@ <flag name='virtio-blk-pci.scsi'/> <flag name='blk-sg-io'/> <flag name='drive-copy-on-read'/> - <flag name='cpu-host'/> <flag name='fsdev-writeout'/> <flag name='drive-iotune'/> <flag name='system_wakeup'/> diff --git a/tests/qemucapabilitiesdata/caps_2.6.0-gicv3.aarch64.xml b/tests/qemucapabilitiesdata/caps_2.6.0-gicv3.aarch64.xml index f4d60d1..72c908d 100644 --- a/tests/qemucapabilitiesdata/caps_2.6.0-gicv3.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_2.6.0-gicv3.aarch64.xml @@ -48,7 +48,6 @@ <flag name='virtio-blk-pci.scsi'/> <flag name='blk-sg-io'/> <flag name='drive-copy-on-read'/> - <flag name='cpu-host'/> <flag name='fsdev-writeout'/> <flag name='drive-iotune'/> <flag name='system_wakeup'/> diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.ppc64le.xml b/tests/qemucapabilitiesdata/caps_2.6.0.ppc64le.xml index 96a02a5..61c5754 100644 --- a/tests/qemucapabilitiesdata/caps_2.6.0.ppc64le.xml +++ b/tests/qemucapabilitiesdata/caps_2.6.0.ppc64le.xml @@ -46,7 +46,6 @@ <flag name='virtio-blk-pci.scsi'/> <flag name='blk-sg-io'/> <flag name='drive-copy-on-read'/> - <flag name='cpu-host'/> <flag name='fsdev-writeout'/> <flag name='drive-iotune'/> <flag name='system_wakeup'/> diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml index d51d3f4..9aac595 100644 --- a/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml @@ -57,7 +57,6 @@ <flag name='virtio-blk-pci.scsi'/> <flag name='blk-sg-io'/> <flag name='drive-copy-on-read'/> - <flag name='cpu-host'/> <flag name='fsdev-writeout'/> <flag name='drive-iotune'/> <flag name='system_wakeup'/> diff --git a/tests/qemuhelptest.c b/tests/qemuhelptest.c index c0bc98e..6cd6883 100644 --- a/tests/qemuhelptest.c +++ b/tests/qemuhelptest.c @@ -169,7 +169,6 @@ mymain(void) QEMU_CAPS_NO_SHUTDOWN, QEMU_CAPS_NO_ACPI, QEMU_CAPS_VIRTIO_BLK_SG_IO, - QEMU_CAPS_CPU_HOST, QEMU_CAPS_VNC); DO_TEST("qemu-kvm-0.12.1.2-rhel60", 12001, 1, 0, QEMU_CAPS_DRIVE_BOOT, @@ -205,7 +204,6 @@ mymain(void) QEMU_CAPS_NO_SHUTDOWN, QEMU_CAPS_NO_ACPI, QEMU_CAPS_VIRTIO_BLK_SG_IO, - QEMU_CAPS_CPU_HOST, QEMU_CAPS_VNC, QEMU_CAPS_DEVICE_QXL, QEMU_CAPS_DEVICE_VGA, @@ -243,7 +241,6 @@ mymain(void) QEMU_CAPS_NO_SHUTDOWN, QEMU_CAPS_NO_ACPI, QEMU_CAPS_VIRTIO_BLK_SG_IO, - QEMU_CAPS_CPU_HOST, QEMU_CAPS_VNC); DO_TEST("qemu-kvm-0.13.0", 13000, 1, 0, QEMU_CAPS_DRIVE_BOOT, @@ -285,7 +282,6 @@ mymain(void) QEMU_CAPS_NO_SHUTDOWN, QEMU_CAPS_NO_ACPI, QEMU_CAPS_VIRTIO_BLK_SG_IO, - QEMU_CAPS_CPU_HOST, QEMU_CAPS_SCSI_LSI, QEMU_CAPS_VNC, QEMU_CAPS_DEVICE_QXL, @@ -343,7 +339,6 @@ mymain(void) QEMU_CAPS_NO_ACPI, QEMU_CAPS_VIRTIO_BLK_SCSI, QEMU_CAPS_VIRTIO_BLK_SG_IO, - QEMU_CAPS_CPU_HOST, QEMU_CAPS_BLOCKIO, QEMU_CAPS_VNC, QEMU_CAPS_DEVICE_QXL, @@ -406,7 +401,6 @@ mymain(void) QEMU_CAPS_VIRTIO_BLK_SCSI, QEMU_CAPS_VIRTIO_BLK_SG_IO, QEMU_CAPS_DRIVE_COPY_ON_READ, - QEMU_CAPS_CPU_HOST, QEMU_CAPS_SCSI_CD, QEMU_CAPS_BLOCKIO, QEMU_CAPS_VNC, @@ -469,7 +463,6 @@ mymain(void) QEMU_CAPS_FSDEV_READONLY, QEMU_CAPS_VIRTIO_BLK_SCSI, QEMU_CAPS_VIRTIO_BLK_SG_IO, - QEMU_CAPS_CPU_HOST, QEMU_CAPS_FSDEV_WRITEOUT, QEMU_CAPS_SCSI_BLOCK, QEMU_CAPS_SCSI_CD, @@ -547,7 +540,6 @@ mymain(void) QEMU_CAPS_VIRTIO_BLK_SCSI, QEMU_CAPS_VIRTIO_BLK_SG_IO, QEMU_CAPS_DRIVE_COPY_ON_READ, - QEMU_CAPS_CPU_HOST, QEMU_CAPS_FSDEV_WRITEOUT, QEMU_CAPS_DRIVE_IOTUNE, QEMU_CAPS_SCSI_DISK_CHANNEL, diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 62466fd..7760647 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -647,7 +647,7 @@ mymain(void) QEMU_CAPS_NO_KVM_PIT); DO_TEST("clock-catchup", QEMU_CAPS_RTC, QEMU_CAPS_NO_KVM_PIT); DO_TEST("cpu-kvmclock", QEMU_CAPS_ENABLE_KVM); - DO_TEST("cpu-host-kvmclock", QEMU_CAPS_ENABLE_KVM, QEMU_CAPS_CPU_HOST); + DO_TEST("cpu-host-kvmclock", QEMU_CAPS_ENABLE_KVM); DO_TEST("kvmclock", QEMU_CAPS_KVM); DO_TEST("clock-timer-hyperv-rtc", QEMU_CAPS_KVM); @@ -1289,10 +1289,9 @@ mymain(void) DO_TEST("cpu-host-model-fallback", NONE); DO_TEST_FAILURE("cpu-host-model-nofallback", NONE); skipLegacyCPUs = false; - DO_TEST("cpu-host-passthrough", QEMU_CAPS_KVM, QEMU_CAPS_CPU_HOST); + DO_TEST("cpu-host-passthrough", QEMU_CAPS_KVM); DO_TEST_FAILURE("cpu-host-passthrough", NONE); - DO_TEST_FAILURE("cpu-qemu-host-passthrough", - QEMU_CAPS_KVM, QEMU_CAPS_CPU_HOST); + DO_TEST_FAILURE("cpu-qemu-host-passthrough", QEMU_CAPS_KVM); driver.caps->host.cpu = cpuHaswell; DO_TEST("cpu-Haswell", QEMU_CAPS_KVM); @@ -1389,9 +1388,9 @@ mymain(void) QEMU_CAPS_NODEFCONFIG); DO_TEST("pseries-cpu-exact", QEMU_CAPS_CHARDEV, QEMU_CAPS_NODEFCONFIG); - DO_TEST("pseries-cpu-compat", QEMU_CAPS_KVM, QEMU_CAPS_CPU_HOST, + DO_TEST("pseries-cpu-compat", QEMU_CAPS_KVM, QEMU_CAPS_CHARDEV, QEMU_CAPS_NODEFCONFIG); - DO_TEST("pseries-cpu-le", QEMU_CAPS_KVM, QEMU_CAPS_CPU_HOST, + DO_TEST("pseries-cpu-le", QEMU_CAPS_KVM, QEMU_CAPS_CHARDEV, QEMU_CAPS_NODEFCONFIG); DO_TEST("pseries-panic-missing", QEMU_CAPS_CHARDEV, QEMU_CAPS_NODEFCONFIG); @@ -1717,49 +1716,49 @@ mymain(void) QEMU_CAPS_DEVICE_VIRTIO_MMIO); DO_TEST("aarch64-cpu-passthrough", QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_DEVICE_VIRTIO_MMIO, - QEMU_CAPS_CPU_HOST, QEMU_CAPS_KVM); + QEMU_CAPS_KVM); DO_TEST("aarch64-gic-none", - QEMU_CAPS_KVM, QEMU_CAPS_MACHINE_OPT, QEMU_CAPS_CPU_HOST, + QEMU_CAPS_KVM, QEMU_CAPS_MACHINE_OPT, QEMU_CAPS_MACH_VIRT_GIC_VERSION); DO_TEST("aarch64-gic-none", - QEMU_CAPS_KVM, QEMU_CAPS_MACHINE_OPT, QEMU_CAPS_CPU_HOST); + QEMU_CAPS_KVM, QEMU_CAPS_MACHINE_OPT); DO_TEST("aarch64-gic-default", - QEMU_CAPS_KVM, QEMU_CAPS_MACHINE_OPT, QEMU_CAPS_CPU_HOST, + QEMU_CAPS_KVM, QEMU_CAPS_MACHINE_OPT, QEMU_CAPS_MACH_VIRT_GIC_VERSION); DO_TEST("aarch64-gic-default", - QEMU_CAPS_KVM, QEMU_CAPS_MACHINE_OPT, QEMU_CAPS_CPU_HOST); + QEMU_CAPS_KVM, QEMU_CAPS_MACHINE_OPT); DO_TEST("aarch64-gic-v2", - QEMU_CAPS_KVM, QEMU_CAPS_MACHINE_OPT, QEMU_CAPS_CPU_HOST, + QEMU_CAPS_KVM, QEMU_CAPS_MACHINE_OPT, QEMU_CAPS_MACH_VIRT_GIC_VERSION); DO_TEST("aarch64-gic-v2", - QEMU_CAPS_KVM, QEMU_CAPS_MACHINE_OPT, QEMU_CAPS_CPU_HOST); + QEMU_CAPS_KVM, QEMU_CAPS_MACHINE_OPT); DO_TEST("aarch64-gic-v3", - QEMU_CAPS_KVM, QEMU_CAPS_MACHINE_OPT, QEMU_CAPS_CPU_HOST, + QEMU_CAPS_KVM, QEMU_CAPS_MACHINE_OPT, QEMU_CAPS_MACH_VIRT_GIC_VERSION); DO_TEST_FAILURE("aarch64-gic-v3", - QEMU_CAPS_KVM, QEMU_CAPS_MACHINE_OPT, QEMU_CAPS_CPU_HOST); + QEMU_CAPS_KVM, QEMU_CAPS_MACHINE_OPT); DO_TEST("aarch64-gic-host", - QEMU_CAPS_KVM, QEMU_CAPS_MACHINE_OPT, QEMU_CAPS_CPU_HOST, + QEMU_CAPS_KVM, QEMU_CAPS_MACHINE_OPT, QEMU_CAPS_MACH_VIRT_GIC_VERSION); DO_TEST_FAILURE("aarch64-gic-host", - QEMU_CAPS_KVM, QEMU_CAPS_MACHINE_OPT, QEMU_CAPS_CPU_HOST); + QEMU_CAPS_KVM, QEMU_CAPS_MACHINE_OPT); DO_TEST_PARSE_ERROR("aarch64-gic-invalid", - QEMU_CAPS_KVM, QEMU_CAPS_MACHINE_OPT, QEMU_CAPS_CPU_HOST, + QEMU_CAPS_KVM, QEMU_CAPS_MACHINE_OPT, QEMU_CAPS_MACH_VIRT_GIC_VERSION); DO_TEST_FAILURE("aarch64-gic-not-virt", - QEMU_CAPS_KVM, QEMU_CAPS_MACHINE_OPT, QEMU_CAPS_CPU_HOST, + QEMU_CAPS_KVM, QEMU_CAPS_MACHINE_OPT, QEMU_CAPS_MACH_VIRT_GIC_VERSION); DO_TEST_FAILURE("aarch64-gic-not-arm", - QEMU_CAPS_KVM, QEMU_CAPS_MACHINE_OPT, QEMU_CAPS_CPU_HOST, + QEMU_CAPS_KVM, QEMU_CAPS_MACHINE_OPT, QEMU_CAPS_MACH_VIRT_GIC_VERSION); driver.caps->host.cpu->arch = VIR_ARCH_AARCH64; DO_TEST("aarch64-kvm-32-on-64", QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_DEVICE_VIRTIO_MMIO, - QEMU_CAPS_KVM, QEMU_CAPS_CPU_HOST, QEMU_CAPS_CPU_AARCH64_OFF); + QEMU_CAPS_KVM, QEMU_CAPS_CPU_AARCH64_OFF); DO_TEST_FAILURE("aarch64-kvm-32-on-64", QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_DEVICE_VIRTIO_MMIO, - QEMU_CAPS_KVM, QEMU_CAPS_CPU_HOST); + QEMU_CAPS_KVM); driver.caps->host.cpu->arch = cpuDefault->arch; DO_TEST("kvm-pit-device", QEMU_CAPS_KVM_PIT_TICK_POLICY); @@ -1787,7 +1786,7 @@ mymain(void) DO_TEST_FAILURE("shmem-small-size", QEMU_CAPS_PCIDEVICE, QEMU_CAPS_DEVICE_IVSHMEM); DO_TEST_PARSE_ERROR("shmem-msi-only", NONE); - DO_TEST("cpu-host-passthrough-features", QEMU_CAPS_KVM, QEMU_CAPS_CPU_HOST); + DO_TEST("cpu-host-passthrough-features", QEMU_CAPS_KVM); DO_TEST_FAILURE("memory-align-fail", NONE); DO_TEST_FAILURE("memory-hotplug-nonuma", QEMU_CAPS_DEVICE_PC_DIMM); -- 2.5.5