Re: [Qemu-devel] [PATCH v2 00/11] isa: preliminary work for multiple buses

[Anthony Liguori]

On 12/14/2011 05:02 PM, Hervé Poussineau wrote:
> Current patches are a rework of my patches already available at [1].
> They don't provide full support for multiple ISA buses (yet), but
> add a ISABus or ISADevice argument to all ISA functions.
> They are mostly mechanically touching every instanciation of ISA
> devices, so number of lines is quite high even if impact is quite low.
>
> Some patches don't pass checkpass check due to spaces around
> parentheses, but malc asked to do so on files he maintains.
>
> Some more patches need to be provided to support multiple ISA buses,
> but they will mostly touch ISA bridges and hw/isa-bus.c file.

I'm not sure which patch did it, but this series breaks the build:

address@hidden:~/build/qemu$ make
  CC    libhw64/vl.o
In file included from /home/anthony/git/qemu/hw/pc.h:7:0,
                 from /home/anthony/git/qemu/vl.c:120:
/home/anthony/git/qemu/hw/isa.h:12:23: error: redefinition of typedef ‘ISABus’
/home/anthony/git/qemu/qemu-common.h:220:23: note: previous declaration of 
‘ISABus’ was here
make[1]: *** [vl.o] Error 1
make: *** [subdir-libhw64] Error 2

Because qemu-common.h and isa.h both 'typedef struct ISABus ISABus'.  You should 
remove it from qemu-common.h.

Regards,

Anthony Liguori

> Thanks
>
> [1] http://lists.gnu.org/archive/html/qemu-devel/2011-10/msg00094.html
>
> Changes v1->v2
>         rebased
>
> Hervé Poussineau (11):
>    isa: give ISABus/ISADevice to isa_create(), isa_bus_irqs() and
>      isa_get_irq() functions
>    isa: move ISABus structure definition to header file
>    i8259: give ISA device to isa_register_ioport()
>    pc: give ISA bus to ISA methods
>    alpha: give ISA bus to ISA methods
>    sun4u: give ISA bus to ISA methods
>    fulong2e: give ISA bus to ISA methods
>    malta: give ISA bus to ISA methods
>    isa: always use provided ISA bus when creating an isa device
>    isa: always use provided ISA bus in isa_bus_irqs()
>    audio: remove unused parameter isa_pic
>
>   arch_init.c        |   10 +++++-----
>   arch_init.h        |    2 +-
>   hw/adlib.c         |    2 +-
>   hw/alpha_dp264.c   |   12 +++++++-----
>   hw/alpha_sys.h     |    3 ++-
>   hw/alpha_typhoon.c |    9 +++++----
>   hw/audiodev.h      |    8 ++++----
>   hw/cs4231a.c       |    4 ++--
>   hw/fdc.h           |    4 ++--
>   hw/gus.c           |    4 ++--
>   hw/i8254.c         |    2 +-
>   hw/i8259.c         |   10 +++++-----
>   hw/ide.h           |    2 +-
>   hw/ide/isa.c       |    4 ++--
>   hw/ide/piix.c      |    2 +-
>   hw/ide/via.c       |    2 +-
>   hw/isa-bus.c       |   33 ++++++++++++++++-----------------
>   hw/isa.h           |   16 +++++++++++-----
>   hw/m48t59.c        |    5 +++--
>   hw/mc146818rtc.c   |    4 ++--
>   hw/mc146818rtc.h   |    2 +-
>   hw/mips_fulong2e.c |   20 ++++++++++----------
>   hw/mips_jazz.c     |   13 +++++++------
>   hw/mips_malta.c    |   27 ++++++++++++++-------------
>   hw/mips_r4k.c      |   21 +++++++++++----------
>   hw/nvram.h         |    3 ++-
>   hw/pc.c            |   28 ++++++++++++++--------------
>   hw/pc.h            |   39 ++++++++++++++++++++-------------------
>   hw/pc_piix.c       |   20 +++++++++++---------
>   hw/pcspk.c         |    2 +-
>   hw/piix4.c         |    3 ++-
>   hw/piix_pci.c      |    8 +++++---
>   hw/ppc_prep.c      |   20 +++++++++++---------
>   hw/sb16.c          |    4 ++--
>   hw/sun4u.c         |   24 +++++++++++++++---------
>   hw/vt82c686.c      |    4 ++--
>   hw/vt82c686.h      |    2 +-
>   qemu-common.h      |    1 +
>   38 files changed, 204 insertions(+), 175 deletions(-)