External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-10-30 18:03:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

qemu_firmware: Introduce @want variable to qemuFirmwareMatchDomain()

Browse Source 
This simplifies condition when matching FW interface by having a
single line condition instead of multiline one. Also, it prepares
the code for future expansion.

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
This commit is contained in:
Michal Privoznik 2020-01-07 10:10:02 +01:00
parent 50d7465f3d
commit 57f9067ca3
1 changed files with 21 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/qemu/qemu_firmware.c
View File

@ -928,22 +928,39 @@ qemuFirmwareMatchesMachineArch(const qemuFirmware *fw,
} }
static qemuFirmwareOSInterface
qemuFirmwareOSInterfaceTypeFromOsDefFirmware(virDomainOsDefFirmware fw)
{
switch (fw) {
case VIR_DOMAIN_OS_DEF_FIRMWARE_BIOS:
return QEMU_FIRMWARE_OS_INTERFACE_BIOS;
case VIR_DOMAIN_OS_DEF_FIRMWARE_EFI:
return QEMU_FIRMWARE_OS_INTERFACE_UEFI;
case VIR_DOMAIN_OS_DEF_FIRMWARE_NONE:
case VIR_DOMAIN_OS_DEF_FIRMWARE_LAST:
break;
}
return QEMU_FIRMWARE_OS_INTERFACE_NONE;
}
static bool static bool
qemuFirmwareMatchDomain(const virDomainDef *def, qemuFirmwareMatchDomain(const virDomainDef *def,
const qemuFirmware *fw, const qemuFirmware *fw,
const char *path) const char *path)
{ {
size_t i; size_t i;
qemuFirmwareOSInterface want;
bool supportsS3 = false; bool supportsS3 = false;
bool supportsS4 = false; bool supportsS4 = false;
bool requiresSMM = false; bool requiresSMM = false;
bool supportsSEV = false; bool supportsSEV = false;
want = qemuFirmwareOSInterfaceTypeFromOsDefFirmware(def->os.firmware);
for (i = 0; i < fw->ninterfaces; i++) { for (i = 0; i < fw->ninterfaces; i++) {
if ((def->os.firmware == VIR_DOMAIN_OS_DEF_FIRMWARE_BIOS && if (fw->interfaces[i] == want)
fw->interfaces[i] == QEMU_FIRMWARE_OS_INTERFACE_BIOS) ||
(def->os.firmware == VIR_DOMAIN_OS_DEF_FIRMWARE_EFI &&
fw->interfaces[i] == QEMU_FIRMWARE_OS_INTERFACE_UEFI))
break; break;
} }