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>

diff --cc backends/baum.c
index d8919d54deb76f33e2a84bc712f6997d7ae44655,37ccca8211078e208ca0cce711fbcad62fc383a0..9063aea2cf7681d8b102134623f772b10e46e8e1
--- 1/hw/baum.c
--- 2/backends/baum.c
+++ b/backends/baum.c
@@@ -24,7 -24,8 +24,7 @@@
  #include "qemu-common.h"
  #include "char/char.h"
  #include "qemu/timer.h"
- #include "usb.h"
+ #include "hw/usb.h"
 -#include "char/baum.h"
  #include <brlapi.h>
  #include <brlapi_constants.h>
  #include <brlapi_keycodes.h>

diff --cc backends/msmouse.c
Simple merge

diff --cc configure
Simple merge

diff --cc hw/a15mpcore.c
index 97abe413c884eb6307cc816393ad5e76eaf9c8d4,d973d53f0a4cb6417f0d471a323baaf5fc3e2870..648656d5b48b6911e382f7f214fb613ad97889f0
--- 1/hw/a15mpcore.c
--- 2/hw/a15mpcore.c
+++ b/hw/a15mpcore.c
@@@ -18,8 -18,7 +18,8 @@@
   * with this program; if not, see <http://www.gnu.org/licenses/>.
   */
  
- #include "sysbus.h"
+ #include "hw/sysbus.h"
 +#include "sysemu/kvm.h"
  
  /* A15MP private memory region.  */
  

diff --cc hw/arm/Makefile.objs
index 0e7df6098ad2088b7eb09b89b491ed12d6ecd134,aebbc866e24ecd847fef04a1f2dac9656a9d851f..2d9c69dfce2b208825f1e7b0391df2c5d081ed26
--- 1/hw/arm/Makefile.objs
--- 2/hw/arm/Makefile.objs
+++ b/hw/arm/Makefile.objs
@@@ -10,28 -8,28 +8,30 @@@ obj-y += exynos4210_uart.o exynos4210_p
  obj-y += exynos4210_pmu.o exynos4210_mct.o exynos4210_fimd.o
  obj-y += exynos4210_rtc.o exynos4210_i2c.o
  obj-y += arm_mptimer.o a15mpcore.o
- obj-y += armv7m.o armv7m_nvic.o stellaris.o stellaris_enet.o
- obj-y += highbank.o
- obj-y += pxa2xx.o pxa2xx_pic.o pxa2xx_gpio.o pxa2xx_timer.o pxa2xx_dma.o
+ obj-y += armv7m_nvic.o stellaris_enet.o
+ obj-y += pxa2xx_timer.o pxa2xx_dma.o
  obj-y += pxa2xx_lcd.o pxa2xx_mmci.o pxa2xx_pcmcia.o pxa2xx_keypad.o
- obj-y += gumstix.o
- obj-y += zaurus.o ide/microdrive.o spitz.o tosa.o tc6393xb.o
- obj-y += omap1.o omap_lcdc.o omap_dma.o omap_clk.o omap_mmc.o omap_i2c.o \
+ obj-y += zaurus.o ide/microdrive.o tc6393xb.o
+ obj-y += omap_lcdc.o omap_dma.o omap_clk.o omap_mmc.o omap_i2c.o \
                  omap_gpio.o omap_intc.o omap_uart.o
- obj-y += omap2.o omap_dss.o soc_dma.o omap_gptimer.o omap_synctimer.o \
+ obj-y += omap_dss.o soc_dma.o omap_gptimer.o omap_synctimer.o \
                  omap_gpmc.o omap_sdrc.o omap_spi.o omap_tap.o omap_l4.o
- obj-y += omap_sx1.o palm.o tsc210x.o
- obj-y += nseries.o blizzard.o onenand.o cbus.o tusb6010.o usb/hcd-musb.o
- obj-y += mst_fpga.o mainstone.o
- obj-y += z2.o
- obj-y += musicpal.o bitbang_i2c.o marvell_88w8618_audio.o
+ obj-y += tsc210x.o
+ obj-y += blizzard.o onenand.o cbus.o tusb6010.o usb/hcd-musb.o
+ obj-y += mst_fpga.o
+ obj-y += bitbang_i2c.o marvell_88w8618_audio.o
  obj-y += framebuffer.o
- obj-y += vexpress.o
  obj-y += strongarm.o
- obj-y += collie.o
  obj-y += imx_serial.o imx_ccm.o imx_timer.o imx_avic.o
- obj-y += kzm.o
 +obj-$(CONFIG_FDT) += ../device_tree.o
 +obj-$(CONFIG_KVM) += kvm/arm_gic.o
  
  obj-y := $(addprefix ../,$(obj-y))
+ 
+ obj-y += boot.o collie.o exynos4_boards.o gumstix.o highbank.o
+ obj-y += integratorcp.o kzm.o mainstone.o musicpal.o nseries.o
+ obj-y += omap_sx1.o palm.o pic_cpu.o realview.o spitz.o stellaris.o
+ obj-y += tosa.o versatilepb.o vexpress.o xilinx_zynq.o z2.o
+ 
+ obj-y += armv7m.o exynos4210.o pxa2xx.o pxa2xx_gpio.o pxa2xx_pic.o
+ obj-y += omap1.o omap2.o

diff --cc hw/arm/pic_cpu.c
index 394bc93cb9435a15598a8b7ad9e6f119a4599367,a7ad893cc2f89b4fc0ac3a147813e39ad42982a6..82236006d2ad98d5f9820a8ec78962c2eff173d1
--- 1/hw/arm_pic.c
--- 2/hw/arm/pic_cpu.c
+++ b/hw/arm/pic_cpu.c
@@@ -7,9 -7,8 +7,9 @@@
   * This code is licensed under the LGPL
   */
  
- #include "hw.h"
- #include "arm-misc.h"
+ #include "hw/hw.h"
+ #include "hw/arm-misc.h"
 +#include "sysemu/kvm.h"
  
  /* Input 0 is IRQ and input 1 is FIQ.  */
  static void arm_pic_cpu_handler(void *opaque, int irq, int level)

diff --cc hw/arm_gic.c
Simple merge

diff --cc hw/arm_gic_common.c
Simple merge

diff --cc hw/arm_gic_internal.h
Simple merge

diff --cc hw/armv7m_nvic.c
Simple merge

diff --cc hw/dataplane/virtio-blk.c
index aa9b04078bb59296d4a40d3372231814265810d6,8319c94b766e979821a43389856ceeb1428bd89a..dfe5f9b9cdd3d4a5edfd76625beee50194c34f7a
--- 1/hw/dataplane/virtio-blk.c
--- 2/hw/dataplane/virtio-blk.c
+++ b/hw/dataplane/virtio-blk.c
@@@ -14,13 -14,15 +14,15 @@@
  
  #include "trace.h"
  #include "qemu/iov.h"
 -#include "event-poll.h"
  #include "qemu/thread.h"
+ #include "qemu/error-report.h"
  #include "vring.h"
  #include "ioq.h"
  #include "migration/migration.h"
+ #include "block/block.h"
  #include "hw/virtio-blk.h"
 -#include "virtio-blk.h"
 +#include "hw/dataplane/virtio-blk.h"
 +#include "block/aio.h"
  
  enum {
      SEG_MAX = 126,                  /* maximum number of I/O segments */

diff --cc hw/e1000.c
Simple merge

diff --cc hw/i386/pc_piix.c
Simple merge

diff --cc hw/ich9.h
Simple merge

diff --cc hw/lpc_ich9.c
Simple merge

diff --cc hw/macio.c
Simple merge

diff --cc hw/milkymist-hw.h
Simple merge

diff --cc hw/nand.c
Simple merge

diff --cc hw/pc.h
Simple merge

diff --cc hw/piix_pci.c
Simple merge

diff --cc hw/scsi-bus.c
Simple merge

diff --cc hw/scsi-disk.c
Simple merge

diff --cc hw/serial.c
Simple merge

diff --cc hw/serial.h
Simple merge

diff --cc hw/sysbus.c
Simple merge

diff --cc hw/sysbus.h
Simple merge

diff --cc hw/vhost.c
Simple merge

diff --cc hw/virtio-blk.c
Simple merge

diff --cc hw/virtio-console.c
Simple merge

diff --cc hw/virtio-net.c
Simple merge

diff --cc hw/virtio-pci.c
Simple merge

diff --cc hw/virtio-serial-bus.c
Simple merge

diff --cc vl.c
Simple merge