[Qemu-commits] [qemu/qemu] 1401c3: Split serial-isa into its own config option

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: 1401c322c8d431fa750cff8276ab725e406086ac
      
https://github.com/qemu/qemu/commit/1401c322c8d431fa750cff8276ab725e406086ac
  Author: David Gibson <address@hidden>
  Date:   2017-02-06 (Mon, 06 Feb 2017)

  Changed paths:
    M default-configs/alpha-softmmu.mak
    M default-configs/arm-softmmu.mak
    M default-configs/i386-softmmu.mak
    M default-configs/mips-softmmu-common.mak
    M default-configs/moxie-softmmu.mak
    M default-configs/pci.mak
    M default-configs/ppc-softmmu.mak
    M default-configs/ppc64-softmmu.mak
    M default-configs/ppcemb-softmmu.mak
    M default-configs/sh4-softmmu.mak
    M default-configs/sh4eb-softmmu.mak
    M default-configs/sparc64-softmmu.mak
    M default-configs/x86_64-softmmu.mak
    M hw/char/Makefile.objs

  Log Message:
  -----------
  Split serial-isa into its own config option

At present, the core device model code for 8250-like serial ports
(serial.c) and the code for serial ports attached to ISA-style legacy IO
(serial-isa.c) are both controlled by the CONFIG_SERIAL variable.

There are lots and lots of embedded platforms that have 8250-like serial
ports but have never had anything resembling ISA legacy IO.  Therefore,
split serial-isa into its own CONFIG_SERIAL_ISA option so it can be
disabled for platforms where it's not appropriate.

For now, I enabled CONFIG_SERIAL_ISA in every default-config where
CONFIG_SERIAL is enabled, excepting microblaze, or32, and xtensa.  As best
as I can tell, those platforms never used legacy ISA, and also don't
include PCI support (which would allow connection of a PCI->ISA bridge
and/or a southbridge including legacy ISA serial ports).

Signed-off-by: David Gibson <address@hidden>
Reviewed-by: Thomas Huth <address@hidden>
Acked-by: Christian Borntraeger <address@hidden>
Reviewed-by: Markus Armbruster <address@hidden>
Reviewed-by: Edgar E. Iglesias <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>


  Commit: 1fc125f5675df8f861c7a66fab6922c630a81eb6
      
https://github.com/qemu/qemu/commit/1fc125f5675df8f861c7a66fab6922c630a81eb6
  Author: David Gibson <address@hidden>
  Date:   2017-02-06 (Mon, 06 Feb 2017)

  Changed paths:
    M default-configs/moxie-softmmu.mak
    M default-configs/pci.mak
    M default-configs/sparc-softmmu.mak
    M default-configs/unicore32-softmmu.mak
    M hw/isa/Makefile.objs

  Log Message:
  -----------
  Allow ISA bus to be configured out

Currently, the code to handle the legacy ISA bus is always included in
qemu.  However there are lots of platforms that don't include ISA legacy
devies, and quite a few that have never used ISA legacy devices at all.

This patch allows the ISA bus code to be disabled in the configuration for
platforms where it doesn't make sense.

For now, the default configs are adjusted to include ISA on all platforms
including PCI: anything with PCI can at least in principle add an i82378
PCI->ISA bridge.  Also, CONFIG_IDE_CORE which is already in pci.mak
requires ISA support.

We also explicitly enable ISA on some other non-PCI platforms which include
ISA devices: moxie, sparc and unicore32.  We may want to pare this down in
future.

The platforms that will lose ISA by default are: cris, lm32, microblazeel,
microblaze, openrisc, s390x, tricore, xtensaeb, xtensa.  As far as I can
tell none of these ever used ISA.

Signed-off-by: David Gibson <address@hidden>
Acked-by: Michael S. Tsirkin <address@hidden>
Reviewed-by: Markus Armbruster <address@hidden>
Reviewed-by: Edgar E. Iglesias <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>


  Commit: c124c4d13bcb19fc866e7f6de075f906fca6af4a
      
https://github.com/qemu/qemu/commit/c124c4d13bcb19fc866e7f6de075f906fca6af4a
  Author: David Gibson <address@hidden>
  Date:   2017-02-06 (Mon, 06 Feb 2017)

  Changed paths:
    M hw/timer/Makefile.objs
    A hw/timer/m48t59-internal.h
    A hw/timer/m48t59-isa.c
    M hw/timer/m48t59.c

  Log Message:
  -----------
  Split ISA and sysbus versions of m48t59 device

The m48t59 device supports both ISA and direct sysbus attached versions of
the device in the one .c file.  This can be awkward for some embedded
machine types which need the sysbus M48T59, but don't want to pull in the
ISA bus code and its other dependencies.

Therefore, this patch splits out the code for the ISA attached M48T59 into
its own C file.  It will be built when both CONFIG_M48T59 and
CONFIG_ISA_BUS are enabled.

Signed-off-by: David Gibson <address@hidden>
Reviewed-by: Edgar E. Iglesias <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>


  Commit: c192325242f0040a9c3d245f843bb5552b391c15
      
https://github.com/qemu/qemu/commit/c192325242f0040a9c3d245f843bb5552b391c15
  Author: Peter Maydell <address@hidden>
  Date:   2017-02-06 (Mon, 06 Feb 2017)

  Changed paths:
    M default-configs/alpha-softmmu.mak
    M default-configs/arm-softmmu.mak
    M default-configs/i386-softmmu.mak
    M default-configs/mips-softmmu-common.mak
    M default-configs/moxie-softmmu.mak
    M default-configs/pci.mak
    M default-configs/ppc-softmmu.mak
    M default-configs/ppc64-softmmu.mak
    M default-configs/ppcemb-softmmu.mak
    M default-configs/sh4-softmmu.mak
    M default-configs/sh4eb-softmmu.mak
    M default-configs/sparc-softmmu.mak
    M default-configs/sparc64-softmmu.mak
    M default-configs/unicore32-softmmu.mak
    M default-configs/x86_64-softmmu.mak
    M hw/char/Makefile.objs
    M hw/isa/Makefile.objs
    M hw/timer/Makefile.objs
    A hw/timer/m48t59-internal.h
    A hw/timer/m48t59-isa.c
    M hw/timer/m48t59.c

  Log Message:
  -----------
  Merge remote-tracking branch 'remotes/dgibson/tags/isa-cleanup-20170206' into 
staging

Allow ISA to be disabled on some platforms (v3)

This makes some cleanups that are a start on allowing ISA to be
compiled out for platforms which don't use it.

I posted this series last November, and it collected a number of R-bs
and no apparent objections.  So, I've now rebased it (trivially) and
am sending a pull request in the hopes of merge.  A lot of the pieces
here don't have a clear maintainer, so I'm sending it directly to
Peter.

Notes:
  * Patch 3/3 triggers a style warning, but that's just because I'm
    moving a C++ // comment verbatim from one file to another

Changes since v2:
  * Trivial rebase

Changes since v1:
  * Fixed some silly compile errors in 3/3 exposed by some
    changes in other headers

# gpg: Signature made Mon 06 Feb 2017 01:37:50 GMT
# gpg:                using RSA key 0x6C38CACA20D9B392
# gpg: Good signature from "David Gibson <address@hidden>"
# gpg:                 aka "David Gibson (Red Hat) <address@hidden>"
# gpg:                 aka "David Gibson (ozlabs.org) <address@hidden>"
# gpg:                 aka "David Gibson (kernel.org) <address@hidden>"
# Primary key fingerprint: 75F4 6586 AE61 A66C C44E  87DC 6C38 CACA 20D9 B392

* remotes/dgibson/tags/isa-cleanup-20170206:
  Split ISA and sysbus versions of m48t59 device
  Allow ISA bus to be configured out
  Split serial-isa into its own config option

Signed-off-by: Peter Maydell <address@hidden>


Compare: https://github.com/qemu/qemu/compare/a951316b8a5c...c192325242f0