summaryrefslogtreecommitdiffstats
path: root/docs
diff options
context:
space:
mode:
authorCornelia Huck2020-03-18 11:39:40 +0100
committerCornelia Huck2020-03-23 12:36:27 +0100
commitf58f084e71c6aeee066a30fc87422820e94a6cfc (patch)
tree4680a014f6df503f4feb608553317f237759dc14 /docs
parentMerge remote-tracking branch 'remotes/elmarco/tags/slirp-pull-request' into s... (diff)
downloadqemu-f58f084e71c6aeee066a30fc87422820e94a6cfc.tar.gz
qemu-f58f084e71c6aeee066a30fc87422820e94a6cfc.tar.xz
qemu-f58f084e71c6aeee066a30fc87422820e94a6cfc.zip
Documentation: create/move s390x documentation
Create a subdirectory for s390x under docs/system/ and move the existing vfio-ap documentation there. Create an initial document describing s390x system emulation. Suggested-by: Peter Maydell <peter.maydell@linaro.org> Signed-off-by: Cornelia Huck <cohuck@redhat.com> Acked-by: Christian Borntraeger <borntraeger@de.ibm.com> Message-Id: <20200318103940.1169-1-cohuck@redhat.com>
Diffstat (limited to 'docs')
-rw-r--r--docs/system/index.rst1
-rw-r--r--docs/system/s390x/vfio-ap.rst (renamed from docs/system/vfio-ap.rst)0
-rw-r--r--docs/system/target-s390x.rst26
-rw-r--r--docs/system/targets.rst1
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