openkylin
/
libvirt
mirror of https://gitee.com/openkylin/libvirt.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

gic: Introduce VIR_GIC_VERSION_DEFAULT alias 

GIC v2 is the default, but checking against that specific version when
we want to know whether the default has been selected is potentially
error prone; using an alias instead makes it safer.
This commit is contained in:
Andrea Bolognani 2016-02-18 16:13:42 +01:00
parent ff0e2ebde2
commit d8fc7e05f8
3 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/qemu/qemu_command.c
View File

@ -5306,10 +5306,9 @@ qemuBuildMachineCommandLine(virCommandPtr cmd,
return -1;
}
/* 2 is the default, so we don't put it as option for
* backwards compatibility
*/
if (def->gic_version != VIR_GIC_VERSION_2) {
/* The default GIC version should not be specified on the
* QEMU commandline for backwards compatibility reasons */
if (def->gic_version != VIR_GIC_VERSION_DEFAULT) {
if (!virQEMUCapsGet(qemuCaps,
QEMU_CAPS_MACH_VIRT_GIC_VERSION)) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",

4
src/qemu/qemu_domain.c
View File

@ -1264,10 +1264,10 @@ qemuDomainDefEnableDefaultFeatures(virDomainDefPtr def)
break;
}
/* Default to GIC v2 if no version was specified */
/* Use the default GIC version if no version was specified */
if (def->features[VIR_DOMAIN_FEATURE_GIC] == VIR_TRISTATE_SWITCH_ON &&
def->gic_version == VIR_GIC_VERSION_NONE)
def->gic_version = VIR_GIC_VERSION_2;
def->gic_version = VIR_GIC_VERSION_DEFAULT;
}

3
src/util/virgic.h
View File

@ -35,4 +35,7 @@ typedef enum {
VIR_ENUM_DECL(virGICVersion);
/* Consider GIC v2 the default */
# define VIR_GIC_VERSION_DEFAULT VIR_GIC_VERSION_2
#endif /* __VIR_GIC_H__ */