r13745 break sdl support

r13745 break sdl support

[Zhai, Edwin]

[-- Attachment #1: Type: text/plain, Size: 768 bytes --]

all,
qemu with sdl always end up with "-nographic" since r13745 (Merge VFB 
support for PV and HVM guests.)

attached patch can fix it.

Signed-off-by: Zhai Edwin <edwin.zhai@intel.com>

but vnc hvm guest still fail restore with

  File 
"/home/gzhai/srcs/hg/tip/dist/install/usr/lib/python/xen/xend/XendDomainInfo.py", 
line 1261, in _createDevices
  File 
"/home/gzhai/srcs/hg/tip/dist/install/usr/lib/python/xen/xend/XendDomainInfo.py", 
line 1237, in _createDevice
  File 
"/home/gzhai/srcs/hg/tip/dist/install/usr/lib/python/xen/xend/server/vfbif.py", 
line 48, in createDevice
  File 
"/home/gzhai/srcs/hg/tip/dist/install/usr/lib/python/xen/xend/server/DevController.py", 
line 111, in createDevice
VmError: Device 0 (vfb) is already connected.

thanks,
edwin


[-- Attachment #2: sdl_fix.patch --]
[-- Type: text/plain, Size: 1302 bytes --]

diff -r 142d79732c66 tools/python/xen/xend/image.py
--- a/tools/python/xen/xend/image.py	Fri Sep 15 17:05:38 2006 +0800
+++ b/tools/python/xen/xend/image.py	Thu Feb 01 13:28:10 2007 +0800
@@ -451,6 +451,11 @@ class HVMImageHandler(ImageHandler):
         vnc_config = {}
         has_vfb = False
         has_vnc = int(vmConfig['image'].get('vnc', 0)) != 0
+        has_sdl = int(vmConfig['image'].get('sdl', 0)) != 0
+        if not has_vfb and not has_vnc and not has_sdl:
+            ret.append('-nographic')
+            return ret
+
         for dev_uuid in vmConfig['console_refs']:
             dev_type, dev_info = vmConfig['devices'][dev_uuid]
             if dev_type == 'vfb':
@@ -458,15 +463,13 @@ class HVMImageHandler(ImageHandler):
                 has_vfb = True
                 break
 
+        if not has_vnc:
+            return ret
+
         if not vnc_config:
             for key in ('vncunused', 'vnclisten', 'vncdisplay', 'vncpasswd'):
                 if key in vmConfig['image']:
                     vnc_config[key] = vmConfig['image'][key]
-
-        if not has_vfb and not has_vnc:
-            ret.append('-nographic')
-            return ret
-
                     
         if not vnc_config.get('vncunused', 0) and \
                vnc_config.get('vncdisplay', 0):

[-- Attachment #3: Type: text/plain, Size: 138 bytes --]

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

Re: r13745 break sdl support

[Tim Deegan]

At 13:41 +0800 on 01 Feb (1170337280), Zhai, Edwin wrote:
>  File 
> "/home/gzhai/srcs/hg/tip/dist/install/usr/lib/python/xen/xend/server/DevController.py", 
> line 111, in createDevice
> VmError: Device 0 (vfb) is already connected.

This will hopefully be fixed soon -- in the meantime this patch allows
me to restore domains again:

diff -r 5d09e6098f93 tools/python/xen/xend/XendConfig.py
--- a/tools/python/xen/xend/XendConfig.py	Wed Jan 31 17:22:17 2007 +0000
+++ b/tools/python/xen/xend/XendConfig.py	Wed Jan 31 18:09:20 2007 +0000
@@ -671,6 +671,9 @@ class XendConfig(dict):
                 if self['devices'][console_uuid][1].get('protocol') == 'rfb':
                     has_rfb = True
                     break
+                if self['devices'][console_uuid][0] == 'vfb':
+                    has_rfb = True
+                    break
 
             if not has_rfb:
                 dev_config = ['vfb']

Re: r13745 break sdl support

[Ewan Mellor]

On Thu, Feb 01, 2007 at 09:38:01AM +0000, Tim Deegan wrote:

> At 13:41 +0800 on 01 Feb (1170337280), Zhai, Edwin wrote:
> >  File 
> > "/home/gzhai/srcs/hg/tip/dist/install/usr/lib/python/xen/xend/server/DevController.py", 
> > line 111, in createDevice
> > VmError: Device 0 (vfb) is already connected.
> 
> This will hopefully be fixed soon -- in the meantime this patch allows
> me to restore domains again:
> 
> diff -r 5d09e6098f93 tools/python/xen/xend/XendConfig.py
> --- a/tools/python/xen/xend/XendConfig.py	Wed Jan 31 17:22:17 2007 +0000
> +++ b/tools/python/xen/xend/XendConfig.py	Wed Jan 31 18:09:20 2007 +0000
> @@ -671,6 +671,9 @@ class XendConfig(dict):
>                  if self['devices'][console_uuid][1].get('protocol') == 'rfb':
>                      has_rfb = True
>                      break
> +                if self['devices'][console_uuid][0] == 'vfb':
> +                    has_rfb = True
> +                    break
>  
>              if not has_rfb:
>                  dev_config = ['vfb']

Applied.

Ewan.

Re: r13745 break sdl support

[Ewan Mellor]

On Thu, Feb 01, 2007 at 01:41:20PM +0800, Zhai, Edwin wrote:

> all,
> qemu with sdl always end up with "-nographic" since r13745 (Merge VFB 
> support for PV and HVM guests.)
> 
> attached patch can fix it.
> 
> Signed-off-by: Zhai Edwin <edwin.zhai@intel.com>
> 
> but vnc hvm guest still fail restore with
> 
>  File 
> "/home/gzhai/srcs/hg/tip/dist/install/usr/lib/python/xen/xend/XendDomainInfo.py", 
> line 1261, in _createDevices
>  File 
> "/home/gzhai/srcs/hg/tip/dist/install/usr/lib/python/xen/xend/XendDomainInfo.py", 
> line 1237, in _createDevice
>  File 
> "/home/gzhai/srcs/hg/tip/dist/install/usr/lib/python/xen/xend/server/vfbif.py", 
> line 48, in createDevice
>  File 
> "/home/gzhai/srcs/hg/tip/dist/install/usr/lib/python/xen/xend/server/DevController.py", 
> line 111, in createDevice
> VmError: Device 0 (vfb) is already connected.
> 
> thanks,
> edwin
> 

> diff -r 142d79732c66 tools/python/xen/xend/image.py
> --- a/tools/python/xen/xend/image.py	Fri Sep 15 17:05:38 2006 +0800
> +++ b/tools/python/xen/xend/image.py	Thu Feb 01 13:28:10 2007 +0800
> @@ -451,6 +451,11 @@ class HVMImageHandler(ImageHandler):
>          vnc_config = {}
>          has_vfb = False
>          has_vnc = int(vmConfig['image'].get('vnc', 0)) != 0
> +        has_sdl = int(vmConfig['image'].get('sdl', 0)) != 0
> +        if not has_vfb and not has_vnc and not has_sdl:
> +            ret.append('-nographic')
> +            return ret
> +
>          for dev_uuid in vmConfig['console_refs']:
>              dev_type, dev_info = vmConfig['devices'][dev_uuid]
>              if dev_type == 'vfb':
> @@ -458,15 +463,13 @@ class HVMImageHandler(ImageHandler):
>                  has_vfb = True
>                  break
>  
> +        if not has_vnc:
> +            return ret
> +
>          if not vnc_config:
>              for key in ('vncunused', 'vnclisten', 'vncdisplay', 'vncpasswd'):
>                  if key in vmConfig['image']:
>                      vnc_config[key] = vmConfig['image'][key]
> -
> -        if not has_vfb and not has_vnc:
> -            ret.append('-nographic')
> -            return ret
> -
>                      
>          if not vnc_config.get('vncunused', 0) and \
>                 vnc_config.get('vncdisplay', 0):

I've fixed this.  Your patch conflicted with what Ali was doing to import the
new console support in the Xen-API, so I've done something a little different,
but hopefully it fixes the problem for you.

Thanks,

Ewan.