Hi,

quite a bunch of patches and files modified, but the diffstat is not that big.

First part is from clean-includes script,
Then comes code movement, about no logical changes.

Now some non-x86 builds and cocci spatch run a bit faster :)

I updated some MAINTAINERS entries while here.

Also I couldn't test the KVM/XEN/HAX part.

Regards,

Phil.

Philippe Mathieu-Daudé (34):
  hw: use "qemu/osdep.h" as first #include in source files
  hw: remove "qemu/osdep.h" from header files
  block: remove "qemu/osdep.h" from header file
  misc: remove headers implicitly included
  misc: remove duplicated includes
  ppc: remove duplicated includes
  i386/hax: remove duplicated includes
  nios2: remove duplicated includes
  misc: avoid "include/" in include path
  amd_iommu: avoid needless includes in header file
  i386/pc: use TYPE_PORT92
  misc: remove old i386 dependency
  hw/ide: remove old i386 dependency
  hw/ipmi: remove old i386 dependency
  hw/i2c: remove old i386 dependency
  hw/tpm: remove old i386 dependency
  hw/virtio-balloon: remove old i386 dependency
  hw/unicore32: restrict hw addr defines to source file
  hw/acpi: ACPI_PM_* defines are not restricted to i386 arch
  hw/timer/i8254: rename pit_init() -> i8254_pit_init()
  hw/display/vga: remove the old i386/pc dependency
  hw/input/i8042: extract API from hw/i386/pc.h
  hw/dma/i8257: rename DMA_init() to i8257_dma_init()
  hw/timer/mc146818: rename rtc_init() -> mc146818_init()
  hw/timer/m48t59: use TYPE_M48T59_ISA, add entries to MAINTAINERS
  hw/net/ne2000: extract ne2k-isa code from i386/pc to ne2000-isa.c
  hw/pci: declare pci_nic_init_nofail() in "hw/net/pci.h"
  hw/net/e1000: use TYPE_PCI_E1000
  hw/net/e1000e: use TYPE_PCI_E1000E
  hw/net/pcnet: use TYPE_PCI_PCNET
  hw/net/rtl8139: use TYPE_PCI_RTL8139
  hw/net/ne2000: use TYPE_PCI_NE2000
  hw/alpha: remove old i386 dependency
  misc: drop old i386 dependency

 block/dmg.h                                 |  1 -
 hw/alpha/alpha_sys.h                        |  2 -
 hw/audio/fmopl.h                            |  1 -
 hw/display/vga_int.h                        |  3 +-
 hw/display/{vga.h => vga_int_regs.h}        |  0
 hw/i386/amd_iommu.h                         |  5 --
 hw/net/ne2000.h                             |  3 ++
 hw/pci/pci_internal.h                       | 16 ++++++
 include/hw/acpi/acpi.h                      | 12 +++++
 include/hw/acpi/ipmi.h                      |  1 -
 include/hw/cpu/core.h                       |  1 -
 include/hw/display/vga.h                    | 25 ++++++++++
 include/hw/{isa/i8257.h => dma/i8257_dma.h} |  6 +++
 include/hw/i2c/ppc4xx_i2c.h                 |  1 -
 include/hw/i386/pc.h                        | 56 ---------------------
 include/hw/input/i8042.h                    | 30 +++++++++++
 include/hw/isa/isa.h                        |  2 -
 include/hw/net/ne2000-isa.h                 | 33 +++++++++++++
 include/hw/net/pci.h                        | 26 ++++++++++
 include/hw/pci/pci.h                        |  4 --
 include/hw/timer/i8254.h                    |  5 +-
 include/hw/timer/i8254_internal.h           |  2 +-
 include/hw/timer/m48t59.h                   |  2 +
 include/hw/timer/mc146818rtc.h              |  3 +-
 include/hw/unicore32/puv3.h                 | 10 ----
 include/sysemu/hax.h                        |  1 -
 target/i386/hax-darwin.h                    |  3 --
 target/i386/hax-windows.h                   |  2 -
 target/nios2/cpu.h                          |  1 -
 accel/tcg/translate-all.c                   |  1 -
 bsd-user/main.c                             |  1 -
 chardev/wctablet.c                          |  4 --
 disas/nios2.c                               |  3 --
 exec.c                                      |  3 --
 hw/acpi/ipmi-stub.c                         |  1 +
 hw/alpha/dp264.c                            | 10 ++--
 hw/alpha/pci.c                              |  2 +
 hw/alpha/typhoon.c                          |  2 +-
 hw/arm/realview.c                           |  3 +-
 hw/arm/spitz.c                              |  1 -
 hw/arm/versatilepb.c                        |  3 +-
 hw/arm/virt.c                               |  1 +
 hw/audio/fmopl.c                            |  1 -
 hw/audio/pcspk.c                            |  1 -
 hw/char/debugcon.c                          |  1 -
 hw/char/xen_console.c                       |  1 -
 hw/core/machine.c                           |  1 -
 hw/cpu/core.c                               |  1 +
 hw/display/vga-isa-mm.c                     |  4 +-
 hw/display/vga-isa.c                        |  2 +-
 hw/display/vga.c                            |  4 +-
 hw/dma/i82374.c                             |  3 +-
 hw/dma/i8257.c                              |  4 +-
 hw/i2c/pm_smbus.c                           |  1 -
 hw/i2c/smbus_ich9.c                         |  1 -
 hw/i386/amd_iommu.c                         |  5 +-
 hw/i386/kvm/pci-assign.c                    |  1 -
 hw/i386/pc.c                                | 18 ++++---
 hw/i386/pci-assign-load-rom.c               |  1 -
 hw/i386/xen/xen_platform.c                  |  1 -
 hw/ide/ahci.c                               |  1 -
 hw/ide/cmd646.c                             |  1 -
 hw/ide/core.c                               |  3 +-
 hw/ide/ich.c                                |  1 -
 hw/ide/isa.c                                |  1 -
 hw/ide/microdrive.c                         |  1 -
 hw/ide/pci.c                                |  1 -
 hw/ide/piix.c                               |  2 +-
 hw/ide/via.c                                |  1 -
 hw/input/adb.c                              |  2 +-
 hw/input/pckbd.c                            |  2 +-
 hw/input/vmmouse.c                          |  3 +-
 hw/intc/lm32_pic.c                          |  1 -
 hw/ipmi/isa_ipmi_bt.c                       |  1 -
 hw/ipmi/isa_ipmi_kcs.c                      |  1 -
 hw/isa/i82378.c                             |  5 +-
 hw/isa/vt82c686.c                           |  1 -
 hw/mips/mips_fulong2e.c                     | 13 +++--
 hw/mips/mips_jazz.c                         |  9 ++--
 hw/mips/mips_malta.c                        | 13 +++--
 hw/mips/mips_r4k.c                          |  8 +--
 hw/misc/ivshmem.c                           |  1 -
 hw/misc/sga.c                               |  1 -
 hw/misc/vmport.c                            |  1 +
 hw/moxie/moxiesim.c                         |  1 -
 hw/net/e1000e.c                             |  6 +--
 hw/net/ne2000-isa.c                         |  6 +--
 hw/net/ne2000.c                             |  5 +-
 hw/net/pcnet-pci.c                          |  3 +-
 hw/net/rtl8139.c                            |  7 ++-
 hw/nios2/boot.c                             |  1 -
 hw/pci-bridge/pci_expander_bridge.c         |  1 -
 hw/pci/pci.c                                | 67 +------------------------
 hw/pci/pci_nic.c                            | 77 +++++++++++++++++++++++++++++
 hw/ppc/e500.c                               |  1 +
 hw/ppc/mac_newworld.c                       |  3 +-
 hw/ppc/mac_oldworld.c                       |  3 +-
 hw/ppc/pnv.c                                |  2 +-
 hw/ppc/ppc440_bamboo.c                      |  3 +-
 hw/ppc/prep.c                               | 13 +++--
 hw/ppc/spapr.c                              |  1 +
 hw/ppc/spapr_cpu_core.c                     |  1 +
 hw/ppc/spapr_hcall.c                        |  1 -
 hw/s390x/css.c                              |  1 -
 hw/scsi/vhost-user-scsi.c                   |  1 -
 hw/sh4/r2d.c                                |  5 +-
 hw/smbios/smbios_type_38-stub.c             |  1 +
 hw/sparc/sun4m.c                            |  5 --
 hw/sparc64/sun4u.c                          | 10 ++--
 hw/ssi/aspeed_smc.c                         |  3 +-
 hw/timer/i8254.c                            |  1 -
 hw/timer/i8254_common.c                     |  1 -
 hw/timer/m48t59-isa.c                       |  2 +-
 hw/timer/mc146818rtc.c                      |  2 +-
 hw/tpm/tpm_passthrough.c                    |  1 -
 hw/tpm/tpm_tis.c                            |  1 -
 hw/unicore32/puv3.c                         | 17 ++++---
 hw/vfio/ccw.c                               |  2 +-
 hw/virtio/vhost-vsock.c                     |  2 +-
 hw/virtio/virtio-balloon.c                  |  2 +-
 hw/watchdog/wdt_ib700.c                     |  1 -
 linux-user/main.c                           |  1 -
 monitor.c                                   |  1 -
 net/colo-compare.c                          |  1 -
 numa.c                                      |  1 -
 target/i386/hax-darwin.c                    |  8 +--
 target/nios2/helper.c                       |  7 +--
 target/nios2/op_helper.c                    |  1 +
 target/nios2/translate.c                    |  1 +
 target/openrisc/exception_helper.c          |  1 -
 target/ppc/kvm.c                            |  3 --
 tests/test-aio-multithread.c                |  1 -
 tests/test-clone-visitor.c                  |  1 -
 tests/vhost-user-test.c                     |  1 -
 tests/vmgenid-test.c                        |  3 --
 util/qemu-sockets.c                         |  1 -
 vl.c                                        |  3 +-
 hw/pci/Makefile.objs                        |  1 +
 MAINTAINERS                                 | 13 ++++-
 139 files changed, 389 insertions(+), 337 deletions(-)
 rename hw/display/{vga.h => vga_int_regs.h} (100%)
 create mode 100644 hw/pci/pci_internal.h
 create mode 100644 include/hw/display/vga.h
 rename include/hw/{isa/i8257.h => dma/i8257_dma.h} (86%)
 create mode 100644 include/hw/input/i8042.h
 create mode 100644 include/hw/net/ne2000-isa.h
 create mode 100644 include/hw/net/pci.h
 create mode 100644 hw/pci/pci_nic.c

-- 
2.14.1

This was an old(ish) patchset. Aplying it now.

22.09.2017 18:39, Philippe Mathieu-Daudé wrote:
> Hi,
> 
> quite a bunch of patches and files modified, but the diffstat is not that big.
> 
> First part is from clean-includes script,
> Then comes code movement, about no logical changes.
> 
> Now some non-x86 builds and cocci spatch run a bit faster :)
> 
> I updated some MAINTAINERS entries while here.
> 
> Also I couldn't test the KVM/XEN/HAX part.
> 
> Regards,
> 
> Phil.
> 
> Philippe Mathieu-Daudé (34):
>   hw: use "qemu/osdep.h" as first #include in source files
applied
>   hw: remove "qemu/osdep.h" from header files
not applied, doing two things, suggested split-up
(I'm fine with it as it is)
>   block: remove "qemu/osdep.h" from header file
applied
>   misc: remove headers implicitly included
applied
>   misc: remove duplicated includes
applied
>   ppc: remove duplicated includes
applied
>   i386/hax: remove duplicated includes
applied (note it can be trimmed more)
>   nios2: remove duplicated includes
applied
>   misc: avoid "include/" in include path
not applied, probably should be split, but I'm fine with it as it is
>   amd_iommu: avoid needless includes in header file
applied
>   i386/pc: use TYPE_PORT92
applied
>   misc: remove old i386 dependency
applied
>   hw/ide: remove old i386 dependency
applied
>   hw/ipmi: remove old i386 dependency
applied
>   hw/i2c: remove old i386 dependency
applied
>   hw/tpm: remove old i386 dependency
applied
>   hw/virtio-balloon: remove old i386 dependency
applied
>   hw/unicore32: restrict hw addr defines to source file
applied
>   hw/acpi: ACPI_PM_* defines are not restricted to i386 arch
applied
>   hw/timer/i8254: rename pit_init() -> i8254_pit_init()
not applied, split?
>   hw/display/vga: remove the old i386/pc dependency
somehow I can't find this patch, neither in my inbox nor in patchwork
>   hw/input/i8042: extract API from hw/i386/pc.h
CHECK
>   hw/dma/i8257: rename DMA_init() to i8257_dma_init()
not applied, pending **errp addition
>   hw/timer/mc146818: rename rtc_init() -> mc146818_init()
applied
>   hw/timer/m48t59: use TYPE_M48T59_ISA, add entries to MAINTAINERS
not applied, it went out of context without i8257_dma_init rename
btw, why do we prefer these TYPE_XXX things instead of simple "xxx" stuff?
>   hw/net/ne2000: extract ne2k-isa code from i386/pc to ne2000-isa.c
applied
>   hw/pci: declare pci_nic_init_nofail() in "hw/net/pci.h"
not applied, it does more than mentioned

>   hw/net/e1000: use TYPE_PCI_E1000
>   hw/net/e1000e: use TYPE_PCI_E1000E
>   hw/net/pcnet: use TYPE_PCI_PCNET
>   hw/net/rtl8139: use TYPE_PCI_RTL8139
>   hw/net/ne2000: use TYPE_PCI_NE2000

Not applied, at least not yet, why do we use these TYPE_XX stuff to
start with?

>   hw/alpha: remove old i386 dependency
not applied

>   misc: drop old i386 dependency
applied, except of the MAINTAINERS part.

Applying these series is quite a bit boring task I'd say :)

Thanks,

/mjt

Hi Michael,

Thanks for your comments!

>>   hw: remove "qemu/osdep.h" from header files
> not applied, doing two things, suggested split-up
> (I'm fine with it as it is)

split out MAINTAINERS entry

>>   i386/hax: remove duplicated includes
> applied (note it can be trimmed more)

done in another patch.

>>   misc: avoid "include/" in include path
> not applied, probably should be split, but I'm fine with it as it is

split out numa.c

>>   hw/timer/i8254: rename pit_init() -> i8254_pit_init()
> not applied, split?

split out MAINTAINERS entry

>>   hw/display/vga: remove the old i386/pc dependency
> somehow I can't find this patch, neither in my inbox nor in patchwork

weird...

>>   hw/input/i8042: extract API from hw/i386/pc.h
> CHECK

split out MAINTAINERS entry

>>   hw/dma/i8257: rename DMA_init() to i8257_dma_init()
> not applied, pending **errp addition

attempt to fix it...

>>   hw/timer/m48t59: use TYPE_M48T59_ISA, add entries to MAINTAINERS
> not applied, it went out of context without i8257_dma_init rename
> btw, why do we prefer these TYPE_XXX things instead of simple "xxx" stuff?

split out MAINTAINERS entry, dropped out TYPE_M48T59_ISA use.

>>   hw/pci: declare pci_nic_init_nofail() in "hw/net/pci.h"
> not applied, it does more than mentioned

dropped from this series.

>>   hw/net/e1000: use TYPE_PCI_E1000
>>   hw/net/e1000e: use TYPE_PCI_E1000E
>>   hw/net/pcnet: use TYPE_PCI_PCNET
>>   hw/net/rtl8139: use TYPE_PCI_RTL8139
>>   hw/net/ne2000: use TYPE_PCI_NE2000
> 
> Not applied, at least not yet, why do we use these TYPE_XX stuff to
> start with?

TYPE_XX is the interface, having the devices using TYPE_XX instead of
hardcoded name guarantee safe rename/refactor.

anyway, dropped.

> Applying these series is quite a bit boring task I'd say :)

separating them from the whole branch too! but they are required for the
final objective which I'll send in 3 or 4 parts.

Regards,

Phil.