- fix an off-by-one in the ipl code
- s390x documentation reordering -----BEGIN PGP SIGNATURE----- iQJGBAABCAAwFiEEw9DWbcNiT/aowBjO3s9rk8bwL68FAl54rscSHGNvaHVja0By ZWRoYXQuY29tAAoJEN7Pa5PG8C+vKjcP/3L95j6zBovoGLwhcOoyeww5U9f2zZVP gC5YVtxD11TBtkLeJ22O27veROWQ4ip2tyTKMewNHjVkkWytZkXcuLwNlKE5Wj30 5v9LjNrniNkfVScKOYVCMqfKP39aTu7/mwbX+uh6fihS1782DqjwM2Q+L1j2Ppw/ adI+Ghouk803Q5fTvCH2ZHYmrRy64XQ5gjay2H4j6eDbg26t2OpgdoZvn5aHWnMG zgEcZnv2sgc9r0lJIUHVnqDaLV1NCo3pp/+77ZlJjeLSy5GjtAbGlXRV4k7cqVnT hGXYCBNnKYdmCitwfWExy0eBbCFHit6j1/AgN89zccgjWFRnCanRYvH0tmGrNKbo 7q28WAEr92cYQ0JcYFb74hkkOVTOPMW3PRYy0oaZOoxwGcR4/h5j/zHZv1d03/lr 9fGX3W/Kcw6HTT06L1w/Pw/mKBIiGFF933Wp8ci0GwVuK1ndZ2KRUHOZAwvenTYn f1IRAqpSNRwvt9Yffz6BKbYivNClBtXcPjy93Wf781EJwUJafxpu7koXtHEOkShl uQn4iGcB+bAfChd1ygxHYf7MLLw1LiOqnlt34vfC/KDrvRcxtq024dHRhsHKjVBH 4Sh0qTDkEC1O60IHO6J87D6x9NUySWni3cz865lVwrIHsBLmM+DamAUUF8UhVSLD rDArw/3edkOq =H4zp -----END PGP SIGNATURE----- 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>
This commit is contained in:
commit
787f82407c
|
@ -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
|
||||
|
|
|
@ -30,7 +30,6 @@ Contents:
|
|||
managed-startup
|
||||
targets
|
||||
security
|
||||
vfio-ap
|
||||
deprecated
|
||||
build-platforms
|
||||
license
|
||||
|
|
26
docs/system/target-s390x.rst
Normal file
26
docs/system/target-s390x.rst
Normal file
|
@ -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
|
||||
|
|
@ -17,3 +17,4 @@ Contents:
|
|||
target-arm
|
||||
target-m68k
|
||||
target-xtensa
|
||||
target-s390x
|
||||
|
|
|
@ -546,7 +546,7 @@ static void update_machine_ipl_properties(IplParameterBlock *iplb)
|
|||
/* Sync loadparm */
|
||||
if (iplb->flags & DIAG308_FLAGS_LP_VALID) {
|
||||
uint8_t *ebcdic_loadparm = iplb->loadparm;
|
||||
char ascii_loadparm[8];
|
||||
char ascii_loadparm[9];
|
||||
int i;
|
||||
|
||||
for (i = 0; i < 8 && ebcdic_loadparm[i]; i++) {
|
||||
|
|
Loading…
Reference in a new issue