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

conf: Use a temporary int variable to store GIC version 

Since no value in the virGICVersion enumeration is negative, a clever
enough compiler can report an error such as

  src/conf/domain_conf.c:15337:75: error: comparison of unsigned enum
  expression < 0 is always false [-Werror,-Wtautological-compare]
    if ((def->gic_version = virGICVersionTypeFromString(tmp)) < 0 ||
        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ^ ~

virGICVersionTypeFromString() can, however, return a negative value if
the input string is not part of the enumeration, so we definitely need
that check.

Work around the problem by storing the return value in a temporary int
variable.
This commit is contained in:
Andrea Bolognani 2016-02-16 17:41:47 +01:00
parent 731ed05ce9
commit cda1cc170f
1 changed files with 4 additions and 3 deletions

7
src/conf/domain_conf.c
View File

@ -14728,7 +14728,7 @@ virDomainDefParseXML(xmlDocPtr xml,
xmlNodePtr *nodes = NULL, node = NULL; xmlNodePtr *nodes = NULL, node = NULL;
char *tmp = NULL; char *tmp = NULL;
size_t i, j; size_t i, j;
int n, virtType; int n, virtType, gic_version;
long id = -1; long id = -1;
virDomainDefPtr def; virDomainDefPtr def;
bool uuid_generated = false; bool uuid_generated = false;
@ -15334,12 +15334,13 @@ virDomainDefParseXML(xmlDocPtr xml,
node = ctxt->node; node = ctxt->node;
ctxt->node = nodes[i]; ctxt->node = nodes[i];
if ((tmp = virXPathString("string(./@version)", ctxt))) { if ((tmp = virXPathString("string(./@version)", ctxt))) {
if ((def->gic_version = virGICVersionTypeFromString(tmp)) < 0 || gic_version = virGICVersionTypeFromString(tmp);
def->gic_version == VIR_GIC_VERSION_NONE) { if (gic_version < 0 || gic_version == VIR_GIC_VERSION_NONE) {
virReportError(VIR_ERR_XML_ERROR, virReportError(VIR_ERR_XML_ERROR,
_("malformed gic version: %s"), tmp); _("malformed gic version: %s"), tmp);
goto error; goto error;
} }
def->gic_version = gic_version;
VIR_FREE(tmp); VIR_FREE(tmp);
} }
def->features[val] = VIR_TRISTATE_SWITCH_ON; def->features[val] = VIR_TRISTATE_SWITCH_ON;