diff options
| author | Peter Maydell | 2020-07-18 18:27:34 +0200 |
|---|---|---|
| committer | Peter Maydell | 2020-07-18 18:27:34 +0200 |
| commit | 97f750becac33e3d3e446d3ff4ae9af2577b7877 (patch) | |
| tree | 24666f24edff2af98638cb3e5fac30ff6198b36f /docs | |
| parent | Merge remote-tracking branch 'remotes/kevin/tags/for-upstream' into staging (diff) | |
| parent | docs/s390x: fix vfio-ccw type (diff) | |
| download | qemu-97f750becac33e3d3e446d3ff4ae9af2577b7877.tar.gz qemu-97f750becac33e3d3e446d3ff4ae9af2577b7877.tar.xz qemu-97f750becac33e3d3e446d3ff4ae9af2577b7877.zip | |
Merge remote-tracking branch 'remotes/cohuck/tags/s390x-20200717' into staging
Fix typo in newly added documentation.
# gpg: Signature made Fri 17 Jul 2020 14:54:20 BST
# 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-20200717:
docs/s390x: fix vfio-ccw type
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/system/s390x/vfio-ccw.rst | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/docs/system/s390x/vfio-ccw.rst b/docs/system/s390x/vfio-ccw.rst index 8f65442c0f..41e0bad5b4 100644 --- a/docs/system/s390x/vfio-ccw.rst +++ b/docs/system/s390x/vfio-ccw.rst @@ -29,7 +29,7 @@ automatically, use [root@host ~]# driverctl -b css set-override 0.0.0313 vfio_ccw [root@host ~]# mdevctl define -u 7e270a25-e163-4922-af60-757fc8ed48c6 \ - -p 0.0.0313 -t vfio-ccw_io -a + -p 0.0.0313 -t vfio_ccw-io -a If using ``mdevctl`` is not possible or wanted, follow the manual procedure below. |