Mailing List Archive

# HG changeset patch
# User Keir Fraser <keir.fraser@citrix.com>
# Date 1269070504 0
# Node ID c5e1a0b720ba8e73953841aa883f48d061a216bd
# Parent 7b63f677f245ff42c7b9218875b54ca812c4c75e
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>
---
Config.mk | 7 +++----
tools/python/xen/xend/image.py | 2 +-
2 files changed, 4 insertions(+), 5 deletions(-)

diff -r 7b63f677f245 -r c5e1a0b720ba Config.mk
--- a/Config.mk Thu Mar 18 11:03:07 2010 +0000
+++ b/Config.mk Sat Mar 20 07:35:04 2010 +0000
@@ -153,10 +153,9 @@ QEMU_REMOTE=http://xenbits.xensource.com
# 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 -r 7b63f677f245 -r c5e1a0b720ba tools/python/xen/xend/image.py
--- a/tools/python/xen/xend/image.py Thu Mar 18 11:03:07 2010 +0000
+++ b/tools/python/xen/xend/image.py Sat Mar 20 07:35:04 2010 +0000
@@ -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)

_______________________________________________
Xen-changelog mailing list
Xen-changelog@lists.xensource.com
http://lists.xensource.com/xen-changelog