[v2] qtest: fix 'expression is always false' build failure in qtest_has_accel()

Commit Message

Igor Mammedov Oct. 27, 2021, 3:10 p.m. UTC

If KVM is disabled or not present, qtest library build
may fail with:
   libqtest.c: In function 'qtest_has_accel':
      comparison of unsigned expression < 0 is always false
      [-Werror=type-limits]
         for (i = 0; i < ARRAY_SIZE(targets); i++) {

due to empty 'targets' array.
Fix it by making sure that CONFIG_KVM_TARGETS isn't empty.

Fixes: e741aff0f43343 ("tests: qtest: add qtest_has_accel() to check if tested binary supports accelerator")
Reported-by: Jason Andryuk <[e-mail]>
Suggested-by: "Michael S. Tsirkin" <[e-mail]>
Signed-off-by: Igor Mammedov <[e-mail]>
---
 meson.build | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Jason Andryuk Oct. 27, 2021, 3:26 p.m. UTC | #1

On Wed, Oct 27, 2021 at 11:10 AM Igor Mammedov <[e-mail]> wrote:
>
> If KVM is disabled or not present, qtest library build
> may fail with:
>    libqtest.c: In function 'qtest_has_accel':
>       comparison of unsigned expression < 0 is always false
>       [-Werror=type-limits]
>          for (i = 0; i < ARRAY_SIZE(targets); i++) {
>
> due to empty 'targets' array.
> Fix it by making sure that CONFIG_KVM_TARGETS isn't empty.
>
> Fixes: e741aff0f43343 ("tests: qtest: add qtest_has_accel() to check if tested binary supports accelerator")
> Reported-by: Jason Andryuk <[e-mail]>
> Suggested-by: "Michael S. Tsirkin" <[e-mail]>
> Signed-off-by: Igor Mammedov <[e-mail]>

Tested-by: Jason Andryuk <[e-mail]>

Thanks,
Jason

Patch

diff --git a/meson.build b/meson.build
index 2c5b53cbe2..ff85e9c2af 100644
--- a/meson.build
+++ b/meson.build
@@ -75,7 +75,7 @@  else
   kvm_targets = []
 endif
 
-kvm_targets_c = ''
+kvm_targets_c = '""'
 if not get_option('kvm').disabled() and targetos == 'linux'
   kvm_targets_c = '"' + '" ,"'.join(kvm_targets) + '"'
 endif