[Qemu-devel] Re: [PATCH 05/15] Make --disable-usb to really remove usb support

[Jan Kiszka]

address@hidden wrote:
> From: Juan Quintela <address@hidden>
> 
> 
> Signed-off-by: Juan Quintela <address@hidden>
> ---
>  Makefile          |    7 ++++++-
>  Makefile.target   |    7 ++++++-
>  configure         |   34 ++++++++++++++++++++++------------
>  hw/nseries.c      |    2 ++
>  hw/pc.c           |    2 ++
>  hw/ppc_newworld.c |    2 ++
>  hw/ppc_oldworld.c |    3 ++-
>  hw/ppc_prep.c     |    2 ++
>  hw/pxa2xx.c       |    4 ++++
>  hw/realview.c     |    2 ++
>  hw/usb.h          |    3 +++
>  hw/versatilepb.c  |    2 ++
>  monitor.c         |    2 ++
>  qemu-monitor.hx   |    4 ++++
>  qemu-options.hx   |    2 ++
>  sysemu.h          |    4 ++++
>  vl.c              |   14 +++++++++++---
>  17 files changed, 78 insertions(+), 18 deletions(-)
> 

...

> diff --git a/hw/nseries.c b/hw/nseries.c
> index b412aa0..55648e1 100644
> --- a/hw/nseries.c
> +++ b/hw/nseries.c
> @@ -1314,8 +1314,10 @@ static void n8x0_init(ram_addr_t ram_size, const char 
> *boot_device,
>      n8x0_dss_setup(s);
>      n8x0_cbus_setup(s);
>      n8x0_uart_setup(s);
> +#ifdef CONFIG_USB
>      if (usb_enabled)
>          n8x0_usb_setup(s);
> +#endif

I think there are some good patterns available to avoid this #ifdef all
over the place. Check how kvm_enabled works, e.g.

Jan

-- 
Siemens AG, Corporate Technology, CT SE 2
Corporate Competence Center Embedded Linux