diff mbox series

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

Message ID 20240209185506.248001-1-thuth@redhat.com
State New
Headers show
Series hw/hppa/Kconfig: Fix building with "configure --without-default-devices" | expand

Commit Message

Thomas Huth Feb. 9, 2024, 6:55 p.m. UTC
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>
---
 hw/hppa/Kconfig | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

Comments

Helge Deller Feb. 9, 2024, 7:19 p.m. UTC | #1
On 2/9/24 19:55, 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>
> ---
>   hw/hppa/Kconfig | 3 ++-
>   1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/hw/hppa/Kconfig b/hw/hppa/Kconfig
> index ff8528aaa8..124d5e9e47 100644
> --- a/hw/hppa/Kconfig
> +++ b/hw/hppa/Kconfig
> @@ -6,7 +6,7 @@ config HPPA_B160L
>       select ASTRO
>       select DINO
>       select LASI
> -    select SERIAL
> +    select SERIAL_PCI

I think the "SERIAL" is needed too for the B160L machine.
Other than that,

Acked-by: Helge Deller <deller@gmx.de>

Thank you!
Helge

>       select ISA_BUS
>       select I8259
>       select IDE_CMD646
> @@ -16,3 +16,4 @@ config HPPA_B160L
>       select LASIPS2
>       select PARALLEL
>       select ARTIST
> +    select USB_OHCI_PCI
BALATON Zoltan Feb. 9, 2024, 7:46 p.m. UTC | #2
On Fri, 9 Feb 2024, Helge Deller wrote:
> On 2/9/24 19:55, 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>
>> ---
>>   hw/hppa/Kconfig | 3 ++-
>>   1 file changed, 2 insertions(+), 1 deletion(-)
>> 
>> diff --git a/hw/hppa/Kconfig b/hw/hppa/Kconfig
>> index ff8528aaa8..124d5e9e47 100644
>> --- a/hw/hppa/Kconfig
>> +++ b/hw/hppa/Kconfig
>> @@ -6,7 +6,7 @@ config HPPA_B160L
>>       select ASTRO
>>       select DINO
>>       select LASI
>> -    select SERIAL
>> +    select SERIAL_PCI
>
> I think the "SERIAL" is needed too for the B160L machine.

SERIAL_PCI selects SERIAL so I think it should be pulled in without 
listing it separately but not sure what's the policy for these configs.

Regards,
BALATON Zoltan

> Other than that,
>
> Acked-by: Helge Deller <deller@gmx.de>
>
> Thank you!
> Helge
>
>>       select ISA_BUS
>>       select I8259
>>       select IDE_CMD646
>> @@ -16,3 +16,4 @@ config HPPA_B160L
>>       select LASIPS2
>>       select PARALLEL
>>       select ARTIST
>> +    select USB_OHCI_PCI
>
>
>
Philippe Mathieu-Daudé Feb. 9, 2024, 8:42 p.m. UTC | #3
On 9/2/24 20:46, BALATON Zoltan wrote:
> On Fri, 9 Feb 2024, Helge Deller wrote:
>> On 2/9/24 19:55, 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>
>>> ---
>>>   hw/hppa/Kconfig | 3 ++-
>>>   1 file changed, 2 insertions(+), 1 deletion(-)
>>>
>>> diff --git a/hw/hppa/Kconfig b/hw/hppa/Kconfig
>>> index ff8528aaa8..124d5e9e47 100644
>>> --- a/hw/hppa/Kconfig
>>> +++ b/hw/hppa/Kconfig
>>> @@ -6,7 +6,7 @@ config HPPA_B160L
>>>       select ASTRO
>>>       select DINO
>>>       select LASI
>>> -    select SERIAL
>>> +    select SERIAL_PCI
>>
>> I think the "SERIAL" is needed too for the B160L machine.
> 
> SERIAL_PCI selects SERIAL so I think it should be pulled in without 
> listing it separately but not sure what's the policy for these configs.

We prefer explicit dependencies.

SERIAL is for Lasi/Dino serial_mm_init().

Although pulling in SERIAL, SERIAL_PCI is for pci-serial*.

> Regards,
> BALATON Zoltan
> 
>> Other than that,
>>
>> Acked-by: Helge Deller <deller@gmx.de>
>>
>> Thank you!
>> Helge
>>
>>>       select ISA_BUS
>>>       select I8259
>>>       select IDE_CMD646
>>> @@ -16,3 +16,4 @@ config HPPA_B160L
>>>       select LASIPS2
>>>       select PARALLEL
>>>       select ARTIST
>>> +    select USB_OHCI_PCI
>>
>>
>>
>
Thomas Huth Feb. 10, 2024, 4:09 p.m. UTC | #4
On 09/02/2024 21.42, Philippe Mathieu-Daudé wrote:
> On 9/2/24 20:46, BALATON Zoltan wrote:
>> On Fri, 9 Feb 2024, Helge Deller wrote:
>>> On 2/9/24 19:55, 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>
>>>> ---
>>>>   hw/hppa/Kconfig | 3 ++-
>>>>   1 file changed, 2 insertions(+), 1 deletion(-)
>>>>
>>>> diff --git a/hw/hppa/Kconfig b/hw/hppa/Kconfig
>>>> index ff8528aaa8..124d5e9e47 100644
>>>> --- a/hw/hppa/Kconfig
>>>> +++ b/hw/hppa/Kconfig
>>>> @@ -6,7 +6,7 @@ config HPPA_B160L
>>>>       select ASTRO
>>>>       select DINO
>>>>       select LASI
>>>> -    select SERIAL
>>>> +    select SERIAL_PCI
>>>
>>> I think the "SERIAL" is needed too for the B160L machine.
>>
>> SERIAL_PCI selects SERIAL so I think it should be pulled in without 
>> listing it separately 

Yes, that was my thinking when I replaced it.

> We prefer explicit dependencies.
> 
> SERIAL is for Lasi/Dino serial_mm_init().
> 
> Although pulling in SERIAL, SERIAL_PCI is for pci-serial*.

Ok, I can respin the patch to add SERIAL_PCI in addition instead of 
replacing SERIAL.

  Thomas


>> Regards,
>> BALATON Zoltan
>>
>>> Other than that,
>>>
>>> Acked-by: Helge Deller <deller@gmx.de>
>>>
>>> Thank you!
>>> Helge
>>>
>>>>       select ISA_BUS
>>>>       select I8259
>>>>       select IDE_CMD646
>>>> @@ -16,3 +16,4 @@ config HPPA_B160L
>>>>       select LASIPS2
>>>>       select PARALLEL
>>>>       select ARTIST
>>>> +    select USB_OHCI_PCI
>>>
>>>
>>>
>>
>
diff mbox series

Patch

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