PCIe and USB support can be disabled on the command line, and therefore should not be included if QEMU is configured --without-default-devices.
While at it, also remove the "default y" for USB_XHCI_SYSBUS because sysbus devices are not user creatable; boards that use them will specify them manually with "imply" or "select" clauses. Reported-by: Bruce Rogers <brog...@suse.com> Cc: Gerd Hoffmann <kra...@redhat.com> Signed-off-by: Paolo Bonzini <pbonz...@redhat.com> --- hw/i386/Kconfig | 4 ++-- hw/usb/Kconfig | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/hw/i386/Kconfig b/hw/i386/Kconfig index eea059ffef..16296dda84 100644 --- a/hw/i386/Kconfig +++ b/hw/i386/Kconfig @@ -96,6 +96,8 @@ config Q35 config MICROVM bool + imply PCI_EXPRESS_GENERIC_BRIDGE + imply USB_XHCI_SYSBUS select SERIAL_ISA # for serial_hds_isa_init() select ISA_BUS select APIC @@ -104,8 +106,6 @@ config MICROVM select MC146818RTC select VIRTIO_MMIO select ACPI_HW_REDUCED - select PCI_EXPRESS_GENERIC_BRIDGE - select USB_XHCI_SYSBUS config X86_IOMMU bool diff --git a/hw/usb/Kconfig b/hw/usb/Kconfig index 3b07d9cf68..7fbae18bc8 100644 --- a/hw/usb/Kconfig +++ b/hw/usb/Kconfig @@ -47,7 +47,6 @@ config USB_XHCI_NEC config USB_XHCI_SYSBUS bool - default y select USB_XHCI config USB_MUSB -- 2.28.0