Merge remote-tracking branch 'remotes/bonzini/tags/for-upstream' into staging

* cpu-exec fixes (Emilio, Laurent)
* TCG bugfix in queue.h (Paolo)
* high address load for linuxboot (Zhijian)
* PVH support (Liam, Stefano)
* misc i386 changes (Paolo, Robert, Doug)
* configure tweak for openpty (Thomas)
* elf2dmp port to Windows (Viktor)
* initial improvements to Makefile infrastructure (Yang + GSoC 2013)

# gpg: Signature made Tue 05 Feb 2019 17:34:42 GMT
# gpg:                using RSA key BFFBD25F78C7AE83
# gpg: Good signature from "Paolo Bonzini <bonzini@gnu.org>" [full]
# gpg:                 aka "Paolo Bonzini <pbonzini@redhat.com>" [full]
# Primary key fingerprint: 46F5 9FBD 57D6 12E7 BFD4  E2F7 7E15 100C CD36 69B1
#      Subkey fingerprint: F133 3857 4B66 2389 866C  7682 BFFB D25F 78C7 AE83

* remotes/bonzini/tags/for-upstream: (76 commits)
  queue: fix QTAILQ_FOREACH_REVERSE_SAFE
  scsi-generic: Convert from DPRINTF() macro to trace events
  scsi-disk: Convert from DPRINTF() macro to trace events
  pc: Use hotplug_handler_(plug|unplug|unplug_request)
  i386: hvf: Fix smp boot hangs
  hw/vfio/Makefile.objs: Create new CONFIG_* variables for VFIO core and PCI
  hw/i2c/Makefile.objs: Create new CONFIG_* variables for EEPROM and ACPI controller
  hw/tricore/Makefile.objs: Create CONFIG_* for tricore
  hw/openrisc/Makefile.objs: Create CONFIG_* for openrisc
  hw/moxie/Makefile.objs: Conditionally build moxie
  hw/hppa/Makefile.objs: Create CONFIG_* for hppa
  hw/cris/Makefile.objs: Create CONFIG_* for cris
  hw/alpha/Makefile.objs: Create CONFIG_* for alpha
  hw/sparc64/Makefile.objs: Create CONFIG_* for sparc64
  hw/riscv/Makefile.objs: Create CONFIG_* for riscv boards
  hw/nios2/Makefile.objs: Conditionally build nios2
  hw/xtensa/Makefile.objs: Build xtensa_sim and xtensa_fpga conditionally
  hw/lm32/Makefile.objs: Conditionally build lm32 and milkmyst
  hw/sparc/Makefile.objs: CONFIG_* for sun4m and leon3 created
  hw/s390/Makefile.objs: Create new CONFIG_* variables for s390x boards and devices
  ...

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
# Conflicts:
#	qemu-deprecated.texi

diff --cc hw/arm/boot.c
Simple merge

diff --cc qemu-deprecated.texi
index 674cc3fdf89173e43c056c1cc13dd9a19325cb04,87c4e55cfcdcc43c4df38364251472980fe643ad..80b0702ad5b25943d377a23f5b6d7fbbac5940a2
--- 1/qemu-deprecated.texi
--- 2/qemu-deprecated.texi
+++ b/qemu-deprecated.texi
@@@ -37,11 -37,12 +37,18 @@@ would automatically enable USB support 
  If using the new syntax, USB support must be explicitly
  enabled via the ``-machine usb=on'' argument.
  
 +@subsection -virtioconsole (since 3.0.0)
 +
 +Option @option{-virtioconsole} has been replaced by
 +@option{-device virtconsole}.
 +
+ @subsection -no-frame (since 2.12.0)
+ 
+ The @code{--no-frame} argument works with SDL 1.2 only. The other user
+ interfaces never implemented this in the first place. So this will be
+ removed together with SDL 1.2 support.
++>>>>>>> remotes/bonzini/tags/for-upstream
+ 
  @subsection -clock (since 3.0.0)
  
  The @code{-clock} option is ignored since QEMU version 1.7.0. There is no

diff --cc qemu-options.hx
Simple merge

diff --cc scripts/update-linux-headers.sh
Simple merge

diff --cc vl.c
Simple merge