[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 07/20] libqtest: refuse QTEST_QEMU_BINARY=qemu-kvm
From: |
Thomas Huth |
Subject: |
[PULL 07/20] libqtest: refuse QTEST_QEMU_BINARY=qemu-kvm |
Date: |
Fri, 14 May 2021 14:15:05 +0200 |
From: Stefan Hajnoczi <stefanha@redhat.com>
Some downstreams rename the QEMU binary to "qemu-kvm". This breaks
qtest_get_arch(), which attempts to parse the target architecture from
the QTEST_QEMU_BINARY environment variable.
Print an error instead of returning the architecture "kvm". Things fail
in weird ways when the architecture string is bogus.
Arguably qtests should always be run in a build directory instead of
against an installed QEMU. In any case, printing a clear error when this
happens is helpful.
Since this is an error that is triggered by the user and not a test
failure, use exit(1) instead of abort(). Change the existing abort()
call in qtest_get_arch() to exit(1) too for the same reason and to be
consistent.
Reported-by: Qin Wang <qinwang@rehdat.com>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Reviewed-by: Emanuele Giuseppe Esposito <eesposit@redhat.com>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Cc: Emanuele Giuseppe Esposito <eesposit@redhat.com>
Message-Id: <20210412143050.725918-1-stefanha@redhat.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>
---
tests/qtest/libqtest.c | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/tests/qtest/libqtest.c b/tests/qtest/libqtest.c
index 71e359efcd..825b13a44c 100644
--- a/tests/qtest/libqtest.c
+++ b/tests/qtest/libqtest.c
@@ -907,7 +907,14 @@ const char *qtest_get_arch(void)
if (!end) {
fprintf(stderr, "Can't determine architecture from binary name.\n");
- abort();
+ exit(1);
+ }
+
+ if (!strstr(qemu, "-system-")) {
+ fprintf(stderr, "QTEST_QEMU_BINARY must end with *-system-<arch> "
+ "where 'arch' is the target\narchitecture (x86_64, aarch64, "
+ "etc).\n");
+ exit(1);
}
return end + 1;
--
2.27.0
- [PULL 00/20] CI, qtest, and misc patches, Thomas Huth, 2021/05/14
- [PULL 02/20] gitlab-ci: Replace YAML anchors by extends (container_job), Thomas Huth, 2021/05/14
- [PULL 01/20] tests/docker/dockerfiles: Add ccache to containers where it was missing, Thomas Huth, 2021/05/14
- [PULL 03/20] gitlab-ci: Replace YAML anchors by extends (native_build_job), Thomas Huth, 2021/05/14
- [PULL 04/20] gitlab-ci: Replace YAML anchors by extends (native_test_job), Thomas Huth, 2021/05/14
- [PULL 05/20] libqos/qgraph: fix "UNAVAILBLE" typo, Thomas Huth, 2021/05/14
- [PULL 07/20] libqtest: refuse QTEST_QEMU_BINARY=qemu-kvm,
Thomas Huth <=
- [PULL 06/20] docs/devel/qgraph: add troubleshooting information, Thomas Huth, 2021/05/14
- [PULL 10/20] tests/qtest/npcm7xx_pwm-test.c: Avoid g_assert_true() for non-test assertions, Thomas Huth, 2021/05/14
- [PULL 11/20] tests/migration-test: Fix "true" vs true, Thomas Huth, 2021/05/14
- [PULL 09/20] tests/qtest/ahci-test.c: Calculate iso_size with 64-bit arithmetic, Thomas Huth, 2021/05/14
- [PULL 08/20] util/compatfd.c: Replaced a malloc call with g_malloc., Thomas Huth, 2021/05/14
- [PULL 13/20] tests/qtest/rtc-test: Remove pointless NULL check, Thomas Huth, 2021/05/14
- [PULL 17/20] configure: Poison all current target-specific #defines, Thomas Huth, 2021/05/14
- [PULL 14/20] tests: Avoid side effects inside g_assert() arguments, Thomas Huth, 2021/05/14