From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44129) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YsAEZ-00088v-Eo for qemu-devel@nongnu.org; Tue, 12 May 2015 09:28:32 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YsA8f-0000pD-Qu for qemu-devel@nongnu.org; Tue, 12 May 2015 09:22:31 -0400 Received: from mx1.redhat.com ([209.132.183.28]:33561) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YsA8f-0000p8-IT for qemu-devel@nongnu.org; Tue, 12 May 2015 09:22:25 -0400 Received: from int-mx14.intmail.prod.int.phx2.redhat.com (int-mx14.intmail.prod.int.phx2.redhat.com [10.5.11.27]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id t4CDMOXA014078 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL) for ; Tue, 12 May 2015 09:22:24 -0400 Message-ID: <5551FE88.8060801@redhat.com> Date: Tue, 12 May 2015 15:22:16 +0200 From: Paolo Bonzini MIME-Version: 1.0 References: <9c01b2089bb2a10d8674d4c79a81b88d3f2866d9.1431411260.git.mrezanin@redhat.com> In-Reply-To: <9c01b2089bb2a10d8674d4c79a81b88d3f2866d9.1431411260.git.mrezanin@redhat.com> Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCHv3 1/2] 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 12/05/2015 08:22, 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 | 29 +++++++++++++++++++++++++++++ > 2 files changed, 29 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..94f645c 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,31 @@ 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_try_create(bus, "isa-parallel"); > + if (!isadev) { > + return; > + } > + 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]); > + } > + } > +} > ACK Paolo