[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-ppc] [Qemu-devel][PATCH v7 2/3] Add one new file vga-pci.h and cle
From: |
Li Zhang |
Subject: |
[Qemu-ppc] [Qemu-devel][PATCH v7 2/3] Add one new file vga-pci.h and cleanup on all platforms |
Date: |
Tue, 7 Aug 2012 10:41:59 +0800 |
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 platforms. This patch also cleans up on all platforms.
Signed-off-by: Li Zhang <address@hidden>
---
hw/alpha_pci.c | 1 +
hw/cirrus_vga.c | 2 +-
hw/mips_malta.c | 1 +
hw/pc.c | 1 +
hw/pc.h | 4 ----
hw/ppc_newworld.c | 2 +-
hw/ppc_oldworld.c | 2 +-
hw/ppc_prep.c | 1 +
hw/sun4u.c | 1 +
hw/vga-pci.c | 2 +-
hw/vga-pci.h | 12 ++++++++++++
11 files changed, 21 insertions(+), 8 deletions(-)
create mode 100644 hw/vga-pci.h
diff --git a/hw/alpha_pci.c b/hw/alpha_pci.c
index 6735577..ea546f8 100644
--- a/hw/alpha_pci.c
+++ b/hw/alpha_pci.c
@@ -11,6 +11,7 @@
#include "qemu-log.h"
#include "sysemu.h"
#include "vmware_vga.h"
+#include "vga-pci.h"
/* PCI IO reads/writes, to byte-word addressable memory. */
diff --git a/hw/cirrus_vga.c b/hw/cirrus_vga.c
index 623dd68..e8dcc6b 100644
--- a/hw/cirrus_vga.c
+++ b/hw/cirrus_vga.c
@@ -27,8 +27,8 @@
* available at http://home.worldonline.dk/~finth/
*/
#include "hw.h"
-#include "pc.h"
#include "pci.h"
+#include "vga-pci.h"
#include "console.h"
#include "vga_int.h"
#include "loader.h"
diff --git a/hw/mips_malta.c b/hw/mips_malta.c
index 351c88e..ad23f26 100644
--- a/hw/mips_malta.c
+++ b/hw/mips_malta.c
@@ -48,6 +48,7 @@
#include "blockdev.h"
#include "exec-memory.h"
#include "sysbus.h" /* SysBusDevice */
+#include "vga-pci.h"
//#define DEBUG_BOARD_INIT
diff --git a/hw/pc.c b/hw/pc.c
index 81c391c..c3a1c6e 100644
--- a/hw/pc.c
+++ b/hw/pc.c
@@ -50,6 +50,7 @@
#include "exec-memory.h"
#include "arch_init.h"
#include "bitmap.h"
+#include "vga-pci.h"
/* output Bochs bios info messages */
//#define DEBUG_BIOS
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/ppc_newworld.c b/hw/ppc_newworld.c
index 1a324eb..c9226db 100644
--- a/hw/ppc_newworld.c
+++ b/hw/ppc_newworld.c
@@ -52,7 +52,6 @@
#include "adb.h"
#include "mac_dbdma.h"
#include "nvram.h"
-#include "pc.h"
#include "pci.h"
#include "net.h"
#include "sysemu.h"
@@ -68,6 +67,7 @@
#include "hw/usb.h"
#include "blockdev.h"
#include "exec-memory.h"
+#include "vga-pci.h"
#define MAX_IDE_BUS 2
#define CFG_ADDR 0xf0000510
diff --git a/hw/ppc_oldworld.c b/hw/ppc_oldworld.c
index da05705..73d71a8 100644
--- a/hw/ppc_oldworld.c
+++ b/hw/ppc_oldworld.c
@@ -29,7 +29,6 @@
#include "adb.h"
#include "mac_dbdma.h"
#include "nvram.h"
-#include "pc.h"
#include "sysemu.h"
#include "net.h"
#include "isa.h"
@@ -44,6 +43,7 @@
#include "kvm_ppc.h"
#include "blockdev.h"
#include "exec-memory.h"
+#include "vga-pci.h"
#define MAX_IDE_BUS 2
#define CFG_ADDR 0xf0000510
diff --git a/hw/ppc_prep.c b/hw/ppc_prep.c
index dc294ae..ecdf633 100644
--- a/hw/ppc_prep.c
+++ b/hw/ppc_prep.c
@@ -39,6 +39,7 @@
#include "blockdev.h"
#include "arch_init.h"
#include "exec-memory.h"
+#include "vga-pci.h"
//#define HARD_DEBUG_PPC_IO
//#define DEBUG_PPC_IO
diff --git a/hw/sun4u.c b/hw/sun4u.c
index 137a7c6..07cd042 100644
--- a/hw/sun4u.c
+++ b/hw/sun4u.c
@@ -39,6 +39,7 @@
#include "elf.h"
#include "blockdev.h"
#include "exec-memory.h"
+#include "vga-pci.h"
//#define DEBUG_IRQ
//#define DEBUG_EBUS
diff --git a/hw/vga-pci.c b/hw/vga-pci.c
index 37dc019..9abbada 100644
--- a/hw/vga-pci.c
+++ b/hw/vga-pci.c
@@ -23,8 +23,8 @@
*/
#include "hw.h"
#include "console.h"
-#include "pc.h"
#include "pci.h"
+#include "vga-pci.h"
#include "vga_int.h"
#include "pixel_ops.h"
#include "qemu-timer.h"
diff --git a/hw/vga-pci.h b/hw/vga-pci.h
new file mode 100644
index 0000000..49abf13
--- /dev/null
+++ b/hw/vga-pci.h
@@ -0,0 +1,12 @@
+#ifndef VGA_PCI_H
+#define VGA_PCI_H
+
+#include "qemu-common.h"
+
+/* vga-pci.c */
+DeviceState *pci_vga_init(PCIBus *bus);
+
+/* cirrus_vga.c */
+DeviceState *pci_cirrus_vga_init(PCIBus *bus);
+
+#endif
--
1.7.7.6
- Re: [Qemu-ppc] [Qemu-devel][PATCH v7 1/3] Add USB option in machine options, (continued)
- Re: [Qemu-ppc] [Qemu-devel][PATCH v7 1/3] Add USB option in machine options, David Gibson, 2012/08/14
- Re: [Qemu-ppc] [Qemu-devel][PATCH v7 1/3] Add USB option in machine options, Alexander Graf, 2012/08/14
- Re: [Qemu-ppc] [Qemu-devel][PATCH v7 1/3] Add USB option in machine options, Benjamin Herrenschmidt, 2012/08/14
- Re: [Qemu-ppc] [Qemu-devel][PATCH v7 1/3] Add USB option in machine options, Li Zhang, 2012/08/14
- Re: [Qemu-ppc] [Qemu-devel][PATCH v7 1/3] Add USB option in machine options, David Gibson, 2012/08/14
- Re: [Qemu-ppc] [Qemu-devel][PATCH v7 1/3] Add USB option in machine options, Li Zhang, 2012/08/14
- Re: [Qemu-ppc] [Qemu-devel][PATCH v7 1/3] Add USB option in machine options, David Gibson, 2012/08/14
- Re: [Qemu-ppc] [Qemu-devel][PATCH v7 1/3] Add USB option in machine options, Li Zhang, 2012/08/15
- Re: [Qemu-ppc] [Qemu-devel][PATCH v7 1/3] Add USB option in machine options, David Gibson, 2012/08/15
- Re: [Qemu-ppc] [Qemu-devel][PATCH v7 1/3] Add USB option in machine options, Li Zhang, 2012/08/15
[Qemu-ppc] [Qemu-devel][PATCH v7 2/3] Add one new file vga-pci.h and cleanup on all platforms,
Li Zhang <=
[Qemu-ppc] [Qemu-devel][PATCH v7 3/3] spapr: Add support for -vga option, Li Zhang, 2012/08/06
- Re: [Qemu-ppc] [Qemu-devel][PATCH v7 3/3] spapr: Add support for -vga option, Alexander Graf, 2012/08/14
- Re: [Qemu-ppc] [Qemu-devel][PATCH v7 3/3] spapr: Add support for -vga option, Benjamin Herrenschmidt, 2012/08/14
- Re: [Qemu-ppc] [Qemu-devel][PATCH v7 3/3] spapr: Add support for -vga option, David Gibson, 2012/08/14
- Re: [Qemu-ppc] [Qemu-devel] [PATCH v7 3/3] spapr: Add support for -vga option, Li Zhang, 2012/08/14
- Re: [Qemu-ppc] [Qemu-devel] [PATCH v7 3/3] spapr: Add support for -vga option, Li Zhang, 2012/08/14
- Re: [Qemu-ppc] [Qemu-devel] [PATCH v7 3/3] spapr: Add support for -vga option, Li Zhang, 2012/08/14
- Re: [Qemu-ppc] [Qemu-devel] [PATCH v7 3/3] spapr: Add support for -vga option, David Gibson, 2012/08/14
Re: [Qemu-ppc] [Qemu-devel][PATCH v7 3/3] spapr: Add support for -vga option, Li Zhang, 2012/08/14