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, 9 insertions, 1 deletions

diff --git a/qemu-common.h b/qemu-common.h
index ae334421e..2dcb224ea 100644
--- a/qemu-common.h
+++ b/qemu-common.h
@@ -23,6 +23,7 @@
 #include <unistd.h>
 #include <fcntl.h>
 #include <sys/stat.h>
+#include <assert.h>
 #include "config-host.h"
 
 #ifndef O_LARGEFILE
@@ -177,7 +178,12 @@ typedef struct PCIBus PCIBus;
 typedef struct PCIDevice PCIDevice;
 typedef struct SerialState SerialState;
 typedef struct IRQState *qemu_irq;
-struct pcmcia_card_s;
+typedef struct PCMCIACardState PCMCIACardState;
+typedef struct MouseTransformInfo MouseTransformInfo;
+typedef struct uWireSlave uWireSlave;
+typedef struct I2SCodec I2SCodec;
+typedef struct DeviceState DeviceState;
+typedef struct SSIBus SSIBus;
 
 /* CPU save/load.  */
 void cpu_save(QEMUFile *f, void *opaque);
@@ -225,6 +231,8 @@ void qemu_iovec_from_buffer(QEMUIOVector *qiov, const void *buf, size_t count);
 struct Monitor;
 typedef struct Monitor Monitor;
 
+#include "module.h"
+
 #endif /* dyngen-exec.h hack */
 
 #endif