motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-08-11 03:24:58 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

hw/ppc/mac_newworld: do not require CONFIG_USB

Browse source 
With --without-default-devices it should not be required to have
devices in the binary that are removed by -nodefaults.  It should be
therefore possible to build a binary that does not include any USB
host controller or any of 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.

With this change, it is possible to change "select USB_OHCI_PCI" into
an "imply" directive.

Suggested-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Message-ID: <20240223124406.234509-7-pbonzini@redhat.com>
[PMD: Fixed style]
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
This commit is contained in:
Paolo Bonzini 2024-02-23 13:44:02 +01:00 • committed by Philippe Mathieu-Daudé
parent 82523f4add
commit 2dd2f2e0e2
2 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
hw/ppc/Kconfig
View file

@ -119,13 +119,13 @@ config MAC_NEWWORLD
imply PCI_DEVICES imply PCI_DEVICES
imply SUNGEM imply SUNGEM
imply TEST_DEVICES imply TEST_DEVICES
imply USB_OHCI_PCI
select ADB select ADB
select MACIO select MACIO
select MACIO_GPIO select MACIO_GPIO
select MAC_PMU select MAC_PMU
select UNIN_PCI select UNIN_PCI
select FW_CFG_PPC select FW_CFG_PPC
select USB_OHCI_PCI
config E500 config E500
bool bool

4
hw/ppc/mac_newworld.c
View file

@ -431,8 +431,10 @@ static void ppc_core99_init(MachineState *machine)
/* U3 needs to use USB for input because Linux doesn't support via-cuda /* U3 needs to use USB for input because Linux doesn't support via-cuda
on PPC64 */ on PPC64 */
if (!has_adb || machine_arch == ARCH_MAC99_U3) { if (!has_adb || machine_arch == ARCH_MAC99_U3) {
USBBus *usb_bus = usb_bus_find(-1); USBBus *usb_bus;
usb_bus = USB_BUS(object_resolve_type_unambiguous(TYPE_USB_BUS,
&error_abort));
usb_create_simple(usb_bus, "usb-kbd"); usb_create_simple(usb_bus, "usb-kbd");
usb_create_simple(usb_bus, "usb-mouse"); usb_create_simple(usb_bus, "usb-mouse");
} }