aboutsummaryrefslogtreecommitdiff
path: root/tests/qtest/cdrom-test.c
diff options
context:
space:
mode:
authorThomas Huth <thuth@redhat.com>2020-08-06 12:16:13 +0200
committerThomas Huth <thuth@redhat.com>2020-10-06 20:14:48 +0200
commiteb32abd8d931994d10327bd965a4fb12d765a0fb (patch)
treec656894a3b7adaed12d59cc16eca8d39b5c19509 /tests/qtest/cdrom-test.c
parent6e05891c31012fccb071cc173ba0f31b09167bba (diff)
downloadqemu-eb32abd8d931994d10327bd965a4fb12d765a0fb.zip
qemu-eb32abd8d931994d10327bd965a4fb12d765a0fb.tar.gz
qemu-eb32abd8d931994d10327bd965a4fb12d765a0fb.tar.bz2
tests/qtest/cdrom: Add more s390x-related boot tests
Let's add two new tests: 1) Booting with "bootindex" is the architected default behavior on the s390x target, so we should have at least one test that is using the "bootindex" property. 2) The s390-ccw bios used to fail when other unbootable devices have been specified before the bootable device (without "bootindex"). Now that the s390-ccw bios is a little bit smarter here, we should test this scenario, too, to avoid regressions. Message-Id: <20200806105349.632-10-thuth@redhat.com> Reviewed-by: Cornelia Huck <cohuck@redhat.com> Acked-by: Janosch Frank <frankja@linux.ibm.com> Signed-off-by: Thomas Huth <thuth@redhat.com>
Diffstat (limited to 'tests/qtest/cdrom-test.c')
-rw-r--r--tests/qtest/cdrom-test.c12
1 files changed, 12 insertions, 0 deletions
diff --git a/tests/qtest/cdrom-test.c b/tests/qtest/cdrom-test.c
index e9afab6..eef242d 100644
--- a/tests/qtest/cdrom-test.c
+++ b/tests/qtest/cdrom-test.c
@@ -163,6 +163,18 @@ static void add_s390x_tests(void)
qtest_add_data_func("cdrom/boot/virtio-scsi",
"-device virtio-scsi -device scsi-cd,drive=cdr "
"-blockdev file,node-name=cdr,filename=", test_cdboot);
+ qtest_add_data_func("cdrom/boot/with-bootindex",
+ "-device virtio-serial -device virtio-scsi "
+ "-device virtio-blk,drive=d1 "
+ "-drive driver=null-co,read-zeroes=on,if=none,id=d1 "
+ "-device virtio-blk,drive=d2,bootindex=1 "
+ "-drive if=none,id=d2,media=cdrom,file=", test_cdboot);
+ qtest_add_data_func("cdrom/boot/without-bootindex",
+ "-device virtio-scsi -device virtio-serial "
+ "-device x-terminal3270 -device virtio-blk,drive=d1 "
+ "-drive driver=null-co,read-zeroes=on,if=none,id=d1 "
+ "-device virtio-blk,drive=d2 "
+ "-drive if=none,id=d2,media=cdrom,file=", test_cdboot);
}
int main(int argc, char **argv)