[PATCH 28/31] 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(a)redhat.com>
---
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 c877aa73d4..4746c14441 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 e515c2c0df..33dcb247de 100644
--- a/tests/qemuxml2argvtest.c
+++ b/tests/qemuxml2argvtest.c
@@ -2579,10 +2579,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,
--
2.39.2