qemu-commits
[Top][All Lists]
Advanced

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

[Qemu-commits] [qemu/qemu] 07b2c8: s390x/pci: avoid double enable/disabl


From: Peter Maydell
Subject: [Qemu-commits] [qemu/qemu] 07b2c8: s390x/pci: avoid double enable/disable of aif
Date: Mon, 22 Jan 2024 00:48:37 -0800

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: 07b2c8e034d80ff92e202405c494d2ff80fcf848
      
https://github.com/qemu/qemu/commit/07b2c8e034d80ff92e202405c494d2ff80fcf848
  Author: Matthew Rosato <mjrosato@linux.ibm.com>
  Date:   2024-01-19 (Fri, 19 Jan 2024)

  Changed paths:
    M hw/s390x/s390-pci-kvm.c
    M include/hw/s390x/s390-pci-bus.h

  Log Message:
  -----------
  s390x/pci: avoid double enable/disable of aif

Use a flag to keep track of whether AIF is currently enabled.  This can be
used to avoid enabling/disabling AIF multiple times as well as to determine
whether or not it should be disabled during reset processing.

Fixes: d0bc7091c2 ("s390x/pci: enable adapter event notification for 
interpreted devices")
Reported-by: Cédric Le Goater <clg@redhat.com>
Reviewed-by: Eric Farman <farman@linux.ibm.com>
Signed-off-by: Matthew Rosato <mjrosato@linux.ibm.com>
Message-ID: <20240118185151.265329-2-mjrosato@linux.ibm.com>
Reviewed-by: Cédric Le Goater <clg@redhat.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>


  Commit: 30e35258e25c75c9d799c34fd89afcafffb37084
      
https://github.com/qemu/qemu/commit/30e35258e25c75c9d799c34fd89afcafffb37084
  Author: Matthew Rosato <mjrosato@linux.ibm.com>
  Date:   2024-01-19 (Fri, 19 Jan 2024)

  Changed paths:
    M hw/s390x/s390-pci-kvm.c

  Log Message:
  -----------
  s390x/pci: refresh fh before disabling aif

Typically we refresh the host fh during CLP enable, however it's possible
that the device goes through multiple reset events before the guest
performs another CLP enable.  Let's handle this for now by refreshing the
host handle from vfio before disabling aif.

Fixes: 03451953c7 ("s390x/pci: reset ISM passthrough devices on shutdown and 
system reset")
Reported-by: Cédric Le Goater <clg@redhat.com>
Reviewed-by: Eric Farman <farman@linux.ibm.com>
Signed-off-by: Matthew Rosato <mjrosato@linux.ibm.com>
Message-ID: <20240118185151.265329-3-mjrosato@linux.ibm.com>
Reviewed-by: Cédric Le Goater <clg@redhat.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>


  Commit: 68c691ca99a2538d6a53a70ce8a9ce06ee307ff1
      
https://github.com/qemu/qemu/commit/68c691ca99a2538d6a53a70ce8a9ce06ee307ff1
  Author: Matthew Rosato <mjrosato@linux.ibm.com>
  Date:   2024-01-19 (Fri, 19 Jan 2024)

  Changed paths:
    M hw/s390x/s390-pci-bus.c
    M hw/s390x/s390-virtio-ccw.c
    M include/hw/s390x/s390-pci-bus.h

  Log Message:
  -----------
  s390x/pci: drive ISM reset from subsystem reset

ISM devices are sensitive to manipulation of the IOMMU, so the ISM device
needs to be reset before the vfio-pci device is reset (triggering a full
UNMAP).  In order to ensure this occurs, trigger ISM device resets from
subsystem_reset before triggering the PCI bus reset (which will also
trigger vfio-pci reset).  This only needs to be done for ISM devices
which were enabled for use by the guest.
Further, ensure that AIF is disabled as part of the reset event.

Fixes: ef1535901a ("s390x: do a subsystem reset before the unprotect on reboot")
Fixes: 03451953c7 ("s390x/pci: reset ISM passthrough devices on shutdown and 
system reset")
Reported-by: Cédric Le Goater <clg@redhat.com>
Signed-off-by: Matthew Rosato <mjrosato@linux.ibm.com>
Message-ID: <20240118185151.265329-4-mjrosato@linux.ibm.com>
Reviewed-by: Eric Farman <farman@linux.ibm.com>
Reviewed-by: Cédric Le Goater <clg@redhat.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>


  Commit: 48c1c25a55cdf02d21b1781531e21299736b193a
      
https://github.com/qemu/qemu/commit/48c1c25a55cdf02d21b1781531e21299736b193a
  Author: Thomas Huth <thuth@redhat.com>
  Date:   2024-01-19 (Fri, 19 Jan 2024)

  Changed paths:
    M docs/about/deprecated.rst
    M docs/about/removed-features.rst
    M qemu-options.hx
    M system/vl.c

  Log Message:
  -----------
  qemu-options: Remove the deprecated -no-hpet option

It's been marked as deprecated since QEMU 8.0, so it should be fine
to remove this now.

Reviewed-by: Markus Armbruster <armbru@redhat.com>
Message-ID: <20240118103759.130748-2-thuth@redhat.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>


  Commit: 4a6410104491b703116cd12ef18a61d13cb5a23f
      
https://github.com/qemu/qemu/commit/4a6410104491b703116cd12ef18a61d13cb5a23f
  Author: Thomas Huth <thuth@redhat.com>
  Date:   2024-01-19 (Fri, 19 Jan 2024)

  Changed paths:
    M docs/about/deprecated.rst
    M docs/about/removed-features.rst
    M docs/specs/tpm.rst
    M hw/i386/pc.c
    M qemu-options.hx
    M system/vl.c

  Log Message:
  -----------
  qemu-options: Remove the deprecated -no-acpi option

It's been marked as deprecated since QEMU 8.0, so it should be fine
to remove this now.

Message-ID: <20240118103759.130748-3-thuth@redhat.com>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Michael Tokarev <mjt@tls.msk.ru>
Signed-off-by: Thomas Huth <thuth@redhat.com>


  Commit: 2582489fecd6042d69e1fa060ab5ff89f4cef550
      
https://github.com/qemu/qemu/commit/2582489fecd6042d69e1fa060ab5ff89f4cef550
  Author: Thomas Huth <thuth@redhat.com>
  Date:   2024-01-19 (Fri, 19 Jan 2024)

  Changed paths:
    M docs/about/deprecated.rst
    M docs/about/removed-features.rst
    M qemu-options.hx
    M system/vl.c

  Log Message:
  -----------
  qemu-options: Remove the deprecated -async-teardown option

It's been marked as deprecated since QEMU 8.1 (and was only available
since QEMU 8.0 anyway), so it should be fine to remove this now.

Reviewed-by: Claudio Imbrenda <imbrenda@linux.ibm.com>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
Message-ID: <20240118103759.130748-4-thuth@redhat.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>


  Commit: 1e7886e9e2068a4d83c1a05011cf21e638090ec5
      
https://github.com/qemu/qemu/commit/1e7886e9e2068a4d83c1a05011cf21e638090ec5
  Author: Thomas Huth <thuth@redhat.com>
  Date:   2024-01-19 (Fri, 19 Jan 2024)

  Changed paths:
    M docs/about/deprecated.rst
    M docs/about/removed-features.rst
    M qemu-options.hx
    M system/vl.c

  Log Message:
  -----------
  qemu-options: Remove the deprecated -chroot option

It's been marked as deprecated since QEMU 8.1, so it should be fine
to remove this now.

Reviewed-by: Markus Armbruster <armbru@redhat.com>
Message-ID: <20240118103759.130748-5-thuth@redhat.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>


  Commit: fe17522d854aa7da4c01ca80ef194af4c2aaead3
      
https://github.com/qemu/qemu/commit/fe17522d854aa7da4c01ca80ef194af4c2aaead3
  Author: Philippe Mathieu-Daudé <philmd@linaro.org>
  Date:   2024-01-19 (Fri, 19 Jan 2024)

  Changed paths:
    M docs/about/deprecated.rst
    M qapi/run-state.json
    M system/runstate.c
    M tests/qemu-iotests/183.out
    M tests/qemu-iotests/234.out
    M tests/qemu-iotests/262.out
    M tests/qemu-iotests/280.out

  Log Message:
  -----------
  qapi: Remove deprecated 'singlestep' member of StatusInfo

This member has been deprecated before the 8.1 release, in commit
34c18203d4 ("qmp: Deprecate 'singlestep' member of StatusInfo").
Time to drop it.

Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
Message-ID: <20240117151430.29235-2-philmd@linaro.org>
Signed-off-by: Thomas Huth <thuth@redhat.com>


  Commit: 97b6e1d35f35463307bf9086b7a3fd8bf3212a19
      
https://github.com/qemu/qemu/commit/97b6e1d35f35463307bf9086b7a3fd8bf3212a19
  Author: Philippe Mathieu-Daudé <philmd@linaro.org>
  Date:   2024-01-19 (Fri, 19 Jan 2024)

  Changed paths:
    M docs/about/deprecated.rst
    M docs/about/removed-features.rst
    M hmp-commands.hx
    M tests/qtest/test-hmp.c

  Log Message:
  -----------
  hmp: Remove deprecated 'singlestep' command

This command has been deprecated before the 8.1 release,
in commit e9ccfdd91d ("hmp: Add 'one-insn-per-tb' command
equivalent to 'singlestep'"). Time to drop it.

Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: "Dr. David Alan Gilbert" <dave@treblig.org>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
Message-ID: <20240117151430.29235-3-philmd@linaro.org>
Signed-off-by: Thomas Huth <thuth@redhat.com>


  Commit: c61a0d31f8db4cb6c54e473e9a44dca616969414
      
https://github.com/qemu/qemu/commit/c61a0d31f8db4cb6c54e473e9a44dca616969414
  Author: Philippe Mathieu-Daudé <philmd@linaro.org>
  Date:   2024-01-19 (Fri, 19 Jan 2024)

  Changed paths:
    M bsd-user/main.c
    M docs/about/deprecated.rst
    M docs/about/removed-features.rst
    M docs/user/main.rst
    M linux-user/main.c
    M qemu-options.hx
    M system/vl.c

  Log Message:
  -----------
  cli: Remove deprecated '-singlestep' command line option

This option has been deprecated before the 8.1 release,
in commit 12fd0f41d0 ("Document that -singlestep command
line option is deprecated"). Time to drop it.

Inspired-by: Thomas Huth <thuth@redhat.com>
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
Message-ID: <20240117151430.29235-4-philmd@linaro.org>
Signed-off-by: Thomas Huth <thuth@redhat.com>


  Commit: 4a27d97c80b90215b33a092a1c3a5efcc987b582
      
https://github.com/qemu/qemu/commit/4a27d97c80b90215b33a092a1c3a5efcc987b582
  Author: Philippe Mathieu-Daudé <philmd@linaro.org>
  Date:   2024-01-19 (Fri, 19 Jan 2024)

  Changed paths:
    M tests/vm/netbsd

  Log Message:
  -----------
  tests/vm/netbsd: Remove missing py311-expat package

Since the pkgsrc-2023Q3 release [*], the py-expat package has been
merged into the base 'python' package:

 - Several packages have been folded into base packages.  While the
   result is simpler, those updating may need to force-remove the
   secondary packages, depending on the update method.  When doing
   make replace, one has to pkg_delete -f the secondary packages.
   pkgin handles at least the python packages correctly, removing the
   split package when updating python.  Specific packages and the
   former packages now included:

     * cairo: cairo-gobject
     * python: py-cElementTree py-curses py-cursespanel py-expat
       py-readline py-sqlite3

Remove py311-expat from the package list in order to avoid:

  ### Installing packages ...
  processing remote summary 
(http://cdn.NetBSD.org/pub/pkgsrc/packages/NetBSD/amd64/9.3/All)...
  database for http://cdn.NetBSD.org/pub/pkgsrc/packages/NetBSD/amd64/9.3/All 
is up-to-date
  py311-expat is not available in the repository
  ...
  calculating dependencies.../py311-expat is not available in the repository
  pkg_install error log can be found in /var/db/pkgin/pkg_install-err.log

[*] https://mail-index.netbsd.org/netbsd-announce/2024/01/01/msg000360.html

Resolves: https://gitlab.com/qemu-project/qemu/-/issues/2109
Tested-by: Thomas Huth <thuth@redhat.com>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Message-ID: <20240117140746.23511-1-philmd@linaro.org>
Signed-off-by: Thomas Huth <thuth@redhat.com>


  Commit: 09be34717190c1620f0c6e5c8765b8da354aeb4b
      
https://github.com/qemu/qemu/commit/09be34717190c1620f0c6e5c8765b8da354aeb4b
  Author: Peter Maydell <peter.maydell@linaro.org>
  Date:   2024-01-20 (Sat, 20 Jan 2024)

  Changed paths:
    M bsd-user/main.c
    M docs/about/deprecated.rst
    M docs/about/removed-features.rst
    M docs/specs/tpm.rst
    M docs/user/main.rst
    M hmp-commands.hx
    M hw/i386/pc.c
    M hw/s390x/s390-pci-bus.c
    M hw/s390x/s390-pci-kvm.c
    M hw/s390x/s390-virtio-ccw.c
    M include/hw/s390x/s390-pci-bus.h
    M linux-user/main.c
    M qapi/run-state.json
    M qemu-options.hx
    M system/runstate.c
    M system/vl.c
    M tests/qemu-iotests/183.out
    M tests/qemu-iotests/234.out
    M tests/qemu-iotests/262.out
    M tests/qemu-iotests/280.out
    M tests/qtest/test-hmp.c
    M tests/vm/netbsd

  Log Message:
  -----------
  Merge tag 'pull-request-2024-01-19' of https://gitlab.com/thuth/qemu into 
staging

- Fix s390x ISM reset
- Remove deprecated CLI options -no-hpet, -no-acpi, -async-teardown,
  -chroot and -singlestep
- Fix installation of the netbsd VM

# -----BEGIN PGP SIGNATURE-----
#
# iQJFBAABCAAvFiEEJ7iIR+7gJQEY8+q5LtnXdP5wLbUFAmWqk40RHHRodXRoQHJl
# ZGhhdC5jb20ACgkQLtnXdP5wLbVb+w//XuWdXzDDof0CsOMhMzBaKLznJ+Qbo4Wr
# S5vNJsiJe3KfI3DJa/ZSO2+lwyFpMPjp3aRSm9rAaw2ErejtfGZMSHj5/BGYuHVM
# x0VlHWnTEe/7NpG2mRwlxntPyYOtFCQ+xCo4YS9fpLLYSQFNhGMyOyfCobVZc1/A
# TDFrS5v1Su1HgYNL6GuyXK8k56ytidBxhuYtfLkR01liUDU1rmTWFcLxrXUwI7Hr
# nfamp/W6G9OJ3co0ysYChM8SvXQzCGPBxzGQjrcHpaL7otTW5yliJcNPwyzGdyLU
# G+5AcdJ8wT+ONonf3KkUTbxS2J2OHzIGCZpqVWGU0h5Yv43zMpNATUmbUPM0H0l4
# mqtUf4bSyhNwClKdkEWJyvEwNRTIHxWerMgaNp9ntEM3Ac0/3HiOXV/DZOKL04Im
# hRHRySSMlyo6Pnnn2fHj3naalKHNVikbvPVR3i8wdYuQ423D35cU8M+yJpJ3Bllt
# 5YgScDkVjifan5SmWVdtQ9bgyrdeQHFa9V1iUjxQx5JfAv8w4RBmats8UYrYm/mF
# Zrx/zdpL5wneslWwPqLp/gOb5lt8tF4vt0sLgpNa6SxI9Pgz/GhPvuhmfheML17l
# znbGEx5q3vqivszZkm8penydut4rbpp6GcoftbI9sIgqfNuuY1d/FZRlb32RTdxH
# 1TUiQfGQqbA=
# =ytHA
# -----END PGP SIGNATURE-----
# gpg: Signature made Fri 19 Jan 2024 15:21:49 GMT
# 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-2024-01-19' of https://gitlab.com/thuth/qemu:
  tests/vm/netbsd: Remove missing py311-expat package
  cli: Remove deprecated '-singlestep' command line option
  hmp: Remove deprecated 'singlestep' command
  qapi: Remove deprecated 'singlestep' member of StatusInfo
  qemu-options: Remove the deprecated -chroot option
  qemu-options: Remove the deprecated -async-teardown option
  qemu-options: Remove the deprecated -no-acpi option
  qemu-options: Remove the deprecated -no-hpet option
  s390x/pci: drive ISM reset from subsystem reset
  s390x/pci: refresh fh before disabling aif
  s390x/pci: avoid double enable/disable of aif

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


Compare: https://github.com/qemu/qemu/compare/3f2a357b9584...09be34717190



reply via email to

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