From: "Philippe Mathieu-Daudé" <philmd@linaro.org>
To: qemu-devel@nongnu.org
Cc: qemu-ppc@nongnu.org, qemu-block@nongnu.org, qemu-arm@nongnu.org,
"Paolo Bonzini" <pbonzini@redhat.com>,
"Philippe Mathieu-Daudé" <philmd@linaro.org>,
"Gerd Hoffmann" <kraxel@redhat.com>
Subject: [PULL 19/30] hw/usb: remove duplicate file in system_ss
Date: Tue, 27 Feb 2024 09:39:35 +0100 [thread overview]
Message-ID: <20240227083948.5427-20-philmd@linaro.org> (raw)
In-Reply-To: <20240227083948.5427-1-philmd@linaro.org>
From: Paolo Bonzini <pbonzini@redhat.com>
Because USB_EHCI_SYSBUS selects USB_EHCI, there is no need to include
hcd-ehci.c explicitly.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Message-ID: <20240223124406.234509-11-pbonzini@redhat.com>
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
---
hw/usb/meson.build | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/hw/usb/meson.build b/hw/usb/meson.build
index 94f0e3b034..aac3bb35f2 100644
--- a/hw/usb/meson.build
+++ b/hw/usb/meson.build
@@ -18,7 +18,7 @@ system_ss.add(when: 'CONFIG_USB_OHCI_PCI', if_true: files('hcd-ohci-pci.c'))
system_ss.add(when: 'CONFIG_USB_OHCI_SYSBUS', if_true: files('hcd-ohci-sysbus.c'))
system_ss.add(when: 'CONFIG_USB_EHCI', if_true: files('hcd-ehci.c'))
system_ss.add(when: 'CONFIG_USB_EHCI_PCI', if_true: files('hcd-ehci-pci.c'))
-system_ss.add(when: 'CONFIG_USB_EHCI_SYSBUS', if_true: files('hcd-ehci.c', 'hcd-ehci-sysbus.c'))
+system_ss.add(when: 'CONFIG_USB_EHCI_SYSBUS', if_true: files('hcd-ehci-sysbus.c'))
system_ss.add(when: 'CONFIG_USB_XHCI', if_true: files('hcd-xhci.c'))
system_ss.add(when: 'CONFIG_USB_XHCI_PCI', if_true: files('hcd-xhci-pci.c'))
system_ss.add(when: 'CONFIG_USB_XHCI_SYSBUS', if_true: files('hcd-xhci-sysbus.c'))
--
2.41.0
next prev parent reply other threads:[~2024-02-27 8:42 UTC|newest]
Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-02-27 8:39 [PULL 00/30] Misc HW patches for 2024-02-27 Philippe Mathieu-Daudé
2024-02-27 8:39 ` [PULL 01/30] hw/arm: Inline sysbus_create_simple(PL110 / PL111) Philippe Mathieu-Daudé
2024-02-27 8:39 ` [PULL 02/30] hw/display/pl110: Pass frame buffer memory region as link property Philippe Mathieu-Daudé
2024-02-27 8:39 ` [PULL 03/30] hw/arm/exynos4210: Inline sysbus_create_varargs(EXYNOS4210_FIMD) Philippe Mathieu-Daudé
2024-02-27 8:39 ` [PULL 04/30] hw/display/exynos4210_fimd: Pass frame buffer memory region as link Philippe Mathieu-Daudé
2024-02-27 8:39 ` [PULL 05/30] hw/i386/kvmvapic: Inline sysbus_address_space() Philippe Mathieu-Daudé
2024-02-27 8:39 ` [PULL 06/30] hw/sysbus: Remove now unused sysbus_address_space() Philippe Mathieu-Daudé
2024-02-27 8:39 ` [PULL 07/30] hw/nubus-device: round Declaration ROM memory region address to qemu_target_page_size() Philippe Mathieu-Daudé
2024-02-27 8:39 ` [PULL 08/30] hw/nubus: increase maximum Declaration ROM size from 128k to 1Mb Philippe Mathieu-Daudé
2024-02-27 8:39 ` [PULL 09/30] hw/nubus: add nubus-virtio-mmio device Philippe Mathieu-Daudé
2024-02-27 8:39 ` [PULL 10/30] hw/acpi: move object_resolve_type_unambiguous to core QOM Philippe Mathieu-Daudé
2024-02-27 8:39 ` [PULL 11/30] hw/ppc/sam460ex: do not use usb_bus_find() Philippe Mathieu-Daudé
2024-02-27 8:39 ` [PULL 12/30] hw/sh4/r2d: " Philippe Mathieu-Daudé
2024-02-27 8:39 ` [PULL 13/30] hw/mips/loongson3_virt: do not require CONFIG_USB Philippe Mathieu-Daudé
2024-02-27 8:39 ` [PULL 14/30] hw/hppa: " Philippe Mathieu-Daudé
2024-02-27 8:39 ` [PULL 15/30] hw/ppc/mac_newworld: " Philippe Mathieu-Daudé
2024-02-27 8:39 ` [PULL 16/30] hw/ppc/pseries: " Philippe Mathieu-Daudé
2024-02-27 8:39 ` [PULL 17/30] hw/usb: remove usb_bus_find Philippe Mathieu-Daudé
2024-02-27 8:39 ` [PULL 18/30] hw/usb: extract sysbus-ohci to a separate file Philippe Mathieu-Daudé
2024-02-27 8:39 ` Philippe Mathieu-Daudé [this message]
2024-02-27 8:39 ` [PULL 20/30] hw/nvme: fix invalid endian conversion Philippe Mathieu-Daudé
2024-02-27 8:39 ` [PULL 21/30] hw/i386/x86: Let ioapic_init_gsi() take parent as pointer Philippe Mathieu-Daudé
2024-02-27 8:39 ` [PULL 22/30] hw/i386/sgx: Use QDev API Philippe Mathieu-Daudé
2024-02-27 8:39 ` [PULL 23/30] hw/i386/q35: Include missing 'hw/acpi/acpi.h' header Philippe Mathieu-Daudé
2024-02-27 8:39 ` [PULL 24/30] hw/i386/pc: Rename "bus" attribute to "pcibus" Philippe Mathieu-Daudé
2024-02-27 8:39 ` [PULL 25/30] hw/i386/pc_{piix, q35}: Eliminate local pci_bus/pci_host variables Philippe Mathieu-Daudé
2024-02-27 8:39 ` [PULL 26/30] hw/i386/pc: Remove unneeded class attribute "kvmclock_enabled" Philippe Mathieu-Daudé
2024-02-27 8:39 ` [PULL 27/30] hw/i386/pc: Populate RTC attribute directly Philippe Mathieu-Daudé
2024-02-27 8:39 ` [PULL 28/30] hw/arm/sbsa-ref: Do not open-code ahci_ide_create_devs() Philippe Mathieu-Daudé
2024-02-27 8:39 ` [PULL 29/30] hw/ide: Remove last two uses of ide/internal.h outside of hw/ide/ Philippe Mathieu-Daudé
2024-02-27 8:39 ` [PULL 30/30] hw/ide: Include 'ide-internal.h' from current path Philippe Mathieu-Daudé
2024-02-27 12:33 ` [PULL 00/30] Misc HW patches for 2024-02-27 Peter Maydell
2024-02-27 12:33 ` Peter Maydell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240227083948.5427-20-philmd@linaro.org \
--to=philmd@linaro.org \
--cc=kraxel@redhat.com \
--cc=pbonzini@redhat.com \
--cc=qemu-arm@nongnu.org \
--cc=qemu-block@nongnu.org \
--cc=qemu-devel@nongnu.org \
--cc=qemu-ppc@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).