[Qemu-commits] [qemu/qemu] 24d84c: target/i386: Fixed size of constant for Windows

[Peter Maydell]

  Branch: refs/heads/staging
  Home:   https://github.com/qemu/qemu
  Commit: 24d84c7e4806da0c362edd2ee76678f15becd17d
      
https://github.com/qemu/qemu/commit/24d84c7e4806da0c362edd2ee76678f15becd17d
  Author: Lara Lazier <laramglazier@gmail.com>
  Date:   2021-08-13 (Fri, 13 Aug 2021)

  Changed paths:
    M target/i386/tcg/sysemu/misc_helper.c
    M target/i386/tcg/sysemu/svm_helper.c

  Log Message:
  -----------
  target/i386: Fixed size of constant for Windows

~0UL has 64 bits on Linux and 32 bits on Windows.

Fixes: https://gitlab.com/qemu-project/qemu/-/issues/512
Reported-by: Volker Rümelin <vr_qemu@t-online.de>
Signed-off-by: Lara Lazier <laramglazier@gmail.com>
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Message-Id: <20210812111056.26926-1-laramglazier@gmail.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>


  Commit: 0b46318170bf2782564e1c444e01a47cda308c7f
      
https://github.com/qemu/qemu/commit/0b46318170bf2782564e1c444e01a47cda308c7f
  Author: Philippe Mathieu-Daudé <philmd@redhat.com>
  Date:   2021-08-13 (Fri, 13 Aug 2021)

  Changed paths:
    M hw/core/machine.c

  Log Message:
  -----------
  hw/core: Add missing return on error

If dies is not supported by this machine's CPU topology, don't
keep processing options and return directly.

Fixes: 0aebebb561c ("machine: reject -smp dies!=1 for non-PC machines")
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Message-Id: <20210813112608.1452541-2-philmd@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>


  Commit: ea0aa1752ca88f7856cbf40eef0db62f90f28dcd
      
https://github.com/qemu/qemu/commit/ea0aa1752ca88f7856cbf40eef0db62f90f28dcd
  Author: Daniel P. Berrangé <berrange@redhat.com>
  Date:   2021-08-13 (Fri, 13 Aug 2021)

  Changed paths:
    M hw/core/machine.c

  Log Message:
  -----------
  hw/core: fix error checking in smp_parse

machine_set_smp() mistakenly checks 'errp' not '*errp',
and so thinks there is an error every single time it runs.
This causes it to jump to the end of the method, skipping
the max CPUs checks. The caller meanwhile sees no error
and so carries on execution. The result of all this is:

 $ qemu-system-x86_64 -smp -1
 qemu-system-x86_64: GLib: ../glib/gmem.c:142: failed to allocate 481036337048 
bytes

instead of

 $ qemu-system-x86_64 -smp -1
 qemu-system-x86_64: Invalid SMP CPUs -1. The max CPUs supported by machine 
'pc-i440fx-6.1' is 255

This is a regression from

  commit fe68090e8fbd6e831aaf3fc3bb0459c5cccf14cf
  Author: Paolo Bonzini <pbonzini@redhat.com>
  Date:   Thu May 13 09:03:48 2021 -0400

    machine: add smp compound property

Closes: https://gitlab.com/qemu-project/qemu/-/issues/524
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
Message-Id: <20210812175353.4128471-1-berrange@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>


  Commit: 2edf8ac5bdd0ae1624dea2a8d5784f7a33745901
      
https://github.com/qemu/qemu/commit/2edf8ac5bdd0ae1624dea2a8d5784f7a33745901
  Author: Peter Maydell <peter.maydell@linaro.org>
  Date:   2021-08-13 (Fri, 13 Aug 2021)

  Changed paths:
    M hw/core/machine.c
    M target/i386/tcg/sysemu/misc_helper.c
    M target/i386/tcg/sysemu/svm_helper.c

  Log Message:
  -----------
  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>


Compare: https://github.com/qemu/qemu/compare/45acd17af884...2edf8ac5bdd0