Re: [PATCH 03/10] sh4: r2d: do not use usb_bus_find()

2024-02-25 Thread Thomas Huth 

On 23/02/2024 13.43, Paolo Bonzini wrote:

usb_bus_find() is always used with argument -1; it can be replaced with
a search of the single USB bus on the machine.

Suggested-by: Philippe Mathieu-Daudé 
Signed-off-by: Paolo Bonzini 
---
  hw/sh4/r2d.c | 4 +++-
  1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/hw/sh4/r2d.c b/hw/sh4/r2d.c
index c73e8f49b8a..4d34ad00d93 100644
--- a/hw/sh4/r2d.c
+++ b/hw/sh4/r2d.c
@@ -244,6 +244,7 @@ static void r2d_init(MachineState *machine)
  SysBusDevice *busdev;
  MemoryRegion *address_space_mem = get_system_memory();
  PCIBus *pci_bus;
+USBBus *usb_bus;
  
  cpu = SUPERH_CPU(cpu_create(machine->cpu_type));

  env = >env;
@@ -312,7 +313,8 @@ static void r2d_init(MachineState *machine)
  pci_init_nic_devices(pci_bus, mc->default_nic);
  
  /* USB keyboard */

-usb_create_simple(usb_bus_find(-1), "usb-kbd");
+usb_bus = USB_BUS(object_resolve_type_unambiguous(TYPE_USB_BUS, 
_abort));
+usb_create_simple(usb_bus, "usb-kbd");
  
  /* Todo: register on board registers */

  memset(_params, 0, sizeof(boot_params));


Reviewed-by: Thomas Huth

[PATCH 03/10] sh4: r2d: do not use usb_bus_find()

2024-02-23 Thread Paolo Bonzini 
usb_bus_find() is always used with argument -1; it can be replaced with
a search of the single USB bus on the machine.

Suggested-by: Philippe Mathieu-Daudé 
Signed-off-by: Paolo Bonzini 
---
 hw/sh4/r2d.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/hw/sh4/r2d.c b/hw/sh4/r2d.c
index c73e8f49b8a..4d34ad00d93 100644
--- a/hw/sh4/r2d.c
+++ b/hw/sh4/r2d.c
@@ -244,6 +244,7 @@ static void r2d_init(MachineState *machine)
 SysBusDevice *busdev;
 MemoryRegion *address_space_mem = get_system_memory();
 PCIBus *pci_bus;
+USBBus *usb_bus;
 
 cpu = SUPERH_CPU(cpu_create(machine->cpu_type));
 env = >env;
@@ -312,7 +313,8 @@ static void r2d_init(MachineState *machine)
 pci_init_nic_devices(pci_bus, mc->default_nic);
 
 /* USB keyboard */
-usb_create_simple(usb_bus_find(-1), "usb-kbd");
+usb_bus = USB_BUS(object_resolve_type_unambiguous(TYPE_USB_BUS, 
_abort));
+usb_create_simple(usb_bus, "usb-kbd");
 
 /* Todo: register on board registers */
 memset(_params, 0, sizeof(boot_params));
-- 
2.43.0