From: Hu Tao <hutao@cn.fujitsu.com>
Date: Thu, 23 Aug 2012 02:31:12 +0000 (+0800)
Subject: fix check of vcpuid in virDomainVcpuPinDefParseXML
X-Git-Tag: v0.10.0-rc2~22
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e9b354e2a95960ba710076054a5a62b77a0be564;p=thirdparty%2Flibvirt.git

fix check of vcpuid in virDomainVcpuPinDefParseXML

For emulator, the vcpuid field is always set to -1, instead of parsing
XML for the value of it.
---

diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index 724220576a..419088cbcd 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -7923,7 +7923,7 @@ virDomainVcpuPinDefParseXML(const xmlNodePtr node,
 {
     virDomainVcpuPinDefPtr def;
     xmlNodePtr oldnode = ctxt->node;
-    int vcpuid;
+    int vcpuid = -1;
     char *tmp = NULL;
     int ret;
 
@@ -7934,15 +7934,17 @@ virDomainVcpuPinDefParseXML(const xmlNodePtr node,
 
     ctxt->node = node;
 
-    ret = virXPathInt("string(./@vcpu)", ctxt, &vcpuid);
-    if ((ret == -2) || (vcpuid < -1)) {
-        virReportError(VIR_ERR_INTERNAL_ERROR,
-                       "%s", _("vcpu id must be an unsigned integer or -1"));
-        goto error;
-    } else if ((vcpuid == -1) && (emulator == 0)) {
-        virReportError(VIR_ERR_INTERNAL_ERROR,
-                       "%s", _("vcpu id value -1 is not allowed for vcpupin"));
-        goto error;
+    if (emulator == 0) {
+        ret = virXPathInt("string(./@vcpu)", ctxt, &vcpuid);
+        if ((ret == -2) || (vcpuid < -1)) {
+            virReportError(VIR_ERR_INTERNAL_ERROR,
+                           "%s", _("vcpu id must be an unsigned integer or -1"));
+            goto error;
+        } else if (vcpuid == -1) {
+            virReportError(VIR_ERR_INTERNAL_ERROR,
+                           "%s", _("vcpu id value -1 is not allowed for vcpupin"));
+            goto error;
+        }
     }
 
     if (vcpuid >= maxvcpus) {