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

[Markus Armbruster]

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 that is not build.
>
> Make calling parallel_hds_isa_init depending on CONFIG_PARALLEL so it can
> be correctly disabled.
>
> Signed-off-by: Miroslav Rezanina <address@hidden>

Sorry for breaking this.  Hope I didn't break more in the same series.
Have you tried CONFIG_SERIAL?

> ---
>  hw/i386/pc.c            | 2 ++
>  hw/mips/mips_fulong2e.c | 2 ++
>  hw/mips/mips_malta.c    | 2 ++
>  hw/sparc64/sun4u.c      | 2 ++
>  4 files changed, 8 insertions(+)
>
> diff --git a/hw/i386/pc.c b/hw/i386/pc.c
> index a8e6be1..560464e 100644
> --- a/hw/i386/pc.c
> +++ b/hw/i386/pc.c
> @@ -1465,7 +1465,9 @@ void pc_basic_device_init(ISABus *isa_bus, qemu_irq 
> *gsi,
>      }
>  
>      serial_hds_isa_init(isa_bus, MAX_SERIAL_PORTS);
> +#ifdef CONFIG_PARALLEL
>      parallel_hds_isa_init(isa_bus, MAX_PARALLEL_PORTS);
> +#endif
>  
>      a20_line = qemu_allocate_irqs(handle_a20_line_change, first_cpu, 2);
>      i8042 = isa_create_simple(isa_bus, "i8042");

We could confine the #ifdef to just one place, by doing patching pc.h
like

+#ifdef CONFIG_PARALLEL
 void parallel_hds_isa_init(ISABus *bus, int n);
+#else
+static inline void parallel_hds_isa_init(ISABus *bus, int n) { }
+#endif

But I'm fine with your patch as is.

Reviewed-by: Markus Armbruster <address@hidden>