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: Accept int in qemuFirmwareOSInterfaceTypeFromOsDefFirmware()

Browse Source 
The point of this function is to translate virDomainOsDefFirmware
enum to qemuFirmwareOSInterface enum. However, with my commit
v5.10.0-507-g8e1804f9f6 we are passing a variable type of
virDomainLoader enum. Make the function accept both enums and
make the enum members correspond to each other.

This fixes clang build.

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
This commit is contained in:
Michal Privoznik 2020-01-08 09:42:47 +01:00
parent 54ba7da585
commit 8fcee47807
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/conf/domain_conf.h
View File

@ -1928,12 +1928,14 @@ struct _virDomainOSEnv {
typedef enum { typedef enum {
VIR_DOMAIN_OS_DEF_FIRMWARE_NONE = 0, VIR_DOMAIN_OS_DEF_FIRMWARE_NONE = 0,
VIR_DOMAIN_OS_DEF_FIRMWARE_BIOS, VIR_DOMAIN_OS_DEF_FIRMWARE_BIOS = VIR_DOMAIN_LOADER_TYPE_ROM,
VIR_DOMAIN_OS_DEF_FIRMWARE_EFI, VIR_DOMAIN_OS_DEF_FIRMWARE_EFI = VIR_DOMAIN_LOADER_TYPE_PFLASH,
VIR_DOMAIN_OS_DEF_FIRMWARE_LAST VIR_DOMAIN_OS_DEF_FIRMWARE_LAST
} virDomainOsDefFirmware; } virDomainOsDefFirmware;
G_STATIC_ASSERT((int)VIR_DOMAIN_OS_DEF_FIRMWARE_LAST == (int)VIR_DOMAIN_LOADER_TYPE_LAST);
VIR_ENUM_DECL(virDomainOsDefFirmware); VIR_ENUM_DECL(virDomainOsDefFirmware);
struct _virDomainOSDef { struct _virDomainOSDef {

2
src/qemu/qemu_firmware.c
View File

@ -929,7 +929,7 @@ qemuFirmwareMatchesMachineArch(const qemuFirmware *fw,
static qemuFirmwareOSInterface static qemuFirmwareOSInterface
qemuFirmwareOSInterfaceTypeFromOsDefFirmware(virDomainOsDefFirmware fw) qemuFirmwareOSInterfaceTypeFromOsDefFirmware(int fw)
{ {
switch (fw) { switch (fw) {
case VIR_DOMAIN_OS_DEF_FIRMWARE_BIOS: case VIR_DOMAIN_OS_DEF_FIRMWARE_BIOS: