Re: [Qemu-devel] [Qemu-ppc][PATCH v6 4/5] Cleanup pc.h on other platforms

[Li Zhang <zhlcindy@linux.vnet.ibm.com>]

Reply to mailing list. :)

On 2012年08月05日 02:41, zhlcindy@gmail.com wrote:
> From: Li Zhang <zhlcindy@linux.vnet.ibm.com>
>
> The declarations of pci_vga_init() and pci_cirrus_vga_init()
> are moved to vga-pci.h to be called by all the platforms.
> So it's necessary to cleanup pc.h on the platforms other than
> PC which include the file and add vga-pci.h on all the plaforms
> to call vga related functions.
>
> This patch is to cleanup pc.h and add vga-pci.h.
>
> Signed-off-by: Li Zhang <zhlcindy@linux.vnet.ibm.com>
> ---
>   hw/alpha_pci.c    |    1 +
>   hw/mips_malta.c   |    1 +
>   hw/pc.c           |    1 +
>   hw/ppc_newworld.c |    2 +-
>   hw/ppc_oldworld.c |    2 +-
>   hw/ppc_prep.c     |    1 +
>   hw/sun4u.c        |    1 +
>   7 files changed, 7 insertions(+), 2 deletions(-)
>
> 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/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 bd193f3..67967db 100644
> --- a/hw/pc.c
> +++ b/hw/pc.c
> @@ -49,6 +49,7 @@
>   #include "memory.h"
>   #include "exec-memory.h"
>   #include "arch_init.h"
> +#include "vga-pci.h"
>
>   /* output Bochs bios info messages */
>   //#define DEBUG_BIOS
> 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


-- 

Li Zhang
IBM China Linux Technology Centre