[Qemu-devel] [PATCH v3 00/42] remove i386/pc dependency from non-PC world (part 1)

[Qemu-devel] [PATCH v3 00/42] remove i386/pc dependency from non-PC world (part 1)

[Philippe Mathieu-Daudé]

Hi,

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

patches missing review: 2 3 16 20 21 33-37 39-41

since v3:

- addressed Thomas & Paolo comments (thanks for your reviews!)
- split/fixed MAINTAINERS entries
- dropped port92 patch
- dropped i8237* patches

I couldn't test the KVM/XEN/HAX part (thanks Corey Minyard for v1 testing!).

since v2:
- added R-b, A-b
- added missing MAINTAINERS entries (as separate patches)
- dma/i82374: avoid multiple creations on the same ISA bus
- i386/pc: extract port92 from pc.c
- i386/pc: move vmport.c/pvpanic.c from hw/misc/ to hw/i386/

v1:

- clean includes (mostly from script)
- code movement (about no logical changes)

Regards,

Phil.

[----] : patches are identical
[####] : number of functional differences between upstream/downstream patch
[down] : patch is downstream-only
The flags [FC] indicate (F)unctional and (C)ontextual differences, respectively

001/42:[----] [--] 'MAINTAINERS: add entries for i2c/ppc4xx'
002/42:[down] 'MAINTAINERS: add an entry for the i82374 (southbridge)'
003/42:[down] 'MAINTAINERS: add an entry for the i8257 (DMA controller)'
004/42:[----] [--] 'MAINTAINERS: add an entry for the i82378 (superio)'
005/42:[----] [-C] 'MAINTAINERS: add an entry for watchdog/wdt_ib700'
006/42:[----] [--] 'MAINTAINERS: add an entry for input/pckbd.c'
007/42:[----] [--] 'MAINTAINERS: add entries for timer/m48t59'
008/42:[----] [--] 'MAINTAINERS: add missing entry for include/hw/net/'
009/42:[----] [--] 'hw: use "qemu/osdep.h" as first #include in source files'
010/42:[----] [--] 'hw: remove "qemu/osdep.h" from header files'
011/42:[----] [--] 'block: remove "qemu/osdep.h" from header file'
012/42:[----] [--] 'misc: remove headers implicitly included'
013/42:[----] [--] 'misc: remove duplicated includes'
014/42:[----] [--] 'ppc: remove duplicated includes'
015/42:[----] [--] 'i386/hax: remove duplicated includes'
016/42:[0013] [FC] 'i386/hax: remove duplicated include'
017/42:[----] [--] 'nios2: remove duplicated includes (in code commented out)'
018/42:[----] [--] 'misc: avoid "include/" in include path'
019/42:[----] [--] 'numa: remove unused #include'
020/42:[down] 'hw/input/vmmouse: remove unused #include'
021/42:[down] 'hw/misc/pvpanic: remove unused #include'
022/42:[----] [--] 'hw/ssi/aspeed_smc: remove unused #include'
023/42:[----] [--] 'amd_iommu: avoid needless includes in header file'
024/42:[0001] [FC] 'misc: remove old i386 dependency'
025/42:[----] [--] 'hw/ide: remove old i386 dependency'
026/42:[----] [--] 'hw/ipmi: remove old i386 dependency'
027/42:[----] [--] 'hw/i2c: remove old i386 dependency'
028/42:[----] [--] 'hw/tpm: remove old i386 dependency'
029/42:[----] [--] 'hw/virtio-balloon: remove old i386 dependency'
030/42:[0001] [FC] 'hw/unicore32: restrict hw addr defines to source file'
031/42:[----] [--] 'hw/timer/i8254: rename pit_init() -> i8254_pit_init()'
032/42:[----] [-C] 'hw/timer/mc146818: rename rtc_init() -> mc146818_rtc_init()'
033/42:[0003] [FC] 'hw/acpi: ACPI_PM_* defines are not restricted to i386 arch'
034/42:[down] 'hw/acpi/ich9: extract ACPI_PM_PROP_TCO_ENABLED from i386/pc'
035/42:[down] 'hw/display/vga: "vga.h" only contains registers defs, rename it "vga_regs.h"'
036/42:[down] 'hw/display/vga: "vga_int.h" requires "ui/console.h"'
037/42:[down] 'hw/display/vga: extract public API from i386/pc to "hw/display/vga.h"'
038/42:[----] [-C] 'hw/net/ne2000: extract ne2k-isa code from i386/pc to ne2000-isa.c'
039/42:[down] 'hw/misc/pvpanic: extract public API from i386/pc to "hw/misc/pvpanic.h"'
040/42:[down] 'i386/pc: move vmport.c to hw/i386/'
041/42:[down] 'i386/pc: move vmmouse.c to hw/i386/'
042/42:[----] [--] 'misc: drop old i386 dependency'

Philippe Mathieu-Daudé (42):
  MAINTAINERS: add entries for i2c/ppc4xx
  MAINTAINERS: add an entry for the i82374 (southbridge)
  MAINTAINERS: add an entry for the i8257 (DMA controller)
  MAINTAINERS: add an entry for the i82378 (superio)
  MAINTAINERS: add an entry for watchdog/wdt_ib700
  MAINTAINERS: add an entry for input/pckbd.c
  MAINTAINERS: add entries for timer/m48t59
  MAINTAINERS: add missing entry for include/hw/net/
  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
  i386/hax: remove duplicated include
  nios2: remove duplicated includes (in code commented out)
  misc: avoid "include/" in include path
  numa: remove unused #include
  hw/input/vmmouse: remove unused #include
  hw/misc/pvpanic: remove unused #include
  hw/ssi/aspeed_smc: remove unused #include
  amd_iommu: avoid needless includes in header file
  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/timer/i8254: rename pit_init() -> i8254_pit_init()
  hw/timer/mc146818: rename rtc_init() -> mc146818_rtc_init()
  hw/acpi: ACPI_PM_* defines are not restricted to i386 arch
  hw/acpi/ich9: extract ACPI_PM_PROP_TCO_ENABLED from i386/pc
  hw/display/vga: "vga.h" only contains registers defs, rename it
    "vga_regs.h"
  hw/display/vga: "vga_int.h" requires "ui/console.h"
  hw/display/vga: extract public API from i386/pc to "hw/display/vga.h"
  hw/net/ne2000: extract ne2k-isa code from i386/pc to ne2000-isa.c
  hw/misc/pvpanic: extract public API from i386/pc to
    "hw/misc/pvpanic.h"
  i386/pc: move vmport.c to hw/i386/
  i386/pc: move vmmouse.c to hw/i386/
  misc: drop old i386 dependency

 block/dmg.h                         |  1 -
 hw/audio/fmopl.h                    |  1 -
 hw/display/qxl.h                    |  1 -
 hw/display/vga_int.h                |  3 ++-
 hw/display/{vga.h => vga_regs.h}    |  0
 hw/i386/amd_iommu.h                 |  5 ----
 hw/net/ne2000.h                     |  3 +++
 include/hw/acpi/acpi.h              | 11 +++++++++
 include/hw/acpi/ich9.h              |  2 ++
 include/hw/acpi/ipmi.h              |  1 -
 include/hw/cpu/core.h               |  1 -
 include/hw/display/vga.h            | 25 +++++++++++++++++++
 include/hw/i2c/ppc4xx_i2c.h         |  1 -
 include/hw/i386/pc.h                | 48 -------------------------------------
 include/hw/misc/pvpanic.h           | 21 ++++++++++++++++
 include/hw/net/ne2000-isa.h         | 33 +++++++++++++++++++++++++
 include/hw/timer/i8254.h            |  5 ++--
 include/hw/timer/i8254_internal.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           |  3 ---
 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/core.c                      |  1 -
 hw/acpi/ipmi-stub.c                 |  1 +
 hw/alpha/dp264.c                    |  4 ++--
 hw/arm/spitz.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/cirrus_vga.c             |  1 -
 hw/display/vga-isa-mm.c             |  4 +---
 hw/display/vga-isa.c                |  3 +--
 hw/display/vga-pci.c                |  1 -
 hw/display/vga.c                    |  5 ++--
 hw/display/virtio-vga.c             |  1 -
 hw/display/vmware_vga.c             |  1 -
 hw/i2c/pm_smbus.c                   |  1 -
 hw/i2c/smbus_ich9.c                 |  1 -
 hw/i386/acpi-build.c                |  2 +-
 hw/i386/amd_iommu.c                 |  5 +++-
 hw/i386/kvm/pci-assign.c            |  1 -
 hw/i386/pc.c                        |  5 ++--
 hw/i386/pci-assign-load-rom.c       |  2 --
 hw/{input => i386}/vmmouse.c        |  1 -
 hw/{misc => i386}/vmport.c          |  0
 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/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             |  4 ++--
 hw/mips/mips_jazz.c                 |  5 ++--
 hw/mips/mips_malta.c                |  4 ++--
 hw/mips/mips_r4k.c                  |  5 ++--
 hw/misc/ivshmem.c                   |  1 -
 hw/misc/pvpanic.c                   | 12 ++++------
 hw/misc/sga.c                       |  1 -
 hw/moxie/moxiesim.c                 |  1 -
 hw/net/ne2000-isa.c                 |  6 ++---
 hw/net/ne2000.c                     |  2 --
 hw/nios2/boot.c                     |  1 -
 hw/pci-bridge/pci_expander_bridge.c |  1 -
 hw/ppc/pnv.c                        |  2 +-
 hw/ppc/prep.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/smbios/smbios_type_38-stub.c     |  1 +
 hw/sparc/sun4m.c                    |  1 -
 hw/ssi/aspeed_smc.c                 |  3 +--
 hw/timer/i8254.c                    |  1 -
 hw/timer/i8254_common.c             |  1 -
 hw/timer/mc146818rtc.c              |  2 +-
 hw/tpm/tpm_passthrough.c            |  1 -
 hw/tpm/tpm_tis.c                    |  1 -
 hw/unicore32/puv3.c                 | 15 ++++++++----
 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            |  6 +----
 target/nios2/helper.c               |  5 +---
 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 +--
 MAINTAINERS                         | 13 +++++++++-
 hw/i386/Makefile.objs               |  2 ++
 hw/input/Makefile.objs              |  1 -
 hw/misc/Makefile.objs               |  2 --
 122 files changed, 179 insertions(+), 221 deletions(-)
 rename hw/display/{vga.h => vga_regs.h} (100%)
 create mode 100644 include/hw/display/vga.h
 create mode 100644 include/hw/misc/pvpanic.h
 create mode 100644 include/hw/net/ne2000-isa.h
 rename hw/{input => i386}/vmmouse.c (99%)
 rename hw/{misc => i386}/vmport.c (100%)

-- 
2.15.0.rc0

[Qemu-devel] [PATCH v3 01/42] MAINTAINERS: add entries for i2c/ppc4xx

[Philippe Mathieu-Daudé]

Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Corey Minyard <cminyard@mvista.com>
---
 MAINTAINERS | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/MAINTAINERS b/MAINTAINERS
index 9cff9737d3..6f56c1349b 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -954,7 +954,9 @@ M: Alexander Graf <agraf@suse.de>
 L: qemu-ppc@nongnu.org
 S: Odd Fixes
 F: hw/ppc/ppc4*.c
+F: hw/i2c/ppc4xx_i2c.c
 F: include/hw/ppc/ppc4xx.h
+F: include/hw/i2c/ppc4xx_i2c.h
 
 ppce500
 M: Alexander Graf <agraf@suse.de>
-- 
2.15.0.rc0

[Qemu-devel] [PATCH v3 02/42] MAINTAINERS: add an entry for the i82374 (southbridge)

[Philippe Mathieu-Daudé]

Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
---
 MAINTAINERS | 1 +
 1 file changed, 1 insertion(+)

diff --git a/MAINTAINERS b/MAINTAINERS
index 6f56c1349b..331f7391c1 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -713,6 +713,7 @@ F: hw/ppc/prep_systemio.c
 F: hw/ppc/rs6000_mc.c
 F: hw/pci-host/prep.[hc]
 F: hw/isa/pc87312.[hc]
+F: hw/dma/i82374.c
 F: pc-bios/ppc_rom.bin
 
 sPAPR
-- 
2.15.0.rc0

[Qemu-devel] [PATCH v3 03/42] MAINTAINERS: add an entry for the i8257 (DMA controller)

[Philippe Mathieu-Daudé]

Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
---
 MAINTAINERS | 1 +
 1 file changed, 1 insertion(+)

diff --git a/MAINTAINERS b/MAINTAINERS
index 331f7391c1..0706b474e7 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -856,6 +856,7 @@ F: hw/timer/hpet*
 F: hw/timer/i8254*
 F: hw/timer/mc146818rtc*
 F: include/hw/i2c/pm_smbus.h
+F: include/hw/isa/i8257.h
 F: include/hw/timer/hpet.h
 F: include/hw/timer/i8254*
 F: include/hw/timer/mc146818rtc*
-- 
2.15.0.rc0

[Qemu-devel] [PATCH v3 04/42] MAINTAINERS: add an entry for the i82378 (superio)

[Philippe Mathieu-Daudé]

Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Hervé Poussineau <hpoussin@reactos.org>
---
 MAINTAINERS | 1 +
 1 file changed, 1 insertion(+)

diff --git a/MAINTAINERS b/MAINTAINERS
index 0706b474e7..510505b2f3 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -712,6 +712,7 @@ F: hw/ppc/prep.c
 F: hw/ppc/prep_systemio.c
 F: hw/ppc/rs6000_mc.c
 F: hw/pci-host/prep.[hc]
+F: hw/isa/i82378.c
 F: hw/isa/pc87312.[hc]
 F: hw/dma/i82374.c
 F: pc-bios/ppc_rom.bin
-- 
2.15.0.rc0

[Qemu-devel] [PATCH v3 05/42] MAINTAINERS: add an entry for watchdog/wdt_ib700

[Philippe Mathieu-Daudé]

Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Thomas Huth <thuth@redhat.com>
---
 MAINTAINERS | 1 +
 1 file changed, 1 insertion(+)

diff --git a/MAINTAINERS b/MAINTAINERS
index 510505b2f3..907e067903 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -856,6 +856,7 @@ F: hw/misc/pc-testdev.c
 F: hw/timer/hpet*
 F: hw/timer/i8254*
 F: hw/timer/mc146818rtc*
+F: hw/watchdog/wdt_ib700.c
 F: include/hw/i2c/pm_smbus.h
 F: include/hw/isa/i8257.h
 F: include/hw/timer/hpet.h
-- 
2.15.0.rc0

[Qemu-devel] [PATCH v3 06/42] MAINTAINERS: add an entry for input/pckbd.c

[Philippe Mathieu-Daudé]

and fix a typo in the "PC Chipset" section

Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Hervé Poussineau <hpoussin@reactos.org>
---
 MAINTAINERS | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/MAINTAINERS b/MAINTAINERS
index 907e067903..1700f3a541 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -842,12 +842,13 @@ F: hw/misc/sga.c
 PC Chipset
 M: Michael S. Tsirkin <mst@redhat.com>
 M: Paolo Bonzini <pbonzini@redhat.com>
-S: Support
+S: Supported
 F: hw/char/debugcon.c
 F: hw/char/parallel.c
 F: hw/char/serial*
 F: hw/dma/i8257*
 F: hw/i2c/pm_smbus.c
+F: hw/input/pckbd.c
 F: hw/intc/apic*
 F: hw/intc/ioapic*
 F: hw/intc/i8259*
-- 
2.15.0.rc0

[Qemu-devel] [PATCH v3 07/42] MAINTAINERS: add entries for timer/m48t59

[Philippe Mathieu-Daudé]

Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Hervé Poussineau <hpoussin@reactos.org>
---
 MAINTAINERS | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/MAINTAINERS b/MAINTAINERS
index 1700f3a541..948d99c123 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -715,6 +715,8 @@ F: hw/pci-host/prep.[hc]
 F: hw/isa/i82378.c
 F: hw/isa/pc87312.[hc]
 F: hw/dma/i82374.c
+F: hw/timer/m48t59-isa.c
+F: include/hw/timer/m48t59.h
 F: pc-bios/ppc_rom.bin
 
 sPAPR
-- 
2.15.0.rc0

[Qemu-devel] [PATCH v3 08/42] MAINTAINERS: add missing entry for include/hw/net/

[Philippe Mathieu-Daudé]

Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Hervé Poussineau <hpoussin@reactos.org>
---
 MAINTAINERS | 1 +
 1 file changed, 1 insertion(+)

diff --git a/MAINTAINERS b/MAINTAINERS
index 948d99c123..0e926a942b 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -982,6 +982,7 @@ Network devices
 M: Jason Wang <jasowang@redhat.com>
 S: Odd Fixes
 F: hw/net/
+F: include/hw/net/
 F: tests/virtio-net-test.c
 T: git git://github.com/jasowang/qemu.git net
 
-- 
2.15.0.rc0

[Qemu-devel] [PATCH v3 09/42] hw: use "qemu/osdep.h" as first #include in source files

[Philippe Mathieu-Daudé]

applied using ./scripts/clean-includes

Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Acked-by: David Gibson <david@gibson.dropbear.id.au>
Acked-by: Cornelia Huck <cohuck@redhat.com>
---
 hw/acpi/ipmi-stub.c             | 1 +
 hw/audio/fmopl.c                | 1 -
 hw/cpu/core.c                   | 1 +
 hw/ppc/spapr_cpu_core.c         | 1 +
 hw/smbios/smbios_type_38-stub.c | 1 +
 hw/vfio/ccw.c                   | 2 +-
 hw/virtio/vhost-vsock.c         | 2 +-
 7 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/hw/acpi/ipmi-stub.c b/hw/acpi/ipmi-stub.c
index 98b6dcee0d..f525f71c2d 100644
--- a/hw/acpi/ipmi-stub.c
+++ b/hw/acpi/ipmi-stub.c
@@ -7,6 +7,7 @@
  * See the COPYING file in the top-level directory.
  */
 
+#include "qemu/osdep.h"
 #include "hw/acpi/ipmi.h"
 
 void build_acpi_ipmi_devices(Aml *table, BusState *bus)
diff --git a/hw/audio/fmopl.c b/hw/audio/fmopl.c
index 5cfb6a96dd..9f50a89b4a 100644
--- a/hw/audio/fmopl.c
+++ b/hw/audio/fmopl.c
@@ -34,7 +34,6 @@
 #include <math.h>
 //#include "driver.h"		/* use M.A.M.E. */
 #include "fmopl.h"
-#include "qemu/osdep.h"
 #ifndef PI
 #define PI 3.14159265358979323846
 #endif
diff --git a/hw/cpu/core.c b/hw/cpu/core.c
index bd578ab80c..7e42e2c87a 100644
--- a/hw/cpu/core.c
+++ b/hw/cpu/core.c
@@ -6,6 +6,7 @@
  * This work is licensed under the terms of the GNU GPL, version 2 or later.
  * See the COPYING file in the top-level directory.
  */
+#include "qemu/osdep.h"
 #include "hw/cpu/core.h"
 #include "qapi/visitor.h"
 #include "qapi/error.h"
diff --git a/hw/ppc/spapr_cpu_core.c b/hw/ppc/spapr_cpu_core.c
index 3e20b1d886..c963440f45 100644
--- a/hw/ppc/spapr_cpu_core.c
+++ b/hw/ppc/spapr_cpu_core.c
@@ -6,6 +6,7 @@
  * This work is licensed under the terms of the GNU GPL, version 2 or later.
  * See the COPYING file in the top-level directory.
  */
+#include "qemu/osdep.h"
 #include "hw/cpu/core.h"
 #include "hw/ppc/spapr_cpu_core.h"
 #include "target/ppc/cpu.h"
diff --git a/hw/smbios/smbios_type_38-stub.c b/hw/smbios/smbios_type_38-stub.c
index 9528c2c28e..5b83c9b1f1 100644
--- a/hw/smbios/smbios_type_38-stub.c
+++ b/hw/smbios/smbios_type_38-stub.c
@@ -7,6 +7,7 @@
  * See the COPYING file in the top-level directory.
  */
 
+#include "qemu/osdep.h"
 #include "hw/smbios/ipmi.h"
 
 void smbios_build_type_38_table(void)
diff --git a/hw/vfio/ccw.c b/hw/vfio/ccw.c
index 76323c6bde..80457a3deb 100644
--- a/hw/vfio/ccw.c
+++ b/hw/vfio/ccw.c
@@ -11,11 +11,11 @@
  * directory.
  */
 
+#include "qemu/osdep.h"
 #include <linux/vfio.h>
 #include <linux/vfio_ccw.h>
 #include <sys/ioctl.h>
 
-#include "qemu/osdep.h"
 #include "qapi/error.h"
 #include "hw/sysbus.h"
 #include "hw/vfio/vfio.h"
diff --git a/hw/virtio/vhost-vsock.c b/hw/virtio/vhost-vsock.c
index 5ec1c6a2a2..aa5af927e1 100644
--- a/hw/virtio/vhost-vsock.c
+++ b/hw/virtio/vhost-vsock.c
@@ -11,8 +11,8 @@
  * top-level directory.
  */
 
-#include <sys/ioctl.h>
 #include "qemu/osdep.h"
+#include <sys/ioctl.h>
 #include "standard-headers/linux/virtio_vsock.h"
 #include "qapi/error.h"
 #include "hw/virtio/virtio-bus.h"
-- 
2.15.0.rc0

[Qemu-devel] [PATCH v3 10/42] hw: remove "qemu/osdep.h" from header files

[Philippe Mathieu-Daudé]

applied using ./scripts/clean-includes

Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Corey Minyard <cminyard@mvista.com>
Tested-by: Corey Minyard <cminyard@mvista.com>
---
 include/hw/acpi/ipmi.h      | 1 -
 include/hw/cpu/core.h       | 1 -
 include/hw/i2c/ppc4xx_i2c.h | 1 -
 3 files changed, 3 deletions(-)

diff --git a/include/hw/acpi/ipmi.h b/include/hw/acpi/ipmi.h
index ab2bb29048..c38483565c 100644
--- a/include/hw/acpi/ipmi.h
+++ b/include/hw/acpi/ipmi.h
@@ -9,7 +9,6 @@
 #ifndef HW_ACPI_IPMI_H
 #define HW_ACPI_IPMI_H
 
-#include "qemu/osdep.h"
 #include "hw/acpi/aml-build.h"
 
 /*
diff --git a/include/hw/cpu/core.h b/include/hw/cpu/core.h
index 79ac79c29c..b7470644d8 100644
--- a/include/hw/cpu/core.h
+++ b/include/hw/cpu/core.h
@@ -9,7 +9,6 @@
 #ifndef HW_CPU_CORE_H
 #define HW_CPU_CORE_H
 
-#include "qemu/osdep.h"
 #include "hw/qdev.h"
 
 #define TYPE_CPU_CORE "cpu-core"
diff --git a/include/hw/i2c/ppc4xx_i2c.h b/include/hw/i2c/ppc4xx_i2c.h
index e53042f6d4..3450bda577 100644
--- a/include/hw/i2c/ppc4xx_i2c.h
+++ b/include/hw/i2c/ppc4xx_i2c.h
@@ -25,7 +25,6 @@
 #ifndef PPC4XX_I2C_H
 #define PPC4XX_I2C_H
 
-#include "qemu/osdep.h"
 #include "qemu-common.h"
 #include "hw/sysbus.h"
 #include "hw/i2c/i2c.h"
-- 
2.15.0.rc0

[Qemu-devel] [PATCH v3 11/42] block: remove "qemu/osdep.h" from header file

[Philippe Mathieu-Daudé]

applied using ./scripts/clean-includes

Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
---
 block/dmg.h | 1 -
 1 file changed, 1 deletion(-)

diff --git a/block/dmg.h b/block/dmg.h
index b592d6fa8b..2ecf239ba5 100644
--- a/block/dmg.h
+++ b/block/dmg.h
@@ -26,7 +26,6 @@
 #ifndef BLOCK_DMG_H
 #define BLOCK_DMG_H
 
-#include "qemu/osdep.h"
 #include "qemu-common.h"
 #include "block/block_int.h"
 #include <zlib.h>
-- 
2.15.0.rc0

[Qemu-devel] [PATCH v3 12/42] misc: remove headers implicitly included

[Philippe Mathieu-Daudé]

applied using ./scripts/clean-includes

Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
---
 hw/audio/fmopl.h             | 1 -
 bsd-user/main.c              | 1 -
 chardev/wctablet.c           | 4 ----
 hw/scsi/vhost-user-scsi.c    | 1 -
 linux-user/main.c            | 1 -
 net/colo-compare.c           | 1 -
 tests/test-aio-multithread.c | 1 -
 tests/test-clone-visitor.c   | 1 -
 tests/vmgenid-test.c         | 3 ---
 9 files changed, 14 deletions(-)

diff --git a/hw/audio/fmopl.h b/hw/audio/fmopl.h
index f4065f425c..e7e578a48e 100644
--- a/hw/audio/fmopl.h
+++ b/hw/audio/fmopl.h
@@ -1,7 +1,6 @@
 #ifndef FMOPL_H
 #define FMOPL_H
 
-#include <stdint.h>
 
 typedef void (*OPL_TIMERHANDLER)(void *param, int channel, double interval_Sec);
 
diff --git a/bsd-user/main.c b/bsd-user/main.c
index 836daac15c..bf27a5b44f 100644
--- a/bsd-user/main.c
+++ b/bsd-user/main.c
@@ -32,7 +32,6 @@
 #include "qemu/envlist.h"
 #include "exec/log.h"
 #include "trace/control.h"
-#include "glib-compat.h"
 
 int singlestep;
 unsigned long mmap_min_addr;
diff --git a/chardev/wctablet.c b/chardev/wctablet.c
index 6c13c2c58a..969d014574 100644
--- a/chardev/wctablet.c
+++ b/chardev/wctablet.c
@@ -25,10 +25,6 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-#include <stdlib.h>
-#include <string.h>
-#include <sys/time.h>
-#include <time.h>
 
 #include "qemu/osdep.h"
 #include "qemu-common.h"
diff --git a/hw/scsi/vhost-user-scsi.c b/hw/scsi/vhost-user-scsi.c
index 500fa6a067..9efa26da7d 100644
--- a/hw/scsi/vhost-user-scsi.c
+++ b/hw/scsi/vhost-user-scsi.c
@@ -18,7 +18,6 @@
 #include "qemu/osdep.h"
 #include "qapi/error.h"
 #include "qemu/error-report.h"
-#include "qemu/typedefs.h"
 #include "qom/object.h"
 #include "hw/fw-path-provider.h"
 #include "hw/qdev-core.h"
diff --git a/linux-user/main.c b/linux-user/main.c
index 829f974662..85d7f6d3f7 100644
--- a/linux-user/main.c
+++ b/linux-user/main.c
@@ -35,7 +35,6 @@
 #include "elf.h"
 #include "exec/log.h"
 #include "trace/control.h"
-#include "glib-compat.h"
 
 char *exec_path;
 
diff --git a/net/colo-compare.c b/net/colo-compare.c
index b3f35d729a..27ea7d4de9 100644
--- a/net/colo-compare.c
+++ b/net/colo-compare.c
@@ -23,7 +23,6 @@
 #include "qom/object_interfaces.h"
 #include "qemu/iov.h"
 #include "qom/object.h"
-#include "qemu/typedefs.h"
 #include "net/queue.h"
 #include "chardev/char-fe.h"
 #include "qemu/sockets.h"
diff --git a/tests/test-aio-multithread.c b/tests/test-aio-multithread.c
index 549d784915..ad78c6b28b 100644
--- a/tests/test-aio-multithread.c
+++ b/tests/test-aio-multithread.c
@@ -11,7 +11,6 @@
  */
 
 #include "qemu/osdep.h"
-#include <glib.h>
 #include "block/aio.h"
 #include "qapi/error.h"
 #include "qemu/coroutine.h"
diff --git a/tests/test-clone-visitor.c b/tests/test-clone-visitor.c
index 96982163e4..ac6afc562e 100644
--- a/tests/test-clone-visitor.c
+++ b/tests/test-clone-visitor.c
@@ -8,7 +8,6 @@
  */
 
 #include "qemu/osdep.h"
-#include <glib.h>
 
 #include "qemu-common.h"
 #include "qapi/clone-visitor.h"
diff --git a/tests/vmgenid-test.c b/tests/vmgenid-test.c
index 918c82c82a..2f96ad453e 100644
--- a/tests/vmgenid-test.c
+++ b/tests/vmgenid-test.c
@@ -8,9 +8,6 @@
  * See the COPYING file in the top-level directory.
  */
 
-#include <glib.h>
-#include <string.h>
-#include <unistd.h>
 #include "qemu/osdep.h"
 #include "qemu/bitmap.h"
 #include "qemu/uuid.h"
-- 
2.15.0.rc0

[Qemu-devel] [PATCH v3 13/42] misc: remove duplicated includes

[Philippe Mathieu-Daudé]

exec: housekeeping (funny since 02d0e095031)

applied using ./scripts/clean-includes

Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Acked-by: Cornelia Huck <cohuck@redhat.com>
Reviewed-by: Anthony PERARD <anthony.perard@citrix.com>
---
 accel/tcg/translate-all.c          | 1 -
 exec.c                             | 3 ---
 hw/arm/spitz.c                     | 1 -
 hw/char/xen_console.c              | 1 -
 hw/core/machine.c                  | 1 -
 hw/s390x/css.c                     | 1 -
 target/openrisc/exception_helper.c | 1 -
 tests/vhost-user-test.c            | 1 -
 util/qemu-sockets.c                | 1 -
 vl.c                               | 1 -
 10 files changed, 12 deletions(-)

diff --git a/accel/tcg/translate-all.c b/accel/tcg/translate-all.c
index c5ce99d549..f81afb87e6 100644
--- a/accel/tcg/translate-all.c
+++ b/accel/tcg/translate-all.c
@@ -31,7 +31,6 @@
 #include "tcg.h"
 #if defined(CONFIG_USER_ONLY)
 #include "qemu.h"
-#include "exec/exec-all.h"
 #if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
 #include <sys/param.h>
 #if __FreeBSD_version >= 700104
diff --git a/exec.c b/exec.c
index 6378714a2b..c19061465f 100644
--- a/exec.c
+++ b/exec.c
@@ -18,8 +18,6 @@
  */
 #include "qemu/osdep.h"
 #include "qapi/error.h"
-#ifndef _WIN32
-#endif
 
 #include "qemu/cutils.h"
 #include "cpu.h"
@@ -51,7 +49,6 @@
 #include "trace-root.h"
 
 #ifdef CONFIG_FALLOCATE_PUNCH_HOLE
-#include <fcntl.h>
 #include <linux/falloc.h>
 #endif
 
diff --git a/hw/arm/spitz.c b/hw/arm/spitz.c
index feccdb00d3..ac1e15cbbc 100644
--- a/hw/arm/spitz.c
+++ b/hw/arm/spitz.c
@@ -29,7 +29,6 @@
 #include "sysemu/block-backend.h"
 #include "hw/sysbus.h"
 #include "exec/address-spaces.h"
-#include "sysemu/sysemu.h"
 #include "cpu.h"
 
 #undef REG_FMT
diff --git a/hw/char/xen_console.c b/hw/char/xen_console.c
index 3643dfe067..5e68326c19 100644
--- a/hw/char/xen_console.c
+++ b/hw/char/xen_console.c
@@ -27,7 +27,6 @@
 #include "hw/hw.h"
 #include "chardev/char-fe.h"
 #include "hw/xen/xen_backend.h"
-#include "qapi/error.h"
 
 #include <xen/io/console.h>
 
diff --git a/hw/core/machine.c b/hw/core/machine.c
index 36c2fb069c..c857f3f934 100644
--- a/hw/core/machine.c
+++ b/hw/core/machine.c
@@ -20,7 +20,6 @@
 #include "sysemu/numa.h"
 #include "qemu/error-report.h"
 #include "qemu/cutils.h"
-#include "sysemu/numa.h"
 #include "sysemu/qtest.h"
 
 static char *machine_get_accel(Object *obj, Error **errp)
diff --git a/hw/s390x/css.c b/hw/s390x/css.c
index 35683d7954..2f4d40a5fb 100644
--- a/hw/s390x/css.c
+++ b/hw/s390x/css.c
@@ -13,7 +13,6 @@
 #include "qapi/error.h"
 #include "qapi/visitor.h"
 #include "hw/qdev.h"
-#include "qemu/error-report.h"
 #include "qemu/bitops.h"
 #include "qemu/error-report.h"
 #include "exec/address-spaces.h"
diff --git a/target/openrisc/exception_helper.c b/target/openrisc/exception_helper.c
index a8a5f69b05..6073a5b21c 100644
--- a/target/openrisc/exception_helper.c
+++ b/target/openrisc/exception_helper.c
@@ -21,7 +21,6 @@
 #include "cpu.h"
 #include "exec/exec-all.h"
 #include "exec/helper-proto.h"
-#include "exec/exec-all.h"
 #include "exception.h"
 
 void HELPER(exception)(CPUOpenRISCState *env, uint32_t excp)
diff --git a/tests/vhost-user-test.c b/tests/vhost-user-test.c
index 4b98018478..e2c89ed376 100644
--- a/tests/vhost-user-test.c
+++ b/tests/vhost-user-test.c
@@ -21,7 +21,6 @@
 #include "libqos/libqos.h"
 #include "libqos/pci-pc.h"
 #include "libqos/virtio-pci.h"
-#include "qapi/error.h"
 
 #include "libqos/malloc-pc.h"
 #include "hw/virtio/virtio-net.h"
diff --git a/util/qemu-sockets.c b/util/qemu-sockets.c
index d149383bb9..d700caef45 100644
--- a/util/qemu-sockets.c
+++ b/util/qemu-sockets.c
@@ -26,7 +26,6 @@
 #include "qapi/error.h"
 #include "qemu/sockets.h"
 #include "qemu/main-loop.h"
-#include "qapi/clone-visitor.h"
 #include "qapi/qobject-input-visitor.h"
 #include "qapi/qobject-output-visitor.h"
 #include "qapi-visit.h"
diff --git a/vl.c b/vl.c
index 0723835bbf..0d1f612629 100644
--- a/vl.c
+++ b/vl.c
@@ -95,7 +95,6 @@ int main(int argc, char **argv)
 #include "sysemu/kvm.h"
 #include "sysemu/hax.h"
 #include "qapi/qobject-input-visitor.h"
-#include "qapi/qobject-input-visitor.h"
 #include "qapi-visit.h"
 #include "qapi/qmp/qjson.h"
 #include "qemu/option.h"
-- 
2.15.0.rc0

[Qemu-devel] [PATCH v3 14/42] ppc: remove duplicated includes

[Philippe Mathieu-Daudé]

applied using ./scripts/clean-includes

not needed since 7ebaf795560

Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Acked-by: David Gibson <david@gibson.dropbear.id.au>
---
 hw/ppc/spapr_hcall.c | 1 -
 target/ppc/kvm.c     | 3 ---
 2 files changed, 4 deletions(-)

diff --git a/hw/ppc/spapr_hcall.c b/hw/ppc/spapr_hcall.c
index 8d72bb7c1c..61e2fcb77d 100644
--- a/hw/ppc/spapr_hcall.c
+++ b/hw/ppc/spapr_hcall.c
@@ -13,7 +13,6 @@
 #include "trace.h"
 #include "kvm_ppc.h"
 #include "hw/ppc/spapr_ovec.h"
-#include "qemu/error-report.h"
 #include "mmu-book3s-v3.h"
 
 struct SPRSyncState {
diff --git a/target/ppc/kvm.c b/target/ppc/kvm.c
index 171d3d8040..f4f4f20960 100644
--- a/target/ppc/kvm.c
+++ b/target/ppc/kvm.c
@@ -47,9 +47,6 @@
 #include "sysemu/hostmem.h"
 #include "qemu/cutils.h"
 #include "qemu/mmap-alloc.h"
-#if defined(TARGET_PPC64)
-#include "hw/ppc/spapr_cpu_core.h"
-#endif
 #include "elf.h"
 #include "sysemu/kvm_int.h"
 
-- 
2.15.0.rc0

[Qemu-devel] [PATCH v3 15/42] i386/hax: remove duplicated includes

[Philippe Mathieu-Daudé]

applied using ./scripts/clean-includes

Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
---
 include/sysemu/hax.h      | 1 -
 target/i386/hax-darwin.h  | 3 ---
 target/i386/hax-windows.h | 2 --
 target/i386/hax-darwin.c  | 6 +-----
 4 files changed, 1 insertion(+), 11 deletions(-)

diff --git a/include/sysemu/hax.h b/include/sysemu/hax.h
index 232a68ab1b..f252399623 100644
--- a/include/sysemu/hax.h
+++ b/include/sysemu/hax.h
@@ -22,7 +22,6 @@
 #ifndef QEMU_HAX_H
 #define QEMU_HAX_H
 
-#include "config-host.h"
 #include "qemu-common.h"
 
 int hax_sync_vcpus(void);
diff --git a/target/i386/hax-darwin.h b/target/i386/hax-darwin.h
index 0c0968b77d..fb8e25a096 100644
--- a/target/i386/hax-darwin.h
+++ b/target/i386/hax-darwin.h
@@ -15,10 +15,7 @@
 #ifndef TARGET_I386_HAX_DARWIN_H
 #define TARGET_I386_HAX_DARWIN_H
 
-#include <sys/types.h>
 #include <sys/ioctl.h>
-#include <sys/mman.h>
-#include <stdarg.h>
 
 #define HAX_INVALID_FD  (-1)
 static inline int hax_invalid_fd(hax_fd fd)
diff --git a/target/i386/hax-windows.h b/target/i386/hax-windows.h
index 1d8f68de91..f7c3e99246 100644
--- a/target/i386/hax-windows.h
+++ b/target/i386/hax-windows.h
@@ -24,8 +24,6 @@
 #include <memory.h>
 #include <malloc.h>
 #include <winioctl.h>
-#include <string.h>
-#include <stdio.h>
 #include <windef.h>
 
 #define HAX_INVALID_FD INVALID_HANDLE_VALUE
diff --git a/target/i386/hax-darwin.c b/target/i386/hax-darwin.c
index 1c5bbd0a2d..ee9417454c 100644
--- a/target/i386/hax-darwin.c
+++ b/target/i386/hax-darwin.c
@@ -11,13 +11,9 @@
  */
 
 /* HAX module interface - darwin version */
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-#include <errno.h>
+#include "qemu/osdep.h"
 #include <sys/ioctl.h>
 
-#include "qemu/osdep.h"
 #include "target/i386/hax-i386.h"
 
 hax_fd hax_mod_open(void)
-- 
2.15.0.rc0

[Qemu-devel] [PATCH v3 16/42] i386/hax: remove duplicated include

[Philippe Mathieu-Daudé]

this file in include in "target/i386/hax-i386.h":

    #ifdef CONFIG_WIN32
    #include "target/i386/hax-windows.h"
    #endif

which guaranty than sysemu/os-win32.h is previously included (CONFIG_WIN32)

Suggested-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
---
 target/i386/hax-windows.h | 1 -
 1 file changed, 1 deletion(-)

diff --git a/target/i386/hax-windows.h b/target/i386/hax-windows.h
index f7c3e99246..004f867694 100644
--- a/target/i386/hax-windows.h
+++ b/target/i386/hax-windows.h
@@ -20,7 +20,6 @@
 #ifndef TARGET_I386_HAX_WINDOWS_H
 #define TARGET_I386_HAX_WINDOWS_H
 
-#include <windows.h>
 #include <memory.h>
 #include <malloc.h>
 #include <winioctl.h>
-- 
2.15.0.rc0

[Qemu-devel] [PATCH v3 17/42] nios2: remove duplicated includes (in code commented out)

[Philippe Mathieu-Daudé]

applied using ./scripts/clean-includes

Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
---
 target/nios2/cpu.h       | 1 -
 disas/nios2.c            | 3 ---
 hw/nios2/boot.c          | 1 -
 target/nios2/helper.c    | 5 +----
 target/nios2/op_helper.c | 1 +
 target/nios2/translate.c | 1 +
 6 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/target/nios2/cpu.h b/target/nios2/cpu.h
index 50d803a217..fda02c39b9 100644
--- a/target/nios2/cpu.h
+++ b/target/nios2/cpu.h
@@ -20,7 +20,6 @@
 #ifndef CPU_NIOS2_H
 #define CPU_NIOS2_H
 
-#include "qemu/osdep.h"
 #include "qemu-common.h"
 
 #define TARGET_LONG_BITS 32
diff --git a/disas/nios2.c b/disas/nios2.c
index b342936d21..de11f04cc4 100644
--- a/disas/nios2.c
+++ b/disas/nios2.c
@@ -1756,7 +1756,6 @@ extern const int nios2_num_r2_reg_range_mappings;
 #endif /* _NIOS2_H */
 
 /*#include "sysdep.h"
-#include <stdio.h>
 #include "opcode/nios2.h"
 */
 /* Register string table */
@@ -2521,8 +2520,6 @@ const int nios2_num_r2_reg_range_mappings = 8;
 #include "dis-asm.h"
 #include "opcode/nios2.h"
 #include "libiberty.h"
-#include <string.h>
-#include <assert.h>
 */
 /* No symbol table is available when this code runs out in an embedded
    system as when it is used for disassembler support in a monitor.  */
diff --git a/hw/nios2/boot.c b/hw/nios2/boot.c
index 2b31f5b844..94f436e7fb 100644
--- a/hw/nios2/boot.c
+++ b/hw/nios2/boot.c
@@ -34,7 +34,6 @@
 #include "qemu/option.h"
 #include "qemu/config-file.h"
 #include "qemu/error-report.h"
-#include "qemu-common.h"
 #include "sysemu/device_tree.h"
 #include "sysemu/sysemu.h"
 #include "hw/loader.h"
diff --git a/target/nios2/helper.c b/target/nios2/helper.c
index ef9ee05798..9f741a8f19 100644
--- a/target/nios2/helper.c
+++ b/target/nios2/helper.c
@@ -18,12 +18,9 @@
  * <http://www.gnu.org/licenses/lgpl-2.1.html>
  */
 
-#include <stdio.h>
-#include <string.h>
-#include <assert.h>
+#include "qemu/osdep.h"
 
 #include "cpu.h"
-#include "qemu/osdep.h"
 #include "qemu/host-utils.h"
 #include "qapi/error.h"
 #include "exec/exec-all.h"
diff --git a/target/nios2/op_helper.c b/target/nios2/op_helper.c
index efb1c489c9..c853aeae02 100644
--- a/target/nios2/op_helper.c
+++ b/target/nios2/op_helper.c
@@ -18,6 +18,7 @@
  * <http://www.gnu.org/licenses/lgpl-2.1.html>
  */
 
+#include "qemu/osdep.h"
 #include "cpu.h"
 #include "exec/helper-proto.h"
 #include "exec/cpu_ldst.h"
diff --git a/target/nios2/translate.c b/target/nios2/translate.c
index 6b0961837d..796d399bd1 100644
--- a/target/nios2/translate.c
+++ b/target/nios2/translate.c
@@ -21,6 +21,7 @@
  * <http://www.gnu.org/licenses/lgpl-2.1.html>
  */
 
+#include "qemu/osdep.h"
 #include "cpu.h"
 #include "tcg-op.h"
 #include "exec/exec-all.h"
-- 
2.15.0.rc0

[Qemu-devel] [PATCH v3 18/42] misc: avoid "include/" in include path

[Philippe Mathieu-Daudé]

Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
---
 hw/input/adb.c      | 2 +-
 hw/ssi/aspeed_smc.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/hw/input/adb.c b/hw/input/adb.c
index fcca3a8eb9..924a3f9fd5 100644
--- a/hw/input/adb.c
+++ b/hw/input/adb.c
@@ -24,8 +24,8 @@
 #include "qemu/osdep.h"
 #include "hw/hw.h"
 #include "hw/input/adb.h"
+#include "hw/input/adb-keys.h"
 #include "ui/console.h"
-#include "include/hw/input/adb-keys.h"
 #include "ui/input.h"
 #include "sysemu/sysemu.h"
 
diff --git a/hw/ssi/aspeed_smc.c b/hw/ssi/aspeed_smc.c
index cb515730c5..992617fd3a 100644
--- a/hw/ssi/aspeed_smc.c
+++ b/hw/ssi/aspeed_smc.c
@@ -26,7 +26,7 @@
 #include "hw/sysbus.h"
 #include "sysemu/sysemu.h"
 #include "qemu/log.h"
-#include "include/qemu/error-report.h"
+#include "qemu/error-report.h"
 #include "exec/address-spaces.h"
 
 #include "hw/ssi/aspeed_smc.h"
-- 
2.15.0.rc0

[Qemu-devel] [PATCH v3 19/42] numa: remove unused #include

[Philippe Mathieu-Daudé]

Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
---
 numa.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/numa.c b/numa.c
index 100a67febf..ebc553b5d9 100644
--- a/numa.c
+++ b/numa.c
@@ -29,7 +29,6 @@
 #include "qemu/bitmap.h"
 #include "qom/cpu.h"
 #include "qemu/error-report.h"
-#include "include/exec/cpu-common.h" /* for RAM_ADDR_FMT */
 #include "qapi-visit.h"
 #include "qapi/opts-visitor.h"
 #include "hw/boards.h"
-- 
2.15.0.rc0

[Qemu-devel] [PATCH v3 20/42] hw/input/vmmouse: remove unused #include

[Philippe Mathieu-Daudé]

Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
---
 hw/input/vmmouse.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/hw/input/vmmouse.c b/hw/input/vmmouse.c
index b6d22086f4..65ef55329e 100644
--- a/hw/input/vmmouse.c
+++ b/hw/input/vmmouse.c
@@ -24,7 +24,6 @@
 #include "qemu/osdep.h"
 #include "hw/hw.h"
 #include "ui/console.h"
-#include "hw/input/ps2.h"
 #include "hw/i386/pc.h"
 #include "hw/qdev.h"
 
-- 
2.15.0.rc0

[Qemu-devel] [PATCH v3 21/42] hw/misc/pvpanic: remove unused #include

[Philippe Mathieu-Daudé]

Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
---
 hw/misc/pvpanic.c | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/hw/misc/pvpanic.c b/hw/misc/pvpanic.c
index 2b1e9a6450..3a0e4ba828 100644
--- a/hw/misc/pvpanic.c
+++ b/hw/misc/pvpanic.c
@@ -13,14 +13,11 @@
  */
 
 #include "qemu/osdep.h"
-#include "qapi/qmp/qobject.h"
-#include "qapi/qmp/qjson.h"
 #include "sysemu/sysemu.h"
 #include "qemu/log.h"
 
 #include "hw/nvram/fw_cfg.h"
 #include "hw/i386/pc.h"
-#include "qapi-event.h"
 
 /* The bit of supported pv event */
 #define PVPANIC_F_PANICKED      0
-- 
2.15.0.rc0

[Qemu-devel] [PATCH v3 22/42] hw/ssi/aspeed_smc: remove unused #include

[Philippe Mathieu-Daudé]

Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
---
 hw/ssi/aspeed_smc.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/hw/ssi/aspeed_smc.c b/hw/ssi/aspeed_smc.c
index 992617fd3a..5059396bc6 100644
--- a/hw/ssi/aspeed_smc.c
+++ b/hw/ssi/aspeed_smc.c
@@ -27,7 +27,6 @@
 #include "sysemu/sysemu.h"
 #include "qemu/log.h"
 #include "qemu/error-report.h"
-#include "exec/address-spaces.h"
 
 #include "hw/ssi/aspeed_smc.h"
 
-- 
2.15.0.rc0

[Qemu-devel] [PATCH v3 23/42] amd_iommu: avoid needless includes in header file

[Philippe Mathieu-Daudé]

instead move them to the source file

Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Thomas Huth <thuth@redhat.com>
---
 hw/i386/amd_iommu.h | 5 -----
 hw/i386/amd_iommu.c | 5 ++++-
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/hw/i386/amd_iommu.h b/hw/i386/amd_iommu.h
index d370ae3549..aeef802364 100644
--- a/hw/i386/amd_iommu.h
+++ b/hw/i386/amd_iommu.h
@@ -23,11 +23,6 @@
 
 #include "hw/hw.h"
 #include "hw/pci/pci.h"
-#include "hw/pci/msi.h"
-#include "hw/sysbus.h"
-#include "sysemu/dma.h"
-#include "hw/i386/pc.h"
-#include "hw/pci/pci_bus.h"
 #include "hw/i386/x86-iommu.h"
 
 /* Capability registers */
diff --git a/hw/i386/amd_iommu.c b/hw/i386/amd_iommu.c
index ad8155ca4c..eeaf0e0aa8 100644
--- a/hw/i386/amd_iommu.c
+++ b/hw/i386/amd_iommu.c
@@ -20,7 +20,10 @@
  * Cache implementation inspired by hw/i386/intel_iommu.c
  */
 #include "qemu/osdep.h"
-#include "hw/i386/amd_iommu.h"
+#include "hw/i386/pc.h"
+#include "hw/pci/msi.h"
+#include "hw/pci/pci_bus.h"
+#include "amd_iommu.h"
 #include "qapi/error.h"
 #include "qemu/error-report.h"
 #include "trace.h"
-- 
2.15.0.rc0

[Qemu-devel] [PATCH v3 24/42] misc: remove old i386 dependency

[Philippe Mathieu-Daudé]

Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Reviewed-by: Anthony PERARD <anthony.perard@citrix.com>
---
 hw/audio/pcspk.c                    | 1 -
 hw/i386/kvm/pci-assign.c            | 1 -
 hw/i386/pci-assign-load-rom.c       | 2 --
 hw/i386/xen/xen_platform.c          | 1 -
 hw/isa/vt82c686.c                   | 1 -
 hw/misc/ivshmem.c                   | 1 -
 hw/misc/sga.c                       | 1 -
 hw/pci-bridge/pci_expander_bridge.c | 1 -
 monitor.c                           | 1 -
 9 files changed, 10 deletions(-)

diff --git a/hw/audio/pcspk.c b/hw/audio/pcspk.c
index 0206f7399b..908696d483 100644
--- a/hw/audio/pcspk.c
+++ b/hw/audio/pcspk.c
@@ -24,7 +24,6 @@
 
 #include "qemu/osdep.h"
 #include "hw/hw.h"
-#include "hw/i386/pc.h"
 #include "hw/isa/isa.h"
 #include "hw/audio/soundhw.h"
 #include "audio/audio.h"
diff --git a/hw/i386/kvm/pci-assign.c b/hw/i386/kvm/pci-assign.c
index d8559d8342..da954d504c 100644
--- a/hw/i386/kvm/pci-assign.c
+++ b/hw/i386/kvm/pci-assign.c
@@ -25,7 +25,6 @@
 #include <linux/kvm.h>
 #include "qapi/error.h"
 #include "hw/hw.h"
-#include "hw/i386/pc.h"
 #include "qemu/error-report.h"
 #include "ui/console.h"
 #include "hw/loader.h"
diff --git a/hw/i386/pci-assign-load-rom.c b/hw/i386/pci-assign-load-rom.c
index 43429b66be..cd17a93de8 100644
--- a/hw/i386/pci-assign-load-rom.c
+++ b/hw/i386/pci-assign-load-rom.c
@@ -4,9 +4,7 @@
 #include "qemu/osdep.h"
 #include "qapi/error.h"
 #include "hw/hw.h"
-#include "hw/i386/pc.h"
 #include "qemu/error-report.h"
-#include "ui/console.h"
 #include "hw/loader.h"
 #include "monitor/monitor.h"
 #include "qemu/range.h"
diff --git a/hw/i386/xen/xen_platform.c b/hw/i386/xen/xen_platform.c
index 056b87de0b..fc8623c90b 100644
--- a/hw/i386/xen/xen_platform.c
+++ b/hw/i386/xen/xen_platform.c
@@ -26,7 +26,6 @@
 #include "qemu/osdep.h"
 #include "qapi/error.h"
 #include "hw/hw.h"
-#include "hw/i386/pc.h"
 #include "hw/ide.h"
 #include "hw/pci/pci.h"
 #include "hw/irq.h"
diff --git a/hw/isa/vt82c686.c b/hw/isa/vt82c686.c
index c129985e2a..4084b32be9 100644
--- a/hw/isa/vt82c686.c
+++ b/hw/isa/vt82c686.c
@@ -12,7 +12,6 @@
 
 #include "qemu/osdep.h"
 #include "hw/hw.h"
-#include "hw/i386/pc.h"
 #include "hw/isa/vt82c686.h"
 #include "hw/i2c/i2c.h"
 #include "hw/i2c/smbus.h"
diff --git a/hw/misc/ivshmem.c b/hw/misc/ivshmem.c
index a5a46827fe..4919011f38 100644
--- a/hw/misc/ivshmem.c
+++ b/hw/misc/ivshmem.c
@@ -20,7 +20,6 @@
 #include "qapi/error.h"
 #include "qemu/cutils.h"
 #include "hw/hw.h"
-#include "hw/i386/pc.h"
 #include "hw/pci/pci.h"
 #include "hw/pci/msi.h"
 #include "hw/pci/msix.h"
diff --git a/hw/misc/sga.c b/hw/misc/sga.c
index 03b006d6f0..97fd63f176 100644
--- a/hw/misc/sga.c
+++ b/hw/misc/sga.c
@@ -26,7 +26,6 @@
  */
 #include "qemu/osdep.h"
 #include "hw/pci/pci.h"
-#include "hw/i386/pc.h"
 #include "hw/loader.h"
 #include "sysemu/sysemu.h"
 
diff --git a/hw/pci-bridge/pci_expander_bridge.c b/hw/pci-bridge/pci_expander_bridge.c
index 8c8ac737ad..9e799dc10f 100644
--- a/hw/pci-bridge/pci_expander_bridge.c
+++ b/hw/pci-bridge/pci_expander_bridge.c
@@ -16,7 +16,6 @@
 #include "hw/pci/pci_bus.h"
 #include "hw/pci/pci_host.h"
 #include "hw/pci/pci_bridge.h"
-#include "hw/i386/pc.h"
 #include "qemu/range.h"
 #include "qemu/error-report.h"
 #include "sysemu/numa.h"
diff --git a/monitor.c b/monitor.c
index fe0d1bdbb4..54737d20e7 100644
--- a/monitor.c
+++ b/monitor.c
@@ -28,7 +28,6 @@
 #include "hw/hw.h"
 #include "monitor/qdev.h"
 #include "hw/usb.h"
-#include "hw/i386/pc.h"
 #include "hw/pci/pci.h"
 #include "sysemu/watchdog.h"
 #include "hw/loader.h"
-- 
2.15.0.rc0

[Qemu-devel] [PATCH v3 25/42] hw/ide: remove old i386 dependency

[Philippe Mathieu-Daudé]

and remove a duplicated include

Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Acked-by: John Snow <jsnow@redhat.com>
---
 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 -
 9 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/hw/ide/ahci.c b/hw/ide/ahci.c
index 32d1296a64..2634f8db3d 100644
--- a/hw/ide/ahci.c
+++ b/hw/ide/ahci.c
@@ -24,7 +24,6 @@
 #include "qemu/osdep.h"
 #include "hw/hw.h"
 #include "hw/pci/msi.h"
-#include "hw/i386/pc.h"
 #include "hw/pci/pci.h"
 
 #include "qemu/error-report.h"
diff --git a/hw/ide/cmd646.c b/hw/ide/cmd646.c
index 86b2a8f504..65aff518ec 100644
--- a/hw/ide/cmd646.c
+++ b/hw/ide/cmd646.c
@@ -24,7 +24,6 @@
  */
 #include "qemu/osdep.h"
 #include "hw/hw.h"
-#include "hw/i386/pc.h"
 #include "hw/pci/pci.h"
 #include "hw/isa/isa.h"
 #include "sysemu/block-backend.h"
diff --git a/hw/ide/core.c b/hw/ide/core.c
index 5f1cd3b91f..ceb1e32a32 100644
--- a/hw/ide/core.c
+++ b/hw/ide/core.c
@@ -24,17 +24,16 @@
  */
 #include "qemu/osdep.h"
 #include "hw/hw.h"
-#include "hw/i386/pc.h"
 #include "hw/pci/pci.h"
 #include "hw/isa/isa.h"
 #include "qemu/error-report.h"
 #include "qemu/timer.h"
 #include "sysemu/sysemu.h"
+#include "sysemu/blockdev.h"
 #include "sysemu/dma.h"
 #include "hw/block/block.h"
 #include "sysemu/block-backend.h"
 #include "qemu/cutils.h"
-#include "qemu/error-report.h"
 
 #include "hw/ide/internal.h"
 #include "trace.h"
diff --git a/hw/ide/ich.c b/hw/ide/ich.c
index 8dd0ced6b3..c01b24ecbe 100644
--- a/hw/ide/ich.c
+++ b/hw/ide/ich.c
@@ -63,7 +63,6 @@
 #include "qemu/osdep.h"
 #include "hw/hw.h"
 #include "hw/pci/msi.h"
-#include "hw/i386/pc.h"
 #include "hw/pci/pci.h"
 #include "hw/isa/isa.h"
 #include "sysemu/block-backend.h"
diff --git a/hw/ide/isa.c b/hw/ide/isa.c
index 40213d662c..9fb24fc92b 100644
--- a/hw/ide/isa.c
+++ b/hw/ide/isa.c
@@ -24,7 +24,6 @@
  */
 #include "qemu/osdep.h"
 #include "hw/hw.h"
-#include "hw/i386/pc.h"
 #include "hw/isa/isa.h"
 #include "sysemu/block-backend.h"
 #include "sysemu/dma.h"
diff --git a/hw/ide/microdrive.c b/hw/ide/microdrive.c
index 17917c0b30..fde4d4645e 100644
--- a/hw/ide/microdrive.c
+++ b/hw/ide/microdrive.c
@@ -24,7 +24,6 @@
  */
 #include "qemu/osdep.h"
 #include "hw/hw.h"
-#include "hw/i386/pc.h"
 #include "hw/pcmcia.h"
 #include "sysemu/block-backend.h"
 #include "sysemu/dma.h"
diff --git a/hw/ide/pci.c b/hw/ide/pci.c
index 25f1d36f3a..1ab0a892d0 100644
--- a/hw/ide/pci.c
+++ b/hw/ide/pci.c
@@ -24,7 +24,6 @@
  */
 #include "qemu/osdep.h"
 #include "hw/hw.h"
-#include "hw/i386/pc.h"
 #include "hw/pci/pci.h"
 #include "hw/isa/isa.h"
 #include "sysemu/block-backend.h"
diff --git a/hw/ide/piix.c b/hw/ide/piix.c
index dfb21f65fa..a3afe1fd29 100644
--- a/hw/ide/piix.c
+++ b/hw/ide/piix.c
@@ -25,11 +25,11 @@
 
 #include "qemu/osdep.h"
 #include "hw/hw.h"
-#include "hw/i386/pc.h"
 #include "hw/pci/pci.h"
 #include "hw/isa/isa.h"
 #include "sysemu/block-backend.h"
 #include "sysemu/sysemu.h"
+#include "sysemu/blockdev.h"
 #include "sysemu/dma.h"
 
 #include "hw/ide/pci.h"
diff --git a/hw/ide/via.c b/hw/ide/via.c
index 35c3059325..117ac4d95e 100644
--- a/hw/ide/via.c
+++ b/hw/ide/via.c
@@ -25,7 +25,6 @@
  */
 #include "qemu/osdep.h"
 #include "hw/hw.h"
-#include "hw/i386/pc.h"
 #include "hw/pci/pci.h"
 #include "hw/isa/isa.h"
 #include "sysemu/block-backend.h"
-- 
2.15.0.rc0

[Qemu-devel] [PATCH v3 26/42] hw/ipmi: remove old i386 dependency

[Philippe Mathieu-Daudé]

Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Corey Minyard <cminyard@mvista.com>
Tested-by: Corey Minyard <cminyard@mvista.com>
---
no IPMI entry!

 hw/ipmi/isa_ipmi_bt.c  | 1 -
 hw/ipmi/isa_ipmi_kcs.c | 1 -
 2 files changed, 2 deletions(-)

diff --git a/hw/ipmi/isa_ipmi_bt.c b/hw/ipmi/isa_ipmi_bt.c
index 2fcc3d2e7c..e098fd5206 100644
--- a/hw/ipmi/isa_ipmi_bt.c
+++ b/hw/ipmi/isa_ipmi_bt.c
@@ -26,7 +26,6 @@
 #include "hw/hw.h"
 #include "hw/ipmi/ipmi.h"
 #include "hw/isa/isa.h"
-#include "hw/i386/pc.h"
 
 /* Control register */
 #define IPMI_BT_CLR_WR_BIT         0
diff --git a/hw/ipmi/isa_ipmi_kcs.c b/hw/ipmi/isa_ipmi_kcs.c
index 80444977a0..689587b65d 100644
--- a/hw/ipmi/isa_ipmi_kcs.c
+++ b/hw/ipmi/isa_ipmi_kcs.c
@@ -26,7 +26,6 @@
 #include "hw/hw.h"
 #include "hw/ipmi/ipmi.h"
 #include "hw/isa/isa.h"
-#include "hw/i386/pc.h"
 
 #define IPMI_KCS_OBF_BIT        0
 #define IPMI_KCS_IBF_BIT        1
-- 
2.15.0.rc0

[Qemu-devel] [PATCH v3 27/42] hw/i2c: remove old i386 dependency

[Philippe Mathieu-Daudé]

Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Thomas Huth <thuth@redhat.com>
---
 hw/i2c/pm_smbus.c   | 1 -
 hw/i2c/smbus_ich9.c | 1 -
 2 files changed, 2 deletions(-)

diff --git a/hw/i2c/pm_smbus.c b/hw/i2c/pm_smbus.c
index 6fc3923f56..a044dd1b27 100644
--- a/hw/i2c/pm_smbus.c
+++ b/hw/i2c/pm_smbus.c
@@ -19,7 +19,6 @@
  */
 #include "qemu/osdep.h"
 #include "hw/hw.h"
-#include "hw/i386/pc.h"
 #include "hw/i2c/pm_smbus.h"
 #include "hw/i2c/smbus.h"
 
diff --git a/hw/i2c/smbus_ich9.c b/hw/i2c/smbus_ich9.c
index e47556c9d8..007cb6701d 100644
--- a/hw/i2c/smbus_ich9.c
+++ b/hw/i2c/smbus_ich9.c
@@ -26,7 +26,6 @@
  */
 #include "qemu/osdep.h"
 #include "hw/hw.h"
-#include "hw/i386/pc.h"
 #include "hw/i2c/pm_smbus.h"
 #include "hw/pci/pci.h"
 #include "sysemu/sysemu.h"
-- 
2.15.0.rc0

[Qemu-devel] [PATCH v3 28/42] hw/tpm: remove old i386 dependency

[Philippe Mathieu-Daudé]

Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Stefan Berger <stefanb@linux.vnet.ibm.com>
---
 hw/tpm/tpm_passthrough.c | 1 -
 hw/tpm/tpm_tis.c         | 1 -
 2 files changed, 2 deletions(-)

diff --git a/hw/tpm/tpm_passthrough.c b/hw/tpm/tpm_passthrough.c
index e6ace28b04..7201844657 100644
--- a/hw/tpm/tpm_passthrough.c
+++ b/hw/tpm/tpm_passthrough.c
@@ -29,7 +29,6 @@
 #include "sysemu/tpm_backend.h"
 #include "tpm_int.h"
 #include "hw/hw.h"
-#include "hw/i386/pc.h"
 #include "qapi/clone-visitor.h"
 #include "tpm_tis.h"
 #include "tpm_util.h"
diff --git a/hw/tpm/tpm_tis.c b/hw/tpm/tpm_tis.c
index d5118e7f60..b07a28aa29 100644
--- a/hw/tpm/tpm_tis.c
+++ b/hw/tpm/tpm_tis.c
@@ -28,7 +28,6 @@
 #include "sysemu/block-backend.h"
 #include "exec/address-spaces.h"
 #include "hw/hw.h"
-#include "hw/i386/pc.h"
 #include "hw/pci/pci_ids.h"
 #include "tpm_tis.h"
 #include "qapi/error.h"
-- 
2.15.0.rc0

[Qemu-devel] [PATCH v3 29/42] hw/virtio-balloon: remove old i386 dependency

[Philippe Mathieu-Daudé]

Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Thomas Huth <thuth@redhat.com>
---
 hw/virtio/virtio-balloon.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hw/virtio/virtio-balloon.c b/hw/virtio/virtio-balloon.c
index 37cde38982..14e08d20d0 100644
--- a/hw/virtio/virtio-balloon.c
+++ b/hw/virtio/virtio-balloon.c
@@ -18,7 +18,7 @@
 #include "qemu/timer.h"
 #include "qemu-common.h"
 #include "hw/virtio/virtio.h"
-#include "hw/i386/pc.h"
+#include "hw/mem/pc-dimm.h"
 #include "sysemu/balloon.h"
 #include "hw/virtio/virtio-balloon.h"
 #include "sysemu/kvm.h"
-- 
2.15.0.rc0

[Qemu-devel] [PATCH v3 30/42] hw/unicore32: restrict hw addr defines to source file

[Philippe Mathieu-Daudé]

and drop unused #includes

Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Thomas Huth <thuth@redhat.com>
---
 include/hw/unicore32/puv3.h | 10 ----------
 hw/unicore32/puv3.c         | 15 ++++++++++-----
 2 files changed, 10 insertions(+), 15 deletions(-)

diff --git a/include/hw/unicore32/puv3.h b/include/hw/unicore32/puv3.h
index 5a4839f8df..f587a1f622 100644
--- a/include/hw/unicore32/puv3.h
+++ b/include/hw/unicore32/puv3.h
@@ -14,16 +14,6 @@
 
 #define PUV3_REGS_OFFSET        (0x1000) /* 4K is reasonable */
 
-/* PKUnity System bus (AHB): 0xc0000000 - 0xedffffff (640MB) */
-#define PUV3_DMA_BASE           (0xc0200000) /* AHB-4 */
-
-/* PKUnity Peripheral bus (APB): 0xee000000 - 0xefffffff (128MB) */
-#define PUV3_GPIO_BASE          (0xee500000) /* APB-5 */
-#define PUV3_INTC_BASE          (0xee600000) /* APB-6 */
-#define PUV3_OST_BASE           (0xee800000) /* APB-8 */
-#define PUV3_PM_BASE            (0xeea00000) /* APB-10 */
-#define PUV3_PS2_BASE           (0xeeb00000) /* APB-11 */
-
 /* Hardware interrupts */
 #define PUV3_IRQS_NR            (32)
 
diff --git a/hw/unicore32/puv3.c b/hw/unicore32/puv3.c
index 504ea46211..11fbd3cb0d 100644
--- a/hw/unicore32/puv3.c
+++ b/hw/unicore32/puv3.c
@@ -11,16 +11,11 @@
 
 #include "qemu/osdep.h"
 #include "qapi/error.h"
-#include "qemu-common.h"
 #include "cpu.h"
 #include "ui/console.h"
-#include "elf.h"
-#include "exec/address-spaces.h"
-#include "hw/sysbus.h"
 #include "hw/boards.h"
 #include "hw/loader.h"
 #include "hw/i386/pc.h"
-#include "qemu/error-report.h"
 #include "sysemu/qtest.h"
 
 #undef DEBUG_PUV3
@@ -29,6 +24,16 @@
 #define KERNEL_LOAD_ADDR        0x03000000
 #define KERNEL_MAX_SIZE         0x00800000 /* Just a guess */
 
+/* PKUnity System bus (AHB): 0xc0000000 - 0xedffffff (640MB) */
+#define PUV3_DMA_BASE           (0xc0200000) /* AHB-4 */
+
+/* PKUnity Peripheral bus (APB): 0xee000000 - 0xefffffff (128MB) */
+#define PUV3_GPIO_BASE          (0xee500000) /* APB-5 */
+#define PUV3_INTC_BASE          (0xee600000) /* APB-6 */
+#define PUV3_OST_BASE           (0xee800000) /* APB-8 */
+#define PUV3_PM_BASE            (0xeea00000) /* APB-10 */
+#define PUV3_PS2_BASE           (0xeeb00000) /* APB-11 */
+
 static void puv3_intc_cpu_handler(void *opaque, int irq, int level)
 {
     UniCore32CPU *cpu = opaque;
-- 
2.15.0.rc0

[Qemu-devel] [PATCH v3 31/42] hw/timer/i8254: rename pit_init() -> i8254_pit_init()

[Philippe Mathieu-Daudé]

and remove the old i386/pc dependency

Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Hervé Poussineau <hpoussin@reactos.org>
---
 include/hw/timer/i8254.h          | 5 +++--
 include/hw/timer/i8254_internal.h | 2 +-
 hw/alpha/dp264.c                  | 2 +-
 hw/i386/pc.c                      | 2 +-
 hw/isa/i82378.c                   | 2 +-
 hw/mips/mips_fulong2e.c           | 2 +-
 hw/mips/mips_jazz.c               | 2 +-
 hw/mips/mips_malta.c              | 2 +-
 hw/mips/mips_r4k.c                | 2 +-
 hw/timer/i8254.c                  | 1 -
 hw/timer/i8254_common.c           | 1 -
 11 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/include/hw/timer/i8254.h b/include/hw/timer/i8254.h
index 5adae9fa44..5b12eb918e 100644
--- a/include/hw/timer/i8254.h
+++ b/include/hw/timer/i8254.h
@@ -26,6 +26,7 @@
 #define HW_I8254_H
 
 #include "hw/hw.h"
+#include "hw/qdev.h"
 #include "hw/isa/isa.h"
 
 #define PIT_FREQ 1193182
@@ -48,8 +49,8 @@ typedef struct PITChannelInfo {
 #define TYPE_I8254 "isa-pit"
 #define TYPE_KVM_I8254 "kvm-pit"
 
-static inline ISADevice *pit_init(ISABus *bus, int base, int isa_irq,
-                                  qemu_irq alt_irq)
+static inline ISADevice *i8254_pit_init(ISABus *bus, int base, int isa_irq,
+                                        qemu_irq alt_irq)
 {
     DeviceState *dev;
     ISADevice *d;
diff --git a/include/hw/timer/i8254_internal.h b/include/hw/timer/i8254_internal.h
index dc09cc0467..c37a438f82 100644
--- a/include/hw/timer/i8254_internal.h
+++ b/include/hw/timer/i8254_internal.h
@@ -26,8 +26,8 @@
 #define QEMU_I8254_INTERNAL_H
 
 #include "hw/hw.h"
-#include "hw/i386/pc.h"
 #include "hw/isa/isa.h"
+#include "qemu/timer.h"
 
 typedef struct PITChannelState {
     int count; /* can be 65536 */
diff --git a/hw/alpha/dp264.c b/hw/alpha/dp264.c
index 1b121306c2..1bd5243648 100644
--- a/hw/alpha/dp264.c
+++ b/hw/alpha/dp264.c
@@ -81,7 +81,7 @@ static void clipper_init(MachineState *machine)
     /* Since we have an SRM-compatible PALcode, use the SRM epoch.  */
     rtc_init(isa_bus, 1900, rtc_irq);
 
-    pit_init(isa_bus, 0x40, 0, NULL);
+    i8254_pit_init(isa_bus, 0x40, 0, NULL);
     isa_create_simple(isa_bus, "i8042");
 
     /* VGA setup.  Don't bother loading the bios.  */
diff --git a/hw/i386/pc.c b/hw/i386/pc.c
index 05985d4927..b565c6086c 100644
--- a/hw/i386/pc.c
+++ b/hw/i386/pc.c
@@ -1551,7 +1551,7 @@ void pc_basic_device_init(ISABus *isa_bus, qemu_irq *gsi,
         if (kvm_pit_in_kernel()) {
             pit = kvm_pit_init(isa_bus, 0x40);
         } else {
-            pit = pit_init(isa_bus, 0x40, pit_isa_irq, pit_alt_irq);
+            pit = i8254_pit_init(isa_bus, 0x40, pit_isa_irq, pit_alt_irq);
         }
         if (hpet) {
             /* connect PIT to output control line of the HPET */
diff --git a/hw/isa/i82378.c b/hw/isa/i82378.c
index d20ea4c2ee..a9c15f858d 100644
--- a/hw/isa/i82378.c
+++ b/hw/isa/i82378.c
@@ -97,7 +97,7 @@ static void i82378_realize(PCIDevice *pci, Error **errp)
     isa_bus_irqs(isabus, s->i8259);
 
     /* 1 82C54 (pit) */
-    isa = pit_init(isabus, 0x40, 0, NULL);
+    isa = i8254_pit_init(isabus, 0x40, 0, NULL);
 
     /* speaker */
     pcspk_init(isabus, isa);
diff --git a/hw/mips/mips_fulong2e.c b/hw/mips/mips_fulong2e.c
index 75318680e1..22e6c05fb5 100644
--- a/hw/mips/mips_fulong2e.c
+++ b/hw/mips/mips_fulong2e.c
@@ -363,7 +363,7 @@ static void mips_fulong2e_init(MachineState *machine)
     smbus_eeprom_init(smbus, 1, eeprom_spd, sizeof(eeprom_spd));
 
     /* init other devices */
-    pit = pit_init(isa_bus, 0x40, 0, NULL);
+    pit = i8254_pit_init(isa_bus, 0x40, 0, NULL);
     DMA_init(isa_bus, 0);
 
     /* Super I/O */
diff --git a/hw/mips/mips_jazz.c b/hw/mips/mips_jazz.c
index 7e6626dc88..5f37852499 100644
--- a/hw/mips/mips_jazz.c
+++ b/hw/mips/mips_jazz.c
@@ -222,7 +222,7 @@ static void mips_jazz_init(MachineState *machine,
     i8259 = i8259_init(isa_bus, env->irq[4]);
     isa_bus_irqs(isa_bus, i8259);
     DMA_init(isa_bus, 0);
-    pit = pit_init(isa_bus, 0x40, 0, NULL);
+    pit = i8254_pit_init(isa_bus, 0x40, 0, NULL);
     pcspk_init(isa_bus, pit);
 
     /* Video card */
diff --git a/hw/mips/mips_malta.c b/hw/mips/mips_malta.c
index 2adb9bcf89..de547d732f 100644
--- a/hw/mips/mips_malta.c
+++ b/hw/mips/mips_malta.c
@@ -1217,7 +1217,7 @@ void mips_malta_init(MachineState *machine)
                           isa_get_irq(NULL, 9), NULL, 0, NULL);
     smbus_eeprom_init(smbus, 8, smbus_eeprom_buf, smbus_eeprom_size);
     g_free(smbus_eeprom_buf);
-    pit = pit_init(isa_bus, 0x40, 0, NULL);
+    pit = i8254_pit_init(isa_bus, 0x40, 0, NULL);
     DMA_init(isa_bus, 0);
 
     /* Super I/O */
diff --git a/hw/mips/mips_r4k.c b/hw/mips/mips_r4k.c
index 1272d4ef9d..48fad52540 100644
--- a/hw/mips/mips_r4k.c
+++ b/hw/mips/mips_r4k.c
@@ -280,7 +280,7 @@ void mips_r4k_init(MachineState *machine)
 
     rtc_init(isa_bus, 2000, NULL);
 
-    pit = pit_init(isa_bus, 0x40, 0, NULL);
+    pit = i8254_pit_init(isa_bus, 0x40, 0, NULL);
 
     serial_hds_isa_init(isa_bus, 0, MAX_SERIAL_PORTS);
 
diff --git a/hw/timer/i8254.c b/hw/timer/i8254.c
index 5e61ad50a8..dbc4a0baec 100644
--- a/hw/timer/i8254.c
+++ b/hw/timer/i8254.c
@@ -23,7 +23,6 @@
  */
 #include "qemu/osdep.h"
 #include "hw/hw.h"
-#include "hw/i386/pc.h"
 #include "hw/isa/isa.h"
 #include "qemu/timer.h"
 #include "hw/timer/i8254.h"
diff --git a/hw/timer/i8254_common.c b/hw/timer/i8254_common.c
index b623c96198..6190b6fc5d 100644
--- a/hw/timer/i8254_common.c
+++ b/hw/timer/i8254_common.c
@@ -24,7 +24,6 @@
  */
 #include "qemu/osdep.h"
 #include "hw/hw.h"
-#include "hw/i386/pc.h"
 #include "hw/isa/isa.h"
 #include "qemu/timer.h"
 #include "hw/timer/i8254.h"
-- 
2.15.0.rc0

[Qemu-devel] [PATCH v3 32/42] hw/timer/mc146818: rename rtc_init() -> mc146818_rtc_init()

[Philippe Mathieu-Daudé]

Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Hervé Poussineau <hpoussin@reactos.org>
Reviewed-by: David Gibson <david@gibson.dropbear.id.au>
---
 include/hw/timer/mc146818rtc.h | 3 ++-
 hw/alpha/dp264.c               | 2 +-
 hw/i386/pc.c                   | 2 +-
 hw/isa/i82378.c                | 3 ++-
 hw/mips/mips_fulong2e.c        | 2 +-
 hw/mips/mips_jazz.c            | 2 +-
 hw/mips/mips_malta.c           | 2 +-
 hw/mips/mips_r4k.c             | 2 +-
 hw/ppc/pnv.c                   | 2 +-
 hw/timer/mc146818rtc.c         | 2 +-
 10 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/include/hw/timer/mc146818rtc.h b/include/hw/timer/mc146818rtc.h
index 7c8e64b203..fe6ed63f71 100644
--- a/include/hw/timer/mc146818rtc.h
+++ b/include/hw/timer/mc146818rtc.h
@@ -6,7 +6,8 @@
 
 #define TYPE_MC146818_RTC "mc146818rtc"
 
-ISADevice *rtc_init(ISABus *bus, int base_year, qemu_irq intercept_irq);
+ISADevice *mc146818_rtc_init(ISABus *bus, int base_year,
+                             qemu_irq intercept_irq);
 void rtc_set_memory(ISADevice *dev, int addr, int val);
 int rtc_get_memory(ISADevice *dev, int addr);
 
diff --git a/hw/alpha/dp264.c b/hw/alpha/dp264.c
index 1bd5243648..f20f252e3c 100644
--- a/hw/alpha/dp264.c
+++ b/hw/alpha/dp264.c
@@ -79,7 +79,7 @@ static void clipper_init(MachineState *machine)
                            clipper_pci_map_irq);
 
     /* Since we have an SRM-compatible PALcode, use the SRM epoch.  */
-    rtc_init(isa_bus, 1900, rtc_irq);
+    mc146818_rtc_init(isa_bus, 1900, rtc_irq);
 
     i8254_pit_init(isa_bus, 0x40, 0, NULL);
     isa_create_simple(isa_bus, "i8042");
diff --git a/hw/i386/pc.c b/hw/i386/pc.c
index b565c6086c..88e64d84c3 100644
--- a/hw/i386/pc.c
+++ b/hw/i386/pc.c
@@ -1543,7 +1543,7 @@ void pc_basic_device_init(ISABus *isa_bus, qemu_irq *gsi,
             rtc_irq = qdev_get_gpio_in(hpet, HPET_LEGACY_RTC_INT);
         }
     }
-    *rtc_state = rtc_init(isa_bus, 2000, rtc_irq);
+    *rtc_state = mc146818_rtc_init(isa_bus, 2000, rtc_irq);
 
     qemu_register_boot_set(pc_boot_set, *rtc_state);
 
diff --git a/hw/isa/i82378.c b/hw/isa/i82378.c
index a9c15f858d..a5d67bc6d7 100644
--- a/hw/isa/i82378.c
+++ b/hw/isa/i82378.c
@@ -21,6 +21,7 @@
 #include "hw/pci/pci.h"
 #include "hw/i386/pc.h"
 #include "hw/timer/i8254.h"
+#include "hw/timer/mc146818rtc.h"
 #include "hw/audio/pcspk.h"
 
 #define TYPE_I82378 "i82378"
@@ -106,7 +107,7 @@ static void i82378_realize(PCIDevice *pci, Error **errp)
     isa = isa_create_simple(isabus, "i82374");
 
     /* timer */
-    isa_create_simple(isabus, "mc146818rtc");
+    isa_create_simple(isabus, TYPE_MC146818_RTC);
 }
 
 static void i82378_init(Object *obj)
diff --git a/hw/mips/mips_fulong2e.c b/hw/mips/mips_fulong2e.c
index 22e6c05fb5..a8292305e8 100644
--- a/hw/mips/mips_fulong2e.c
+++ b/hw/mips/mips_fulong2e.c
@@ -369,7 +369,7 @@ static void mips_fulong2e_init(MachineState *machine)
     /* Super I/O */
     isa_create_simple(isa_bus, "i8042");
 
-    rtc_init(isa_bus, 2000, NULL);
+    mc146818_rtc_init(isa_bus, 2000, NULL);
 
     serial_hds_isa_init(isa_bus, 0, MAX_SERIAL_PORTS);
     parallel_hds_isa_init(isa_bus, 1);
diff --git a/hw/mips/mips_jazz.c b/hw/mips/mips_jazz.c
index 5f37852499..b9ffb33b45 100644
--- a/hw/mips/mips_jazz.c
+++ b/hw/mips/mips_jazz.c
@@ -292,7 +292,7 @@ static void mips_jazz_init(MachineState *machine,
     fdctrl_init_sysbus(qdev_get_gpio_in(rc4030, 1), -1, 0x80003000, fds);
 
     /* Real time clock */
-    rtc_init(isa_bus, 1980, NULL);
+    mc146818_rtc_init(isa_bus, 1980, NULL);
     memory_region_init_io(rtc, NULL, &rtc_ops, NULL, "rtc", 0x1000);
     memory_region_add_subregion(address_space, 0x80004000, rtc);
 
diff --git a/hw/mips/mips_malta.c b/hw/mips/mips_malta.c
index de547d732f..8e0e264cf8 100644
--- a/hw/mips/mips_malta.c
+++ b/hw/mips/mips_malta.c
@@ -1223,7 +1223,7 @@ void mips_malta_init(MachineState *machine)
     /* Super I/O */
     isa_create_simple(isa_bus, "i8042");
 
-    rtc_init(isa_bus, 2000, NULL);
+    mc146818_rtc_init(isa_bus, 2000, NULL);
     serial_hds_isa_init(isa_bus, 0, 2);
     parallel_hds_isa_init(isa_bus, 1);
 
diff --git a/hw/mips/mips_r4k.c b/hw/mips/mips_r4k.c
index 48fad52540..cdb91e31c5 100644
--- a/hw/mips/mips_r4k.c
+++ b/hw/mips/mips_r4k.c
@@ -278,7 +278,7 @@ void mips_r4k_init(MachineState *machine)
     i8259 = i8259_init(isa_bus, env->irq[2]);
     isa_bus_irqs(isa_bus, i8259);
 
-    rtc_init(isa_bus, 2000, NULL);
+    mc146818_rtc_init(isa_bus, 2000, NULL);
 
     pit = i8254_pit_init(isa_bus, 0x40, 0, NULL);
 
diff --git a/hw/ppc/pnv.c b/hw/ppc/pnv.c
index d46d91c76f..0e47757bff 100644
--- a/hw/ppc/pnv.c
+++ b/hw/ppc/pnv.c
@@ -651,7 +651,7 @@ static void ppc_powernv_init(MachineState *machine)
     serial_hds_isa_init(pnv->isa_bus, 0, MAX_SERIAL_PORTS);
 
     /* Create an RTC ISA device too */
-    rtc_init(pnv->isa_bus, 2000, NULL);
+    mc146818_rtc_init(pnv->isa_bus, 2000, NULL);
 
     /* OpenPOWER systems use a IPMI SEL Event message to notify the
      * host to powerdown */
diff --git a/hw/timer/mc146818rtc.c b/hw/timer/mc146818rtc.c
index 7764be25ec..35a05a64cc 100644
--- a/hw/timer/mc146818rtc.c
+++ b/hw/timer/mc146818rtc.c
@@ -999,7 +999,7 @@ static void rtc_realizefn(DeviceState *dev, Error **errp)
     qdev_init_gpio_out(dev, &s->irq, 1);
 }
 
-ISADevice *rtc_init(ISABus *bus, int base_year, qemu_irq intercept_irq)
+ISADevice *mc146818_rtc_init(ISABus *bus, int base_year, qemu_irq intercept_irq)
 {
     DeviceState *dev;
     ISADevice *isadev;
-- 
2.15.0.rc0

[Qemu-devel] [PATCH v3 33/42] hw/acpi: ACPI_PM_* defines are not restricted to i386 arch

[Philippe Mathieu-Daudé]

this allows to remove the old i386/pc dependency on acpi/core.

Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
---
 include/hw/acpi/acpi.h | 11 +++++++++++
 include/hw/i386/pc.h   | 11 -----------
 hw/acpi/core.c         |  1 -
 3 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/include/hw/acpi/acpi.h b/include/hw/acpi/acpi.h
index 7b3d93cf0d..39ff512129 100644
--- a/include/hw/acpi/acpi.h
+++ b/include/hw/acpi/acpi.h
@@ -39,6 +39,17 @@
 #define ACPI_PM2_REGISTER_WIDTH         8
 #define ACPI_PM_TIMER_WIDTH             32
 
+/* PC-style peripherals (also used by other machines).  */
+#define ACPI_PM_PROP_S3_DISABLED "disable_s3"
+#define ACPI_PM_PROP_S4_DISABLED "disable_s4"
+#define ACPI_PM_PROP_S4_VAL "s4_val"
+#define ACPI_PM_PROP_SCI_INT "sci_int"
+#define ACPI_PM_PROP_ACPI_ENABLE_CMD "acpi_enable_cmd"
+#define ACPI_PM_PROP_ACPI_DISABLE_CMD "acpi_disable_cmd"
+#define ACPI_PM_PROP_PM_IO_BASE "pm_io_base"
+#define ACPI_PM_PROP_GPE0_BLK "gpe0_blk"
+#define ACPI_PM_PROP_GPE0_BLK_LEN "gpe0_blk_len"
+
 /* PM Timer ticks per second (HZ) */
 #define PM_TIMER_FREQUENCY  3579545
 
diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h
index 087d184ef5..6335e2bf47 100644
--- a/include/hw/i386/pc.h
+++ b/include/hw/i386/pc.h
@@ -151,17 +151,6 @@ struct PCMachineClass {
 #define PC_MACHINE_CLASS(klass) \
     OBJECT_CLASS_CHECK(PCMachineClass, (klass), TYPE_PC_MACHINE)
 
-/* PC-style peripherals (also used by other machines).  */
-
-#define ACPI_PM_PROP_S3_DISABLED "disable_s3"
-#define ACPI_PM_PROP_S4_DISABLED "disable_s4"
-#define ACPI_PM_PROP_S4_VAL "s4_val"
-#define ACPI_PM_PROP_SCI_INT "sci_int"
-#define ACPI_PM_PROP_ACPI_ENABLE_CMD "acpi_enable_cmd"
-#define ACPI_PM_PROP_ACPI_DISABLE_CMD "acpi_disable_cmd"
-#define ACPI_PM_PROP_PM_IO_BASE "pm_io_base"
-#define ACPI_PM_PROP_GPE0_BLK "gpe0_blk"
-#define ACPI_PM_PROP_GPE0_BLK_LEN "gpe0_blk_len"
 #define ACPI_PM_PROP_TCO_ENABLED "enable_tco"
 
 /* parallel.c */
diff --git a/hw/acpi/core.c b/hw/acpi/core.c
index cd0a1d357b..eb9b76f70b 100644
--- a/hw/acpi/core.c
+++ b/hw/acpi/core.c
@@ -21,7 +21,6 @@
 #include "qemu/osdep.h"
 #include "sysemu/sysemu.h"
 #include "hw/hw.h"
-#include "hw/i386/pc.h"
 #include "hw/acpi/acpi.h"
 #include "hw/nvram/fw_cfg.h"
 #include "qemu/config-file.h"
-- 
2.15.0.rc0

[Qemu-devel] [PATCH v3 34/42] hw/acpi/ich9: extract ACPI_PM_PROP_TCO_ENABLED from i386/pc

[Philippe Mathieu-Daudé]

enable_tco is specific to i386/pc.

Suggested-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
---
 include/hw/acpi/ich9.h | 2 ++
 include/hw/i386/pc.h   | 2 --
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/include/hw/acpi/ich9.h b/include/hw/acpi/ich9.h
index a352c94fde..59aeb06393 100644
--- a/include/hw/acpi/ich9.h
+++ b/include/hw/acpi/ich9.h
@@ -63,6 +63,8 @@ typedef struct ICH9LPCPMRegs {
     TCOIORegs tco_regs;
 } ICH9LPCPMRegs;
 
+#define ACPI_PM_PROP_TCO_ENABLED "enable_tco"
+
 void ich9_pm_init(PCIDevice *lpc_pci, ICH9LPCPMRegs *pm,
                   bool smm_enabled,
                   qemu_irq sci_irq);
diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h
index 6335e2bf47..b1b4c918af 100644
--- a/include/hw/i386/pc.h
+++ b/include/hw/i386/pc.h
@@ -151,8 +151,6 @@ struct PCMachineClass {
 #define PC_MACHINE_CLASS(klass) \
     OBJECT_CLASS_CHECK(PCMachineClass, (klass), TYPE_PC_MACHINE)
 
-#define ACPI_PM_PROP_TCO_ENABLED "enable_tco"
-
 /* parallel.c */
 
 void parallel_hds_isa_init(ISABus *bus, int n);
-- 
2.15.0.rc0

[Qemu-devel] [PATCH v3 35/42] hw/display/vga: "vga.h" only contains registers defs, rename it "vga_regs.h"

[Philippe Mathieu-Daudé]

Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
---
 hw/display/{vga.h => vga_regs.h} | 0
 hw/display/vga.c                 | 2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename hw/display/{vga.h => vga_regs.h} (100%)

diff --git a/hw/display/vga.h b/hw/display/vga_regs.h
similarity index 100%
rename from hw/display/vga.h
rename to hw/display/vga_regs.h
diff --git a/hw/display/vga.c b/hw/display/vga.c
index ed24ef7076..35696b6fdd 100644
--- a/hw/display/vga.c
+++ b/hw/display/vga.c
@@ -24,11 +24,11 @@
 #include "qemu/osdep.h"
 #include "qapi/error.h"
 #include "hw/hw.h"
-#include "vga.h"
 #include "ui/console.h"
 #include "hw/i386/pc.h"
 #include "hw/pci/pci.h"
 #include "vga_int.h"
+#include "vga_regs.h"
 #include "ui/pixel_ops.h"
 #include "qemu/timer.h"
 #include "hw/xen/xen.h"
-- 
2.15.0.rc0

[Qemu-devel] [PATCH v3 36/42] hw/display/vga: "vga_int.h" requires "ui/console.h"

[Philippe Mathieu-Daudé]

since The VGACommonState struct has a GraphicHwOps *hw_ops member,
then remove the now unnecessary includes.

Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
---
 hw/display/qxl.h        | 1 -
 hw/display/vga_int.h    | 3 ++-
 hw/display/cirrus_vga.c | 1 -
 hw/display/vga-isa-mm.c | 1 -
 hw/display/vga-isa.c    | 1 -
 hw/display/vga-pci.c    | 1 -
 hw/display/vga.c        | 1 -
 hw/display/virtio-vga.c | 1 -
 hw/display/vmware_vga.c | 1 -
 9 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/hw/display/qxl.h b/hw/display/qxl.h
index f6556adb73..8668a8e05a 100644
--- a/hw/display/qxl.h
+++ b/hw/display/qxl.h
@@ -3,7 +3,6 @@
 
 #include "qemu-common.h"
 
-#include "ui/console.h"
 #include "hw/hw.h"
 #include "hw/pci/pci.h"
 #include "vga_int.h"
diff --git a/hw/display/vga_int.h b/hw/display/vga_int.h
index ad34a1f048..fe23b81442 100644
--- a/hw/display/vga_int.h
+++ b/hw/display/vga_int.h
@@ -25,8 +25,9 @@
 #ifndef HW_VGA_INT_H
 #define HW_VGA_INT_H
 
-#include "hw/hw.h"
+#include "exec/ioport.h"
 #include "exec/memory.h"
+#include "ui/console.h"
 
 #define ST01_V_RETRACE      0x08
 #define ST01_DISP_ENABLE    0x01
diff --git a/hw/display/cirrus_vga.c b/hw/display/cirrus_vga.c
index b4d579857a..cde3f17ebd 100644
--- a/hw/display/cirrus_vga.c
+++ b/hw/display/cirrus_vga.c
@@ -31,7 +31,6 @@
 #include "trace.h"
 #include "hw/hw.h"
 #include "hw/pci/pci.h"
-#include "ui/console.h"
 #include "ui/pixel_ops.h"
 #include "vga_int.h"
 #include "hw/loader.h"
diff --git a/hw/display/vga-isa-mm.c b/hw/display/vga-isa-mm.c
index 51ccbccc41..68c4d6e23e 100644
--- a/hw/display/vga-isa-mm.c
+++ b/hw/display/vga-isa-mm.c
@@ -23,7 +23,6 @@
  */
 #include "qemu/osdep.h"
 #include "hw/hw.h"
-#include "ui/console.h"
 #include "hw/i386/pc.h"
 #include "vga_int.h"
 #include "ui/pixel_ops.h"
diff --git a/hw/display/vga-isa.c b/hw/display/vga-isa.c
index 1af95562f2..26f69fd40a 100644
--- a/hw/display/vga-isa.c
+++ b/hw/display/vga-isa.c
@@ -25,7 +25,6 @@
  */
 #include "qemu/osdep.h"
 #include "hw/hw.h"
-#include "ui/console.h"
 #include "hw/i386/pc.h"
 #include "vga_int.h"
 #include "ui/pixel_ops.h"
diff --git a/hw/display/vga-pci.c b/hw/display/vga-pci.c
index 7adb89fcb4..1674bd3581 100644
--- a/hw/display/vga-pci.c
+++ b/hw/display/vga-pci.c
@@ -25,7 +25,6 @@
  */
 #include "qemu/osdep.h"
 #include "hw/hw.h"
-#include "ui/console.h"
 #include "hw/pci/pci.h"
 #include "vga_int.h"
 #include "ui/pixel_ops.h"
diff --git a/hw/display/vga.c b/hw/display/vga.c
index 35696b6fdd..22fd069ad2 100644
--- a/hw/display/vga.c
+++ b/hw/display/vga.c
@@ -24,7 +24,6 @@
 #include "qemu/osdep.h"
 #include "qapi/error.h"
 #include "hw/hw.h"
-#include "ui/console.h"
 #include "hw/i386/pc.h"
 #include "hw/pci/pci.h"
 #include "vga_int.h"
diff --git a/hw/display/virtio-vga.c b/hw/display/virtio-vga.c
index f9b017d86b..baa74ba82c 100644
--- a/hw/display/virtio-vga.c
+++ b/hw/display/virtio-vga.c
@@ -1,7 +1,6 @@
 #include "qemu/osdep.h"
 #include "hw/hw.h"
 #include "hw/pci/pci.h"
-#include "ui/console.h"
 #include "vga_int.h"
 #include "hw/virtio/virtio-pci.h"
 #include "qapi/error.h"
diff --git a/hw/display/vmware_vga.c b/hw/display/vmware_vga.c
index cdc3fed6ca..06d0adc590 100644
--- a/hw/display/vmware_vga.c
+++ b/hw/display/vmware_vga.c
@@ -26,7 +26,6 @@
 #include "hw/hw.h"
 #include "hw/loader.h"
 #include "trace.h"
-#include "ui/console.h"
 #include "ui/vnc.h"
 #include "hw/pci/pci.h"
 
-- 
2.15.0.rc0

[Qemu-devel] [PATCH v3 37/42] hw/display/vga: extract public API from i386/pc to "hw/display/vga.h"

[Philippe Mathieu-Daudé]

and remove the old i386/pc dependency.

Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
---
 include/hw/display/vga.h | 25 +++++++++++++++++++++++++
 include/hw/i386/pc.h     | 12 ------------
 hw/display/vga-isa-mm.c  |  3 +--
 hw/display/vga-isa.c     |  2 +-
 hw/display/vga.c         |  2 +-
 hw/mips/mips_jazz.c      |  1 +
 vl.c                     |  2 +-
 MAINTAINERS              |  1 +
 8 files changed, 31 insertions(+), 17 deletions(-)
 create mode 100644 include/hw/display/vga.h

diff --git a/include/hw/display/vga.h b/include/hw/display/vga.h
new file mode 100644
index 0000000000..0401a3a292
--- /dev/null
+++ b/include/hw/display/vga.h
@@ -0,0 +1,25 @@
+/*
+ * QEMU VGA Emulator.
+ *
+ * Copyright (c) 2003 Fabrice Bellard
+ *
+ * This work is licensed under the terms of the GNU GPL, version 2 or later.
+ * See the COPYING file in the top-level directory.
+ */
+#ifndef QEMU_HW_DISPLAY_VGA_H
+#define QEMU_HW_DISPLAY_VGA_H
+
+#include "exec/memory.h"
+
+enum vga_retrace_method {
+    VGA_RETRACE_DUMB,
+    VGA_RETRACE_PRECISE
+};
+
+extern enum vga_retrace_method vga_retrace_method;
+
+int isa_vga_mm_init(hwaddr vram_base,
+                    hwaddr ctrl_base, int it_shift,
+                    MemoryRegion *address_space);
+
+#endif
diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h
index b1b4c918af..25ba378bd8 100644
--- a/include/hw/i386/pc.h
+++ b/include/hw/i386/pc.h
@@ -302,18 +302,6 @@ PCIBus *find_i440fx(void);
 extern PCIDevice *piix4_dev;
 int piix4_init(PCIBus *bus, ISABus **isa_bus, int devfn);
 
-/* vga.c */
-enum vga_retrace_method {
-    VGA_RETRACE_DUMB,
-    VGA_RETRACE_PRECISE
-};
-
-extern enum vga_retrace_method vga_retrace_method;
-
-int isa_vga_mm_init(hwaddr vram_base,
-                    hwaddr ctrl_base, int it_shift,
-                    MemoryRegion *address_space);
-
 /* ne2000.c */
 static inline bool isa_ne2000_init(ISABus *bus, int base, int irq, NICInfo *nd)
 {
diff --git a/hw/display/vga-isa-mm.c b/hw/display/vga-isa-mm.c
index 68c4d6e23e..e887b45651 100644
--- a/hw/display/vga-isa-mm.c
+++ b/hw/display/vga-isa-mm.c
@@ -23,10 +23,9 @@
  */
 #include "qemu/osdep.h"
 #include "hw/hw.h"
-#include "hw/i386/pc.h"
+#include "hw/display/vga.h"
 #include "vga_int.h"
 #include "ui/pixel_ops.h"
-#include "qemu/timer.h"
 
 #define VGA_RAM_SIZE (8192 * 1024)
 
diff --git a/hw/display/vga-isa.c b/hw/display/vga-isa.c
index 26f69fd40a..469834add5 100644
--- a/hw/display/vga-isa.c
+++ b/hw/display/vga-isa.c
@@ -25,7 +25,7 @@
  */
 #include "qemu/osdep.h"
 #include "hw/hw.h"
-#include "hw/i386/pc.h"
+#include "hw/isa/isa.h"
 #include "vga_int.h"
 #include "ui/pixel_ops.h"
 #include "qemu/timer.h"
diff --git a/hw/display/vga.c b/hw/display/vga.c
index 22fd069ad2..59729f7031 100644
--- a/hw/display/vga.c
+++ b/hw/display/vga.c
@@ -24,7 +24,7 @@
 #include "qemu/osdep.h"
 #include "qapi/error.h"
 #include "hw/hw.h"
-#include "hw/i386/pc.h"
+#include "hw/display/vga.h"
 #include "hw/pci/pci.h"
 #include "vga_int.h"
 #include "vga_regs.h"
diff --git a/hw/mips/mips_jazz.c b/hw/mips/mips_jazz.c
index b9ffb33b45..ece4a153b2 100644
--- a/hw/mips/mips_jazz.c
+++ b/hw/mips/mips_jazz.c
@@ -39,6 +39,7 @@
 #include "hw/loader.h"
 #include "hw/timer/mc146818rtc.h"
 #include "hw/timer/i8254.h"
+#include "hw/display/vga.h"
 #include "hw/audio/pcspk.h"
 #include "sysemu/block-backend.h"
 #include "hw/sysbus.h"
diff --git a/vl.c b/vl.c
index 0d1f612629..f0b7106feb 100644
--- a/vl.c
+++ b/vl.c
@@ -57,9 +57,9 @@ int main(int argc, char **argv)
 #include "hw/boards.h"
 #include "sysemu/accel.h"
 #include "hw/usb.h"
-#include "hw/i386/pc.h"
 #include "hw/isa/isa.h"
 #include "hw/scsi/scsi.h"
+#include "hw/display/vga.h"
 #include "hw/bt.h"
 #include "sysemu/watchdog.h"
 #include "hw/smbios/smbios.h"
diff --git a/MAINTAINERS b/MAINTAINERS
index 0e926a942b..81b67e4685 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -860,6 +860,7 @@ F: hw/timer/hpet*
 F: hw/timer/i8254*
 F: hw/timer/mc146818rtc*
 F: hw/watchdog/wdt_ib700.c
+F: include/hw/display/vga.h
 F: include/hw/i2c/pm_smbus.h
 F: include/hw/isa/i8257.h
 F: include/hw/timer/hpet.h
-- 
2.15.0.rc0

[Qemu-devel] [PATCH v3 38/42] hw/net/ne2000: extract ne2k-isa code from i386/pc to ne2000-isa.c

[Philippe Mathieu-Daudé]

- add "hw/net/ne2000-isa.h"
- remove the old i386 dependency

Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Hervé Poussineau <hpoussin@reactos.org>
Acked-by: David Gibson <david@gibson.dropbear.id.au>
---
 hw/net/ne2000.h             |  3 +++
 include/hw/i386/pc.h        | 20 --------------------
 include/hw/net/ne2000-isa.h | 33 +++++++++++++++++++++++++++++++++
 hw/i386/pc.c                |  1 +
 hw/mips/mips_r4k.c          |  1 +
 hw/net/ne2000-isa.c         |  6 ++----
 hw/net/ne2000.c             |  2 --
 hw/ppc/prep.c               |  1 +
 8 files changed, 41 insertions(+), 26 deletions(-)
 create mode 100644 include/hw/net/ne2000-isa.h

diff --git a/hw/net/ne2000.h b/hw/net/ne2000.h
index d213dccae3..adb8021bd1 100644
--- a/hw/net/ne2000.h
+++ b/hw/net/ne2000.h
@@ -1,6 +1,9 @@
 #ifndef HW_NE2000_H
 #define HW_NE2000_H
 
+#include "hw/hw.h"
+#include "net/net.h"
+
 #define NE2000_PMEM_SIZE    (32*1024)
 #define NE2000_PMEM_START   (16*1024)
 #define NE2000_PMEM_END     (NE2000_PMEM_SIZE+NE2000_PMEM_START)
diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h
index 25ba378bd8..846d37b9fb 100644
--- a/include/hw/i386/pc.h
+++ b/include/hw/i386/pc.h
@@ -302,26 +302,6 @@ PCIBus *find_i440fx(void);
 extern PCIDevice *piix4_dev;
 int piix4_init(PCIBus *bus, ISABus **isa_bus, int devfn);
 
-/* ne2000.c */
-static inline bool isa_ne2000_init(ISABus *bus, int base, int irq, NICInfo *nd)
-{
-    DeviceState *dev;
-    ISADevice *isadev;
-
-    qemu_check_nic_model(nd, "ne2k_isa");
-
-    isadev = isa_try_create(bus, "ne2k_isa");
-    if (!isadev) {
-        return false;
-    }
-    dev = DEVICE(isadev);
-    qdev_prop_set_uint32(dev, "iobase", base);
-    qdev_prop_set_uint32(dev, "irq",    irq);
-    qdev_set_nic_properties(dev, nd);
-    qdev_init_nofail(dev);
-    return true;
-}
-
 /* pc_sysfw.c */
 void pc_system_firmware_init(MemoryRegion *rom_memory,
                              bool isapc_ram_fw);
diff --git a/include/hw/net/ne2000-isa.h b/include/hw/net/ne2000-isa.h
new file mode 100644
index 0000000000..ff2bed9c95
--- /dev/null
+++ b/include/hw/net/ne2000-isa.h
@@ -0,0 +1,33 @@
+/*
+ * QEMU NE2000 emulation -- isa bus windup
+ *
+ * Copyright (c) 2003-2004 Fabrice Bellard
+ *
+ * This work is licensed under the terms of the GNU GPL, version 2 or later.
+ * See the COPYING file in the top-level directory.
+ */
+#include "hw/hw.h"
+#include "hw/qdev.h"
+#include "hw/isa/isa.h"
+#include "net/net.h"
+
+#define TYPE_ISA_NE2000 "ne2k_isa"
+
+static inline ISADevice *isa_ne2000_init(ISABus *bus, int base, int irq,
+                                         NICInfo *nd)
+{
+    ISADevice *d;
+
+    qemu_check_nic_model(nd, "ne2k_isa");
+
+    d = isa_try_create(bus, TYPE_ISA_NE2000);
+    if (d) {
+        DeviceState *dev = DEVICE(d);
+
+        qdev_prop_set_uint32(dev, "iobase", base);
+        qdev_prop_set_uint32(dev, "irq",    irq);
+        qdev_set_nic_properties(dev, nd);
+        qdev_init_nofail(dev);
+    }
+    return d;
+}
diff --git a/hw/i386/pc.c b/hw/i386/pc.c
index 88e64d84c3..48c92e64ae 100644
--- a/hw/i386/pc.c
+++ b/hw/i386/pc.c
@@ -69,6 +69,7 @@
 #include "qom/cpu.h"
 #include "hw/nmi.h"
 #include "hw/i386/intel_iommu.h"
+#include "hw/net/ne2000-isa.h"
 
 /* debug PC/ISA interrupts */
 //#define DEBUG_IRQ
diff --git a/hw/mips/mips_r4k.c b/hw/mips/mips_r4k.c
index cdb91e31c5..b40168fa08 100644
--- a/hw/mips/mips_r4k.c
+++ b/hw/mips/mips_r4k.c
@@ -18,6 +18,7 @@
 #include "hw/char/serial.h"
 #include "hw/isa/isa.h"
 #include "net/net.h"
+#include "hw/net/ne2000-isa.h"
 #include "sysemu/sysemu.h"
 #include "hw/boards.h"
 #include "hw/block/flash.h"
diff --git a/hw/net/ne2000-isa.c b/hw/net/ne2000-isa.c
index f3455339ee..70e5c1d3d4 100644
--- a/hw/net/ne2000-isa.c
+++ b/hw/net/ne2000-isa.c
@@ -22,17 +22,15 @@
  * THE SOFTWARE.
  */
 #include "qemu/osdep.h"
-#include "hw/hw.h"
-#include "hw/i386/pc.h"
 #include "hw/isa/isa.h"
+#include "hw/net/ne2000-isa.h"
 #include "hw/qdev.h"
-#include "net/net.h"
 #include "ne2000.h"
+#include "sysemu/sysemu.h"
 #include "exec/address-spaces.h"
 #include "qapi/error.h"
 #include "qapi/visitor.h"
 
-#define TYPE_ISA_NE2000 "ne2k_isa"
 #define ISA_NE2000(obj) OBJECT_CHECK(ISANE2000State, (obj), TYPE_ISA_NE2000)
 
 typedef struct ISANE2000State {
diff --git a/hw/net/ne2000.c b/hw/net/ne2000.c
index 3938e6ddd8..6874c8c6b9 100644
--- a/hw/net/ne2000.c
+++ b/hw/net/ne2000.c
@@ -22,9 +22,7 @@
  * THE SOFTWARE.
  */
 #include "qemu/osdep.h"
-#include "hw/hw.h"
 #include "hw/pci/pci.h"
-#include "net/net.h"
 #include "ne2000.h"
 #include "hw/loader.h"
 #include "sysemu/sysemu.h"
diff --git a/hw/ppc/prep.c b/hw/ppc/prep.c
index 94138a4e8c..f9c958b785 100644
--- a/hw/ppc/prep.c
+++ b/hw/ppc/prep.c
@@ -42,6 +42,7 @@
 #include "hw/loader.h"
 #include "hw/timer/mc146818rtc.h"
 #include "hw/isa/pc87312.h"
+#include "hw/net/ne2000-isa.h"
 #include "sysemu/block-backend.h"
 #include "sysemu/arch_init.h"
 #include "sysemu/kvm.h"
-- 
2.15.0.rc0

[Qemu-devel] [PATCH v3 39/42] hw/misc/pvpanic: extract public API from i386/pc to "hw/misc/pvpanic.h"

[Philippe Mathieu-Daudé]

and remove the old i386/pc dependency.

Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
---
no MAINTAINERS entry, does this belong to "PC Chipset"?

 include/hw/i386/pc.h      |  3 ---
 include/hw/misc/pvpanic.h | 21 +++++++++++++++++++++
 hw/i386/acpi-build.c      |  2 +-
 hw/misc/pvpanic.c         |  9 ++++-----
 4 files changed, 26 insertions(+), 9 deletions(-)
 create mode 100644 include/hw/misc/pvpanic.h

diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h
index 846d37b9fb..1a74ccd73b 100644
--- a/include/hw/i386/pc.h
+++ b/include/hw/i386/pc.h
@@ -306,9 +306,6 @@ int piix4_init(PCIBus *bus, ISABus **isa_bus, int devfn);
 void pc_system_firmware_init(MemoryRegion *rom_memory,
                              bool isapc_ram_fw);
 
-/* pvpanic.c */
-uint16_t pvpanic_port(void);
-
 /* acpi-build.c */
 void pc_madt_cpu_entry(AcpiDeviceIf *adev, int uid,
                        const CPUArchIdList *apic_ids, GArray *entry);
diff --git a/include/hw/misc/pvpanic.h b/include/hw/misc/pvpanic.h
new file mode 100644
index 0000000000..36a54e270c
--- /dev/null
+++ b/include/hw/misc/pvpanic.h
@@ -0,0 +1,21 @@
+/*
+ * QEMU simulated pvpanic device.
+ *
+ * Copyright Fujitsu, Corp. 2013
+ *
+ * Authors:
+ *     Wen Congyang <wency@cn.fujitsu.com>
+ *     Hu Tao <hutao@cn.fujitsu.com>
+ *
+ * This work is licensed under the terms of the GNU GPL, version 2 or later.
+ * See the COPYING file in the top-level directory.
+ *
+ */
+#ifndef HW_MISC_PVPANIC_H
+#define HW_MISC_PVPANIC_H
+
+#define TYPE_PVPANIC "pvpanic"
+
+uint16_t pvpanic_port(void);
+
+#endif
diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c
index 73519ab3ac..63bbc610eb 100644
--- a/hw/i386/acpi-build.c
+++ b/hw/i386/acpi-build.c
@@ -28,8 +28,8 @@
 #include "qemu/error-report.h"
 #include "hw/pci/pci.h"
 #include "qom/cpu.h"
-#include "hw/i386/pc.h"
 #include "target/i386/cpu.h"
+#include "hw/misc/pvpanic.h"
 #include "hw/timer/hpet.h"
 #include "hw/acpi/acpi-defs.h"
 #include "hw/acpi/acpi.h"
diff --git a/hw/misc/pvpanic.c b/hw/misc/pvpanic.c
index 3a0e4ba828..b26250dec9 100644
--- a/hw/misc/pvpanic.c
+++ b/hw/misc/pvpanic.c
@@ -17,7 +17,7 @@
 #include "qemu/log.h"
 
 #include "hw/nvram/fw_cfg.h"
-#include "hw/i386/pc.h"
+#include "hw/misc/pvpanic.h"
 
 /* The bit of supported pv event */
 #define PVPANIC_F_PANICKED      0
@@ -25,9 +25,8 @@
 /* The pv event value */
 #define PVPANIC_PANICKED        (1 << PVPANIC_F_PANICKED)
 
-#define TYPE_ISA_PVPANIC_DEVICE    "pvpanic"
 #define ISA_PVPANIC_DEVICE(obj)    \
-    OBJECT_CHECK(PVPanicState, (obj), TYPE_ISA_PVPANIC_DEVICE)
+    OBJECT_CHECK(PVPanicState, (obj), TYPE_PVPANIC)
 
 static void handle_event(int event)
 {
@@ -104,7 +103,7 @@ static void pvpanic_isa_realizefn(DeviceState *dev, Error **errp)
 
 uint16_t pvpanic_port(void)
 {
-    Object *o = object_resolve_path_type("", TYPE_ISA_PVPANIC_DEVICE, NULL);
+    Object *o = object_resolve_path_type("", TYPE_PVPANIC, NULL);
     if (!o) {
         return 0;
     }
@@ -126,7 +125,7 @@ static void pvpanic_isa_class_init(ObjectClass *klass, void *data)
 }
 
 static TypeInfo pvpanic_isa_info = {
-    .name          = TYPE_ISA_PVPANIC_DEVICE,
+    .name          = TYPE_PVPANIC,
     .parent        = TYPE_ISA_DEVICE,
     .instance_size = sizeof(PVPanicState),
     .instance_init = pvpanic_isa_initfn,
-- 
2.15.0.rc0

[Qemu-devel] [PATCH v3 40/42] i386/pc: move vmport.c to hw/i386/

[Philippe Mathieu-Daudé]

It's a x86-only device, so it does not make sense to keep it
in the shared misc folder.

Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
---
 hw/{misc => i386}/vmport.c | 0
 hw/i386/Makefile.objs      | 1 +
 hw/misc/Makefile.objs      | 2 --
 3 files changed, 1 insertion(+), 2 deletions(-)
 rename hw/{misc => i386}/vmport.c (100%)

diff --git a/hw/misc/vmport.c b/hw/i386/vmport.c
similarity index 100%
rename from hw/misc/vmport.c
rename to hw/i386/vmport.c
diff --git a/hw/i386/Makefile.objs b/hw/i386/Makefile.objs
index 909ead6a77..64a461c929 100644
--- a/hw/i386/Makefile.objs
+++ b/hw/i386/Makefile.objs
@@ -5,6 +5,7 @@ obj-y += pc_sysfw.o
 obj-y += x86-iommu.o intel_iommu.o
 obj-y += amd_iommu.o
 obj-$(CONFIG_XEN) += ../xenpv/ xen/
+obj-$(CONFIG_VMPORT) += vmport.o
 
 obj-y += kvmvapic.o
 obj-y += acpi-build.o
diff --git a/hw/misc/Makefile.objs b/hw/misc/Makefile.objs
index 19202d90cf..03bc758592 100644
--- a/hw/misc/Makefile.objs
+++ b/hw/misc/Makefile.objs
@@ -11,8 +11,6 @@ common-obj-$(CONFIG_EDU) += edu.o
 common-obj-y += unimp.o
 common-obj-y += vmcoreinfo.o
 
-obj-$(CONFIG_VMPORT) += vmport.o
-
 # ARM devices
 common-obj-$(CONFIG_PL310) += arm_l2x0.o
 common-obj-$(CONFIG_INTEGRATOR_DEBUG) += arm_integrator_debug.o
-- 
2.15.0.rc0

[Qemu-devel] [PATCH v3 41/42] i386/pc: move vmmouse.c to hw/i386/

[Philippe Mathieu-Daudé]

It's a x86-only device, so it does not make sense to keep it
in the shared misc folder.

Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
---
 hw/{input => i386}/vmmouse.c | 0
 hw/i386/Makefile.objs        | 1 +
 hw/input/Makefile.objs       | 1 -
 3 files changed, 1 insertion(+), 1 deletion(-)
 rename hw/{input => i386}/vmmouse.c (100%)

diff --git a/hw/input/vmmouse.c b/hw/i386/vmmouse.c
similarity index 100%
rename from hw/input/vmmouse.c
rename to hw/i386/vmmouse.c
diff --git a/hw/i386/Makefile.objs b/hw/i386/Makefile.objs
index 64a461c929..e15f26291e 100644
--- a/hw/i386/Makefile.objs
+++ b/hw/i386/Makefile.objs
@@ -6,6 +6,7 @@ obj-y += x86-iommu.o intel_iommu.o
 obj-y += amd_iommu.o
 obj-$(CONFIG_XEN) += ../xenpv/ xen/
 obj-$(CONFIG_VMPORT) += vmport.o
+obj-$(CONFIG_VMMOUSE) += vmmouse.o
 
 obj-y += kvmvapic.o
 obj-y += acpi-build.o
diff --git a/hw/input/Makefile.objs b/hw/input/Makefile.objs
index 7715d7230d..636f794b6b 100644
--- a/hw/input/Makefile.objs
+++ b/hw/input/Makefile.objs
@@ -6,7 +6,6 @@ common-obj-$(CONFIG_PL050) += pl050.o
 common-obj-y += ps2.o
 common-obj-$(CONFIG_STELLARIS_INPUT) += stellaris_input.o
 common-obj-$(CONFIG_TSC2005) += tsc2005.o
-common-obj-$(CONFIG_VMMOUSE) += vmmouse.o
 
 common-obj-$(CONFIG_VIRTIO) += virtio-input.o
 common-obj-$(CONFIG_VIRTIO) += virtio-input-hid.o
-- 
2.15.0.rc0

[Qemu-devel] [PATCH v3 42/42] misc: drop old i386 dependency

[Philippe Mathieu-Daudé]

Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Thomas Huth <thuth@redhat.com>
---
 hw/char/debugcon.c      | 1 -
 hw/intc/lm32_pic.c      | 1 -
 hw/moxie/moxiesim.c     | 1 -
 hw/sparc/sun4m.c        | 1 -
 hw/watchdog/wdt_ib700.c | 1 -
 5 files changed, 5 deletions(-)

diff --git a/hw/char/debugcon.c b/hw/char/debugcon.c
index 95ccec6f8b..e2abc61b04 100644
--- a/hw/char/debugcon.c
+++ b/hw/char/debugcon.c
@@ -29,7 +29,6 @@
 #include "hw/hw.h"
 #include "chardev/char-fe.h"
 #include "hw/isa/isa.h"
-#include "hw/i386/pc.h"
 
 #define TYPE_ISA_DEBUGCON_DEVICE "isa-debugcon"
 #define ISA_DEBUGCON_DEVICE(obj) \
diff --git a/hw/intc/lm32_pic.c b/hw/intc/lm32_pic.c
index 09e15115fb..db6c7afc2f 100644
--- a/hw/intc/lm32_pic.c
+++ b/hw/intc/lm32_pic.c
@@ -20,7 +20,6 @@
 #include "qemu/osdep.h"
 
 #include "hw/hw.h"
-#include "hw/i386/pc.h"
 #include "monitor/monitor.h"
 #include "hw/sysbus.h"
 #include "trace.h"
diff --git a/hw/moxie/moxiesim.c b/hw/moxie/moxiesim.c
index 5ea8dd3a93..5c9a4211ac 100644
--- a/hw/moxie/moxiesim.c
+++ b/hw/moxie/moxiesim.c
@@ -30,7 +30,6 @@
 #include "cpu.h"
 #include "hw/sysbus.h"
 #include "hw/hw.h"
-#include "hw/i386/pc.h"
 #include "hw/isa/isa.h"
 #include "net/net.h"
 #include "sysemu/sysemu.h"
diff --git a/hw/sparc/sun4m.c b/hw/sparc/sun4m.c
index e1bdd4828d..93424b186f 100644
--- a/hw/sparc/sun4m.c
+++ b/hw/sparc/sun4m.c
@@ -36,7 +36,6 @@
 #include "net/net.h"
 #include "hw/boards.h"
 #include "hw/scsi/esp.h"
-#include "hw/i386/pc.h"
 #include "hw/isa/isa.h"
 #include "hw/nvram/sun_nvram.h"
 #include "hw/nvram/chrp_nvram.h"
diff --git a/hw/watchdog/wdt_ib700.c b/hw/watchdog/wdt_ib700.c
index 532afe89e7..d045032bf4 100644
--- a/hw/watchdog/wdt_ib700.c
+++ b/hw/watchdog/wdt_ib700.c
@@ -25,7 +25,6 @@
 #include "sysemu/watchdog.h"
 #include "hw/hw.h"
 #include "hw/isa/isa.h"
-#include "hw/i386/pc.h"
 
 /*#define IB700_DEBUG 1*/
 
-- 
2.15.0.rc0

Re: [Qemu-devel] [PATCH v3 33/42] hw/acpi: ACPI_PM_* defines are not restricted to i386 arch

[Igor Mammedov]

On Tue, 17 Oct 2017 13:44:17 -0300
Philippe Mathieu-Daudé <f4bug@amsat.org> wrote:

> this allows to remove the old i386/pc dependency on acpi/core.
> 
> Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Igor Mammedov <imammedo@redhat.com>

> ---
>  include/hw/acpi/acpi.h | 11 +++++++++++
>  include/hw/i386/pc.h   | 11 -----------
>  hw/acpi/core.c         |  1 -
>  3 files changed, 11 insertions(+), 12 deletions(-)
> 
> diff --git a/include/hw/acpi/acpi.h b/include/hw/acpi/acpi.h
> index 7b3d93cf0d..39ff512129 100644
> --- a/include/hw/acpi/acpi.h
> +++ b/include/hw/acpi/acpi.h
> @@ -39,6 +39,17 @@
>  #define ACPI_PM2_REGISTER_WIDTH         8
>  #define ACPI_PM_TIMER_WIDTH             32
>  
> +/* PC-style peripherals (also used by other machines).  */
> +#define ACPI_PM_PROP_S3_DISABLED "disable_s3"
> +#define ACPI_PM_PROP_S4_DISABLED "disable_s4"
> +#define ACPI_PM_PROP_S4_VAL "s4_val"
> +#define ACPI_PM_PROP_SCI_INT "sci_int"
> +#define ACPI_PM_PROP_ACPI_ENABLE_CMD "acpi_enable_cmd"
> +#define ACPI_PM_PROP_ACPI_DISABLE_CMD "acpi_disable_cmd"
> +#define ACPI_PM_PROP_PM_IO_BASE "pm_io_base"
> +#define ACPI_PM_PROP_GPE0_BLK "gpe0_blk"
> +#define ACPI_PM_PROP_GPE0_BLK_LEN "gpe0_blk_len"
> +
>  /* PM Timer ticks per second (HZ) */
>  #define PM_TIMER_FREQUENCY  3579545
>  
> diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h
> index 087d184ef5..6335e2bf47 100644
> --- a/include/hw/i386/pc.h
> +++ b/include/hw/i386/pc.h
> @@ -151,17 +151,6 @@ struct PCMachineClass {
>  #define PC_MACHINE_CLASS(klass) \
>      OBJECT_CLASS_CHECK(PCMachineClass, (klass), TYPE_PC_MACHINE)
>  
> -/* PC-style peripherals (also used by other machines).  */
> -
> -#define ACPI_PM_PROP_S3_DISABLED "disable_s3"
> -#define ACPI_PM_PROP_S4_DISABLED "disable_s4"
> -#define ACPI_PM_PROP_S4_VAL "s4_val"
> -#define ACPI_PM_PROP_SCI_INT "sci_int"
> -#define ACPI_PM_PROP_ACPI_ENABLE_CMD "acpi_enable_cmd"
> -#define ACPI_PM_PROP_ACPI_DISABLE_CMD "acpi_disable_cmd"
> -#define ACPI_PM_PROP_PM_IO_BASE "pm_io_base"
> -#define ACPI_PM_PROP_GPE0_BLK "gpe0_blk"
> -#define ACPI_PM_PROP_GPE0_BLK_LEN "gpe0_blk_len"
>  #define ACPI_PM_PROP_TCO_ENABLED "enable_tco"
>  
>  /* parallel.c */
> diff --git a/hw/acpi/core.c b/hw/acpi/core.c
> index cd0a1d357b..eb9b76f70b 100644
> --- a/hw/acpi/core.c
> +++ b/hw/acpi/core.c
> @@ -21,7 +21,6 @@
>  #include "qemu/osdep.h"
>  #include "sysemu/sysemu.h"
>  #include "hw/hw.h"
> -#include "hw/i386/pc.h"
>  #include "hw/acpi/acpi.h"
>  #include "hw/nvram/fw_cfg.h"
>  #include "qemu/config-file.h"

Re: [Qemu-devel] [PATCH v3 34/42] hw/acpi/ich9: extract ACPI_PM_PROP_TCO_ENABLED from i386/pc

[Igor Mammedov]

On Tue, 17 Oct 2017 13:44:18 -0300
Philippe Mathieu-Daudé <f4bug@amsat.org> wrote:

> enable_tco is specific to i386/pc.
> 
> Suggested-by: Paolo Bonzini <pbonzini@redhat.com>
> Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Igor Mammedov <imammedo@redhat.com>

> ---
>  include/hw/acpi/ich9.h | 2 ++
>  include/hw/i386/pc.h   | 2 --
>  2 files changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/include/hw/acpi/ich9.h b/include/hw/acpi/ich9.h
> index a352c94fde..59aeb06393 100644
> --- a/include/hw/acpi/ich9.h
> +++ b/include/hw/acpi/ich9.h
> @@ -63,6 +63,8 @@ typedef struct ICH9LPCPMRegs {
>      TCOIORegs tco_regs;
>  } ICH9LPCPMRegs;
>  
> +#define ACPI_PM_PROP_TCO_ENABLED "enable_tco"
> +
>  void ich9_pm_init(PCIDevice *lpc_pci, ICH9LPCPMRegs *pm,
>                    bool smm_enabled,
>                    qemu_irq sci_irq);
> diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h
> index 6335e2bf47..b1b4c918af 100644
> --- a/include/hw/i386/pc.h
> +++ b/include/hw/i386/pc.h
> @@ -151,8 +151,6 @@ struct PCMachineClass {
>  #define PC_MACHINE_CLASS(klass) \
>      OBJECT_CLASS_CHECK(PCMachineClass, (klass), TYPE_PC_MACHINE)
>  
> -#define ACPI_PM_PROP_TCO_ENABLED "enable_tco"
> -
>  /* parallel.c */
>  
>  void parallel_hds_isa_init(ISABus *bus, int n);

Re: [Qemu-devel] [PATCH v3 02/42] MAINTAINERS: add an entry for the i82374 (southbridge)

[Thomas Huth]

On 17.10.2017 18:43, Philippe Mathieu-Daudé wrote:
> Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
> ---
>  MAINTAINERS | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/MAINTAINERS b/MAINTAINERS
> index 6f56c1349b..331f7391c1 100644
> --- a/MAINTAINERS
> +++ b/MAINTAINERS
> @@ -713,6 +713,7 @@ F: hw/ppc/prep_systemio.c
>  F: hw/ppc/rs6000_mc.c
>  F: hw/pci-host/prep.[hc]
>  F: hw/isa/pc87312.[hc]
> +F: hw/dma/i82374.c
>  F: pc-bios/ppc_rom.bin
>  
>  sPAPR
> 

Reviewed-by: Thomas Huth <thuth@redhat.com>

Re: [Qemu-devel] [PATCH v3 16/42] i386/hax: remove duplicated include

[Thomas Huth]

On 17.10.2017 18:44, Philippe Mathieu-Daudé wrote:
> this file in include in "target/i386/hax-i386.h":
> 
>     #ifdef CONFIG_WIN32
>     #include "target/i386/hax-windows.h"
>     #endif
> 
> which guaranty than sysemu/os-win32.h is previously included (CONFIG_WIN32)

which guaranties that ... ?

 Thomas

Re: [Qemu-devel] [PATCH v3 36/42] hw/display/vga: "vga_int.h" requires "ui/console.h"

[Thomas Huth]

On 17.10.2017 18:44, Philippe Mathieu-Daudé wrote:
> since The VGACommonState struct has a GraphicHwOps *hw_ops member,
> then remove the now unnecessary includes.
> 
> Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
> ---
>  hw/display/qxl.h        | 1 -
>  hw/display/vga_int.h    | 3 ++-
>  hw/display/cirrus_vga.c | 1 -
>  hw/display/vga-isa-mm.c | 1 -
>  hw/display/vga-isa.c    | 1 -
>  hw/display/vga-pci.c    | 1 -
>  hw/display/vga.c        | 1 -
>  hw/display/virtio-vga.c | 1 -
>  hw/display/vmware_vga.c | 1 -
>  9 files changed, 2 insertions(+), 9 deletions(-)

Reviewed-by: Thomas Huth <thuth@redhat.com>

Re: [Qemu-devel] [PATCH v3 16/42] i386/hax: remove duplicated include

[Philippe Mathieu-Daudé]

On 10/18/2017 09:12 AM, Thomas Huth wrote:
> On 17.10.2017 18:44, Philippe Mathieu-Daudé wrote:
>> this file in include in "target/i386/hax-i386.h":
>>
>>     #ifdef CONFIG_WIN32
>>     #include "target/i386/hax-windows.h"
>>     #endif
>>
>> which guaranty than sysemu/os-win32.h is previously included (CONFIG_WIN32)
> 
> which guaranties that ... ?

Oh :(
Michael if you take the whole series, do you mind changing this
description or do you want me to respin it? (if there is no further
functional change asked).

Regards,

Phil.

Re: [Qemu-devel] [PATCH v3 37/42] hw/display/vga: extract public API from i386/pc to "hw/display/vga.h"

[Thomas Huth]

On 17.10.2017 18:44, Philippe Mathieu-Daudé wrote:
> and remove the old i386/pc dependency.
> 
> Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
> ---
>  include/hw/display/vga.h | 25 +++++++++++++++++++++++++
>  include/hw/i386/pc.h     | 12 ------------
>  hw/display/vga-isa-mm.c  |  3 +--
>  hw/display/vga-isa.c     |  2 +-
>  hw/display/vga.c         |  2 +-
>  hw/mips/mips_jazz.c      |  1 +
>  vl.c                     |  2 +-
>  MAINTAINERS              |  1 +
>  8 files changed, 31 insertions(+), 17 deletions(-)
>  create mode 100644 include/hw/display/vga.h
> 
> diff --git a/include/hw/display/vga.h b/include/hw/display/vga.h
> new file mode 100644
> index 0000000000..0401a3a292
> --- /dev/null
> +++ b/include/hw/display/vga.h
> @@ -0,0 +1,25 @@
> +/*
> + * QEMU VGA Emulator.
> + *
> + * Copyright (c) 2003 Fabrice Bellard
> + *
> + * This work is licensed under the terms of the GNU GPL, version 2 or later.
> + * See the COPYING file in the top-level directory.
> + */
> +#ifndef QEMU_HW_DISPLAY_VGA_H
> +#define QEMU_HW_DISPLAY_VGA_H
> +
> +#include "exec/memory.h"
> +
> +enum vga_retrace_method {
> +    VGA_RETRACE_DUMB,
> +    VGA_RETRACE_PRECISE
> +};
> +
> +extern enum vga_retrace_method vga_retrace_method;
> +
> +int isa_vga_mm_init(hwaddr vram_base,
> +                    hwaddr ctrl_base, int it_shift,
> +                    MemoryRegion *address_space);
> +
> +#endif
> diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h
> index b1b4c918af..25ba378bd8 100644
> --- a/include/hw/i386/pc.h
> +++ b/include/hw/i386/pc.h
> @@ -302,18 +302,6 @@ PCIBus *find_i440fx(void);
>  extern PCIDevice *piix4_dev;
>  int piix4_init(PCIBus *bus, ISABus **isa_bus, int devfn);
>  
> -/* vga.c */
> -enum vga_retrace_method {
> -    VGA_RETRACE_DUMB,
> -    VGA_RETRACE_PRECISE
> -};
> -
> -extern enum vga_retrace_method vga_retrace_method;
> -
> -int isa_vga_mm_init(hwaddr vram_base,
> -                    hwaddr ctrl_base, int it_shift,
> -                    MemoryRegion *address_space);
> -
>  /* ne2000.c */
>  static inline bool isa_ne2000_init(ISABus *bus, int base, int irq, NICInfo *nd)
>  {
> diff --git a/hw/display/vga-isa-mm.c b/hw/display/vga-isa-mm.c
> index 68c4d6e23e..e887b45651 100644
> --- a/hw/display/vga-isa-mm.c
> +++ b/hw/display/vga-isa-mm.c
> @@ -23,10 +23,9 @@
>   */
>  #include "qemu/osdep.h"
>  #include "hw/hw.h"
> -#include "hw/i386/pc.h"
> +#include "hw/display/vga.h"
>  #include "vga_int.h"
>  #include "ui/pixel_ops.h"
> -#include "qemu/timer.h"
>  
>  #define VGA_RAM_SIZE (8192 * 1024)
>  
> diff --git a/hw/display/vga-isa.c b/hw/display/vga-isa.c
> index 26f69fd40a..469834add5 100644
> --- a/hw/display/vga-isa.c
> +++ b/hw/display/vga-isa.c
> @@ -25,7 +25,7 @@
>   */
>  #include "qemu/osdep.h"
>  #include "hw/hw.h"
> -#include "hw/i386/pc.h"
> +#include "hw/isa/isa.h"
>  #include "vga_int.h"
>  #include "ui/pixel_ops.h"
>  #include "qemu/timer.h"
> diff --git a/hw/display/vga.c b/hw/display/vga.c
> index 22fd069ad2..59729f7031 100644
> --- a/hw/display/vga.c
> +++ b/hw/display/vga.c
> @@ -24,7 +24,7 @@
>  #include "qemu/osdep.h"
>  #include "qapi/error.h"
>  #include "hw/hw.h"
> -#include "hw/i386/pc.h"
> +#include "hw/display/vga.h"
>  #include "hw/pci/pci.h"
>  #include "vga_int.h"
>  #include "vga_regs.h"
> diff --git a/hw/mips/mips_jazz.c b/hw/mips/mips_jazz.c
> index b9ffb33b45..ece4a153b2 100644
> --- a/hw/mips/mips_jazz.c
> +++ b/hw/mips/mips_jazz.c
> @@ -39,6 +39,7 @@
>  #include "hw/loader.h"
>  #include "hw/timer/mc146818rtc.h"
>  #include "hw/timer/i8254.h"
> +#include "hw/display/vga.h"
>  #include "hw/audio/pcspk.h"
>  #include "sysemu/block-backend.h"
>  #include "hw/sysbus.h"
> diff --git a/vl.c b/vl.c
> index 0d1f612629..f0b7106feb 100644
> --- a/vl.c
> +++ b/vl.c
> @@ -57,9 +57,9 @@ int main(int argc, char **argv)
>  #include "hw/boards.h"
>  #include "sysemu/accel.h"
>  #include "hw/usb.h"
> -#include "hw/i386/pc.h"
>  #include "hw/isa/isa.h"
>  #include "hw/scsi/scsi.h"
> +#include "hw/display/vga.h"
>  #include "hw/bt.h"
>  #include "sysemu/watchdog.h"
>  #include "hw/smbios/smbios.h"
> diff --git a/MAINTAINERS b/MAINTAINERS
> index 0e926a942b..81b67e4685 100644
> --- a/MAINTAINERS
> +++ b/MAINTAINERS
> @@ -860,6 +860,7 @@ F: hw/timer/hpet*
>  F: hw/timer/i8254*
>  F: hw/timer/mc146818rtc*
>  F: hw/watchdog/wdt_ib700.c
> +F: include/hw/display/vga.h
>  F: include/hw/i2c/pm_smbus.h
>  F: include/hw/isa/i8257.h
>  F: include/hw/timer/hpet.h

Not sure whether this is the right section for vga.h ... especially
since the other hw/display/vga* files are also not listed in MAINTAINERS
yet?

Anyway, the other parts of this patch look fine to me, so with or
without the change to MAINTAINERS:

Reviewed-by: Thomas Huth <thuth@redhat.com>

Re: [Qemu-devel] [PATCH v3 35/42] hw/display/vga: "vga.h" only contains registers defs, rename it "vga_regs.h"

[Thomas Huth]

On 17.10.2017 18:44, Philippe Mathieu-Daudé wrote:
> Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
> ---
>  hw/display/{vga.h => vga_regs.h} | 0
>  hw/display/vga.c                 | 2 +-
>  2 files changed, 1 insertion(+), 1 deletion(-)
>  rename hw/display/{vga.h => vga_regs.h} (100%)
> 
> diff --git a/hw/display/vga.h b/hw/display/vga_regs.h
> similarity index 100%
> rename from hw/display/vga.h
> rename to hw/display/vga_regs.h
> diff --git a/hw/display/vga.c b/hw/display/vga.c
> index ed24ef7076..35696b6fdd 100644
> --- a/hw/display/vga.c
> +++ b/hw/display/vga.c
> @@ -24,11 +24,11 @@
>  #include "qemu/osdep.h"
>  #include "qapi/error.h"
>  #include "hw/hw.h"
> -#include "vga.h"
>  #include "ui/console.h"
>  #include "hw/i386/pc.h"
>  #include "hw/pci/pci.h"
>  #include "vga_int.h"
> +#include "vga_regs.h"
>  #include "ui/pixel_ops.h"
>  #include "qemu/timer.h"
>  #include "hw/xen/xen.h"
> 

Reviewed-by: Thomas Huth <thuth@redhat.com>

Re: [Qemu-devel] [PATCH v3 40/42] i386/pc: move vmport.c to hw/i386/

[Thomas Huth]

On 17.10.2017 18:44, Philippe Mathieu-Daudé wrote:
> It's a x86-only device, so it does not make sense to keep it
> in the shared misc folder.
> 
> Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
> ---
>  hw/{misc => i386}/vmport.c | 0
>  hw/i386/Makefile.objs      | 1 +
>  hw/misc/Makefile.objs      | 2 --
>  3 files changed, 1 insertion(+), 2 deletions(-)
>  rename hw/{misc => i386}/vmport.c (100%)

Reviewed-by: Thomas Huth <thuth@redhat.com>

Re: [Qemu-devel] [PATCH v3 41/42] i386/pc: move vmmouse.c to hw/i386/

[Thomas Huth]

On 17.10.2017 18:44, Philippe Mathieu-Daudé wrote:
> It's a x86-only device, so it does not make sense to keep it
> in the shared misc folder.

s/misc/input/

> Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
> ---
>  hw/{input => i386}/vmmouse.c | 0
>  hw/i386/Makefile.objs        | 1 +
>  hw/input/Makefile.objs       | 1 -
>  3 files changed, 1 insertion(+), 1 deletion(-)
>  rename hw/{input => i386}/vmmouse.c (100%)

Reviewed-by: Thomas Huth <thuth@redhat.com>

Re: [Qemu-devel] [PATCH v3 00/42] remove i386/pc dependency from non-PC world (part 1)

[Philippe Mathieu-Daudé]

Hi Michael,

Since we are now in Soft Freeze, I'll respin this series rebased once
the next merge window opens.

On 10/17/2017 01:43 PM, Philippe Mathieu-Daudé wrote:
> Hi,
> 
> quite a bunch of patches and files modified, but the diffstat is not that big.
> 
> patches missing review: 2 3 16 20 21 33-37 39-41

In the meaning time patches 3 16 20 21 39 can still get some R|A-b :)

Regards,

Phil.

> since v3:
> 
> - addressed Thomas & Paolo comments (thanks for your reviews!)
> - split/fixed MAINTAINERS entries
> - dropped port92 patch
> - dropped i8237* patches
> 
> I couldn't test the KVM/XEN/HAX part (thanks Corey Minyard for v1 testing!).
> 
> since v2:
> - added R-b, A-b
> - added missing MAINTAINERS entries (as separate patches)
> - dma/i82374: avoid multiple creations on the same ISA bus
> - i386/pc: extract port92 from pc.c
> - i386/pc: move vmport.c/pvpanic.c from hw/misc/ to hw/i386/
> 
> v1:
> 
> - clean includes (mostly from script)
> - code movement (about no logical changes)
> 
> Regards,
> 
> Phil.
> 
> [----] : patches are identical
> [####] : number of functional differences between upstream/downstream patch
> [down] : patch is downstream-only
> The flags [FC] indicate (F)unctional and (C)ontextual differences, respectively
> 
> 001/42:[----] [--] 'MAINTAINERS: add entries for i2c/ppc4xx'
> 002/42:[down] 'MAINTAINERS: add an entry for the i82374 (southbridge)'
> 003/42:[down] 'MAINTAINERS: add an entry for the i8257 (DMA controller)'
> 004/42:[----] [--] 'MAINTAINERS: add an entry for the i82378 (superio)'
> 005/42:[----] [-C] 'MAINTAINERS: add an entry for watchdog/wdt_ib700'
> 006/42:[----] [--] 'MAINTAINERS: add an entry for input/pckbd.c'
> 007/42:[----] [--] 'MAINTAINERS: add entries for timer/m48t59'
> 008/42:[----] [--] 'MAINTAINERS: add missing entry for include/hw/net/'
> 009/42:[----] [--] 'hw: use "qemu/osdep.h" as first #include in source files'
> 010/42:[----] [--] 'hw: remove "qemu/osdep.h" from header files'
> 011/42:[----] [--] 'block: remove "qemu/osdep.h" from header file'
> 012/42:[----] [--] 'misc: remove headers implicitly included'
> 013/42:[----] [--] 'misc: remove duplicated includes'
> 014/42:[----] [--] 'ppc: remove duplicated includes'
> 015/42:[----] [--] 'i386/hax: remove duplicated includes'
> 016/42:[0013] [FC] 'i386/hax: remove duplicated include'
> 017/42:[----] [--] 'nios2: remove duplicated includes (in code commented out)'
> 018/42:[----] [--] 'misc: avoid "include/" in include path'
> 019/42:[----] [--] 'numa: remove unused #include'
> 020/42:[down] 'hw/input/vmmouse: remove unused #include'
> 021/42:[down] 'hw/misc/pvpanic: remove unused #include'
> 022/42:[----] [--] 'hw/ssi/aspeed_smc: remove unused #include'
> 023/42:[----] [--] 'amd_iommu: avoid needless includes in header file'
> 024/42:[0001] [FC] 'misc: remove old i386 dependency'
> 025/42:[----] [--] 'hw/ide: remove old i386 dependency'
> 026/42:[----] [--] 'hw/ipmi: remove old i386 dependency'
> 027/42:[----] [--] 'hw/i2c: remove old i386 dependency'
> 028/42:[----] [--] 'hw/tpm: remove old i386 dependency'
> 029/42:[----] [--] 'hw/virtio-balloon: remove old i386 dependency'
> 030/42:[0001] [FC] 'hw/unicore32: restrict hw addr defines to source file'
> 031/42:[----] [--] 'hw/timer/i8254: rename pit_init() -> i8254_pit_init()'
> 032/42:[----] [-C] 'hw/timer/mc146818: rename rtc_init() -> mc146818_rtc_init()'
> 033/42:[0003] [FC] 'hw/acpi: ACPI_PM_* defines are not restricted to i386 arch'
> 034/42:[down] 'hw/acpi/ich9: extract ACPI_PM_PROP_TCO_ENABLED from i386/pc'
> 035/42:[down] 'hw/display/vga: "vga.h" only contains registers defs, rename it "vga_regs.h"'
> 036/42:[down] 'hw/display/vga: "vga_int.h" requires "ui/console.h"'
> 037/42:[down] 'hw/display/vga: extract public API from i386/pc to "hw/display/vga.h"'
> 038/42:[----] [-C] 'hw/net/ne2000: extract ne2k-isa code from i386/pc to ne2000-isa.c'
> 039/42:[down] 'hw/misc/pvpanic: extract public API from i386/pc to "hw/misc/pvpanic.h"'
> 040/42:[down] 'i386/pc: move vmport.c to hw/i386/'
> 041/42:[down] 'i386/pc: move vmmouse.c to hw/i386/'
> 042/42:[----] [--] 'misc: drop old i386 dependency'
[...]

Re: [Qemu-devel] [PATCH v3 02/42] MAINTAINERS: add an entry for the i82374 (southbridge)

[Hervé Poussineau]

Le 17/10/2017 à 18:43, Philippe Mathieu-Daudé a écrit :
> Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
> ---
>   MAINTAINERS | 1 +
>   1 file changed, 1 insertion(+)
> 
> diff --git a/MAINTAINERS b/MAINTAINERS
> index 6f56c1349b..331f7391c1 100644
> --- a/MAINTAINERS
> +++ b/MAINTAINERS
> @@ -713,6 +713,7 @@ F: hw/ppc/prep_systemio.c
>   F: hw/ppc/rs6000_mc.c
>   F: hw/pci-host/prep.[hc]
>   F: hw/isa/pc87312.[hc]
> +F: hw/dma/i82374.c
>   F: pc-bios/ppc_rom.bin
>   
>   sPAPR
> 

Reviewed-by: Hervé Poussineau <hpoussin@reactos.org>

Re: [Qemu-devel] [PATCH v3 04/42] MAINTAINERS: add an entry for the i82378 (superio)

[Hervé Poussineau]

Le 17/10/2017 à 18:43, Philippe Mathieu-Daudé a écrit :
> Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
> Reviewed-by: Hervé Poussineau <hpoussin@reactos.org>
> ---
>   MAINTAINERS | 1 +
>   1 file changed, 1 insertion(+)
> 
> diff --git a/MAINTAINERS b/MAINTAINERS
> index 0706b474e7..510505b2f3 100644
> --- a/MAINTAINERS
> +++ b/MAINTAINERS
> @@ -712,6 +712,7 @@ F: hw/ppc/prep.c
>   F: hw/ppc/prep_systemio.c
>   F: hw/ppc/rs6000_mc.c
>   F: hw/pci-host/prep.[hc]
> +F: hw/isa/i82378.c
>   F: hw/isa/pc87312.[hc]
>   F: hw/dma/i82374.c
>   F: pc-bios/ppc_rom.bin
> 

Reviewed-by: Hervé Poussineau <hpoussin@reactos.org>

Re: [Qemu-devel] [PATCH v3 00/42] remove i386/pc dependency from non-PC world (part 1)

[Michael S. Tsirkin]

On Tue, Oct 17, 2017 at 01:43:44PM -0300, Philippe Mathieu-Daudé wrote:
> Hi,
> 
> quite a bunch of patches and files modified, but the diffstat is not that big.
> 
> patches missing review: 2 3 16 20 21 33-37 39-41

All my stuff looks good.  Series

Reviewed-by: Michael S. Tsirkin <mst@redhat.com>

If you like, and no one wants to, I can merge after the release.


> since v3:
> 
> - addressed Thomas & Paolo comments (thanks for your reviews!)
> - split/fixed MAINTAINERS entries
> - dropped port92 patch
> - dropped i8237* patches
> 
> I couldn't test the KVM/XEN/HAX part (thanks Corey Minyard for v1 testing!).
> 
> since v2:
> - added R-b, A-b
> - added missing MAINTAINERS entries (as separate patches)
> - dma/i82374: avoid multiple creations on the same ISA bus
> - i386/pc: extract port92 from pc.c
> - i386/pc: move vmport.c/pvpanic.c from hw/misc/ to hw/i386/
> 
> v1:
> 
> - clean includes (mostly from script)
> - code movement (about no logical changes)
> 
> Regards,
> 
> Phil.
> 
> [----] : patches are identical
> [####] : number of functional differences between upstream/downstream patch
> [down] : patch is downstream-only
> The flags [FC] indicate (F)unctional and (C)ontextual differences, respectively
> 
> 001/42:[----] [--] 'MAINTAINERS: add entries for i2c/ppc4xx'
> 002/42:[down] 'MAINTAINERS: add an entry for the i82374 (southbridge)'
> 003/42:[down] 'MAINTAINERS: add an entry for the i8257 (DMA controller)'
> 004/42:[----] [--] 'MAINTAINERS: add an entry for the i82378 (superio)'
> 005/42:[----] [-C] 'MAINTAINERS: add an entry for watchdog/wdt_ib700'
> 006/42:[----] [--] 'MAINTAINERS: add an entry for input/pckbd.c'
> 007/42:[----] [--] 'MAINTAINERS: add entries for timer/m48t59'
> 008/42:[----] [--] 'MAINTAINERS: add missing entry for include/hw/net/'
> 009/42:[----] [--] 'hw: use "qemu/osdep.h" as first #include in source files'
> 010/42:[----] [--] 'hw: remove "qemu/osdep.h" from header files'
> 011/42:[----] [--] 'block: remove "qemu/osdep.h" from header file'
> 012/42:[----] [--] 'misc: remove headers implicitly included'
> 013/42:[----] [--] 'misc: remove duplicated includes'
> 014/42:[----] [--] 'ppc: remove duplicated includes'
> 015/42:[----] [--] 'i386/hax: remove duplicated includes'
> 016/42:[0013] [FC] 'i386/hax: remove duplicated include'
> 017/42:[----] [--] 'nios2: remove duplicated includes (in code commented out)'
> 018/42:[----] [--] 'misc: avoid "include/" in include path'
> 019/42:[----] [--] 'numa: remove unused #include'
> 020/42:[down] 'hw/input/vmmouse: remove unused #include'
> 021/42:[down] 'hw/misc/pvpanic: remove unused #include'
> 022/42:[----] [--] 'hw/ssi/aspeed_smc: remove unused #include'
> 023/42:[----] [--] 'amd_iommu: avoid needless includes in header file'
> 024/42:[0001] [FC] 'misc: remove old i386 dependency'
> 025/42:[----] [--] 'hw/ide: remove old i386 dependency'
> 026/42:[----] [--] 'hw/ipmi: remove old i386 dependency'
> 027/42:[----] [--] 'hw/i2c: remove old i386 dependency'
> 028/42:[----] [--] 'hw/tpm: remove old i386 dependency'
> 029/42:[----] [--] 'hw/virtio-balloon: remove old i386 dependency'
> 030/42:[0001] [FC] 'hw/unicore32: restrict hw addr defines to source file'
> 031/42:[----] [--] 'hw/timer/i8254: rename pit_init() -> i8254_pit_init()'
> 032/42:[----] [-C] 'hw/timer/mc146818: rename rtc_init() -> mc146818_rtc_init()'
> 033/42:[0003] [FC] 'hw/acpi: ACPI_PM_* defines are not restricted to i386 arch'
> 034/42:[down] 'hw/acpi/ich9: extract ACPI_PM_PROP_TCO_ENABLED from i386/pc'
> 035/42:[down] 'hw/display/vga: "vga.h" only contains registers defs, rename it "vga_regs.h"'
> 036/42:[down] 'hw/display/vga: "vga_int.h" requires "ui/console.h"'
> 037/42:[down] 'hw/display/vga: extract public API from i386/pc to "hw/display/vga.h"'
> 038/42:[----] [-C] 'hw/net/ne2000: extract ne2k-isa code from i386/pc to ne2000-isa.c'
> 039/42:[down] 'hw/misc/pvpanic: extract public API from i386/pc to "hw/misc/pvpanic.h"'
> 040/42:[down] 'i386/pc: move vmport.c to hw/i386/'
> 041/42:[down] 'i386/pc: move vmmouse.c to hw/i386/'
> 042/42:[----] [--] 'misc: drop old i386 dependency'
> 
> Philippe Mathieu-Daudé (42):
>   MAINTAINERS: add entries for i2c/ppc4xx
>   MAINTAINERS: add an entry for the i82374 (southbridge)
>   MAINTAINERS: add an entry for the i8257 (DMA controller)
>   MAINTAINERS: add an entry for the i82378 (superio)
>   MAINTAINERS: add an entry for watchdog/wdt_ib700
>   MAINTAINERS: add an entry for input/pckbd.c
>   MAINTAINERS: add entries for timer/m48t59
>   MAINTAINERS: add missing entry for include/hw/net/
>   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
>   i386/hax: remove duplicated include
>   nios2: remove duplicated includes (in code commented out)
>   misc: avoid "include/" in include path
>   numa: remove unused #include
>   hw/input/vmmouse: remove unused #include
>   hw/misc/pvpanic: remove unused #include
>   hw/ssi/aspeed_smc: remove unused #include
>   amd_iommu: avoid needless includes in header file
>   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/timer/i8254: rename pit_init() -> i8254_pit_init()
>   hw/timer/mc146818: rename rtc_init() -> mc146818_rtc_init()
>   hw/acpi: ACPI_PM_* defines are not restricted to i386 arch
>   hw/acpi/ich9: extract ACPI_PM_PROP_TCO_ENABLED from i386/pc
>   hw/display/vga: "vga.h" only contains registers defs, rename it
>     "vga_regs.h"
>   hw/display/vga: "vga_int.h" requires "ui/console.h"
>   hw/display/vga: extract public API from i386/pc to "hw/display/vga.h"
>   hw/net/ne2000: extract ne2k-isa code from i386/pc to ne2000-isa.c
>   hw/misc/pvpanic: extract public API from i386/pc to
>     "hw/misc/pvpanic.h"
>   i386/pc: move vmport.c to hw/i386/
>   i386/pc: move vmmouse.c to hw/i386/
>   misc: drop old i386 dependency
> 
>  block/dmg.h                         |  1 -
>  hw/audio/fmopl.h                    |  1 -
>  hw/display/qxl.h                    |  1 -
>  hw/display/vga_int.h                |  3 ++-
>  hw/display/{vga.h => vga_regs.h}    |  0
>  hw/i386/amd_iommu.h                 |  5 ----
>  hw/net/ne2000.h                     |  3 +++
>  include/hw/acpi/acpi.h              | 11 +++++++++
>  include/hw/acpi/ich9.h              |  2 ++
>  include/hw/acpi/ipmi.h              |  1 -
>  include/hw/cpu/core.h               |  1 -
>  include/hw/display/vga.h            | 25 +++++++++++++++++++
>  include/hw/i2c/ppc4xx_i2c.h         |  1 -
>  include/hw/i386/pc.h                | 48 -------------------------------------
>  include/hw/misc/pvpanic.h           | 21 ++++++++++++++++
>  include/hw/net/ne2000-isa.h         | 33 +++++++++++++++++++++++++
>  include/hw/timer/i8254.h            |  5 ++--
>  include/hw/timer/i8254_internal.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           |  3 ---
>  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/core.c                      |  1 -
>  hw/acpi/ipmi-stub.c                 |  1 +
>  hw/alpha/dp264.c                    |  4 ++--
>  hw/arm/spitz.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/cirrus_vga.c             |  1 -
>  hw/display/vga-isa-mm.c             |  4 +---
>  hw/display/vga-isa.c                |  3 +--
>  hw/display/vga-pci.c                |  1 -
>  hw/display/vga.c                    |  5 ++--
>  hw/display/virtio-vga.c             |  1 -
>  hw/display/vmware_vga.c             |  1 -
>  hw/i2c/pm_smbus.c                   |  1 -
>  hw/i2c/smbus_ich9.c                 |  1 -
>  hw/i386/acpi-build.c                |  2 +-
>  hw/i386/amd_iommu.c                 |  5 +++-
>  hw/i386/kvm/pci-assign.c            |  1 -
>  hw/i386/pc.c                        |  5 ++--
>  hw/i386/pci-assign-load-rom.c       |  2 --
>  hw/{input => i386}/vmmouse.c        |  1 -
>  hw/{misc => i386}/vmport.c          |  0
>  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/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             |  4 ++--
>  hw/mips/mips_jazz.c                 |  5 ++--
>  hw/mips/mips_malta.c                |  4 ++--
>  hw/mips/mips_r4k.c                  |  5 ++--
>  hw/misc/ivshmem.c                   |  1 -
>  hw/misc/pvpanic.c                   | 12 ++++------
>  hw/misc/sga.c                       |  1 -
>  hw/moxie/moxiesim.c                 |  1 -
>  hw/net/ne2000-isa.c                 |  6 ++---
>  hw/net/ne2000.c                     |  2 --
>  hw/nios2/boot.c                     |  1 -
>  hw/pci-bridge/pci_expander_bridge.c |  1 -
>  hw/ppc/pnv.c                        |  2 +-
>  hw/ppc/prep.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/smbios/smbios_type_38-stub.c     |  1 +
>  hw/sparc/sun4m.c                    |  1 -
>  hw/ssi/aspeed_smc.c                 |  3 +--
>  hw/timer/i8254.c                    |  1 -
>  hw/timer/i8254_common.c             |  1 -
>  hw/timer/mc146818rtc.c              |  2 +-
>  hw/tpm/tpm_passthrough.c            |  1 -
>  hw/tpm/tpm_tis.c                    |  1 -
>  hw/unicore32/puv3.c                 | 15 ++++++++----
>  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            |  6 +----
>  target/nios2/helper.c               |  5 +---
>  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 +--
>  MAINTAINERS                         | 13 +++++++++-
>  hw/i386/Makefile.objs               |  2 ++
>  hw/input/Makefile.objs              |  1 -
>  hw/misc/Makefile.objs               |  2 --
>  122 files changed, 179 insertions(+), 221 deletions(-)
>  rename hw/display/{vga.h => vga_regs.h} (100%)
>  create mode 100644 include/hw/display/vga.h
>  create mode 100644 include/hw/misc/pvpanic.h
>  create mode 100644 include/hw/net/ne2000-isa.h
>  rename hw/{input => i386}/vmmouse.c (99%)
>  rename hw/{misc => i386}/vmport.c (100%)
> 
> -- 
> 2.15.0.rc0