[v2] hw: Clean up hw/i386 headers (and few alpha/hppa)

[PATCH v2 00/18] hw: Clean up hw/i386 headers (and few alpha/hppa)

Philippe Mathieu-Daudé posted 18 patches 4 years, 2 months ago

Diff against v1
Download series mbox

Test docker-quick@centos7 failed

Test FreeBSD failed

Test docker-mingw@fedora failed

Test checkpatch failed

Patches applied successfully (tree, apply log)
git fetch https://github.com/patchew-project/qemu tags/patchew/20200228114649.12818-1-philmd@redhat.com

Maintainers: Eduardo Habkost <ehabkost@redhat.com>, "Michael S. Tsirkin" <mst@redhat.com>, "Philippe Mathieu-Daudé" <philmd@redhat.com>, Helge Deller <deller@gmx.de>, Gerd Hoffmann <kraxel@redhat.com>, Marcel Apfelbaum <marcel.apfelbaum@gmail.com>, Peter Maydell <peter.maydell@linaro.org>, Aleksandar Markovic <amarkovic@wavecomp.com>, Paolo Bonzini <pbonzini@redhat.com>, Andrzej Zaborowski <balrogg@gmail.com>, Richard Henderson <rth@twiddle.net>, Aurelien Jarno <aurelien@aurel32.net>, Igor Mammedov <imammedo@redhat.com>

hw/alpha/alpha_sys.h              |  1 -
include/hw/i386/ich9.h            |  1 -
include/hw/i386/intel_iommu.h     |  4 ----
include/hw/i386/ioapic_internal.h |  1 -
include/hw/i386/pc.h              | 11 +++--------
include/hw/pci-host/q35.h         |  8 +-------
hw/acpi/cpu_hotplug.c             |  1 +
hw/acpi/ich9.c                    |  2 +-
hw/acpi/piix4.c                   |  1 +
hw/alpha/dp264.c                  |  1 +
hw/hppa/machine.c                 |  1 +
hw/i2c/smbus_ich9.c               |  1 +
hw/i386/acpi-build.c              |  1 +
hw/i386/pc.c                      |  1 +
hw/i386/pc_piix.c                 |  1 +
hw/i386/pc_q35.c                  |  1 +
hw/isa/lpc_ich9.c                 |  1 -
hw/pci-host/i440fx.c              |  1 +
hw/pci-host/q35.c                 |  1 +
hw/rtc/twl92230.c                 |  1 -
hw/timer/hpet.c                   |  2 +-
hw/usb/dev-storage.c              |  1 -
softmmu/vl.c                      |  1 +
23 files changed, 18 insertions(+), 27 deletions(-)

Expand all Fold all

[PATCH v2 00/18] hw: Clean up hw/i386 headers (and few alpha/hppa)

Posted by Philippe Mathieu-Daudé 4 years, 2 months ago

[Rebased since v1]:
https://www.mail-archive.com/qemu-block@nongnu.org/msg57485.html

This is a follow-up of Markus's cleanup series:
Tame a few "touch this, recompile the world"
https://www.mail-archive.com/qemu-devel@nongnu.org/msg635748.html

This part is mostly restricted to X86, but since some file from the
Alpha/PA-RISC machines include "hw/i386/pc.h" I had to fix them
too.

Eventually I'll succeed at removing hw/i386/ dependency on non-X86
platforms (Quest I started 2 years ago...).

Regards,

Phil.

Philippe Mathieu-Daudé (18):
  vl: Add missing "hw/boards.h" include
  hw/southbridge/ich9: Removed unused headers
  hw/i386/ioapic_internal: Remove unused "hw/i386/ioapic.h" header
  hw/timer: Remove unused "ui/console.h" header
  hw/usb/dev-storage: Remove unused "ui/console.h" header
  hw/i386/intel_iommu: Remove unused includes
  hw/alpha/alpha_sys: Remove unused "hw/ide.h" header
  hw/alpha/dp264: Include "net/net.h"
  hw/hppa/machine: Include "net/net.h"
  hw/acpi/cpu_hotplug: Include "hw/pci/pci.h"
  hw/timer/hpet: Include "exec/address-spaces.h"
  hw/pci-host/q35: Include "qemu/range.h"
  hw/i2c/smbus_ich9: Include "qemu/range.h"
  hw/pci-host/piix: Include "qemu/range.h"
  hw/acpi: Include "hw/mem/nvdimm.h"
  hw/i386: Include "hw/mem/nvdimm.h"
  hw/pci-host/q35: Remove unused includes
  hw/i386/pc: Clean up includes

 hw/alpha/alpha_sys.h              |  1 -
 include/hw/i386/ich9.h            |  1 -
 include/hw/i386/intel_iommu.h     |  4 ----
 include/hw/i386/ioapic_internal.h |  1 -
 include/hw/i386/pc.h              | 11 +++--------
 include/hw/pci-host/q35.h         |  8 +-------
 hw/acpi/cpu_hotplug.c             |  1 +
 hw/acpi/ich9.c                    |  2 +-
 hw/acpi/piix4.c                   |  1 +
 hw/alpha/dp264.c                  |  1 +
 hw/hppa/machine.c                 |  1 +
 hw/i2c/smbus_ich9.c               |  1 +
 hw/i386/acpi-build.c              |  1 +
 hw/i386/pc.c                      |  1 +
 hw/i386/pc_piix.c                 |  1 +
 hw/i386/pc_q35.c                  |  1 +
 hw/isa/lpc_ich9.c                 |  1 -
 hw/pci-host/i440fx.c              |  1 +
 hw/pci-host/q35.c                 |  1 +
 hw/rtc/twl92230.c                 |  1 -
 hw/timer/hpet.c                   |  2 +-
 hw/usb/dev-storage.c              |  1 -
 softmmu/vl.c                      |  1 +
 23 files changed, 18 insertions(+), 27 deletions(-)

-- 
2.21.1

Re: [PATCH v2 00/18] hw: Clean up hw/i386 headers (and few alpha/hppa)

Posted by Laurent Vivier 4 years, 1 month ago

Le 28/02/2020 à 12:46, Philippe Mathieu-Daudé a écrit :
> [Rebased since v1]:
> https://www.mail-archive.com/qemu-block@nongnu.org/msg57485.html
> 
> This is a follow-up of Markus's cleanup series:
> Tame a few "touch this, recompile the world"
> https://www.mail-archive.com/qemu-devel@nongnu.org/msg635748.html
> 
> This part is mostly restricted to X86, but since some file from the
> Alpha/PA-RISC machines include "hw/i386/pc.h" I had to fix them
> too.
> 
> Eventually I'll succeed at removing hw/i386/ dependency on non-X86
> platforms (Quest I started 2 years ago...).
> 
> Regards,
> 
> Phil.
> 
> Philippe Mathieu-Daudé (18):
>   vl: Add missing "hw/boards.h" include
>   hw/southbridge/ich9: Removed unused headers
>   hw/i386/ioapic_internal: Remove unused "hw/i386/ioapic.h" header
>   hw/timer: Remove unused "ui/console.h" header
>   hw/usb/dev-storage: Remove unused "ui/console.h" header
>   hw/i386/intel_iommu: Remove unused includes
>   hw/alpha/alpha_sys: Remove unused "hw/ide.h" header
>   hw/alpha/dp264: Include "net/net.h"
>   hw/hppa/machine: Include "net/net.h"
>   hw/acpi/cpu_hotplug: Include "hw/pci/pci.h"
>   hw/timer/hpet: Include "exec/address-spaces.h"
>   hw/pci-host/q35: Include "qemu/range.h"
>   hw/i2c/smbus_ich9: Include "qemu/range.h"
>   hw/pci-host/piix: Include "qemu/range.h"
>   hw/acpi: Include "hw/mem/nvdimm.h"
>   hw/i386: Include "hw/mem/nvdimm.h"
>   hw/pci-host/q35: Remove unused includes
>   hw/i386/pc: Clean up includes
> 
>  hw/alpha/alpha_sys.h              |  1 -
>  include/hw/i386/ich9.h            |  1 -
>  include/hw/i386/intel_iommu.h     |  4 ----
>  include/hw/i386/ioapic_internal.h |  1 -
>  include/hw/i386/pc.h              | 11 +++--------
>  include/hw/pci-host/q35.h         |  8 +-------
>  hw/acpi/cpu_hotplug.c             |  1 +
>  hw/acpi/ich9.c                    |  2 +-
>  hw/acpi/piix4.c                   |  1 +
>  hw/alpha/dp264.c                  |  1 +
>  hw/hppa/machine.c                 |  1 +
>  hw/i2c/smbus_ich9.c               |  1 +
>  hw/i386/acpi-build.c              |  1 +
>  hw/i386/pc.c                      |  1 +
>  hw/i386/pc_piix.c                 |  1 +
>  hw/i386/pc_q35.c                  |  1 +
>  hw/isa/lpc_ich9.c                 |  1 -
>  hw/pci-host/i440fx.c              |  1 +
>  hw/pci-host/q35.c                 |  1 +
>  hw/rtc/twl92230.c                 |  1 -
>  hw/timer/hpet.c                   |  2 +-
>  hw/usb/dev-storage.c              |  1 -
>  softmmu/vl.c                      |  1 +
>  23 files changed, 18 insertions(+), 27 deletions(-)
> 

Series applied to my trivial-patches branch.

Thanks,
Laurent

Re: [PATCH v2 00/18] hw: Clean up hw/i386 headers (and few alpha/hppa)

Posted by Richard Henderson 4 years, 2 months ago

On 2/28/20 3:46 AM, Philippe Mathieu-Daudé wrote:
> Philippe Mathieu-Daudé (18):
>   vl: Add missing "hw/boards.h" include
>   hw/southbridge/ich9: Removed unused headers
>   hw/i386/ioapic_internal: Remove unused "hw/i386/ioapic.h" header
>   hw/timer: Remove unused "ui/console.h" header
>   hw/usb/dev-storage: Remove unused "ui/console.h" header
>   hw/i386/intel_iommu: Remove unused includes
>   hw/alpha/alpha_sys: Remove unused "hw/ide.h" header
>   hw/alpha/dp264: Include "net/net.h"
>   hw/hppa/machine: Include "net/net.h"
>   hw/acpi/cpu_hotplug: Include "hw/pci/pci.h"
>   hw/timer/hpet: Include "exec/address-spaces.h"
>   hw/pci-host/q35: Include "qemu/range.h"
>   hw/i2c/smbus_ich9: Include "qemu/range.h"
>   hw/pci-host/piix: Include "qemu/range.h"
>   hw/acpi: Include "hw/mem/nvdimm.h"
>   hw/i386: Include "hw/mem/nvdimm.h"
>   hw/pci-host/q35: Remove unused includes

Reviewed-by: Richard Henderson <richard.henderson@linaro.org>

r~