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
..
hostmem.c	dataplane: add host memory mapping code	2013-01-02 15:50:32 +01:00
hostmem.h	dataplane: add host memory mapping code	2013-01-02 15:50:32 +01:00
ioq.c	hw: include hw header files with full paths	2013-03-01 15:01:17 +01:00
ioq.h	dataplane: add Linux AIO request queue	2013-01-02 15:58:03 +01:00
Makefile.objs	dataplane: remove EventPoll in favor of AioContext	2013-03-04 09:54:17 +01:00
virtio-blk.c	Merge remote-tracking branch 'bonzini/hw-dirs' into staging	2013-03-10 19:56:35 -05:00
virtio-blk.h	dataplane: add virtio-blk data plane code	2013-01-02 16:08:47 +01:00
vring.c	hw: include hw header files with full paths	2013-03-01 15:01:17 +01:00
vring.h	hw: include hw header files with full paths	2013-03-01 15:01:17 +01:00