From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51415) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YsTXW-0005AF-0x for qemu-devel@nongnu.org; Wed, 13 May 2015 06:05:23 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YsTXQ-00046g-AF for qemu-devel@nongnu.org; Wed, 13 May 2015 06:05:21 -0400 Received: from mx1.redhat.com ([209.132.183.28]:42200) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YsTXQ-00046T-55 for qemu-devel@nongnu.org; Wed, 13 May 2015 06:05:16 -0400 Received: from int-mx13.intmail.prod.int.phx2.redhat.com (int-mx13.intmail.prod.int.phx2.redhat.com [10.5.11.26]) by mx1.redhat.com (Postfix) with ESMTPS id 594818F003 for ; Wed, 13 May 2015 10:05:15 +0000 (UTC) Message-ID: <555321D7.9050505@redhat.com> Date: Wed, 13 May 2015 12:05:11 +0200 From: Paolo Bonzini MIME-Version: 1.0 References: <1431509970-32154-1-git-send-email-mrezanin@redhat.com> In-Reply-To: <1431509970-32154-1-git-send-email-mrezanin@redhat.com> Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCHv4] Move parallel_hds_isa_init to hw/isa/isa-bus.c List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: mrezanin@redhat.com, qemu-devel@nongnu.org Cc: armbru@redhat.com On 13/05/2015 11:39, mrezanin@redhat.com wrote: > From: Miroslav Rezanina > > Disabling CONFIG_PARALLEL cause removing parallel_hds_isa_init defined in > parallel.c. This function is called during initialization of some boards so > disabling CONFIG_PARALLEL cause build failure. > > This patch moves parallel_hds_isa_init to hw/isa/isa-bus.c so it is included > in case of disabled CONFIG_PARALLEL. Build is successful but qemu will abort > with "Unknown device" error when function is called. > > Signed-off-by: Miroslav Rezanina > --- > hw/char/parallel.c | 25 ------------------------- > hw/isa/isa-bus.c | 26 ++++++++++++++++++++++++++ > 2 files changed, 26 insertions(+), 25 deletions(-) > > diff --git a/hw/char/parallel.c b/hw/char/parallel.c > index 4079554..c2b553f 100644 > --- a/hw/char/parallel.c > +++ b/hw/char/parallel.c > @@ -641,28 +641,3 @@ static void parallel_register_types(void) > } > > type_init(parallel_register_types) > - > -static void parallel_init(ISABus *bus, int index, CharDriverState *chr) > -{ > - DeviceState *dev; > - ISADevice *isadev; > - > - isadev = isa_create(bus, "isa-parallel"); > - dev = DEVICE(isadev); > - qdev_prop_set_uint32(dev, "index", index); > - qdev_prop_set_chr(dev, "chardev", chr); > - qdev_init_nofail(dev); > -} > - > -void parallel_hds_isa_init(ISABus *bus, int n) > -{ > - int i; > - > - assert(n <= MAX_PARALLEL_PORTS); > - > - for (i = 0; i < n; i++) { > - if (parallel_hds[i]) { > - parallel_init(bus, i, parallel_hds[i]); > - } > - } > -} > diff --git a/hw/isa/isa-bus.c b/hw/isa/isa-bus.c > index 825aa62..ec8e7de 100644 > --- a/hw/isa/isa-bus.c > +++ b/hw/isa/isa-bus.c > @@ -21,6 +21,7 @@ > #include "hw/sysbus.h" > #include "sysemu/sysemu.h" > #include "hw/isa/isa.h" > +#include "hw/i386/pc.h" > > static ISABus *isabus; > > @@ -267,3 +268,28 @@ MemoryRegion *isa_address_space_io(ISADevice *dev) > } > > type_init(isabus_register_types) > + > +static void parallel_init(ISABus *bus, int index, CharDriverState *chr) > +{ > + DeviceState *dev; > + ISADevice *isadev; > + > + isadev = isa_create(bus, "isa-parallel"); > + dev = DEVICE(isadev); > + qdev_prop_set_uint32(dev, "index", index); > + qdev_prop_set_chr(dev, "chardev", chr); > + qdev_init_nofail(dev); > +} > + > +void parallel_hds_isa_init(ISABus *bus, int n) > +{ > + int i; > + > + assert(n <= MAX_PARALLEL_PORTS); > + > + for (i = 0; i < n; i++) { > + if (parallel_hds[i]) { > + parallel_init(bus, i, parallel_hds[i]); > + } > + } > +} > Thanks, applied for 2.4. Paolo