From 85644c24c852dc97d7ac4741f880362a1b705c80 Mon Sep 17 00:00:00 2001 From: Peter Krempa Date: Fri, 3 Mar 2023 14:52:54 +0100 Subject: [PATCH] qemu: Always assume QEMU_CAPS_CPU_AARCH64_OFF MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 Reviewed-by: Ján Tomko --- src/qemu/qemu_validate.c | 9 --------- tests/qemuxml2argvdata/aarch64-kvm-32-on-64.err | 1 - tests/qemuxml2argvtest.c | 5 +---- 3 files changed, 1 insertion(+), 14 deletions(-) delete mode 100644 tests/qemuxml2argvdata/aarch64-kvm-32-on-64.err diff --git a/src/qemu/qemu_validate.c b/src/qemu/qemu_validate.c index 9587281533..30c11a567a 100644 --- 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 index 3858f112b4..0000000000 --- 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 89ec07c548..eaea0c103c 100644 --- 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,