External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-12-22 13:45:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

conf: Fix virtType check

Browse Source 
Commit id '7383b8cc' changed virDomainDef 'virtType' to an enum, that
caused a build failure on some archs due to comparing an unsigned value
to < 0.  Adjust the fetch of 'type' to be into temporary 'int virtType'
and then assign that virtType to the def->virtType
This commit is contained in:
John Ferlan 2015-09-25 17:33:05 -04:00
parent 7383b8cc06
commit 5e06a4f063
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/conf/domain_conf.c
View File

@ -14640,7 +14640,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; int n, virtType;
long id = -1; long id = -1;
virDomainDefPtr def; virDomainDefPtr def;
bool uuid_generated = false; bool uuid_generated = false;
@ -14678,11 +14678,12 @@ virDomainDefParseXML(xmlDocPtr xml,
goto error; goto error;
} }
if ((def->virtType = virDomainVirtTypeFromString(tmp)) < 0) { if ((virtType = virDomainVirtTypeFromString(tmp)) < 0) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
_("invalid domain type %s"), tmp); _("invalid domain type %s"), tmp);
goto error; goto error;
} }
def->virtType = virtType;
VIR_FREE(tmp); VIR_FREE(tmp);
def->os.bootloader = virXPathString("string(./bootloader)", ctxt); def->os.bootloader = virXPathString("string(./bootloader)", ctxt);