Thu Feb 22 10:37:08 IST 2007 Mark McLoughlin <markmc@redhat.com>

* qemud/conf.c: fix another xml property leak.
This commit is contained in:
Mark McLoughlin 2007-02-22 10:39:38 +00:00
parent 5687da2c7a
commit 68f1003652
3 changed files with 8 additions and 11 deletions

View File

@ -1,3 +1,7 @@
Thu Feb 22 10:37:08 IST 2007 Mark McLoughlin <markmc@redhat.com>
* qemud/conf.c: fix another xml property leak.
Tue Feb 20 19:08:58 IST 2007 Mark McLoughlin <markmc@redhat.com>
* qemud/conf.c: use strerror(errno) in some error messages

View File

@ -328,11 +328,6 @@ int virConnectListDefinedDomains (virConnectPtr conn,
int maxnames);
int virDomainCreate (virDomainPtr domain);
int virDomainGetAutostart (virDomainPtr domain,
int *autostart);
int virDomainSetAutostart (virDomainPtr domain,
int autostart);
/**
* virVcpuInfo: structure for information about a virtual CPU in a domain.
*/
@ -533,11 +528,6 @@ char * virNetworkGetXMLDesc (virNetworkPtr network,
int flags);
char * virNetworkGetBridgeName (virNetworkPtr network);
int virNetworkGetAutostart (virNetworkPtr network,
int *autostart);
int virNetworkSetAutostart (virNetworkPtr network,
int autostart);
#ifdef __cplusplus
}
#endif

View File

@ -751,7 +751,8 @@ static struct qemud_vm_def *qemudParseXML(struct qemud_server *server,
if ((obj != NULL) && (obj->type == XPATH_NODESET) &&
(obj->nodesetval != NULL) && (obj->nodesetval->nodeNr >= 0)) {
for (i = 0; i < obj->nodesetval->nodeNr && i < QEMUD_MAX_BOOT_DEVS ; i++) {
prop = xmlGetProp(obj->nodesetval->nodeTab[i], BAD_CAST "dev");
if (!(prop = xmlGetProp(obj->nodesetval->nodeTab[i], BAD_CAST "dev")))
continue;
if (!strcmp((char *)prop, "hd")) {
def->os.bootDevs[def->os.nBootDevs++] = QEMUD_BOOT_DISK;
} else if (!strcmp((char *)prop, "fd")) {
@ -761,8 +762,10 @@ static struct qemud_vm_def *qemudParseXML(struct qemud_server *server,
} else if (!strcmp((char *)prop, "net")) {
def->os.bootDevs[def->os.nBootDevs++] = QEMUD_BOOT_NET;
} else {
xmlFree(prop);
goto error;
}
xmlFree(prop);
}
}
xmlXPathFreeObject(obj);