virtiotest tweaks

2 files changed, 6 insertions, 9 deletions

diff --git a/tests/basic.py b/tests/basic.py
index 3b6eac4..4553e4e 100644
--- a/tests/basic.py
+++ b/tests/basic.py
@@ -83,9 +83,9 @@ class BaseDRM(TestDRM):
         self.console_wait('---root---')
 
     def virtio_tests(self, vga):
-        self.console_run('virtiotest -i')
-        virtinfo = self.console_wait('---root---')
-        self.write_text(vga, "virtio", virtinfo)
+        self.console_run('virtiotest -i -l')
+        virtcaps = self.console_wait('---root---')
+        self.write_text(vga, "virtcaps", virtcaps)
 
         self.console_run('virtiotest -a -s 10')
         self.console_wait('---ok---', '---root---', 'virtiotest error')
diff --git a/virtiotest.c b/virtiotest.c
index 9230cb9..05582fd 100644
--- a/virtiotest.c
+++ b/virtiotest.c
@@ -289,15 +289,12 @@ int main(int argc, char **argv)
 
     drm_init_dev(card, output, modename, false);
 
-    if (printinfo) {
+    if (printinfo)
         virtio_print_caps();
-        goto done;
-    }
-
-    if (listformat) {
+    if (listformat)
         virtio_list_format();
+    if (printinfo || listformat)
         goto done;
-    }
 
     virtio_init_fb();
     virtio_draw();