Commit c1195d16 authored by zhlcindy@gmail.com's avatar zhlcindy@gmail.com Committed by Alexander Graf
Browse files

Add one new file vga-pci.h and cleanup on all platforms 



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: default avatarLi Zhang <zhlcindy@linux.vnet.ibm.com>
Signed-off-by: default avatarAlexander Graf <agraf@suse.de>
parent 7e99826c

hw/alpha_pci.c

+1 −0
Original line number Diff line number Diff line
@@ -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.  */

hw/cirrus_vga.c

+1 −1
Original line number Diff line number Diff line
@@ -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"

hw/mips_malta.c

+1 −0
Original line number Diff line number Diff line
@@ -48,6 +48,7 @@ 
#include "blockdev.h"

#include "exec-memory.h"

#include "sysbus.h"             /* SysBusDevice */

#include "vga-pci.h"



//#define DEBUG_BOARD_INIT

hw/pc.c

+1 −0
Original line number Diff line number Diff line
@@ -51,6 +51,7 @@ 
#include "exec-memory.h"

#include "arch_init.h"

#include "bitmap.h"

#include "vga-pci.h"



/* output Bochs bios info messages */

//#define DEBUG_BIOS

hw/pc.h

+0 −4
Original line number Diff line number Diff line
@@ -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)

{