diff options
| author | Jason J. Herne <jjherne@linux.ibm.com> | 2019-04-04 10:34:30 -0400 |
|---|---|---|
| committer | Thomas Huth <thuth@redhat.com> | 2019-04-12 12:40:35 +0200 |
| commit | 7b361db37b18a75860decc0a85e0194936401d66 (patch) | |
| tree | 7e6a1401a5f5005a71ab3a84ba7b8e4fd47cfae0 /tests/boot-serial-test.c | |
| parent | 930072d2bf30986e57dac5c5945a32492f288944 (diff) | |
| download | qemu-7b361db37b18a75860decc0a85e0194936401d66.zip qemu-7b361db37b18a75860decc0a85e0194936401d66.tar.gz qemu-7b361db37b18a75860decc0a85e0194936401d66.tar.bz2 | |
s390-bios: Factor finding boot device out of virtio code path
Make a new routine find_boot_device to locate the boot device for all
cases, not just virtio.
The error message for the case where no boot device has been specified
and a suitable boot device cannot be auto detected was specific to
virtio devices. We update this message to remove virtio specific wording.
Signed-off-by: Jason J. Herne <jjherne@linux.ibm.com>
Reviewed-by: Farhan Ali <alifm@linux.ibm.com>
Reviewed-by: Cornelia Huck <cohuck@redhat.com>
Message-Id: <1554388475-18329-12-git-send-email-jjherne@linux.ibm.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>
Diffstat (limited to 'tests/boot-serial-test.c')
| -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 }, |