Allow check-qtest with "--without-default-devices"

[PATCH 4/8] tests/qtest/hd-geo-test: Check for availability of "pc" machine before using it

Posted by Thomas Huth 1 year, 5 months ago

In case QEMU has been configured with "--without-default-devices", the
"pc" machine type might be missing in the binary. We should check for
its availability before using it.

Signed-off-by: Thomas Huth <thuth@redhat.com>
---
 tests/qtest/hd-geo-test.c | 71 +++++++++++++++++++++------------------
 1 file changed, 38 insertions(+), 33 deletions(-)

diff --git a/tests/qtest/hd-geo-test.c b/tests/qtest/hd-geo-test.c
index d08bffad91..85eb8d7668 100644
--- a/tests/qtest/hd-geo-test.c
+++ b/tests/qtest/hd-geo-test.c
@@ -1074,17 +1074,26 @@ int main(int argc, char **argv)
         }
     }
 
-    qtest_add_func("hd-geo/ide/none", test_ide_none);
-    qtest_add_func("hd-geo/ide/drive/mbr/blank", test_ide_drive_mbr_blank);
-    qtest_add_func("hd-geo/ide/drive/mbr/lba", test_ide_drive_mbr_lba);
-    qtest_add_func("hd-geo/ide/drive/mbr/chs", test_ide_drive_mbr_chs);
-    qtest_add_func("hd-geo/ide/drive/cd_0", test_ide_drive_cd_0);
-    qtest_add_func("hd-geo/ide/device/mbr/blank", test_ide_device_mbr_blank);
-    qtest_add_func("hd-geo/ide/device/mbr/lba", test_ide_device_mbr_lba);
-    qtest_add_func("hd-geo/ide/device/mbr/chs", test_ide_device_mbr_chs);
-    qtest_add_func("hd-geo/ide/device/user/chs", test_ide_device_user_chs);
-    qtest_add_func("hd-geo/ide/device/user/chst", test_ide_device_user_chst);
-    if (have_qemu_img()) {
+    if (qtest_has_machine("pc")) {
+        qtest_add_func("hd-geo/ide/none", test_ide_none);
+        qtest_add_func("hd-geo/ide/drive/mbr/blank", test_ide_drive_mbr_blank);
+        qtest_add_func("hd-geo/ide/drive/mbr/lba", test_ide_drive_mbr_lba);
+        qtest_add_func("hd-geo/ide/drive/mbr/chs", test_ide_drive_mbr_chs);
+        qtest_add_func("hd-geo/ide/drive/cd_0", test_ide_drive_cd_0);
+        qtest_add_func("hd-geo/ide/device/mbr/blank", test_ide_device_mbr_blank);
+        qtest_add_func("hd-geo/ide/device/mbr/lba", test_ide_device_mbr_lba);
+        qtest_add_func("hd-geo/ide/device/mbr/chs", test_ide_device_mbr_chs);
+        qtest_add_func("hd-geo/ide/device/user/chs", test_ide_device_user_chs);
+        qtest_add_func("hd-geo/ide/device/user/chst", test_ide_device_user_chst);
+    }
+
+    if (!have_qemu_img()) {
+        g_test_message("QTEST_QEMU_IMG not set or qemu-img missing; "
+                       "skipping hd-geo/override/* tests");
+        goto test_add_done;
+    }
+
+    if (qtest_has_machine("pc")) {
         qtest_add_func("hd-geo/override/ide", test_override_ide);
         if (qtest_has_device("lsi53c895a")) {
             qtest_add_func("hd-geo/override/scsi", test_override_scsi);
@@ -1104,30 +1113,26 @@ int main(int argc, char **argv)
             qtest_add_func("hd-geo/override/virtio_blk",
                            test_override_virtio_blk);
         }
+    }
 
-        if (qtest_has_machine("q35")) {
-            qtest_add_func("hd-geo/override/sata", test_override_sata);
-            qtest_add_func("hd-geo/override/zero_chs_q35",
-                           test_override_zero_chs_q35);
-            if (qtest_has_device("lsi53c895a")) {
-                qtest_add_func("hd-geo/override/scsi_q35",
-                               test_override_scsi_q35);
-            }
-            if (qtest_has_device("virtio-scsi-pci")) {
-                qtest_add_func("hd-geo/override/scsi_hot_unplug_q35",
-                               test_override_scsi_hot_unplug_q35);
-            }
-            if (qtest_has_device("virtio-blk-pci")) {
-                qtest_add_func("hd-geo/override/virtio_hot_unplug_q35",
-                               test_override_virtio_hot_unplug_q35);
-                qtest_add_func("hd-geo/override/virtio_blk_q35",
-                               test_override_virtio_blk_q35);
-            }
-
+    if (qtest_has_machine("q35")) {
+        qtest_add_func("hd-geo/override/sata", test_override_sata);
+        qtest_add_func("hd-geo/override/zero_chs_q35",
+                       test_override_zero_chs_q35);
+        if (qtest_has_device("lsi53c895a")) {
+            qtest_add_func("hd-geo/override/scsi_q35",
+                           test_override_scsi_q35);
+        }
+        if (qtest_has_device("virtio-scsi-pci")) {
+            qtest_add_func("hd-geo/override/scsi_hot_unplug_q35",
+                           test_override_scsi_hot_unplug_q35);
+        }
+        if (qtest_has_device("virtio-blk-pci")) {
+            qtest_add_func("hd-geo/override/virtio_hot_unplug_q35",
+                           test_override_virtio_hot_unplug_q35);
+            qtest_add_func("hd-geo/override/virtio_blk_q35",
+                           test_override_virtio_blk_q35);
         }
-    } else {
-        g_test_message("QTEST_QEMU_IMG not set or qemu-img missing; "
-                       "skipping hd-geo/override/* tests");
     }
 
 test_add_done:
-- 
2.46.0

Re: [PATCH 4/8] tests/qtest/hd-geo-test: Check for availability of "pc" machine before using it

Posted by Philippe Mathieu-Daudé 1 year, 5 months ago

On 5/9/24 21:14, Thomas Huth wrote:
> In case QEMU has been configured with "--without-default-devices", the
> "pc" machine type might be missing in the binary. We should check for
> its availability before using it.
> 
> Signed-off-by: Thomas Huth <thuth@redhat.com>
> ---
>   tests/qtest/hd-geo-test.c | 71 +++++++++++++++++++++------------------
>   1 file changed, 38 insertions(+), 33 deletions(-)
> 
> diff --git a/tests/qtest/hd-geo-test.c b/tests/qtest/hd-geo-test.c
> index d08bffad91..85eb8d7668 100644
> --- a/tests/qtest/hd-geo-test.c
> +++ b/tests/qtest/hd-geo-test.c
> @@ -1074,17 +1074,26 @@ int main(int argc, char **argv)
>           }
>       }
>   
> -    qtest_add_func("hd-geo/ide/none", test_ide_none);
> -    qtest_add_func("hd-geo/ide/drive/mbr/blank", test_ide_drive_mbr_blank);
> -    qtest_add_func("hd-geo/ide/drive/mbr/lba", test_ide_drive_mbr_lba);
> -    qtest_add_func("hd-geo/ide/drive/mbr/chs", test_ide_drive_mbr_chs);
> -    qtest_add_func("hd-geo/ide/drive/cd_0", test_ide_drive_cd_0);
> -    qtest_add_func("hd-geo/ide/device/mbr/blank", test_ide_device_mbr_blank);
> -    qtest_add_func("hd-geo/ide/device/mbr/lba", test_ide_device_mbr_lba);
> -    qtest_add_func("hd-geo/ide/device/mbr/chs", test_ide_device_mbr_chs);
> -    qtest_add_func("hd-geo/ide/device/user/chs", test_ide_device_user_chs);
> -    qtest_add_func("hd-geo/ide/device/user/chst", test_ide_device_user_chst);
> -    if (have_qemu_img()) {
> +    if (qtest_has_machine("pc")) {
> +        qtest_add_func("hd-geo/ide/none", test_ide_none);
> +        qtest_add_func("hd-geo/ide/drive/mbr/blank", test_ide_drive_mbr_blank);
> +        qtest_add_func("hd-geo/ide/drive/mbr/lba", test_ide_drive_mbr_lba);
> +        qtest_add_func("hd-geo/ide/drive/mbr/chs", test_ide_drive_mbr_chs);
> +        qtest_add_func("hd-geo/ide/drive/cd_0", test_ide_drive_cd_0);
> +        qtest_add_func("hd-geo/ide/device/mbr/blank", test_ide_device_mbr_blank);
> +        qtest_add_func("hd-geo/ide/device/mbr/lba", test_ide_device_mbr_lba);
> +        qtest_add_func("hd-geo/ide/device/mbr/chs", test_ide_device_mbr_chs);
> +        qtest_add_func("hd-geo/ide/device/user/chs", test_ide_device_user_chs);
> +        qtest_add_func("hd-geo/ide/device/user/chst", test_ide_device_user_chst);

Just wondering, could a qtest_add_machine_func() method be helpful?
Maybe not if we want to check for multiple machines?

Re: [PATCH 4/8] tests/qtest/hd-geo-test: Check for availability of "pc" machine before using it

Posted by Thomas Huth 1 year, 5 months ago

On 06/09/2024 09.50, Philippe Mathieu-Daudé wrote:
> On 5/9/24 21:14, Thomas Huth wrote:
>> In case QEMU has been configured with "--without-default-devices", the
>> "pc" machine type might be missing in the binary. We should check for
>> its availability before using it.
>>
>> Signed-off-by: Thomas Huth <thuth@redhat.com>
>> ---
>>   tests/qtest/hd-geo-test.c | 71 +++++++++++++++++++++------------------
>>   1 file changed, 38 insertions(+), 33 deletions(-)
>>
>> diff --git a/tests/qtest/hd-geo-test.c b/tests/qtest/hd-geo-test.c
>> index d08bffad91..85eb8d7668 100644
>> --- a/tests/qtest/hd-geo-test.c
>> +++ b/tests/qtest/hd-geo-test.c
>> @@ -1074,17 +1074,26 @@ int main(int argc, char **argv)
>>           }
>>       }
>> -    qtest_add_func("hd-geo/ide/none", test_ide_none);
>> -    qtest_add_func("hd-geo/ide/drive/mbr/blank", test_ide_drive_mbr_blank);
>> -    qtest_add_func("hd-geo/ide/drive/mbr/lba", test_ide_drive_mbr_lba);
>> -    qtest_add_func("hd-geo/ide/drive/mbr/chs", test_ide_drive_mbr_chs);
>> -    qtest_add_func("hd-geo/ide/drive/cd_0", test_ide_drive_cd_0);
>> -    qtest_add_func("hd-geo/ide/device/mbr/blank", 
>> test_ide_device_mbr_blank);
>> -    qtest_add_func("hd-geo/ide/device/mbr/lba", test_ide_device_mbr_lba);
>> -    qtest_add_func("hd-geo/ide/device/mbr/chs", test_ide_device_mbr_chs);
>> -    qtest_add_func("hd-geo/ide/device/user/chs", test_ide_device_user_chs);
>> -    qtest_add_func("hd-geo/ide/device/user/chst", 
>> test_ide_device_user_chst);
>> -    if (have_qemu_img()) {
>> +    if (qtest_has_machine("pc")) {
>> +        qtest_add_func("hd-geo/ide/none", test_ide_none);
>> +        qtest_add_func("hd-geo/ide/drive/mbr/blank", 
>> test_ide_drive_mbr_blank);
>> +        qtest_add_func("hd-geo/ide/drive/mbr/lba", test_ide_drive_mbr_lba);
>> +        qtest_add_func("hd-geo/ide/drive/mbr/chs", test_ide_drive_mbr_chs);
>> +        qtest_add_func("hd-geo/ide/drive/cd_0", test_ide_drive_cd_0);
>> +        qtest_add_func("hd-geo/ide/device/mbr/blank", 
>> test_ide_device_mbr_blank);
>> +        qtest_add_func("hd-geo/ide/device/mbr/lba", 
>> test_ide_device_mbr_lba);
>> +        qtest_add_func("hd-geo/ide/device/mbr/chs", 
>> test_ide_device_mbr_chs);
>> +        qtest_add_func("hd-geo/ide/device/user/chs", 
>> test_ide_device_user_chs);
>> +        qtest_add_func("hd-geo/ide/device/user/chst", 
>> test_ide_device_user_chst);
> 
> Just wondering, could a qtest_add_machine_func() method be helpful?
> Maybe not if we want to check for multiple machines?

For adding multiple tests, I think a check at the beginning of the block is 
better than checking it over and over again.

  Thomas

[PATCH 1/8] tests/qtest/migration: Add a check for the availability of the "pc" machine
[PATCH 2/8] tests/qtest/cdrom-test: Improve the machine detection in the cdrom test
[PATCH 3/8] tests/qtest/boot-order-test: Make the machine name mandatory in this test
[PATCH 4/8] tests/qtest/hd-geo-test: Check for availability of "pc" machine before using it
[PATCH 5/8] tests/qtest/meson.build: Add more CONFIG switches checks for the x86 tests
[PATCH 6/8] tests/qtest: Disable numa-test if the default machine is not available
[PATCH 7/8] Revert "target/riscv: Restrict semihosting to TCG"
[PATCH 8/8] .gitlab-ci.d/buildtest: Build most targets in the build-without-defaults job