* [PATCH] fix the control panel problem for latest tree
@ 2005-09-16 9:47 Ling, Xiaofeng
2005-09-16 18:51 ` Christian Limpach
0 siblings, 1 reply; 4+ messages in thread
From: Ling, Xiaofeng @ 2005-09-16 9:47 UTC (permalink / raw)
To: xen-devel
[-- Attachment #1: Type: text/plain, Size: 1940 bytes --]
The new image handling structure break the vmx guest loading, this patch
fix it.
Signed-off-by: Xiaofeng Ling <xiaofeng.ling@intel.com>
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':
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: vmxcp-fix.patch --]
[-- Type: text/x-patch; name="vmxcp-fix.patch", Size: 2103 bytes --]
# HG changeset patch
# User Xiaofeng Ling <xiaofeng.ling@intel.com>
# Node ID 089ec1b6817cb9f2bff25093b4f88fc2af2efe1b
# Parent fe916b4a7d74a7564cc6397b4302a4457c5dbdd8
The new image handling struct break the vmx guest, this patch
fix it.
Signed-off-by: Xiaofeng Ling <xiaofeng.ling@intel.com>
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':
[-- Attachment #3: Type: text/plain, Size: 138 bytes --]
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xensource.com
http://lists.xensource.com/xen-devel
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] fix the control panel problem for latest tree
2005-09-16 9:47 [PATCH] fix the control panel problem for latest tree Ling, Xiaofeng
@ 2005-09-16 18:51 ` Christian Limpach
2005-09-20 4:53 ` Xiaofeng Ling
0 siblings, 1 reply; 4+ messages in thread
From: Christian Limpach @ 2005-09-16 18:51 UTC (permalink / raw)
To: Ling, Xiaofeng; +Cc: xen-devel
Thanks!
On 9/16/05, Ling, Xiaofeng <xiaofeng.ling@intel.com> wrote:
> The new image handling structure break the vmx guest loading, this patch
> fix it.
>
> Signed-off-by: Xiaofeng Ling <xiaofeng.ling@intel.com>
>
> 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
>
>
>
>
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] fix the control panel problem for latest tree
2005-09-16 18:51 ` Christian Limpach
@ 2005-09-20 4:53 ` Xiaofeng Ling
2005-09-20 9:44 ` Christian Limpach
0 siblings, 1 reply; 4+ messages in thread
From: Xiaofeng Ling @ 2005-09-20 4:53 UTC (permalink / raw)
To: Christian.Limpach; +Cc: xen-devel
[-- Attachment #1: Type: text/plain, Size: 2713 bytes --]
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 <xiaofeng.ling@intel.com> wrote:
>
>>The new image handling structure break the vmx guest loading, this patch
>>fix it.
>>
>>Signed-off-by: Xiaofeng Ling <xiaofeng.ling@intel.com>
>>
>>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
[-- Attachment #2: vncconfig.patch --]
[-- Type: text/x-patch, Size: 1216 bytes --]
# HG changeset patch
# User Xiaofeng Ling <xiaofeng.ling@intel.com>
# Node ID e8d938a4dcc90108739635489b01c99a33305045
# Parent 53cbced17c98f009c8cf534358979d9115b8657d
fix vnc configuration issue for creating vmx guest
Signed-off-by: Xiaofeng Ling <xiaofeng.ling@intel.com>
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')
[-- Attachment #3: Type: text/plain, Size: 138 bytes --]
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xensource.com
http://lists.xensource.com/xen-devel
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] fix the control panel problem for latest tree
2005-09-20 4:53 ` Xiaofeng Ling
@ 2005-09-20 9:44 ` Christian Limpach
0 siblings, 0 replies; 4+ messages in thread
From: Christian Limpach @ 2005-09-20 9:44 UTC (permalink / raw)
To: Xiaofeng Ling; +Cc: xen-devel
Thanks!
On Tue, Sep 20, 2005 at 12:53:54PM +0800, Xiaofeng Ling wrote:
> 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 <xiaofeng.ling@intel.com> wrote:
> >
> >>The new image handling structure break the vmx guest loading, this patch
> >>fix it.
> >>
> >>Signed-off-by: Xiaofeng Ling <xiaofeng.ling@intel.com>
> >>
> >>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
>
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2005-09-20 9:44 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2005-09-16 9:47 [PATCH] fix the control panel problem for latest tree Ling, Xiaofeng
2005-09-16 18:51 ` Christian Limpach
2005-09-20 4:53 ` Xiaofeng Ling
2005-09-20 9:44 ` Christian Limpach
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.