From nobody Mon Feb 9 11:48:38 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.45 as permitted sender) client-ip=209.85.221.45; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f45.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.45 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1619304080; cv=none; d=zohomail.com; s=zohoarc; b=bpvMblR5CTp5coZsv5A5hGCkNRgACLQFBKnNqZWZQgPgK5cMOxU55v7QlibOwO0UW1zogtHKLeM1ZpatbKgiatIKgv1khBmvamFksR2726Lfs80u46ddR3BnfJGLE0xUYYR5BX+prL3OaVNz1l5+MJ9GhcmjEafx7WG4HgY5rgI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1619304080; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=p/zy/Z+Qd/eJr8yIhJGl9KIuGgPFWP7jni5e955+Gj0=; b=W3dncwDuwTvtk3HsgY9ACwudgLc4dWIlRgBw9I6XOiEoDmU5AyNUwCGSlMh3KxXhaBV+egemej9LfXJWUtR1WBcAeO08GC6Snq1TRwdaIQHFBP3LBdLrlI95lbmNw3If3iafe3ekZp7u1ZPskcb0XujJIH71DcyT0kSXaVsE6Jk= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.45 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wr1-f45.google.com (mail-wr1-f45.google.com [209.85.221.45]) by mx.zohomail.com with SMTPS id 1619304080313487.10959971785815; Sat, 24 Apr 2021 15:41:20 -0700 (PDT) Received: by mail-wr1-f45.google.com with SMTP id h4so42952209wrt.12 for ; Sat, 24 Apr 2021 15:41:19 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.redhat.com (39.red-81-40-121.staticip.rima-tde.net. [81.40.121.39]) by smtp.gmail.com with ESMTPSA id e10sm13982097wrw.20.2021.04.24.15.41.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 24 Apr 2021 15:41:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=p/zy/Z+Qd/eJr8yIhJGl9KIuGgPFWP7jni5e955+Gj0=; b=bZwEw5QPLaAwEu5tfWSUZAAPdBCl79RdxVCZCmM9LRObKOC+y8FsYLuJK4vPXK6yru ygLkqTR8XRxyzeQ3UHcmDWPGQ+Euu6shY6uYLBHCpYL5aDB2GocqVhO6dVhPxRctNTXe lLfHG28miJ9SyyFs0cOoGwuPkhV1bBHC6HCaX2oda2ATI5GGVSzih1ZhYNSkP3habVrK aswZ9p6aJxIfH3hiF+TtOxeV98ywIxuaa+JTKUHm9DUOkWtaLjGQaV77jvk8fOTY6rqL tUSRgt4G/FJIgQ9vqkQEQCh45c/KrFKvM9WsAlGTVoSNCS6NqeWPxnNz6LpierACstXm TBMA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=p/zy/Z+Qd/eJr8yIhJGl9KIuGgPFWP7jni5e955+Gj0=; b=RQary4/uFAP+6QlDlUeL+boeL+75IUqWUsvAthewtIT4JwWeFvERGipJL0U7gocJed 0rikrHWjLgq5wQJUUEg7WhSGlfwzGPb7sql1NbOq0y9+Gv0uEwtFMVQrOAtI1Ut7qfZs mgxrQ8Fjukx3balR+ktuj+DTjD8EbI68io/KSDZBOqouC57C+SkUz4HXVZf47iLeNPLg 48Kd4REPEsA9Sxw1stTWeU+ayRBxxeEWxWrwroZ2jz2lJRkrCY+CATDH7tKdmlnYZ7Gc qRr1GWJ8rC1dkjruSxNmII3uFDFuHzhCqj5PJxXrB33DC0QGky1iy9SkJ7oDbwNRjkHJ 9SjQ== X-Gm-Message-State: AOAM530ePirXqFkNMKJtc42J1csgSCLC5Pj/k0KKnsFsQRb8iUNEro4H F4d+RxYhUMtqhtOU8pbyfgE= X-Google-Smtp-Source: ABdhPJzkrHT+HIROFYkQGx1mWNVQf9Y4Ab+yLfmeBcMVlDCHxxDgsn5UVjHbA3kxHsTJtiSnhjwN7A== X-Received: by 2002:a5d:4ccc:: with SMTP id c12mr13553277wrt.268.1619304078432; Sat, 24 Apr 2021 15:41:18 -0700 (PDT) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Gerd Hoffmann , Thomas Huth , Paolo Bonzini , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH 1/2] hw/usb/host-stub: Remove unused header Date: Sun, 25 Apr 2021 00:41:09 +0200 Message-Id: <20210424224110.3442424-2-f4bug@amsat.org> X-Mailer: git-send-email 2.26.3 In-Reply-To: <20210424224110.3442424-1-f4bug@amsat.org> References: <20210424224110.3442424-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson --- hw/usb/host-stub.c | 1 - 1 file changed, 1 deletion(-) diff --git a/hw/usb/host-stub.c b/hw/usb/host-stub.c index 538ed29684c..80809ceba54 100644 --- a/hw/usb/host-stub.c +++ b/hw/usb/host-stub.c @@ -31,7 +31,6 @@ */ =20 #include "qemu/osdep.h" -#include "ui/console.h" #include "hw/usb.h" #include "monitor/monitor.h" =20 --=20 2.26.3 From nobody Mon Feb 9 11:48:38 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.44 as permitted sender) client-ip=209.85.221.44; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f44.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.44 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1619304085; cv=none; d=zohomail.com; s=zohoarc; b=nuExQRWMbiShikx+l4LfG7tLAPY/9L3eGYVOEKwxz+DbRZMSEIVYRBthy2gpzkqo/AgV6GS1g+47bnEboeyjUENn7pZSL+uxpPkCGnTCDeECpeyH43u7O3qxfaINoBF4TjX1AX/BAqbuGphXOQlVx/P0sBjnHkK4S+bHT89DUtk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1619304085; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=dD10fcyTHziloH/OmXJ89/8ajkLj2G0VreI42lYIf04=; b=NWcet7XOywlUZLozb7eK/UOpU4bsPBrz29KuC8spiPq2qOHVTjvdI2ySZPT4XdxcDmE3Oxo+hYTCpjZDwKtF++eZWLCKTjEIARUtDFsFU3El3/M/NXP5OHKwILV2To67tz8N9s/84ObnoGVT8UOoonWR6MyPtnHo2urDHjmMrdk= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.44 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wr1-f44.google.com (mail-wr1-f44.google.com [209.85.221.44]) by mx.zohomail.com with SMTPS id 1619304085067534.0548299774205; Sat, 24 Apr 2021 15:41:25 -0700 (PDT) Received: by mail-wr1-f44.google.com with SMTP id k14so2076695wrv.5 for ; Sat, 24 Apr 2021 15:41:24 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.redhat.com (39.red-81-40-121.staticip.rima-tde.net. [81.40.121.39]) by smtp.gmail.com with ESMTPSA id o17sm14901274wrg.80.2021.04.24.15.41.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 24 Apr 2021 15:41:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=dD10fcyTHziloH/OmXJ89/8ajkLj2G0VreI42lYIf04=; b=Wad4lCJdqrCBc30MXtgaZMkAth8XLvSvgkBbZi3FAkfhwpKegOMu7P6L7q9OaIlNkw ekRUtXDZ7Y9cg3wRiGMfbO2iSRGow7PgyI+zQK+wnmRFspvETXOhWdM0Or1x2p/pRNLx PochWcwu9HapYubPmbkTNJf5tWxnItSTNG25I3/eRvQ/TC8MF1aQjiEevmsn4yabsMPH M7qtRfFJOxkVbu+O8QtDDNXF5tHJY7CnVs14+2sPJ+SVkvAZLaJ3kQShcLSfrfl2J9dq wQckPGAYOQg8kxaoq2kBYfNXac19USHQvdCu0xFbdsFDvessU6B9pnMK7H9BWyD/rSTM V4Cg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=dD10fcyTHziloH/OmXJ89/8ajkLj2G0VreI42lYIf04=; b=ZP9nEntJ0mADWry6mQQsiYQfo4WR4nJMArX3dL116X/uP1Gke/ypJ1MK/flY6v5oCo LRbDTEHinrH16pslozSFtKc7Uytj3uwl4W4rSNSXMnhFXIYQe4LwE/c2VEWSXKSQQI+s U9BOA5Wv8a9O5gPM828IdpmrGCYKNlA7IUZ8rDzEozcL6QHYB0TzzzU7fhfDY71rkR/Y i4S2qYTmK66hDpFMpkqmtdvQslcVvy8+tElnflmPMeuFD/WE/PnqH4v7LZ9BZz/IWoNt zGYSgPtmTyJo59LoUYgWTVEnSYztxYCXnYAcSdCdE0QZ+RCqN3fyHtUltiA3jTcgqnTm EP/A== X-Gm-Message-State: AOAM533qtBVwKDYXYniM5k4FcEux2NVpUDuLbu5AnOVj3IRu8dmXGgYn LuHndPOuh86iUVZ0gNerTmw= X-Google-Smtp-Source: ABdhPJz4CtonYKY4Nbg37JLfZxtHkTueSex7W2i5U4UAzJrL0B7YLpPYOok2RmjbGSMUYdRgWNsgeg== X-Received: by 2002:a5d:424a:: with SMTP id s10mr13735820wrr.70.1619304083293; Sat, 24 Apr 2021 15:41:23 -0700 (PDT) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Gerd Hoffmann , Thomas Huth , Paolo Bonzini , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH 2/2] hw/usb: Do not build USB subsystem if not required Date: Sun, 25 Apr 2021 00:41:10 +0200 Message-Id: <20210424224110.3442424-3-f4bug@amsat.org> X-Mailer: git-send-email 2.26.3 In-Reply-To: <20210424224110.3442424-1-f4bug@amsat.org> References: <20210424224110.3442424-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) If the Kconfig 'USB' value is not selected, it is pointless to build the USB core components. Add a stub for the HMP commands and usbdevice_create() which is called by usb_device_add in softmmu/vl.c. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson --- stubs/usb-dev-stub.c | 25 +++++++++++++++++++++++++ MAINTAINERS | 1 + hw/usb/meson.build | 9 +++------ stubs/meson.build | 1 + 4 files changed, 30 insertions(+), 6 deletions(-) create mode 100644 stubs/usb-dev-stub.c diff --git a/stubs/usb-dev-stub.c b/stubs/usb-dev-stub.c new file mode 100644 index 00000000000..b1adeeb4548 --- /dev/null +++ b/stubs/usb-dev-stub.c @@ -0,0 +1,25 @@ +/* + * QEMU USB device emulation stubs + * + * Copyright (C) 2021 Philippe Mathieu-Daud=C3=A9 + * + * SPDX-License-Identifier: GPL-2.0-or-later + */ + +#include "qemu/osdep.h" +#include "qemu/error-report.h" +#include "sysemu/sysemu.h" +#include "monitor/monitor.h" +#include "hw/usb.h" + +USBDevice *usbdevice_create(const char *driver) +{ + error_report("Support for USB devices not built-in"); + + return NULL; +} + +void hmp_info_usb(Monitor *mon, const QDict *qdict) +{ + monitor_printf(mon, "Support for USB devices not built-in\n"); +} diff --git a/MAINTAINERS b/MAINTAINERS index 36055f14c59..cd63d3efd8b 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1804,6 +1804,7 @@ USB M: Gerd Hoffmann S: Maintained F: hw/usb/* +F: stubs/usb-dev-stub.c F: tests/qtest/usb-*-test.c F: docs/usb2.txt F: docs/usb-storage.txt diff --git a/hw/usb/meson.build b/hw/usb/meson.build index fb7a74e73ae..f357270d0b6 100644 --- a/hw/usb/meson.build +++ b/hw/usb/meson.build @@ -1,17 +1,14 @@ hw_usb_modules =3D {} =20 # usb subsystem core -softmmu_ss.add(files( +softmmu_ss.add(when: 'CONFIG_USB', if_true: files( 'bus.c', 'combined-packet.c', 'core.c', - 'pcap.c', - 'libhw.c' -)) - -softmmu_ss.add(when: 'CONFIG_USB', if_true: files( 'desc.c', 'desc-msos.c', + 'libhw.c', + 'pcap.c', )) =20 # usb host adapters diff --git a/stubs/meson.build b/stubs/meson.build index be6f6d609e5..3faef16892b 100644 --- a/stubs/meson.build +++ b/stubs/meson.build @@ -50,6 +50,7 @@ endif if have_system stub_ss.add(files('semihost.c')) + stub_ss.add(files('usb-dev-stub.c')) stub_ss.add(files('xen-hw-stub.c')) else stub_ss.add(files('qdev.c')) --=20 2.26.3