Commit 0fd61a2d authored by Philippe Mathieu-Daudé's avatar Philippe Mathieu-Daudé Committed by Philippe Mathieu-Daudé
Browse files

hw/pci-host/piix: Move i440FX declarations to hw/pci-host/i440fx.h 



The hw/pci-host/piix.c contains a mix of PIIX3 and i440FX chipsets
functions. To be able to split it, we need to export some
declarations first.

Reviewed-by: default avatarAleksandar Markovic <amarkovic@wavecomp.com>
Signed-off-by: default avatarPhilippe Mathieu-Daudé <philmd@redhat.com>
parent 4b19de14

MAINTAINERS

+1 −0
Original line number Diff line number Diff line
@@ -1244,6 +1244,7 @@ F: hw/i386/ 
F: hw/pci-host/piix.c

F: hw/pci-host/q35.c

F: hw/pci-host/pam.c

F: include/hw/pci-host/i440fx.h

F: include/hw/pci-host/q35.h

F: include/hw/pci-host/pam.h

F: hw/isa/lpc_ich9.c

hw/acpi/pcihp.c

+1 −1
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ 
#include "qemu/osdep.h"

#include "hw/acpi/pcihp.h"



#include "hw/i386/pc.h"

#include "hw/pci-host/i440fx.h"

#include "hw/pci/pci.h"

#include "hw/pci/pci_bridge.h"

#include "hw/acpi/acpi.h"

hw/i386/pc_piix.c

+1 −0
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ 
#include "hw/i386/x86.h"

#include "hw/i386/pc.h"

#include "hw/i386/apic.h"

#include "hw/pci-host/i440fx.h"

#include "hw/southbridge/piix.h"

#include "hw/display/ramfb.h"

#include "hw/firmware/smbios.h"

hw/pci-host/piix.c

+1 −0
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ 
#include "hw/irq.h"

#include "hw/pci/pci.h"

#include "hw/pci/pci_host.h"

#include "hw/pci-host/i440fx.h"

#include "hw/southbridge/piix.h"

#include "hw/qdev-properties.h"

#include "hw/isa/isa.h"

include/hw/i386/pc.h

+0 −22
Original line number Diff line number Diff line
@@ -231,28 +231,6 @@ int cmos_get_fd_drive_type(FloppyDriveType fd0); 
/* hpet.c */

extern int no_hpet;



/* piix_pci.c */

struct PCII440FXState;

typedef struct PCII440FXState PCII440FXState;



#define TYPE_I440FX_PCI_HOST_BRIDGE "i440FX-pcihost"

#define TYPE_I440FX_PCI_DEVICE "i440FX"



#define TYPE_IGD_PASSTHROUGH_I440FX_PCI_DEVICE "igd-passthrough-i440FX"



PCIBus *i440fx_init(const char *host_type, const char *pci_type,

                    PCII440FXState **pi440fx_state, int *piix_devfn,

                    ISABus **isa_bus, qemu_irq *pic,

                    MemoryRegion *address_space_mem,

                    MemoryRegion *address_space_io,

                    ram_addr_t ram_size,

                    ram_addr_t below_4g_mem_size,

                    ram_addr_t above_4g_mem_size,

                    MemoryRegion *pci_memory,

                    MemoryRegion *ram_memory);



PCIBus *find_i440fx(void);



/* pc_sysfw.c */

void pc_system_flash_create(PCMachineState *pcms);

void pc_system_firmware_init(PCMachineState *pcms, MemoryRegion *rom_memory);