[Qemu-commits] [qemu/qemu] 808d15: build: make meson-buildoptions.sh stable

[Peter Maydell]

  Branch: refs/heads/staging
  Home:   https://github.com/qemu/qemu
  Commit: 808d15b383fecb3ec540186f68767a211c756c5a
      
https://github.com/qemu/qemu/commit/808d15b383fecb3ec540186f68767a211c756c5a
  Author: Paolo Bonzini <pbonzini@redhat.com>
  Date:   2023-02-10 (Fri, 10 Feb 2023)

  Changed paths:
    M scripts/meson-buildoptions.py
    M scripts/meson-buildoptions.sh

  Log Message:
  -----------
  build: make meson-buildoptions.sh stable

The library directory can change depending on the multilib setup of the host.
It would be even better to detect it in configure with the same algorithm
that Meson uses, but the important thing to avoid confusing developers is
to have identical contents of scripts/meson-buildoptions.sh, independent
of the distro and architecture on which it was created.

So, for now just give a custom default value to libdir.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>


  Commit: d76aa73fad1f64c192856e1420ad0756f5e3b778
      
https://github.com/qemu/qemu/commit/d76aa73fad1f64c192856e1420ad0756f5e3b778
  Author: Paolo Bonzini <pbonzini@redhat.com>
  Date:   2023-02-10 (Fri, 10 Feb 2023)

  Changed paths:
    M include/disas/dis-asm.h
    M include/qemu/bswap.h
    M include/qemu/envlist.h
    M include/qemu/rcu.h
    M include/qemu/rcu_queue.h
    M include/qemu/uri.h

  Log Message:
  -----------
  remove unnecessary extern "C" blocks

A handful of header files in QEMU are wrapped with extern "C" blocks.
These are not necessary: there are C++ source files anymore in QEMU,
and even where there were some, they did not include most of these
files anyway.

Remove them for consistency.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>


  Commit: 5080152e2ef6cde7aa692e29880c62bd54acb750
      
https://github.com/qemu/qemu/commit/5080152e2ef6cde7aa692e29880c62bd54acb750
  Author: Paolo Bonzini <pbonzini@redhat.com>
  Date:   2023-02-10 (Fri, 10 Feb 2023)

  Changed paths:
    M block/iscsi.c

  Log Message:
  -----------
  block/iscsi: fix double-free on BUSY or similar statuses

Commit 8c460269aa77 ("iscsi: base all handling of check condition on
scsi_sense_to_errno", 2019-07-15) removed a "goto out" so that the
same coroutine is re-entered twice; once from iscsi_co_generic_cb,
once from the timer callback iscsi_retry_timer_expired.  This can
cause a crash.

Resolves: https://gitlab.com/qemu-project/qemu/-/issues/1378
Reported-by: Grzegorz Zdanowski <https://gitlab.com/kiler129>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>


  Commit: 78901b5047a2c27858f6c3e780ab3f2af5463631
      
https://github.com/qemu/qemu/commit/78901b5047a2c27858f6c3e780ab3f2af5463631
  Author: Paolo Bonzini <pbonzini@redhat.com>
  Date:   2023-02-10 (Fri, 10 Feb 2023)

  Changed paths:
    M softmmu/vl.c

  Log Message:
  -----------
  vl: catch [accel] entry without accelerator

Avoid a SIGSEGV and return an error instead.

Reported-by: Thomas Huth <thuth@redhat.com>
Resolves: https://gitlab.com/qemu-project/qemu/-/issues/1439
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>


  Commit: 5d62d6649cd367b5b4a3676e7514d2f9ca86cb03
      
https://github.com/qemu/qemu/commit/5d62d6649cd367b5b4a3676e7514d2f9ca86cb03
  Author: Richard Henderson <richard.henderson@linaro.org>
  Date:   2023-02-11 (Sat, 11 Feb 2023)

  Changed paths:
    M tests/tcg/i386/test-i386-bmi2.c

  Log Message:
  -----------
  tests/tcg/i386: Introduce and use reg_t consistently

Define reg_t based on the actual register width.
Define the inlines using that type.  This will allow
input registers to 32-bit insns to be set to 64-bit
values on x86-64, which allows testing various edge cases.

Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Message-Id: <20230114230542.3116013-2-richard.henderson@linaro.org>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>


  Commit: b14c0098975264ed03144f145bca0179a6763a07
      
https://github.com/qemu/qemu/commit/b14c0098975264ed03144f145bca0179a6763a07
  Author: Richard Henderson <richard.henderson@linaro.org>
  Date:   2023-02-11 (Sat, 11 Feb 2023)

  Changed paths:
    M target/i386/tcg/emit.c.inc
    M tests/tcg/i386/test-i386-bmi2.c

  Log Message:
  -----------
  target/i386: Fix BEXTR instruction

There were two problems here: not limiting the input to operand bits,
and not correctly handling large extraction length.

Resolves: https://gitlab.com/qemu-project/qemu/-/issues/1372
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
Message-Id: <20230114230542.3116013-3-richard.henderson@linaro.org>
Cc: qemu-stable@nongnu.org
Fixes: 1d0b926150e5 ("target/i386: move scalar 0F 38 and 0F 3A instruction to 
new decoder", 2022-10-18)
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>


  Commit: 99282098dc74c2055bde5652bde6cf0067d0c370
      
https://github.com/qemu/qemu/commit/99282098dc74c2055bde5652bde6cf0067d0c370
  Author: Richard Henderson <richard.henderson@linaro.org>
  Date:   2023-02-11 (Sat, 11 Feb 2023)

  Changed paths:
    M target/i386/tcg/emit.c.inc

  Log Message:
  -----------
  target/i386: Fix C flag for BLSI, BLSMSK, BLSR

We forgot to set cc_src, which is used for computing C.

Resolves: https://gitlab.com/qemu-project/qemu/-/issues/1370
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
Message-Id: <20230114180601.2993644-1-richard.henderson@linaro.org>
Cc: qemu-stable@nongnu.org
Fixes: 1d0b926150e5 ("target/i386: move scalar 0F 38 and 0F 3A instruction to 
new decoder", 2022-10-18)
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>


  Commit: 60c7dd22e1383754d5f150bc9f7c2785c662a7b6
      
https://github.com/qemu/qemu/commit/60c7dd22e1383754d5f150bc9f7c2785c662a7b6
  Author: Paolo Bonzini <pbonzini@redhat.com>
  Date:   2023-02-11 (Sat, 11 Feb 2023)

  Changed paths:
    M target/i386/tcg/emit.c.inc
    M tests/tcg/i386/Makefile.target
    A tests/tcg/i386/test-i386-adcox.c

  Log Message:
  -----------
  target/i386: fix ADOX followed by ADCX

When ADCX is followed by ADOX or vice versa, the second instruction's
carry comes from EFLAGS and the condition codes use the CC_OP_ADCOX
operation.  Retrieving the carry from EFLAGS is handled by this bit
of gen_ADCOX:

        tcg_gen_extract_tl(carry_in, cpu_cc_src,
            ctz32(cc_op == CC_OP_ADCX ? CC_C : CC_O), 1);

Unfortunately, in this case cc_op has been overwritten by the previous
"if" statement to CC_OP_ADCOX.  This works by chance when the first
instruction is ADCX; however, if the first instruction is ADOX,
ADCX will incorrectly take its carry from OF instead of CF.

Fix by moving the computation of the new cc_op at the end of the function.
The included exhaustive test case fails without this patch and passes
afterwards.

Because ADCX/ADOX need not be invoked through the VEX prefix, this
regression bisects to commit 16fc5726a6e2 ("target/i386: reimplement
0x0f 0x38, add AVX", 2022-10-18).  However, the mistake happened a
little earlier, when BMI instructions were rewritten using the new
decoder framework.

Resolves: https://gitlab.com/qemu-project/qemu/-/issues/1471
Reported-by: Paul Jolly <https://gitlab.com/myitcv>
Fixes: 1d0b926150e5 ("target/i386: move scalar 0F 38 and 0F 3A instruction to 
new decoder", 2022-10-18)
Cc: qemu-stable@nongnu.org
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>


  Commit: 786c5256d3262518d8805ac2a62eb1c4a3813b80
      
https://github.com/qemu/qemu/commit/786c5256d3262518d8805ac2a62eb1c4a3813b80
  Author: Paolo Bonzini <pbonzini@redhat.com>
  Date:   2023-02-11 (Sat, 11 Feb 2023)

  Changed paths:
    M tests/qtest/libqtest.c

  Log Message:
  -----------
  libqtest: split qtest_spawn_qemu function

In order to create a function that allows testing of invalid command
lines, extract the parts of qtest_init_without_qmp_handshake that do
not require any successful set up of sockets.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>


  Commit: 12008ff748d8cfb62fb937559c0fd844371bab5e
      
https://github.com/qemu/qemu/commit/12008ff748d8cfb62fb937559c0fd844371bab5e
  Author: Paolo Bonzini <pbonzini@redhat.com>
  Date:   2023-02-11 (Sat, 11 Feb 2023)

  Changed paths:
    M tests/qtest/libqtest.c

  Log Message:
  -----------
  libqtest: ensure waitpid() is only called once

If a test aborts after qtest_wait_qemu() is called, the SIGABRT hooks are
still in place and waitpid() is called again.  The second time it is called,
the process does not exist anymore and the system call fails.

Move the s->qemu_pid = -1 assignment to qtest_wait_qemu() to make it
idempotent, and anyway remove the SIGABRT hook as well to avoid that
qtest_check_status() is called twice.  Because of the extra call,
qtest_remove_abrt_handler() now has to be made idempotent as well.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>


  Commit: 003ba52a8b327180e284630b289c6ece5a3e08b9
      
https://github.com/qemu/qemu/commit/003ba52a8b327180e284630b289c6ece5a3e08b9
  Author: Peter Maydell <peter.maydell@linaro.org>
  Date:   2023-02-16 (Thu, 16 Feb 2023)

  Changed paths:
    M block/iscsi.c
    M include/disas/dis-asm.h
    M include/qemu/bswap.h
    M include/qemu/envlist.h
    M include/qemu/rcu.h
    M include/qemu/rcu_queue.h
    M include/qemu/uri.h
    M scripts/meson-buildoptions.py
    M scripts/meson-buildoptions.sh
    M softmmu/vl.c
    M target/i386/tcg/emit.c.inc
    M tests/qtest/libqtest.c
    M tests/tcg/i386/Makefile.target
    A tests/tcg/i386/test-i386-adcox.c
    M tests/tcg/i386/test-i386-bmi2.c

  Log Message:
  -----------
  Merge tag 'for-upstream' of https://gitlab.com/bonzini/qemu into staging

* block/iscsi: fix double-free on BUSY or similar statuses
* catch [accel] entry without accelerator
* target/i386: various fixes for BMI and ADX instructions
* make the contents of meson-buildoptions.sh stable

# -----BEGIN PGP SIGNATURE-----
#
# iQFIBAABCAAyFiEE8TM4V0tmI4mGbHaCv/vSX3jHroMFAmPpDTcUHHBib256aW5p
# QHJlZGhhdC5jb20ACgkQv/vSX3jHroODWAgAhWi0XSBe91+34ahQqx6JoLStNX9e
# xy1Cm/5LPDrDquD/4T6gnzb1Min/X2AsVu9c+VIbuHbL/rFc7aNIEL6c7KzwSFLs
# vEDF7tSnlIMK0ClDsDYBz7HUIgBgqE2crAJmTJus2Cqd+Ef5bMxhQi5Imrk6qtmO
# HRdVYEGasJ7CO50oUB91AMrNInWQw0qBnBOB8TnwTLTcvE1txa+xnZuZgQA2HrGX
# OweLdKRcYPvRYvBB3wLMbwqEKbD1eYbdbNt7T2KkuVQpYcgfoCpayHIIMroD+hvu
# BImmG9wWieDKH4Brs765gH6/3VF5UZKbgDQo9Wz+W/5QqnqRSsOYBiMkmA==
# =G3PN
# -----END PGP SIGNATURE-----
# gpg: Signature made Sun 12 Feb 2023 16:00:55 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

* tag 'for-upstream' of https://gitlab.com/bonzini/qemu:
  libqtest: ensure waitpid() is only called once
  libqtest: split qtest_spawn_qemu function
  target/i386: fix ADOX followed by ADCX
  target/i386: Fix C flag for BLSI, BLSMSK, BLSR
  target/i386: Fix BEXTR instruction
  tests/tcg/i386: Introduce and use reg_t consistently
  vl: catch [accel] entry without accelerator
  block/iscsi: fix double-free on BUSY or similar statuses
  remove unnecessary extern "C" blocks
  build: make meson-buildoptions.sh stable

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


Compare: https://github.com/qemu/qemu/compare/0dd47dc54706...003ba52a8b32