Commit a2cb15b0 authored by Michael S. Tsirkin's avatar Michael S. Tsirkin

pci: update all users to look in pci/

update all users so we can remove the makefile hack.
Signed-off-by: default avatarMichael S. Tsirkin <mst@redhat.com>
parent 315a1350
......@@ -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"
......
......@@ -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 {
......
......@@ -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"
......
......@@ -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"
......
......@@ -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"
......
......@@ -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"
......
......@@ -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"
......
......@@ -22,7 +22,7 @@
#include "apm.h"
#include "hw.h"
#include "pci.h"
#include "pci/pci.h"
//#define DEBUG
......
......@@ -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"
......
......@@ -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"
......
......@@ -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
......
......@@ -26,7 +26,7 @@
#include "hw.h"
#include "pci.h"
#include "pci/pci.h"
#include "net.h"
#include "net/checksum.h"
#include "loader.h"
......
......@@ -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"
......
......@@ -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:
......
......@@ -23,7 +23,7 @@
* THE SOFTWARE.
*/
#include "pci.h"
#include "pci/pci.h"
#include "eeprom93xx.h"
#include "esp.h"
#include "trace.h"
......
......@@ -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
......
......@@ -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"
......
......@@ -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"
......
......@@ -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"
......
......@@ -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"
......
......@@ -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);
......
......@@ -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
......
......@@ -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"
......
......@@ -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"
......
......@@ -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"
......
......@@ -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"
......
......@@ -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"
......
......@@ -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"
......
......@@ -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"
......
......@@ -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"
......
......@@ -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 */
......
#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,
......
......@@ -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"
......
......@@ -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,
......
......@@ -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
......
......@@ -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"
......
......@@ -13,7 +13,7 @@
#include <assert.h>
#include "hw.h"
#include "pci.h"
#include "pci/pci.h"
#include "scsi.h"
#include "dma.h"
......
......@@ -24,7 +24,7 @@
*/
#include "hw.h"
#include "ppc_mac.h"
#include "pci.h"
#include "pci/pci.h"
#include "escc.h"
typedef struct MacIOState
......
......@@ -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"
......
......@@ -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"
......
......@@ -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"
......
......@@ -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"
......
......@@ -35,7 +35,7 @@
*/
#include "hw.h"
#include "ppc_mac.h"
#include "pci.h"
#include "pci/pci.h"
#include "openpic.h"
//#define DEBUG_OPENPIC
......
......@@ -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"
......
......@@ -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"
......
......@@ -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
......
......@@ -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"
......
......@@ -24,7 +24,7 @@
#include "hw.h"
#include "pc.h"
#include "pci.h"
#include "pci/pci.h"
#include "isa.h"
#include "sysbus.h"
......
......@@ -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"
......
......@@ -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"
......
......@@ -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"
......
......@@ -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,
......
......@@ -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
......
......@@ -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"
......
......@@ -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"
......
......@@ -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"
......
......@@ -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
......
......@@ -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"
......
......@@ -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"
......
......@@ -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"
......
......@@ -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"
......
......@@ -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"
......
......@@ -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"
......
......@@ -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
......
......@@ -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"
......
......@@ -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"
......
......@@ -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"
......
......@@ -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"