qemu-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Qemu-commits] [qemu/qemu] d9458f: s390x: Fix QEMU abort by selecting S3


From: Peter Maydell
Subject: [Qemu-commits] [qemu/qemu] d9458f: s390x: Fix QEMU abort by selecting S390_FLIC_KVM
Date: Wed, 19 Jul 2023 01:44:25 -0700

  Branch: refs/heads/staging
  Home:   https://github.com/qemu/qemu
  Commit: d9458f990afa1633b99d0d897d3e48689d6a01ed
      
https://github.com/qemu/qemu/commit/d9458f990afa1633b99d0d897d3e48689d6a01ed
  Author: Cédric Le Goater <clg@redhat.com>
  Date:   2023-07-18 (Tue, 18 Jul 2023)

  Changed paths:
    M hw/intc/Kconfig
    M hw/s390x/Kconfig

  Log Message:
  -----------
  s390x: Fix QEMU abort by selecting S390_FLIC_KVM

If QEMU is built with --without-default-devices, the s390-flic-kvm
device is missing and QEMU aborts when started with the KVM accelerator.
Make sure it's available by selecting S390_FLIC_KVM in Kconfig.

Consequently, this also fixes an abort in tests/qtest/migration-test.

Signed-off-by: Cédric Le Goater <clg@redhat.com>
Message-Id: <20230711151440.716822-1-clg@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Signed-off-by: Thomas Huth <thuth@redhat.com>


  Commit: 7f114a580710b3b2a7e3a3a30e2096e804b0fcb6
      
https://github.com/qemu/qemu/commit/7f114a580710b3b2a7e3a3a30e2096e804b0fcb6
  Author: Ilya Leoshkevich <iii@linux.ibm.com>
  Date:   2023-07-18 (Tue, 18 Jul 2023)

  Changed paths:
    M include/elf.h
    M linux-user/elfload.c

  Log Message:
  -----------
  linux-user/elfload: Fix /proc/cpuinfo features: on s390x

elf_hwcap_str() takes a bit number, but compares it for equality with
the HWCAP_S390_* masks. This causes /proc/cpuinfo to display incorrect
hwcaps.

Fix by introducing the HWCAP_S390_NR_* constants and using them in
elf_hwcap_str() instead of the HWCAP_S390_*. While at it, add the
missing nnpa, pcimio and sie hwcaps from the latest kernel.

Output before:

        features        : esan3 zarch stfle msa

Output after:

        features        : esan3 zarch stfle msa ldisp eimm etf3eh highgprs vx 
vxe

Fixes: e19807bee357 ("linux-user/elfload: Introduce elf_hwcap_str() on s390x")
Signed-off-by: Ilya Leoshkevich <iii@linux.ibm.com>
Message-Id: <20230627151356.273259-1-iii@linux.ibm.com>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Signed-off-by: Thomas Huth <thuth@redhat.com>


  Commit: 94aaf6d8a589490706e8cdc1ae725743f101124a
      
https://github.com/qemu/qemu/commit/94aaf6d8a589490706e8cdc1ae725743f101124a
  Author: Fabiano Rosas <farosas@suse.de>
  Date:   2023-07-18 (Tue, 18 Jul 2023)

  Changed paths:
    M tests/qtest/migration-test.c

  Log Message:
  -----------
  tests/qtest: Fix typo in multifd cancel test

This wasn't noticed because the test is currently disabled.

Fixes: 02f56e3de ("tests/qtest: massively speed up migration-test")
Signed-off-by: Fabiano Rosas <farosas@suse.de>
Message-Id: <20230711212131.2370-1-farosas@suse.de>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>


  Commit: 03e596de1789af2d6d3ef222268642ee34c08a1d
      
https://github.com/qemu/qemu/commit/03e596de1789af2d6d3ef222268642ee34c08a1d
  Author: Philippe Mathieu-Daudé <philmd@linaro.org>
  Date:   2023-07-18 (Tue, 18 Jul 2023)

  Changed paths:
    M tests/lcitool/refresh
    A tests/vm/generated/README

  Log Message:
  -----------
  tests/lcitool: Generate distribution packages list in JSON format

Add the generate_pkglist() helper to generate a list of packages
required by a distribution to build QEMU.

Since we can not add a "THIS FILE WAS AUTO-GENERATED" comment in
JSON, create the files under tests/vm/generated/ sub-directory;
add a README mentioning the files are generated.

Suggested-by: Erik Skultety <eskultet@redhat.com>
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Reviewed-by: Warner Losh <imp@bsdimp.com>
Message-Id: <20230711144922.67491-2-philmd@linaro.org>
Signed-off-by: Thomas Huth <thuth@redhat.com>


  Commit: a38dee6695b07a90f157e6eb592f91cef3849bfc
      
https://github.com/qemu/qemu/commit/a38dee6695b07a90f157e6eb592f91cef3849bfc
  Author: Philippe Mathieu-Daudé <philmd@linaro.org>
  Date:   2023-07-18 (Tue, 18 Jul 2023)

  Changed paths:
    A tests/vm/generated/freebsd.json

  Log Message:
  -----------
  tests/lcitool: Refresh generated files

Refresh the generated files by running:

  $ make lcitool-refresh

Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Message-Id: <20230711144922.67491-3-philmd@linaro.org>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
[thuth: Drop changes to libpmem-dev and libxen-dev]
Signed-off-by: Thomas Huth <thuth@redhat.com>


  Commit: 4cd57671b777632be2dc20bc2f5a0410e258e3dc
      
https://github.com/qemu/qemu/commit/4cd57671b777632be2dc20bc2f5a0410e258e3dc
  Author: Philippe Mathieu-Daudé <philmd@linaro.org>
  Date:   2023-07-18 (Tue, 18 Jul 2023)

  Changed paths:
    M tests/vm/basevm.py

  Log Message:
  -----------
  tests/vm: Introduce get_qemu_packages_from_lcitool_json() helper

Add the get_qemu_packages_from_lcitool_json() helper which return
such package list from a lcitool env var file in JSON format.

Suggested-by: Daniel P. Berrangé <berrange@redhat.com>
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Message-Id: <20230711144922.67491-4-philmd@linaro.org>
Signed-off-by: Thomas Huth <thuth@redhat.com>


  Commit: ca2a07f6c3630d5d39af24651987256a705ac500
      
https://github.com/qemu/qemu/commit/ca2a07f6c3630d5d39af24651987256a705ac500
  Author: Philippe Mathieu-Daudé <philmd@linaro.org>
  Date:   2023-07-18 (Tue, 18 Jul 2023)

  Changed paths:
    M tests/vm/freebsd

  Log Message:
  -----------
  tests/vm/freebsd: Get up-to-date package list from lcitool vars file

Get an up-to-date package list from lcitool, that way we
don't need to manually keep this array in sync.

Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Inspired-by: Thomas Huth <thuth@redhat.com>
Message-Id: <20230711144922.67491-5-philmd@linaro.org>
Signed-off-by: Thomas Huth <thuth@redhat.com>


  Commit: a5754847e0fc2bc08a414dd381803009e8bca390
      
https://github.com/qemu/qemu/commit/a5754847e0fc2bc08a414dd381803009e8bca390
  Author: Thomas Huth <thuth@redhat.com>
  Date:   2023-07-18 (Tue, 18 Jul 2023)

  Changed paths:
    M docs/devel/testing.rst
    M tests/avocado/machine_aarch64_sbsaref.py

  Log Message:
  -----------
  tests/avocado: Disable the test_sbsaref_edk2_firmware by default

The test fails occasionally, see e.g.:

 https://gitlab.com/thuth/qemu/-/jobs/4196177756#L489
 https://gitlab.com/thuth/qemu/-/jobs/4623296271#L290

It also fails on my laptop in ca. 50% of all runs. Thus disable it by
default by using the QEMU_TEST_FLAKY_TESTS environment variable to fence
it (which we also already use in flaky qtests). While we're at it, also
document this variable in docs/devel/testing.rst.

Message-Id: <20230710170155.7192-1-thuth@redhat.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>


  Commit: 7a0adc3e05c2bb1cfd450cb73a6da6f7de9ce3f4
      
https://github.com/qemu/qemu/commit/7a0adc3e05c2bb1cfd450cb73a6da6f7de9ce3f4
  Author: Peter Maydell <peter.maydell@linaro.org>
  Date:   2023-07-19 (Wed, 19 Jul 2023)

  Changed paths:
    M docs/devel/testing.rst
    M hw/intc/Kconfig
    M hw/s390x/Kconfig
    M include/elf.h
    M linux-user/elfload.c
    M tests/avocado/machine_aarch64_sbsaref.py
    M tests/lcitool/refresh
    M tests/qtest/migration-test.c
    M tests/vm/basevm.py
    M tests/vm/freebsd
    A tests/vm/generated/README
    A tests/vm/generated/freebsd.json

  Log Message:
  -----------
  Merge tag 'pull-request-2023-07-18' of https://gitlab.com/thuth/qemu into 
staging

* Fix s390x KVM guests when compiling with --without-default-devices
* Fix /proc/cpuinfo features list in s390x linux-user emulation
* Generate FreeBSD VM package list via lcitool
* Disable the flaky test_sbsaref_edk2_firmware avocado test by default

# -----BEGIN PGP SIGNATURE-----
#
# iQJFBAABCAAvFiEEJ7iIR+7gJQEY8+q5LtnXdP5wLbUFAmS2W14RHHRodXRoQHJl
# ZGhhdC5jb20ACgkQLtnXdP5wLbW25g/7B68fy5dMzrrYlESm/PSYKa+POZtXt7IO
# EuDNgqIz8bBtlK/4HgMiY0huoT+5cWJ73qZeSzoiDjte8CqOAfjy2TeOWEpd+1qZ
# xHZ7W1t1fwN2rNQlOlGw4jASkrwdYeiBbD8PopixKeevwMOOAxroYNHSvzPNG+Qa
# rTJAlzq1Q80z8DP5zl6ufsxQNiWQsCdCO3hdTZQsRi+RCxl+3SMx2xKA2bBtw9VL
# skwItYqvvw21LtR7yYhnb9bMtikh+nVYuyAW6CJl9vrG2zwf6D/tURIk4LLaIxlS
# XfDVRul6BJHWWdWAZ42Q7Xwe0olrzOfl57wYb/gvh09E6NEjyJcyIr/mor+yz1/q
# Qomb/Stt5K8pphiSSwkKmZUGA0s96MjOYe/xXbJegu+6X6HNgYVobZDMMq/BABy2
# XeESwUE/Hfz+VW14oqCk4edZb6+jQbYaKO/YDPd7uyXzfas079koWYfWx9Ew08U8
# f5h7achjECr3R4DJ9VgYIOKJuv37LcnwbePspXdRK5pjRrqr9FD9XsEg4gF7rbIe
# A/g/UUx1+AXeie4z1MrUwFhOrqV1g5t34cBR9iqZtISd0UiNk6ExoiX8i+ELaw5+
# ADirr46HJFS9jVAKKw9zym932qC92AQNH0d0iOYv3AHzvKvTDiQOXHyl1bLTMeYd
# yUJNn+Jkdns=
# =dw94
# -----END PGP SIGNATURE-----
# gpg: Signature made Tue 18 Jul 2023 10:29:02 BST
# gpg:                using RSA key 27B88847EEE0250118F3EAB92ED9D774FE702DB5
# gpg:                issuer "thuth@redhat.com"
# gpg: Good signature from "Thomas Huth <th.huth@gmx.de>" [full]
# gpg:                 aka "Thomas Huth <thuth@redhat.com>" [full]
# gpg:                 aka "Thomas Huth <huth@tuxfamily.org>" [full]
# gpg:                 aka "Thomas Huth <th.huth@posteo.de>" [unknown]
# Primary key fingerprint: 27B8 8847 EEE0 2501 18F3  EAB9 2ED9 D774 FE70 2DB5

* tag 'pull-request-2023-07-18' of https://gitlab.com/thuth/qemu:
  tests/avocado: Disable the test_sbsaref_edk2_firmware by default
  tests/vm/freebsd: Get up-to-date package list from lcitool vars file
  tests/vm: Introduce get_qemu_packages_from_lcitool_json() helper
  tests/lcitool: Refresh generated files
  tests/lcitool: Generate distribution packages list in JSON format
  tests/qtest: Fix typo in multifd cancel test
  linux-user/elfload: Fix /proc/cpuinfo features: on s390x
  s390x: Fix QEMU abort by selecting S390_FLIC_KVM

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


Compare: https://github.com/qemu/qemu/compare/361d53973552...7a0adc3e05c2



reply via email to

[Prev in Thread] Current Thread [Next in Thread]