[Qemu-commits] [qemu/qemu] f514e1: hw: Add compat machines for 7.2

[Paolo Bonzini]

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: f514e1477f0d098f00d739c49e91944e04612e13
      
https://github.com/qemu/qemu/commit/f514e1477f0d098f00d739c49e91944e04612e13
  Author: Cornelia Huck <cohuck@redhat.com>
  Date:   2022-08-25 (Thu, 25 Aug 2022)

  Changed paths:
    M hw/arm/virt.c
    M hw/core/machine.c
    M hw/i386/pc.c
    M hw/i386/pc_piix.c
    M hw/i386/pc_q35.c
    M hw/m68k/virt.c
    M hw/ppc/spapr.c
    M hw/s390x/s390-virtio-ccw.c
    M include/hw/boards.h
    M include/hw/i386/pc.h

  Log Message:
  -----------
  hw: Add compat machines for 7.2

Add 7.2 machine types for arm/i440fx/m68k/q35/s390x/spapr.

Signed-off-by: Cornelia Huck <cohuck@redhat.com>
Reviewed-by: Daniel Henrique Barboza <danielhb413@gmail.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Message-Id: <20220727121755.395894-1-cohuck@redhat.com>
[thuth: fixed conflict with pcmc->legacy_no_rng_seed]
Signed-off-by: Thomas Huth <thuth@redhat.com>


  Commit: 1d41de5f0524b00a3e1ac0a5b66958466f4332fa
      
https://github.com/qemu/qemu/commit/1d41de5f0524b00a3e1ac0a5b66958466f4332fa
  Author: Christian Borntraeger <borntraeger@linux.ibm.com>
  Date:   2022-08-25 (Thu, 25 Aug 2022)

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

  Log Message:
  -----------
  s390x/cpumodel: add stfl197 processor-activity-instrumentation extension 1

Add stfle 197 (processor-activity-instrumentation extension 1) to the
gen16 default model and fence it off for 7.1 and older.

Signed-off-by: Christian Borntraeger <borntraeger@linux.ibm.com>
Reviewed-by: David Hildenbrand <david@redhat.com>
Message-Id: <20220727135120.12784-1-borntraeger@linux.ibm.com>
Acked-by: Cornelia Huck <cohuck@redhat.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>


  Commit: d324c21ba0b84b3033baa097e44a7fbbec815fad
      
https://github.com/qemu/qemu/commit/d324c21ba0b84b3033baa097e44a7fbbec815fad
  Author: Ilya Leoshkevich <iii@linux.ibm.com>
  Date:   2022-08-25 (Thu, 25 Aug 2022)

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

  Log Message:
  -----------
  target/s390x: Fix CLFIT and CLGIT immediate size

I2 is 16 bits, not 32.

Found by running valgrind's none/tests/s390x/traps.

Fixes: 1c2687518235 ("target-s390: Implement COMPARE AND TRAP")
Signed-off-by: Ilya Leoshkevich <iii@linux.ibm.com>
Message-Id: <20220817161529.597414-1-iii@linux.ibm.com>
Reviewed-by: David Hildenbrand <david@redhat.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>


  Commit: 8be934b70e923104da883b990dee18f02552d40e
      
https://github.com/qemu/qemu/commit/8be934b70e923104da883b990dee18f02552d40e
  Author: Thomas Huth <thuth@redhat.com>
  Date:   2022-08-26 (Fri, 26 Aug 2022)

  Changed paths:
    M backends/hostmem.c

  Log Message:
  -----------
  backends/hostmem: Fix support of memory-backend-memfd in qemu_maxrampagesize()

It is currently not possible yet to use "memory-backend-memfd" on s390x
with hugepages enabled. This problem is caused by qemu_maxrampagesize()
not taking memory-backend-memfd objects into account yet, so the code
in s390_memory_init() fails to enable the huge page support there via
s390_set_max_pagesize(). Fix it by generalizing the code, so that it
looks at qemu_ram_pagesize(memdev->mr.ram_block) instead of re-trying
to get the information from the filesystem.

Suggested-by: David Hildenbrand <david@redhat.com>
Buglink: https://bugzilla.redhat.com/show_bug.cgi?id=2116496
Message-Id: <20220810125720.3849835-2-thuth@redhat.com>
Reviewed-by: David Hildenbrand <david@redhat.com>
Reviewed-by: Claudio Imbrenda <imbrenda@linux.ibm.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>


  Commit: 90de559a669b99919e2a95ee85cb6b9b2e7256cb
      
https://github.com/qemu/qemu/commit/90de559a669b99919e2a95ee85cb6b9b2e7256cb
  Author: Thomas Huth <thuth@redhat.com>
  Date:   2022-08-26 (Fri, 26 Aug 2022)

  Changed paths:
    M softmmu/physmem.c

  Log Message:
  -----------
  softmmu/physmem: Remove the ifdef __linux__ around the pagesize functions

Now that host_memory_backend_pagesize() is not depending on the hugetlb
memory path handling anymore, we can also remove the #ifdef and the
TOCTTOU comment from the calling functions - the code should now work
equally well on all host architectures.

Message-Id: <20220810125720.3849835-3-thuth@redhat.com>
Reviewed-by: Claudio Imbrenda <imbrenda@linux.ibm.com>
Acked-by: David Hildenbrand <david@redhat.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>


  Commit: 90d994619383c2665cf4f4712872c43ad2728bec
      
https://github.com/qemu/qemu/commit/90d994619383c2665cf4f4712872c43ad2728bec
  Author: Thomas Huth <thuth@redhat.com>
  Date:   2022-08-26 (Fri, 26 Aug 2022)

  Changed paths:
    M include/qemu/mmap-alloc.h
    M util/mmap-alloc.c

  Log Message:
  -----------
  util/mmap-alloc: Remove qemu_mempath_getpagesize()

The last user of this function has just been removed, so we can
drop this function now, too.

Message-Id: <20220810125720.3849835-4-thuth@redhat.com>
Reviewed-by: David Hildenbrand <david@redhat.com>
Reviewed-by: Claudio Imbrenda <imbrenda@linux.ibm.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>


  Commit: 3a2a29ebbdf47138ffa3cb729afeaa5286948521
      
https://github.com/qemu/qemu/commit/3a2a29ebbdf47138ffa3cb729afeaa5286948521
  Author: Stefan Hajnoczi <stefanha@redhat.com>
  Date:   2022-08-31 (Wed, 31 Aug 2022)

  Changed paths:
    M backends/hostmem.c
    M hw/arm/virt.c
    M hw/core/machine.c
    M hw/i386/pc.c
    M hw/i386/pc_piix.c
    M hw/i386/pc_q35.c
    M hw/m68k/virt.c
    M hw/ppc/spapr.c
    M hw/s390x/s390-virtio-ccw.c
    M include/hw/boards.h
    M include/hw/i386/pc.h
    M include/qemu/mmap-alloc.h
    M softmmu/physmem.c
    M target/s390x/cpu_features_def.h.inc
    M target/s390x/gen-features.c
    M target/s390x/tcg/insn-data.def
    M util/mmap-alloc.c

  Log Message:
  -----------
  Merge tag 's390x-pull-request-2022-08-30' of https://gitlab.com/thuth/qemu 
into staging

* Compat machine types for QEMU 7.2
* Add feature bit for the "processor-activity-instrumentation extension"
* Fix emulation of CLFIT and CLGIT instructions
* Fix hugepages support on s390x with the memfd memory-backend

# -----BEGIN PGP SIGNATURE-----
#
# iQJFBAABCAAvFiEEJ7iIR+7gJQEY8+q5LtnXdP5wLbUFAmMOD0cRHHRodXRoQHJl
# ZGhhdC5jb20ACgkQLtnXdP5wLbWrUg//YyjsnuUoKhea7PmnL6WUOyD0jZoMtDK3
# IwRzneLfTPQneStqCc1gtoWMelhP68wa/t2ygfwB5hOrLKz8r0aIvnsfEgc8t++R
# 58IwClD9Z2d26lCMzIlW3A4ACQfZVk96wtqPmfShMHKuZePrA/oM4l7R+EItP9nl
# s1WYUZ0ia/qogJ2Wr+MvDGbURv37DqYJ2OuY8WCrIX9trQxUwcydZKMv1ca55mpn
# GfZNBbTuqhLMf+r4NmxNzHnMayGtWOyaISStJBhGDlRJyKjDsy1ghAXDMa1WFRup
# lj6mBoq0F19PCnjI9AUFVNvPhuj/1Ku+YkVwrImleSdBBmgaUx+LWwFXU+stnQv7
# 9bYosdTJ55BJ8YmRn1w00b+rIVg4SvJimQJc+BizWe7tdpc+E1AhBerUC4bwZxZw
# NRiPwSraym2b9/mpv7/fzUGECEpP37IHHZtIa37OO3d48NuaHpFHhpcskbmfCIwP
# K19Jqc5cyLf7/iEliOo+BVcMVDQSL4M4x7CePpO1Kd83RmDEoBQlQDL9ZcXYAefz
# yY7OYwi2DfO893umDNuXwyN6b3HwOjDztFy2emgVRfwFIsm4jWnsByRsjVasaIvd
# kmfCjZj0URBoUCfJiKtrpzgF+uup8n54uJxtbsWyf83xdMz/zpsDXAnm1eG6qZq3
# 7MD1+akz2Ak=
# =lJy4
# -----END PGP SIGNATURE-----
# gpg: Signature made Tue 30 Aug 2022 09:23:19 EDT
# 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 's390x-pull-request-2022-08-30' of https://gitlab.com/thuth/qemu:
  util/mmap-alloc: Remove qemu_mempath_getpagesize()
  softmmu/physmem: Remove the ifdef __linux__ around the pagesize functions
  backends/hostmem: Fix support of memory-backend-memfd in qemu_maxrampagesize()
  target/s390x: Fix CLFIT and CLGIT immediate size
  s390x/cpumodel: add stfl197 processor-activity-instrumentation extension 1
  hw: Add compat machines for 7.2

Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>


Compare: https://github.com/qemu/qemu/compare/93fac696d241...3a2a29ebbdf4