External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-07-17 15:17:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

conf: Use virGICVersion enumeration in virDomainDef

Browse Source 
Instead of allowing any random positive number, restrict the possible
values to the ones that are part of the virGICVersion enumeration.
This commit is contained in:
Andrea Bolognani 2016-02-03 14:33:28 +01:00
parent 2a7b11eafb
commit 768b7ed2c8
4 changed files with 20 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/conf/domain_conf.c
View File

@ -15334,8 +15334,8 @@ virDomainDefParseXML(xmlDocPtr xml,
node = ctxt->node;
ctxt->node = nodes[i];
if ((tmp = virXPathString("string(./@version)", ctxt))) {
if (virStrToLong_uip(tmp, NULL, 10, &def->gic_version) < 0 ||
def->gic_version == 0) {
if ((def->gic_version = virGICVersionTypeFromString(tmp)) < 0 ||
def->gic_version == VIR_GIC_VERSION_NONE) {
virReportError(VIR_ERR_XML_ERROR,
_("malformed gic version: %s"), tmp);
goto error;
@ -17413,8 +17413,9 @@ virDomainDefFeaturesCheckABIStability(virDomainDefPtr src,
/* GIC version */
if (src->gic_version != dst->gic_version) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
_("Source GIC version '%u' does not match destination '%u'"),
src->gic_version, dst->gic_version);
_("Source GIC version '%s' does not match destination '%s'"),
virGICVersionTypeToString(src->gic_version),
virGICVersionTypeToString(dst->gic_version));
return false;
}
@ -22173,9 +22174,9 @@ virDomainDefFormatInternal(virDomainDefPtr def,
case VIR_DOMAIN_FEATURE_GIC:
if (def->features[i] == VIR_TRISTATE_SWITCH_ON) {
virBufferAddLit(buf, "<gic");
if (def->gic_version)
virBufferAsprintf(buf, " version='%u'",
def->gic_version);
if (def->gic_version != VIR_GIC_VERSION_NONE)
virBufferAsprintf(buf, " version='%s'",
virGICVersionTypeToString(def->gic_version));
virBufferAddLit(buf, "/>\n");
}
break;

3
src/conf/domain_conf.h
View File

@ -50,6 +50,7 @@
# include "virstoragefile.h"
# include "virseclabel.h"
# include "virprocess.h"
# include "virgic.h"
/* forward declarations of all device types, required by
* virDomainDeviceDef
@ -2232,7 +2233,7 @@ struct _virDomainDef {
int hyperv_features[VIR_DOMAIN_HYPERV_LAST];
int kvm_features[VIR_DOMAIN_KVM_LAST];
unsigned int hyperv_spinlocks;
unsigned int gic_version;
virGICVersion gic_version;
/* These options are of type virTristateSwitch: ON = keep, OFF = drop */
int caps_features[VIR_DOMAIN_CAPS_FEATURE_LAST];

5
src/libvirt_private.syms
View File

@ -1512,6 +1512,11 @@ virFirewallStartRollback;
virFirewallStartTransaction;
# util/virgic.h
virGICVersionTypeFromString;
virGICVersionTypeToString;
# util/virhash.h
virHashAddEntry;
virHashAtomicNew;

8
src/qemu/qemu_command.c
View File

@ -55,6 +55,7 @@
#include "virtpm.h"
#include "virscsi.h"
#include "virnuma.h"
#include "virgic.h"
#if defined(__linux__)
# include <linux/capability.h>
#endif
@ -7774,7 +7775,7 @@ qemuBuildMachineArgStr(virCommandPtr cmd,
}
if (def->features[VIR_DOMAIN_FEATURE_GIC] == VIR_TRISTATE_SWITCH_ON) {
if (def->gic_version) {
if (def->gic_version != VIR_GIC_VERSION_NONE) {
if ((def->os.arch != VIR_ARCH_ARMV7L &&
def->os.arch != VIR_ARCH_AARCH64) ||
(STRNEQ(def->os.machine, "virt") &&
@ -7789,7 +7790,7 @@ qemuBuildMachineArgStr(virCommandPtr cmd,
/* 2 is the default, so we don't put it as option for
* backwards compatibility
*/
if (def->gic_version != 2) {
if (def->gic_version != VIR_GIC_VERSION_2) {
if (!virQEMUCapsGet(qemuCaps,
QEMU_CAPS_MACH_VIRT_GIC_VERSION)) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
@ -7799,7 +7800,8 @@ qemuBuildMachineArgStr(virCommandPtr cmd,
return -1;
}
virBufferAsprintf(&buf, ",gic-version=%d", def->gic_version);
virBufferAsprintf(&buf, ",gic-version=%s",
virGICVersionTypeToString(def->gic_version));
}
}
}