diff options
| author | Simon Glass <sjg@chromium.org> | 2023-01-17 10:47:52 -0700 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2023-01-23 18:11:40 -0500 |
| commit | a60f7a3e35bc6da231046a8931072027575c6939 (patch) | |
| tree | dab232d613434d0c41935e9616641a5f7664bd99 /test | |
| parent | 00fc8cade89e36855fe8143c4ee66e951a41734e (diff) | |
bootstd: Add a virtio bootdev
Add a bootdev for virtio so that these devices can be used with standard
boot.
Signed-off-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'test')
| -rw-r--r-- | test/boot/bootdev.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/test/boot/bootdev.c b/test/boot/bootdev.c index 6f150175f6..2ad31a0ef6 100644 --- a/test/boot/bootdev.c +++ b/test/boot/bootdev.c @@ -244,7 +244,8 @@ static int bootdev_test_hunter(struct unit_test_state *uts) ut_assert_nextline(" 30 nvme nvme_bootdev"); ut_assert_nextline(" 30 scsi scsi_bootdev"); ut_assert_nextline(" 40 usb usb_bootdev"); - ut_assert_nextline("(total hunters: 6)"); + ut_assert_nextline(" 30 virtio virtio_bootdev"); + ut_assert_nextline("(total hunters: 7)"); ut_assert_console_end(); ut_assertok(bootdev_hunt("usb1", false)); @@ -273,7 +274,7 @@ static int bootdev_test_cmd_hunt(struct unit_test_state *uts) ut_assertok(run_command("bootdev hunt -l", 0)); ut_assert_nextline("Prio Used Uclass Hunter"); ut_assert_nextlinen("----"); - ut_assert_skip_to_line("(total hunters: 6)"); + ut_assert_skip_to_line("(total hunters: 7)"); ut_assert_console_end(); /* Scan all hunters */ @@ -290,6 +291,7 @@ static int bootdev_test_cmd_hunt(struct unit_test_state *uts) ut_assert_skip_to_line("Hunting with: usb"); ut_assert_nextline( "Bus usb@1: scanning bus usb@1 for devices... 5 USB Device(s) found"); + ut_assert_skip_to_line("Hunting with: virtio"); ut_assert_console_end(); /* List available hunters */ @@ -302,11 +304,11 @@ static int bootdev_test_cmd_hunt(struct unit_test_state *uts) ut_assert_nextline(" 30 * nvme nvme_bootdev"); ut_assert_nextline(" 30 * scsi scsi_bootdev"); ut_assert_nextline(" 40 * usb usb_bootdev"); - - ut_assert_nextline("(total hunters: 6)"); + ut_assert_nextline(" 30 * virtio virtio_bootdev"); + ut_assert_nextline("(total hunters: 7)"); ut_assert_console_end(); - ut_asserteq(GENMASK(5, 0), std->hunters_used); + ut_asserteq(GENMASK(6, 0), std->hunters_used); return 0; } |