NuKVM/libvirt
3
0
Fork 0
mirror of https://github.com/libvirt/libvirt.git synced 2025-02-25 18:55:26 -06:00
Code Issues Packages Projects Releases Wiki Activity

conf: Reject features when using manual firmware selection

Browse Source 
Signed-off-by: Andrea Bolognani <abologna@redhat.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
This commit is contained in:
Andrea Bolognani 2022-06-20 17:44:31 +02:00
parent c4b8124e45
commit 73c5ae55c7
4 changed files with 30 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/conf/domain_validate.c
View File

@ -1655,6 +1655,13 @@ virDomainDefOSValidate(const virDomainDef *def,
return -1; return -1;
} }
} else { } else {
if (def->os.firmwareFeatures) {
virReportError(VIR_ERR_XML_DETAIL, "%s",
_("cannot use feature-based firmware autoselection "
"when firmware autoselection is disabled"));
return -1;
}
if (!loader) if (!loader)
return 0; return 0;

1
tests/qemuxml2argvdata/firmware-manual-efi-features.x86_64-latest.err Normal file
View File

@ -0,0 +1 @@
cannot use feature-based firmware autoselection when firmware autoselection is disabled

21
tests/qemuxml2argvdata/firmware-manual-efi-features.xml Normal file
View File

@ -0,0 +1,21 @@
<domain type='qemu'>
<name>test</name>
<uuid>362d1fc1-df7d-193e-5c18-49a71bd1da66</uuid>
<memory unit='KiB'>1048576</memory>
<vcpu placement='static'>1</vcpu>
<os>
<type arch='x86_64' machine='pc'>hvm</type>
<loader readonly='yes' type='pflash'>/usr/share/OVMF/OVMF_CODE.fd</loader>
<firmware>
<feature enabled='no' name='enrolled-keys'/>
</firmware>
</os>
<features>
<acpi/>
</features>
<devices>
<emulator>/usr/bin/qemu-system-x86_64</emulator>
<controller type='usb' model='none'/>
<memballoon model='none'/>
</devices>
</domain>

1
tests/qemuxml2argvtest.c
View File

@ -1192,6 +1192,7 @@ mymain(void)
QEMU_CAPS_DEVICE_ISA_SERIAL); QEMU_CAPS_DEVICE_ISA_SERIAL);
DO_TEST_NOCAPS("firmware-manual-efi"); DO_TEST_NOCAPS("firmware-manual-efi");
DO_TEST_PARSE_ERROR_NOCAPS("firmware-manual-efi-no-path"); DO_TEST_PARSE_ERROR_NOCAPS("firmware-manual-efi-no-path");
DO_TEST_CAPS_LATEST_PARSE_ERROR("firmware-manual-efi-features");
DO_TEST_CAPS_LATEST("firmware-manual-bios-rw"); DO_TEST_CAPS_LATEST("firmware-manual-bios-rw");
DO_TEST_CAPS_LATEST("firmware-manual-bios-rw-implicit"); DO_TEST_CAPS_LATEST("firmware-manual-bios-rw-implicit");
DO_TEST("firmware-manual-efi-secure", DO_TEST("firmware-manual-efi-secure",