Branch: refs/heads/staging Home: https://github.com/qemu/qemu Commit: c35aff184b2ed5be930da671ea25c857713555af https://github.com/qemu/qemu/commit/c35aff184b2ed5be930da671ea25c857713555af Author: Collin Walling <wall...@linux.ibm.com> Date: 2021-12-17 (Fri, 17 Dec 2021)
Changed paths: M target/s390x/cpu.h M target/s390x/kvm/kvm.c Log Message: ----------- s390: kvm: adjust diag318 resets to retain data The CPNC portion of the diag318 data is erroneously reset during an initial CPU reset caused by SIGP. Let's go ahead and relocate the diag318_info field within the CPUS390XState struct such that it is only zeroed during a clear reset. This way, the CPNC will be retained for each VCPU in the configuration after the diag318 instruction has been invoked. The s390_machine_reset code already takes care of zeroing the diag318 data on VM resets, which also cover resets caused by diag308. Fixes: fabdada9357b ("s390: guest support for diagnose 0x318") Reported-by: Christian Borntraeger <borntrae...@de.ibm.com> Signed-off-by: Collin Walling <wall...@linux.ibm.com> Reviewed-by: Janosch Frank <fran...@linux.ibm.com> Reviewed-by: Christian Borntraeger <borntrae...@linux.ibm.com> Message-Id: <20211117152303.627969-1-wall...@linux.ibm.com> Signed-off-by: Thomas Huth <th...@redhat.com> Commit: 2c092950a4766307e3d14f3764f7610d551515b9 https://github.com/qemu/qemu/commit/2c092950a4766307e3d14f3764f7610d551515b9 Author: Christian Borntraeger <borntrae...@linux.ibm.com> Date: 2021-12-17 (Fri, 17 Dec 2021) Changed paths: M .mailmap M MAINTAINERS Log Message: ----------- MAINTAINERS: update email address of Christian Borntraeger My borntrae...@de.ibm.com email is just a forwarder to the linux.ibm.com address. Let us remove the extra hop to avoid a potential source of errors. While at it, add the relevant email addresses to mailmap. Signed-off-by: Christian Borntraeger <borntrae...@linux.ibm.com> Message-Id: <20211126102449.287524-1-borntrae...@linux.ibm.com> Signed-off-by: Thomas Huth <th...@redhat.com> Commit: b2892a2b9d45d25b909108ca633d19f9d8d673f5 https://github.com/qemu/qemu/commit/b2892a2b9d45d25b909108ca633d19f9d8d673f5 Author: Matthew Rosato <mjros...@linux.ibm.com> Date: 2021-12-17 (Fri, 17 Dec 2021) Changed paths: M include/hw/s390x/s390-pci-bus.h Log Message: ----------- s390x/pci: use a reserved ID for the default PCI group The current default PCI group being used can technically collide with a real group ID passed from a hostdev. Let's instead use a group ID that comes from a special pool (0xF0-0xFF) that is architected to be reserved for simulated devices. Fixes: 28dc86a072 ("s390x/pci: use a PCI Group structure") Signed-off-by: Matthew Rosato <mjros...@linux.ibm.com> Reviewed-by: Eric Farman <far...@linux.ibm.com> Reviewed-by: Pierre Morel <pmo...@linux.ibm.com> Message-Id: <20211203142706.427279-2-mjros...@linux.ibm.com> Signed-off-by: Thomas Huth <th...@redhat.com> Commit: df7ce0a94d9283f0656b4bc0f21566973ff649a3 https://github.com/qemu/qemu/commit/df7ce0a94d9283f0656b4bc0f21566973ff649a3 Author: Matthew Rosato <mjros...@linux.ibm.com> Date: 2021-12-17 (Fri, 17 Dec 2021) Changed paths: M hw/s390x/s390-pci-inst.c Log Message: ----------- s390x/pci: don't use hard-coded dma range in reg_ioat Instead use the values from clp info, they will either be the hard-coded values or what came from the host driver via vfio. Fixes: 9670ee752727 ("s390x/pci: use a PCI Function structure") Signed-off-by: Matthew Rosato <mjros...@linux.ibm.com> Reviewed-by: Eric Farman <far...@linux.ibm.com> Reviewed-by: Pierre Morel <pmo...@linux.ibm.com> Message-Id: <20211203142706.427279-3-mjros...@linux.ibm.com> Signed-off-by: Thomas Huth <th...@redhat.com> Commit: cb6d6a3e6aa1226b67fd218953dcb3866c3a6845 https://github.com/qemu/qemu/commit/cb6d6a3e6aa1226b67fd218953dcb3866c3a6845 Author: Matthew Rosato <mjros...@linux.ibm.com> Date: 2021-12-17 (Fri, 17 Dec 2021) Changed paths: M hw/s390x/s390-pci-inst.c Log Message: ----------- s390x/pci: use the passthrough measurement update interval We may have gotten a measurement update interval from the underlying host via vfio -- Use it to set the interval via which we update the function measurement block. Fixes: 28dc86a072 ("s390x/pci: use a PCI Group structure") Signed-off-by: Matthew Rosato <mjros...@linux.ibm.com> Reviewed-by: Eric Farman <far...@linux.ibm.com> Reviewed-by: Pierre Morel <pmo...@linux.ibm.com> Message-Id: <20211203142706.427279-4-mjros...@linux.ibm.com> Signed-off-by: Thomas Huth <th...@redhat.com> Commit: ac6aa30ac47b2abaf142f76de46374da2a98f6e7 https://github.com/qemu/qemu/commit/ac6aa30ac47b2abaf142f76de46374da2a98f6e7 Author: Matthew Rosato <mjros...@linux.ibm.com> Date: 2021-12-17 (Fri, 17 Dec 2021) Changed paths: M hw/s390x/s390-pci-bus.c M hw/s390x/s390-pci-inst.c M hw/s390x/s390-pci-vfio.c M include/hw/s390x/s390-pci-bus.h M include/hw/s390x/s390-pci-clp.h Log Message: ----------- s390x/pci: add supported DT information to clp response The DTSM is a mask that specifies which I/O Address Translation designation types are supported. Today QEMU only supports DT=1. Signed-off-by: Matthew Rosato <mjros...@linux.ibm.com> Reviewed-by: Eric Farman <far...@linux.ibm.com> Reviewed-by: Pierre Morel <pmo...@linux.ibm.com> Message-Id: <20211203142706.427279-5-mjros...@linux.ibm.com> Signed-off-by: Thomas Huth <th...@redhat.com> Commit: 9f8e6cad65a66b27e797defe639a4a4fd4330f23 https://github.com/qemu/qemu/commit/9f8e6cad65a66b27e797defe639a4a4fd4330f23 Author: Thomas Huth <th...@redhat.com> Date: 2021-12-17 (Fri, 17 Dec 2021) Changed paths: M .gitlab-ci.d/windows.yml Log Message: ----------- gitlab-ci: Speed up the msys2-64bit job by using --without-default-devices The new msys2-64bit job is often running for more than 50 minutes - and if the CI is currently loaded, it times out after 60 minutes. The job has been declared with a bigger timeout, but seems like this is getting ignored on the shared Gitlab-CI Windows runners, so we're currently seeing a lot of failures with this job. Thus we have to reduce the time it takes to finish this job. Since we want to test compiling the WHPX and HAX accelerator code with this job, switching to another target CPU is not really a good option, so let's reduce the amount of code that we have to compile with the --without-default-devices switch instead. Message-Id: <20211216082253.43899-1-th...@redhat.com> Reviewed-by: Philippe Mathieu-Daudé <phi...@redhat.com> Signed-off-by: Thomas Huth <th...@redhat.com> Commit: 48c03a0e13f49e8dff9a8ac37fff43e00a0a9bb3 https://github.com/qemu/qemu/commit/48c03a0e13f49e8dff9a8ac37fff43e00a0a9bb3 Author: Richard Henderson <richard.hender...@linaro.org> Date: 2021-12-17 (Fri, 17 Dec 2021) Changed paths: M .gitlab-ci.d/windows.yml M .mailmap M MAINTAINERS M hw/s390x/s390-pci-bus.c M hw/s390x/s390-pci-inst.c M hw/s390x/s390-pci-vfio.c M include/hw/s390x/s390-pci-bus.h M include/hw/s390x/s390-pci-clp.h M target/s390x/cpu.h M target/s390x/kvm/kvm.c Log Message: ----------- Merge tag 's390x-2021-12-17' of https://gitlab.com/thuth/qemu into staging * Small fixes for the s390x PCI code * Fix reset handling of the diag318 data * Ease timeout problem of the new msys2-64bit job # gpg: Signature made Fri 17 Dec 2021 02:01:45 AM PST # gpg: using RSA key 27B88847EEE0250118F3EAB92ED9D774FE702DB5 # gpg: issuer "th...@redhat.com" # gpg: Good signature from "Thomas Huth <th.h...@gmx.de>" [unknown] # gpg: aka "Thomas Huth <th...@redhat.com>" [unknown] # gpg: aka "Thomas Huth <th.h...@posteo.de>" [unknown] # gpg: aka "Thomas Huth <h...@tuxfamily.org>" [unknown] # gpg: WARNING: This key is not certified with a trusted signature! # gpg: There is no indication that the signature belongs to the owner. # Primary key fingerprint: 27B8 8847 EEE0 2501 18F3 EAB9 2ED9 D774 FE70 2DB5 * tag 's390x-2021-12-17' of https://gitlab.com/thuth/qemu: gitlab-ci: Speed up the msys2-64bit job by using --without-default-devices s390x/pci: add supported DT information to clp response s390x/pci: use the passthrough measurement update interval s390x/pci: don't use hard-coded dma range in reg_ioat s390x/pci: use a reserved ID for the default PCI group MAINTAINERS: update email address of Christian Borntraeger s390: kvm: adjust diag318 resets to retain data Signed-off-by: Richard Henderson <richard.hender...@linaro.org> Compare: https://github.com/qemu/qemu/compare/0afbf81147f6...48c03a0e13f4