Re: [PATCH 05/10] hppa: do not require CONFIG_USB

[BALATON Zoltan]

On Fri, 23 Feb 2024, Thomas Huth wrote:
> On 23/02/2024 13.44, Paolo Bonzini wrote:
> > With --without-default-devices it is possible to build a binary that
> > does not include any USB host controller and therefore that does not
> > include the code guarded by CONFIG_USB.  While the simpler creation
> > functions such as usb_create_simple can be inlined, this is not true
> > of usb_bus_find().  Remove it, replacing it with a search of the single
> > USB bus on the machine.
> >
> > Suggested-by: Philippe Mathieu-Daudé <philmd@linaro.org>
> > Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
> > ---
> >   hw/hppa/machine.c | 7 ++++---
> >   hw/hppa/Kconfig   | 2 +-
> >   2 files changed, 5 insertions(+), 4 deletions(-)
> >
> > diff --git a/hw/hppa/machine.c b/hw/hppa/machine.c
> > index 5fcaf5884be..11982d5776c 100644
> > --- a/hw/hppa/machine.c
> > +++ b/hw/hppa/machine.c
> > @@ -396,10 +396,11 @@ static void machine_HP_common_init_tail(MachineState 
> > *machine, PCIBus *pci_bus,
> >       }
> >         /* create USB OHCI controller for USB keyboard & mouse on Astro 
> > machines */
> > -    if (!lasi_dev && machine->enable_graphics) {
> > +    if (!lasi_dev && machine->enable_graphics && defaults_enabled()) {
>
> Do we need the defaults_enabled() here? Isn't enable_graphics already 
> disabled if defaults_enabled() is not set?

Isn't enable_graphics controlled by -nographic and defaults_enabled 
controlled by -nodefaults? I think they are independent but maybe that 
does not answer the question if it's needed or not.

Regards,
BALATON Zoltan

> Thomas
>
>
> >           pci_create_simple(pci_bus, -1, "pci-ohci");
> > -        usb_create_simple(usb_bus_find(-1), "usb-kbd");
> > -        usb_create_simple(usb_bus_find(-1), "usb-mouse");
> > +        Object *usb_bus = object_resolve_type_unambiguous(TYPE_USB_BUS, 
> > &error_abort);
> > +        usb_create_simple(USB_BUS(usb_bus), "usb-kbd");
> > +        usb_create_simple(USB_BUS(usb_bus), "usb-mouse");
> >       }