From nobody Sat Nov 15 18:46:31 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1596701596; cv=none; d=zohomail.com; s=zohoarc; b=Bs05Ip99jCufDJ5U/kTdL3t7bngbqwzNWIMCAG3HP6hoXayrfFJcvTp5/OGcJkwu5vZZOdbdyHfOrL8JnJronyYoRFexEY4Rt3sEi5RNn0GiTaQkFS8G3NOfa8aTAFg1rCULM9Rzyup+gA9iAyBRal+txUjx52J7bvqIVly9LmY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1596701596; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=PKVKSszyeyyCRd4E+VhH/flvllNXMyQlvVRFN6SRato=; b=SaAOCcbOzZleUw5wDaPg1tYBSHTIGzW1EIHXBQP/WMhKu5Ys5QNpcUIDGWzBJlvmp3Uy8yrBzmXkiq/pg59jQ0QllfCM4UIp1KAupJPxhnz9raU4go1RcKrIIwRy4XAr2OL3rBOr4BpxkGXNDWaHOnYRI99yca+iP4HDQkjwWL4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1596701596126412.71028355306294; Thu, 6 Aug 2020 01:13:16 -0700 (PDT) Received: from localhost ([::1]:38094 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k3b1W-0002DR-Qc for importer@patchew.org; Thu, 06 Aug 2020 04:13:14 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34676) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k3b0J-0000UG-NM for qemu-devel@nongnu.org; Thu, 06 Aug 2020 04:12:00 -0400 Received: from us-smtp-2.mimecast.com ([205.139.110.61]:28311 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1k3b0G-0006AO-6r for qemu-devel@nongnu.org; Thu, 06 Aug 2020 04:11:59 -0400 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-406-GDeXGxgKOEuUSvu9atYl3w-1; Thu, 06 Aug 2020 04:11:53 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 19223800688; Thu, 6 Aug 2020 08:11:52 +0000 (UTC) Received: from blackfin.pond.sub.org (ovpn-112-143.ams2.redhat.com [10.36.112.143]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 120425D9DC; Thu, 6 Aug 2020 08:11:49 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 9A508114207B; Thu, 6 Aug 2020 10:11:47 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1596701514; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=PKVKSszyeyyCRd4E+VhH/flvllNXMyQlvVRFN6SRato=; b=e3TcuJYJco0LKqoOF6+81P2T9GIMspO1w9BRFpaqD0brVy9asZtqv1TWV28IKK2feGeZx0 952Wu3YF7lbcjJLchabe5keegJCypDjdjRrso2nxng3iIrgrWpXaMAyWjoC5hOdbtaZHEZ /Q1VQxKg+kmaY7oI6qdSfZz5aVmB+AM= X-MC-Unique: GDeXGxgKOEuUSvu9atYl3w-1 From: Markus Armbruster To: qemu-devel@nongnu.org Subject: [PATCH 1/3] docs/interop/qmp-spec: Point to the QEMU QMP reference manual Date: Thu, 6 Aug 2020 10:11:45 +0200 Message-Id: <20200806081147.3123652-2-armbru@redhat.com> In-Reply-To: <20200806081147.3123652-1-armbru@redhat.com> References: <20200806081147.3123652-1-armbru@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=armbru@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=205.139.110.61; envelope-from=armbru@redhat.com; helo=us-smtp-delivery-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/08/06 00:07:42 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -40 X-Spam_score: -4.1 X-Spam_bar: ---- X-Spam_report: (-4.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-1, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham 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: peter.maydell@linaro.org, =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) Commit 4d8bb958fa0..231aaf3a821 integrated the contents of docs/qmp-events.txt into QAPI schema doc comments. It left dangling references to qmp-events.txt behind. Fix to point to the QEMU QMP reference manual generated from the QAPI schema. Add a similar reference for commands. Cc: Marc-Andr=C3=A9 Lureau Signed-off-by: Markus Armbruster Reviewed-by: Marc-Andr=C3=A9 Lureau --- docs/interop/qmp-spec.txt | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/docs/interop/qmp-spec.txt b/docs/interop/qmp-spec.txt index adcf86754d..cdf5842555 100644 --- a/docs/interop/qmp-spec.txt +++ b/docs/interop/qmp-spec.txt @@ -110,6 +110,9 @@ or if provided. The "id" member can be any json-value. A json-number incremented for each successive command works fine. =20 +The actual commands are documented in the QEMU QMP reference manual +docs/interop/qemu-qmp-ref.{7,html,info,pdf,txt}. + 2.3.1 Out-of-band execution --------------------------- =20 @@ -207,13 +210,13 @@ The format of asynchronous events is: there is a failure to retrieve host time, both members of the timestamp will be set to -1. =20 -For a listing of supported asynchronous events, please, refer to the -qmp-events.txt file. +The actual asynchronous events are documented in the QEMU QMP +reference manual docs/interop/qemu-qmp-ref.{7,html,info,pdf,txt}. =20 Some events are rate-limited to at most one per second. If additional "similar" events arrive within one second, all but the last one are dropped, and the last one is delayed. "Similar" normally means same -event type. See qmp-events.txt for details. +event type. =20 2.6 Forcing the JSON parser into known-good state ------------------------------------------------- --=20 2.26.2 From nobody Sat Nov 15 18:46:31 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1596701594; cv=none; d=zohomail.com; s=zohoarc; b=O8ITr6n4fOjTVXYvvi0MRE6opagJx9Lu4nAWiieu4PCKtYVj0AQSNeYqRXhnchRk2lIySdunqxqnEgvXrTcCPtcF4poOm9dl55h26gY2Y3jJZdnepvlZzg+Jrw+Aw8es8vjM/huTZaa/IBYdtJK3+IJglcM3P07Cnu7LdSIqkus= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1596701594; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=y0barxTYUSvJ2TwDPT7a4rxHIHf5wsrh45pkC4a/134=; b=lb/EUOlvzTjWrDvJmzKPFtldeqVpINc+JIaV2c4p6ChVF1i04+xHqgiq+R4DyrZLr0JckOonttQax4FWAVyOYMYVKUTrHDXVOYDojjonAlEbEVPQ5nLlIaXQT7/7W8c5uTDh1hXQD2VgvCnr9gDVEquO3LJNYk//qZEC2BQI8ds= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 159670159471448.33294494403117; Thu, 6 Aug 2020 01:13:14 -0700 (PDT) Received: from localhost ([::1]:37932 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k3b1V-00029O-Dr for importer@patchew.org; Thu, 06 Aug 2020 04:13:13 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34658) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k3b0I-0000TW-N4 for qemu-devel@nongnu.org; Thu, 06 Aug 2020 04:11:59 -0400 Received: from us-smtp-2.mimecast.com ([205.139.110.61]:20890 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1k3b0G-0006AV-6n for qemu-devel@nongnu.org; Thu, 06 Aug 2020 04:11:58 -0400 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-400-wN0BBGeuPOWzJ7UAjG1vZw-1; Thu, 06 Aug 2020 04:11:53 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 6CA4580183C; Thu, 6 Aug 2020 08:11:52 +0000 (UTC) Received: from blackfin.pond.sub.org (ovpn-112-143.ams2.redhat.com [10.36.112.143]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 19B625FC36; Thu, 6 Aug 2020 08:11:49 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id A58F010FDD9D; Thu, 6 Aug 2020 10:11:47 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1596701515; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=y0barxTYUSvJ2TwDPT7a4rxHIHf5wsrh45pkC4a/134=; b=iWyvPIur/oCG//GbVA5F6UY1UvZcj+JsZOOLRC8vSaMxaSB2S9CNNsh8JEIWtY67z7s1CN JPeTP2rk5owahJGEKg9WlI79/B5KuV28CsHDblPCgnQt+d8mPyVsYuYP7Gr3f/IWgo6fES rjA7baiYsvU1TYUNBTV05iIoSimD15A= X-MC-Unique: wN0BBGeuPOWzJ7UAjG1vZw-1 From: Markus Armbruster To: qemu-devel@nongnu.org Subject: [PATCH 2/3] qapi: Document event VSERPORT_CHANGE is rate-limited Date: Thu, 6 Aug 2020 10:11:46 +0200 Message-Id: <20200806081147.3123652-3-armbru@redhat.com> In-Reply-To: <20200806081147.3123652-1-armbru@redhat.com> References: <20200806081147.3123652-1-armbru@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=armbru@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=205.139.110.61; envelope-from=armbru@redhat.com; helo=us-smtp-delivery-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/08/06 00:07:42 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -40 X-Spam_score: -4.1 X-Spam_bar: ---- X-Spam_report: (-4.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-1, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham 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: peter.maydell@linaro.org, =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Commit e2ae6159de "virtio-serial: report frontend connection state via monitor" neglected to document the new event is rate-limited. Fix that. Cc: Marc-Andr=C3=A9 Lureau Cc: Eric Blake Signed-off-by: Markus Armbruster Reviewed-by: Marc-Andr=C3=A9 Lureau --- qapi/char.json | 2 ++ 1 file changed, 2 insertions(+) diff --git a/qapi/char.json b/qapi/char.json index 8aeedf96b2..b4d66ec90b 100644 --- a/qapi/char.json +++ b/qapi/char.json @@ -562,6 +562,8 @@ # # @open: true if the guest has opened the virtio-serial port # +# Note: This event is rate-limited. +# # Since: 2.1 # # Example: --=20 2.26.2 From nobody Sat Nov 15 18:46:31 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1596701723; cv=none; d=zohomail.com; s=zohoarc; b=kgZGj2vLYNDP1vOoZJBT+C6GtSV00KdnC2zFIFkjap8kx5oMjCUoznxuGftu9pJlV/TMalgdozi7fef/vxKyx5qW8/7mTv4OusnMMcbUu0MXr6sZhrdYjCMa5Eluz7s8XoYwrMt/gY30J4YYEWjG9a5K39s8HNd+WbbDN/ColDU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1596701723; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=i+vkL/rWmSLNgGXHOv1NU1qrwCDKsI4zH1RF4xW5wW4=; b=lwUSxMfdjSmxBgj6mbpFE0hauZYM5Jt5Pq66wji9UeiCKakW2L+m8VbHkV3T5Kl7VT4eDIAsctZ7IMKEERlpjF2Rxc6fPpQzP6yLn9QzQKC2IYpQWi0ALpkXVnMAeCVSI9u/1xWUihlW2o/n/1N6SgXvPwHRuDc6OuPiISddZbw= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1596701723985614.1503187401037; Thu, 6 Aug 2020 01:15:23 -0700 (PDT) Received: from localhost ([::1]:46010 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k3b3a-0005ZB-5t for importer@patchew.org; Thu, 06 Aug 2020 04:15:22 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34678) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k3b0J-0000UM-Rt for qemu-devel@nongnu.org; Thu, 06 Aug 2020 04:12:00 -0400 Received: from us-smtp-2.mimecast.com ([205.139.110.61]:51180 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1k3b0H-0006Am-Ke for qemu-devel@nongnu.org; Thu, 06 Aug 2020 04:11:59 -0400 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-388-eUb1pmDNONaY8-4wc5fJPg-1; Thu, 06 Aug 2020 04:11:53 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 7059458; Thu, 6 Aug 2020 08:11:52 +0000 (UTC) Received: from blackfin.pond.sub.org (ovpn-112-143.ams2.redhat.com [10.36.112.143]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 1B5D96179D; Thu, 6 Aug 2020 08:11:49 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id A633010FDD9E; Thu, 6 Aug 2020 10:11:47 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1596701516; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=i+vkL/rWmSLNgGXHOv1NU1qrwCDKsI4zH1RF4xW5wW4=; b=GT4APYdCrAKr4tIS79aUkLjQN9hykyVYT8J6JG0gFyP3H4F6iPMC8khNSZuoRTXgleEqKS +62CbPq9tB9Of5RuBtGJh/A0l7BhRClVo2t0ccygnlO0GFoGTnKAP4xxXko9pFkmBbTI9n LYyDP1aWteT4HBqTa3IIUE/DvCiBvh8= X-MC-Unique: eUb1pmDNONaY8-4wc5fJPg-1 From: Markus Armbruster To: qemu-devel@nongnu.org Subject: [PATCH 3/3] docs/qdev-device-use: Don't suggest -drive and -net can do USB Date: Thu, 6 Aug 2020 10:11:47 +0200 Message-Id: <20200806081147.3123652-4-armbru@redhat.com> In-Reply-To: <20200806081147.3123652-1-armbru@redhat.com> References: <20200806081147.3123652-1-armbru@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=armbru@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=205.139.110.61; envelope-from=armbru@redhat.com; helo=us-smtp-delivery-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/08/06 00:07:42 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -40 X-Spam_score: -4.1 X-Spam_bar: ---- X-Spam_report: (-4.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-1, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham 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: peter.maydell@linaro.org, Thomas Huth , Gerd Hoffmann Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Commit 480324ec8d "docs/qdev-device-use: Clean up the sentences related to -usbdevice" deleted the information on syntax that no longer works. Unfortunately, the resulting text suggests you can configure USB block devices with -drive, and USB network devices with -net, which is misleading. Instead of rephrasing the now misleading text, I'm putting the information back, and just make clear it's about old versions of QEMU. Cc: Thomas Huth Cc: Gerd Hoffmann Signed-off-by: Markus Armbruster --- docs/qdev-device-use.txt | 34 ++++++++++++++++++++++++++++++++-- 1 file changed, 32 insertions(+), 2 deletions(-) diff --git a/docs/qdev-device-use.txt b/docs/qdev-device-use.txt index f8d0d2fe29..8532ba5224 100644 --- a/docs/qdev-device-use.txt +++ b/docs/qdev-device-use.txt @@ -125,7 +125,14 @@ The -device argument differs in detail for each type o= f drive: =20 * if=3Dpflash, if=3Dmtd, if=3Dsd, if=3Dxen are not yet available with -dev= ice =20 -For USB storage devices, you can use something like: +For USB devices, the old way was actually different: + + -usbdevice disk:format=3DFMT:FILENAME + +"Was" because "disk:" is gone since v2.12.0. + +The old way provided much less control than -drive's OPTS... The new +way fixes that: =20 -device usb-storage,drive=3DDRIVE-ID,removable=3DRMB =20 @@ -178,6 +185,9 @@ The appropriate DEVNAME depends on the machine type. F= or type "pc": =20 -device usb-braille,chardev=3Dbraille -chardev braille,id=3Dbraille =20 +* -usbdevice serial::chardev is gone since v2.12.0. It became + -device usb-serial,chardev=3Ddev. + LEGACY-CHARDEV translates to -chardev HOST-OPTS... as follows: =20 * null becomes -chardev null @@ -231,6 +241,12 @@ The old way to define the guest part looks like this: =20 -net nic,netdev=3DNET-ID,macaddr=3DMACADDR,model=3DMODEL,name=3DID,add= r=3DSTR,vectors=3DV =20 +Except for USB it looked like this: + + -usbdevice net:netdev=3DNET-ID,macaddr=3DMACADDR,name=3DID + +"Looked" because "net:" is gone since v2.12.0. + The new way is -device: =20 -device DEVNAME,netdev=3DNET-ID,mac=3DMACADDR,DEV-OPTS... @@ -327,6 +343,13 @@ The new way is -device DEVNAME,DEV-OPTS... Details de= pend on DRIVER: * wacom-tablet -device usb-wacom-tablet * braille See "Character Devices" =20 +Until v2.12.0, we additionally had + +* host:... See "Host Device Assignment" +* disk:... See "Block Devices" +* serial:... See "Character Devices" +* net:... See "Network Devices" + =3D=3D=3D Watchdog Devices =3D=3D=3D =20 Host and guest part of watchdog devices have always been separate. @@ -342,7 +365,14 @@ and host USB devices. PCI devices can only be assigne= d with -device: =20 -device vfio-pci,host=3DADDR,id=3DID =20 -To assign a host USB device use: +The old way to assign a USB host device + + -usbdevice host:auto:BUS.ADDR:VID:PRID + +was removed in v2.12.0. Any of BUS, ADDR, VID, PRID could be the +wildcard *. + +The new way is =20 -device usb-host,hostbus=3DBUS,hostaddr=3DADDR,vendorid=3DVID,producti= d=3DPRID =20 --=20 2.26.2