From patchwork Sat Apr 24 22:41:09 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 12222887 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7DB11C43460 for ; Sat, 24 Apr 2021 22:42:55 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id A546F60FE9 for ; Sat, 24 Apr 2021 22:42:54 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org A546F60FE9 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=amsat.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:37062 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1laQzE-0003IO-Lk for qemu-devel@archiver.kernel.org; Sat, 24 Apr 2021 18:42:52 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57944) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1laQxl-0002IE-TC for qemu-devel@nongnu.org; Sat, 24 Apr 2021 18:41:21 -0400 Received: from mail-wr1-x42f.google.com ([2a00:1450:4864:20::42f]:41871) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1laQxk-0001Kb-KR for qemu-devel@nongnu.org; Sat, 24 Apr 2021 18:41:21 -0400 Received: by mail-wr1-x42f.google.com with SMTP id c4so13086958wrt.8 for ; Sat, 24 Apr 2021 15:41:19 -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=TlX4vKBqlS0qPjZGkvWuGEpHMfwspHNH5AUMOt7CvP+nYDQDNLDh+/xoDtuAlPAc0Y eK3nMN5XK/RmtSi9KyA8gmlyl0kQ6gceZGkbLNQPKi/B0DeIyYmYNXAOxaFHmZegrDge Q+JGnszXXp0MoWZ5ORqqTw+Iq6YqUTTZq7ZCyMxgqXIsoDnDBV+aZvSd3dcuQ3k/hQQh /NbfZd5mnKNjebypKpuoIBVVoe/dMY55T7lecW2xPIGB6nsRlJq49QjW+gvvULVTZRVR P5rEex+0BQDmvriMrtaGVVhWXsdUhCLmcECP375ubqI/PXxbgm/Faz2+iyvwqJBdIWo5 hpBA== X-Gm-Message-State: AOAM533WQUXVtAEuX10egE0JEts6RAEFzT0FmRdMzcCMm8RLJ6L5GLCz UKzh7uckEbopn1p+ICFmfmh91yv3MwwpKg== 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) 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) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org 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 Received-SPF: pass client-ip=2a00:1450:4864:20::42f; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-x42f.google.com X-Spam_score_int: -14 X-Spam_score: -1.5 X-Spam_bar: - X-Spam_report: (-1.5 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.25, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.249, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Paolo Bonzini , Thomas Huth , Gerd Hoffmann , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Signed-off-by: Philippe Mathieu-Daudé 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 @@ */ #include "qemu/osdep.h" -#include "ui/console.h" #include "hw/usb.h" #include "monitor/monitor.h" From patchwork Sat Apr 24 22:41:10 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 12222889 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 87FACC433ED for ; Sat, 24 Apr 2021 22:44:18 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 1B9F9613DE for ; Sat, 24 Apr 2021 22:44:18 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 1B9F9613DE Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=amsat.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:41316 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1laR0b-00052k-8E for qemu-devel@archiver.kernel.org; Sat, 24 Apr 2021 18:44:17 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57970) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1laQxr-0002Ji-69 for qemu-devel@nongnu.org; Sat, 24 Apr 2021 18:41:32 -0400 Received: from mail-wr1-x42b.google.com ([2a00:1450:4864:20::42b]:45033) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1laQxo-0001MY-Re for qemu-devel@nongnu.org; Sat, 24 Apr 2021 18:41:26 -0400 Received: by mail-wr1-x42b.google.com with SMTP id e7so43015629wrs.11 for ; Sat, 24 Apr 2021 15:41:24 -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=oXcdc0s3nvI00uOmY8XNuOVUyD7nkS0BF/ElWt68mjtos/KbiZqQbWgrWy7vbwJS7q fR8c8znBSihQMQKGoyRXeg2KDcVHRCe15Ja63IuRtrXZtKQrr9HDzbT5lUC5cuccSUZJ 4mfYQonHU3TkReSlDaKF5oYcU6j1k8KkfUbI8adzygDeCJUSYSPAICI+lnlK3B8cWUtS ueHA4g6G/BYksX9/OmnVz1cFJm/dYpgSvBbZEkK+FalgzODwABzPsHFhHSp5A2AUvezn 6CG3mtsvGnmrxouGac7xdnWUy/hUbiQ8vX9iOCQlo31jCR1dSWtqlaDynqCL+kVXCbDC CW8Q== X-Gm-Message-State: AOAM530T2pWXRokMAokgVOe5iaNjFjSSxv+hmDQ2QMxFZhFXBA/7T0qd B1J7iJUv6sq/MzhhBoxuc/hbUiYRfqQ2BA== 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) 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) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org 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 Received-SPF: pass client-ip=2a00:1450:4864:20::42b; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-x42b.google.com X-Spam_score_int: -14 X-Spam_score: -1.5 X-Spam_bar: - X-Spam_report: (-1.5 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.25, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.249, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Paolo Bonzini , Thomas Huth , Gerd Hoffmann , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" 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é 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é + * + * 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 = {} # 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', )) # 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'))