From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:34640) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TAJBi-00039s-G2 for qemu-devel@nongnu.org; Sat, 08 Sep 2012 07:26:59 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TAJBh-0000yu-3g for qemu-devel@nongnu.org; Sat, 08 Sep 2012 07:26:58 -0400 Received: from hall.aurel32.net ([88.191.126.93]:57360) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TAJBg-0000xG-S6 for qemu-devel@nongnu.org; Sat, 08 Sep 2012 07:26:57 -0400 From: Aurelien Jarno Date: Sat, 8 Sep 2012 13:26:21 +0200 Message-Id: <1347103584-20598-10-git-send-email-aurelien@aurel32.net> In-Reply-To: <1347103584-20598-1-git-send-email-aurelien@aurel32.net> References: <1347103584-20598-1-git-send-email-aurelien@aurel32.net> Subject: [Qemu-devel] [PATCH 09/12] ppc/pSeries: use the new pci_vga_init() function List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Alexander Graf , Aurelien Jarno , David Gibson Keep the case to prevent some vga card to be selected. Cc: Alexander Graf Cc: David Gibson Signed-off-by: Aurelien Jarno --- hw/spapr.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/hw/spapr.c b/hw/spapr.c index 80735d6..8b0c390 100644 --- a/hw/spapr.c +++ b/hw/spapr.c @@ -46,7 +46,6 @@ #include "kvm.h" #include "kvm_ppc.h" #include "pci.h" -#include "vga-pci.h" #include "exec-memory.h" #include "hw/usb.h" @@ -589,11 +588,9 @@ static void spapr_cpu_reset(void *opaque) static int spapr_vga_init(PCIBus *pci_bus) { switch (vga_interface_type) { - case VGA_STD: - pci_std_vga_init(pci_bus); - return 1; case VGA_NONE: - return 0; + case VGA_STD: + return pci_vga_init(pci_bus) != NULL; default: fprintf(stderr, "This vga model is not supported," "currently it only supports -vga std\n"); -- 1.7.10.4