Re: [Qemu-devel] [PATCHv2] parallel: Allow to disable CONFIG_PARALLEL

[Miroslav Rezanina]

On Mon, May 11, 2015 at 08:46:19AM +0200, Markus Armbruster wrote:
> address@hidden writes:
> 
> > From: Miroslav Rezanina <address@hidden>
> >
> > Disabling CONFIG_PARALLEL cause build failure as commit 07dc788 factored
> > out initialization to parallel_hds_isa_init function in hw/char/parallel.c 
> > that is not build. 
> >
> > Stub file is added to be able to disable CONFIG_PARALLEL. This file is used
> > in targets using parallel_hds_isa_init and provide empty definition of this
> > function.
> >
> > Signed-off-by: Miroslav Rezanina <address@hidden>
> >
> > ---
> >  hw/i386/Makefile.objs    | 1 +
> >  hw/mips/Makefile.objs    | 2 ++
> >  hw/sparc64/Makefile.objs | 2 ++
> >  stubs/parallel-stub.c    | 7 +++++++
> 
> Nitpick: the existing stub/*.c naming practice suggests
> stubs/parallel.c.

Yeah...I forget to rename it after moving from repository
root to stub directory. I originally have it in repository
root as it is not included in libqemustub. So the naming can
be treated as hint that something is different. However,
I can rename it to follow stubs/* naming.
> 
> >  4 files changed, 12 insertions(+)
> >  create mode 100644 stubs/parallel-stub.c
> >
> > diff --git a/hw/i386/Makefile.objs b/hw/i386/Makefile.objs
> > index e058a39..2b7131a 100644
> > --- a/hw/i386/Makefile.objs
> > +++ b/hw/i386/Makefile.objs
> > @@ -4,6 +4,7 @@ obj-y += pc.o pc_piix.o pc_q35.o
> >  obj-y += pc_sysfw.o
> >  obj-y += intel_iommu.o
> >  obj-$(CONFIG_XEN) += ../xenpv/ xen/
> > +obj-$(call lnot,$(CONFIG_PARALLEL)) += ../../stubs/parallel-stub.o
> >  
> >  obj-y += kvmvapic.o
> >  obj-y += acpi-build.o
> 
> Can we rely on the linker to pull parallel-stub.o from a suitable .a
> libqemustub.a when needed?

We do not have to as parallel-stub.o is not included in libqemustub.a.
It is linked directly in case CONFIG_PARALLEL is not defined (for
targets using parallel_hds_isa_init).

Mirek

> 
> > diff --git a/hw/mips/Makefile.objs b/hw/mips/Makefile.objs
> > index 0a652f8..2e65305 100644
> > --- a/hw/mips/Makefile.objs
> > +++ b/hw/mips/Makefile.objs
> > @@ -2,3 +2,5 @@ obj-y += mips_r4k.o mips_jazz.o mips_malta.o mips_mipssim.o
> >  obj-y += addr.o cputimer.o mips_int.o
> >  obj-$(CONFIG_FULONG) += mips_fulong2e.o
> >  obj-y += gt64xxx_pci.o
> > +obj-$(call lnot,$(CONFIG_PARALLEL)) += ../../stubs/parallel-stub.o
> > +
> > diff --git a/hw/sparc64/Makefile.objs b/hw/sparc64/Makefile.objs
> > index a84cfe3..7696611 100644
> > --- a/hw/sparc64/Makefile.objs
> > +++ b/hw/sparc64/Makefile.objs
> > @@ -1 +1,3 @@
> >  obj-y += sun4u.o
> > +obj-$(call lnot,$(CONFIG_PARALLEL)) += ../../stubs/parallel-stub.o
> > +
> > diff --git a/stubs/parallel-stub.c b/stubs/parallel-stub.c
> > new file mode 100644
> > index 0000000..949c1b2
> > --- /dev/null
> > +++ b/stubs/parallel-stub.c
> > @@ -0,0 +1,7 @@
> > +#include "qemu/typedefs.h"
> > +#include "hw/isa/isa.h"
> > +#include "hw/i386/pc.h"
> > +
> > +void parallel_hds_isa_init(ISABus *bus, int n)
> > +{
> > +}