From: Anthony Liguori <aliguori@us.ibm.com>
Date: Mon, 11 Mar 2013 00:39:07 +0000 (-0500)
Subject: Merge remote-tracking branch 'bonzini/hw-dirs' into staging
X-Git-Tag: v1.5.0-rc0~487
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6e72a00f909dcd093fbdd1faa2b3c8caa1697a6c;p=thirdparty%2Fqemu.git

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>
---

6e72a00f909dcd093fbdd1faa2b3c8caa1697a6c
diff --cc backends/baum.c
index d8919d54deb,37ccca82110..9063aea2cf7
--- a/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 hw/a15mpcore.c
index 97abe413c88,d973d53f0a4..648656d5b48
--- a/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 0e7df6098ad,aebbc866e24..2d9c69dfce2
--- a/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 394bc93cb94,a7ad893cc2f..82236006d2a
--- a/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/dataplane/virtio-blk.c
index aa9b04078bb,8319c94b766..dfe5f9b9cdd
--- a/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 */