* src/xm_internal.c: If vcpu cpuset attribute is invalid

then display an error instead of silently ignoring it
	(Hiroyuki Kaguchi).
This commit is contained in:
Richard W.M. Jones 2008-06-03 08:01:45 +00:00
parent 4a9ebf7da7
commit eeb224b812
2 changed files with 14 additions and 13 deletions

View File

@ -1,3 +1,9 @@
Tue Jun 3 08:58:00 BST 2008 Richard W.M. Jones <rjones@redhat.com>
* src/xm_internal.c: If vcpu cpuset attribute is invalid
then display an error instead of silently ignoring it
(Hiroyuki Kaguchi).
Mon Jun 2 12:52:00 BST 2008 Richard W.M. Jones <rjones@redhat.com>
General tips for contributing patches

View File

@ -2004,20 +2004,15 @@ virConfPtr xenXMParseXMLToConfig(virConnectPtr conn, const char *xml) {
char *ranges;
ranges = virConvertCpuSet(conn, cpus, 0);
if (ranges != NULL) {
VIR_FREE(cpus);
if (xenXMConfigSetString(conf, "cpus", ranges) < 0) {
VIR_FREE(ranges);
goto error;
}
VIR_FREE(ranges);
} else {
if (xenXMConfigSetString(conf, "cpus", cpus) < 0) {
VIR_FREE(cpus);
goto error;
}
VIR_FREE(cpus);
VIR_FREE(cpus);
if (ranges == NULL) {
goto error;
}
if (xenXMConfigSetString(conf, "cpus", ranges) < 0) {
VIR_FREE(ranges);
goto error;
}
VIR_FREE(ranges);
}
obj = xmlXPathEval(BAD_CAST "string(/domain/os/type)", ctxt);