[Xen-changelog] [xen-unstable] Fix 2 issues when creating HVM guests:

[Xen patchbot-unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User kfraser@xxxxxxxxxxxxxxxxxxxxx
# Node ID cfd9d4601022e182c77c37ae1a7c08c1b082fa97
# Parent  0e32095a7b4611d18a82052a9d5b23e474f91af9
Fix 2 issues when creating HVM guests:
 1) xend can't start due to xend-config.sxp
 2) qemu dm option vncunused should be effective only
    when vnc is turned on.

Signed-off-by: Xin Li <xin.b.li@xxxxxxxxx>
---
 tools/examples/xend-config.sxp |    2 +-
 tools/python/xen/xend/image.py |   12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff -r 0e32095a7b46 -r cfd9d4601022 tools/examples/xend-config.sxp
--- a/tools/examples/xend-config.sxp    Wed Aug 09 21:34:27 2006 +0100
+++ b/tools/examples/xend-config.sxp    Thu Aug 10 10:37:15 2006 +0100
@@ -54,7 +54,7 @@
 #  (xend-relocation-hosts-allow '^localhost$ ^.*\.example\.org$')
 #
 #(xend-relocation-hosts-allow '')
-(xend-relocation-hosts-allow '^localhost$ ^localhost\.localdomain$')
+(xend-relocation-hosts-allow '^localhost$ ^localhost\\.localdomain$')
 
 # The limit (in kilobytes) on the size of the console buffer
 #(console-limit 1024)
diff -r 0e32095a7b46 -r cfd9d4601022 tools/python/xen/xend/image.py
--- a/tools/python/xen/xend/image.py    Wed Aug 09 21:34:27 2006 +0100
+++ b/tools/python/xen/xend/image.py    Thu Aug 10 10:37:15 2006 +0100
@@ -251,7 +251,7 @@ class HVMImageHandler(ImageHandler):
     def parseDeviceModelArgs(self, imageConfig, deviceConfig):
         dmargs = [ 'boot', 'fda', 'fdb', 'soundhw',
                    'localtime', 'serial', 'stdvga', 'isa', 'vcpus',
-                  'acpi', 'usb', 'usbdevice']
+                   'acpi', 'usb', 'usbdevice']
         ret = []
         for a in dmargs:
             v = sxp.child_value(imageConfig, a)
@@ -305,9 +305,6 @@ class HVMImageHandler(ImageHandler):
     def configVNC(self, config):
         # Handle graphics library related options
         vnc = sxp.child_value(config, 'vnc')
-        vncdisplay = sxp.child_value(config, 'vncdisplay',
-                                     int(self.vm.getDomid()))
-        vncunused = sxp.child_value(config, 'vncunused')
         sdl = sxp.child_value(config, 'sdl')
         ret = []
         nographic = sxp.child_value(config, 'nographic')
@@ -315,9 +312,12 @@ class HVMImageHandler(ImageHandler):
             ret.append('-nographic')
             return ret
         if vnc:
+            vncdisplay = sxp.child_value(config, 'vncdisplay',
+                                         int(self.vm.getDomid()))
             ret = ret + ['-vnc', '%d' % vncdisplay, '-k', 'en-us']
-        if vncunused:
-            ret += ['-vncunused']
+            vncunused = sxp.child_value(config, 'vncunused')
+            if vncunused:
+                ret += ['-vncunused']
         return ret
 
     def createDeviceModel(self):

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