qemu: Always assume QEMU_CAPS_CPU_AARCH64_OFF

We always assert the flag for aarch64 qemus and in qemu the 'aarch64'
cpu property doesn't seem to be optional.

Remove checks and remove impossible test case.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>

diff --git a/src/qemu/qemu_validate.c b/src/qemu/qemu_validate.c
index 958728153344691f149bb6d6731f0561f59b42af..30c11a567ad077466d807e2cee12bc5c8347eb84 100644 (file)
--- a/src/qemu/qemu_validate.c
+++ b/src/qemu/qemu_validate.c
@@ -430,15 +430,6 @@ qemuValidateDomainDefCpu(virQEMUDriver *driver,
     if (cpu->model || cpu->mode != VIR_CPU_MODE_CUSTOM) {
         switch ((virCPUMode) cpu->mode) {
         case VIR_CPU_MODE_HOST_PASSTHROUGH:
-            if (def->os.arch == VIR_ARCH_ARMV7L &&
-                driver->hostarch == VIR_ARCH_AARCH64) {
-                if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_CPU_AARCH64_OFF)) {
-                    virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
-                                   _("QEMU binary does not support CPU host-passthrough for armv7l on aarch64 host"));
-                    return -1;
-                }
-            }
-
             if (cpu->migratable &&
                 cpu->migratable != VIR_TRISTATE_SWITCH_OFF &&
                 !virQEMUCapsGet(qemuCaps, QEMU_CAPS_CPU_MIGRATABLE)) {

diff --git a/tests/qemuxml2argvdata/aarch64-kvm-32-on-64.err b/tests/qemuxml2argvdata/aarch64-kvm-32-on-64.err
deleted file mode 100644 (file)
index 3858f11..0000000
--- a/tests/qemuxml2argvdata/aarch64-kvm-32-on-64.err
+++ /dev/null
@@ -1 +0,0 @@
-unsupported configuration: QEMU binary does not support CPU host-passthrough for armv7l on aarch64 host

diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
index 89ec07c548bae72fbbbf38e04c9aeea8a99c570b..eaea0c103c47b593454d0103145b8060c9f1ddd7 100644 (file)
--- a/tests/qemuxml2argvtest.c
+++ b/tests/qemuxml2argvtest.c
@@ -2536,10 +2536,7 @@ mymain(void)
     DO_TEST("aarch64-kvm-32-on-64",
             QEMU_CAPS_DEVICE_VIRTIO_MMIO,
             QEMU_CAPS_DEVICE_PL011,
-            QEMU_CAPS_KVM, QEMU_CAPS_CPU_AARCH64_OFF);
-    DO_TEST_PARSE_ERROR("aarch64-kvm-32-on-64",
-                        QEMU_CAPS_DEVICE_VIRTIO_MMIO,
-                        QEMU_CAPS_KVM);
+            QEMU_CAPS_KVM);
     DO_TEST("aarch64-pci-serial",
             QEMU_CAPS_DEVICE_PCI_SERIAL,
             QEMU_CAPS_OBJECT_GPEX,