[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [RFC v14 52/80] tests: device-introspect-test: cope with ARM TCG-onl
From: |
Claudio Fontana |
Subject: |
Re: [RFC v14 52/80] tests: device-introspect-test: cope with ARM TCG-only devices |
Date: |
Mon, 19 Apr 2021 12:24:52 +0200 |
User-agent: |
Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.12.0 |
On 4/19/21 12:22 PM, Thomas Huth wrote:
> On 16/04/2021 18.27, Claudio Fontana wrote:
>> 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;
>
> That last goto does not make much sense, since the label is right below.
It is necessary to remove the warning that is otherwise produced about the
unused label IIRC.
Ciao,
Claudio
>
> Thomas
>
>
>> + add_machine_test_done:
>> return g_test_run();
>> }
>>
>
- [RFC v14 53/80] tests: do not run qom-test on all machines for ARM KVM-only, (continued)
- [RFC v14 53/80] tests: do not run qom-test on all machines for ARM KVM-only, Claudio Fontana, 2021/04/16
- [RFC v14 49/80] tests/qtest: skip bios-tables-test test_acpi_oem_fields_virt for KVM, Claudio Fontana, 2021/04/16
- [RFC v14 37/80] target/arm: move exception code out of tcg/helper.c, Claudio Fontana, 2021/04/16
- [RFC v14 41/80] target/arm: move cpu_tcg to tcg/tcg-cpu-models.c, Claudio Fontana, 2021/04/16
- [RFC v14 46/80] target/arm: cleanup cpu includes, Claudio Fontana, 2021/04/16
- [RFC v14 44/80] target/arm: move kvm-const.h, kvm.c, kvm64.c, kvm_arm.h to kvm/, Claudio Fontana, 2021/04/16
- [RFC v14 50/80] tests: restrict TCG-only arm-cpu-features tests to TCG builds, Claudio Fontana, 2021/04/16
- [RFC v14 54/80] Revert "target/arm: Restrict v8M IDAU to TCG", Claudio Fontana, 2021/04/16
- [RFC v14 52/80] tests: device-introspect-test: cope with ARM TCG-only devices, Claudio Fontana, 2021/04/16
[RFC v14 55/80] target/arm: create kvm cpu accel class, Claudio Fontana, 2021/04/16
[RFC v14 51/80] tests: do not run test-hmp on all machines for ARM KVM-only, Claudio Fontana, 2021/04/16
[RFC v14 57/80] target/arm: add tcg cpu accel class, Claudio Fontana, 2021/04/16
[RFC v14 58/80] target/arm: move TCG gt timer creation code in tcg/, Claudio Fontana, 2021/04/16
[RFC v14 64/80] target/arm: restrict rebuild_hflags_a64 to TARGET_AARCH64, Claudio Fontana, 2021/04/16
[RFC v14 62/80] target/arm: cpu-sve: make cpu_sve_finalize_features return bool, Claudio Fontana, 2021/04/16