[v2] hw/hppa/Kconfig: Fix building with "configure --without-default-devices"

[PATCH v2] hw/hppa/Kconfig: Fix building with "configure --without-default-devices"

Posted by Thomas Huth 6 months, 3 weeks ago

When running "configure" with "--without-default-devices", building
of qemu-system-hppa currently fails with:

 /usr/bin/ld: libqemu-hppa-softmmu.fa.p/hw_hppa_machine.c.o: in function `machine_HP_common_init_tail':
 hw/hppa/machine.c:399: undefined reference to `usb_bus_find'
 /usr/bin/ld: hw/hppa/machine.c:399: undefined reference to `usb_create_simple'
 /usr/bin/ld: hw/hppa/machine.c:400: undefined reference to `usb_bus_find'
 /usr/bin/ld: hw/hppa/machine.c:400: undefined reference to `usb_create_simple'
 collect2: error: ld returned 1 exit status
 ninja: build stopped: subcommand failed.
 make: *** [Makefile:162: run-ninja] Error 1

And after fixing this, the qemu-system-hppa binary refuses to run
due to the missing 'pci-ohci' and 'pci-serial' devices. Let's add
the right config switches to fix these problems.

Signed-off-by: Thomas Huth <thuth@redhat.com>
---
 v2: Keep "select SERIAL" instead of replacing it

 hw/hppa/Kconfig | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/hw/hppa/Kconfig b/hw/hppa/Kconfig
index ff8528aaa8..dff5df7f72 100644
--- a/hw/hppa/Kconfig
+++ b/hw/hppa/Kconfig
@@ -7,6 +7,7 @@ config HPPA_B160L
     select DINO
     select LASI
     select SERIAL
+    select SERIAL_PCI
     select ISA_BUS
     select I8259
     select IDE_CMD646
@@ -16,3 +17,4 @@ config HPPA_B160L
     select LASIPS2
     select PARALLEL
     select ARTIST
+    select USB_OHCI_PCI
-- 
2.43.0

Re: [PATCH v2] hw/hppa/Kconfig: Fix building with "configure --without-default-devices"

Posted by Michael Tokarev 6 months, 2 weeks ago

16.02.2024 12:16, Thomas Huth :
> When running "configure" with "--without-default-devices", building
> of qemu-system-hppa currently fails with:
..

Applied to trivial-patches, thanks!

/mjt

Re: [PATCH v2] hw/hppa/Kconfig: Fix building with "configure --without-default-devices"

Posted by Paolo Bonzini 6 months, 3 weeks ago

On Fri, Feb 16, 2024 at 10:16 AM Thomas Huth <thuth@redhat.com> wrote:
>
> When running "configure" with "--without-default-devices", building
> of qemu-system-hppa currently fails with:
>
>  /usr/bin/ld: libqemu-hppa-softmmu.fa.p/hw_hppa_machine.c.o: in function `machine_HP_common_init_tail':
>  hw/hppa/machine.c:399: undefined reference to `usb_bus_find'
>  /usr/bin/ld: hw/hppa/machine.c:399: undefined reference to `usb_create_simple'
>  /usr/bin/ld: hw/hppa/machine.c:400: undefined reference to `usb_bus_find'
>  /usr/bin/ld: hw/hppa/machine.c:400: undefined reference to `usb_create_simple'
>  collect2: error: ld returned 1 exit status
>  ninja: build stopped: subcommand failed.
>  make: *** [Makefile:162: run-ninja] Error 1
>
> And after fixing this, the qemu-system-hppa binary refuses to run
> due to the missing 'pci-ohci' and 'pci-serial' devices. Let's add
> the right config switches to fix these problems.

USB_OHCI_PCI is something similar to what was going on with the
Loongsoon virt machine, and Philippe asked me to look at removing
usb_bus_find() everywhere. But I have no objection to having this
patch committed in the meanwhile.

Paolo

> Signed-off-by: Thomas Huth <thuth@redhat.com>
> ---
>  v2: Keep "select SERIAL" instead of replacing it
>
>  hw/hppa/Kconfig | 2 ++
>  1 file changed, 2 insertions(+)
>
> diff --git a/hw/hppa/Kconfig b/hw/hppa/Kconfig
> index ff8528aaa8..dff5df7f72 100644
> --- a/hw/hppa/Kconfig
> +++ b/hw/hppa/Kconfig
> @@ -7,6 +7,7 @@ config HPPA_B160L
>      select DINO
>      select LASI
>      select SERIAL
> +    select SERIAL_PCI
>      select ISA_BUS
>      select I8259
>      select IDE_CMD646
> @@ -16,3 +17,4 @@ config HPPA_B160L
>      select LASIPS2
>      select PARALLEL
>      select ARTIST
> +    select USB_OHCI_PCI
> --
> 2.43.0
>

Re: [PATCH v2] hw/hppa/Kconfig: Fix building with "configure --without-default-devices"

Posted by Philippe Mathieu-Daudé 6 months, 3 weeks ago

On 16/2/24 10:16, Thomas Huth wrote:
> When running "configure" with "--without-default-devices", building
> of qemu-system-hppa currently fails with:
> 
>   /usr/bin/ld: libqemu-hppa-softmmu.fa.p/hw_hppa_machine.c.o: in function `machine_HP_common_init_tail':
>   hw/hppa/machine.c:399: undefined reference to `usb_bus_find'
>   /usr/bin/ld: hw/hppa/machine.c:399: undefined reference to `usb_create_simple'
>   /usr/bin/ld: hw/hppa/machine.c:400: undefined reference to `usb_bus_find'
>   /usr/bin/ld: hw/hppa/machine.c:400: undefined reference to `usb_create_simple'
>   collect2: error: ld returned 1 exit status
>   ninja: build stopped: subcommand failed.
>   make: *** [Makefile:162: run-ninja] Error 1
> 
> And after fixing this, the qemu-system-hppa binary refuses to run
> due to the missing 'pci-ohci' and 'pci-serial' devices. Let's add
> the right config switches to fix these problems.
> 
> Signed-off-by: Thomas Huth <thuth@redhat.com>
> ---
>   v2: Keep "select SERIAL" instead of replacing it

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