From: Peter Maydell <peter.maydell@linaro.org>
Date: Mon, 16 Nov 2020 22:29:51 +0000 (+0000)
Subject: Merge remote-tracking branch 'remotes/bonzini-gitlab/tags/for-upstream' into staging
X-Git-Tag: qemu-xen-4.16.0-rc4~483
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=bce36c6c5436c0c2679b42c6de54de5393dfcf59;p=qemu-xen.git

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

Bug fixes

# gpg: Signature made Mon 16 Nov 2020 18:22:51 GMT
# 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]
# 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-gitlab/tags/for-upstream:
  memory: Skip dirty tracking for un-migratable memory regions
  target/i386: avoid theoretical leak on MCE injection
  scsi-disk: convert more errno values back to SCSI statuses
  util/vfio-helpers.c: Use ram_block_discard_disable() in qemu_vfio_open_pci()
  kvm/i386: Set proper nested state format for SVM

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
---

bce36c6c5436c0c2679b42c6de54de5393dfcf59