From nobody Mon May 6 00:20:27 2024 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=1604912914; cv=none; d=zohomail.com; s=zohoarc; b=mwsSWkM6CE+714UawS5GzAb48GzvxJiPgjJ/65rfOyLvTJBwNTv/3Rm5tuAsNwfxQ12Vq6LKvnWWpu7jbafEPM142qxogKIwNVWJWnHg04BB480FK62mYu7MyHwIYdjKH2yG0NNqODU8lxH4JOdOtlyTi2EtgWBRwkAigxij+8I= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1604912914; 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=J6uUEkiSBUCBQbhCiD2GKNFNDIcq0zljxBD6327CaJc=; b=L27iASf7Fir/zN8zJS6xYXU6UYD1+bDGGHezXBeivd/bv6176Gc6Gf9YV9qHvEEj8ueTt/ikFf7GFXVN933fbAgGhqBAQLBDW8W22OMJ2pIOpMo/xjXAZvEMnamoh0oFSx8CjAaj5Gx5KPS3VCaVxnzv1OB1R5KcJV4YEvDKi+I= 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 1604912914045996.6151922508514; Mon, 9 Nov 2020 01:08:34 -0800 (PST) Received: from localhost ([::1]:40962 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kc3A8-0003GD-Nt for importer@patchew.org; Mon, 09 Nov 2020 04:08:32 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:51632) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kc34K-0005Bq-JB for qemu-devel@nongnu.org; Mon, 09 Nov 2020 04:02:32 -0500 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:30922) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kc34H-0004ad-Q1 for qemu-devel@nongnu.org; Mon, 09 Nov 2020 04:02:32 -0500 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-43-w5kDUgnFOL6O5HgQwpP-vg-1; Mon, 09 Nov 2020 04:02:26 -0500 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id C72465F9C3; Mon, 9 Nov 2020 09:02:25 +0000 (UTC) Received: from blackfin.pond.sub.org (ovpn-112-103.ams2.redhat.com [10.36.112.103]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 2299E1002C1E; Mon, 9 Nov 2020 09:02:22 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id BB64A11329AB; Mon, 9 Nov 2020 10:02:20 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1604912549; 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=J6uUEkiSBUCBQbhCiD2GKNFNDIcq0zljxBD6327CaJc=; b=NbYNeZB0HH0Stm4XtMkgOPc3wbGkHvOQTwVPljRdnI4J7aqkT/+n/NhPjEyrmfhcevC7f+ NV6hvEXgJWzXKkUIi4w+OK/mxO1x+KrBwlJMojTS+2Bjw8G9ktSIXaJ2KUBqNQJYjGKvhf S+vD+8UDQxAQtj2B7gn3nwbUJS2Z69I= X-MC-Unique: w5kDUgnFOL6O5HgQwpP-vg-1 From: Markus Armbruster To: qemu-devel@nongnu.org Subject: [PULL 1/5] docs/devel/qapi-code-gen: Fix up examples Date: Mon, 9 Nov 2020 10:02:16 +0100 Message-Id: <20201109090220.825764-2-armbru@redhat.com> In-Reply-To: <20201109090220.825764-1-armbru@redhat.com> References: <20201109090220.825764-1-armbru@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 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=216.205.24.124; envelope-from=armbru@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/11/09 00:04:29 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] 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, DKIMWL_WL_HIGH=-0.001, 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_H4=-0.01, RCVD_IN_MSPIKE_WL=-0.01, 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) Signed-off-by: Markus Armbruster Message-Id: <20201027121026.3025930-1-armbru@redhat.com> Reviewed-by: Marc-Andr=C3=A9 Lureau --- docs/devel/qapi-code-gen.txt | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/docs/devel/qapi-code-gen.txt b/docs/devel/qapi-code-gen.txt index c6438c6aa9..6906a06ad2 100644 --- a/docs/devel/qapi-code-gen.txt +++ b/docs/devel/qapi-code-gen.txt @@ -393,7 +393,7 @@ is identical on the wire to: { 'enum': 'Enum', 'data': ['one', 'two'] } { 'struct': 'Branch1', 'data': { 'data': 'str' } } { 'struct': 'Branch2', 'data': { 'data': 'int' } } - { 'union': 'Flat': 'base': { 'type': 'Enum' }, 'discriminator': 'type', + { 'union': 'Flat', 'base': { 'type': 'Enum' }, 'discriminator': 'type', 'data': { 'one': 'Branch1', 'two': 'Branch2' } } =20 The optional 'if' member specifies a conditional. See "Configuring @@ -590,6 +590,8 @@ When in doubt, do not implement OOB execution support. Member 'allow-preconfig' declares whether the command is available before the machine is built. It defaults to false. For example: =20 + { 'enum': 'QMPCapability', + 'data': [ 'oob' ] } { 'command': 'qmp_capabilities', 'data': { '*enable': [ 'QMPCapability' ] }, 'allow-preconfig': true } @@ -824,7 +826,7 @@ Example: a struct with conditional feature 'allow-negat= ive-numbers' { 'struct': 'TestType', 'data': { 'number': 'int' }, 'features': [ { 'name': 'allow-negative-numbers', - 'if' 'defined(IFCOND)' } ] } + 'if': 'defined(IFCOND)' } ] } =20 Please note that you are responsible to ensure that the C code will compile with an arbitrary combination of conditions, since the --=20 2.26.2 From nobody Mon May 6 00:20:27 2024 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=1604913048; cv=none; d=zohomail.com; s=zohoarc; b=LVXNnVYkXOGL2u7oejojM7YtbkLOOG5LtTYk6pmgnugyOmarFA+1GCiFPYX6eQDQWH1koBVm24SAw9yuctWpJTyRHrmZzgmOIAzPYgRgQ1JPByOvCYE0X3c/2sQ1i11CG26VIDp4uY0darvKZycHguPCj8v0/pV+4dCZ0cKuJEU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1604913048; 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=w0eAf4G3UytQjjSQ3AIUQihXFsb/aqtAMLl5D/O9nzQ=; b=g5pJp2vDPtYAJRe3ib0nBAQ81OaV3QmnrUDcJkgGczpmw+yMAXU2+7/puHcT90wmqenwhj0ZkXcNM5imNLePJfMBUxAXXEkJTCbS71UE6kx+GrVgNBRaq/CbWainC7uuIRTvPx772eaSLJX0lRqseeT7/Gt47hxKzgIn5hH3ELo= 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 160491304864021.834019377008417; Mon, 9 Nov 2020 01:10:48 -0800 (PST) Received: from localhost ([::1]:45888 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kc3CJ-0005KB-7l for importer@patchew.org; Mon, 09 Nov 2020 04:10:47 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:51654) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kc34M-0005Gr-E7 for qemu-devel@nongnu.org; Mon, 09 Nov 2020 04:02:34 -0500 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:38133) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kc34K-0004bR-L7 for qemu-devel@nongnu.org; Mon, 09 Nov 2020 04:02:34 -0500 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-257-U0N7PzJsMtiBA-J-9u9_2Q-1; Mon, 09 Nov 2020 04:02:29 -0500 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 C93EE805F03; Mon, 9 Nov 2020 09:02:28 +0000 (UTC) Received: from blackfin.pond.sub.org (ovpn-112-103.ams2.redhat.com [10.36.112.103]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 279605C1DC; Mon, 9 Nov 2020 09:02:22 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id BF3451132921; Mon, 9 Nov 2020 10:02:20 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1604912551; 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=w0eAf4G3UytQjjSQ3AIUQihXFsb/aqtAMLl5D/O9nzQ=; b=fCWOgSfpityIJDN+cODH6Pla3CK0TDShYPe/ou7n71fbkb3/ejj0sQVMSVZYJPbCT3DoHe G4MUOI76/w5ooX5XwjI2vIgbpQ2dkJCeYbT1VW7ZgbmEbDmabGTQ0OI6DWM4GmEdP7p01N mZ0e+npTt9QWYpsAETJx9h3gcsOHmc8= X-MC-Unique: U0N7PzJsMtiBA-J-9u9_2Q-1 From: Markus Armbruster To: qemu-devel@nongnu.org Subject: [PULL 2/5] MAINTAINERS: Add QAPI schema modules to their subsystems Date: Mon, 9 Nov 2020 10:02:17 +0100 Message-Id: <20201109090220.825764-3-armbru@redhat.com> In-Reply-To: <20201109090220.825764-1-armbru@redhat.com> References: <20201109090220.825764-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=216.205.24.124; envelope-from=armbru@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/11/09 00:04:29 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] 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, DKIMWL_WL_HIGH=-0.001, 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_H4=-0.01, RCVD_IN_MSPIKE_WL=-0.01, 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, "Daniel P . Berrange" , Gerd Hoffmann , Stefan Hajnoczi , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Add the relevant QAPI schema modules to section Audio, QMP, Tracing, Cryptography. Cc: Gerd Hoffmann Cc: Stefan Hajnoczi Cc: Daniel P. Berrange Signed-off-by: Markus Armbruster Message-Id: <20201102081550.171061-2-armbru@redhat.com> Reviewed-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Stefan Hajnoczi Acked-by: Daniel P. Berrang=C3=A9 --- MAINTAINERS | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/MAINTAINERS b/MAINTAINERS index 63223e1183..30e1eccbec 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1909,6 +1909,7 @@ Rocker M: Jiri Pirko S: Maintained F: hw/net/rocker/ +F: qapi/rocker.json F: tests/rocker/ F: docs/specs/rocker.txt =20 @@ -2111,6 +2112,7 @@ S: Maintained F: audio/ F: hw/audio/ F: include/hw/audio/ +F: qapi/audio.json F: tests/qtest/ac97-test.c F: tests/qtest/es1370-test.c F: tests/qtest/intel-hda-test.c @@ -2490,7 +2492,9 @@ F: monitor/monitor-internal.h F: monitor/qmp* F: monitor/misc.c F: monitor/monitor.c +F: qapi/control.json F: qapi/error.json +F: qapi/introspect.json F: docs/devel/*qmp-* F: docs/interop/*qmp-* F: scripts/qmp/ @@ -2551,6 +2555,7 @@ S: Maintained F: trace/ F: trace-events F: docs/qemu-option-trace.rst.inc +F: qapi/trace.json F: scripts/tracetool.py F: scripts/tracetool/ F: scripts/qemu-trace-stap* @@ -2610,6 +2615,7 @@ M: Daniel P. Berrange S: Maintained F: crypto/ F: include/crypto/ +F: qapi/crypto.json F: tests/test-crypto-* F: tests/benchmark-crypto-* F: tests/crypto-tls-* --=20 2.26.2 From nobody Mon May 6 00:20:27 2024 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=1604912761; cv=none; d=zohomail.com; s=zohoarc; b=OeXikb1JKNfMED4TKn0yWDuButuboEm+n8eo3yM3MisRaJa+1S9pfroTvSeoV9zUhwNOmva8ULSWlJZlRwVgTDqQqkiGMSkSTsOEKt/2fLhc44Rp09AcMEqCryGFm8MIfJf6ZhtRJoIH/QYBluOR0GTwsitm3gCwpUhN3QZrnIU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1604912761; 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=prc1AXXpQQAIjpm/dfebeyQVScUnlPg51yiyfwUenHA=; b=c7Qyq/U3gLaixxoI0shNbN28rau4gdQgx+leVxRYCBJvDYXH+pS3mA7bBotjLY997F/Ocd+tKCLpKNcwVYumpOIjQw26qCa8qJWKeFwyq2PqmA/LM7a6uw42+7hiMWuILkceH2u8YcOGytWGgHjghRfJN3d9r+U9WiY50D76DaU= 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 1604912761350315.5858032289967; Mon, 9 Nov 2020 01:06:01 -0800 (PST) Received: from localhost ([::1]:35834 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kc37g-00011o-BH for importer@patchew.org; Mon, 09 Nov 2020 04:06:00 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:51628) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kc34K-0005Af-6t for qemu-devel@nongnu.org; Mon, 09 Nov 2020 04:02:32 -0500 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:35219) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kc34H-0004aP-4S for qemu-devel@nongnu.org; Mon, 09 Nov 2020 04:02:31 -0500 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-500-YxjeJSkcMhWkEThm-DIn5w-1; Mon, 09 Nov 2020 04:02:26 -0500 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 6CDA58030A2; Mon, 9 Nov 2020 09:02:25 +0000 (UTC) Received: from blackfin.pond.sub.org (ovpn-112-103.ams2.redhat.com [10.36.112.103]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 270565C1D7; Mon, 9 Nov 2020 09:02:22 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id C2B821132780; Mon, 9 Nov 2020 10:02:20 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1604912548; 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=prc1AXXpQQAIjpm/dfebeyQVScUnlPg51yiyfwUenHA=; b=PeE1Va8Zog0iTc8f3wKmYR6uoiYyWk3QhqzB9op02Yo1fA7BJu7vGM53oRuC1384yevubS rRHNwB1WvLwO9siTgBPAOMntYyI5q9mVp1hR6w4JNvTBM69ZqOLoSRmloisFSfZBd0V48C OhKwPXIWkcsduhNctm4XI8cwJAiy3Ug= X-MC-Unique: YxjeJSkcMhWkEThm-DIn5w-1 From: Markus Armbruster To: qemu-devel@nongnu.org Subject: [PULL 3/5] qapi: Fix missing headers in QMP Reference Manual Date: Mon, 9 Nov 2020 10:02:18 +0100 Message-Id: <20201109090220.825764-4-armbru@redhat.com> In-Reply-To: <20201109090220.825764-1-armbru@redhat.com> References: <20201109090220.825764-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=63.128.21.124; envelope-from=armbru@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/11/09 01:25:23 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -30 X-Spam_score: -3.1 X-Spam_bar: --- X-Spam_report: (-3.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, 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_H5=-1, RCVD_IN_MSPIKE_WL=-0.01, 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, "Daniel P . Berrange" , Gerd Hoffmann Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Audio stuff is under "Miscellanea", and authorization stuff is under "Input". Add suitable header doc comments to correct that. Cc: Gerd Hoffmann Cc: Daniel P. Berrange Signed-off-by: Markus Armbruster Message-Id: <20201102081550.171061-3-armbru@redhat.com> Acked-by: Daniel P. Berrang=C3=A9 --- qapi/audio.json | 4 ++++ qapi/authz.json | 6 ++++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/qapi/audio.json b/qapi/audio.json index 3b843878d2..072ed79def 100644 --- a/qapi/audio.json +++ b/qapi/audio.json @@ -5,6 +5,10 @@ # This work is licensed under the terms of the GNU GPL, version 2 or later. # See the COPYING file in the top-level directory. =20 +## +# =3D Audio +## + ## # @AudiodevPerDirectionOptions: # diff --git a/qapi/authz.json b/qapi/authz.json index f3e9745426..42afe752d1 100644 --- a/qapi/authz.json +++ b/qapi/authz.json @@ -1,7 +1,9 @@ # -*- Mode: Python -*- # vim: filetype=3Dpython -# -# QAPI authz definitions + +## +# =3D User authorization +## =20 ## # @QAuthZListPolicy: --=20 2.26.2 From nobody Mon May 6 00:20:27 2024 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=1604912766; cv=none; d=zohomail.com; s=zohoarc; b=PDApRJ1CQY0z2yL2NRB9XPem/rhoHTJOWD86japP8v/+Ul3UZoGVLA5ZN3cjxA5dzTe6IVkm+4E+gQOTXzrqjS4e7jQmTcePkM3cqwOPQDX6aXY/CH3K+4n5fw/V5LlN9JlWto9xQOi3rSmLWwdQCaINdqfzAFXiChuajC/1j2k= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1604912766; 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=iDvvt1yKkSwe7BIjolzHKCMnGtVeYevZcFWtbX7oWrc=; b=iyub4lV5G33A/5lMpLW9GieBbo9LveSc/Z2v7wa0ZSjWBbejygCjyAHlsr3FnzfgQgfKnPd0X0OcTens9F9kVzm5TybDPzZSBu0DcHXuh+C7YgDrhZd1ztQ91sceoODNUnaIzGmb18xlwHlaeFjvSn7Jg8Inzg2EfUkZTQBk0aM= 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 1604912766543858.1445280011516; Mon, 9 Nov 2020 01:06:06 -0800 (PST) Received: from localhost ([::1]:36052 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kc37l-00019C-GL for importer@patchew.org; Mon, 09 Nov 2020 04:06:05 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:51556) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kc34G-00056X-AL for qemu-devel@nongnu.org; Mon, 09 Nov 2020 04:02:29 -0500 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:26052) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kc34E-0004Z8-JI for qemu-devel@nongnu.org; Mon, 09 Nov 2020 04:02:27 -0500 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-136-lKzxeb9cN524VDhuVtyVdg-1; Mon, 09 Nov 2020 04:02:23 -0500 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 650635F9DB; Mon, 9 Nov 2020 09:02:22 +0000 (UTC) Received: from blackfin.pond.sub.org (ovpn-112-103.ams2.redhat.com [10.36.112.103]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 3270B619C4; Mon, 9 Nov 2020 09:02:22 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id C57B01129947; Mon, 9 Nov 2020 10:02:20 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1604912545; 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=iDvvt1yKkSwe7BIjolzHKCMnGtVeYevZcFWtbX7oWrc=; b=WjqGDQOoyPHBjgn2VyRTxo5ugCfxRdFGlYtTfhp/I3WQb+39pcFNTgMELxQQMAAmDwDByP q4bosA265TjMy89lDcGKS9aLspGZxX4FWj9DxleXAl+YiYHzXXpQjvR4dj3NgdaUKC1iSa JOlmCBKgpZcAwE8qIWY+kXQ7gbqk568= X-MC-Unique: lKzxeb9cN524VDhuVtyVdg-1 From: Markus Armbruster To: qemu-devel@nongnu.org Subject: [PULL 4/5] qapi/block-core: Improve MapEntry documentation Date: Mon, 9 Nov 2020 10:02:19 +0100 Message-Id: <20201109090220.825764-5-armbru@redhat.com> In-Reply-To: <20201109090220.825764-1-armbru@redhat.com> References: <20201109090220.825764-1-armbru@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 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=63.128.21.124; envelope-from=armbru@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/11/09 01:25:23 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -30 X-Spam_score: -3.1 X-Spam_bar: --- X-Spam_report: (-3.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, 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_H5=-1, RCVD_IN_MSPIKE_WL=-0.01, 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, Max Reitz 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" From: Max Reitz MapEntry and BlockDeviceMapEntry are kind of the same thing, and the latter is not used, so we want to remove it. However, the documentation it provides for some fields is better than that of MapEntry, so steal some of it for the latter. (And adjust them a bit in the process, because I feel like we can make them even clearer.) Signed-off-by: Max Reitz Message-Id: <20201104165513.72720-2-mreitz@redhat.com> Acked-by: Markus Armbruster Signed-off-by: Markus Armbruster --- qapi/block-core.json | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/qapi/block-core.json b/qapi/block-core.json index 1b8b4156b4..3f86675357 100644 --- a/qapi/block-core.json +++ b/qapi/block-core.json @@ -244,17 +244,25 @@ # # Mapping information from a virtual block range to a host file range # -# @start: the start byte of the mapped virtual range +# @start: virtual (guest) offset of the first byte described by this +# entry # # @length: the number of bytes of the mapped virtual range # -# @data: whether the mapped range has data +# @data: reading the image will actually read data from a file (in +# particular, if @offset is present this means that the sectors +# are not simply preallocated, but contain actual data in raw +# format) # -# @zero: whether the virtual blocks are zeroed +# @zero: whether the virtual blocks read as zeroes # -# @depth: the depth of the mapping +# @depth: number of layers (0 =3D top image, 1 =3D top image's backing +# file, ..., n - 1 =3D bottom image (where n is the number of +# images in the chain)) before reaching one for which the +# range is allocated # -# @offset: the offset in file that the virtual sectors are mapped to +# @offset: if present, the image file stores the data for this range +# in raw format at the given (host) offset # # @filename: filename that is referred to by @offset # --=20 2.26.2 From nobody Mon May 6 00:20:27 2024 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=1604912915; cv=none; d=zohomail.com; s=zohoarc; b=RmyLcFz6pkbttmo2zv6vTNGDAIzULzniPOdni6nYR/Bk+KvtKU1Jo2e7VR2xBsuwI2yNadoOU+61IR1sqoHI562jRm1mr3+sD0BID8AehEEBqK2hVeV7OUR4E7t0i5f7RJ61zEl7vPhF+uv60UsorD5U7ysBbXvax7OaCCfVdQw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1604912915; 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=6CNFOjdwy6RTVjG5pmjUPvHSYD9LspsvcyqoPOXwxS8=; b=HgHFVMejFX11QKjUqKmGKtb1aXgp6B9PHMG4H/h7pCzEmbBCR5FWURdU78g6Us20cuQU8Z3atE8jNdkCRUhN8RxI8+GUYezBrgmfYs+FELqtaNhNKYK+Cdv76Ez4ryqz2ChlbN3SSQAFgqESxMqF9quaWeYCSq8CCPCKN8x9mu4= 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 1604912915336668.0838702072273; Mon, 9 Nov 2020 01:08:35 -0800 (PST) Received: from localhost ([::1]:41102 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kc3AA-0003Jf-BP for importer@patchew.org; Mon, 09 Nov 2020 04:08:34 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:51856) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kc34r-0005qt-9d for qemu-devel@nongnu.org; Mon, 09 Nov 2020 04:03:05 -0500 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:34799) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kc34p-0004np-6G for qemu-devel@nongnu.org; Mon, 09 Nov 2020 04:03:04 -0500 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-481-8KS4_5WGMVigyhJ5_1XI4w-1; Mon, 09 Nov 2020 04:02:24 -0500 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id C84BE1868416; Mon, 9 Nov 2020 09:02:23 +0000 (UTC) Received: from blackfin.pond.sub.org (ovpn-112-103.ams2.redhat.com [10.36.112.103]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 9658375124; Mon, 9 Nov 2020 09:02:23 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id C92F5116B844; Mon, 9 Nov 2020 10:02:20 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1604912582; 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=6CNFOjdwy6RTVjG5pmjUPvHSYD9LspsvcyqoPOXwxS8=; b=cZyPWRQtwQDtRQbipekVCeVAx8p55Ea3xvbnRJoxLYoAnCg5CwFLc8fxnYdcaAg060M6Er 48pu4XL5Jv9g8ay1eP2uQvygOO51m14rUua+ceD5iIgFufI0NfhPdlyBoeFBFUndhKmC8I NGKGMwEXl1Jlgv7OapnHs+iJgNVBxJo= X-MC-Unique: 8KS4_5WGMVigyhJ5_1XI4w-1 From: Markus Armbruster To: qemu-devel@nongnu.org Subject: [PULL 5/5] block: Remove unused BlockDeviceMapEntry Date: Mon, 9 Nov 2020 10:02:20 +0100 Message-Id: <20201109090220.825764-6-armbru@redhat.com> In-Reply-To: <20201109090220.825764-1-armbru@redhat.com> References: <20201109090220.825764-1-armbru@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 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=63.128.21.124; envelope-from=armbru@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/11/09 01:25:23 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -30 X-Spam_score: -3.1 X-Spam_bar: --- X-Spam_report: (-3.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, 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_H5=-1, RCVD_IN_MSPIKE_WL=-0.01, 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, Paolo Bonzini Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" BlockDeviceMapEntry has never been used. It was added in commit facd6e2 "so that it is published through the introspection mechanism." What exactly introspecting types that aren't used for anything could accomplish isn't clear. What "introspection mechanism" to use is also nebulous. To the best of my knowledge, there has never been one that covered this type. Certainly not query-qmp-schema, which includes only types that are actually used in QMP. Not being able to introspect BlockDeviceMapEntry hasn't bothered anyone enough to complain in almost four years. Get rid of it. Cc: Paolo Bonzini Cc: Eric Blake Reviewed-by: Eric Blake Signed-off-by: Markus Armbruster Message-Id: <20201104165513.72720-3-mreitz@redhat.com> --- qapi/block-core.json | 29 ----------------------------- 1 file changed, 29 deletions(-) diff --git a/qapi/block-core.json b/qapi/block-core.json index 3f86675357..04ad80bc1e 100644 --- a/qapi/block-core.json +++ b/qapi/block-core.json @@ -426,35 +426,6 @@ ## { 'enum': 'BlockDeviceIoStatus', 'data': [ 'ok', 'failed', 'nospace' ] } =20 -## -# @BlockDeviceMapEntry: -# -# Entry in the metadata map of the device (returned by "qemu-img map") -# -# @start: Offset in the image of the first byte described by this entry -# (in bytes) -# -# @length: Length of the range described by this entry (in bytes) -# -# @depth: Number of layers (0 =3D top image, 1 =3D top image's backing fil= e, etc.) -# before reaching one for which the range is allocated. The value= is -# in the range 0 to the depth of the image chain - 1. -# -# @zero: the sectors in this range read as zeros -# -# @data: reading the image will actually read data from a file (in particu= lar, -# if @offset is present this means that the sectors are not simply -# preallocated, but contain actual data in raw format) -# -# @offset: if present, the image file stores the data for this range in -# raw format at the given offset. -# -# Since: 1.7 -## -{ 'struct': 'BlockDeviceMapEntry', - 'data': { 'start': 'int', 'length': 'int', 'depth': 'int', 'zero': 'bool= ', - 'data': 'bool', '*offset': 'int' } } - ## # @DirtyBitmapStatus: # --=20 2.26.2