From: Peter Maydell <peter.maydell@linaro.org>
Date: Fri, 13 Aug 2021 16:52:19 +0000 (+0100)
Subject: Merge remote-tracking branch 'remotes/bonzini-gitlab/tags/for-upstream' into staging
X-Git-Tag: v6.1.0-rc4~6
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2edf8ac5bdd0ae1624dea2a8d5784f7a33745901;p=thirdparty%2Fqemu.git

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

Fixes for -smp, and for x86 TCG on Windows.

# gpg: Signature made Fri 13 Aug 2021 13:43:46 BST
# 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:
  hw/core: fix error checking in smp_parse
  hw/core: Add missing return on error
  target/i386: Fixed size of constant for Windows

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

2edf8ac5bdd0ae1624dea2a8d5784f7a33745901