diff mbox series

[PATCH-for-10.0?,v2,13/14] hw/arm/virt-acpi: Do not advertise disabled GIC ITS

Message ID 20250403151829.44858-14-philmd@linaro.org
State Superseded
Headers show
Series hw/arm: Tests & ACPI tables fixes for 10.0 | expand

Commit Message

Philippe Mathieu-Daudé April 3, 2025, 3:18 p.m. UTC 
GIC ITS can be disabled at runtime using '-M its=off',
which sets VirtMachineState::its = false. Check this
field to avoid advertising the ITS in the MADT table.

Reported-by: Udo Steinberg <udo@hypervisor.org>
Resolves: https://gitlab.com/qemu-project/qemu/-/issues/2886
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Gustavo Romero <gustavo.romero@linaro.org>
---
 hw/arm/virt-acpi-build.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Igor Mammedov April 4, 2025, 10:41 a.m. UTC | #1 
On Thu,  3 Apr 2025 17:18:28 +0200
Philippe Mathieu-Daudé <philmd@linaro.org> wrote:

> GIC ITS can be disabled at runtime using '-M its=off',
> which sets VirtMachineState::its = false. Check this
> field to avoid advertising the ITS in the MADT table.
> 
> Reported-by: Udo Steinberg <udo@hypervisor.org>
> Resolves: https://gitlab.com/qemu-project/qemu/-/issues/2886
> Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
> Reviewed-by: Gustavo Romero <gustavo.romero@linaro.org>
> ---
>  hw/arm/virt-acpi-build.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/hw/arm/virt-acpi-build.c b/hw/arm/virt-acpi-build.c
> index e7e27951cb9..38a9e6fe0c5 100644
> --- a/hw/arm/virt-acpi-build.c
> +++ b/hw/arm/virt-acpi-build.c
> @@ -212,7 +212,7 @@ static bool its_enabled(VirtMachineState *vms)
>  {
>      VirtMachineClass *vmc = VIRT_MACHINE_GET_CLASS(vms);
>  
> -    return !vmc->no_its;
> +    return !vmc->no_its && vms->its;

It's confusing have both no_its and its,
it would be better to lean this mess up (i.e dedup or rename if something is poorly named)

>  }
>  
>  /*
Philippe Mathieu-Daudé April 4, 2025, 12:49 p.m. UTC | #2 
On 4/4/25 12:41, Igor Mammedov wrote:
> On Thu,  3 Apr 2025 17:18:28 +0200
> Philippe Mathieu-Daudé <philmd@linaro.org> wrote:
> 
>> GIC ITS can be disabled at runtime using '-M its=off',
>> which sets VirtMachineState::its = false. Check this
>> field to avoid advertising the ITS in the MADT table.
>>
>> Reported-by: Udo Steinberg <udo@hypervisor.org>
>> Resolves: https://gitlab.com/qemu-project/qemu/-/issues/2886
>> Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
>> Reviewed-by: Gustavo Romero <gustavo.romero@linaro.org>
>> ---
>>   hw/arm/virt-acpi-build.c | 2 +-
>>   1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/hw/arm/virt-acpi-build.c b/hw/arm/virt-acpi-build.c
>> index e7e27951cb9..38a9e6fe0c5 100644
>> --- a/hw/arm/virt-acpi-build.c
>> +++ b/hw/arm/virt-acpi-build.c
>> @@ -212,7 +212,7 @@ static bool its_enabled(VirtMachineState *vms)
>>   {
>>       VirtMachineClass *vmc = VIRT_MACHINE_GET_CLASS(vms);
>>   
>> -    return !vmc->no_its;
>> +    return !vmc->no_its && vms->its;
> 
> It's confusing have both no_its and its,
> it would be better to lean this mess up (i.e dedup or rename if something is poorly named)

What about:

class: s/no_its/!its_createable/ or !its_usable
state: s/its/its_created/ or its_used or its_in_use
diff mbox series

Patch

diff --git a/hw/arm/virt-acpi-build.c b/hw/arm/virt-acpi-build.c
index e7e27951cb9..38a9e6fe0c5 100644
--- a/hw/arm/virt-acpi-build.c
+++ b/hw/arm/virt-acpi-build.c
@@ -212,7 +212,7 @@  static bool its_enabled(VirtMachineState *vms)
 {
     VirtMachineClass *vmc = VIRT_MACHINE_GET_CLASS(vms);
 
-    return !vmc->no_its;
+    return !vmc->no_its && vms->its;
 }
 
 /*