OpenE2K
/
qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity
qemu-e2k/util
History
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 hw: move fifo.[ch] to libqemuutil 2013-03-01 13:53:10 +01:00
acl.c acl: Free memory allocated with g_malloc() with g_free() 2013-01-15 18:25:41 -06:00
aes.c
…
bitmap.c
…
bitops.c bitops: Replace bitops_ctol with ctzl 2013-02-16 11:12:45 +00:00
cache-utils.c
…
compatfd.c
…
cutils.c cutils: unsigned int parsing functions 2013-02-04 14:38:33 -06:00
envlist.c util: Fix compilation of envlist.c for MinGW 2013-02-02 20:13:19 +00:00
error.c
…
event_notifier-posix.c
…
event_notifier-win32.c
…
fifo8.c hw: move fifo.[ch] to libqemuutil 2013-03-01 13:53:10 +01:00
hbitmap.c hbitmap: Use non-bitops ctzl 2013-02-16 11:11:34 +00:00
host-utils.c host-utils: Improve mulu64 and muls64 2013-02-17 14:28:58 +00:00
iov.c qemu/iovec: Don't assert if sbytes is zero 2013-02-06 08:29:50 -06:00
module.c
…
notify.c
…
osdep.c osdep: replace setsockopt by qemu_setsockopt 2013-03-08 10:22:14 +01:00
oslib-posix.c oslib-posix: Align to permit transparent hugepages on ARM Linux 2013-03-05 00:34:40 +00:00
oslib-win32.c
…
path.c Replace non-portable asprintf by g_strdup_printf 2013-01-19 10:24:43 +00:00
qemu-config.c hw: move qdev-monitor.o to toplevel directory 2013-03-01 13:54:10 +01:00
qemu-error.c
…
qemu-option.c qemu-option: Disable two helpful messages that got broken recently 2013-02-11 08:13:19 -06:00
qemu-progress.c
…
qemu-sockets.c char-socket: fix error reporting 2013-03-08 13:57:12 -06:00
qemu-thread-posix.c
…
qemu-thread-win32.c
…
qemu-timer-common.c
…
uri.c
…