pci: update all users to look in pci/ update all users so we can remove the makefile hack. Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
diff --git a/arch_init.c b/arch_init.c index e6effe8..e307b23 100644 --- a/arch_init.c +++ b/arch_init.c
@@ -36,7 +36,7 @@ #include "arch_init.h" #include "audio/audio.h" #include "hw/pc.h" -#include "hw/pci.h" +#include "hw/pci/pci.h" #include "hw/audiodev.h" #include "kvm.h" #include "migration.h"
diff --git a/hw/ac97.c b/hw/ac97.c index ce6a1dc..3e659b3 100644 --- a/hw/ac97.c +++ b/hw/ac97.c
@@ -20,7 +20,7 @@ #include "hw.h" #include "audiodev.h" #include "audio/audio.h" -#include "pci.h" +#include "pci/pci.h" #include "dma.h" enum {
diff --git a/hw/acpi_ich9.c b/hw/acpi_ich9.c index 85d441c..755fa05 100644 --- a/hw/acpi_ich9.c +++ b/hw/acpi_ich9.c
@@ -25,7 +25,7 @@ */ #include "hw.h" #include "pc.h" -#include "pci.h" +#include "pci/pci.h" #include "qemu-timer.h" #include "sysemu.h" #include "acpi.h"
diff --git a/hw/acpi_piix4.c b/hw/acpi_piix4.c index 0b5b0d3..46f9843 100644 --- a/hw/acpi_piix4.c +++ b/hw/acpi_piix4.c
@@ -22,7 +22,7 @@ #include "pc.h" #include "apm.h" #include "pm_smbus.h" -#include "pci.h" +#include "pci/pci.h" #include "acpi.h" #include "sysemu.h" #include "range.h"
diff --git a/hw/alpha_sys.h b/hw/alpha_sys.h index 7604d09..b1e5258 100644 --- a/hw/alpha_sys.h +++ b/hw/alpha_sys.h
@@ -3,8 +3,8 @@ #ifndef HW_ALPHA_H #define HW_ALPHA_H 1 -#include "pci.h" -#include "pci_host.h" +#include "pci/pci.h" +#include "pci/pci_host.h" #include "ide.h" #include "net.h" #include "pc.h"
diff --git a/hw/apb_pci.c b/hw/apb_pci.c index 054814f..de594f8 100644 --- a/hw/apb_pci.c +++ b/hw/apb_pci.c
@@ -27,10 +27,10 @@ the secondary PCI bridge. */ #include "sysbus.h" -#include "pci.h" -#include "pci_host.h" -#include "pci_bridge.h" -#include "pci_internals.h" +#include "pci/pci.h" +#include "pci/pci_host.h" +#include "pci/pci_bridge.h" +#include "pci/pci_internals.h" #include "apb_pci.h" #include "sysemu.h" #include "exec-memory.h"
diff --git a/hw/apic.c b/hw/apic.c index f73fc87..d66a476 100644 --- a/hw/apic.c +++ b/hw/apic.c
@@ -20,7 +20,7 @@ #include "apic_internal.h" #include "apic.h" #include "ioapic.h" -#include "msi.h" +#include "pci/msi.h" #include "host-utils.h" #include "trace.h" #include "pc.h"
diff --git a/hw/apm.c b/hw/apm.c index e988ad9..2e1b137 100644 --- a/hw/apm.c +++ b/hw/apm.c
@@ -22,7 +22,7 @@ #include "apm.h" #include "hw.h" -#include "pci.h" +#include "pci/pci.h" //#define DEBUG
diff --git a/hw/bonito.c b/hw/bonito.c index 0bf6d4a..a1fc38c 100644 --- a/hw/bonito.c +++ b/hw/bonito.c
@@ -40,10 +40,10 @@ #include <assert.h> #include "hw.h" -#include "pci.h" +#include "pci/pci.h" #include "pc.h" #include "mips.h" -#include "pci_host.h" +#include "pci/pci_host.h" #include "sysemu.h" #include "exec-memory.h"
diff --git a/hw/cirrus_vga.c b/hw/cirrus_vga.c index 40efa8a..7d021f2 100644 --- a/hw/cirrus_vga.c +++ b/hw/cirrus_vga.c
@@ -27,7 +27,7 @@ * available at http://home.worldonline.dk/~finth/ */ #include "hw.h" -#include "pci.h" +#include "pci/pci.h" #include "console.h" #include "vga_int.h" #include "loader.h"
diff --git a/hw/dec_pci.c b/hw/dec_pci.c index c30ade3..a6a7c84 100644 --- a/hw/dec_pci.c +++ b/hw/dec_pci.c
@@ -25,10 +25,10 @@ #include "dec_pci.h" #include "sysbus.h" -#include "pci.h" -#include "pci_host.h" -#include "pci_bridge.h" -#include "pci_internals.h" +#include "pci/pci.h" +#include "pci/pci_host.h" +#include "pci/pci_bridge.h" +#include "pci/pci_internals.h" /* debug DEC */ //#define DEBUG_DEC
diff --git a/hw/e1000.c b/hw/e1000.c index 5537ad2..c89c8d2 100644 --- a/hw/e1000.c +++ b/hw/e1000.c
@@ -26,7 +26,7 @@ #include "hw.h" -#include "pci.h" +#include "pci/pci.h" #include "net.h" #include "net/checksum.h" #include "loader.h"
diff --git a/hw/eepro100.c b/hw/eepro100.c index a189474..992f03a 100644 --- a/hw/eepro100.c +++ b/hw/eepro100.c
@@ -42,7 +42,7 @@ #include <stddef.h> /* offsetof */ #include "hw.h" -#include "pci.h" +#include "pci/pci.h" #include "net.h" #include "eeprom93xx.h" #include "sysemu.h"
diff --git a/hw/es1370.c b/hw/es1370.c index e0c9729..6536578 100644 --- a/hw/es1370.c +++ b/hw/es1370.c
@@ -29,7 +29,7 @@ #include "hw.h" #include "audiodev.h" #include "audio/audio.h" -#include "pci.h" +#include "pci/pci.h" #include "dma.h" /* Missing stuff:
diff --git a/hw/esp-pci.c b/hw/esp-pci.c index d9a8e59..d433473 100644 --- a/hw/esp-pci.c +++ b/hw/esp-pci.c
@@ -23,7 +23,7 @@ * THE SOFTWARE. */ -#include "pci.h" +#include "pci/pci.h" #include "eeprom93xx.h" #include "esp.h" #include "trace.h"
diff --git a/hw/grackle_pci.c b/hw/grackle_pci.c index 67da307..9484166 100644 --- a/hw/grackle_pci.c +++ b/hw/grackle_pci.c
@@ -23,9 +23,9 @@ * THE SOFTWARE. */ -#include "pci_host.h" +#include "pci/pci_host.h" #include "ppc_mac.h" -#include "pci.h" +#include "pci/pci.h" /* debug Grackle */ //#define DEBUG_GRACKLE
diff --git a/hw/gt64xxx.c b/hw/gt64xxx.c index 95d491d..5aa49c6 100644 --- a/hw/gt64xxx.c +++ b/hw/gt64xxx.c
@@ -24,8 +24,8 @@ #include "hw.h" #include "mips.h" -#include "pci.h" -#include "pci_host.h" +#include "pci/pci.h" +#include "pci/pci_host.h" #include "pc.h" #include "exec-memory.h"
diff --git a/hw/hda-audio.c b/hw/hda-audio.c index 36761dd..92a91b5 100644 --- a/hw/hda-audio.c +++ b/hw/hda-audio.c
@@ -18,7 +18,7 @@ */ #include "hw.h" -#include "pci.h" +#include "pci/pci.h" #include "intel-hda.h" #include "intel-hda-defs.h" #include "audio/audio.h"
diff --git a/hw/i82378.c b/hw/i82378.c index 99f35d4..c6b0b5e 100644 --- a/hw/i82378.c +++ b/hw/i82378.c
@@ -17,7 +17,7 @@ * License along with this library; if not, see <http://www.gnu.org/licenses/>. */ -#include "pci.h" +#include "pci/pci.h" #include "pc.h" #include "i8254.h" #include "pcspk.h"
diff --git a/hw/i82801b11.c b/hw/i82801b11.c index 3d1f996..3dc1000 100644 --- a/hw/i82801b11.c +++ b/hw/i82801b11.c
@@ -41,7 +41,7 @@ * License along with this library; if not, see <http://www.gnu.org/licenses/> */ -#include "pci.h" +#include "pci/pci.h" #include "ich9.h"
diff --git a/hw/ich9.h b/hw/ich9.h index 34e216f..ddd1293 100644 --- a/hw/ich9.h +++ b/hw/ich9.h
@@ -8,13 +8,13 @@ #include "pc.h" #include "apm.h" #include "ioapic.h" -#include "pci.h" -#include "pcie_host.h" -#include "pci_bridge.h" +#include "pci/pci.h" +#include "pci/pcie_host.h" +#include "pci/pci_bridge.h" #include "acpi.h" #include "acpi_ich9.h" #include "pam.h" -#include "pci_internals.h" +#include "pci/pci_internals.h" void ich9_lpc_set_irq(void *opaque, int irq_num, int level); int ich9_lpc_map_irq(PCIDevice *pci_dev, int intx);
diff --git a/hw/ide.h b/hw/ide.h index add742c..081c710 100644 --- a/hw/ide.h +++ b/hw/ide.h
@@ -2,7 +2,7 @@ #define HW_IDE_H #include "isa.h" -#include "pci.h" +#include "pci/pci.h" #include "memory.h" #define MAX_IDE_DEVS 2
diff --git a/hw/ide/ahci.c b/hw/ide/ahci.c index 67562db..2ea64bd 100644 --- a/hw/ide/ahci.c +++ b/hw/ide/ahci.c
@@ -22,9 +22,9 @@ */ #include <hw/hw.h> -#include <hw/msi.h> +#include <hw/pci/msi.h> #include <hw/pc.h> -#include <hw/pci.h> +#include <hw/pci/pci.h> #include <hw/sysbus.h> #include "monitor.h"
diff --git a/hw/ide/cmd646.c b/hw/ide/cmd646.c index 804db60..88210ea 100644 --- a/hw/ide/cmd646.c +++ b/hw/ide/cmd646.c
@@ -24,7 +24,7 @@ */ #include <hw/hw.h> #include <hw/pc.h> -#include <hw/pci.h> +#include <hw/pci/pci.h> #include <hw/isa.h> #include "block.h" #include "sysemu.h"
diff --git a/hw/ide/core.c b/hw/ide/core.c index c4f93d0..adc4aa4 100644 --- a/hw/ide/core.c +++ b/hw/ide/core.c
@@ -24,7 +24,7 @@ */ #include <hw/hw.h> #include <hw/pc.h> -#include <hw/pci.h> +#include <hw/pci/pci.h> #include <hw/isa.h> #include "qemu-error.h" #include "qemu-timer.h"
diff --git a/hw/ide/ich.c b/hw/ide/ich.c index 272b773..8e1a48e 100644 --- a/hw/ide/ich.c +++ b/hw/ide/ich.c
@@ -61,9 +61,9 @@ */ #include <hw/hw.h> -#include <hw/msi.h> +#include <hw/pci/msi.h> #include <hw/pc.h> -#include <hw/pci.h> +#include <hw/pci/pci.h> #include <hw/isa.h> #include "block.h" #include "dma.h"
diff --git a/hw/ide/pci.c b/hw/ide/pci.c index bcdd70e..23a0e23 100644 --- a/hw/ide/pci.c +++ b/hw/ide/pci.c
@@ -24,7 +24,7 @@ */ #include <hw/hw.h> #include <hw/pc.h> -#include <hw/pci.h> +#include <hw/pci/pci.h> #include <hw/isa.h> #include "block.h" #include "dma.h"
diff --git a/hw/ide/piix.c b/hw/ide/piix.c index 9431bad..5cf39cf 100644 --- a/hw/ide/piix.c +++ b/hw/ide/piix.c
@@ -25,7 +25,7 @@ #include <hw/hw.h> #include <hw/pc.h> -#include <hw/pci.h> +#include <hw/pci/pci.h> #include <hw/isa.h> #include "blockdev.h" #include "sysemu.h"
diff --git a/hw/ide/via.c b/hw/ide/via.c index efda173..8b4a24e 100644 --- a/hw/ide/via.c +++ b/hw/ide/via.c
@@ -25,7 +25,7 @@ */ #include <hw/hw.h> #include <hw/pc.h> -#include <hw/pci.h> +#include <hw/pci/pci.h> #include <hw/isa.h> #include "block.h" #include "sysemu.h"
diff --git a/hw/intel-hda.c b/hw/intel-hda.c index a68c368..c21bf72 100644 --- a/hw/intel-hda.c +++ b/hw/intel-hda.c
@@ -18,8 +18,8 @@ */ #include "hw.h" -#include "pci.h" -#include "msi.h" +#include "pci/pci.h" +#include "pci/msi.h" #include "qemu-timer.h" #include "audiodev.h" #include "intel-hda.h"
diff --git a/hw/ioh3420.c b/hw/ioh3420.c index 4d31473..d706e19 100644 --- a/hw/ioh3420.c +++ b/hw/ioh3420.c
@@ -20,9 +20,9 @@ * with this program; if not, see <http://www.gnu.org/licenses/>. */ -#include "pci_ids.h" -#include "msi.h" -#include "pcie.h" +#include "pci/pci_ids.h" +#include "pci/msi.h" +#include "pci/pcie.h" #include "ioh3420.h" #define PCI_DEVICE_ID_IOH_EPORT 0x3420 /* D0:F0 express mode */
diff --git a/hw/ioh3420.h b/hw/ioh3420.h index 68c523a..046cf2c 100644 --- a/hw/ioh3420.h +++ b/hw/ioh3420.h
@@ -1,7 +1,7 @@ #ifndef QEMU_IOH3420_H #define QEMU_IOH3420_H -#include "pcie_port.h" +#include "pci/pcie_port.h" PCIESlot *ioh3420_init(PCIBus *bus, int devfn, bool multifunction, const char *bus_name, pci_map_irq_fn map_irq,
diff --git a/hw/ivshmem.c b/hw/ivshmem.c index f6dbb21..cf64f32 100644 --- a/hw/ivshmem.c +++ b/hw/ivshmem.c
@@ -18,8 +18,8 @@ */ #include "hw.h" #include "pc.h" -#include "pci.h" -#include "msix.h" +#include "pci/pci.h" +#include "pci/msix.h" #include "kvm.h" #include "migration.h" #include "qerror.h"
diff --git a/hw/kvm/apic.c b/hw/kvm/apic.c index 8b65d51..beb418d 100644 --- a/hw/kvm/apic.c +++ b/hw/kvm/apic.c
@@ -10,7 +10,7 @@ * See the COPYING file in the top-level directory. */ #include "hw/apic_internal.h" -#include "hw/msi.h" +#include "hw/pci/msi.h" #include "kvm.h" static inline void kvm_apic_set_reg(struct kvm_lapic_state *kapic,
diff --git a/hw/kvm/pci-assign.c b/hw/kvm/pci-assign.c index e80dad0..4229159 100644 --- a/hw/kvm/pci-assign.c +++ b/hw/kvm/pci-assign.c
@@ -34,8 +34,8 @@ #include "monitor.h" #include "range.h" #include "sysemu.h" -#include "hw/pci.h" -#include "hw/msi.h" +#include "hw/pci/pci.h" +#include "hw/pci/msi.h" #include "kvm_i386.h" #define MSIX_PAGE_SIZE 0x1000
diff --git a/hw/lpc_ich9.c b/hw/lpc_ich9.c index 7a11363..811bf26 100644 --- a/hw/lpc_ich9.c +++ b/hw/lpc_ich9.c
@@ -35,14 +35,14 @@ #include "pc.h" #include "apm.h" #include "ioapic.h" -#include "pci.h" -#include "pcie_host.h" -#include "pci_bridge.h" +#include "pci/pci.h" +#include "pci/pcie_host.h" +#include "pci/pci_bridge.h" #include "ich9.h" #include "acpi.h" #include "acpi_ich9.h" #include "pam.h" -#include "pci_internals.h" +#include "pci/pci_internals.h" #include "exec-memory.h" #include "sysemu.h"
diff --git a/hw/lsi53c895a.c b/hw/lsi53c895a.c index 04f2fae..4aac9a0 100644 --- a/hw/lsi53c895a.c +++ b/hw/lsi53c895a.c
@@ -13,7 +13,7 @@ #include <assert.h> #include "hw.h" -#include "pci.h" +#include "pci/pci.h" #include "scsi.h" #include "dma.h"
diff --git a/hw/macio.c b/hw/macio.c index eb15b89..362afdc 100644 --- a/hw/macio.c +++ b/hw/macio.c
@@ -24,7 +24,7 @@ */ #include "hw.h" #include "ppc_mac.h" -#include "pci.h" +#include "pci/pci.h" #include "escc.h" typedef struct MacIOState
diff --git a/hw/megasas.c b/hw/megasas.c index 61b6527..f4fbe97 100644 --- a/hw/megasas.c +++ b/hw/megasas.c
@@ -19,9 +19,9 @@ */ #include "hw.h" -#include "pci.h" +#include "pci/pci.h" #include "dma.h" -#include "msix.h" +#include "pci/msix.h" #include "iov.h" #include "scsi.h" #include "scsi-defs.h"
diff --git a/hw/mips_fulong2e.c b/hw/mips_fulong2e.c index 5fcf900..d5cf33b 100644 --- a/hw/mips_fulong2e.c +++ b/hw/mips_fulong2e.c
@@ -29,7 +29,7 @@ #include "flash.h" #include "mips.h" #include "mips_cpudevs.h" -#include "pci.h" +#include "pci/pci.h" #include "qemu-char.h" #include "sysemu.h" #include "audio/audio.h"
diff --git a/hw/mips_malta.c b/hw/mips_malta.c index 4d2464a..571903d 100644 --- a/hw/mips_malta.c +++ b/hw/mips_malta.c
@@ -33,7 +33,7 @@ #include "flash.h" #include "mips.h" #include "mips_cpudevs.h" -#include "pci.h" +#include "pci/pci.h" #include "qemu-char.h" #include "sysemu.h" #include "arch_init.h"
diff --git a/hw/ne2000.c b/hw/ne2000.c index d3dd9a6..fb78e5b 100644 --- a/hw/ne2000.c +++ b/hw/ne2000.c
@@ -22,7 +22,7 @@ * THE SOFTWARE. */ #include "hw.h" -#include "pci.h" +#include "pci/pci.h" #include "net.h" #include "ne2000.h" #include "loader.h"
diff --git a/hw/openpic.c b/hw/openpic.c index 8b3784a..4791dc6 100644 --- a/hw/openpic.c +++ b/hw/openpic.c
@@ -35,7 +35,7 @@ */ #include "hw.h" #include "ppc_mac.h" -#include "pci.h" +#include "pci/pci.h" #include "openpic.h" //#define DEBUG_OPENPIC
diff --git a/hw/pc.c b/hw/pc.c index b11e7c4..d1b102c 100644 --- a/hw/pc.c +++ b/hw/pc.c
@@ -27,7 +27,7 @@ #include "apic.h" #include "fdc.h" #include "ide.h" -#include "pci.h" +#include "pci/pci.h" #include "monitor.h" #include "fw_cfg.h" #include "hpet_emul.h" @@ -38,7 +38,7 @@ #include "mc146818rtc.h" #include "i8254.h" #include "pcspk.h" -#include "msi.h" +#include "pci/msi.h" #include "sysbus.h" #include "sysemu.h" #include "kvm.h"
diff --git a/hw/pc_piix.c b/hw/pc_piix.c index 19e342a..c2b4cb0 100644 --- a/hw/pc_piix.c +++ b/hw/pc_piix.c
@@ -27,8 +27,8 @@ #include "hw.h" #include "pc.h" #include "apic.h" -#include "pci.h" -#include "pci_ids.h" +#include "pci/pci.h" +#include "pci/pci_ids.h" #include "usb.h" #include "net.h" #include "boards.h"
diff --git a/hw/pci_bridge_dev.c b/hw/pci_bridge_dev.c index f706396..5c9fc50 100644 --- a/hw/pci_bridge_dev.c +++ b/hw/pci_bridge_dev.c
@@ -19,13 +19,13 @@ * with this program; if not, see <http://www.gnu.org/licenses/>. */ -#include "pci_bridge.h" -#include "pci_ids.h" -#include "msi.h" -#include "shpc.h" -#include "slotid_cap.h" +#include "pci/pci_bridge.h" +#include "pci/pci_ids.h" +#include "pci/msi.h" +#include "pci/shpc.h" +#include "pci/slotid_cap.h" #include "memory.h" -#include "pci_internals.h" +#include "pci/pci_internals.h" #define REDHAT_PCI_VENDOR_ID 0x1b36 #define PCI_BRIDGE_DEV_VENDOR_ID REDHAT_PCI_VENDOR_ID
diff --git a/hw/pcnet-pci.c b/hw/pcnet-pci.c index 0bf438f..c1abbf8 100644 --- a/hw/pcnet-pci.c +++ b/hw/pcnet-pci.c
@@ -27,7 +27,7 @@ * AMD Publication# 19436 Rev:E Amendment/0 Issue Date: June 2000 */ -#include "pci.h" +#include "pci/pci.h" #include "net.h" #include "loader.h" #include "qemu-timer.h"
diff --git a/hw/piix4.c b/hw/piix4.c index ce4eb0d..799ed17 100644 --- a/hw/piix4.c +++ b/hw/piix4.c
@@ -24,7 +24,7 @@ #include "hw.h" #include "pc.h" -#include "pci.h" +#include "pci/pci.h" #include "isa.h" #include "sysbus.h"
diff --git a/hw/piix_pci.c b/hw/piix_pci.c index ba1b3de..b5ea68b 100644 --- a/hw/piix_pci.c +++ b/hw/piix_pci.c
@@ -24,8 +24,8 @@ #include "hw.h" #include "pc.h" -#include "pci.h" -#include "pci_host.h" +#include "pci/pci.h" +#include "pci/pci_host.h" #include "isa.h" #include "sysbus.h" #include "range.h"
diff --git a/hw/ppc/e500.c b/hw/ppc/e500.c index 6749fff..f77c488 100644 --- a/hw/ppc/e500.c +++ b/hw/ppc/e500.c
@@ -20,7 +20,7 @@ #include "net.h" #include "hw/hw.h" #include "hw/serial.h" -#include "hw/pci.h" +#include "hw/pci/pci.h" #include "hw/boards.h" #include "sysemu.h" #include "kvm.h"
diff --git a/hw/ppc440_bamboo.c b/hw/ppc440_bamboo.c index cc85607..0b39a81 100644 --- a/hw/ppc440_bamboo.c +++ b/hw/ppc440_bamboo.c
@@ -15,7 +15,7 @@ #include "qemu-common.h" #include "net.h" #include "hw.h" -#include "pci.h" +#include "pci/pci.h" #include "boards.h" #include "kvm.h" #include "kvm_ppc.h"
diff --git a/hw/ppc4xx.h b/hw/ppc4xx.h index d795ced..2b96d47 100644 --- a/hw/ppc4xx.h +++ b/hw/ppc4xx.h
@@ -25,7 +25,7 @@ #if !defined(PPC_4XX_H) #define PPC_4XX_H -#include "pci.h" +#include "pci/pci.h" /* PowerPC 4xx core initialization */ CPUPPCState *ppc4xx_init (const char *cpu_model,
diff --git a/hw/ppc4xx_pci.c b/hw/ppc4xx_pci.c index d3ad6a0..3e8af11 100644 --- a/hw/ppc4xx_pci.c +++ b/hw/ppc4xx_pci.c
@@ -22,8 +22,8 @@ #include "hw.h" #include "ppc.h" #include "ppc4xx.h" -#include "pci.h" -#include "pci_host.h" +#include "pci/pci.h" +#include "pci/pci_host.h" #include "exec-memory.h" #undef DEBUG
diff --git a/hw/ppc_newworld.c b/hw/ppc_newworld.c index 664747e..c1ff9d7 100644 --- a/hw/ppc_newworld.c +++ b/hw/ppc_newworld.c
@@ -52,7 +52,7 @@ #include "adb.h" #include "mac_dbdma.h" #include "nvram.h" -#include "pci.h" +#include "pci/pci.h" #include "net.h" #include "sysemu.h" #include "boards.h"
diff --git a/hw/ppc_oldworld.c b/hw/ppc_oldworld.c index e8138c0..3bc29c6 100644 --- a/hw/ppc_oldworld.c +++ b/hw/ppc_oldworld.c
@@ -32,7 +32,7 @@ #include "sysemu.h" #include "net.h" #include "isa.h" -#include "pci.h" +#include "pci/pci.h" #include "boards.h" #include "fw_cfg.h" #include "escc.h"
diff --git a/hw/ppc_prep.c b/hw/ppc_prep.c index bf15730..f6ffb59 100644 --- a/hw/ppc_prep.c +++ b/hw/ppc_prep.c
@@ -29,8 +29,8 @@ #include "net.h" #include "sysemu.h" #include "isa.h" -#include "pci.h" -#include "pci_host.h" +#include "pci/pci.h" +#include "pci/pci_host.h" #include "ppc.h" #include "boards.h" #include "qemu-log.h"
diff --git a/hw/ppce500_pci.c b/hw/ppce500_pci.c index 2ff7438..39022aa 100644 --- a/hw/ppce500_pci.c +++ b/hw/ppce500_pci.c
@@ -15,8 +15,8 @@ */ #include "hw.h" -#include "pci.h" -#include "pci_host.h" +#include "pci/pci.h" +#include "pci/pci_host.h" #include "bswap.h" #ifdef DEBUG_PCI
diff --git a/hw/prep_pci.c b/hw/prep_pci.c index 0bc479c..5f22de6 100644 --- a/hw/prep_pci.c +++ b/hw/prep_pci.c
@@ -23,8 +23,8 @@ */ #include "hw.h" -#include "pci.h" -#include "pci_host.h" +#include "pci/pci.h" +#include "pci/pci_host.h" #include "pc.h" #include "exec-memory.h"
diff --git a/hw/q35.h b/hw/q35.h index e34f7c1..2f951c8 100644 --- a/hw/q35.h +++ b/hw/q35.h
@@ -29,8 +29,8 @@ #include "pc.h" #include "apm.h" #include "apic.h" -#include "pci.h" -#include "pcie_host.h" +#include "pci/pci.h" +#include "pci/pcie_host.h" #include "acpi.h" #include "acpi_ich9.h" #include "pam.h"
diff --git a/hw/qxl.h b/hw/qxl.h index e583cfb..41246c7 100644 --- a/hw/qxl.h +++ b/hw/qxl.h
@@ -2,7 +2,7 @@ #include "console.h" #include "hw.h" -#include "pci.h" +#include "pci/pci.h" #include "vga_int.h" #include "qemu-thread.h"
diff --git a/hw/r2d.c b/hw/r2d.c index 66212e9..e18c23b 100644 --- a/hw/r2d.c +++ b/hw/r2d.c
@@ -29,7 +29,7 @@ #include "devices.h" #include "sysemu.h" #include "boards.h" -#include "pci.h" +#include "pci/pci.h" #include "net.h" #include "sh7750_regs.h" #include "ide.h"
diff --git a/hw/realview.c b/hw/realview.c index e789c15..149bb56 100644 --- a/hw/realview.c +++ b/hw/realview.c
@@ -11,7 +11,7 @@ #include "arm-misc.h" #include "primecell.h" #include "devices.h" -#include "pci.h" +#include "pci/pci.h" #include "net.h" #include "sysemu.h" #include "boards.h"
diff --git a/hw/rtl8139.c b/hw/rtl8139.c index e3aa8bf..e294a2a 100644 --- a/hw/rtl8139.c +++ b/hw/rtl8139.c
@@ -52,7 +52,7 @@ #include <zlib.h> #include "hw.h" -#include "pci.h" +#include "pci/pci.h" #include "dma.h" #include "qemu-timer.h" #include "net.h"
diff --git a/hw/serial-pci.c b/hw/serial-pci.c index 95dc5c8..6a2548a 100644 --- a/hw/serial-pci.c +++ b/hw/serial-pci.c
@@ -26,7 +26,7 @@ /* see docs/specs/pci-serial.txt */ #include "serial.h" -#include "pci.h" +#include "pci/pci.h" #define PCI_SERIAL_MAX_PORTS 4
diff --git a/hw/sga.c b/hw/sga.c index a666349..5d80efd 100644 --- a/hw/sga.c +++ b/hw/sga.c
@@ -24,7 +24,7 @@ * sgabios code originally available at code.google.com/p/sgabios * */ -#include "pci.h" +#include "pci/pci.h" #include "pc.h" #include "loader.h" #include "sysemu.h"
diff --git a/hw/sh_pci.c b/hw/sh_pci.c index fdec71b..9ea08c8 100644 --- a/hw/sh_pci.c +++ b/hw/sh_pci.c
@@ -23,8 +23,8 @@ */ #include "sysbus.h" #include "sh.h" -#include "pci.h" -#include "pci_host.h" +#include "pci/pci.h" +#include "pci/pci_host.h" #include "bswap.h" #include "exec-memory.h"
diff --git a/hw/smbus_ich9.c b/hw/smbus_ich9.c index d202664..b7bddc8 100644 --- a/hw/smbus_ich9.c +++ b/hw/smbus_ich9.c
@@ -27,7 +27,7 @@ #include "hw.h" #include "pc.h" #include "pm_smbus.h" -#include "pci.h" +#include "pci/pci.h" #include "sysemu.h" #include "i2c.h" #include "smbus.h"
diff --git a/hw/spapr.c b/hw/spapr.c index ad3f0ea..b0125a8 100644 --- a/hw/spapr.c +++ b/hw/spapr.c
@@ -41,11 +41,11 @@ #include "hw/spapr_vio.h" #include "hw/spapr_pci.h" #include "hw/xics.h" -#include "hw/msi.h" +#include "hw/pci/msi.h" #include "kvm.h" #include "kvm_ppc.h" -#include "pci.h" +#include "pci/pci.h" #include "exec-memory.h" #include "hw/usb.h"
diff --git a/hw/spapr_pci.c b/hw/spapr_pci.c index 3c5b855..2386164 100644 --- a/hw/spapr_pci.c +++ b/hw/spapr_pci.c
@@ -23,17 +23,17 @@ * THE SOFTWARE. */ #include "hw.h" -#include "pci.h" -#include "msi.h" -#include "msix.h" -#include "pci_host.h" +#include "pci/pci.h" +#include "pci/msi.h" +#include "pci/msix.h" +#include "pci/pci_host.h" #include "hw/spapr.h" #include "hw/spapr_pci.h" #include "exec-memory.h" #include <libfdt.h> #include "trace.h" -#include "hw/pci_internals.h" +#include "hw/pci/pci_internals.h" /* Copied from the kernel arch/powerpc/platforms/pseries/msi.c */ #define RTAS_QUERY_FN 0
diff --git a/hw/spapr_pci.h b/hw/spapr_pci.h index e307ac8..7b26ba1 100644 --- a/hw/spapr_pci.h +++ b/hw/spapr_pci.h
@@ -23,8 +23,8 @@ #if !defined(__HW_SPAPR_PCI_H__) #define __HW_SPAPR_PCI_H__ -#include "hw/pci.h" -#include "hw/pci_host.h" +#include "hw/pci/pci.h" +#include "hw/pci/pci_host.h" #include "hw/xics.h" #define SPAPR_MSIX_MAX_DEVS 32
diff --git a/hw/sun4u.c b/hw/sun4u.c index b2b51e3..47bcf93 100644 --- a/hw/sun4u.c +++ b/hw/sun4u.c
@@ -22,7 +22,7 @@ * THE SOFTWARE. */ #include "hw.h" -#include "pci.h" +#include "pci/pci.h" #include "apb_pci.h" #include "pc.h" #include "serial.h"
diff --git a/hw/unin_pci.c b/hw/unin_pci.c index 9981d94..4675792 100644 --- a/hw/unin_pci.c +++ b/hw/unin_pci.c
@@ -23,8 +23,8 @@ */ #include "hw.h" #include "ppc_mac.h" -#include "pci.h" -#include "pci_host.h" +#include "pci/pci.h" +#include "pci/pci_host.h" /* debug UniNorth */ //#define DEBUG_UNIN
diff --git a/hw/usb/hcd-ehci-pci.c b/hw/usb/hcd-ehci-pci.c index 41dbb53..8b04396 100644 --- a/hw/usb/hcd-ehci-pci.c +++ b/hw/usb/hcd-ehci-pci.c
@@ -16,7 +16,7 @@ */ #include "hw/usb/hcd-ehci.h" -#include "hw/pci.h" +#include "hw/pci/pci.h" #include "range.h" typedef struct EHCIPCIState {
diff --git a/hw/usb/hcd-ohci.c b/hw/usb/hcd-ohci.c index e16a2ec..4faf8e1 100644 --- a/hw/usb/hcd-ohci.c +++ b/hw/usb/hcd-ohci.c
@@ -29,7 +29,7 @@ #include "hw/hw.h" #include "qemu-timer.h" #include "hw/usb.h" -#include "hw/pci.h" +#include "hw/pci/pci.h" #include "hw/sysbus.h" #include "hw/qdev-dma.h"
diff --git a/hw/usb/hcd-uhci.c b/hw/usb/hcd-uhci.c index d053791..04c9446 100644 --- a/hw/usb/hcd-uhci.c +++ b/hw/usb/hcd-uhci.c
@@ -27,7 +27,7 @@ */ #include "hw/hw.h" #include "hw/usb.h" -#include "hw/pci.h" +#include "hw/pci/pci.h" #include "qemu-timer.h" #include "iov.h" #include "dma.h"
diff --git a/hw/usb/hcd-xhci.c b/hw/usb/hcd-xhci.c index efb509e..220c3b5 100644 --- a/hw/usb/hcd-xhci.c +++ b/hw/usb/hcd-xhci.c
@@ -21,9 +21,9 @@ #include "hw/hw.h" #include "qemu-timer.h" #include "hw/usb.h" -#include "hw/pci.h" -#include "hw/msi.h" -#include "hw/msix.h" +#include "hw/pci/pci.h" +#include "hw/pci/msi.h" +#include "hw/pci/msix.h" #include "trace.h" //#define DEBUG_XHCI
diff --git a/hw/versatile_pci.c b/hw/versatile_pci.c index e0c3ee3..7a543b4 100644 --- a/hw/versatile_pci.c +++ b/hw/versatile_pci.c
@@ -8,8 +8,8 @@ */ #include "sysbus.h" -#include "pci.h" -#include "pci_host.h" +#include "pci/pci.h" +#include "pci/pci_host.h" #include "exec-memory.h" typedef struct {
diff --git a/hw/versatilepb.c b/hw/versatilepb.c index 25e652b..41e39d8 100644 --- a/hw/versatilepb.c +++ b/hw/versatilepb.c
@@ -12,7 +12,7 @@ #include "devices.h" #include "net.h" #include "sysemu.h" -#include "pci.h" +#include "pci/pci.h" #include "i2c.h" #include "boards.h" #include "blockdev.h"
diff --git a/hw/vfio_pci.c b/hw/vfio_pci.c index 7c27834..45d90ab 100644 --- a/hw/vfio_pci.c +++ b/hw/vfio_pci.c
@@ -31,9 +31,9 @@ #include "exec-memory.h" #include "kvm.h" #include "memory.h" -#include "msi.h" -#include "msix.h" -#include "pci.h" +#include "pci/msi.h" +#include "pci/msix.h" +#include "pci/pci.h" #include "qemu-common.h" #include "qemu-error.h" #include "qemu-queue.h"
diff --git a/hw/vga-pci.c b/hw/vga-pci.c index 947e35c..0cb318e 100644 --- a/hw/vga-pci.c +++ b/hw/vga-pci.c
@@ -25,7 +25,7 @@ */ #include "hw.h" #include "console.h" -#include "pci.h" +#include "pci/pci.h" #include "vga_int.h" #include "pixel_ops.h" #include "qemu-timer.h"
diff --git a/hw/vga.c b/hw/vga.c index 2b0200a..6d56f8a 100644 --- a/hw/vga.c +++ b/hw/vga.c
@@ -25,7 +25,7 @@ #include "vga.h" #include "console.h" #include "pc.h" -#include "pci.h" +#include "pci/pci.h" #include "vga_int.h" #include "pixel_ops.h" #include "qemu-timer.h"
diff --git a/hw/virtio-balloon.h b/hw/virtio-balloon.h index 73300dd..b1828f4 100644 --- a/hw/virtio-balloon.h +++ b/hw/virtio-balloon.h
@@ -16,7 +16,7 @@ #define _QEMU_VIRTIO_BALLOON_H #include "virtio.h" -#include "pci.h" +#include "pci/pci.h" /* from Linux's linux/virtio_balloon.h */
diff --git a/hw/virtio-net.h b/hw/virtio-net.h index 36aa463..b13be7c 100644 --- a/hw/virtio-net.h +++ b/hw/virtio-net.h
@@ -16,7 +16,7 @@ #include "virtio.h" #include "net.h" -#include "pci.h" +#include "pci/pci.h" #define ETH_ALEN 6
diff --git a/hw/virtio-pci.c b/hw/virtio-pci.c index 71f4fb5..e9b722d 100644 --- a/hw/virtio-pci.c +++ b/hw/virtio-pci.c
@@ -22,10 +22,10 @@ #include "virtio-net.h" #include "virtio-serial.h" #include "virtio-scsi.h" -#include "pci.h" +#include "pci/pci.h" #include "qemu-error.h" -#include "msi.h" -#include "msix.h" +#include "pci/msi.h" +#include "pci/msix.h" #include "net.h" #include "loader.h" #include "kvm.h"
diff --git a/hw/virtio-scsi.h b/hw/virtio-scsi.h index 91924f6..7d7cba7 100644 --- a/hw/virtio-scsi.h +++ b/hw/virtio-scsi.h
@@ -16,7 +16,7 @@ #include "virtio.h" #include "net.h" -#include "pci.h" +#include "pci/pci.h" /* The ID for virtio_scsi */ #define VIRTIO_ID_SCSI 8
diff --git a/hw/vmware_vga.c b/hw/vmware_vga.c index 834588d..333ec8c 100644 --- a/hw/vmware_vga.c +++ b/hw/vmware_vga.c
@@ -24,7 +24,7 @@ #include "hw.h" #include "loader.h" #include "console.h" -#include "pci.h" +#include "pci/pci.h" #undef VERBOSE #define HW_RECT_ACCEL
diff --git a/hw/vt82c686.c b/hw/vt82c686.c index 57d16c0..f963912 100644 --- a/hw/vt82c686.c +++ b/hw/vt82c686.c
@@ -15,7 +15,7 @@ #include "vt82c686.h" #include "i2c.h" #include "smbus.h" -#include "pci.h" +#include "pci/pci.h" #include "isa.h" #include "sysbus.h" #include "mips.h" @@ -27,7 +27,7 @@ #include "exec-memory.h" typedef uint32_t pci_addr_t; -#include "pci_host.h" +#include "pci/pci_host.h" //#define DEBUG_VT82C686B #ifdef DEBUG_VT82C686B
diff --git a/hw/wdt_i6300esb.c b/hw/wdt_i6300esb.c index da15c73..1817742 100644 --- a/hw/wdt_i6300esb.c +++ b/hw/wdt_i6300esb.c
@@ -25,7 +25,7 @@ #include "qemu-timer.h" #include "watchdog.h" #include "hw.h" -#include "pci.h" +#include "pci/pci.h" /*#define I6300ESB_DEBUG 1*/
diff --git a/hw/xen-host-pci-device.h b/hw/xen-host-pci-device.h index 0079dac..942b24d 100644 --- a/hw/xen-host-pci-device.h +++ b/hw/xen-host-pci-device.h
@@ -1,7 +1,7 @@ #ifndef XEN_HOST_PCI_DEVICE_H #define XEN_HOST_PCI_DEVICE_H -#include "pci.h" +#include "pci/pci.h" enum { XEN_HOST_PCI_REGION_TYPE_IO = 1 << 1,
diff --git a/hw/xen_apic.c b/hw/xen_apic.c index fc45366..a6632fe 100644 --- a/hw/xen_apic.c +++ b/hw/xen_apic.c
@@ -10,7 +10,7 @@ * later. See the COPYING file in the top-level directory. */ #include "hw/apic_internal.h" -#include "hw/msi.h" +#include "hw/pci/msi.h" #include "xen.h" static uint64_t xen_apic_mem_read(void *opaque, hwaddr addr,
diff --git a/hw/xen_platform.c b/hw/xen_platform.c index a54e7a2..10bb560 100644 --- a/hw/xen_platform.c +++ b/hw/xen_platform.c
@@ -27,7 +27,7 @@ #include "hw.h" #include "pc.h" -#include "pci.h" +#include "pci/pci.h" #include "irq.h" #include "xen_common.h" #include "net.h"
diff --git a/hw/xen_pt.c b/hw/xen_pt.c index 7a3846e..c782cdb 100644 --- a/hw/xen_pt.c +++ b/hw/xen_pt.c
@@ -54,7 +54,7 @@ #include <sys/ioctl.h> -#include "pci.h" +#include "pci/pci.h" #include "xen.h" #include "xen_backend.h" #include "xen_pt.h"
diff --git a/hw/xen_pt.h b/hw/xen_pt.h index f15e69a..e349730 100644 --- a/hw/xen_pt.h +++ b/hw/xen_pt.h
@@ -3,7 +3,7 @@ #include "qemu-common.h" #include "xen_common.h" -#include "pci.h" +#include "pci/pci.h" #include "xen-host-pci-device.h" void xen_pt_log(const PCIDevice *d, const char *f, ...) GCC_FMT_ATTR(2, 3);
diff --git a/hw/xio3130_downstream.c b/hw/xio3130_downstream.c index 0d8a5e7..2dcd46b 100644 --- a/hw/xio3130_downstream.c +++ b/hw/xio3130_downstream.c
@@ -19,9 +19,9 @@ * with this program; if not, see <http://www.gnu.org/licenses/>. */ -#include "pci_ids.h" -#include "msi.h" -#include "pcie.h" +#include "pci/pci_ids.h" +#include "pci/msi.h" +#include "pci/pcie.h" #include "xio3130_downstream.h" #define PCI_DEVICE_ID_TI_XIO3130D 0x8233 /* downstream port */
diff --git a/hw/xio3130_downstream.h b/hw/xio3130_downstream.h index 010487f..559dff6 100644 --- a/hw/xio3130_downstream.h +++ b/hw/xio3130_downstream.h
@@ -1,7 +1,7 @@ #ifndef QEMU_XIO3130_DOWNSTREAM_H #define QEMU_XIO3130_DOWNSTREAM_H -#include "pcie_port.h" +#include "pci/pcie_port.h" PCIESlot *xio3130_downstream_init(PCIBus *bus, int devfn, bool multifunction, const char *bus_name, pci_map_irq_fn map_irq,
diff --git a/hw/xio3130_upstream.c b/hw/xio3130_upstream.c index d46b86c..713caf2 100644 --- a/hw/xio3130_upstream.c +++ b/hw/xio3130_upstream.c
@@ -19,9 +19,9 @@ * with this program; if not, see <http://www.gnu.org/licenses/>. */ -#include "pci_ids.h" -#include "msi.h" -#include "pcie.h" +#include "pci/pci_ids.h" +#include "pci/msi.h" +#include "pci/pcie.h" #include "xio3130_upstream.h" #define PCI_DEVICE_ID_TI_XIO3130U 0x8232 /* upstream port */
diff --git a/hw/xio3130_upstream.h b/hw/xio3130_upstream.h index e996997..fa09656 100644 --- a/hw/xio3130_upstream.h +++ b/hw/xio3130_upstream.h
@@ -1,7 +1,7 @@ #ifndef QEMU_XIO3130_UPSTREAM_H #define QEMU_XIO3130_UPSTREAM_H -#include "pcie_port.h" +#include "pci/pcie_port.h" PCIEPort *xio3130_upstream_init(PCIBus *bus, int devfn, bool multifunction, const char *bus_name, pci_map_irq_fn map_irq,
diff --git a/kvm-all.c b/kvm-all.c index 8e9a8d8..bfa09ad 100644 --- a/kvm-all.c +++ b/kvm-all.c
@@ -26,7 +26,7 @@ #include "qemu-config.h" #include "sysemu.h" #include "hw/hw.h" -#include "hw/msi.h" +#include "hw/pci/msi.h" #include "gdbstub.h" #include "kvm.h" #include "bswap.h"
diff --git a/kvm-stub.c b/kvm-stub.c index a3455e2..d65fd04 100644 --- a/kvm-stub.c +++ b/kvm-stub.c
@@ -12,7 +12,7 @@ #include "qemu-common.h" #include "hw/hw.h" -#include "hw/msi.h" +#include "hw/pci/msi.h" #include "cpu.h" #include "gdbstub.h" #include "kvm.h"
diff --git a/monitor.c b/monitor.c index c0e32d6..a92ab44 100644 --- a/monitor.c +++ b/monitor.c
@@ -27,7 +27,7 @@ #include "hw/usb.h" #include "hw/pcmcia.h" #include "hw/pc.h" -#include "hw/pci.h" +#include "hw/pci/pci.h" #include "hw/watchdog.h" #include "hw/loader.h" #include "gdbstub.h"
diff --git a/target-i386/kvm.c b/target-i386/kvm.c index f669281..0901589 100644 --- a/target-i386/kvm.c +++ b/target-i386/kvm.c
@@ -31,7 +31,7 @@ #include "hw/apic.h" #include "ioport.h" #include "hyperv.h" -#include "hw/pci.h" +#include "hw/pci/pci.h" //#define DEBUG_KVM
diff --git a/xen-all.c b/xen-all.c index 046cc2a..e3a51cc 100644 --- a/xen-all.c +++ b/xen-all.c
@@ -10,7 +10,7 @@ #include <sys/mman.h> -#include "hw/pci.h" +#include "hw/pci/pci.h" #include "hw/pc.h" #include "hw/xen_common.h" #include "hw/xen_backend.h"