diff options
| author | Keir Fraser <keir.fraser@citrix.com> | 2010-03-20 07:35:04 +0000 |
|---|---|---|
| committer | Keir Fraser <keir.fraser@citrix.com> | 2010-03-20 07:35:04 +0000 |
| commit | 978f36d60a68c0ea939920d1bdc8bed9910045d4 (patch) | |
| tree | d23afb87fcb0036f26aaf226bfe9c6d7bc1c8fca | |
| parent | 9d35e7f37442e143f2dbe8a6f2fe54365559280f (diff) | |
| download | xen-978f36d60a68c0ea939920d1bdc8bed9910045d4.tar.gz xen-978f36d60a68c0ea939920d1bdc8bed9910045d4.tar.bz2 xen-978f36d60a68c0ea939920d1bdc8bed9910045d4.zip | |
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>
| -rw-r--r-- | Config.mk | 7 | ||||
| -rw-r--r-- | tools/python/xen/xend/image.py | 2 |
2 files changed, 4 insertions, 5 deletions
@@ -153,10 +153,9 @@ QEMU_REMOTE=http://xenbits.xensource.com/git-http/qemu-xen-unstable.git # CONFIG_QEMU ?= ../qemu-xen.git CONFIG_QEMU ?= $(QEMU_REMOTE) -QEMU_TAG := xen-4.0.0-rc6 -#QEMU_TAG ?= e5d14857cd67490bf956d97c8888c0be95ed3f78 -# Thu Feb 18 15:36:29 2010 +0000 -# When xen_platform_pci=0 also disable fixed Xen platform ioports +QEMU_TAG ?= 435718fb726b80462b4028128301dcf92214cc6a +# Thu Mar 18 16:48:03 2010 +0000 +# Fix const-correctness in dma bitmap hex parser OCAML_XENSTORED_REPO=http://xenbits.xensource.com/ext/xen-ocaml-tools.hg diff --git a/tools/python/xen/xend/image.py b/tools/python/xen/xend/image.py index f3b2cc544b..7f99a699df 100644 --- a/tools/python/xen/xend/image.py +++ b/tools/python/xen/xend/image.py @@ -838,7 +838,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())] + ret = ret + ['-vcpu_avail', hex(self.vm.getVCpuAvail())] if self.kernel: log.debug("kernel = %s", self.kernel) |