Commit 787f8240 authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/cohuck/tags/s390x-20200323' into staging 



- fix an off-by-one in the ipl code
- s390x documentation reordering

# gpg: Signature made Mon 23 Mar 2020 12:42:47 GMT
# gpg:                using RSA key C3D0D66DC3624FF6A8C018CEDECF6B93C6F02FAF
# gpg:                issuer "cohuck@redhat.com"
# gpg: Good signature from "Cornelia Huck <conny@cornelia-huck.de>" [marginal]
# gpg:                 aka "Cornelia Huck <huckc@linux.vnet.ibm.com>" [full]
# gpg:                 aka "Cornelia Huck <cornelia.huck@de.ibm.com>" [full]
# gpg:                 aka "Cornelia Huck <cohuck@kernel.org>" [marginal]
# gpg:                 aka "Cornelia Huck <cohuck@redhat.com>" [marginal]
# Primary key fingerprint: C3D0 D66D C362 4FF6 A8C0  18CE DECF 6B93 C6F0 2FAF

* remotes/cohuck/tags/s390x-20200323:
  s390/ipl: fix off-by-one in update_machine_ipl_properties()
  Documentation: create/move s390x documentation

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 5f29856b 77228373

MAINTAINERS

+3 −2
Original line number Diff line number Diff line
@@ -101,7 +101,8 @@ F: include/hw/watchdog/wdt_diag288.h 
F: pc-bios/s390-ccw/

F: pc-bios/s390-ccw.img

F: target/s390x/

F: docs/vfio-ap.txt

F: docs/system/target-s390x.rst

F: docs/system/s390x/

F: tests/migration/s390x/

K: ^Subject:.*(?i)s390x?

T: git https://github.com/cohuck/qemu.git s390-next
@@ -1611,7 +1612,7 @@ F: hw/s390x/ap-bridge.c 
F: include/hw/s390x/ap-device.h

F: include/hw/s390x/ap-bridge.h

F: hw/vfio/ap.c

F: docs/system/vfio-ap.rst

F: docs/system/s390x/vfio-ap.rst

L: qemu-s390x@nongnu.org



vhost

docs/system/index.rst

+0 −1
Original line number Diff line number Diff line
@@ -30,7 +30,6 @@ Contents: 
   managed-startup

   targets

   security

   vfio-ap

   deprecated

   build-platforms

   license

docs/system/vfio-ap.rst→docs/system/s390x/vfio-ap.rst

+0 −0

File moved.

View file

docs/system/target-s390x.rst

0 → 100644
+26 −0
Original line number Diff line number Diff line 
.. _s390x-System-emulator:



s390x System emulator

---------------------



QEMU can emulate z/Architecture (in particular, 64 bit) s390x systems

via the ``qemu-system-s390x`` binary. Only one machine type,

``s390-ccw-virtio``, is supported (with versioning for compatibility

handling).



When using KVM as accelerator, QEMU can emulate CPUs up to the generation

of the host. When using the default cpu model with TCG as accelerator,

QEMU will emulate a subset of z13 cpu features that should be enough to run

distributions built for the z13.



Device support

==============



QEMU will not emulate most of the traditional devices found under LPAR or

z/VM; virtio devices (especially using virtio-ccw) make up the bulk of

the available devices. Passthrough of host devices via vfio-pci, vfio-ccw,

or vfio-ap is also available.



.. toctree::

   s390x/vfio-ap

docs/system/targets.rst

+1 −0
Original line number Diff line number Diff line
@@ -17,3 +17,4 @@ Contents: 
   target-arm

   target-m68k

   target-xtensa

   target-s390x