[Qemu-commits] [qemu/qemu] 170ed4: tests/vm: do not specify -bios option

[Peter Maydell]

  Branch: refs/heads/staging
  Home:   https://github.com/qemu/qemu
  Commit: 170ed475cd5f78261c56cebf12541ceee4807594
      
https://github.com/qemu/qemu/commit/170ed475cd5f78261c56cebf12541ceee4807594
  Author: Paolo Bonzini <pbonzini@redhat.com>
  Date:   2022-07-06 (Wed, 06 Jul 2022)

  Changed paths:
    M tests/vm/fedora
    M tests/vm/freebsd
    M tests/vm/netbsd
    M tests/vm/openbsd

  Log Message:
  -----------
  tests/vm: do not specify -bios option

When running from the build tree, the executable is able to find
the BIOS on its own; when running from the source tree, a firmware
blob should already be installed and there is no guarantee that
the one in the source tree works with the QEMU that is being used for
the installation.

Just remove the -bios option, since it is unnecessary and in fact
there are other x86 VM tests that do not bother specifying it.

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


  Commit: 6c8fa961da5e60f574bb52fd3ad44b1e9e8ad4b8
      
https://github.com/qemu/qemu/commit/6c8fa961da5e60f574bb52fd3ad44b1e9e8ad4b8
  Author: Mauro Matteo Cascella <mcascell@redhat.com>
  Date:   2022-07-06 (Wed, 06 Jul 2022)

  Changed paths:
    M hw/scsi/lsi53c895a.c

  Log Message:
  -----------
  scsi/lsi53c895a: fix use-after-free in lsi_do_msgout (CVE-2022-0216)

Set current_req->req to NULL to prevent reusing a free'd buffer in case of
repeated SCSI cancel requests. Thanks to Thomas Huth for suggesting the patch.

Fixes: CVE-2022-0216
Resolves: https://gitlab.com/qemu-project/qemu/-/issues/972
Signed-off-by: Mauro Matteo Cascella <mcascell@redhat.com>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Message-Id: <20220705200543.2366809-1-mcascell@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>


  Commit: ebca847d051b7a595494f9ef0f128113ef125c8e
      
https://github.com/qemu/qemu/commit/ebca847d051b7a595494f9ef0f128113ef125c8e
  Author: Paolo Bonzini <pbonzini@redhat.com>
  Date:   2022-07-06 (Wed, 06 Jul 2022)

  Changed paths:
    M pc-bios/optionrom/Makefile
    R pc-bios/optionrom/code16gcc.h

  Log Message:
  -----------
  pc-bios/optionrom: use -m16 unconditionally

Remove support for .code16gcc, all supported platforms have -m16.

Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>


  Commit: 640aabc8ae65f471daf67fdc41fed00d6d795a65
      
https://github.com/qemu/qemu/commit/640aabc8ae65f471daf67fdc41fed00d6d795a65
  Author: Paolo Bonzini <pbonzini@redhat.com>
  Date:   2022-07-06 (Wed, 06 Jul 2022)

  Changed paths:
    M configure
    M pc-bios/optionrom/Makefile

  Log Message:
  -----------
  configure, pc-bios/optionrom: pass cross CFLAGS correctly

The optionrom build is disregarding the flags passed to the configure
script via --cross-cflags-i386.  Pass it down and add it to the Makefile.

This will make it possible to get the -m32 flag from $target_cflags to
force a 32-bit build on 64-bit hosts, instead of supplying manually the
arcane -Wa,-32 and linker emulation options.

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


  Commit: 75b244794323c821aee0d928c5731efe9a022425
      
https://github.com/qemu/qemu/commit/75b244794323c821aee0d928c5731efe9a022425
  Author: Paolo Bonzini <pbonzini@redhat.com>
  Date:   2022-07-06 (Wed, 06 Jul 2022)

  Changed paths:
    M configure
    M pc-bios/s390-ccw/Makefile
    M pc-bios/s390-ccw/netboot.mak

  Log Message:
  -----------
  configure, pc-bios/s390-ccw: pass cross CFLAGS correctly

QEMU_CFLAGS is not available in pc-bios/s390-ccw/netboot.mak, but the Makefile
needs to access the flags passed to the configure script for the s390x
cross compiler.  Fix everything and rename QEMU_CFLAGS to EXTRA_CFLAGS for
consistency with tests/tcg.

Reviewed-by: Thomas Huth <thuth@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>


  Commit: d44f2f96f7939c898834f98f7dd7c7acc2b2fed0
      
https://github.com/qemu/qemu/commit/d44f2f96f7939c898834f98f7dd7c7acc2b2fed0
  Author: Paolo Bonzini <pbonzini@redhat.com>
  Date:   2022-07-06 (Wed, 06 Jul 2022)

  Changed paths:
    M configure
    M pc-bios/vof/Makefile

  Log Message:
  -----------
  configure, pc-bios/vof: pass cross CFLAGS correctly

Use the flags passed to the configure script for the ppc cross compiler,
which in fact default to those that are needed to get the 32-bit ISA.
Add the endianness flag so that it remains possible to use a ppc64le
compiler to compile VOF.

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


  Commit: 26e7253375e5db94a2c08acbc4a3c8203b382024
      
https://github.com/qemu/qemu/commit/26e7253375e5db94a2c08acbc4a3c8203b382024
  Author: Paolo Bonzini <pbonzini@redhat.com>
  Date:   2022-07-06 (Wed, 06 Jul 2022)

  Changed paths:
    M configure

  Log Message:
  -----------
  configure: allow more host/target combos to use the host compiler

Add more pairs of bi-arch compilers, so that it is not necessary to have
e.g. both little-endian and big-endian ARM compilers.

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


  Commit: e81785abba296ee6b54b6ae833cac45020b5ba6a
      
https://github.com/qemu/qemu/commit/e81785abba296ee6b54b6ae833cac45020b5ba6a
  Author: Paolo Bonzini <pbonzini@redhat.com>
  Date:   2022-07-06 (Wed, 06 Jul 2022)

  Changed paths:
    M configure

  Log Message:
  -----------
  configure: write EXTRA_CFLAGS for all sub-Makefiles

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


  Commit: bb52a8a278782f4e0f009d3568e60a9689b64da7
      
https://github.com/qemu/qemu/commit/bb52a8a278782f4e0f009d3568e60a9689b64da7
  Author: Paolo Bonzini <pbonzini@redhat.com>
  Date:   2022-07-06 (Wed, 06 Jul 2022)

  Changed paths:
    M tests/tcg/Makefile.target
    M tests/tcg/aarch64/system/pauth-3.c
    M tests/tcg/aarch64/system/semiconsole.c
    M tests/tcg/aarch64/system/semiheap.c
    M tests/tcg/multiarch/system/memory.c

  Log Message:
  -----------
  tests/tcg: compile system emulation tests as freestanding

System emulation tests do not run in a hosted environment, since they
do not link with libc.  They should only use freestanding headers
(float.h, limits.h, stdarg.h, stddef.h, stdbool.h, stdint.h,
stdalign.h, stdnoreturn.h) and should be compiled with -ffreestanding
in order to use the compiler implementation of those headers
rather than the one in libc.

Some tests are using inttypes.h instead of stdint.h, so fix that.

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


  Commit: 52f08deaf803fa95fd12a886f854502ca632d562
      
https://github.com/qemu/qemu/commit/52f08deaf803fa95fd12a886f854502ca632d562
  Author: Paolo Bonzini <pbonzini@redhat.com>
  Date:   2022-07-08 (Fri, 08 Jul 2022)

  Changed paths:
    M configure

  Log Message:
  -----------
  configure: pass whole target name to probe_target_compiler

Let probe_target_compiler know if it is looking for a compiler for a
softmmu (freestanding) or a linux-user (hosted) environment.  The
detection for the compiler has to be done differently in the two
cases.

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


  Commit: 92e288fcfbf2908450023e85c0d53c1ebb8dbd30
      
https://github.com/qemu/qemu/commit/92e288fcfbf2908450023e85c0d53c1ebb8dbd30
  Author: Paolo Bonzini <pbonzini@redhat.com>
  Date:   2022-07-08 (Fri, 08 Jul 2022)

  Changed paths:
    M configure

  Log Message:
  -----------
  build: try both native and cross compilers

Configure is trying to fall back on cross compilers for targets that
can have bi-arch or bi-endian toolchains, but there are many corner
cases where just checking the name can go wrong.  For example, the RHEL
ppc64le compiler is bi-arch and bi-endian, but multilibs are disabled.
Therefore it cannot be used to build 32-bit hosted binaries like the
linux-user TCG tests.

Trying the cross compiler first also does not work, and an example for
this is also ppc64le.  The powerpc64-linux-gnu-gcc binary from the
cross-gcc package is theoretically multilib-friendly, but it cannot
find the CRT files on a ppc64le host, because they are not in the .../le
multilib subdirectory.

This can be fixed by testing both the native compiler and the cross
compiler, and proceeding with the first one that works.  To do this,
move the compiler usability check from the tests/tcg snippet to inside
probe_target_compiler and, while at it, restrict the softmmu emulation
target to basically a test for the presence of libgcc.

Tested-by: Matheus Kowalczuk Ferst <matheus.ferst@eldorado.org.br>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>


  Commit: e56d09702834cf61342b71892ba25252d6c0ecf1
      
https://github.com/qemu/qemu/commit/e56d09702834cf61342b71892ba25252d6c0ecf1
  Author: Alexander Bulekov <alxndr@bu.edu>
  Date:   2022-07-08 (Fri, 08 Jul 2022)

  Changed paths:
    M meson.build

  Log Message:
  -----------
  build: improve -fsanitize-coverage-allowlist check

The sancov filter check still fails when unused arguments are treated as
errors. To work around that, add a SanitizerCoverage flag to the
build-check.

Fixes: aa4f3a3b88 ("build: fix check for -fsanitize-coverage-allowlist")
Signed-off-by: Alexander Bulekov <alxndr@bu.edu>
Message-Id: <20220621204507.698711-1-alxndr@bu.edu>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>


  Commit: 0e76929d6539a609a49bac09c27444ef576fa74a
      
https://github.com/qemu/qemu/commit/0e76929d6539a609a49bac09c27444ef576fa74a
  Author: Alexander Bulekov <alxndr@bu.edu>
  Date:   2022-07-08 (Fri, 08 Jul 2022)

  Changed paths:
    M scripts/oss-fuzz/build.sh

  Log Message:
  -----------
  fuzz: only use generic-fuzz targets on oss-fuzz

The non-generic-fuzz targets often time-out, or run out of memory.
Additionally, they create unreproducible bug-reports. It is possible
that this is resulting in failing coverage-reports on OSS-Fuzz. In the
future, these test-cases should be fixed, or removed.

Reviewed-by: Darren Kenny <darren.kenny@oracle.com>
Signed-off-by: Alexander Bulekov <alxndr@bu.edu>
Message-Id: <20220623125505.2137534-1-alxndr@bu.edu>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>


  Commit: d2bfbdf316b215ab94858738091cc93d46f27d8c
      
https://github.com/qemu/qemu/commit/d2bfbdf316b215ab94858738091cc93d46f27d8c
  Author: Marc-André Lureau <marcandre.lureau@redhat.com>
  Date:   2022-07-08 (Fri, 08 Jul 2022)

  Changed paths:
    M audio/meson.build
    M meson.build

  Log Message:
  -----------
  audio/dbus: fix building

Commit c9c847481 broken dbus audio module compilation with bad
'CONFIG_GIO' usage. Furthermore, it implied extra dependency on audio
module which aren't necessary.

The problem was that 'dbus_display' is not correctly automatically set
on MacOS, because opengl dependency wasn't taken into account.

Fixes: c9c847481 ("audio/dbus: Fix building with modules on macOS")
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Message-Id: <20220622154918.560870-1-marcandre.lureau@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>


  Commit: f696b74b15f641c23c3f1aa644a3f2a98c0a87e1
      
https://github.com/qemu/qemu/commit/f696b74b15f641c23c3f1aa644a3f2a98c0a87e1
  Author: Miaoqian Lin <linmq006@gmail.com>
  Date:   2022-07-08 (Fri, 08 Jul 2022)

  Changed paths:
    M accel/kvm/kvm-all.c

  Log Message:
  -----------
  accel: kvm: Fix memory leak in find_stats_descriptors

This function doesn't release descriptors in one error path,
result in memory leak. Call g_free() to release it.

Fixes: cc01a3f4cadd ("kvm: Support for querying fd-based stats")
Signed-off-by: Miaoqian Lin <linmq006@gmail.com>
Message-Id: <20220624063159.57411-1-linmq006@gmail.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>


  Commit: 7e270af22474b0834919d8726296fde7ae771007
      
https://github.com/qemu/qemu/commit/7e270af22474b0834919d8726296fde7ae771007
  Author: Akihiko Odaki <akihiko.odaki@gmail.com>
  Date:   2022-07-08 (Fri, 08 Jul 2022)

  Changed paths:
    M Makefile

  Log Message:
  -----------
  build: Do not depend on pc-bios for config-host.mak

Commit 45f1eecdd63f9e4fa93fef01dd826e7706ac6d7b removed the dependency
from configure to pc-bios

Signed-off-by: Akihiko Odaki <akihiko.odaki@gmail.com>
Message-Id: <20220624150258.50449-1-akihiko.odaki@gmail.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>


  Commit: a24827942afaac413b8dd4ef9b71b7495755f15e
      
https://github.com/qemu/qemu/commit/a24827942afaac413b8dd4ef9b71b7495755f15e
  Author: Akihiko Odaki <akihiko.odaki@gmail.com>
  Date:   2022-07-08 (Fri, 08 Jul 2022)

  Changed paths:
    M qga/main.c

  Log Message:
  -----------
  qga: Relocate a path emitted in the help text

Signed-off-by: Akihiko Odaki <akihiko.odaki@gmail.com>
Message-Id: <20220624145455.50058-1-akihiko.odaki@gmail.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>


  Commit: 9fb6d8a9b2fc0e150b56a0ff4341494dcd8360b8
      
https://github.com/qemu/qemu/commit/9fb6d8a9b2fc0e150b56a0ff4341494dcd8360b8
  Author: Paolo Bonzini <pbonzini@redhat.com>
  Date:   2022-07-12 (Tue, 12 Jul 2022)

  Changed paths:
    M meson_options.txt
    M scripts/meson-buildoptions.sh

  Log Message:
  -----------
  meson: place default firmware path under .../share

Fixes: c09c1ce7e9 ("configure: switch directory options to automatic parsing", 
2022-05-07)
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>


  Commit: 8e3d85d36b77f11ad7bded3a2d48c1f0cc334f82
      
https://github.com/qemu/qemu/commit/8e3d85d36b77f11ad7bded3a2d48c1f0cc334f82
  Author: Peter Maydell <peter.maydell@linaro.org>
  Date:   2022-07-12 (Tue, 12 Jul 2022)

  Changed paths:
    M Makefile
    M accel/kvm/kvm-all.c
    M audio/meson.build
    M configure
    M hw/scsi/lsi53c895a.c
    M meson.build
    M meson_options.txt
    M pc-bios/optionrom/Makefile
    R pc-bios/optionrom/code16gcc.h
    M pc-bios/s390-ccw/Makefile
    M pc-bios/s390-ccw/netboot.mak
    M pc-bios/vof/Makefile
    M qga/main.c
    M scripts/meson-buildoptions.sh
    M scripts/oss-fuzz/build.sh
    M tests/tcg/Makefile.target
    M tests/tcg/aarch64/system/pauth-3.c
    M tests/tcg/aarch64/system/semiconsole.c
    M tests/tcg/aarch64/system/semiheap.c
    M tests/tcg/multiarch/system/memory.c
    M tests/vm/fedora
    M tests/vm/freebsd
    M tests/vm/netbsd
    M tests/vm/openbsd

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

* fuzzing fixes (Alexander)
* fix cross compilation CFLAGS and compiler choice
* do not specify -bios option for tests/vm
* miscellaneous fixes
* preparation for pre-install tree in the build directory (Akihiko)

# gpg: Signature made Tue 12 Jul 2022 13:47:19 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

* tag 'for-upstream' of https://gitlab.com/bonzini/qemu:
  meson: place default firmware path under .../share
  qga: Relocate a path emitted in the help text
  build: Do not depend on pc-bios for config-host.mak
  accel: kvm: Fix memory leak in find_stats_descriptors
  audio/dbus: fix building
  fuzz: only use generic-fuzz targets on oss-fuzz
  build: improve -fsanitize-coverage-allowlist check
  build: try both native and cross compilers
  configure: pass whole target name to probe_target_compiler
  tests/tcg: compile system emulation tests as freestanding
  configure: write EXTRA_CFLAGS for all sub-Makefiles
  configure: allow more host/target combos to use the host compiler
  configure, pc-bios/vof: pass cross CFLAGS correctly
  configure, pc-bios/s390-ccw: pass cross CFLAGS correctly
  configure, pc-bios/optionrom: pass cross CFLAGS correctly
  pc-bios/optionrom: use -m16 unconditionally
  scsi/lsi53c895a: fix use-after-free in lsi_do_msgout (CVE-2022-0216)
  tests/vm: do not specify -bios option

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

# Conflicts:
#       pc-bios/s390-ccw/netboot.mak


Compare: https://github.com/qemu/qemu/compare/9548cbeffffd...8e3d85d36b77