Merge remote branch 'upstream' into upstream-merge

* upstream: (32 commits)
  vnc: rich cursor support.
  use new cursor struct + functions for vmware vga and sdl.
  cursor: add cursor functions.
  Fix error handling in qemu_read_config_file
  Virtio-net: Replace the hardcode 6 with defined ETN_ALEN
  sdl: Do not disable screensaver by default
  microblaze: Handle new elf mach nr for sysemu.
  lsi: Fix value overflow in request tag processing
  sparc64: flush translations on mmu context change
  sparc64: fix mmu context at trap levels above zero
  sparc64: fix dump_mmu to look for global bit in tte value instead of tag
  sparc64: fix pstate privilege bits
  sparc64: generate data access exception on RW violation
  sparc32 protect read-only bits in DMA CSR registers
  vmstate: fix breakage by 7e72abc382b700a72549e8147bdea413534eeedc
  Fix -device help and documentation
  Fix tarbin Makefile rule
  hxtool: Add syntax error detection
  Fix TEXI section mark imbalance in qemu-img-cmd.hx
  Put dependency files in proper subdir
  ...

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

1 files changed, 1 insertions, 0 deletions

diff --git a/sysemu.h b/sysemu.h
index 0d6280522..7435a80ee 100644
--- a/sysemu.h
+++ b/sysemu.h
@@ -129,6 +129,7 @@ extern int max_cpus;
 extern int cursor_hide;
 extern int graphic_rotate;
 extern int no_quit;
+extern int no_shutdown;
 extern int semihosting_enabled;
 extern int old_param;
 extern int boot_menu;