[v2] buildsys: Start shrinking qemu-user build process

[PATCH v2 10/18] hw/usb: move stubs out of stubs/

Posted by Paolo Bonzini 1 year, 10 months ago

Since the USB stubs are needed exactly when the Kconfig symbols are not
enabled, they can be placed in hw/usb/ and conditionalized on CONFIG_USB.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
 stubs/usb-dev-stub.c => hw/usb/bus-stub.c | 0
 hw/usb/meson.build                        | 2 +-
 stubs/meson.build                         | 1 -
 3 files changed, 1 insertion(+), 2 deletions(-)
 rename stubs/usb-dev-stub.c => hw/usb/bus-stub.c (100%)

diff --git a/stubs/usb-dev-stub.c b/hw/usb/bus-stub.c
similarity index 100%
rename from stubs/usb-dev-stub.c
rename to hw/usb/bus-stub.c
diff --git a/hw/usb/meson.build b/hw/usb/meson.build
index aac3bb35f27..23f7f7acb50 100644
--- a/hw/usb/meson.build
+++ b/hw/usb/meson.build
@@ -9,7 +9,7 @@ system_ss.add(when: 'CONFIG_USB', if_true: files(
   'desc-msos.c',
   'libhw.c',
   'pcap.c',
-))
+), if_false: files('bus-stub.c'))
 
 # usb host adapters
 system_ss.add(when: 'CONFIG_USB_UHCI', if_true: files('hcd-uhci.c'))
diff --git a/stubs/meson.build b/stubs/meson.build
index aa7120f7110..45616afbfaa 100644
--- a/stubs/meson.build
+++ b/stubs/meson.build
@@ -56,7 +56,6 @@ endif
 if have_system
   stub_ss.add(files('fw_cfg.c'))
   stub_ss.add(files('semihost.c'))
-  stub_ss.add(files('usb-dev-stub.c'))
   stub_ss.add(files('xen-hw-stub.c'))
   stub_ss.add(files('virtio-md-pci.c'))
 else
-- 
2.44.0

Re: [PATCH v2 10/18] hw/usb: move stubs out of stubs/

Posted by Richard Henderson 1 year, 10 months ago

On 4/8/24 05:53, Paolo Bonzini wrote:
> Since the USB stubs are needed exactly when the Kconfig symbols are not
> enabled, they can be placed in hw/usb/ and conditionalized on CONFIG_USB.
> 
> Signed-off-by: Paolo Bonzini<pbonzini@redhat.com>
> ---
>   stubs/usb-dev-stub.c => hw/usb/bus-stub.c | 0
>   hw/usb/meson.build                        | 2 +-
>   stubs/meson.build                         | 1 -
>   3 files changed, 1 insertion(+), 2 deletions(-)
>   rename stubs/usb-dev-stub.c => hw/usb/bus-stub.c (100%)

Reviewed-by: Richard Henderson <richard.henderson@linaro.org>

r~

Re: [PATCH v2 10/18] hw/usb: move stubs out of stubs/

Posted by Philippe Mathieu-Daudé 1 year, 10 months ago

On 8/4/24 17:53, Paolo Bonzini wrote:
> Since the USB stubs are needed exactly when the Kconfig symbols are not
> enabled, they can be placed in hw/usb/ and conditionalized on CONFIG_USB.
> 
> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
> ---
>   stubs/usb-dev-stub.c => hw/usb/bus-stub.c | 0
>   hw/usb/meson.build                        | 2 +-
>   stubs/meson.build                         | 1 -
>   3 files changed, 1 insertion(+), 2 deletions(-)
>   rename stubs/usb-dev-stub.c => hw/usb/bus-stub.c (100%)

> diff --git a/hw/usb/meson.build b/hw/usb/meson.build
> index aac3bb35f27..23f7f7acb50 100644
> --- a/hw/usb/meson.build
> +++ b/hw/usb/meson.build
> @@ -9,7 +9,7 @@ system_ss.add(when: 'CONFIG_USB', if_true: files(
>     'desc-msos.c',
>     'libhw.c',
>     'pcap.c',
> -))
> +), if_false: files('bus-stub.c'))

I like it because the stub is restricted to the
subsystem. Possibly easing maintenance.

> diff --git a/stubs/meson.build b/stubs/meson.build

> -  stub_ss.add(files('usb-dev-stub.c'))

Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>