[Qemu-commits] [qemu/qemu] 2092fd: s390x: sck: load into a temporary not into in1

[Peter Maydell]

  Branch: refs/heads/staging
  Home:   https://github.com/qemu/qemu
  Commit: 2092fdd97c27c0d6ef4bd0958fde0f6522100dcc
      
https://github.com/qemu/qemu/commit/2092fdd97c27c0d6ef4bd0958fde0f6522100dcc
  Author: Nico Boehr <nrb@linux.ibm.com>
  Date:   2022-02-25 (Fri, 25 Feb 2022)

  Changed paths:
    M target/s390x/tcg/insn-data.def
    M target/s390x/tcg/translate.c

  Log Message:
  -----------
  s390x: sck: load into a temporary not into in1

We previously loaded into in1, but in1 is not filled during
disassembly and hence always zero. This leads to an assertion failure:

  qemu-system-s390x: /home/nrb/qemu/include/tcg/tcg.h:654: temp_idx:
  Assertion `n >= 0 && n < tcg_ctx->nb_temps' failed.`

Instead, use in2_la2_m64a to load from storage into in2 and pass that to
the helper, which matches what we already do for SCKC.

This fixes the SCK test I sent here under TCG:
<https://www.spinics.net/lists/kvm/msg265169.html>

Fixes: 9dc67537 ("s390x/tcg: implement SET CLOCK ")
Suggested-by: David Hildenbrand <david@redhat.com>
Signed-off-by: Nico Boehr <nrb@linux.ibm.com>
Message-Id: <20220126084201.774457-1-nrb@linux.ibm.com>
Reviewed-by: David Hildenbrand <david@redhat.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>


  Commit: f3f230d934dada8801c86742f58bca7a2cd1ff78
      
https://github.com/qemu/qemu/commit/f3f230d934dada8801c86742f58bca7a2cd1ff78
  Author: Thomas Huth <thuth@redhat.com>
  Date:   2022-02-25 (Fri, 25 Feb 2022)

  Changed paths:
    M tests/avocado/machine_s390_ccw_virtio.py

  Log Message:
  -----------
  tests/avocado/machine_s390_ccw_virtio: Adapt test to new default resolution

QEMU's default screen resolution recently changed to 1280x800, so the
resolution in the screen shot header changed of course, too.

Fixes: de72c4b7cd ("edid: set default resolution to 1280x800 (WXGA)")
Reported-by: Peter Maydell <peter.maydell@linaro.org>
Message-Id: <20220221101933.307525-1-thuth@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Acked-by: Halil Pasic <pasic@linux.ibm.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>


  Commit: e7b3b0951d95c14bfe62e8a138c867df3f399f66
      
https://github.com/qemu/qemu/commit/e7b3b0951d95c14bfe62e8a138c867df3f399f66
  Author: Thomas Huth <thuth@redhat.com>
  Date:   2022-02-28 (Mon, 28 Feb 2022)

  Changed paths:
    M .travis.yml

  Log Message:
  -----------
  travis.yml: Update the s390x jobs to Ubuntu Focal

QEMU will soon drop the support for Ubuntu 18.04, so let's update
the Travis jobs that were still using this version to 20.04 instead.

While we're at it, also remove an obsolete comment about Ubuntu
Xenial being the default for our Travis jobs.

Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Message-Id: <20220221153423.1028465-1-thuth@redhat.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>


  Commit: ea0a1053e276f07b1a75b222115810e8cee71fa9
      
https://github.com/qemu/qemu/commit/ea0a1053e276f07b1a75b222115810e8cee71fa9
  Author: David Miller <dmiller423@gmail.com>
  Date:   2022-02-28 (Mon, 28 Feb 2022)

  Changed paths:
    M target/s390x/gen-features.c
    M target/s390x/helper.h
    M target/s390x/tcg/insn-data.def
    M target/s390x/tcg/mem_helper.c
    M target/s390x/tcg/translate.c

  Log Message:
  -----------
  s390x/tcg: Implement Miscellaneous-Instruction-Extensions Facility 3 for the 
s390x

implements:
AND WITH COMPLEMENT   (NCRK, NCGRK)
NAND                  (NNRK, NNGRK)
NOT EXCLUSIVE OR      (NXRK, NXGRK)
NOR                   (NORK, NOGRK)
OR WITH COMPLEMENT    (OCRK, OCGRK)
SELECT                (SELR, SELGR)
SELECT HIGH           (SELFHR)
MOVE RIGHT TO LEFT    (MVCRL)
POPULATION COUNT      (POPCNT)

Resolves: https://gitlab.com/qemu-project/qemu/-/issues/737
Signed-off-by: David Miller <dmiller423@gmail.com>
Message-Id: <20220223223117.66660-2-dmiller423@gmail.com>
Reviewed-by: David Hildenbrand <david@redhat.com>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Signed-off-by: Thomas Huth <thuth@redhat.com>


  Commit: 8a4eafb69cd92d323ab05850b72005e11f7a4201
      
https://github.com/qemu/qemu/commit/8a4eafb69cd92d323ab05850b72005e11f7a4201
  Author: David Miller <dmiller423@gmail.com>
  Date:   2022-02-28 (Mon, 28 Feb 2022)

  Changed paths:
    M hw/s390x/s390-virtio-ccw.c
    M target/s390x/cpu_models.c
    M target/s390x/gen-features.c

  Log Message:
  -----------
  s390x/cpumodel: Bump up QEMU model to a stripped-down IBM z15 GA1

TCG implements everything we need to run basic z15 OS+software

Signed-off-by: David Miller <dmiller423@gmail.com>
Message-Id: <20220223223117.66660-3-dmiller423@gmail.com>
Reviewed-by: David Hildenbrand <david@redhat.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>


  Commit: e2c3fb069994858fea9aca9a4e64fa5afd34021a
      
https://github.com/qemu/qemu/commit/e2c3fb069994858fea9aca9a4e64fa5afd34021a
  Author: David Miller <dmiller423@gmail.com>
  Date:   2022-02-28 (Mon, 28 Feb 2022)

  Changed paths:
    M tests/tcg/s390x/Makefile.target
    A tests/tcg/s390x/mie3-compl.c
    A tests/tcg/s390x/mie3-mvcrl.c
    A tests/tcg/s390x/mie3-sel.c

  Log Message:
  -----------
  tests/tcg/s390x: Tests for Miscellaneous-Instruction-Extensions Facility 3

tests/tcg/s390x/mie3-compl.c: [N]*K instructions
tests/tcg/s390x/mie3-mvcrl.c: MVCRL instruction
tests/tcg/s390x/mie3-sel.c: SELECT instruction

Signed-off-by: David Miller <dmiller423@gmail.com>
Message-Id: <20220223223117.66660-4-dmiller423@gmail.com>
[thuth: Squash mnemonic -> .insn patch, white space cleanup, improve asm usage]
Signed-off-by: Thomas Huth <thuth@redhat.com>


  Commit: 99c53410bc9d50e556f565b0960673cccb566452
      
https://github.com/qemu/qemu/commit/99c53410bc9d50e556f565b0960673cccb566452
  Author: Peter Maydell <peter.maydell@linaro.org>
  Date:   2022-03-01 (Tue, 01 Mar 2022)

  Changed paths:
    M .travis.yml
    M hw/s390x/s390-virtio-ccw.c
    M target/s390x/cpu_models.c
    M target/s390x/gen-features.c
    M target/s390x/helper.h
    M target/s390x/tcg/insn-data.def
    M target/s390x/tcg/mem_helper.c
    M target/s390x/tcg/translate.c
    M tests/avocado/machine_s390_ccw_virtio.py
    M tests/tcg/s390x/Makefile.target
    A tests/tcg/s390x/mie3-compl.c
    A tests/tcg/s390x/mie3-mvcrl.c
    A tests/tcg/s390x/mie3-sel.c

  Log Message:
  -----------
  Merge remote-tracking branch 
'remotes/thuth-gitlab/tags/pull-request-2022-02-28' into staging

* Fix emulation of the SET CLOCK instruction
* Fix the s390x avocado test with Fedora
* Update the s390x Travis jobs to Focal (instead of Bionic)
* Implement the z15 Misc Instruction Extension 3 Facility

# gpg: Signature made Mon 28 Feb 2022 10:34:47 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

* remotes/thuth-gitlab/tags/pull-request-2022-02-28:
  tests/tcg/s390x: Tests for Miscellaneous-Instruction-Extensions Facility 3
  s390x/cpumodel: Bump up QEMU model to a stripped-down IBM z15 GA1
  s390x/tcg: Implement Miscellaneous-Instruction-Extensions Facility 3 for the 
s390x
  travis.yml: Update the s390x jobs to Ubuntu Focal
  tests/avocado/machine_s390_ccw_virtio: Adapt test to new default resolution
  s390x: sck: load into a temporary not into in1

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


Compare: https://github.com/qemu/qemu/compare/648c15e4ec34...99c53410bc9d