From 7b361db37b18a75860decc0a85e0194936401d66 Mon Sep 17 00:00:00 2001 From: "Jason J. Herne" Date: Thu, 4 Apr 2019 10:34:30 -0400 Subject: 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 Reviewed-by: Farhan Ali Reviewed-by: Cornelia Huck Message-Id: <1554388475-18329-12-git-send-email-jjherne@linux.ibm.com> Signed-off-by: Thomas Huth --- tests/boot-serial-test.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tests/boot-serial-test.c') 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 }, -- cgit v1.1