From: Li Zhang <zhlci...@linux.vnet.ibm.com> Functions pci_vga_init() and pci_cirrus_vga_init() are declared in pc.h. That prevents other platforms (e.g. sPAPR) to use them.
This patch is to create one new file vga-pci.h and move the declarations to vga-pci.h, so that they can be shared by all the platforms. Signed-off-by: Li Zhang <zhlci...@linux.vnet.ibm.com> --- hw/cirrus_vga.c | 2 +- hw/pc.h | 4 ---- hw/vga-pci.c | 2 +- hw/vga-pci.h | 13 +++++++++++++ 4 files changed, 15 insertions(+), 6 deletions(-) create mode 100644 hw/vga-pci.h diff --git a/hw/cirrus_vga.c b/hw/cirrus_vga.c index 623dd68..3e8e5bb 100644 --- a/hw/cirrus_vga.c +++ b/hw/cirrus_vga.c @@ -27,11 +27,11 @@ * available at http://home.worldonline.dk/~finth/ */ #include "hw.h" -#include "pc.h" #include "pci.h" #include "console.h" #include "vga_int.h" #include "loader.h" +#include "vga-pci.h" /* * TODO: diff --git a/hw/pc.h b/hw/pc.h index 31ccb6f..e4db071 100644 --- a/hw/pc.h +++ b/hw/pc.h @@ -189,14 +189,10 @@ static inline DeviceState *isa_vga_init(ISABus *bus) return &dev->qdev; } -DeviceState *pci_vga_init(PCIBus *bus); int isa_vga_mm_init(target_phys_addr_t vram_base, target_phys_addr_t ctrl_base, int it_shift, MemoryRegion *address_space); -/* cirrus_vga.c */ -DeviceState *pci_cirrus_vga_init(PCIBus *bus); - /* ne2000.c */ static inline bool isa_ne2000_init(ISABus *bus, int base, int irq, NICInfo *nd) { diff --git a/hw/vga-pci.c b/hw/vga-pci.c index 37dc019..4872056 100644 --- a/hw/vga-pci.c +++ b/hw/vga-pci.c @@ -23,12 +23,12 @@ */ #include "hw.h" #include "console.h" -#include "pc.h" #include "pci.h" #include "vga_int.h" #include "pixel_ops.h" #include "qemu-timer.h" #include "loader.h" +#include "vga-pci.h" typedef struct PCIVGAState { PCIDevice dev; diff --git a/hw/vga-pci.h b/hw/vga-pci.h new file mode 100644 index 0000000..e272deb --- /dev/null +++ b/hw/vga-pci.h @@ -0,0 +1,13 @@ +#ifndef VGA_PCI_H +#define VGA_PCI_H + +#include "qemu-common.h" +#include "qdev.h" + +/* vga-pci.c */ +DeviceState *pci_vga_init(PCIBus *bus); + +/* cirrus_vga.c */ +DeviceState *pci_cirrus_vga_init(PCIBus *bus); + +#endif -- 1.7.9.5
