mbox series

[0/7] hw/i386: Cleanups around 'hw/i386/pc.h'

Message ID 20240213120153.90930-1-philmd@linaro.org
Headers show
Series hw/i386: Cleanups around 'hw/i386/pc.h' | expand

Message

Philippe Mathieu-Daudé Feb. 13, 2024, 12:01 p.m. UTC 
Trivial patches removing uses of "hw/i386/pc.h".

Philippe Mathieu-Daudé (7):
  target/i386/monitor: Remove unused 'hw/i386/pc.h' header
  hw/timer: Move HPET_INTCAP definition to "hpet.h"
  hw/isa/lpc_ich9: Remove unused 'hw/i386/pc.h'
  hw/i386/acpi: Declare pc_madt_cpu_entry() in 'acpi-common.h'
  hw/i386/port92: Add missing 'hw/isa/isa.h' header
  hw/acpi/cpu_hotplug: Include 'pci_device.h' instead of 'pci.h'
  hw/acpi/cpu_hotplug: Include 'x86.h' instead of 'pc.h'

 hw/i386/acpi-common.h   | 3 +++
 include/hw/i386/pc.h    | 6 ------
 include/hw/timer/hpet.h | 2 ++
 hw/acpi/cpu_hotplug.c   | 4 ++--
 hw/i386/acpi-common.c   | 1 -
 hw/i386/port92.c        | 1 +
 hw/isa/lpc_ich9.c       | 1 -
 hw/timer/hpet.c         | 1 -
 target/i386/monitor.c   | 1 -
 9 files changed, 8 insertions(+), 12 deletions(-)

Comments

Luc Michel Feb. 13, 2024, 2:27 p.m. UTC | #1 
On 13:01 Tue 13 Feb     , Philippe Mathieu-Daudé wrote:
> Trivial patches removing uses of "hw/i386/pc.h".
> 
> Philippe Mathieu-Daudé (7):
>   target/i386/monitor: Remove unused 'hw/i386/pc.h' header
>   hw/timer: Move HPET_INTCAP definition to "hpet.h"
>   hw/isa/lpc_ich9: Remove unused 'hw/i386/pc.h'
>   hw/i386/acpi: Declare pc_madt_cpu_entry() in 'acpi-common.h'
>   hw/i386/port92: Add missing 'hw/isa/isa.h' header
>   hw/acpi/cpu_hotplug: Include 'pci_device.h' instead of 'pci.h'
>   hw/acpi/cpu_hotplug: Include 'x86.h' instead of 'pc.h'
> 
>  hw/i386/acpi-common.h   | 3 +++
>  include/hw/i386/pc.h    | 6 ------
>  include/hw/timer/hpet.h | 2 ++
>  hw/acpi/cpu_hotplug.c   | 4 ++--
>  hw/i386/acpi-common.c   | 1 -
>  hw/i386/port92.c        | 1 +
>  hw/isa/lpc_ich9.c       | 1 -
>  hw/timer/hpet.c         | 1 -
>  target/i386/monitor.c   | 1 -
>  9 files changed, 8 insertions(+), 12 deletions(-)
> 
> --
> 2.41.0
> 
> 

For the series:
Reviewed-by: Luc Michel <luc.michel@amd.com>
Michael S. Tsirkin Feb. 13, 2024, 3:55 p.m. UTC | #2 
On Tue, Feb 13, 2024 at 01:01:45PM +0100, Philippe Mathieu-Daudé wrote:
> Trivial patches removing uses of "hw/i386/pc.h".

How did you test that it's indeed unused?

> Philippe Mathieu-Daudé (7):
>   target/i386/monitor: Remove unused 'hw/i386/pc.h' header
>   hw/timer: Move HPET_INTCAP definition to "hpet.h"
>   hw/isa/lpc_ich9: Remove unused 'hw/i386/pc.h'
>   hw/i386/acpi: Declare pc_madt_cpu_entry() in 'acpi-common.h'
>   hw/i386/port92: Add missing 'hw/isa/isa.h' header
>   hw/acpi/cpu_hotplug: Include 'pci_device.h' instead of 'pci.h'
>   hw/acpi/cpu_hotplug: Include 'x86.h' instead of 'pc.h'
> 
>  hw/i386/acpi-common.h   | 3 +++
>  include/hw/i386/pc.h    | 6 ------
>  include/hw/timer/hpet.h | 2 ++
>  hw/acpi/cpu_hotplug.c   | 4 ++--
>  hw/i386/acpi-common.c   | 1 -
>  hw/i386/port92.c        | 1 +
>  hw/isa/lpc_ich9.c       | 1 -
>  hw/timer/hpet.c         | 1 -
>  target/i386/monitor.c   | 1 -
>  9 files changed, 8 insertions(+), 12 deletions(-)
> 
> -- 
> 2.41.0
Philippe Mathieu-Daudé Feb. 13, 2024, 4 p.m. UTC | #3 
On 13/2/24 16:55, Michael S. Tsirkin wrote:
> On Tue, Feb 13, 2024 at 01:01:45PM +0100, Philippe Mathieu-Daudé wrote:
>> Trivial patches removing uses of "hw/i386/pc.h".
> 
> How did you test that it's indeed unused?

I put and #error in hw/i386/pc.h and built :)
(I'm trying to remove the PC dependency on generic devices.)

The few generic devices left are not as trivial.

>> Philippe Mathieu-Daudé (7):
>>    target/i386/monitor: Remove unused 'hw/i386/pc.h' header
>>    hw/timer: Move HPET_INTCAP definition to "hpet.h"
>>    hw/isa/lpc_ich9: Remove unused 'hw/i386/pc.h'
>>    hw/i386/acpi: Declare pc_madt_cpu_entry() in 'acpi-common.h'
>>    hw/i386/port92: Add missing 'hw/isa/isa.h' header
>>    hw/acpi/cpu_hotplug: Include 'pci_device.h' instead of 'pci.h'
>>    hw/acpi/cpu_hotplug: Include 'x86.h' instead of 'pc.h'
>>
>>   hw/i386/acpi-common.h   | 3 +++
>>   include/hw/i386/pc.h    | 6 ------
>>   include/hw/timer/hpet.h | 2 ++
>>   hw/acpi/cpu_hotplug.c   | 4 ++--
>>   hw/i386/acpi-common.c   | 1 -
>>   hw/i386/port92.c        | 1 +
>>   hw/isa/lpc_ich9.c       | 1 -
>>   hw/timer/hpet.c         | 1 -
>>   target/i386/monitor.c   | 1 -
>>   9 files changed, 8 insertions(+), 12 deletions(-)
>>
>> -- 
>> 2.41.0
>
Michael Tokarev Feb. 14, 2024, 12:45 p.m. UTC | #4 
13.02.2024 15:01, Philippe Mathieu-Daudé wrote:
> Trivial patches removing uses of "hw/i386/pc.h".
> 
> Philippe Mathieu-Daudé (7):
>    target/i386/monitor: Remove unused 'hw/i386/pc.h' header
>    hw/timer: Move HPET_INTCAP definition to "hpet.h"
>    hw/isa/lpc_ich9: Remove unused 'hw/i386/pc.h'
>    hw/i386/acpi: Declare pc_madt_cpu_entry() in 'acpi-common.h'
>    hw/i386/port92: Add missing 'hw/isa/isa.h' header
>    hw/acpi/cpu_hotplug: Include 'pci_device.h' instead of 'pci.h'
>    hw/acpi/cpu_hotplug: Include 'x86.h' instead of 'pc.h'
> 
>   hw/i386/acpi-common.h   | 3 +++
>   include/hw/i386/pc.h    | 6 ------
>   include/hw/timer/hpet.h | 2 ++
>   hw/acpi/cpu_hotplug.c   | 4 ++--
>   hw/i386/acpi-common.c   | 1 -
>   hw/i386/port92.c        | 1 +
>   hw/isa/lpc_ich9.c       | 1 -
>   hw/timer/hpet.c         | 1 -
>   target/i386/monitor.c   | 1 -
>   9 files changed, 8 insertions(+), 12 deletions(-)

For the series:

Reviewed-by: Michael Tokarev <mjt@tls.msk.ru>

and picked up for trivial-patches.

Thanks,

/mjt
Bernhard Beschow Feb. 15, 2024, 7:33 p.m. UTC | #5 
Am 13. Februar 2024 16:00:26 UTC schrieb "Philippe Mathieu-Daudé" <philmd@linaro.org>:
>On 13/2/24 16:55, Michael S. Tsirkin wrote:
>> On Tue, Feb 13, 2024 at 01:01:45PM +0100, Philippe Mathieu-Daudé wrote:
>>> Trivial patches removing uses of "hw/i386/pc.h".
>> 
>> How did you test that it's indeed unused?
>
>I put and #error in hw/i386/pc.h and built :)
>(I'm trying to remove the PC dependency on generic devices.)
>
>The few generic devices left are not as trivial.
>
>>> Philippe Mathieu-Daudé (7):
>>>    target/i386/monitor: Remove unused 'hw/i386/pc.h' header
>>>    hw/timer: Move HPET_INTCAP definition to "hpet.h"
>>>    hw/isa/lpc_ich9: Remove unused 'hw/i386/pc.h'
>>>    hw/i386/acpi: Declare pc_madt_cpu_entry() in 'acpi-common.h'
>>>    hw/i386/port92: Add missing 'hw/isa/isa.h' header
>>>    hw/acpi/cpu_hotplug: Include 'pci_device.h' instead of 'pci.h'
>>>    hw/acpi/cpu_hotplug: Include 'x86.h' instead of 'pc.h'
>>> 
>>>   hw/i386/acpi-common.h   | 3 +++
>>>   include/hw/i386/pc.h    | 6 ------
>>>   include/hw/timer/hpet.h | 2 ++
>>>   hw/acpi/cpu_hotplug.c   | 4 ++--
>>>   hw/i386/acpi-common.c   | 1 -
>>>   hw/i386/port92.c        | 1 +

I'd take care of port92 and make it part of all our three south bridge families (which models the real hardware more closely).

Best regards,
Bernhard

>>>   hw/isa/lpc_ich9.c       | 1 -
>>>   hw/timer/hpet.c         | 1 -
>>>   target/i386/monitor.c   | 1 -
>>>   9 files changed, 8 insertions(+), 12 deletions(-)
>>> 
>>> -- 
>>> 2.41.0
>> 
>