Merge commit '355bf2e5bac7be1b7516e88307f5507e74e8ce79' into upstream-merge

Merge commit '355bf2e5bac7be1b7516e88307f5507e74e8ce79' into upstream-merge

* commit '355bf2e5bac7be1b7516e88307f5507e74e8ce79': (108 commits)
  acpi: add ACPIREGS
  acpi: move around structs
  target-i386: Introduce x86_cpuid_set_model_id()
  target-i386: Introduce x86_cpuid_version_set_stepping()
  target-i386: Introduce x86_cpuid_version_set_model()
  target-i386: Introduce x86_cpuid_version_set_family()
  console: Eliminate text_consoles[]
  sockets: Clean up inet_listen_opts()'s convoluted bind() loop
  sockets: Drop sockets_debug debug code
  gdbstub: Error locations for -gdb
  vl.c: Error locations for options using add_device_config()
  qemu-char: qemu_chr_open_fd() can't fail, don't check
  qemu-char: Re-apply style fixes from just reverted aad04cd0
  qemu-char: Use qemu_open() to avoid leaking fds to children
  Revert "qemu-char: Print strerror message on failure" and deps
  scsi-block: always use scsi_generic_ops for cache != none
  scsi: fix searching for an empty id
  scsi: fix wrong return for target INQUIRY
  virtio-scsi: add migration support
  virtio-scsi: process control queue requests
  ...

Conflicts:
	hw/acpi_piix4.c

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