diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2020-03-23 15:38:30 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2020-03-23 15:38:30 +0000 |
| commit | 787f82407c5056a8b1097e39e53d01dd1abe406b (patch) | |
| tree | 1abdc37f97cbcc42f07824bafe9d2b0aa20eeafb /docs | |
| parent | 5f29856b852d055960a772d372ffe1bb2321b3f5 (diff) | |
| parent | 7722837369eb1c7e808021d79da68afa0c01c26f (diff) | |
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: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/system/index.rst | 1 | ||||
| -rw-r--r-- | docs/system/s390x/vfio-ap.rst (renamed from docs/system/vfio-ap.rst) | 0 | ||||
| -rw-r--r-- | docs/system/target-s390x.rst | 26 | ||||
| -rw-r--r-- | docs/system/targets.rst | 1 |
4 files changed, 27 insertions, 1 deletions
diff --git a/docs/system/index.rst b/docs/system/index.rst index 6e5f20fa13..c0f685b818 100644 --- a/docs/system/index.rst +++ b/docs/system/index.rst @@ -30,7 +30,6 @@ Contents: managed-startup targets security - vfio-ap deprecated build-platforms license diff --git a/docs/system/vfio-ap.rst b/docs/system/s390x/vfio-ap.rst index 3cd84179a2..3cd84179a2 100644 --- a/docs/system/vfio-ap.rst +++ b/docs/system/s390x/vfio-ap.rst diff --git a/docs/system/target-s390x.rst b/docs/system/target-s390x.rst new file mode 100644 index 0000000000..4c8b7cdd66 --- /dev/null +++ b/docs/system/target-s390x.rst @@ -0,0 +1,26 @@ +.. _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 + diff --git a/docs/system/targets.rst b/docs/system/targets.rst index eba3111247..0d8f91580a 100644 --- a/docs/system/targets.rst +++ b/docs/system/targets.rst @@ -17,3 +17,4 @@ Contents: target-arm target-m68k target-xtensa + target-s390x |