HVM vcpu add/remove: parse vcpu_avail to Qemu

Signed-off-by: Liu, Jinsong <jinsong.liu@intel.com>
Disable qemu cmdline option until our qemu supports it.

Signed-off-by: Keir Fraser <keir.fraser@citrix.com>

diff --git a/tools/python/xen/xend/XendDomainInfo.py b/tools/python/xen/xend/XendDomainInfo.py
index d6e7f69f61d31a3d5a66023fc6064262cc9f4c48..3e49951034bfee23bbcede5ca94fb668acc42115 100644 (file)
--- a/tools/python/xen/xend/XendDomainInfo.py
+++ b/tools/python/xen/xend/XendDomainInfo.py
@@ -1903,6 +1903,9 @@ class XendDomainInfo:
     def getVCpuCount(self):
         return self.info['VCPUs_max']
 
+    def getVCpuAvail(self):
+        return self.info['vcpu_avail']
+
     def setVCpuCount(self, vcpus):
         def vcpus_valid(n):
             if vcpus <= 0:

diff --git a/tools/python/xen/xend/image.py b/tools/python/xen/xend/image.py
index ee2e03375c5b68db757864a53b6b6a6fa350d444..45d7a0815ac2d795c5b33ce45b26f4be2f4d37cc 100644 (file)
--- a/tools/python/xen/xend/image.py
+++ b/tools/python/xen/xend/image.py
@@ -827,6 +827,7 @@ class HVMImageHandler(ImageHandler):
     def parseDeviceModelArgs(self, vmConfig):
         ret = ImageHandler.parseDeviceModelArgs(self, vmConfig)
         ret = ret + ['-vcpus', str(self.vm.getVCpuCount())]
+#        ret = ret + ['-vcpu_avail', str(self.vm.getVCpuAvail())]
 
         if self.kernel:
             log.debug("kernel         = %s", self.kernel)