debuggers.hg

changeset 21093:c5e1a0b720ba

Fix vcpu hotplug bug: transfer vcpu_avail hex string to qemu

Currently qemu has a bug: When maxvcpus > 64, qemu will get wrong
vcpu bitmap (s->cpus_sts[i]) since it only get bitmap from a long
variable.

This patch, cooperate with another qemu patch, is to fix this bug.
This patch transfer a vcpu_avail string in a hex string format, so
that at qemu side it's more easier to get vcpu bitmap from hex string,
especially when many vcpus, like more than 64.

(Also update QEMU_TAG for matching qemu-side update)

Signed-off-by: Liu, Jinsong <jinsong.liu@intel.com>
author Keir Fraser <keir.fraser@citrix.com>
date Sat Mar 20 07:35:04 2010 +0000 (2010-03-20)
parents 7b63f677f245
children 81d9132ce00d
files Config.mk tools/python/xen/xend/image.py
line diff
     1.1 --- a/Config.mk	Thu Mar 18 11:03:07 2010 +0000
     1.2 +++ b/Config.mk	Sat Mar 20 07:35:04 2010 +0000
     1.3 @@ -153,10 +153,9 @@ QEMU_REMOTE=http://xenbits.xensource.com
     1.4  # CONFIG_QEMU ?= ../qemu-xen.git
     1.5  CONFIG_QEMU ?= $(QEMU_REMOTE)
     1.6  
     1.7 -QEMU_TAG := xen-4.0.0-rc6
     1.8 -#QEMU_TAG ?= e5d14857cd67490bf956d97c8888c0be95ed3f78
     1.9 -# Thu Feb 18 15:36:29 2010 +0000
    1.10 -# When xen_platform_pci=0 also disable fixed Xen platform ioports
    1.11 +QEMU_TAG ?= 435718fb726b80462b4028128301dcf92214cc6a
    1.12 +# Thu Mar 18 16:48:03 2010 +0000
    1.13 +# Fix const-correctness in dma bitmap hex parser
    1.14  
    1.15  OCAML_XENSTORED_REPO=http://xenbits.xensource.com/ext/xen-ocaml-tools.hg
    1.16  
     2.1 --- a/tools/python/xen/xend/image.py	Thu Mar 18 11:03:07 2010 +0000
     2.2 +++ b/tools/python/xen/xend/image.py	Sat Mar 20 07:35:04 2010 +0000
     2.3 @@ -838,7 +838,7 @@ class HVMImageHandler(ImageHandler):
     2.4      def parseDeviceModelArgs(self, vmConfig):
     2.5          ret = ImageHandler.parseDeviceModelArgs(self, vmConfig)
     2.6          ret = ret + ['-vcpus', str(self.vm.getVCpuCount())]
     2.7 -        ret = ret + ['-vcpu_avail', str(self.vm.getVCpuAvail())]
     2.8 +        ret = ret + ['-vcpu_avail', hex(self.vm.getVCpuAvail())]
     2.9  
    2.10          if self.kernel:
    2.11              log.debug("kernel         = %s", self.kernel)