From mboxrd@z Thu Jan  1 00:00:00 1970
From: Noboru Iwamatsu <n_iwamatsu@jp.fujitsu.com>
Subject: [PATCH] hvmloader: fix vgatype detecting issue
Date: Fri, 19 Feb 2010 17:50:57 +0900
Message-ID: <4B7E50F1.6070405@jp.fujitsu.com>
Mime-Version: 1.0
Content-Type: multipart/mixed; boundary="------------080008070405010704000709"
Return-path: <xen-devel-bounces@lists.xensource.com>
List-Unsubscribe: <http://lists.xensource.com/mailman/listinfo/xen-devel>,
	<mailto:xen-devel-request@lists.xensource.com?subject=unsubscribe>
List-Post: <mailto:xen-devel@lists.xensource.com>
List-Help: <mailto:xen-devel-request@lists.xensource.com?subject=help>
List-Subscribe: <http://lists.xensource.com/mailman/listinfo/xen-devel>,
	<mailto:xen-devel-request@lists.xensource.com?subject=subscribe>
Sender: xen-devel-bounces@lists.xensource.com
Errors-To: xen-devel-bounces@lists.xensource.com
To: xen-devel@lists.xensource.com
Cc: weidong.han@intel.com
List-Id: xen-devel@lists.xenproject.org

This is a multi-part message in MIME format.
--------------080008070405010704000709
Content-Type: text/plain; charset=ISO-8859-1; format=flowed
Content-Transfer-Encoding: 7bit

Hi,

When graphics card is assigned to a guest as a secondary VGA,
without gfx_passthru and emulated VGA is the primary VGA,
hvmloader misreads gfx_passthru is specified if VGA device is
found after the emulated VGA.

This patch fix this issue. If emulated VGA is found, hvmloader
preserves it and loads vgabios of the emulated VGA.

Noboru.

Signed-off-by: Noboru Iwamatsu <n_iwamatsu@jp.fujitsu.com>

--------------080008070405010704000709
Content-Type: text/plain;
 name="hvmloader-vga-pt-fix.patch"
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment;
 filename="hvmloader-vga-pt-fix.patch"

diff -r e99d20837ac0 -r d03433d515f3 tools/firmware/hvmloader/hvmloader.c
--- a/tools/firmware/hvmloader/hvmloader.c	Tue Feb 16 18:11:17 2010 +0000
+++ b/tools/firmware/hvmloader/hvmloader.c	Wed Feb 17 13:44:32 2010 +0900
@@ -210,11 +210,12 @@
         switch ( class )
         {
         case 0x0300:
+            /* If emulated VGA is found, preserve it as primary VGA. */
             if ( (vendor_id == 0x1234) && (device_id == 0x1111) )
                 virtual_vga = VGA_std;
             else if ( (vendor_id == 0x1013) && (device_id == 0xb8) )
                 virtual_vga = VGA_cirrus;
-            else
+            else if ( virtual_vga == VGA_none )
                 virtual_vga = VGA_pt;
             break;
         case 0x0680:

--------------080008070405010704000709
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

--------------080008070405010704000709--