Skip to content

Commit

Permalink
pci: update all users to look in pci/
Browse files Browse the repository at this point in the history 
update all users so we can remove the makefile hack.

Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
  • Loading branch information
@mstsirkin
mstsirkin committed Dec 17, 2012
1 parent 315a135 commit a2cb15b
Show file tree
Hide file tree
Showing 102 changed files with 159 additions and 159 deletions.
2 changes: 1 addition & 1 deletion arch_init.c
View file
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion hw/ac97.c
View file
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion hw/acpi_ich9.c
View file
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion hw/acpi_piix4.c
View file
Expand Up @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions hw/alpha_sys.h
View file
Expand Up @@ -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"
Expand Down
8 changes: 4 additions & 4 deletions hw/apb_pci.c
View file
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion hw/apic.c
View file
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion hw/apm.c
View file
Expand Up @@ -22,7 +22,7 @@

#include "apm.h"
#include "hw.h"
#include "pci.h"
#include "pci/pci.h"

//#define DEBUG

Expand Down
4 changes: 2 additions & 2 deletions hw/bonito.c
View file
Expand Up @@ -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"

Expand Down
2 changes: 1 addition & 1 deletion hw/cirrus_vga.c
View file
Expand Up @@ -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"
Expand Down
8 changes: 4 additions & 4 deletions hw/dec_pci.c
View file
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion hw/e1000.c
View file
Expand Up @@ -26,7 +26,7 @@


#include "hw.h"
#include "pci.h"
#include "pci/pci.h"
#include "net.h"
#include "net/checksum.h"
#include "loader.h"
Expand Down
2 changes: 1 addition & 1 deletion hw/eepro100.c
View file
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion hw/es1370.c
View file
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion hw/esp-pci.c
View file
Expand Up @@ -23,7 +23,7 @@
* THE SOFTWARE.
*/

#include "pci.h"
#include "pci/pci.h"
#include "eeprom93xx.h"
#include "esp.h"
#include "trace.h"
Expand Down
4 changes: 2 additions & 2 deletions hw/grackle_pci.c
View file
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions hw/gt64xxx.c
View file
Expand Up @@ -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"

Expand Down
2 changes: 1 addition & 1 deletion hw/hda-audio.c
View file
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion hw/i82378.c
View file
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion hw/i82801b11.c
View file
Expand Up @@ -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"


Expand Down
8 changes: 4 additions & 4 deletions hw/ich9.h
View file
Expand Up @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion hw/ide.h
View file
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions hw/ide/ahci.c
View file
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion hw/ide/cmd646.c
View file
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion hw/ide/core.c
View file
Expand Up @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions hw/ide/ich.c
View file
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion hw/ide/pci.c
View file
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion hw/ide/piix.c
View file
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion hw/ide/via.c
View file
Expand Up @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions hw/intel-hda.c
View file
Expand Up @@ -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"
Expand Down
6 changes: 3 additions & 3 deletions hw/ioh3420.c
View file
Expand Up @@ -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 */
Expand Down
2 changes: 1 addition & 1 deletion hw/ioh3420.h
View file
@@ -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,
Expand Down
4 changes: 2 additions & 2 deletions hw/ivshmem.c
View file
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion hw/kvm/apic.c
View file
Expand Up @@ -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,
Expand Down
4 changes: 2 additions & 2 deletions hw/kvm/pci-assign.c
View file
Expand Up @@ -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
Expand Down
8 changes: 4 additions & 4 deletions hw/lpc_ich9.c
View file
Expand Up @@ -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"

Expand Down
2 changes: 1 addition & 1 deletion hw/lsi53c895a.c
View file
Expand Up @@ -13,7 +13,7 @@
#include <assert.h>

#include "hw.h"
#include "pci.h"
#include "pci/pci.h"
#include "scsi.h"
#include "dma.h"

Expand Down
2 changes: 1 addition & 1 deletion hw/macio.c
View file
Expand Up @@ -24,7 +24,7 @@
*/
#include "hw.h"
#include "ppc_mac.h"
#include "pci.h"
#include "pci/pci.h"
#include "escc.h"

typedef struct MacIOState
Expand Down

0 comments on commit a2cb15b

Please sign in to comment.