Although QEMU allows ACPI with UEFI firmware via the '-bios' option on
aarch64, libvirt rejected such configurations through its validation.
Therefore, the conditional statement was changed to allow the following
settings:
<os>
<type arch='aarch64' machine='virt-4.0'>hvm</type>
<loader type="rom">/usr/share/qemu-efi-aarch64/QEMU_EFI.fd</loader>
</os>
<features>
<acpi/>
</features>
Specifying <os firmware='bios'> still results in error, as before.
Signed-off-by: Kazuhiro Abe <[email protected]>
---
src/qemu/qemu_validate.c | 2 +-
...auto-bios-acpi-aarch64.aarch64-latest.err} | 0
.../firmware-auto-bios-acpi-aarch64.xml | 17 ++++++++++
...ual-noefi-acpi-aarch64.aarch64-latest.args | 31 +++++++++++++++++++
...nual-noefi-acpi-aarch64.aarch64-latest.xml | 29 +++++++++++++++++
tests/qemuxmlconftest.c | 3 +-
6 files changed, 80 insertions(+), 2 deletions(-)
rename
tests/qemuxmlconfdata/{firmware-manual-noefi-acpi-aarch64.aarch64-latest.err =>
firmware-auto-bios-acpi-aarch64.aarch64-latest.err} (100%)
create mode 100644 tests/qemuxmlconfdata/firmware-auto-bios-acpi-aarch64.xml
create mode 100644
tests/qemuxmlconfdata/firmware-manual-noefi-acpi-aarch64.aarch64-latest.args
create mode 100644
tests/qemuxmlconfdata/firmware-manual-noefi-acpi-aarch64.aarch64-latest.xml
diff --git a/src/qemu/qemu_validate.c b/src/qemu/qemu_validate.c
index 3b0f2b50a5..263aaa25a2 100644
--- a/src/qemu/qemu_validate.c
+++ b/src/qemu/qemu_validate.c
@@ -1341,7 +1341,7 @@ qemuValidateDomainDef(const virDomainDef *def,
/* On aarch64, ACPI requires UEFI */
if (def->features[VIR_DOMAIN_FEATURE_ACPI] == VIR_TRISTATE_SWITCH_ON &&
def->os.arch == VIR_ARCH_AARCH64 &&
- (def->os.firmware != VIR_DOMAIN_OS_DEF_FIRMWARE_EFI &&
+ (def->os.firmware == VIR_DOMAIN_OS_DEF_FIRMWARE_BIOS &&
!virDomainDefHasOldStyleUEFI(def))) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
_("ACPI requires UEFI on this architecture"));
diff --git
a/tests/qemuxmlconfdata/firmware-manual-noefi-acpi-aarch64.aarch64-latest.err
b/tests/qemuxmlconfdata/firmware-auto-bios-acpi-aarch64.aarch64-latest.err
similarity index 100%
rename from
tests/qemuxmlconfdata/firmware-manual-noefi-acpi-aarch64.aarch64-latest.err
rename to
tests/qemuxmlconfdata/firmware-auto-bios-acpi-aarch64.aarch64-latest.err
diff --git a/tests/qemuxmlconfdata/firmware-auto-bios-acpi-aarch64.xml
b/tests/qemuxmlconfdata/firmware-auto-bios-acpi-aarch64.xml
new file mode 100644
index 0000000000..37c4efdb80
--- /dev/null
+++ b/tests/qemuxmlconfdata/firmware-auto-bios-acpi-aarch64.xml
@@ -0,0 +1,17 @@
+<domain type='qemu'>
+ <name>guest</name>
+ <uuid>63840878-0deb-4095-97e6-fc444d9bc9fa</uuid>
+ <memory unit='KiB'>1048576</memory>
+ <vcpu placement='static'>1</vcpu>
+ <os firmware='bios'>
+ <type arch='aarch64' machine='virt-4.0'>hvm</type>
+ </os>
+ <features>
+ <acpi/>
+ </features>
+ <devices>
+ <emulator>/usr/bin/qemu-system-aarch64</emulator>
+ <controller type='usb' model='none'/>
+ <memballoon model='none'/>
+ </devices>
+</domain>
diff --git
a/tests/qemuxmlconfdata/firmware-manual-noefi-acpi-aarch64.aarch64-latest.args
b/tests/qemuxmlconfdata/firmware-manual-noefi-acpi-aarch64.aarch64-latest.args
new file mode 100644
index 0000000000..fe79a7e746
--- /dev/null
+++
b/tests/qemuxmlconfdata/firmware-manual-noefi-acpi-aarch64.aarch64-latest.args
@@ -0,0 +1,31 @@
+LC_ALL=C \
+PATH=/bin \
+HOME=/var/lib/libvirt/qemu/domain--1-guest \
+USER=test \
+LOGNAME=test \
+XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-guest/.local/share \
+XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-guest/.cache \
+XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \
+/usr/bin/qemu-system-aarch64 \
+-name guest=guest,debug-threads=on \
+-S \
+-object
'{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-guest/master-key.aes"}'
\
+-machine
virt-4.0,usb=off,gic-version=2,dump-guest-core=off,memory-backend=mach-virt.ram,acpi=on
\
+-accel tcg \
+-cpu cortex-a15 \
+-m size=1048576k \
+-object
'{"qom-type":"memory-backend-ram","id":"mach-virt.ram","size":1073741824}' \
+-overcommit mem-lock=off \
+-smp 1,sockets=1,cores=1,threads=1 \
+-uuid 63840878-0deb-4095-97e6-fc444d9bc9fa \
+-display none \
+-no-user-config \
+-nodefaults \
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-mon chardev=charmonitor,id=monitor,mode=control \
+-rtc base=utc \
+-no-shutdown \
+-boot strict=on \
+-audiodev '{"id":"audio1","driver":"none"}' \
+-sandbox
on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \
+-msg timestamp=on
diff --git
a/tests/qemuxmlconfdata/firmware-manual-noefi-acpi-aarch64.aarch64-latest.xml
b/tests/qemuxmlconfdata/firmware-manual-noefi-acpi-aarch64.aarch64-latest.xml
new file mode 100644
index 0000000000..b713a65714
--- /dev/null
+++
b/tests/qemuxmlconfdata/firmware-manual-noefi-acpi-aarch64.aarch64-latest.xml
@@ -0,0 +1,29 @@
+<domain type='qemu'>
+ <name>guest</name>
+ <uuid>63840878-0deb-4095-97e6-fc444d9bc9fa</uuid>
+ <memory unit='KiB'>1048576</memory>
+ <currentMemory unit='KiB'>1048576</currentMemory>
+ <vcpu placement='static'>1</vcpu>
+ <os>
+ <type arch='aarch64' machine='virt-4.0'>hvm</type>
+ <boot dev='hd'/>
+ </os>
+ <features>
+ <acpi/>
+ <gic version='2'/>
+ </features>
+ <cpu mode='custom' match='exact' check='none'>
+ <model fallback='forbid'>cortex-a15</model>
+ </cpu>
+ <clock offset='utc'/>
+ <on_poweroff>destroy</on_poweroff>
+ <on_reboot>restart</on_reboot>
+ <on_crash>destroy</on_crash>
+ <devices>
+ <emulator>/usr/bin/qemu-system-aarch64</emulator>
+ <controller type='usb' index='0' model='none'/>
+ <controller type='pci' index='0' model='pcie-root'/>
+ <audio id='1' type='none'/>
+ <memballoon model='none'/>
+ </devices>
+</domain>
diff --git a/tests/qemuxmlconftest.c b/tests/qemuxmlconftest.c
index dd55c1ef28..122e644caf 100644
--- a/tests/qemuxmlconftest.c
+++ b/tests/qemuxmlconftest.c
@@ -1554,10 +1554,11 @@ mymain(void)
DO_TEST_CAPS_LATEST("firmware-manual-efi-acpi-q35");
DO_TEST_CAPS_ARCH_LATEST("firmware-manual-efi-noacpi-aarch64", "aarch64");
DO_TEST_CAPS_LATEST_PARSE_ERROR("firmware-manual-efi-noacpi-q35");
- DO_TEST_CAPS_ARCH_LATEST_PARSE_ERROR("firmware-manual-noefi-acpi-aarch64",
"aarch64");
+ DO_TEST_CAPS_ARCH_LATEST("firmware-manual-noefi-acpi-aarch64", "aarch64");
DO_TEST_CAPS_LATEST("firmware-manual-noefi-acpi-q35");
DO_TEST_CAPS_ARCH_LATEST("firmware-manual-noefi-noacpi-aarch64",
"aarch64");
DO_TEST_CAPS_LATEST("firmware-manual-noefi-noacpi-q35");
+ DO_TEST_CAPS_ARCH_LATEST_PARSE_ERROR("firmware-auto-bios-acpi-aarch64",
"aarch64");
/* Ensure that legacy firmware paths keep working */
DO_TEST_CAPS_LATEST("firmware-manual-efi-secboot-legacy-paths");
--
2.43.0
