[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [PATCH 2/2] tests/qtest: Special case sbsa-ref and xlnx-versal-virt
From: |
Eric Auger |
Subject: |
Re: [PATCH 2/2] tests/qtest: Special case sbsa-ref and xlnx-versal-virt if !CONFIG_ARM_GIC_TCG |
Date: |
Mon, 31 Jan 2022 17:15:48 +0100 |
User-agent: |
Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.10.1 |
Hi Drew,
On 1/31/22 4:59 PM, Andrew Jones wrote:
> On Mon, Jan 31, 2022 at 04:45:31PM +0100, Eric Auger wrote:
>> qom-test and test-hmp shall not run tests on sbsa-ref and
>> xlnx-versal-virt if CONFIG_ARM_GIC_TCG is unset as those machines
>> always instantiate GICv3.
>>
>> Otherwise the tests fail with
>> ERROR:../qom/object.c:715:object_new_with_type: assertion failed: (type !=
>> NULL)
>>
>> Signed-off-by: Eric Auger <eric.auger@redhat.com>
>> Fixes: a8a5546798c3 ("hw/intc/arm_gicv3: Introduce CONFIG_ARM_GIC_TCG
>> Kconfig selector")
>> ---
>> tests/qtest/libqtest.c | 6 ++++++
>> 1 file changed, 6 insertions(+)
>>
>> diff --git a/tests/qtest/libqtest.c b/tests/qtest/libqtest.c
>> index 41f4da4e54..f53983a28e 100644
>> --- a/tests/qtest/libqtest.c
>> +++ b/tests/qtest/libqtest.c
>> @@ -1394,6 +1394,12 @@ void qtest_cb_for_every_machine(void (*cb)(const char
>> *machine),
>> g_str_equal("xenpv", machines[i].name)) {
>> continue;
>> }
>> +#ifndef CONFIG_ARM_GIC_TCG
>> + if (!strncmp("sbsa-ref", machines[i].name, 8) ||
>> + !strncmp("xlnx-versal-virt", machines[i].name, 16)) {
>> + continue;
>> + }
>> +#endif
> Hmm, if these machine types completely depend on userspace gicv3
> emulation, i.e. no way to use in-kernel gic or another tcg gic
> model, then I guess they shouldn't be built at all when ARM_GIC_TCG
> isn't configured. I.e.
Yes your suggestion make sense to me, thatw would be a better fix indeed.
Eric
>
> diff --git a/hw/arm/Kconfig b/hw/arm/Kconfig
> index 2e0049196d6c..d7cc028b049d 100644
> --- a/hw/arm/Kconfig
> +++ b/hw/arm/Kconfig
> @@ -209,6 +209,7 @@ config REALVIEW
>
> config SBSA_REF
> bool
> + depends on ARM_GIC_TCG
> imply PCI_DEVICES
> select AHCI
> select ARM_SMMUV3
> @@ -378,6 +379,7 @@ config XLNX_ZYNQMP_ARM
>
> config XLNX_VERSAL
> bool
> + depends on ARM_GIC_TCG
> select ARM_GIC
> select PL011
> select CADENCE
>
>
> Thanks,
> drew
>
>> if (!skip_old_versioned ||
>> !qtest_is_old_versioned_machine(machines[i].name)) {
>> cb(machines[i].name);
>> --
>> 2.26.3
>>
[PATCH 1/2] hw/arm/virt: Fix gic-version=max when CONFIG_ARM_GIC_TCG is unset, Eric Auger, 2022/01/31