diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2011-12-12 14:29:41 -0600 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2011-12-15 09:20:49 -0600 |
| commit | ad6d45fa0837acf3e8cab323ee5b08e05a9410a5 (patch) | |
| tree | 589be72d1f0ec05c6e6ff9d215c36186e845cc4c /hw/cirrus_vga.c | |
| parent | b2b6c39a7915e82cade4ab8689344c91c5e45653 (diff) | |
| download | qemu-ad6d45fa0837acf3e8cab323ee5b08e05a9410a5.tar.gz | |
qom: add vga node to the pc composition tree
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Diffstat (limited to 'hw/cirrus_vga.c')
| -rw-r--r-- | hw/cirrus_vga.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/hw/cirrus_vga.c b/hw/cirrus_vga.c index 1b216e8813..1388a203eb 100644 --- a/hw/cirrus_vga.c +++ b/hw/cirrus_vga.c @@ -2899,7 +2899,7 @@ static void cirrus_init_common(CirrusVGAState * s, int device_id, int is_pci, * ***************************************/ -void isa_cirrus_vga_init(MemoryRegion *system_memory) +DeviceState *isa_cirrus_vga_init(MemoryRegion *system_memory) { CirrusVGAState *s; @@ -2913,6 +2913,8 @@ void isa_cirrus_vga_init(MemoryRegion *system_memory) vmstate_register(NULL, 0, &vmstate_cirrus_vga, s); rom_add_vga(VGABIOS_CIRRUS_FILENAME); /* XXX ISA-LFB support */ + /* FIXME not qdev yet */ + return NULL; } /*************************************** @@ -2955,9 +2957,9 @@ static int pci_cirrus_vga_initfn(PCIDevice *dev) return 0; } -void pci_cirrus_vga_init(PCIBus *bus) +DeviceState *pci_cirrus_vga_init(PCIBus *bus) { - pci_create_simple(bus, -1, "cirrus-vga"); + return &pci_create_simple(bus, -1, "cirrus-vga")->qdev; } static PCIDeviceInfo cirrus_vga_info = { |