External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-01-10 23:07:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

conf: Split out parsing of emulatorpin

Browse Source 
Split up parts of virDomainVcpuPinDefParseXML into
virDomainEmulatorPinDefParseXML.
This commit is contained in:
Peter Krempa 2015-04-07 17:13:07 +02:00
parent d56707766e
commit 06c03b48bd
1 changed files with 37 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
src/conf/domain_conf.c
View File

@ -13191,7 +13191,6 @@ static virDomainPinDefPtr
virDomainVcpuPinDefParseXML(xmlNodePtr node,
xmlXPathContextPtr ctxt,
int maxvcpus,
bool emulator,
bool iothreads)
{
virDomainPinDefPtr def;
@ -13206,7 +13205,7 @@ virDomainVcpuPinDefParseXML(xmlNodePtr node,
ctxt->node = node;
if (!emulator && !iothreads) {
if (!iothreads) {
ret = virXPathInt("string(./@vcpu)", ctxt, &vcpuid);
if ((ret == -2) || (vcpuid < -1)) {
virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
@ -13255,10 +13254,7 @@ virDomainVcpuPinDefParseXML(xmlNodePtr node,
}
if (!(tmp = virXMLPropString(node, "cpuset"))) {
if (emulator)
virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
_("missing cpuset for emulatorpin"));
else if (iothreads)
if (iothreads)
virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
_("missing cpuset for iothreadpin"));
else
@ -13289,6 +13285,38 @@ virDomainVcpuPinDefParseXML(xmlNodePtr node,
}
/* Parse the XML definition for emulatorpin.
* emulatorpin has the form of
* <emulatorpin cpuset='0'/>
*/
static virDomainPinDefPtr
virDomainEmulatorPinDefParseXML(xmlNodePtr node)
{
virDomainPinDefPtr def;
char *tmp = NULL;
if (VIR_ALLOC(def) < 0)
return NULL;
if (!(tmp = virXMLPropString(node, "cpuset"))) {
virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
_("missing cpuset for emulatorpin"));
goto error;
}
if (virBitmapParse(tmp, 0, &def->cpumask, VIR_DOMAIN_CPUMASK_LEN) < 0)
goto error;
VIR_FREE(tmp);
return def;
error:
VIR_FREE(tmp);
VIR_FREE(def);
return NULL;
}
int
virDomainDefMaybeAddController(virDomainDefPtr def,
int type,
@ -13983,7 +14011,7 @@ virDomainDefParseXML(xmlDocPtr xml,
for (i = 0; i < n; i++) {
virDomainPinDefPtr vcpupin = NULL;
vcpupin = virDomainVcpuPinDefParseXML(nodes[i], ctxt,
def->maxvcpus, false, false);
def->maxvcpus, false);
if (!vcpupin)
goto error;
@ -14053,11 +14081,7 @@ virDomainDefParseXML(xmlDocPtr xml,
goto error;
}
def->cputune.emulatorpin = virDomainVcpuPinDefParseXML(nodes[0],
ctxt, 0,
true, false);
if (!def->cputune.emulatorpin)
if (!(def->cputune.emulatorpin = virDomainEmulatorPinDefParseXML(nodes[0])))
goto error;
}
VIR_FREE(nodes);
@ -14076,7 +14100,7 @@ virDomainDefParseXML(xmlDocPtr xml,
virDomainPinDefPtr iothreadpin = NULL;
iothreadpin = virDomainVcpuPinDefParseXML(nodes[i], ctxt,
def->iothreads,
false, true);
true);
if (!iothreadpin)
goto error;