Anthony Liguori 6e72a00f90 Merge remote-tracking branch 'bonzini/hw-dirs' into staging ... * bonzini/hw-dirs: sh: move files referencing CPU to hw/sh4/ ppc: move more files to hw/ppc ppc: move files referencing CPU to hw/ppc/ m68k: move files referencing CPU to hw/m68k/ i386: move files referencing CPU to hw/i386/ arm: move files referencing CPU to hw/arm/ hw: move boards and other isolated files to hw/ARCH ppc: express FDT dependency of pSeries and e500 boards via default-configs/ build: always link device_tree.o into emulators if libfdt available hw: include hw header files with full paths ppc: do not use ../ in include files vt82c686: vt82c686 is not a PCI host bridge virtio-9p: remove PCI dependencies from hw/9pfs/ virtio-9p: use CONFIG_VIRTFS, not CONFIG_LINUX hw: move device-hotplug.o to toplevel, compile it once hw: move qdev-monitor.o to toplevel directory hw: move fifo.[ch] to libqemuutil hw: move char backends to backends/ Conflicts: backends/baum.c backends/msmouse.c hw/a15mpcore.c hw/arm/Makefile.objs hw/arm/pic_cpu.c hw/dataplane/event-poll.c hw/dataplane/virtio-blk.c include/char/baum.h include/char/msmouse.h qemu-char.c vl.c Resolve conflicts caused by header movements. Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>		2013-03-10 19:56:35 -05:00
..
Makefile.objs	build: remove extra-obj-y	2013-01-26 13:15:37 +00:00
msi.c	misc: move include files to include/qemu/	2012-12-19 08:32:39 +01:00
msi.h
msix.c	msix: add api to access msix message	2013-01-07 19:42:22 +02:00
msix.h	msix: add api to access msix message	2013-01-07 19:42:22 +02:00
pci_bridge.c	misc: move include files to include/qemu/	2012-12-19 08:32:39 +01:00
pci_bridge.h
pci_bus.h
pci_host.c
pci_host.h	pci_host: Drop write-only address_space field	2013-03-08 13:15:27 +01:00
pci_ids.h	Add TEWS TPCI200 IndustryPack emulation	2013-01-14 13:26:12 -06:00
pci_regs.h
pci-hotplug.c	softmmu: move include files to include/sysemu/	2012-12-19 08:32:45 +01:00
pci-stub.c	softmmu: move include files to include/sysemu/	2012-12-19 08:32:45 +01:00
pci.c	error: Strip trailing '\n' from error string arguments (again)	2013-02-11 08:13:19 -06:00
pci.h	pci: use constants for devices under the 1B36 device ID, document them	2013-01-09 12:10:28 +02:00
pcie_aer.c	softmmu: move include files to include/sysemu/	2012-12-19 08:32:45 +01:00
pcie_aer.h
pcie_host.c	exec: move include files to include/exec/	2012-12-19 08:31:31 +01:00
pcie_host.h	exec: move include files to include/exec/	2012-12-19 08:31:31 +01:00
pcie_port.c
pcie_port.h
pcie_regs.h
pcie.c	pcie: Fix bug in pcie_ext_cap_set_next	2012-12-26 11:49:28 +02:00
pcie.h
shpc.c	hw: move qdev-monitor.o to toplevel directory	2013-03-01 13:54:10 +01:00
shpc.h	migration: move include files to include/migration/	2012-12-19 08:31:32 +01:00
slotid_cap.c	hw: move qdev-monitor.o to toplevel directory	2013-03-01 13:54:10 +01:00
slotid_cap.h