|
 |
3e5111 |
From 2106b821cd1eef809853f7424edf8660732b1303 Mon Sep 17 00:00:00 2001
|
|
|
3e5111 |
Message-Id: <2106b821cd1eef809853f7424edf8660732b1303@dist-git>
|
|
|
3e5111 |
From: Andrea Bolognani <abologna@redhat.com>
|
|
|
3e5111 |
Date: Tue, 4 Apr 2017 14:59:30 +0200
|
|
|
3e5111 |
Subject: [PATCH] qemu: Advertise ACPI support for aarch64 guests
|
|
|
3e5111 |
|
|
|
3e5111 |
So far, libvirt has assumed that only x86 supports ACPI,
|
|
|
3e5111 |
but that's inaccurate since aarch64 supports it too.
|
|
|
3e5111 |
|
|
|
3e5111 |
Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1429509
|
|
|
3e5111 |
|
|
|
3e5111 |
(cherry picked from commit 560335c35c830344329c16cb1f25f887344bdfd8)
|
|
|
3e5111 |
Signed-off-by: Andrea Bolognani <abologna@redhat.com>
|
|
|
3e5111 |
---
|
|
|
3e5111 |
src/qemu/qemu_capabilities.c | 28 ++++++++++++++++------
|
|
|
3e5111 |
.../caps_2.6.0-gicv2.aarch64.xml | 1 +
|
|
|
3e5111 |
.../caps_2.6.0-gicv3.aarch64.xml | 1 +
|
|
|
3e5111 |
.../qemuxml2argv-aarch64-gic-host.args | 1 +
|
|
|
3e5111 |
.../qemuxml2argv-aarch64-gic-v2.args | 1 +
|
|
|
3e5111 |
.../qemuxml2argv-aarch64-gic-v3.args | 1 +
|
|
|
3e5111 |
6 files changed, 26 insertions(+), 7 deletions(-)
|
|
|
3e5111 |
|
|
|
3e5111 |
diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
|
|
|
3e5111 |
index 9d0a29732..a8125102c 100644
|
|
|
3e5111 |
--- a/src/qemu/qemu_capabilities.c
|
|
|
3e5111 |
+++ b/src/qemu/qemu_capabilities.c
|
|
|
3e5111 |
@@ -1043,13 +1043,17 @@ virQEMUCapsInitGuestFromBinary(virCapsPtr caps,
|
|
|
3e5111 |
|
|
|
3e5111 |
machines = NULL;
|
|
|
3e5111 |
nmachines = 0;
|
|
|
3e5111 |
+ }
|
|
|
3e5111 |
|
|
|
3e5111 |
+ if ((ARCH_IS_X86(guestarch) || guestarch == VIR_ARCH_AARCH64) &&
|
|
|
3e5111 |
+ virCapabilitiesAddGuestFeature(guest, "acpi", true, true) == NULL) {
|
|
|
3e5111 |
+ goto cleanup;
|
|
|
3e5111 |
}
|
|
|
3e5111 |
|
|
|
3e5111 |
if (ARCH_IS_X86(guestarch) &&
|
|
|
3e5111 |
- (virCapabilitiesAddGuestFeature(guest, "acpi", true, true) == NULL ||
|
|
|
3e5111 |
- virCapabilitiesAddGuestFeature(guest, "apic", true, false) == NULL))
|
|
|
3e5111 |
+ virCapabilitiesAddGuestFeature(guest, "apic", true, false) == NULL) {
|
|
|
3e5111 |
goto cleanup;
|
|
|
3e5111 |
+ }
|
|
|
3e5111 |
|
|
|
3e5111 |
if ((guestarch == VIR_ARCH_I686) &&
|
|
|
3e5111 |
(virCapabilitiesAddGuestFeature(guest, "pae", true, false) == NULL ||
|
|
|
3e5111 |
@@ -4181,10 +4185,15 @@ virQEMUCapsInitHelp(virQEMUCapsPtr qemuCaps, uid_t runUid, gid_t runGid, const c
|
|
|
3e5111 |
qmperr) < 0)
|
|
|
3e5111 |
goto cleanup;
|
|
|
3e5111 |
|
|
|
3e5111 |
- /* -no-acpi is not supported on non-x86
|
|
|
3e5111 |
- * even if qemu reports it in -help */
|
|
|
3e5111 |
- if (!ARCH_IS_X86(qemuCaps->arch))
|
|
|
3e5111 |
+ /* Older QEMU versions reported -no-acpi in the output of -help even
|
|
|
3e5111 |
+ * though it was not supported by the architecture. The issue has since
|
|
|
3e5111 |
+ * been fixed, but to maintain compatibility with all release we still
|
|
|
3e5111 |
+ * need to filter out the capability for architectures that we know
|
|
|
3e5111 |
+ * don't support the feature, eg. anything but x86 and aarch64 */
|
|
|
3e5111 |
+ if (!ARCH_IS_X86(qemuCaps->arch) &&
|
|
|
3e5111 |
+ qemuCaps->arch != VIR_ARCH_AARCH64) {
|
|
|
3e5111 |
virQEMUCapsClear(qemuCaps, QEMU_CAPS_NO_ACPI);
|
|
|
3e5111 |
+ }
|
|
|
3e5111 |
|
|
|
3e5111 |
/* virQEMUCapsExtractDeviceStr will only set additional caps if qemu
|
|
|
3e5111 |
* understands the 0.13.0+ notion of "-device driver,". */
|
|
|
3e5111 |
@@ -4305,9 +4314,14 @@ virQEMUCapsInitQMPArch(virQEMUCapsPtr qemuCaps,
|
|
|
3e5111 |
void
|
|
|
3e5111 |
virQEMUCapsInitQMPBasicArch(virQEMUCapsPtr qemuCaps)
|
|
|
3e5111 |
{
|
|
|
3e5111 |
- /* ACPI/HPET/KVM PIT are x86 specific */
|
|
|
3e5111 |
- if (ARCH_IS_X86(qemuCaps->arch)) {
|
|
|
3e5111 |
+ /* ACPI only works on x86 and aarch64 */
|
|
|
3e5111 |
+ if (ARCH_IS_X86(qemuCaps->arch) ||
|
|
|
3e5111 |
+ qemuCaps->arch == VIR_ARCH_AARCH64) {
|
|
|
3e5111 |
virQEMUCapsSet(qemuCaps, QEMU_CAPS_NO_ACPI);
|
|
|
3e5111 |
+ }
|
|
|
3e5111 |
+
|
|
|
3e5111 |
+ /* HPET and KVM PIT are x86 specific */
|
|
|
3e5111 |
+ if (ARCH_IS_X86(qemuCaps->arch)) {
|
|
|
3e5111 |
virQEMUCapsSet(qemuCaps, QEMU_CAPS_NO_HPET);
|
|
|
3e5111 |
virQEMUCapsSet(qemuCaps, QEMU_CAPS_NO_KVM_PIT);
|
|
|
3e5111 |
}
|
|
|
3e5111 |
diff --git a/tests/qemucapabilitiesdata/caps_2.6.0-gicv2.aarch64.xml b/tests/qemucapabilitiesdata/caps_2.6.0-gicv2.aarch64.xml
|
|
|
3e5111 |
index c1e46794a..af3a8e7cb 100644
|
|
|
3e5111 |
--- a/tests/qemucapabilitiesdata/caps_2.6.0-gicv2.aarch64.xml
|
|
|
3e5111 |
+++ b/tests/qemucapabilitiesdata/caps_2.6.0-gicv2.aarch64.xml
|
|
|
3e5111 |
@@ -40,6 +40,7 @@
|
|
|
3e5111 |
<flag name='no-shutdown'/>
|
|
|
3e5111 |
<flag name='cache-unsafe'/>
|
|
|
3e5111 |
<flag name='ich9-ahci'/>
|
|
|
3e5111 |
+ <flag name='no-acpi'/>
|
|
|
3e5111 |
<flag name='fsdev-readonly'/>
|
|
|
3e5111 |
<flag name='virtio-blk-pci.scsi'/>
|
|
|
3e5111 |
<flag name='drive-copy-on-read'/>
|
|
|
3e5111 |
diff --git a/tests/qemucapabilitiesdata/caps_2.6.0-gicv3.aarch64.xml b/tests/qemucapabilitiesdata/caps_2.6.0-gicv3.aarch64.xml
|
|
|
3e5111 |
index 20dfda216..4402ffa6f 100644
|
|
|
3e5111 |
--- a/tests/qemucapabilitiesdata/caps_2.6.0-gicv3.aarch64.xml
|
|
|
3e5111 |
+++ b/tests/qemucapabilitiesdata/caps_2.6.0-gicv3.aarch64.xml
|
|
|
3e5111 |
@@ -40,6 +40,7 @@
|
|
|
3e5111 |
<flag name='no-shutdown'/>
|
|
|
3e5111 |
<flag name='cache-unsafe'/>
|
|
|
3e5111 |
<flag name='ich9-ahci'/>
|
|
|
3e5111 |
+ <flag name='no-acpi'/>
|
|
|
3e5111 |
<flag name='fsdev-readonly'/>
|
|
|
3e5111 |
<flag name='virtio-blk-pci.scsi'/>
|
|
|
3e5111 |
<flag name='drive-copy-on-read'/>
|
|
|
3e5111 |
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-aarch64-gic-host.args b/tests/qemuxml2argvdata/qemuxml2argv-aarch64-gic-host.args
|
|
|
3e5111 |
index 5fdaa08ef..23276ad71 100644
|
|
|
3e5111 |
--- a/tests/qemuxml2argvdata/qemuxml2argv-aarch64-gic-host.args
|
|
|
3e5111 |
+++ b/tests/qemuxml2argvdata/qemuxml2argv-aarch64-gic-host.args
|
|
|
3e5111 |
@@ -15,4 +15,5 @@ QEMU_AUDIO_DRV=none \
|
|
|
3e5111 |
-nographic \
|
|
|
3e5111 |
-nodefaults \
|
|
|
3e5111 |
-monitor unix:/tmp/lib/domain--1-aarch64test/monitor.sock,server,nowait \
|
|
|
3e5111 |
+-no-acpi \
|
|
|
3e5111 |
-boot c
|
|
|
3e5111 |
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-aarch64-gic-v2.args b/tests/qemuxml2argvdata/qemuxml2argv-aarch64-gic-v2.args
|
|
|
3e5111 |
index 2caf1b92c..f79c1c60e 100644
|
|
|
3e5111 |
--- a/tests/qemuxml2argvdata/qemuxml2argv-aarch64-gic-v2.args
|
|
|
3e5111 |
+++ b/tests/qemuxml2argvdata/qemuxml2argv-aarch64-gic-v2.args
|
|
|
3e5111 |
@@ -15,4 +15,5 @@ QEMU_AUDIO_DRV=none \
|
|
|
3e5111 |
-nographic \
|
|
|
3e5111 |
-nodefaults \
|
|
|
3e5111 |
-monitor unix:/tmp/lib/domain--1-aarch64test/monitor.sock,server,nowait \
|
|
|
3e5111 |
+-no-acpi \
|
|
|
3e5111 |
-boot c
|
|
|
3e5111 |
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-aarch64-gic-v3.args b/tests/qemuxml2argvdata/qemuxml2argv-aarch64-gic-v3.args
|
|
|
3e5111 |
index 3ae8e5f86..fce9308b0 100644
|
|
|
3e5111 |
--- a/tests/qemuxml2argvdata/qemuxml2argv-aarch64-gic-v3.args
|
|
|
3e5111 |
+++ b/tests/qemuxml2argvdata/qemuxml2argv-aarch64-gic-v3.args
|
|
|
3e5111 |
@@ -15,4 +15,5 @@ QEMU_AUDIO_DRV=none \
|
|
|
3e5111 |
-nographic \
|
|
|
3e5111 |
-nodefaults \
|
|
|
3e5111 |
-monitor unix:/tmp/lib/domain--1-aarch64test/monitor.sock,server,nowait \
|
|
|
3e5111 |
+-no-acpi \
|
|
|
3e5111 |
-boot c
|
|
|
3e5111 |
--
|
|
|
3e5111 |
2.12.2
|
|
|
3e5111 |
|