Am 7. Februar 2024 13:55:51 UTC schrieb Paolo Bonzini <pbonz...@redhat.com>:
>Il mer 7 feb 2024, 14:18 BALATON Zoltan <bala...@eik.bme.hu> ha scritto:
>
>> > if (defaults_enabled() && object_class_by_name("pci-ohci")) {
>> > 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-tablet");
>> > + Object *usb_bus = object_resolve_path_type("", TYPE_USB_BUS,
>> NULL);
>> > + usb_create_simple(USB_BUS(usb_bus), "usb-kbd");
>> > + usb_create_simple(USB_BUS(usb_bus), "usb-tablet");
>> > }
>> >
>> > for (i = 0; i < nb_nics; i++) {
>>
>> Is this hunk supposed to be in this patch?
>>
>
>Yes, it fixes compilation --without-default-devices (where usb_bus_find
>does not exist). Before this patch CONFIG_USB is always selected, even
>without default devices.
Might be worth pointing out in the commit message. I wondered about this, too.
Bernhard
>
>Paolo
>
>
>> Regards,
>> BALATON Zoltan
>>
>> > diff --git a/hw/display/Kconfig b/hw/display/Kconfig
>> > index 1aafe1923d2..5b2b3840f7a 100644
>> > --- a/hw/display/Kconfig
>> > +++ b/hw/display/Kconfig
>> > @@ -55,7 +55,7 @@ config VGA_MMIO
>> >
>> > config VMWARE_VGA
>> > bool
>> > - default y if PCI_DEVICES && PC_PCI
>> > + default y if PCI_DEVICES && (PC_PCI || MIPS)
>> > depends on PCI
>> > select VGA
>> >
>> > diff --git a/hw/mips/Kconfig b/hw/mips/Kconfig
>> > index e57db4f6412..5c83ef49cf6 100644
>> > --- a/hw/mips/Kconfig
>> > +++ b/hw/mips/Kconfig
>> > @@ -1,8 +1,15 @@
>> > config MALTA
>> > bool
>> > + imply PCNET_PCI
>> > + imply PCI_DEVICES
>> > + imply TEST_DEVICES
>> > select FDC37M81X
>> > select GT64120
>> > + select MIPS_CPS
>> > select PIIX
>> > + select PFLASH_CFI01
>> > + select SERIAL
>> > + select SMBUS_EEPROM
>> >
>> > config MIPSSIM
>> > bool
>> > @@ -31,17 +38,26 @@ config JAZZ
>> >
>> > config FULOONG
>> > bool
>> > + imply PCI_DEVICES
>> > + imply TEST_DEVICES
>> > + imply ATI_VGA
>> > + imply RTL8139_PCI
>> > select PCI_BONITO
>> > + select SMBUS_EEPROM
>> > select VT82C686
>> >
>> > config LOONGSON3V
>> > bool
>> > + imply PCI_DEVICES
>> > + imply TEST_DEVICES
>> > + imply VIRTIO_PCI
>> > + imply VIRTIO_NET
>> > imply VIRTIO_VGA
>> > imply QXL if SPICE
>> > + imply USB_OHCI_PCI
>> > select SERIAL
>> > select GOLDFISH_RTC
>> > select LOONGSON_LIOINTC
>> > - select PCI_DEVICES
>> > select PCI_EXPRESS_GENERIC_BRIDGE
>> > select MSI_NONBROKEN
>> > select FW_CFG_MIPS
>> > @@ -53,6 +69,8 @@ config MIPS_CPS
>> >
>> > config MIPS_BOSTON
>> > bool
>> > + imply PCI_DEVICES
>> > + imply TEST_DEVICES
>> > select FITLOADER
>> > select MIPS_CPS
>> > select PCI_EXPRESS_XILINX
>> >
>>
>>
