Hi,

This series could be the 'part 2' of my previous "remove i386/pc dependency
from non-PC world" I started around 2.9.

As Hervé sent a PIIX4 series [1], I awoke this old branch to reduce duplicated
effort and added Hervé patches.

Hervé: what is missing from your series is the 'user_creatable' part, I'll
fix this when I find more spare time.

Regards,

Phil.

[1]: http://lists.nongnu.org/archive/html/qemu-devel/2018-01/msg01028.html

Hervé Poussineau (8):
  mc146818rtc: always register rtc to rtc list
  piix4: rename some variables in realize function
  piix4: convert reset function to QOM
  piix4: add Reset Control Register
  piix4: add a i8259 interrupt controller as specified in datasheet
  piix4: add a i8257 dma controller as specified in datasheet
  piix4: add a i8254 pit controller as specified in datasheet
  piix4: add a speaker as specified in datasheet

Philippe Mathieu-Daudé (21):
  hw/acpi: add mem/nvdimm.h dependency
  pci/pci_host: move generic definitions out of i386/pc.h
  hw/isa: extract parallel-isa specific code
  hw/dma/i8257: rename DMA_init() to i8257_dma_init()
  hw/input/i8042: extract declarations from i386/pc.h into input/i8042.h
  hw/isa: add a generic isa_superio_init()
  hw/i386/pc: use isa_superio_init()
  hw/mips/fulong2e: use isa_superio_init()
  hw/mips/malta: code movement
  hw/mips/malta: add fdc37m81x_init() which uses isa_superio_init()
  Revert "irq: introduce qemu_irq_proxy()"
  piix: move piix4 declaration into new southbridge/i82371_piix.h
  piix: move southbridge related declarations/definitions to i82371_piix.h
  piix3: extract piix3_init() from i440fx_init()
  hw/i386: extract i440fx related declarations/definitions to i440fx.h
  hw/i386: extract i440fx code from piix.c into i440fx.c
  hw/i386: move piix from hw/pci-host to hw/southbridge
  configs/mips-softmmu: use common CONFIG_PCI_PIIX instead of CONFIG_PIIX4
  piix3: convert reset function to QOM
  piix: merge common code from isa/piix4.c with southbridge piix3
  piix4: add isa_superio_init

 default-configs/i386-softmmu.mak        |   1 +
 default-configs/mips-softmmu-common.mak |   2 +-
 default-configs/x86_64-softmmu.mak      |   1 +
 include/hw/acpi/piix4.h                 |   6 -
 include/hw/char/parallel.h              |  14 +
 include/hw/{isa => dma}/i8257.h         |   6 +
 include/hw/i386/pc.h                    |  63 ----
 include/hw/input/i8042.h                |  25 ++
 include/hw/irq.h                        |   5 -
 include/hw/isa/isa.h                    |   2 -
 include/hw/isa/superio.h                |  17 +
 include/hw/pci-host/i440fx.h            |  51 +++
 include/hw/pci/pci_host.h               |   8 +
 include/hw/southbridge/i82371_piix.h    |  38 +++
 hw/acpi/ich9.c                          |   1 +
 hw/acpi/pcihp.c                         |   2 +-
 hw/acpi/piix4.c                         |   3 +-
 hw/alpha/dp264.c                        |   3 +-
 hw/char/parallel-isa.c                  |  29 ++
 hw/char/parallel.c                      |   2 +-
 hw/core/irq.c                           |  14 -
 hw/dma/i82374.c                         |   3 +-
 hw/dma/i8257.c                          |   4 +-
 hw/i386/acpi-build.c                    |   2 +-
 hw/i386/pc.c                            |  22 +-
 hw/i386/pc_piix.c                       |   2 +
 hw/i386/vmmouse.c                       |   1 +
 hw/i386/vmport.c                        |   1 +
 hw/input/pckbd.c                        |   2 +-
 hw/isa/isa-bus.c                        |  26 --
 hw/isa/isa-superio.c                    |  45 +++
 hw/isa/piix4.c                          | 146 --------
 hw/mips/gt64xxx_pci.c                   |   1 +
 hw/mips/mips_fulong2e.c                 |  12 +-
 hw/mips/mips_jazz.c                     |   5 +-
 hw/mips/mips_malta.c                    |  71 ++--
 hw/mips/mips_r4k.c                      |   3 +-
 hw/pci-host/{piix.c => i440fx.c}        | 409 +---------------------
 hw/ppc/prep.c                           |   5 +-
 hw/southbridge/piix.c                   | 586 ++++++++++++++++++++++++++++++++
 hw/sparc/sun4m.c                        |   4 -
 hw/sparc64/sun4u.c                      |   8 +-
 hw/timer/mc146818rtc.c                  |   6 +-
 hw/unicore32/puv3.c                     |   1 +
 stubs/pci-host-piix.c                   |   3 +-
 MAINTAINERS                             |  14 +-
 hw/Makefile.objs                        |   1 +
 hw/char/Makefile.objs                   |   1 +
 hw/isa/Makefile.objs                    |   2 +-
 hw/pci-host/Makefile.objs               |   2 +-
 hw/southbridge/Makefile.objs            |   1 +
 51 files changed, 923 insertions(+), 759 deletions(-)
 delete mode 100644 include/hw/acpi/piix4.h
 create mode 100644 include/hw/char/parallel.h
 rename include/hw/{isa => dma}/i8257.h (86%)
 create mode 100644 include/hw/input/i8042.h
 create mode 100644 include/hw/isa/superio.h
 create mode 100644 include/hw/pci-host/i440fx.h
 create mode 100644 include/hw/southbridge/i82371_piix.h
 create mode 100644 hw/char/parallel-isa.c
 create mode 100644 hw/isa/isa-superio.c
 delete mode 100644 hw/isa/piix4.c
 rename hw/pci-host/{piix.c => i440fx.c} (59%)
 create mode 100644 hw/southbridge/piix.c
 create mode 100644 hw/southbridge/Makefile.objs

-- 
2.15.1

For Hervé to test his VirtualPC2007.

 hw/southbridge/piix.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/hw/southbridge/piix.c b/hw/southbridge/piix.c
index 53ee177866..b800d538da 100644
--- a/hw/southbridge/piix.c
+++ b/hw/southbridge/piix.c
@@ -32,6 +32,7 @@
 #include "hw/dma/i8257.h"
 #include "hw/audio/pcspk.h"
 #include "hw/timer/i8254.h"
+#include "hw/isa/superio.h"
 #include "hw/xen/xen.h"
 
 #define PIIX_NUM_PIC_IRQS       16      /* i8259 * 2 */
@@ -538,6 +539,8 @@ static void piix4_realize(PCIDevice *pci_dev, Error **errp)
     /* DMA */
     i8257_dma_init(s->isa_bus, 0);
 
+    isa_superio_init(s->isa_bus, 2, 1, 1);
+
     piix4_dev = pci_dev;
 }
 
-- 
2.15.1