[Xen-changelog] [xen-unstable] hvmloader: fix vgatype detecting issue

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

# HG changeset patch
# User Keir Fraser <keir.fraser@xxxxxxxxxx>
# Date 1266833062 0
# Node ID 845da68515d80d2b5969f6d46cfc5c5b6d7097af
# Parent  87f1e5b7660b8c0961f8fc71ba800d51885f250d
hvmloader: fix vgatype detecting issue

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.

Signed-off-by: Noboru Iwamatsu <n_iwamatsu@xxxxxxxxxxxxxx>
---
 tools/firmware/hvmloader/hvmloader.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletion(-)

diff -r 87f1e5b7660b -r 845da68515d8 tools/firmware/hvmloader/hvmloader.c
--- a/tools/firmware/hvmloader/hvmloader.c      Mon Feb 22 10:02:17 2010 +0000
+++ b/tools/firmware/hvmloader/hvmloader.c      Mon Feb 22 10:04:22 2010 +0000
@@ -210,11 +210,12 @@ static void pci_setup(void)
         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:

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