[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[RFC v6 34/38] tests: device-introspect-test: cope with ARM TCG-only dev
From: |
Claudio Fontana |
Subject: |
[RFC v6 34/38] tests: device-introspect-test: cope with ARM TCG-only devices |
Date: |
Thu, 11 Mar 2021 14:30:22 +0100 |
Skip the test_device_intro_concrete for now for ARM KVM-only build,
as on ARM we currently build devices for ARM that are not
compatible with a KVM-only build.
We can remove this workaround when we fix this in KConfig etc,
and we only list and build machines that are compatible with KVM
for KVM-only builds.
Signed-off-by: Claudio Fontana <cfontana@suse.de>
Cc: Philippe Mathieu-Daudé <f4bug@amsat.org>
---
tests/qtest/device-introspect-test.c | 18 ++++++++++++++++++
1 file changed, 18 insertions(+)
diff --git a/tests/qtest/device-introspect-test.c
b/tests/qtest/device-introspect-test.c
index bbec166dbc..1ff15e2247 100644
--- a/tests/qtest/device-introspect-test.c
+++ b/tests/qtest/device-introspect-test.c
@@ -329,12 +329,30 @@ int main(int argc, char **argv)
qtest_add_func("device/introspect/none", test_device_intro_none);
qtest_add_func("device/introspect/abstract", test_device_intro_abstract);
qtest_add_func("device/introspect/abstract-interfaces",
test_abstract_interfaces);
+
+ /*
+ * XXX currently we build also boards for ARM that are incompatible with
KVM.
+ * We therefore need to check this explicitly, and only test virt for
kvm-only
+ * arm builds.
+ * After we do the work of Kconfig etc to ensure that only KVM-compatible
boards
+ * are built for the kvm-only build, we could remove this.
+ */
+#ifndef CONFIG_TCG
+ {
+ const char *arch = qtest_get_arch();
+ if (strcmp(arch, "arm") == 0 || strcmp(arch, "aarch64") == 0) {
+ goto add_machine_test_done;
+ }
+ }
+#endif /* !CONFIG_TCG */
if (g_test_quick()) {
qtest_add_data_func("device/introspect/concrete/defaults/none",
g_strdup(common_args), test_device_intro_concrete);
} else {
qtest_cb_for_every_machine(add_machine_test_case, true);
}
+ goto add_machine_test_done;
+ add_machine_test_done:
return g_test_run();
}
--
2.26.2
- [RFC v6 27/38] target/arm: remove kvm include file for PSCI and arm-powerctl, (continued)
- [RFC v6 27/38] target/arm: remove kvm include file for PSCI and arm-powerctl, Claudio Fontana, 2021/03/11
- [RFC v6 22/38] target/arm: split a15 cpu model and 32bit class functions to cpu32.c, Claudio Fontana, 2021/03/11
- [RFC v6 28/38] target/arm: move kvm-const.h, kvm.c, kvm64.c, kvm_arm.h to kvm/, Claudio Fontana, 2021/03/11
- [RFC v6 32/38] tests: restrict TCG-only arm-cpu-features tests to TCG builds, Claudio Fontana, 2021/03/11
- [RFC v6 29/38] target/arm: cleanup cpu includes, Claudio Fontana, 2021/03/11
- [RFC v6 31/38] tests/qtest: skip bios-tables-test test_acpi_oem_fields_virt for KVM, Claudio Fontana, 2021/03/11
- [RFC v6 35/38] tests: do not run qom-test on all machines for ARM KVM-only, Claudio Fontana, 2021/03/11
- [RFC v6 30/38] target/arm: remove broad "else" statements when checking accels, Claudio Fontana, 2021/03/11
- [RFC v6 38/38] target/arm: move kvm cpu properties setting to kvm-cpu, Claudio Fontana, 2021/03/11
- [RFC v6 36/38] Revert "target/arm: Restrict v8M IDAU to TCG", Claudio Fontana, 2021/03/11
- [RFC v6 34/38] tests: device-introspect-test: cope with ARM TCG-only devices,
Claudio Fontana <=
- [RFC v6 37/38] kvm: create kvm cpu accel class, Claudio Fontana, 2021/03/11
- [RFC v6 33/38] tests: do not run test-hmp on all machines for ARM KVM-only, Claudio Fontana, 2021/03/11