diff mbox series

hw/acpi/pcihp: Fix typo in function name

Message ID 20250504215639.54860-10-gustavo.romero@linaro.org
State New
Headers show
Series hw/acpi/pcihp: Fix typo in function name | expand

Commit Message

Gustavo Romero May 4, 2025, 9:56 p.m. UTC
Fix typo in QEMU's ACPI PCI hotplug API function name that checks
whether a given bus is hotplug-capable.

Signed-off-by: Gustavo Romero <gustavo.romero@linaro.org>
---
 hw/acpi/acpi-pci-hotplug-stub.c | 2 +-
 hw/acpi/ich9.c                  | 2 +-
 hw/acpi/pcihp.c                 | 2 +-
 hw/acpi/piix4.c                 | 2 +-
 include/hw/acpi/pcihp.h         | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

Comments

Eric Auger May 5, 2025, 7:13 a.m. UTC | #1
On 5/4/25 11:56 PM, Gustavo Romero wrote:
> Fix typo in QEMU's ACPI PCI hotplug API function name that checks
> whether a given bus is hotplug-capable.
>
> Signed-off-by: Gustavo Romero <gustavo.romero@linaro.org>
Reviewed-by: Eric Auger <eric.auger@redhat.com>

For awareness, there is a similar typo in pci-port.
see
https://lore.kernel.org/all/20250428102628.378046-2-eric.auger@redhat.com/

another trivial indentation fix in generic_event_device.c
https://lore.kernel.org/all/20250428102628.378046-3-eric.auger@redhat.com/

Eric




> ---
>  hw/acpi/acpi-pci-hotplug-stub.c | 2 +-
>  hw/acpi/ich9.c                  | 2 +-
>  hw/acpi/pcihp.c                 | 2 +-
>  hw/acpi/piix4.c                 | 2 +-
>  include/hw/acpi/pcihp.h         | 2 +-
>  5 files changed, 5 insertions(+), 5 deletions(-)
>
> diff --git a/hw/acpi/acpi-pci-hotplug-stub.c b/hw/acpi/acpi-pci-hotplug-stub.c
> index b67b4a92da..b7bc6e40a1 100644
> --- a/hw/acpi/acpi-pci-hotplug-stub.c
> +++ b/hw/acpi/acpi-pci-hotplug-stub.c
> @@ -34,7 +34,7 @@ void acpi_pcihp_reset(AcpiPciHpState *s)
>  {
>  }
>  
> -bool acpi_pcihp_is_hotpluggbale_bus(AcpiPciHpState *s, BusState *bus)
> +bool acpi_pcihp_is_hotpluggable_bus(AcpiPciHpState *s, BusState *bus)
>  {
>      return true;
>  }
> diff --git a/hw/acpi/ich9.c b/hw/acpi/ich9.c
> index c7a735bf64..a07c9d115b 100644
> --- a/hw/acpi/ich9.c
> +++ b/hw/acpi/ich9.c
> @@ -570,7 +570,7 @@ void ich9_pm_device_unplug_cb(HotplugHandler *hotplug_dev, DeviceState *dev,
>  bool ich9_pm_is_hotpluggable_bus(HotplugHandler *hotplug_dev, BusState *bus)
>  {
>      ICH9LPCState *lpc = ICH9_LPC_DEVICE(hotplug_dev);
> -    return acpi_pcihp_is_hotpluggbale_bus(&lpc->pm.acpi_pci_hotplug, bus);
> +    return acpi_pcihp_is_hotpluggable_bus(&lpc->pm.acpi_pci_hotplug, bus);
>  }
>  
>  void ich9_pm_ospm_status(AcpiDeviceIf *adev, ACPIOSTInfoList ***list)
> diff --git a/hw/acpi/pcihp.c b/hw/acpi/pcihp.c
> index 5f79c9016b..aac90013d4 100644
> --- a/hw/acpi/pcihp.c
> +++ b/hw/acpi/pcihp.c
> @@ -371,7 +371,7 @@ void acpi_pcihp_device_unplug_request_cb(HotplugHandler *hotplug_dev,
>      acpi_send_event(DEVICE(hotplug_dev), ACPI_PCI_HOTPLUG_STATUS);
>  }
>  
> -bool acpi_pcihp_is_hotpluggbale_bus(AcpiPciHpState *s, BusState *bus)
> +bool acpi_pcihp_is_hotpluggable_bus(AcpiPciHpState *s, BusState *bus)
>  {
>      Object *o = OBJECT(bus->parent);
>  
> diff --git a/hw/acpi/piix4.c b/hw/acpi/piix4.c
> index b16d45f03e..d98b80df6d 100644
> --- a/hw/acpi/piix4.c
> +++ b/hw/acpi/piix4.c
> @@ -406,7 +406,7 @@ static bool piix4_is_hotpluggable_bus(HotplugHandler *hotplug_dev,
>                                        BusState *bus)
>  {
>      PIIX4PMState *s = PIIX4_PM(hotplug_dev);
> -    return acpi_pcihp_is_hotpluggbale_bus(&s->acpi_pci_hotplug, bus);
> +    return acpi_pcihp_is_hotpluggable_bus(&s->acpi_pci_hotplug, bus);
>  }
>  
>  static void piix4_pm_machine_ready(Notifier *n, void *opaque)
> diff --git a/include/hw/acpi/pcihp.h b/include/hw/acpi/pcihp.h
> index ac21a95913..a97904bada 100644
> --- a/include/hw/acpi/pcihp.h
> +++ b/include/hw/acpi/pcihp.h
> @@ -58,7 +58,7 @@ typedef struct AcpiPciHpState {
>  void acpi_pcihp_init(Object *owner, AcpiPciHpState *, PCIBus *root,
>                       MemoryRegion *io, uint16_t io_base);
>  
> -bool acpi_pcihp_is_hotpluggbale_bus(AcpiPciHpState *s, BusState *bus);
> +bool acpi_pcihp_is_hotpluggable_bus(AcpiPciHpState *s, BusState *bus);
>  void acpi_pcihp_device_pre_plug_cb(HotplugHandler *hotplug_dev,
>                                     DeviceState *dev, Error **errp);
>  void acpi_pcihp_device_plug_cb(HotplugHandler *hotplug_dev, AcpiPciHpState *s,
Gustavo Romero May 5, 2025, 12:29 p.m. UTC | #2
Hi Eric,

On 5/5/25 04:13, Eric Auger wrote:
> 
> 
> On 5/4/25 11:56 PM, Gustavo Romero wrote:
>> Fix typo in QEMU's ACPI PCI hotplug API function name that checks
>> whether a given bus is hotplug-capable.
>>
>> Signed-off-by: Gustavo Romero <gustavo.romero@linaro.org>
> Reviewed-by: Eric Auger <eric.auger@redhat.com>
> 
> For awareness, there is a similar typo in pci-port.
> see
> https://lore.kernel.org/all/20250428102628.378046-2-eric.auger@redhat.com/

hmm it's unfortunate that I was about to publish a series to exactly
enable the APCI PCI hotplug on ARM. Next time I should try to sync better
with Red Hat folks on the work fronts...

I've skimmed through your RFC and it seems to be doing mostly of what I
was doing for my series, so I'll reviewed it formally today, it should be quick.

Anyways, thanks for the heads up.


Cheers,
Gustavo

> another trivial indentation fix in generic_event_device.c
> https://lore.kernel.org/all/20250428102628.378046-3-eric.auger@redhat.com/
> 
> Eric
> 
> 
> 
> 
>> ---
>>   hw/acpi/acpi-pci-hotplug-stub.c | 2 +-
>>   hw/acpi/ich9.c                  | 2 +-
>>   hw/acpi/pcihp.c                 | 2 +-
>>   hw/acpi/piix4.c                 | 2 +-
>>   include/hw/acpi/pcihp.h         | 2 +-
>>   5 files changed, 5 insertions(+), 5 deletions(-)
>>
>> diff --git a/hw/acpi/acpi-pci-hotplug-stub.c b/hw/acpi/acpi-pci-hotplug-stub.c
>> index b67b4a92da..b7bc6e40a1 100644
>> --- a/hw/acpi/acpi-pci-hotplug-stub.c
>> +++ b/hw/acpi/acpi-pci-hotplug-stub.c
>> @@ -34,7 +34,7 @@ void acpi_pcihp_reset(AcpiPciHpState *s)
>>   {
>>   }
>>   
>> -bool acpi_pcihp_is_hotpluggbale_bus(AcpiPciHpState *s, BusState *bus)
>> +bool acpi_pcihp_is_hotpluggable_bus(AcpiPciHpState *s, BusState *bus)
>>   {
>>       return true;
>>   }
>> diff --git a/hw/acpi/ich9.c b/hw/acpi/ich9.c
>> index c7a735bf64..a07c9d115b 100644
>> --- a/hw/acpi/ich9.c
>> +++ b/hw/acpi/ich9.c
>> @@ -570,7 +570,7 @@ void ich9_pm_device_unplug_cb(HotplugHandler *hotplug_dev, DeviceState *dev,
>>   bool ich9_pm_is_hotpluggable_bus(HotplugHandler *hotplug_dev, BusState *bus)
>>   {
>>       ICH9LPCState *lpc = ICH9_LPC_DEVICE(hotplug_dev);
>> -    return acpi_pcihp_is_hotpluggbale_bus(&lpc->pm.acpi_pci_hotplug, bus);
>> +    return acpi_pcihp_is_hotpluggable_bus(&lpc->pm.acpi_pci_hotplug, bus);
>>   }
>>   
>>   void ich9_pm_ospm_status(AcpiDeviceIf *adev, ACPIOSTInfoList ***list)
>> diff --git a/hw/acpi/pcihp.c b/hw/acpi/pcihp.c
>> index 5f79c9016b..aac90013d4 100644
>> --- a/hw/acpi/pcihp.c
>> +++ b/hw/acpi/pcihp.c
>> @@ -371,7 +371,7 @@ void acpi_pcihp_device_unplug_request_cb(HotplugHandler *hotplug_dev,
>>       acpi_send_event(DEVICE(hotplug_dev), ACPI_PCI_HOTPLUG_STATUS);
>>   }
>>   
>> -bool acpi_pcihp_is_hotpluggbale_bus(AcpiPciHpState *s, BusState *bus)
>> +bool acpi_pcihp_is_hotpluggable_bus(AcpiPciHpState *s, BusState *bus)
>>   {
>>       Object *o = OBJECT(bus->parent);
>>   
>> diff --git a/hw/acpi/piix4.c b/hw/acpi/piix4.c
>> index b16d45f03e..d98b80df6d 100644
>> --- a/hw/acpi/piix4.c
>> +++ b/hw/acpi/piix4.c
>> @@ -406,7 +406,7 @@ static bool piix4_is_hotpluggable_bus(HotplugHandler *hotplug_dev,
>>                                         BusState *bus)
>>   {
>>       PIIX4PMState *s = PIIX4_PM(hotplug_dev);
>> -    return acpi_pcihp_is_hotpluggbale_bus(&s->acpi_pci_hotplug, bus);
>> +    return acpi_pcihp_is_hotpluggable_bus(&s->acpi_pci_hotplug, bus);
>>   }
>>   
>>   static void piix4_pm_machine_ready(Notifier *n, void *opaque)
>> diff --git a/include/hw/acpi/pcihp.h b/include/hw/acpi/pcihp.h
>> index ac21a95913..a97904bada 100644
>> --- a/include/hw/acpi/pcihp.h
>> +++ b/include/hw/acpi/pcihp.h
>> @@ -58,7 +58,7 @@ typedef struct AcpiPciHpState {
>>   void acpi_pcihp_init(Object *owner, AcpiPciHpState *, PCIBus *root,
>>                        MemoryRegion *io, uint16_t io_base);
>>   
>> -bool acpi_pcihp_is_hotpluggbale_bus(AcpiPciHpState *s, BusState *bus);
>> +bool acpi_pcihp_is_hotpluggable_bus(AcpiPciHpState *s, BusState *bus);
>>   void acpi_pcihp_device_pre_plug_cb(HotplugHandler *hotplug_dev,
>>                                      DeviceState *dev, Error **errp);
>>   void acpi_pcihp_device_plug_cb(HotplugHandler *hotplug_dev, AcpiPciHpState *s,
>
Eric Auger May 5, 2025, 2:19 p.m. UTC | #3
Hi Gustavo,

On 5/5/25 2:29 PM, Gustavo Romero wrote:
> Hi Eric,
>
> On 5/5/25 04:13, Eric Auger wrote:
>>
>>
>> On 5/4/25 11:56 PM, Gustavo Romero wrote:
>>> Fix typo in QEMU's ACPI PCI hotplug API function name that checks
>>> whether a given bus is hotplug-capable.
>>>
>>> Signed-off-by: Gustavo Romero <gustavo.romero@linaro.org>
>> Reviewed-by: Eric Auger <eric.auger@redhat.com>
>>
>> For awareness, there is a similar typo in pci-port.
>> see
>> https://lore.kernel.org/all/20250428102628.378046-2-eric.auger@redhat.com/
>>
>
> hmm it's unfortunate that I was about to publish a series to exactly
> enable the APCI PCI hotplug on ARM. Next time I should try to sync better
> with Red Hat folks on the work fronts...
Sorry to hear that. That's always a frustrating situation :-(
>
> I've skimmed through your RFC and it seems to be doing mostly of what I
> was doing for my series, so I'll reviewed it formally today, it should
> be quick.
I guess we may need to add some additional qtests for hotplug (just as
they have on x86). Maybe we can collaborate on this or you already have
some stuff under work.

Thanks

Eric
>
> Anyways, thanks for the heads up.
>
>
> Cheers,
> Gustavo
>
>> another trivial indentation fix in generic_event_device.c
>> https://lore.kernel.org/all/20250428102628.378046-3-eric.auger@redhat.com/
>>
>>
>> Eric
>>
>>
>>
>>
>>> ---
>>>   hw/acpi/acpi-pci-hotplug-stub.c | 2 +-
>>>   hw/acpi/ich9.c                  | 2 +-
>>>   hw/acpi/pcihp.c                 | 2 +-
>>>   hw/acpi/piix4.c                 | 2 +-
>>>   include/hw/acpi/pcihp.h         | 2 +-
>>>   5 files changed, 5 insertions(+), 5 deletions(-)
>>>
>>> diff --git a/hw/acpi/acpi-pci-hotplug-stub.c
>>> b/hw/acpi/acpi-pci-hotplug-stub.c
>>> index b67b4a92da..b7bc6e40a1 100644
>>> --- a/hw/acpi/acpi-pci-hotplug-stub.c
>>> +++ b/hw/acpi/acpi-pci-hotplug-stub.c
>>> @@ -34,7 +34,7 @@ void acpi_pcihp_reset(AcpiPciHpState *s)
>>>   {
>>>   }
>>>   -bool acpi_pcihp_is_hotpluggbale_bus(AcpiPciHpState *s, BusState
>>> *bus)
>>> +bool acpi_pcihp_is_hotpluggable_bus(AcpiPciHpState *s, BusState *bus)
>>>   {
>>>       return true;
>>>   }
>>> diff --git a/hw/acpi/ich9.c b/hw/acpi/ich9.c
>>> index c7a735bf64..a07c9d115b 100644
>>> --- a/hw/acpi/ich9.c
>>> +++ b/hw/acpi/ich9.c
>>> @@ -570,7 +570,7 @@ void ich9_pm_device_unplug_cb(HotplugHandler
>>> *hotplug_dev, DeviceState *dev,
>>>   bool ich9_pm_is_hotpluggable_bus(HotplugHandler *hotplug_dev,
>>> BusState *bus)
>>>   {
>>>       ICH9LPCState *lpc = ICH9_LPC_DEVICE(hotplug_dev);
>>> -    return
>>> acpi_pcihp_is_hotpluggbale_bus(&lpc->pm.acpi_pci_hotplug, bus);
>>> +    return
>>> acpi_pcihp_is_hotpluggable_bus(&lpc->pm.acpi_pci_hotplug, bus);
>>>   }
>>>     void ich9_pm_ospm_status(AcpiDeviceIf *adev, ACPIOSTInfoList
>>> ***list)
>>> diff --git a/hw/acpi/pcihp.c b/hw/acpi/pcihp.c
>>> index 5f79c9016b..aac90013d4 100644
>>> --- a/hw/acpi/pcihp.c
>>> +++ b/hw/acpi/pcihp.c
>>> @@ -371,7 +371,7 @@ void
>>> acpi_pcihp_device_unplug_request_cb(HotplugHandler *hotplug_dev,
>>>       acpi_send_event(DEVICE(hotplug_dev), ACPI_PCI_HOTPLUG_STATUS);
>>>   }
>>>   -bool acpi_pcihp_is_hotpluggbale_bus(AcpiPciHpState *s, BusState
>>> *bus)
>>> +bool acpi_pcihp_is_hotpluggable_bus(AcpiPciHpState *s, BusState *bus)
>>>   {
>>>       Object *o = OBJECT(bus->parent);
>>>   diff --git a/hw/acpi/piix4.c b/hw/acpi/piix4.c
>>> index b16d45f03e..d98b80df6d 100644
>>> --- a/hw/acpi/piix4.c
>>> +++ b/hw/acpi/piix4.c
>>> @@ -406,7 +406,7 @@ static bool
>>> piix4_is_hotpluggable_bus(HotplugHandler *hotplug_dev,
>>>                                         BusState *bus)
>>>   {
>>>       PIIX4PMState *s = PIIX4_PM(hotplug_dev);
>>> -    return acpi_pcihp_is_hotpluggbale_bus(&s->acpi_pci_hotplug, bus);
>>> +    return acpi_pcihp_is_hotpluggable_bus(&s->acpi_pci_hotplug, bus);
>>>   }
>>>     static void piix4_pm_machine_ready(Notifier *n, void *opaque)
>>> diff --git a/include/hw/acpi/pcihp.h b/include/hw/acpi/pcihp.h
>>> index ac21a95913..a97904bada 100644
>>> --- a/include/hw/acpi/pcihp.h
>>> +++ b/include/hw/acpi/pcihp.h
>>> @@ -58,7 +58,7 @@ typedef struct AcpiPciHpState {
>>>   void acpi_pcihp_init(Object *owner, AcpiPciHpState *, PCIBus *root,
>>>                        MemoryRegion *io, uint16_t io_base);
>>>   -bool acpi_pcihp_is_hotpluggbale_bus(AcpiPciHpState *s, BusState
>>> *bus);
>>> +bool acpi_pcihp_is_hotpluggable_bus(AcpiPciHpState *s, BusState *bus);
>>>   void acpi_pcihp_device_pre_plug_cb(HotplugHandler *hotplug_dev,
>>>                                      DeviceState *dev, Error **errp);
>>>   void acpi_pcihp_device_plug_cb(HotplugHandler *hotplug_dev,
>>> AcpiPciHpState *s,
>>
>
Gustavo Romero May 6, 2025, 12:26 a.m. UTC | #4
Hi Eric,

On 5/5/25 11:19, Eric Auger wrote:
> Hi Gustavo,
> 
> On 5/5/25 2:29 PM, Gustavo Romero wrote:
>> Hi Eric,
>>
>> On 5/5/25 04:13, Eric Auger wrote:
>>>
>>>
>>> On 5/4/25 11:56 PM, Gustavo Romero wrote:
>>>> Fix typo in QEMU's ACPI PCI hotplug API function name that checks
>>>> whether a given bus is hotplug-capable.
>>>>
>>>> Signed-off-by: Gustavo Romero <gustavo.romero@linaro.org>
>>> Reviewed-by: Eric Auger <eric.auger@redhat.com>
>>>
>>> For awareness, there is a similar typo in pci-port.
>>> see
>>> https://lore.kernel.org/all/20250428102628.378046-2-eric.auger@redhat.com/
>>>
>>
>> hmm it's unfortunate that I was about to publish a series to exactly
>> enable the APCI PCI hotplug on ARM. Next time I should try to sync better
>> with Red Hat folks on the work fronts...
> Sorry to hear that. That's always a frustrating situation :-(

Yes...


>> I've skimmed through your RFC and it seems to be doing mostly of what I
>> was doing for my series, so I'll reviewed it formally today, it should
>> be quick.
> I guess we may need to add some additional qtests for hotplug (just as
> they have on x86). Maybe we can collaborate on this or you already have
> some stuff under work.

Sure, the new test I'm baking is the one I've used in the smoke test. I'll
contribute it on top of your series so.

For the x86 "parity", which tests you're thinking of to add for arm64?


Cheers,
Gustavo
diff mbox series

Patch

diff --git a/hw/acpi/acpi-pci-hotplug-stub.c b/hw/acpi/acpi-pci-hotplug-stub.c
index b67b4a92da..b7bc6e40a1 100644
--- a/hw/acpi/acpi-pci-hotplug-stub.c
+++ b/hw/acpi/acpi-pci-hotplug-stub.c
@@ -34,7 +34,7 @@  void acpi_pcihp_reset(AcpiPciHpState *s)
 {
 }
 
-bool acpi_pcihp_is_hotpluggbale_bus(AcpiPciHpState *s, BusState *bus)
+bool acpi_pcihp_is_hotpluggable_bus(AcpiPciHpState *s, BusState *bus)
 {
     return true;
 }
diff --git a/hw/acpi/ich9.c b/hw/acpi/ich9.c
index c7a735bf64..a07c9d115b 100644
--- a/hw/acpi/ich9.c
+++ b/hw/acpi/ich9.c
@@ -570,7 +570,7 @@  void ich9_pm_device_unplug_cb(HotplugHandler *hotplug_dev, DeviceState *dev,
 bool ich9_pm_is_hotpluggable_bus(HotplugHandler *hotplug_dev, BusState *bus)
 {
     ICH9LPCState *lpc = ICH9_LPC_DEVICE(hotplug_dev);
-    return acpi_pcihp_is_hotpluggbale_bus(&lpc->pm.acpi_pci_hotplug, bus);
+    return acpi_pcihp_is_hotpluggable_bus(&lpc->pm.acpi_pci_hotplug, bus);
 }
 
 void ich9_pm_ospm_status(AcpiDeviceIf *adev, ACPIOSTInfoList ***list)
diff --git a/hw/acpi/pcihp.c b/hw/acpi/pcihp.c
index 5f79c9016b..aac90013d4 100644
--- a/hw/acpi/pcihp.c
+++ b/hw/acpi/pcihp.c
@@ -371,7 +371,7 @@  void acpi_pcihp_device_unplug_request_cb(HotplugHandler *hotplug_dev,
     acpi_send_event(DEVICE(hotplug_dev), ACPI_PCI_HOTPLUG_STATUS);
 }
 
-bool acpi_pcihp_is_hotpluggbale_bus(AcpiPciHpState *s, BusState *bus)
+bool acpi_pcihp_is_hotpluggable_bus(AcpiPciHpState *s, BusState *bus)
 {
     Object *o = OBJECT(bus->parent);
 
diff --git a/hw/acpi/piix4.c b/hw/acpi/piix4.c
index b16d45f03e..d98b80df6d 100644
--- a/hw/acpi/piix4.c
+++ b/hw/acpi/piix4.c
@@ -406,7 +406,7 @@  static bool piix4_is_hotpluggable_bus(HotplugHandler *hotplug_dev,
                                       BusState *bus)
 {
     PIIX4PMState *s = PIIX4_PM(hotplug_dev);
-    return acpi_pcihp_is_hotpluggbale_bus(&s->acpi_pci_hotplug, bus);
+    return acpi_pcihp_is_hotpluggable_bus(&s->acpi_pci_hotplug, bus);
 }
 
 static void piix4_pm_machine_ready(Notifier *n, void *opaque)
diff --git a/include/hw/acpi/pcihp.h b/include/hw/acpi/pcihp.h
index ac21a95913..a97904bada 100644
--- a/include/hw/acpi/pcihp.h
+++ b/include/hw/acpi/pcihp.h
@@ -58,7 +58,7 @@  typedef struct AcpiPciHpState {
 void acpi_pcihp_init(Object *owner, AcpiPciHpState *, PCIBus *root,
                      MemoryRegion *io, uint16_t io_base);
 
-bool acpi_pcihp_is_hotpluggbale_bus(AcpiPciHpState *s, BusState *bus);
+bool acpi_pcihp_is_hotpluggable_bus(AcpiPciHpState *s, BusState *bus);
 void acpi_pcihp_device_pre_plug_cb(HotplugHandler *hotplug_dev,
                                    DeviceState *dev, Error **errp);
 void acpi_pcihp_device_plug_cb(HotplugHandler *hotplug_dev, AcpiPciHpState *s,