From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:60498) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RazyB-0005nr-F7 for qemu-devel@nongnu.org; Wed, 14 Dec 2011 20:18:48 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Razy9-0001rv-SD for qemu-devel@nongnu.org; Wed, 14 Dec 2011 20:18:47 -0500 Received: from e6.ny.us.ibm.com ([32.97.182.146]:59564) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Razy9-0001rU-N8 for qemu-devel@nongnu.org; Wed, 14 Dec 2011 20:18:45 -0500 Received: from /spool/local by e6.ny.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Wed, 14 Dec 2011 20:18:42 -0500 Received: from d03av01.boulder.ibm.com (d03av01.boulder.ibm.com [9.17.195.167]) by d01relay04.pok.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id pBF1Hmff349114 for ; Wed, 14 Dec 2011 20:17:48 -0500 Received: from d03av01.boulder.ibm.com (loopback [127.0.0.1]) by d03av01.boulder.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id pBF1Hm10024864 for ; Wed, 14 Dec 2011 18:17:48 -0700 Message-ID: <4EE94AB9.8080702@us.ibm.com> Date: Wed, 14 Dec 2011 19:17:45 -0600 From: Anthony Liguori MIME-Version: 1.0 References: <1323903763-22933-1-git-send-email-hpoussin@reactos.org> In-Reply-To: <1323903763-22933-1-git-send-email-hpoussin@reactos.org> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit Subject: Re: [Qemu-devel] [PATCH v2 00/11] isa: preliminary work for multiple buses List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: =?UTF-8?B?SGVydsOpIFBvdXNzaW5lYXU=?= Cc: qemu-devel@nongnu.org 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: anthony@titi:~/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(-) >