From patchwork Sat Sep 8 11:26:24 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aurelien Jarno X-Patchwork-Id: 182543 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 8DB252C0089 for ; Sat, 8 Sep 2012 21:53:13 +1000 (EST) Received: from localhost ([::1]:60318 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TAJCg-0004sR-NL for incoming@patchwork.ozlabs.org; Sat, 08 Sep 2012 07:27:58 -0400 Received: from eggs.gnu.org ([208.118.235.92]:34683) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TAJBk-0003AD-CC for qemu-devel@nongnu.org; Sat, 08 Sep 2012 07:27:01 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TAJBg-0000ya-BM for qemu-devel@nongnu.org; Sat, 08 Sep 2012 07:27:00 -0400 Received: from hall.aurel32.net ([88.191.126.93]:57355) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TAJBg-0000x1-3L for qemu-devel@nongnu.org; Sat, 08 Sep 2012 07:26:56 -0400 Received: from [77.227.137.151] (helo=ohm.aurel32.net) by hall.aurel32.net with esmtpsa (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.72) (envelope-from ) id 1TAJBW-0007VD-2A; Sat, 08 Sep 2012 13:26:46 +0200 Received: from aurel32 by ohm.aurel32.net with local (Exim 4.80) (envelope-from ) id 1TAJBT-0005Rj-0R; Sat, 08 Sep 2012 13:26:43 +0200 From: Aurelien Jarno To: qemu-devel@nongnu.org Date: Sat, 8 Sep 2012 13:26:24 +0200 Message-Id: <1347103584-20598-13-git-send-email-aurelien@aurel32.net> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1347103584-20598-1-git-send-email-aurelien@aurel32.net> References: <1347103584-20598-1-git-send-email-aurelien@aurel32.net> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 3) X-Received-From: 88.191.126.93 Cc: Anthony Liguori , Aurelien Jarno Subject: [Qemu-devel] [PATCH 12/12] vga: cleanup after pci_vga_init() conversion X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Now that all machines call pci_vga_init(), some unused code can be removed. Cc: Anthony Liguori Signed-off-by: Aurelien Jarno --- hw/cirrus_vga.c | 6 ------ hw/vga-pci.c | 6 ------ hw/vga-pci.h | 12 ------------ hw/vmware_vga.c | 1 - hw/vmware_vga.h | 15 --------------- sysemu.h | 4 ---- 6 files changed, 44 deletions(-) delete mode 100644 hw/vga-pci.h delete mode 100644 hw/vmware_vga.h diff --git a/hw/cirrus_vga.c b/hw/cirrus_vga.c index e8dcc6b..5d1d42f 100644 --- a/hw/cirrus_vga.c +++ b/hw/cirrus_vga.c @@ -28,7 +28,6 @@ */ #include "hw.h" #include "pci.h" -#include "vga-pci.h" #include "console.h" #include "vga_int.h" #include "loader.h" @@ -2963,11 +2962,6 @@ static int pci_cirrus_vga_initfn(PCIDevice *dev) return 0; } -DeviceState *pci_cirrus_vga_init(PCIBus *bus) -{ - return &pci_create_simple(bus, -1, "cirrus-vga")->qdev; -} - static void cirrus_vga_class_init(ObjectClass *klass, void *data) { DeviceClass *dc = DEVICE_CLASS(klass); diff --git a/hw/vga-pci.c b/hw/vga-pci.c index 992ffd9..996d47f 100644 --- a/hw/vga-pci.c +++ b/hw/vga-pci.c @@ -24,7 +24,6 @@ #include "hw.h" #include "console.h" #include "pci.h" -#include "vga-pci.h" #include "vga_int.h" #include "pixel_ops.h" #include "qemu-timer.h" @@ -70,11 +69,6 @@ static int pci_std_vga_initfn(PCIDevice *dev) return 0; } -DeviceState *pci_std_vga_init(PCIBus *bus) -{ - return &pci_create_simple(bus, -1, "VGA")->qdev; -} - static Property vga_pci_properties[] = { DEFINE_PROP_UINT32("vgamem_mb", PCIVGAState, vga.vram_size_mb, 16), DEFINE_PROP_END_OF_LIST(), diff --git a/hw/vga-pci.h b/hw/vga-pci.h deleted file mode 100644 index d111cdc..0000000 --- a/hw/vga-pci.h +++ /dev/null @@ -1,12 +0,0 @@ -#ifndef VGA_PCI_H -#define VGA_PCI_H - -#include "qemu-common.h" - -/* vga-pci.c */ -DeviceState *pci_std_vga_init(PCIBus *bus); - -/* cirrus_vga.c */ -DeviceState *pci_cirrus_vga_init(PCIBus *bus); - -#endif diff --git a/hw/vmware_vga.c b/hw/vmware_vga.c index f5e4f44..5796d89 100644 --- a/hw/vmware_vga.c +++ b/hw/vmware_vga.c @@ -25,7 +25,6 @@ #include "loader.h" #include "console.h" #include "pci.h" -#include "vmware_vga.h" #undef VERBOSE #define HW_RECT_ACCEL diff --git a/hw/vmware_vga.h b/hw/vmware_vga.h deleted file mode 100644 index 000fbdd..0000000 --- a/hw/vmware_vga.h +++ /dev/null @@ -1,15 +0,0 @@ -#ifndef QEMU_VMWARE_VGA_H -#define QEMU_VMWARE_VGA_H - -#include "qemu-common.h" - -/* vmware_vga.c */ -static inline DeviceState *pci_vmsvga_init(PCIBus *bus) -{ - PCIDevice *dev; - - dev = pci_create_simple(bus, -1, "vmware-svga"); - return &dev->qdev; -} - -#endif diff --git a/sysemu.h b/sysemu.h index 65552ac..0587b38 100644 --- a/sysemu.h +++ b/sysemu.h @@ -105,11 +105,7 @@ typedef enum { } VGAInterfaceType; extern int vga_interface_type; -#define cirrus_vga_enabled (vga_interface_type == VGA_CIRRUS) -#define std_vga_enabled (vga_interface_type == VGA_STD) #define xenfb_enabled (vga_interface_type == VGA_XENFB) -#define vmsvga_enabled (vga_interface_type == VGA_VMWARE) -#define qxl_enabled (vga_interface_type == VGA_QXL) extern int graphic_width; extern int graphic_height;