Message ID | 1431509970-32154-1-git-send-email-mrezanin@redhat.com |
---|---|
State | New |
Headers | show |
On 13/05/2015 11:39, mrezanin@redhat.com wrote: > From: Miroslav Rezanina <mrezanin@redhat.com> > > 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 <mrezanin@redhat.com> > --- > 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
mrezanin@redhat.com writes: > From: Miroslav Rezanina <mrezanin@redhat.com> > > 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 <mrezanin@redhat.com> Reviewed-by: Markus Armbruster <armbru@redhat.com>
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]); + } + } +}