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

* 'master' of git://git.sv.gnu.org/qemu: (84 commits)
  ETRAX: Simplify serport control logic.
  ETRAX: Drop _t for the serial type.
  ETRAX: Use NULL for subwidth serport reg accesses.
  ETRAX: Drop the _t for the internal PIC type.
  ETRAX: Simplify the interrupt controller model.
  ETRAX: Simplify interrupt signaling.
  Fix compiler warnings in nwfpe code.
  target-mips: proper sign extension for 'SUBU rd, zero, rt'
  target-mips: fix comments about SUB/DSUB
  qemu-options.hx: fix description of cache=none suboption
  Suppress type mismatch warnings in VDE code.
  minor fix of pci_register_bus()
  use PCI_HEADER_TYPE.
  Fix typos in comments in exec.c
  Optimize cmp x, 0 case
  Reindent
  Handle NULL bdrv.
  Improve instruction name comments for easier searching
  Clarify: dmmuregs[1] is not a typo
  Optimize operations with immediate parameters
  ...

Conflicts:
	Makefile.target
	hw/vga.c
	qemu-common.h
	vl.c

(iothread merge by Marcelo)

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

1 files changed, 13 insertions, 0 deletions

diff --git a/qemu-common.h b/qemu-common.h
index 942d3a6ec..ae334421e 100644
--- a/qemu-common.h
+++ b/qemu-common.h
@@ -194,6 +194,19 @@ struct qemu_work_item {
     int done;
 };
 
+/* Force QEMU to process pending events */
+void qemu_notify_event(void);
+
+/* Unblock cpu */
+void qemu_cpu_kick(void *env);
+int qemu_cpu_self(void *env);
+
+#ifdef CONFIG_USER_ONLY
+#define qemu_init_vcpu(env) do { } while (0)
+#else
+void qemu_init_vcpu(void *env);
+#endif
+
 typedef struct QEMUIOVector {
     struct iovec *iov;
     int niov;