From patchwork Tue Jun 11 10:23:03 2024 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: 803242 Delivered-To: patch@linaro.org Received: by 2002:a05:6000:e87:b0:35b:5a80:51b4 with SMTP id dz7csp228152wrb; Tue, 11 Jun 2024 03:24:21 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWsah4UsOS8xuH1kMUaUxaLrxjQGG8bGfiI7/qaCXHiYcMFBSlRVdgw50aVLY66K9PA6ZqV0mASEfJnvY9uPBcG X-Google-Smtp-Source: AGHT+IEwXz0Ht5XmObqC4+TPlt3SyOoOXb+jWvt67Ow9V9MXntYF4PocwHFaPyTfnhUkfnwAMG+x X-Received: by 2002:ac8:5ad4:0:b0:43d:f943:624c with SMTP id d75a77b69052e-44041b4e8a9mr141008791cf.6.1718101460950; Tue, 11 Jun 2024 03:24:20 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1718101460; cv=none; d=google.com; s=arc-20160816; b=oVIyoTfUbHi7NbuAO+Bwk9VW167IUpVbzhqmpDE9H8lGoswE+b9lVgLyDxiL0rpdD8 IKUSfujPFojlNSAXkWRJYfVPrX8Qfqj46sjKsXKWU0DO+3FxRMKEMCJDMvdIRpkHs/pT iS2kJpgiqHUtIMKA5Vm09bjVUy0ox00QnLsNfU2WLqAAOgXWz1xMFrSr5S5eRa/lcxfc MJ+3zokx+E5kN5G9K2qD81lr/e5UubnDkn/0wYRAa6te7WJ/66fibaf3IIcha4rqtIrV 6V9jM2TI4jOA8DyEkofIMgWWhVGIiCkPCyYSdpNeJSftf2KIg/NxnGCfUkyAQ60k86eG p09g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=R+Nzh48rBgkECIQzn+94+NuX+YcHJey5MBlADXTE7iY=; fh=3dqDnrm2ph/3+nx3VFbAlrHG+vYVIFwKOm5l5qyNva0=; b=OsudcE0yMkqXr7V/RSY/JyWMpmkAh/ne1wJrg4yX/sNvg3P47ZxEsRCyrgk7CYUXaW E3YrEkzo5iHROYSclI2r4mS/ZhOnnzlV+tv+HZ26w9e1AapzRKig0tTzpX2LbQSK/fNn Om005mcxMd/1OtXifeU/6Kr9gSue0qVOInS4em0oHZsWLf5PdPnjnFfcKITf5IQ2Sacp /r/EccmUeUcKnIqbvchPB4q0fhPrhIFhkOjWMOR4aDlojx3ckgIAY4aVx2A1sDJ2nGur vVZNtO+p/zj0dhTq1eoK7Oy4v2FlAYIjzGc8aoQDAXmm57aoyfcVtfl3AYkkFrtIQFun 4qtg==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=KJG+p6Ga; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id d75a77b69052e-44154407ee7si4807741cf.656.2024.06.11.03.24.20 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 11 Jun 2024 03:24:20 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=KJG+p6Ga; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sGyet-0006QS-2V; Tue, 11 Jun 2024 06:23:19 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sGyer-0006Q1-HA for qemu-devel@nongnu.org; Tue, 11 Jun 2024 06:23:17 -0400 Received: from mail-wr1-x436.google.com ([2a00:1450:4864:20::436]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1sGyep-0000Xu-TQ for qemu-devel@nongnu.org; Tue, 11 Jun 2024 06:23:17 -0400 Received: by mail-wr1-x436.google.com with SMTP id ffacd0b85a97d-35f1c490c13so2913708f8f.3 for ; Tue, 11 Jun 2024 03:23:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1718101394; x=1718706194; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=R+Nzh48rBgkECIQzn+94+NuX+YcHJey5MBlADXTE7iY=; b=KJG+p6Gaep7ZeyuhRNWXlqahgUstN7Qde79a8RV7DIzA6FNaiLIAZYb6CmX3kKBHGJ 2YL+azEkUXMQva5OMZkOFdLNnz1n/jMZs6kzUlipUL6QwrT5cIjdKf52auS6tSq/zn9i 7PkZZPMYF0zJwAnsO+gSdNYYNDrNo7aG6DIOWNzK1QqobX64Tm0xF/qcpw6IuDVW7gtq JWvIvzCzQCqa/41a2zwkT4aDpBpkfDFtVnIgDDTSuX7lOXusEkH26ow2Ju2CtZOmBALd zq3lqvy4LjFm/Wl9G+9IDOo1ftLygM8oIL/zs7+6YbLHsQjfEKUqmwIRR9UXBqyK+u6n 8Fiw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1718101394; x=1718706194; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=R+Nzh48rBgkECIQzn+94+NuX+YcHJey5MBlADXTE7iY=; b=gKT6ffwLbuSEPAbOBHGEx2OLDAUHWLTBuz1WSJExMex1fqrIuyyBDZbglqGaUYpEgU BoB0/kPTTBpVc3w+MqaW1Bi+LqLEySa13zaI/AdO8ABH6Eods6EWwgdCFKvhPgxgaLMv +x5QMk1HKEWzgQNlJSw+oxON4pbRgzxYm76x6LYcSV4JiDwjyRDVu20eFVEXTAmteJx+ JQsp6JULQCL+7Exo0KqPbTTbCBqbMyEoG1Bov3WvEQIYxtbae9FMSYRoIiMFqpEAlerJ KoxaEnbj+WhB4czhspWeCynI5gaJD0eA2/H4AFGgnZC69L4iqtzDblTS4Ay7AcG2mMpZ U6Fg== X-Forwarded-Encrypted: i=1; AJvYcCWlj5CP/qiia0bSI7SNDlrbQsAYsYkWcu0rVP12gZ86rE78ysRkSgmkXvjzrrC3eRPbBsorAYKRT3UtoOEEGnBpSFZkwpU= X-Gm-Message-State: AOJu0YwGvE3bIRa1FcUZ1e1LRHInyhfDg1r5Xc7K5tKINqiwUY/970Va lG5j315wxH3fOffAGIo2A7mBYm7NfwRhE7VGS5YolreQP4m/APpYy0eUO6GmZjY= X-Received: by 2002:a05:6000:b43:b0:35f:900:4e6 with SMTP id ffacd0b85a97d-35f090005famr9425893f8f.60.1718101394184; Tue, 11 Jun 2024 03:23:14 -0700 (PDT) Received: from m1x-phil.lan (rsa59-h02-176-184-32-6.dsl.sta.abo.bbox.fr. [176.184.32.6]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-35f24d67093sm4999971f8f.96.2024.06.11.03.23.12 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 11 Jun 2024 03:23:13 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: =?utf-8?q?Daniel_P_=2E_Berrang=C3=A9?= , qemu-devel@nongnu.org Cc: Paolo Bonzini , Thomas Huth , "Dr. David Alan Gilbert" , Markus Armbruster , =?utf-8?q?Philippe_Mathieu-Daud?= =?utf-8?q?=C3=A9?= Subject: [PATCH v2 1/3] hw/usb: Remove unused 'host.h' header Date: Tue, 11 Jun 2024 12:23:03 +0200 Message-ID: <20240611102305.60735-2-philmd@linaro.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20240611102305.60735-1-philmd@linaro.org> References: <20240611102305.60735-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::436; envelope-from=philmd@linaro.org; helo=mail-wr1-x436.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org Since commit 99761176ee ("usb: Remove legacy -usbdevice options (host, serial, disk and net)") hw/usb/host.h is not used, remove it. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Daniel P. Berrangé --- Cc: Thomas Huth --- hw/usb/host.h | 44 -------------------------------------------- 1 file changed, 44 deletions(-) delete mode 100644 hw/usb/host.h diff --git a/hw/usb/host.h b/hw/usb/host.h deleted file mode 100644 index 048ff3b482..0000000000 --- a/hw/usb/host.h +++ /dev/null @@ -1,44 +0,0 @@ -/* - * Linux host USB redirector - * - * Copyright (c) 2005 Fabrice Bellard - * - * Copyright (c) 2008 Max Krasnyansky - * Support for host device auto connect & disconnect - * Major rewrite to support fully async operation - * - * Copyright 2008 TJ - * Added flexible support for /dev/bus/usb /sys/bus/usb/devices in addition - * to the legacy /proc/bus/usb USB device discovery and handling - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL - * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN - * THE SOFTWARE. - */ - -#ifndef QEMU_USB_HOST_H -#define QEMU_USB_HOST_H - -struct USBAutoFilter { - uint32_t bus_num; - uint32_t addr; - char *port; - uint32_t vendor_id; - uint32_t product_id; -}; - -#endif /* QEMU_USB_HOST_H */ From patchwork Tue Jun 11 10:23:04 2024 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: 803241 Delivered-To: patch@linaro.org Received: by 2002:a05:6000:e87:b0:35b:5a80:51b4 with SMTP id dz7csp228149wrb; Tue, 11 Jun 2024 03:24:20 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWtgFfhIF1NEcWiR04PvLtJJwZlkgrMiw0QcUl3gN5L75gS5oQuvQJ0e1n61nqi0Vtw07lC/cJrmbxyMJ1kHRKG X-Google-Smtp-Source: AGHT+IGLLmgllrfLr6jfgzYdFW0zKgDrhDGHLguwTtSj4ym0EZiFf8RVlS8O64PhFUIn3thyOy9J X-Received: by 2002:a05:622a:54d:b0:43d:f232:dfb3 with SMTP id d75a77b69052e-44041ce658emr149099861cf.47.1718101460657; Tue, 11 Jun 2024 03:24:20 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1718101460; cv=none; d=google.com; s=arc-20160816; b=igBI9eM8bxtExoxxOhYsN1o7NOCszlAEVuAniJ+XzOXfzXT0JWPiQdh7uhK4lVFcZE cz2eJUxGhcu2jL8VlQPhD8lx9xHqUZORwq0QJ/mll/96JufD469DiFJr+ru/StHLVHst 4AAugyYJzyMp7c1OphKkV+17jHva4L1UwgWM3qI1tTx3tPpHjgoW8xKJKv9D5VWHKzP4 Yr8RfFSNVPkbI4f+1kEaXy25vHrarEfSgR9rYh36WhBYOlE6TFDcnGpge3Kgz8UaahtW CYcu50/ZhCV0t5vAqHLGGVzyfN49uXQFOb76mjtcFOGDuW0Mf+XC56Vk+tGKsiLJOTvK H2lg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=D5kxM32IuNmuEBUfifZgDrwNVCiJKoR9GZCW1cb30w8=; fh=m+BjH3aoOU8Zst4T6NO5vAbTP7jGsi+uuKjO/JXPwCw=; b=efuC/aOV99QkSiy8wu6fGhKNV5Fl14IqwW8joh3YzqBr56VvLcMdK9Fo4x65t1HzjO bwsKnAYzVFX/4zjDR9KLH9jPrrWu6w7Ryo5FntKMX+wf7+QXdTYy8ACtI++CTVim3FNN mOEq05LGw2MS6liWDBJIIVAPWCA+idjagT928pf1YsAoHaztG4RtPZcVZwdEfF8X1DB4 lp0gtfcDFPav56Vqq0gNBeHHCxSYcdWfnYG3anR0PAv9NYq6Mt2ADN5a6J+GIOza+BOc pOA2kOO25yLiSB1PpG0QD6etUF881gimT/lVGL/2kLTQg6rsPRYZXIARNpeHZKilvTTA fuDQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=HSzYvDD1; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id d75a77b69052e-44038b3a424si121031181cf.401.2024.06.11.03.24.20 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 11 Jun 2024 03:24:20 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=HSzYvDD1; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sGyez-0006TJ-Mv; Tue, 11 Jun 2024 06:23:25 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sGyey-0006Sj-51 for qemu-devel@nongnu.org; Tue, 11 Jun 2024 06:23:24 -0400 Received: from mail-wr1-x42e.google.com ([2a00:1450:4864:20::42e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1sGyew-0000Yw-5y for qemu-devel@nongnu.org; Tue, 11 Jun 2024 06:23:23 -0400 Received: by mail-wr1-x42e.google.com with SMTP id ffacd0b85a97d-35f1bc2ab37so2167752f8f.1 for ; Tue, 11 Jun 2024 03:23:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1718101400; x=1718706200; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=D5kxM32IuNmuEBUfifZgDrwNVCiJKoR9GZCW1cb30w8=; b=HSzYvDD1CZItkK+k6C6NOM6SkI2S62X34nFkv6+KfbW+OXxbYea+MRLR8d85LkrVbP 60RZWTbqdO4Ykqml/2vv50tywv56JCIoDE9lHpAvP3nIsY8W5w0if5VUogZDIGZZtBz/ S4bsRA2ViPggTsRxojoMsKbd78P83EcJfl9VvupEORi+ZxamWLg7t6fL68mgt19PhV+q HgRE05/2k1NDNnErxLPqhNDbsfIFiRDHxB8US5AlKvBheqIaCh5V604BYsWgo6JQPkbm FgNifivEb+AyjhxLtTy71Ozs/OzxGgpCzc9J+BEC5exf0WhP4kRvWa828Xpct/wNRC7c OlBQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1718101400; x=1718706200; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=D5kxM32IuNmuEBUfifZgDrwNVCiJKoR9GZCW1cb30w8=; b=CRFMoBvRgLc9q72DFv91+SO/B4bweLO6yglujKM3MrGpyWdzpU94TeOVvrCuhmb0qD oQfloW/QyCKaSw3m99ZRFNouW1ZL0NXSMq9b4D1MUpD5ZVXk7tRey3SELHqeGDrb0CZg FAUwB5BUKJeFvdneGutIqJDnLKesBtv25FXyoh8liQB1SOAZEJdjqZzgOGqFPy5lUgCC JWyOxOY4uHTWaNoliTJ26jaYRdNsSIjvFxcQxrLQ4GJ2rEAuz75tVvivONuIckOe2oTk Pr3nGpKvIgycUN5eAPcyy0F633JBAgkufgiUqUammEd89c/H/H/LK5i84FdjUUcWYyfo Ej6g== X-Forwarded-Encrypted: i=1; AJvYcCWX7FlV6z9vR1ji3liHWAO6LEi0xr1+rGuUYKxY5rUwGTD/EAr82bsoC7fj8/vAXK5C24q9Gk8xetpzF6FJaH3kSXpPEbI= X-Gm-Message-State: AOJu0Yw9QnAmbRyOWfgH/K40ECISzNbXP71Nj8DAGclo/MsuXXt3NG0L s9ubkZgEtpkpJNbQuoQDFdWCspJSnhFkBFCx1GA9fwh3b9ZUXSnJetQ4PI0sDko= X-Received: by 2002:a05:6000:a84:b0:35f:1f3c:b62a with SMTP id ffacd0b85a97d-35f1f3cb667mr4366867f8f.58.1718101400331; Tue, 11 Jun 2024 03:23:20 -0700 (PDT) Received: from m1x-phil.lan (rsa59-h02-176-184-32-6.dsl.sta.abo.bbox.fr. [176.184.32.6]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-35f27600519sm3907640f8f.32.2024.06.11.03.23.18 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 11 Jun 2024 03:23:19 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: =?utf-8?q?Daniel_P_=2E_Berrang=C3=A9?= , qemu-devel@nongnu.org Cc: Paolo Bonzini , Thomas Huth , "Dr. David Alan Gilbert" , Markus Armbruster , =?utf-8?q?Philippe_Mathieu-Daud?= =?utf-8?q?=C3=A9?= Subject: [PATCH v2 2/3] hw/usb: Introduce x-query-usbhost QMP command Date: Tue, 11 Jun 2024 12:23:04 +0200 Message-ID: <20240611102305.60735-3-philmd@linaro.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20240611102305.60735-1-philmd@linaro.org> References: <20240611102305.60735-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::42e; envelope-from=philmd@linaro.org; helo=mail-wr1-x42e.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org This is a counterpart to the HMP "info usbhost" command. It is being added with an "x-" prefix because this QMP command is intended as an adhoc debugging tool and will thus not be modelled in QAPI as fully structured data, nor will it have long term guaranteed stability. The existing HMP command is rewritten to call the QMP command. Since host-libusb.c can be built as part of the 'hw-usb' module, we introduce the libusb_register_hmp_info_hrt() helper to allow late registration when the module is loaded. Suggested-by: Daniel P. Berrangé Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Daniel P. Berrangé --- qapi/machine.json | 18 ++++++++++++++++ hw/usb/host-libusb.h | 16 ++++++++++++++ include/hw/usb.h | 3 --- hw/usb/bus-stub.c | 7 +++++- hw/usb/host-libusb-common.c | 31 ++++++++++++++++++++++++++ hw/usb/host-libusb.c | 43 +++++++++++++++++++++++++------------ tests/qtest/qmp-cmd-test.c | 3 +++ hmp-commands-info.hx | 2 ++ hw/usb/meson.build | 1 + 9 files changed, 106 insertions(+), 18 deletions(-) create mode 100644 hw/usb/host-libusb.h create mode 100644 hw/usb/host-libusb-common.c diff --git a/qapi/machine.json b/qapi/machine.json index 1283d14493..1b428f29d4 100644 --- a/qapi/machine.json +++ b/qapi/machine.json @@ -1813,6 +1813,24 @@ 'returns': 'HumanReadableText', 'features': [ 'unstable' ] } +## +# @x-query-usbhost: +# +# Query information on host USB devices +# +# Features: +# +# @unstable: This command is meant for debugging. +# +# Returns: Host USB device information +# +# Since: 9.1 +## +{ 'command': 'x-query-usbhost', + 'returns': 'HumanReadableText', + 'features': [ 'unstable' ], + 'if': 'CONFIG_USB_LIBUSB' } + ## # @SmbiosEntryPointType: # diff --git a/hw/usb/host-libusb.h b/hw/usb/host-libusb.h new file mode 100644 index 0000000000..eaada081a5 --- /dev/null +++ b/hw/usb/host-libusb.h @@ -0,0 +1,16 @@ +/* + * QEMU USB host redirector + * + * SPDX-FileContributor: Philippe Mathieu-Daudé + * SPDX-FileCopyrightText: 2024 Linaro Ltd. + * SPDX-License-Identifier: GPL-2.0-or-later + */ + +#ifndef HW_USB_HOST_LIBUSB_H +#define HW_USB_HOST_LIBUSB_H + +#include "qapi/qapi-types-common.h" + +void libusb_register_hmp_info_hrt(HumanReadableText *(*handler)(Error **errp)); + +#endif diff --git a/include/hw/usb.h b/include/hw/usb.h index d46d96779a..c0b34af518 100644 --- a/include/hw/usb.h +++ b/include/hw/usb.h @@ -465,9 +465,6 @@ void usb_device_reset(USBDevice *dev); void usb_wakeup(USBEndpoint *ep, unsigned int stream); void usb_generic_async_ctrl_complete(USBDevice *s, USBPacket *p); -/* usb-linux.c */ -void hmp_info_usbhost(Monitor *mon, const QDict *qdict); - /* usb ports of the VM */ #define VM_USB_HUB_SIZE 8 diff --git a/hw/usb/bus-stub.c b/hw/usb/bus-stub.c index fcabe8429e..948429bb33 100644 --- a/hw/usb/bus-stub.c +++ b/hw/usb/bus-stub.c @@ -11,7 +11,6 @@ #include "qapi/error.h" #include "qapi/qapi-commands-machine.h" #include "sysemu/sysemu.h" -#include "monitor/monitor.h" #include "hw/usb.h" USBDevice *usbdevice_create(const char *driver) @@ -26,3 +25,9 @@ HumanReadableText *qmp_x_query_usb(Error **errp) error_setg(errp, "Support for USB devices not built-in"); return NULL; } + +HumanReadableText *qmp_x_query_usbhost(Error **errp) +{ + error_setg(errp, "Support for USB devices not built-in"); + return NULL; +} diff --git a/hw/usb/host-libusb-common.c b/hw/usb/host-libusb-common.c new file mode 100644 index 0000000000..406a2b25be --- /dev/null +++ b/hw/usb/host-libusb-common.c @@ -0,0 +1,31 @@ +/* + * QEMU USB host redirector helpers + * + * SPDX-FileContributor: Philippe Mathieu-Daudé + * SPDX-FileCopyrightText: 2024 Linaro Ltd. + * SPDX-License-Identifier: GPL-2.0-or-later + */ + +#include "qemu/osdep.h" +#include "qemu/module.h" +#include "qapi/error.h" +#include "qapi/qapi-commands-machine.h" +#include "monitor/monitor.h" +#include "host-libusb.h" + +static HumanReadableText *(*qmp_x_query_usbhost_handler)(Error **errp); + +void libusb_register_hmp_info_hrt(HumanReadableText *(*handler)(Error **errp)) +{ + qmp_x_query_usbhost_handler = handler; + monitor_register_hmp_info_hrt("usbhost", handler); +} + +HumanReadableText *qmp_x_query_usbhost(Error **errp) +{ + if (module_load("hw-usb-", "host", errp) <= 0) { + return NULL; + } + assert(qmp_x_query_usbhost_handler); + return qmp_x_query_usbhost_handler(errp); +} diff --git a/hw/usb/host-libusb.c b/hw/usb/host-libusb.c index 80122b4125..b3e1443794 100644 --- a/hw/usb/host-libusb.c +++ b/hw/usb/host-libusb.c @@ -1,5 +1,5 @@ /* - * Linux host USB redirector + * QEMU USB host redirector * * Copyright (c) 2005 Fabrice Bellard * @@ -46,6 +46,8 @@ #endif #include "qapi/error.h" +#include "qapi/qapi-commands-machine.h" +#include "qapi/type-helpers.h" #include "migration/vmstate.h" #include "monitor/monitor.h" #include "qemu/error-report.h" @@ -57,6 +59,7 @@ #include "hw/qdev-properties.h" #include "hw/usb.h" +#include "host-libusb.h" /* ------------------------------------------------------------------------ */ @@ -1813,10 +1816,12 @@ static const TypeInfo usb_host_dev_info = { module_obj(TYPE_USB_HOST_DEVICE); module_kconfig(USB); +static HumanReadableText *qmp_mod_query_usbhost(Error **errp); + static void usb_host_register_types(void) { type_register_static(&usb_host_dev_info); - monitor_register_hmp("usbhost", true, hmp_info_usbhost); + libusb_register_hmp_info_hrt(qmp_mod_query_usbhost); } type_init(usb_host_register_types) @@ -1921,18 +1926,25 @@ static void usb_host_auto_check(void *unused) timer_mod(usb_auto_timer, qemu_clock_get_ms(QEMU_CLOCK_REALTIME) + 2000); } -void hmp_info_usbhost(Monitor *mon, const QDict *qdict) +static HumanReadableText *qmp_mod_query_usbhost(Error **errp) { + g_autoptr(GString) buf = g_string_new(""); libusb_device **devs = NULL; struct libusb_device_descriptor ddesc; char port[16]; int i, n; if (usb_host_init() != 0) { - return; + error_setg(errp, "Failed to init libusb"); + return NULL; } n = libusb_get_device_list(ctx, &devs); + if (!n) { + error_setg(errp, "No host USB device"); + return NULL; + } + for (i = 0; i < n; i++) { if (libusb_get_device_descriptor(devs[i], &ddesc) != 0) { continue; @@ -1941,14 +1953,15 @@ void hmp_info_usbhost(Monitor *mon, const QDict *qdict) continue; } usb_host_get_port(devs[i], port, sizeof(port)); - monitor_printf(mon, " Bus %d, Addr %d, Port %s, Speed %s Mb/s\n", - libusb_get_bus_number(devs[i]), - libusb_get_device_address(devs[i]), - port, - speed_name[libusb_get_device_speed(devs[i])]); - monitor_printf(mon, " Class %02x:", ddesc.bDeviceClass); - monitor_printf(mon, " USB device %04x:%04x", - ddesc.idVendor, ddesc.idProduct); + g_string_append_printf(buf, + " Bus %d, Addr %d, Port %s, Speed %s Mb/s\n", + libusb_get_bus_number(devs[i]), + libusb_get_device_address(devs[i]), + port, + speed_name[libusb_get_device_speed(devs[i])]); + g_string_append_printf(buf, " Class %02x:", ddesc.bDeviceClass); + g_string_append_printf(buf, " USB device %04x:%04x", + ddesc.idVendor, ddesc.idProduct); if (ddesc.iProduct) { libusb_device_handle *handle; if (libusb_open(devs[i], &handle) == 0) { @@ -1957,10 +1970,12 @@ void hmp_info_usbhost(Monitor *mon, const QDict *qdict) ddesc.iProduct, name, sizeof(name)); libusb_close(handle); - monitor_printf(mon, ", %s", name); + g_string_append_printf(buf, ", %s", name); } } - monitor_printf(mon, "\n"); + g_string_append_c(buf, '\n'); } libusb_free_device_list(devs, 1); + + return human_readable_text_from_str(buf); } diff --git a/tests/qtest/qmp-cmd-test.c b/tests/qtest/qmp-cmd-test.c index 2c15f60958..731d3c6c59 100644 --- a/tests/qtest/qmp-cmd-test.c +++ b/tests/qtest/qmp-cmd-test.c @@ -49,6 +49,9 @@ static int query_error_class(const char *cmd) { "query-vm-generation-id", ERROR_CLASS_GENERIC_ERROR }, /* Only valid with a USB bus added */ { "x-query-usb", ERROR_CLASS_GENERIC_ERROR }, +#ifdef CONFIG_USB_LIBUSB + { "x-query-usbhost", ERROR_CLASS_GENERIC_ERROR }, +#endif /* Only valid with accel=tcg */ { "x-query-jit", ERROR_CLASS_GENERIC_ERROR }, { "x-query-opcount", ERROR_CLASS_GENERIC_ERROR }, diff --git a/hmp-commands-info.hx b/hmp-commands-info.hx index cfd4ad5651..134f970584 100644 --- a/hmp-commands-info.hx +++ b/hmp-commands-info.hx @@ -335,12 +335,14 @@ SRST Show guest USB devices. ERST +#ifdef CONFIG_USB_LIBUSB { .name = "usbhost", .args_type = "", .params = "", .help = "show host USB devices", }, +#endif SRST ``info usbhost`` diff --git a/hw/usb/meson.build b/hw/usb/meson.build index d7de1003e3..af92b504fd 100644 --- a/hw/usb/meson.build +++ b/hw/usb/meson.build @@ -7,6 +7,7 @@ system_ss.add(when: 'CONFIG_USB', if_true: files( 'core.c', 'desc.c', 'desc-msos.c', + 'host-libusb-common.c', 'libhw.c', 'pcap.c', ), if_false: files('bus-stub.c')) From patchwork Tue Jun 11 10:23:05 2024 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: 803243 Delivered-To: patch@linaro.org Received: by 2002:a05:6000:e87:b0:35b:5a80:51b4 with SMTP id dz7csp228144wrb; Tue, 11 Jun 2024 03:24:20 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUuHqrOoy1n2SgQLfl13aBnkp4Pi5yn/livovaEuGUH0tDizQhOW6ePb+Rt4zj82Yzpk1zZE098Yf0Th2BDMY7G X-Google-Smtp-Source: AGHT+IGj1sVBIHrv5S1fL6uwFcb9glbC7n3mXncXFwU9Ae4GdbWOsuCaYMHxRZN5r8rGvjSacjQV X-Received: by 2002:a05:620a:4049:b0:795:ab7c:8a71 with SMTP id af79cd13be357-795ab7c930bmr569324285a.4.1718101460519; Tue, 11 Jun 2024 03:24:20 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1718101460; cv=none; d=google.com; s=arc-20160816; b=VToJezlN2mqmYi9PpUjiRyNSq0mR66zSnZzXMI4jNsIdnPzmhrou1j8JPzqX+t7+I9 NovrI7mV7OYIeNO3zlwRTTlQYR71VvmIEMSAUmZL83luXNTKfhVX6Ir4wezoYMRpa4AC YoXqu+NcmrjKwZsJaJPgRLFXTjQhwu25WTjJRyG7NIM4A+cL70NeMDDb1/sdhPLECnqx tUx7axjMd0FAiwTpZrT5erXjYta6sUzf7u7JTFieNnvrDu9k1kw1t0mrNOx7lKyClqWK NIASZQ4GyoLGuIpwJEdsW+wS3w1bYCrkUttKJCqsRwOozlQIW8qxhgZ7ZtiDa0s87k2o hrdQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=0tgZq3sbZcXD41HkUXjwl9sONKRxoM6G0WQFFkBzjWc=; fh=uoIbv1r+8U3cHO65CUbP9R+kO0oCFQ3JVzDTGSxa82Q=; b=rgIhuyMA7sJFlu7jQQusNzCqIkJwg5AaNKkAfzAZZGgoz+LP/JLtbsnYTaMfUhEbNU DaDlFPO3kwyjDm/+2bcZuPhqQvZVf/8uFdh8mQTM5VIDr+vCSwt5NjUDufYp1uMgFM57 JODJa4KQAqjDRKCM2dW1KWClG8OZ3ydlgkZ2o/Awom0cNcfzZLJNmow9hJSGmTM9VfiR pTEyNHnd2V998zMGHXzKtIwLlSDwanp3QRdRSwYc1K8X+NmQq+bmRqRLS6YIpn+oou6P eZZmdIcqml7FsJq5h+7HCuB6mWMkRg2Vm1MEmFwRDmqCEJTUc1jkUFkQn0EPlIAaL8fn v8MA==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="UB/y2fsD"; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id af79cd13be357-795597417a1si730819685a.53.2024.06.11.03.24.20 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 11 Jun 2024 03:24:20 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="UB/y2fsD"; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sGyf5-0006UD-57; Tue, 11 Jun 2024 06:23:31 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sGyf3-0006Ty-Ir for qemu-devel@nongnu.org; Tue, 11 Jun 2024 06:23:29 -0400 Received: from mail-lf1-x130.google.com ([2a00:1450:4864:20::130]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1sGyf1-0000ZH-U8 for qemu-devel@nongnu.org; Tue, 11 Jun 2024 06:23:29 -0400 Received: by mail-lf1-x130.google.com with SMTP id 2adb3069b0e04-52c4b92c09bso1097371e87.1 for ; Tue, 11 Jun 2024 03:23:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1718101406; x=1718706206; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=0tgZq3sbZcXD41HkUXjwl9sONKRxoM6G0WQFFkBzjWc=; b=UB/y2fsDJLtvXgHEAn5o+BUgRDr+osL/vPLHM/G1RIW2fPnMP+Wm6hhbuDzCb8dypr eBYSesrCHXmSccVkU+Q0BTwucTiczJOFN+IhoAv9Jtzq6BUpzGjEtfrwEcC4b6G27JZJ lQs+GaF/QiazCdNXPHYDq+zB+iioCaPZYHUql5Gp6kzEjoMQHjc1OA+mLNmLQlG4izrr xOVwN2h84N0g+/qmdA6ZFk5LkC85B4YPLnU08SR/cMDCb8V4VBljJLHz0ZAC2/SzeTp1 cWMkmFbBwZNiBDnilaNfJi69pmdaMFwpnnBvu4MG7SENaGPLJJB8YlBqv6y6+x6cwVYb 9+PQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1718101406; x=1718706206; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=0tgZq3sbZcXD41HkUXjwl9sONKRxoM6G0WQFFkBzjWc=; b=KspxlSPDr+2jrOxeDzSo3mOK0Of2rYJSyUAlsrzAXwgKbo+1RHn35jewl4zZ2iiDPA bliCBuC1caPHqgg+ZeE5KWn+kEvUnVwYYz0MsTlIOPLpArg/7+md8btkheGrt1G1n5ML WzoWBiFMhDkK1cmRJzLShy/TqekKjPOcjH7IpSoyQV5AtXtqP3MSkYzOH/Z54ey1VIcC uBA7WpfCaPb4dqVeGpOpVV3eH8hSqxn/I3pLn4EfQmF0ZGsm4np4fntdU0sTWRa4eO8u kIi/YpmS2NnsffWeGkws4WsiRn20MZ6DEHe3a2v4V6BA3Mak2fzGArGmuNvSzloQeyyX KcFg== X-Forwarded-Encrypted: i=1; AJvYcCVrtr4ILEG3LgXi3vNkRmsRl9Wm4cUpN7U8+zJy8CpHOF4OwXRdgm33UYEFB84b/k4YR2HTudlKJppN2b8uMjU0nfSJI/k= X-Gm-Message-State: AOJu0YwIj10LH6pgpTzZHx6OQ3ZkcRbgMY8XNlG74k5YFnwFs5WfryRo P297IKwArQzccfctffyvK0WbQ2b9NtZJCmIzdaYyVTPpPs08vrZoEJD5rNMaEdc= X-Received: by 2002:ac2:551b:0:b0:52c:9725:b334 with SMTP id 2adb3069b0e04-52c9725b492mr465698e87.54.1718101405948; Tue, 11 Jun 2024 03:23:25 -0700 (PDT) Received: from m1x-phil.lan (rsa59-h02-176-184-32-6.dsl.sta.abo.bbox.fr. [176.184.32.6]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-35f0b876d80sm10294643f8f.109.2024.06.11.03.23.24 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 11 Jun 2024 03:23:25 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: =?utf-8?q?Daniel_P_=2E_Berrang=C3=A9?= , qemu-devel@nongnu.org Cc: Paolo Bonzini , Thomas Huth , "Dr. David Alan Gilbert" , Markus Armbruster , =?utf-8?q?Philippe_Mathieu-Daud?= =?utf-8?q?=C3=A9?= Subject: [PATCH v2 3/3] monitor: Remove monitor_register_hmp() Date: Tue, 11 Jun 2024 12:23:05 +0200 Message-ID: <20240611102305.60735-4-philmd@linaro.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20240611102305.60735-1-philmd@linaro.org> References: <20240611102305.60735-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::130; envelope-from=philmd@linaro.org; helo=mail-lf1-x130.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org Previous commit removed the last use of monitor_register_hmp(), remove it so new commands are implemented using monitor_register_hmp_info_hrt(). Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Daniel P. Berrangé --- include/monitor/monitor.h | 2 -- monitor/hmp-target.c | 16 ---------------- 2 files changed, 18 deletions(-) diff --git a/include/monitor/monitor.h b/include/monitor/monitor.h index 965f5d5450..2199a74913 100644 --- a/include/monitor/monitor.h +++ b/include/monitor/monitor.h @@ -55,8 +55,6 @@ int monitor_fdset_dup_fd_add(int64_t fdset_id, int flags); void monitor_fdset_dup_fd_remove(int dup_fd); int64_t monitor_fdset_dup_fd_find(int dup_fd); -void monitor_register_hmp(const char *name, bool info, - void (*cmd)(Monitor *mon, const QDict *qdict)); void monitor_register_hmp_info_hrt(const char *name, HumanReadableText *(*handler)(Error **errp)); diff --git a/monitor/hmp-target.c b/monitor/hmp-target.c index 1eb72ac1bf..86f48c613b 100644 --- a/monitor/hmp-target.c +++ b/monitor/hmp-target.c @@ -145,22 +145,6 @@ static void __attribute__((__constructor__)) sortcmdlist(void) compare_mon_cmd); } -void monitor_register_hmp(const char *name, bool info, - void (*cmd)(Monitor *mon, const QDict *qdict)) -{ - HMPCommand *table = info ? hmp_info_cmds : hmp_cmds; - - while (table->name != NULL) { - if (strcmp(table->name, name) == 0) { - g_assert(table->cmd == NULL && table->cmd_info_hrt == NULL); - table->cmd = cmd; - return; - } - table++; - } - g_assert_not_reached(); -} - void monitor_register_hmp_info_hrt(const char *name, HumanReadableText *(*handler)(Error **errp)) {