* commit 'qemu-svn/trunk': (38 commits)
  Remove WIN32 guard around -k
  Add new command line option -singlestep for tcg single stepping.
  tcg/x86_64: optimize register allocation order
  stop dirty tracking just at the end of migration (Glauber Costa)
  create qemu_file_set_error (Glauber Costa)
  propagate error on failed completion (Glauber Costa)
  Disable qemu-io on Win32
  Add files not included in previous commit.
  Fix savevm after BDRV_FILE size enforcement
  Fix the build for --disable-aio
  gdbstub: Rework configuration via command line and monitor (Jan Kiszka)
  Make `-icount' help fit 80 chars screen width (Robert Riebisch)
  qemu-io - an I/O path exerciser (Christoph Hellwig)
  Fix display breakage when resizing the screen (v2) (Avi Kivity)
  Fix some win32 compile warnings
  Make binary stripping conditional (Riku Voipio)
  qcow2: fix image creation for large, > ~2TB, images (Chris Wright)
  pci_add storage: fix error handling for 'if' parameter (Eduardo Habkost)
  build system: clean qemu-options.texi and gdbstub-xml.c (Jan Kiszka)
  build system: silent generation of doc files and qemu-options.h (Jan Kiszka)
  ...

Conflicts:
	qemu/Makefile.target
	qemu/hw/vga.c
	qemu/vl.c

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