Skip to content
Snippets Groups Projects
  • Peter Maydell's avatar
    3e29da9f
    Merge remote-tracking branch 'remotes/bonzini/tags/for-upstream' into staging · 3e29da9f
    Peter Maydell authored
    
    * 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: default avatarPeter Maydell <peter.maydell@linaro.org>
    
    # Conflicts:
    #	qemu-deprecated.texi
    3e29da9f
    History
    Merge remote-tracking branch 'remotes/bonzini/tags/for-upstream' into staging
    Peter Maydell authored
    
    * 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: default avatarPeter Maydell <peter.maydell@linaro.org>
    
    # Conflicts:
    #	qemu-deprecated.texi