From: Richard Henderson <richard.henderson@linaro.org>
Date: Wed, 3 Nov 2021 17:07:30 +0000 (-0400)
Subject: Merge remote-tracking branch 'remotes/bonzini/tags/for-upstream' into staging
X-Git-Tag: v6.2.0~65
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=b1fd92137e4d485adeec8e9f292f928ff335b76c;p=mirror_qemu.git

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

* Build system fixes and cleanups
* DMA support in the multiboot option ROM
* Rename default-bus-bypass-iommu
* Deprecate -watchdog and cleanup -watchdog-action
* HVF fix for <PAGE_SIZE regions
* Support TSC scaling for AMD nested virtualization
* Fix for ESP fuzzing bug

# gpg: Signature made Tue 02 Nov 2021 10:57:37 AM EDT
# gpg:                using RSA key F13338574B662389866C7682BFFBD25F78C7AE83
# gpg:                issuer "pbonzini@redhat.com"
# gpg: Good signature from "Paolo Bonzini <bonzini@gnu.org>" [full]
# gpg:                 aka "Paolo Bonzini <pbonzini@redhat.com>" [full]

* remotes/bonzini/tags/for-upstream: (27 commits)
  configure: fix --audio-drv-list help message
  configure: Remove the check for the __thread keyword
  Move the l2tpv3 test from configure to meson.build
  meson: remove unnecessary coreaudio test program
  meson: remove pointless warnings
  meson.build: Allow to disable OSS again
  meson: bump submodule to 0.59.3
  qtest/am53c974-test: add test for cancelling in-flight requests
  esp: ensure in-flight SCSI requests are always cancelled
  KVM: SVM: add migration support for nested TSC scaling
  hw/i386: fix vmmouse registration
  watchdog: remove select_watchdog_action
  vl: deprecate -watchdog
  watchdog: add information from -watchdog help to -device help
  hw/i386: Rename default_bus_bypass_iommu
  hvf: Avoid mapping regions < PAGE_SIZE as ram
  configure: do not duplicate CPU_CFLAGS into QEMU_LDFLAGS
  configure: remove useless NPTL probe
  target/i386: use DMA-enabled multiboot ROM for new-enough QEMU machine types
  optionrom: add a DMA-enabled multiboot ROM
  ...

Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---

b1fd92137e4d485adeec8e9f292f928ff335b76c
diff --cc monitor/misc.c
index fabd25a241,1759d1e7f1..a3a6e47844
--- a/monitor/misc.c
+++ b/monitor/misc.c
@@@ -70,8 -70,8 +70,9 @@@
  #include "qapi/qapi-commands-migration.h"
  #include "qapi/qapi-commands-misc.h"
  #include "qapi/qapi-commands-qom.h"
+ #include "qapi/qapi-commands-run-state.h"
  #include "qapi/qapi-commands-trace.h"
 +#include "qapi/qapi-commands-machine.h"
  #include "qapi/qapi-init-commands.h"
  #include "qapi/error.h"
  #include "qapi/qmp-event.h"