Commit 6e72a00f authored by Anthony Liguori's avatar Anthony Liguori
Browse files

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: default avatarAnthony Liguori <aliguori@us.ibm.com>
parents 6a245c66 7a2771d1

Makefile.objs

+1 −0
Original line number Diff line number Diff line
@@ -51,6 +51,7 @@ ifeq ($(CONFIG_SOFTMMU),y) 
common-obj-y = $(block-obj-y) blockdev.o blockdev-nbd.o block/

common-obj-y += net/

common-obj-y += readline.o

common-obj-y += qdev-monitor.o device-hotplug.o

common-obj-$(CONFIG_WIN32) += os-win32.o

common-obj-$(CONFIG_POSIX) += os-posix.o

Makefile.target

+1 −0
Original line number Diff line number Diff line
@@ -111,6 +111,7 @@ CONFIG_NO_CORE_DUMP = $(if $(subst n,,$(CONFIG_HAVE_CORE_DUMP)),n,y) 
obj-y += arch_init.o cpus.o monitor.o gdbstub.o balloon.o ioport.o

obj-y += qtest.o

obj-y += hw/

obj-$(CONFIG_FDT) += device_tree.o

obj-$(CONFIG_KVM) += kvm-all.o

obj-$(CONFIG_NO_KVM) += kvm-stub.o

obj-y += memory.o savevm.o cputlb.o

backends/Makefile.objs

+4 −0
Original line number Diff line number Diff line 
common-obj-y += rng.o rng-egd.o

common-obj-$(CONFIG_POSIX) += rng-random.o



common-obj-y += msmouse.o

common-obj-$(CONFIG_BRLAPI) += baum.o

$(obj)/baum.o: QEMU_CFLAGS += $(SDL_CFLAGS)

hw/baum.c→backends/baum.c

+1 −1
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ 
#include "qemu-common.h"

#include "char/char.h"

#include "qemu/timer.h"

#include "usb.h"

#include "hw/usb.h"

#include <brlapi.h>

#include <brlapi_constants.h>

#include <brlapi_keycodes.h>

hw/msmouse.c→backends/msmouse.c

+0 −0

File moved.

View file