[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v3 17/17] vga: cleanup after isa_vga_init() and pci_
From: |
Aurelien Jarno |
Subject: |
[Qemu-devel] [PATCH v3 17/17] vga: cleanup after isa_vga_init() and pci_vga_init() conversion |
Date: |
Tue, 11 Sep 2012 21:10:42 +0200 |
Now that all machines call isa_vga_init() or pci_vga_init(), some unused
code can be removed.
Cc: Anthony Liguori <address@hidden>
Signed-off-by: Aurelien Jarno <address@hidden>
---
hw/cirrus_vga.c | 6 ------
hw/pc.h | 13 -------------
hw/vga-pci.c | 6 ------
hw/vga-pci.h | 12 ------------
hw/vmware_vga.c | 1 -
hw/vmware_vga.h | 15 ---------------
sysemu.h | 3 ---
7 files changed, 56 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/pc.h b/hw/pc.h
index 77c38d6..9923d96 100644
--- a/hw/pc.h
+++ b/hw/pc.h
@@ -176,19 +176,6 @@ enum vga_retrace_method {
extern enum vga_retrace_method vga_retrace_method;
-static inline DeviceState *isa_std_vga_init(ISABus *bus)
-{
- ISADevice *dev;
-
- dev = isa_try_create(bus, "isa-vga");
- if (!dev) {
- fprintf(stderr, "Warning: isa-vga not available\n");
- return NULL;
- }
- qdev_init_nofail(&dev->qdev);
- return &dev->qdev;
-}
-
int isa_vga_mm_init(target_phys_addr_t vram_base,
target_phys_addr_t ctrl_base, int it_shift,
MemoryRegion *address_space);
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 b68e883..784a67b 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..c0ab3ed 100644
--- a/sysemu.h
+++ b/sysemu.h
@@ -105,10 +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;
--
1.7.10.4
- [Qemu-devel] [PATCH v3 16/17] mips/r4k: use the new is_vga_init() function, (continued)
- [Qemu-devel] [PATCH v3 16/17] mips/r4k: use the new is_vga_init() function, Aurelien Jarno, 2012/09/11
- [Qemu-devel] [PATCH v3 02/17] vga: rename isa_vga_init() to isa_std_vga_init(), Aurelien Jarno, 2012/09/11
- [Qemu-devel] [PATCH v3 15/17] pc: use the new pci_vga_init() and isa_vga_init() functions, Aurelien Jarno, 2012/09/11
- [Qemu-devel] [PATCH v3 14/17] sun/sun4u: use the new pci_vga_init() function, Aurelien Jarno, 2012/09/11
- [Qemu-devel] [PATCH v3 13/17] ppc/pSeries: use the new pci_vga_init() function, Aurelien Jarno, 2012/09/11
- [Qemu-devel] [PATCH v3 12/17] ppc/prep: use the new pci_vga_init() function, Aurelien Jarno, 2012/09/11
- [Qemu-devel] [PATCH v3 11/17] ppc/oldworld: use the new pci_vga_init() function, Aurelien Jarno, 2012/09/11
- [Qemu-devel] [PATCH v3 10/17] ppc/newworld: use the new pci_vga_init() function, Aurelien Jarno, 2012/09/11
- [Qemu-devel] [PATCH v3 09/17] alpha: use the new pci_vga_init() function, Aurelien Jarno, 2012/09/11
- [Qemu-devel] [PATCH v3 08/17] mips/malta: use the new pci_vga_init() function, Aurelien Jarno, 2012/09/11
- [Qemu-devel] [PATCH v3 17/17] vga: cleanup after isa_vga_init() and pci_vga_init() conversion,
Aurelien Jarno <=
- [Qemu-devel] [PATCH v3 01/17] vga: rename pci_vga_init() into pci_std_vga_init(), Aurelien Jarno, 2012/09/11
- [Qemu-devel] [PATCH v3 03/17] vl.c: convert *vga_enabled functions to QOM, Aurelien Jarno, 2012/09/11
- [Qemu-devel] [PATCH v3 06/17] pci: add a pci_vga_init() function, Aurelien Jarno, 2012/09/11
- [Qemu-devel] [PATCH v3 05/17] vl.c: default to std if cirrus is not available, Aurelien Jarno, 2012/09/11
- [Qemu-devel] [PATCH v3 04/17] vl.c: check for qxl availability, Aurelien Jarno, 2012/09/11
- [Qemu-devel] [PATCH v3 07/17] isa: add a isa_vga_init() function, Aurelien Jarno, 2012/09/11