From mboxrd@z Thu Jan 1 00:00:00 1970 From: "Zhai, Edwin" Subject: r13745 break sdl support Date: Thu, 01 Feb 2007 13:41:20 +0800 Message-ID: <45C17D80.5030507@intel.com> Reply-To: edwin.zhai@intel.com Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="------------090004050407090208040906" Return-path: List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xensource.com Errors-To: xen-devel-bounces@lists.xensource.com To: xen-devel@lists.xensource.com Cc: "Zhai, Edwin" List-Id: xen-devel@lists.xenproject.org This is a multi-part message in MIME format. --------------090004050407090208040906 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit 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 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 --------------090004050407090208040906 Content-Type: text/plain; name="sdl_fix.patch" Content-Transfer-Encoding: 7bit Content-Disposition: inline; filename="sdl_fix.patch" 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): --------------090004050407090208040906 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 --------------090004050407090208040906--