OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

vga: cleanup after isa_vga_init() and pci_vga_init() conversion

Browse Source 
Now that all machines call isa_vga_init() or pci_vga_init(), some unused
code can be removed.

Cc: Anthony Liguori <aliguori@us.ibm.com>
Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>
This commit is contained in:
Aurelien Jarno 2012-09-08 12:58:09 +02:00
parent f642dfce19
commit 457ebdcd91
7 changed files with 0 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
hw/cirrus_vga.c
View File

@ -28,7 +28,6 @@
*/
#include "hw.h"
#include "pci.h"
#include "vga-pci.h"
#include "console.h"
#include "vga_int.h"
#include "loader.h"
@ -2970,11 +2969,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);

13
hw/pc.h
View File

@ -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);

6
hw/vga-pci.c
View File

@ -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(),

12
hw/vga-pci.h
View File

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

1
hw/vmware_vga.c
View File

@ -25,7 +25,6 @@
#include "loader.h"
#include "console.h"
#include "pci.h"
#include "vmware_vga.h"
#undef VERBOSE
#define HW_RECT_ACCEL

15
hw/vmware_vga.h
View File

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

3
sysemu.h
View File

@ -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;