External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-01-09 14:35:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

gic: Remove VIR_GIC_VERSION_DEFAULT

Browse Source 
The QEMU default is GICv2, and some of the code in libvirt
relies on the exact value. Stop pretending that's not the
case and use GICv2 explicitly where needed.

Signed-off-by: Andrea Bolognani <abologna@redhat.com>
This commit is contained in:
Andrea Bolognani 2017-05-12 14:38:08 +02:00
parent bc07101a7c
commit 5645badd1f
3 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/qemu/qemu_command.c
View File

@ -7403,9 +7403,9 @@ qemuBuildMachineCommandLine(virCommandPtr cmd,
goto cleanup; goto cleanup;
} }
/* The default GIC version should not be specified on the /* The default GIC version (GICv2) should not be specified on
* QEMU commandline for backwards compatibility reasons */ * the QEMU commandline for backwards compatibility reasons */
if (def->gic_version != VIR_GIC_VERSION_DEFAULT) { if (def->gic_version != VIR_GIC_VERSION_2) {
if (!virQEMUCapsGet(qemuCaps, if (!virQEMUCapsGet(qemuCaps,
QEMU_CAPS_MACH_VIRT_GIC_VERSION)) { QEMU_CAPS_MACH_VIRT_GIC_VERSION)) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",

7
src/qemu/qemu_domain.c
View File

@ -2596,12 +2596,11 @@ qemuDomainDefEnableDefaultFeatures(virDomainDefPtr def,
def->features[VIR_DOMAIN_FEATURE_GIC] = VIR_TRISTATE_SWITCH_ON; def->features[VIR_DOMAIN_FEATURE_GIC] = VIR_TRISTATE_SWITCH_ON;
} }
/* Use the default GIC version if no version was specified */ /* Use the default GIC version (GICv2) if no version was specified */
if (def->features[VIR_DOMAIN_FEATURE_GIC] == VIR_TRISTATE_SWITCH_ON && if (def->features[VIR_DOMAIN_FEATURE_GIC] == VIR_TRISTATE_SWITCH_ON &&
def->gic_version == VIR_GIC_VERSION_NONE) { def->gic_version == VIR_GIC_VERSION_NONE) {
VIR_DEBUG("Using GIC version %s (default)", VIR_DEBUG("Using GIC version 2 (default)");
virGICVersionTypeToString(VIR_GIC_VERSION_DEFAULT)); def->gic_version = VIR_GIC_VERSION_2;
def->gic_version = VIR_GIC_VERSION_DEFAULT;
} }
} }

3
src/util/virgic.h
View File

@ -35,9 +35,6 @@ typedef enum {
VIR_ENUM_DECL(virGICVersion); VIR_ENUM_DECL(virGICVersion);
/* Consider GIC v2 the default */
# define VIR_GIC_VERSION_DEFAULT VIR_GIC_VERSION_2
typedef enum { typedef enum {
VIR_GIC_IMPLEMENTATION_NONE = 0, VIR_GIC_IMPLEMENTATION_NONE = 0,
VIR_GIC_IMPLEMENTATION_KERNEL = (1 << 1), VIR_GIC_IMPLEMENTATION_KERNEL = (1 << 1),