Merge branch 'master' of git://git.sv.gnu.org/qemu

* 'master' of git://git.sv.gnu.org/qemu: (116 commits)
  kvm: add error message for when SMP is requested
  Remove initrd warning message
  initialize struct sigevent before timer_create
  Fix NULL alarm_timer pointer at exit
  keep initrd in below 4g area.
  migrate.c: migrate_fd_put_buffer: Do not busyloop: stop writing if EWOULDBLOCK
  kvm: work around supported cpuid ioctl() brokenness
  remove gcc 3.x requirement from documentation
  Remove dead code
  Format per CODING_STYLE
  Abort on attempts to allocate zero bytes
  Unbreak out-of-tree builds
  Hardware convenience library
  Disable >4G ram support on 32-bit targets
  Only define __llseek if it is going to be used
  Avoid implicit truncation compiler warnings
  Remove obsolete BIOS_SIZE from sysemu.h
  cris: First shot at qdev for CRIS interrupts.
  etrax: Don't keep the passed irq pointer.
  etrax: Remove unused eth irq line.
  ...

Conflicts:
	Makefile
	Makefile.target
	block/raw-posix.c
	configure
	hw/boards.h
	hw/pc.h
	hw/pci.c
	hw/virtio-console.c
	target-ppc/cpu.h
	vl.c

Signed-off-by: Avi Kivity <avi@redhat.com>

1 files changed, 3 insertions, 0 deletions

diff --git a/osdep.c b/osdep.c
index bd6234b22..31098055c 100644
--- a/osdep.c
+++ b/osdep.c
@@ -33,6 +33,9 @@
 #include <sys/statvfs.h>
 #endif
 
+/* FIXME: This file should be target independent. However it has kqemu
+   hacks, so must be built for every target.  */
+
 /* Needed early for HOST_BSD etc. */
 #include "config-host.h"