| Message ID | 20211222153600.976588-1-thuth@redhat.com |
|---|---|
| State | New |
| Headers | show |
| Series | tests/qtest/hd-geo-test: Check for the lsi53c895a controller before using it | expand |
On Wed, Dec 22, 2021 at 10:36 AM Thomas Huth <thuth@redhat.com> wrote: > > The lsi53c895a SCSI controller might have been disabled in the target > binary, so let's check for its availability first before using it. > > Signed-off-by: Thomas Huth <thuth@redhat.com> > --- > tests/qtest/hd-geo-test.c | 8 +++++--- > 1 file changed, 5 insertions(+), 3 deletions(-) > > diff --git a/tests/qtest/hd-geo-test.c b/tests/qtest/hd-geo-test.c > index 113126ae06..771eaa741b 100644 > --- a/tests/qtest/hd-geo-test.c > +++ b/tests/qtest/hd-geo-test.c > @@ -960,9 +960,11 @@ int main(int argc, char **argv) > qtest_add_func("hd-geo/ide/device/user/chst", test_ide_device_user_chst); > if (have_qemu_img()) { > qtest_add_func("hd-geo/override/ide", test_override_ide); > - qtest_add_func("hd-geo/override/scsi", test_override_scsi); > - qtest_add_func("hd-geo/override/scsi_2_controllers", > - test_override_scsi_2_controllers); > + if (qtest_has_device("lsi53c895a")) { > + qtest_add_func("hd-geo/override/scsi", test_override_scsi); > + qtest_add_func("hd-geo/override/scsi_2_controllers", > + test_override_scsi_2_controllers); > + } > qtest_add_func("hd-geo/override/virtio_blk", test_override_virtio_blk); > qtest_add_func("hd-geo/override/zero_chs", test_override_zero_chs); > qtest_add_func("hd-geo/override/scsi_hot_unplug", > -- > 2.27.0 > Acked-by: John Snow <jsnow@redhat.com>
On 22/12/21 16:36, Thomas Huth wrote: > The lsi53c895a SCSI controller might have been disabled in the target > binary, so let's check for its availability first before using it. > > Signed-off-by: Thomas Huth <thuth@redhat.com> > --- > tests/qtest/hd-geo-test.c | 8 +++++--- > 1 file changed, 5 insertions(+), 3 deletions(-) Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
diff --git a/tests/qtest/hd-geo-test.c b/tests/qtest/hd-geo-test.c index 113126ae06..771eaa741b 100644 --- a/tests/qtest/hd-geo-test.c +++ b/tests/qtest/hd-geo-test.c @@ -960,9 +960,11 @@ int main(int argc, char **argv) qtest_add_func("hd-geo/ide/device/user/chst", test_ide_device_user_chst); if (have_qemu_img()) { qtest_add_func("hd-geo/override/ide", test_override_ide); - qtest_add_func("hd-geo/override/scsi", test_override_scsi); - qtest_add_func("hd-geo/override/scsi_2_controllers", - test_override_scsi_2_controllers); + if (qtest_has_device("lsi53c895a")) { + qtest_add_func("hd-geo/override/scsi", test_override_scsi); + qtest_add_func("hd-geo/override/scsi_2_controllers", + test_override_scsi_2_controllers); + } qtest_add_func("hd-geo/override/virtio_blk", test_override_virtio_blk); qtest_add_func("hd-geo/override/zero_chs", test_override_zero_chs); qtest_add_func("hd-geo/override/scsi_hot_unplug",
The lsi53c895a SCSI controller might have been disabled in the target binary, so let's check for its availability first before using it. Signed-off-by: Thomas Huth <thuth@redhat.com> --- tests/qtest/hd-geo-test.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)