diff options
| author | Cornelia Huck <cohuck@redhat.com> | 2019-04-25 14:08:17 +0200 |
|---|---|---|
| committer | Cornelia Huck <cohuck@redhat.com> | 2019-04-25 14:09:20 +0200 |
| commit | 41c3d4269b1c18d12d33c5bf089dace25d08e82e (patch) | |
| tree | 5b9447cf21e53ce4fec524e8f9e836fcfd4780da /tests | |
| parent | 905b7ee4d647111d29f29c55618591366321c47a (diff) | |
| parent | 4a33fac54665558b7f7a68135c4a4c602eceb72f (diff) | |
| download | qemu-41c3d4269b1c18d12d33c5bf089dace25d08e82e.zip qemu-41c3d4269b1c18d12d33c5bf089dace25d08e82e.tar.gz qemu-41c3d4269b1c18d12d33c5bf089dace25d08e82e.tar.bz2 | |
Merge tag 's390-ccw-bios-2019-04-12' into s390-next-staging
Support for booting from a vfio-ccw passthrough dasd device
# gpg: Signature made Fri 12 Apr 2019 01:17:03 PM CEST
# gpg: using RSA key 2ED9D774FE702DB5
# gpg: Good signature from "Thomas Huth <th.huth@gmx.de>" [full]
# gpg: aka "Thomas Huth <thuth@redhat.com>" [undefined]
# gpg: aka "Thomas Huth <huth@tuxfamily.org>" [undefined]
# gpg: aka "Thomas Huth <th.huth@posteo.de>" [unknown]
* tag 's390-ccw-bios-2019-04-12':
pc-bios/s390: Update firmware images
s390-bios: Use control unit type to find bootable devices
s390-bios: Support booting from real dasd device
s390-bios: Add channel command codes/structs needed for dasd-ipl
s390-bios: Use control unit type to determine boot method
s390-bios: Refactor virtio to run channel programs via cio
s390-bios: Factor finding boot device out of virtio code path
s390-bios: Extend find_dev() for non-virtio devices
s390-bios: cio error handling
s390-bios: Support for running format-0/1 channel programs
s390-bios: ptr2u32 and u32toptr
s390-bios: Map low core memory
s390-bios: Decouple channel i/o logic from virtio
s390-bios: Clean up cio.h
s390-bios: decouple common boot logic from virtio
s390-bios: decouple cio setup from virtio
s390 vfio-ccw: Add bootindex property and IPLB data
Signed-off-by: Cornelia Huck <cohuck@redhat.com>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/boot-serial-test.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/boot-serial-test.c b/tests/boot-serial-test.c index c591748..24852d4 100644 --- a/tests/boot-serial-test.c +++ b/tests/boot-serial-test.c @@ -114,7 +114,7 @@ static testdef_t tests[] = { { "sparc", "SS-4", "", "MB86904" }, { "sparc", "SS-600MP", "", "TMS390Z55" }, { "sparc64", "sun4u", "", "UltraSPARC" }, - { "s390x", "s390-ccw-virtio", "", "virtio device" }, + { "s390x", "s390-ccw-virtio", "", "device" }, { "m68k", "mcf5208evb", "", "TT", sizeof(kernel_mcf5208), kernel_mcf5208 }, { "microblaze", "petalogix-s3adsp1800", "", "TT", sizeof(kernel_pls3adsp1800), kernel_pls3adsp1800 }, |