From mboxrd@z Thu Jan 1 00:00:00 1970 From: Xiaofeng Ling Subject: Re: [PATCH] fix the control panel problem for latest tree Date: Tue, 20 Sep 2005 12:53:54 +0800 Message-ID: <432F95E2.9060505@intel.com> References: <3ACA40606221794F80A5670F0AF15F84098454E1@pdsmsx403> <3d8eece205091611511f17b6e1@mail.gmail.com> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="------------080103060608000806050104" Return-path: In-Reply-To: <3d8eece205091611511f17b6e1@mail.gmail.com> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xensource.com Errors-To: xen-devel-bounces@lists.xensource.com To: Christian.Limpach@cl.cam.ac.uk Cc: xen-devel List-Id: xen-devel@lists.xenproject.org This is a multi-part message in MIME format. --------------080103060608000806050104 Content-Type: text/plain; charset=us-ascii; format=flowed Content-Transfer-Encoding: 7bit Attach is patch to fix the problem when using vnc instead of SDL. Because new image handling structure move configurtion to image handle creating, at that time, the domain struct is not created yet, so vnc code can not get domid. In this patch, I split the image configuration into two parts. maybe not so ideal, but just simple. Christian Limpach wrote: > Thanks! > > On 9/16/05, Ling, Xiaofeng wrote: > >>The new image handling structure break the vmx guest loading, this patch >>fix it. >> >>Signed-off-by: Xiaofeng Ling >> >>diff -r fe916b4a7d74 -r 089ec1b6817c tools/python/xen/xend/image.py >>--- a/tools/python/xen/xend/image.py Fri Sep 16 02:53:39 2005 >>+++ b/tools/python/xen/xend/image.py Fri Sep 16 06:30:21 2005 >>@@ -271,9 +271,10 @@ >> def configure(self, config): >> ImageHandler.configure(self, config) >> if not config: >>- self.memmap, self.dmargs, self.device_model, self.display = self.vm.gatherVm( >>+ self.memmap, dmargs, self.device_model, self.display = self.vm.gatherVm( >> ("image/memmap"), ("image/dmargs"), ("image/device-model"), >> ("image/display")) >>+ self.dmargs = dmargs.split(' ') >> return >> >> self.memmap = sxp.child_value(config, 'memmap') >>@@ -283,10 +284,10 @@ >> raise VmError("vmx: missing device model") >> self.display = sxp.child_value(config, 'display') >> >>- self.storeVm(("image/memmap", self.memmap), >>- ("image/dmargs", self.dmargs), >>- ("image/device-model", self.device_model), >>- ("image/display", self.display)) >>+ self.vm.storeVm(("image/memmap", self.memmap), >>+ ("image/dmargs", " ".join(self.dmargs)), >>+ ("image/device-model", self.device_model), >>+ ("image/display", self.display)) >> >> def createImage(self): >> """Create a VM for the VMX environment. >>@@ -346,7 +347,7 @@ >> ret.append("%s" % v) >> >> # Handle disk/network related options >>- devices = sxp.children(config, 'device') >>+ devices = sxp.children(self.vm.config, 'device') >> for device in devices: >> name = sxp.name(sxp.child0(device)) >> if name == 'vbd': >> >> >>_______________________________________________ >>Xen-devel mailing list >>Xen-devel@lists.xensource.com >>http://lists.xensource.com/xen-devel >> >> >> >> > > > _______________________________________________ > Xen-devel mailing list > Xen-devel@lists.xensource.com > http://lists.xensource.com/xen-devel --------------080103060608000806050104 Content-Type: text/x-patch; name="vncconfig.patch" Content-Transfer-Encoding: 7bit Content-Disposition: inline; filename="vncconfig.patch" # HG changeset patch # User Xiaofeng Ling # Node ID e8d938a4dcc90108739635489b01c99a33305045 # Parent 53cbced17c98f009c8cf534358979d9115b8657d fix vnc configuration issue for creating vmx guest Signed-off-by: Xiaofeng Ling diff -r 53cbced17c98 -r e8d938a4dcc9 tools/python/xen/xend/image.py --- a/tools/python/xen/xend/image.py Fri Sep 16 06:41:40 2005 +++ b/tools/python/xen/xend/image.py Mon Sep 19 02:35:32 2005 @@ -294,6 +294,7 @@ """ self.parseMemmap() self.createDomain() + self.dmargs += self.configVNC(sxp.child_value(self.vm.config, 'image')) def buildDomain(self): # Create an event channel @@ -377,10 +378,13 @@ instance = sxp.child_value(vtpminfo, 'instance') ret.append("-instance") ret.append("%s" % instance) - + return ret + + def configVNC(self, config): # Handle graphics library related options vnc = sxp.child_value(config, 'vnc') sdl = sxp.child_value(config, 'sdl') + ret = [] nographic = sxp.child_value(config, 'nographic') if nographic: ret.append('-nographic') --------------080103060608000806050104 Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Xen-devel mailing list Xen-devel@lists.xensource.com http://lists.xensource.com/xen-devel --------------080103060608000806050104--