[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v7 20/20] tests/qtest: Fix tests when no KVM or TCG are present
From: |
Fabiano Rosas |
Subject: |
[PATCH v7 20/20] tests/qtest: Fix tests when no KVM or TCG are present |
Date: |
Thu, 23 Feb 2023 10:08:41 -0300 |
It is possible to have a build with both TCG and KVM disabled due to
Xen requiring the i386 and x86_64 binaries to be present in an aarch64
host.
If we build with --disable-tcg on the aarch64 host, we will end-up
with a QEMU binary (x86) that does not support TCG nor KVM.
Fix tests that crash or hang in the above scenario. Do not include any
test cases if TCG and KVM are missing.
Signed-off-by: Fabiano Rosas <farosas@suse.de>
---
This currently affects Arm, but will also affect x86 after the xenpvh
series gets merged. This patch fixes both scenarios.
---
tests/qtest/bios-tables-test.c | 4 ++++
tests/qtest/boot-serial-test.c | 10 ++++++++++
tests/qtest/migration-test.c | 5 +++++
tests/qtest/pxe-test.c | 6 ++++++
tests/qtest/vmgenid-test.c | 6 ++++++
5 files changed, 31 insertions(+)
diff --git a/tests/qtest/bios-tables-test.c b/tests/qtest/bios-tables-test.c
index d29a4e47af..f6c2a010d2 100644
--- a/tests/qtest/bios-tables-test.c
+++ b/tests/qtest/bios-tables-test.c
@@ -2114,6 +2114,10 @@ int main(int argc, char *argv[])
char *v_env = getenv("V");
int ret;
+ if (!has_tcg && !has_kvm) {
+ return 0;
+ }
+
if (v_env) {
verbosity_level = atoi(v_env);
}
diff --git a/tests/qtest/boot-serial-test.c b/tests/qtest/boot-serial-test.c
index 3aef3a97a9..45490f5931 100644
--- a/tests/qtest/boot-serial-test.c
+++ b/tests/qtest/boot-serial-test.c
@@ -17,6 +17,9 @@
#include "libqtest.h"
#include "libqos/libqos-spapr.h"
+static bool has_tcg;
+static bool has_kvm;
+
static const uint8_t bios_avr[] = {
0x88, 0xe0, /* ldi r24, 0x08 */
0x80, 0x93, 0xc1, 0x00, /* sts 0x00C1, r24 ; Enable tx */
@@ -285,6 +288,13 @@ int main(int argc, char *argv[])
const char *arch = qtest_get_arch();
int i;
+ has_tcg = qtest_has_accel("tcg");
+ has_kvm = qtest_has_accel("kvm");
+
+ if (!has_tcg && !has_kvm) {
+ return 0;
+ }
+
g_test_init(&argc, &argv, NULL);
for (i = 0; tests[i].arch != NULL; i++) {
diff --git a/tests/qtest/migration-test.c b/tests/qtest/migration-test.c
index 109bc8e7b1..a6e3ca9f7d 100644
--- a/tests/qtest/migration-test.c
+++ b/tests/qtest/migration-test.c
@@ -2460,11 +2460,16 @@ static bool kvm_dirty_ring_supported(void)
int main(int argc, char **argv)
{
const bool has_kvm = qtest_has_accel("kvm");
+ const bool has_tcg = qtest_has_accel("tcg");
const bool has_uffd = ufd_version_check();
const char *arch = qtest_get_arch();
g_autoptr(GError) err = NULL;
int ret;
+ if (!has_tcg && !has_kvm) {
+ return 0;
+ }
+
g_test_init(&argc, &argv, NULL);
/*
diff --git a/tests/qtest/pxe-test.c b/tests/qtest/pxe-test.c
index 62b6eef464..05575f7687 100644
--- a/tests/qtest/pxe-test.c
+++ b/tests/qtest/pxe-test.c
@@ -130,6 +130,12 @@ int main(int argc, char *argv[])
{
int ret;
const char *arch = qtest_get_arch();
+ bool has_tcg = qtest_has_accel("tcg");
+ bool has_kvm = qtest_has_accel("kvm");
+
+ if (!has_tcg && !has_kvm) {
+ return 0;
+ }
ret = boot_sector_init(disk);
if(ret)
diff --git a/tests/qtest/vmgenid-test.c b/tests/qtest/vmgenid-test.c
index efba76e716..8045d3d706 100644
--- a/tests/qtest/vmgenid-test.c
+++ b/tests/qtest/vmgenid-test.c
@@ -164,6 +164,12 @@ static void vmgenid_query_monitor_test(void)
int main(int argc, char **argv)
{
int ret;
+ bool has_tcg = qtest_has_accel("tcg");
+ bool has_kvm = qtest_has_accel("kvm");
+
+ if (!has_tcg && !has_kvm) {
+ return 0;
+ }
ret = boot_sector_init(disk);
if (ret) {
--
2.35.3
- [PATCH v7 08/20] target/arm: Move regime_using_lpae_format into internal.h, (continued)
- [PATCH v7 08/20] target/arm: Move regime_using_lpae_format into internal.h, Fabiano Rosas, 2023/02/23
- [PATCH v7 09/20] target/arm: Don't access TCG code when debugging with KVM, Fabiano Rosas, 2023/02/23
- [PATCH v7 10/20] cpu-defs.h: Expose CPUTLBEntryFull to non-TCG code, Fabiano Rosas, 2023/02/23
- [PATCH v7 11/20] target/arm: Move cortex sysregs into a separate file, Fabiano Rosas, 2023/02/23
- [PATCH v7 12/20] target/arm: Move 64-bit TCG CPUs into tcg/, Fabiano Rosas, 2023/02/23
- [PATCH v7 14/20] target/arm: move cpu_tcg to tcg/cpu32.c, Fabiano Rosas, 2023/02/23
- [PATCH v7 13/20] target/arm: Move aa32_max_features out of cpu_tcg.c, Fabiano Rosas, 2023/02/23
- [PATCH v7 15/20] tests/avocado: Pass parameters to migration test, Fabiano Rosas, 2023/02/23
- [PATCH v7 16/20] tests/avocado: add machine:none tag to version.py, Fabiano Rosas, 2023/02/23
- [PATCH v7 17/20] arm/Kconfig: Always select SEMIHOSTING when TCG is present, Fabiano Rosas, 2023/02/23
- [PATCH v7 20/20] tests/qtest: Fix tests when no KVM or TCG are present,
Fabiano Rosas <=
- [PATCH v7 19/20] gitlab-ci: Check building KVM-only aarch64 target, Fabiano Rosas, 2023/02/23
- [PATCH v7 18/20] arm/Kconfig: Do not build TCG-only boards on a KVM-only build, Fabiano Rosas, 2023/02/23
- Re: [PATCH v7 00/20] target/arm: Allow CONFIG_TCG=n builds, Peter Maydell, 2023/02/23