From nobody Fri May 17 19:45:51 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1650551986393595.385009615055; Thu, 21 Apr 2022 07:39:46 -0700 (PDT) Received: from localhost ([::1]:58860 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nhXyD-0000Y9-66 for importer@patchew.org; Thu, 21 Apr 2022 10:39:45 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46488) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nhXqS-0002jq-JI for qemu-devel@nongnu.org; Thu, 21 Apr 2022 10:31:44 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]:33527) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nhXqP-0004Kx-4s for qemu-devel@nongnu.org; Thu, 21 Apr 2022 10:31:44 -0400 Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-513-U3SK-wkHNUSr0hTDGKjZEw-1; Thu, 21 Apr 2022 10:31:37 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id E083F86B8A6; Thu, 21 Apr 2022 14:31:36 +0000 (UTC) Received: from blackfin.pond.sub.org (unknown [10.36.112.3]) by smtp.corp.redhat.com (Postfix) with ESMTPS id BD9B2200AE73; Thu, 21 Apr 2022 14:31:36 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id A216121E6A20; Thu, 21 Apr 2022 16:31:35 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1650551500; 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=21/uvnIQ4OdM8mEY2QgS4QmgQgsadSmhW3DxDkPKdEA=; b=F8y3UQVBeH0xjbPqniQw12ue2PLLYpYlLoLsrZco0/8MsSCmHoiVao19Y5zSRrlLOFoV2U c2hNnSEPzGY7i/TMpM5ftdxzHhMgTUqu65u2I2m2EDuY3xVtb2yRiK7HQMneQLvutUVn6M jqFkBW8d9jFykXgx7B2E+PysM3XfqpQ= X-MC-Unique: U3SK-wkHNUSr0hTDGKjZEw-1 From: Markus Armbruster To: qemu-devel@nongnu.org Subject: [PULL 1/7] qapi-schema: support alternates with array type Date: Thu, 21 Apr 2022 16:31:29 +0200 Message-Id: <20220421143135.1491256-2-armbru@redhat.com> In-Reply-To: <20220421143135.1491256-1-armbru@redhat.com> References: <20220421143135.1491256-1-armbru@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 2.78 on 10.11.54.4 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=170.10.129.124; envelope-from=armbru@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -28 X-Spam_score: -2.9 X-Spam_bar: -- X-Spam_report: (-2.9 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.082, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, 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: , Cc: Paolo Bonzini , richard.henderson@linaro.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1650551987168100001 Content-Type: text/plain; charset="utf-8" From: Paolo Bonzini Detect array types as alternate branches, and turn the JSON list into a QAPISchemaArrayType. Array types in an alternate are represented with QTYPE_QLIST in the type field. Signed-off-by: Paolo Bonzini Message-Id: <20220321164243.200569-2-pbonzini@redhat.com> Reviewed-by: Markus Armbruster Signed-off-by: Markus Armbruster --- scripts/qapi/expr.py | 2 +- scripts/qapi/schema.py | 4 ++++ tests/qapi-schema/alternate-array.err | 2 -- tests/qapi-schema/alternate-array.json | 2 -- tests/qapi-schema/alternate-array.out | 18 ++++++++++++++++++ 5 files changed, 23 insertions(+), 5 deletions(-) diff --git a/scripts/qapi/expr.py b/scripts/qapi/expr.py index 3cb389e875..48578e1698 100644 --- a/scripts/qapi/expr.py +++ b/scripts/qapi/expr.py @@ -554,7 +554,7 @@ def check_alternate(expr: _JSONObject, info: QAPISource= Info) -> None: check_name_lower(key, info, source) check_keys(value, info, source, ['type'], ['if']) check_if(value, info, source) - check_type(value['type'], info, source) + check_type(value['type'], info, source, allow_array=3DTrue) =20 =20 def check_command(expr: _JSONObject, info: QAPISourceInfo) -> None: diff --git a/scripts/qapi/schema.py b/scripts/qapi/schema.py index b7b3fc0ce4..3728340c37 100644 --- a/scripts/qapi/schema.py +++ b/scripts/qapi/schema.py @@ -243,6 +243,7 @@ def alternate_qtype(self): 'number': 'QTYPE_QNUM', 'int': 'QTYPE_QNUM', 'boolean': 'QTYPE_QBOOL', + 'array': 'QTYPE_QLIST', 'object': 'QTYPE_QDICT' } return json2qtype.get(self.json_type()) @@ -1069,6 +1070,9 @@ def _def_struct_type(self, expr, info, doc): None)) =20 def _make_variant(self, case, typ, ifcond, info): + if isinstance(typ, list): + assert len(typ) =3D=3D 1 + typ =3D self._make_array_type(typ[0], info) return QAPISchemaVariant(case, info, typ, ifcond) =20 def _def_union_type(self, expr, info, doc): diff --git a/tests/qapi-schema/alternate-array.err b/tests/qapi-schema/alte= rnate-array.err index b1aa1f4e8d..e69de29bb2 100644 --- a/tests/qapi-schema/alternate-array.err +++ b/tests/qapi-schema/alternate-array.err @@ -1,2 +0,0 @@ -alternate-array.json: In alternate 'Alt': -alternate-array.json:5: 'data' member 'two' cannot be an array diff --git a/tests/qapi-schema/alternate-array.json b/tests/qapi-schema/alt= ernate-array.json index f241aac122..b878a2db77 100644 --- a/tests/qapi-schema/alternate-array.json +++ b/tests/qapi-schema/alternate-array.json @@ -1,5 +1,3 @@ -# we do not allow array branches in alternates -# TODO: should we support this? { 'struct': 'One', 'data': { 'name': 'str' } } { 'alternate': 'Alt', diff --git a/tests/qapi-schema/alternate-array.out b/tests/qapi-schema/alte= rnate-array.out index e69de29bb2..a657d85738 100644 --- a/tests/qapi-schema/alternate-array.out +++ b/tests/qapi-schema/alternate-array.out @@ -0,0 +1,18 @@ +module ./builtin +object q_empty +enum QType + prefix QTYPE + member none + member qnull + member qnum + member qstring + member qdict + member qlist + member qbool +module alternate-array.json +object One + member name: str optional=3DFalse +alternate Alt + tag type + case one: One + case two: intList --=20 2.35.1 From nobody Fri May 17 19:45:51 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1650551841867205.65509978835541; Thu, 21 Apr 2022 07:37:21 -0700 (PDT) Received: from localhost ([::1]:50266 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nhXvs-00037x-S2 for importer@patchew.org; Thu, 21 Apr 2022 10:37:20 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46450) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nhXqQ-0002ba-PI for qemu-devel@nongnu.org; Thu, 21 Apr 2022 10:31:42 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:43435) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nhXqN-0004KV-KD for qemu-devel@nongnu.org; Thu, 21 Apr 2022 10:31:41 -0400 Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-600-DGqIlNUbOcq2I04BR2-6EA-1; Thu, 21 Apr 2022 10:31:37 -0400 Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id DEDBE1E17362; Thu, 21 Apr 2022 14:31:36 +0000 (UTC) Received: from blackfin.pond.sub.org (unknown [10.36.112.3]) by smtp.corp.redhat.com (Postfix) with ESMTPS id BD4DE572326; Thu, 21 Apr 2022 14:31:36 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id A4B6921E6A21; Thu, 21 Apr 2022 16:31:35 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1650551498; 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=jKa7yV2+zsvqUdHt1JXcWtUR1qt3zKiPk0YTzvQppbY=; b=WMyEwJjGRa1970XpDlEFDoj/TGhed1fgMcxccGWrBEboyMzBW4VQ/vZAvOzxlwfb8W5vS+ fQK8NAiXk5IKFqaePLaM92Kf9ZiCYLZwUByxbXl42UvNUqOMP1LvrTuKXI1mcBHCuiNafX 3rLT7PBdg4fyuNu3C+OqtsyYpHBIRWE= X-MC-Unique: DGqIlNUbOcq2I04BR2-6EA-1 From: Markus Armbruster To: qemu-devel@nongnu.org Subject: [PULL 2/7] qapi-schema: test: add a qapi-schema-test for array alternates Date: Thu, 21 Apr 2022 16:31:30 +0200 Message-Id: <20220421143135.1491256-3-armbru@redhat.com> In-Reply-To: <20220421143135.1491256-1-armbru@redhat.com> References: <20220421143135.1491256-1-armbru@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 2.85 on 10.11.54.10 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=170.10.133.124; envelope-from=armbru@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -28 X-Spam_score: -2.9 X-Spam_bar: -- X-Spam_report: (-2.9 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.082, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, 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: , Cc: Paolo Bonzini , richard.henderson@linaro.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1650551842326100001 Content-Type: text/plain; charset="utf-8" From: Paolo Bonzini Check that conflicts among array alternates are detected correctly. Signed-off-by: Paolo Bonzini Message-Id: <20220321164243.200569-3-pbonzini@redhat.com> Reviewed-by: Markus Armbruster [Expected test output alternate-conflict-lists.json corrected] Signed-off-by: Markus Armbruster --- tests/qapi-schema/alternate-conflict-lists.err | 2 ++ tests/qapi-schema/alternate-conflict-lists.json | 6 ++++++ tests/qapi-schema/alternate-conflict-lists.out | 0 tests/qapi-schema/meson.build | 1 + 4 files changed, 9 insertions(+) create mode 100644 tests/qapi-schema/alternate-conflict-lists.err create mode 100644 tests/qapi-schema/alternate-conflict-lists.json create mode 100644 tests/qapi-schema/alternate-conflict-lists.out diff --git a/tests/qapi-schema/alternate-conflict-lists.err b/tests/qapi-sc= hema/alternate-conflict-lists.err new file mode 100644 index 0000000000..f3374ec1e7 --- /dev/null +++ b/tests/qapi-schema/alternate-conflict-lists.err @@ -0,0 +1,2 @@ +alternate-conflict-lists.json: In alternate 'Alt': +alternate-conflict-lists.json:4: branch 'two' can't be distinguished from = 'one' diff --git a/tests/qapi-schema/alternate-conflict-lists.json b/tests/qapi-s= chema/alternate-conflict-lists.json new file mode 100644 index 0000000000..a3efd6c501 --- /dev/null +++ b/tests/qapi-schema/alternate-conflict-lists.json @@ -0,0 +1,6 @@ +# Two lists conflict even if their inner types would be compatible +{ 'struct': 'One', + 'data': { 'name': 'str' } } +{ 'alternate': 'Alt', + 'data': { 'one': [ 'int' ], + 'two': [ 'str' ] } } diff --git a/tests/qapi-schema/alternate-conflict-lists.out b/tests/qapi-sc= hema/alternate-conflict-lists.out new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tests/qapi-schema/meson.build b/tests/qapi-schema/meson.build index caf0791ba8..c18dd7d02f 100644 --- a/tests/qapi-schema/meson.build +++ b/tests/qapi-schema/meson.build @@ -11,6 +11,7 @@ schemas =3D [ 'alternate-conflict-dict.json', 'alternate-conflict-enum-bool.json', 'alternate-conflict-enum-int.json', + 'alternate-conflict-lists.json', 'alternate-conflict-string.json', 'alternate-conflict-bool-string.json', 'alternate-conflict-num-string.json', --=20 2.35.1 From nobody Fri May 17 19:45:51 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1650551701757487.0671359314474; Thu, 21 Apr 2022 07:35:01 -0700 (PDT) Received: from localhost ([::1]:42120 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nhXtc-0005uA-Of for importer@patchew.org; Thu, 21 Apr 2022 10:35:00 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46456) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nhXqQ-0002cR-A1 for qemu-devel@nongnu.org; Thu, 21 Apr 2022 10:31:42 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:36594) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nhXqN-0004KY-Lm for qemu-devel@nongnu.org; Thu, 21 Apr 2022 10:31:41 -0400 Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-602-hQ3E8AybOYqrg2C7uPoYGg-1; Thu, 21 Apr 2022 10:31:37 -0400 Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 079CC3811A2E; Thu, 21 Apr 2022 14:31:37 +0000 (UTC) Received: from blackfin.pond.sub.org (unknown [10.36.112.3]) by smtp.corp.redhat.com (Postfix) with ESMTPS id BDAA654CE48; Thu, 21 Apr 2022 14:31:36 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id A70F321E6A22; Thu, 21 Apr 2022 16:31:35 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1650551498; 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=QoVcMAqdY+GpguPwNtbDNu7RgHt7AT0G42Ac8ZbNe1E=; b=QPoFHk3cm9orCpgsX4kCDWIGt50KvO7sy966uu1fowArRo28FE7NKSqIbWkpadV9gi66VF 3+fIOchQhljbQ6cdXB1SFTzj1RrZbTzrw5cSvG4etZIChaypryLw62t/h5eNNtl6EviD5o hvLzZeRCJMqGjZbMoHS3YaY04On/LNc= X-MC-Unique: hQ3E8AybOYqrg2C7uPoYGg-1 From: Markus Armbruster To: qemu-devel@nongnu.org Subject: [PULL 3/7] qapi-schema: test: add a unit test for parsing array alternates Date: Thu, 21 Apr 2022 16:31:31 +0200 Message-Id: <20220421143135.1491256-4-armbru@redhat.com> In-Reply-To: <20220421143135.1491256-1-armbru@redhat.com> References: <20220421143135.1491256-1-armbru@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 2.85 on 10.11.54.9 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=170.10.133.124; envelope-from=armbru@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -28 X-Spam_score: -2.9 X-Spam_bar: -- X-Spam_report: (-2.9 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.082, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, 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: , Cc: Paolo Bonzini , richard.henderson@linaro.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1650551702682100001 Content-Type: text/plain; charset="utf-8" From: Paolo Bonzini Signed-off-by: Paolo Bonzini Message-Id: <20220321164243.200569-4-pbonzini@redhat.com> Reviewed-by: Markus Armbruster [Dead code dropped in test_visitor_in_alternate_list()] Signed-off-by: Markus Armbruster --- tests/unit/test-qobject-input-visitor.c | 40 +++++++++++++++++++++++++ tests/qapi-schema/qapi-schema-test.json | 1 + tests/qapi-schema/qapi-schema-test.out | 4 +++ 3 files changed, 45 insertions(+) diff --git a/tests/unit/test-qobject-input-visitor.c b/tests/unit/test-qobj= ect-input-visitor.c index aed08eaebc..14329dabcf 100644 --- a/tests/unit/test-qobject-input-visitor.c +++ b/tests/unit/test-qobject-input-visitor.c @@ -775,6 +775,7 @@ static void test_visitor_in_alternate_number(TestInputV= isitorData *data, AltEnumNum *aen; AltNumEnum *ans; AltEnumInt *asi; + AltListInt *ali; =20 /* Parsing an int */ =20 @@ -801,6 +802,12 @@ static void test_visitor_in_alternate_number(TestInput= VisitorData *data, g_assert_cmpint(asi->u.i, =3D=3D, 42); qapi_free_AltEnumInt(asi); =20 + v =3D visitor_input_test_init(data, "42"); + visit_type_AltListInt(v, NULL, &ali, &error_abort); + g_assert_cmpint(ali->type, =3D=3D, QTYPE_QNUM); + g_assert_cmpint(ali->u.i, =3D=3D, 42); + qapi_free_AltListInt(ali); + /* Parsing a double */ =20 v =3D visitor_input_test_init(data, "42.5"); @@ -826,6 +833,37 @@ static void test_visitor_in_alternate_number(TestInput= VisitorData *data, qapi_free_AltEnumInt(asi); } =20 +static void test_visitor_in_alternate_list(TestInputVisitorData *data, + const void *unused) +{ + intList *item; + Visitor *v; + AltListInt *ali; + int i; + + v =3D visitor_input_test_init(data, "[ 42, 43, 44 ]"); + visit_type_AltListInt(v, NULL, &ali, &error_abort); + g_assert(ali !=3D NULL); + + g_assert_cmpint(ali->type, =3D=3D, QTYPE_QLIST); + for (i =3D 0, item =3D ali->u.l; item; item =3D item->next, i++) { + g_assert_cmpint(item->value, =3D=3D, 42 + i); + } + + qapi_free_AltListInt(ali); + ali =3D NULL; + + /* An empty list is valid */ + v =3D visitor_input_test_init(data, "[]"); + visit_type_AltListInt(v, NULL, &ali, &error_abort); + g_assert(ali !=3D NULL); + + g_assert_cmpint(ali->type, =3D=3D, QTYPE_QLIST); + g_assert(!ali->u.l); + qapi_free_AltListInt(ali); + ali =3D NULL; +} + static void input_visitor_test_add(const char *testpath, const void *user_data, void (*test_func)(TestInputVisitorData = *data, @@ -1187,6 +1225,8 @@ int main(int argc, char **argv) NULL, test_visitor_in_wrong_type); input_visitor_test_add("/visitor/input/alternate-number", NULL, test_visitor_in_alternate_number); + input_visitor_test_add("/visitor/input/alternate-list", + NULL, test_visitor_in_alternate_list); input_visitor_test_add("/visitor/input/fail/struct", NULL, test_visitor_in_fail_struct); input_visitor_test_add("/visitor/input/fail/struct-nested", diff --git a/tests/qapi-schema/qapi-schema-test.json b/tests/qapi-schema/qa= pi-schema-test.json index 43b8697002..ba7302f42b 100644 --- a/tests/qapi-schema/qapi-schema-test.json +++ b/tests/qapi-schema/qapi-schema-test.json @@ -119,6 +119,7 @@ { 'alternate': 'AltEnumNum', 'data': { 'e': 'EnumOne', 'n': 'number' } } { 'alternate': 'AltNumEnum', 'data': { 'n': 'number', 'e': 'EnumOne' } } { 'alternate': 'AltEnumInt', 'data': { 'e': 'EnumOne', 'i': 'int' } } +{ 'alternate': 'AltListInt', 'data': { 'l': ['int'], 'i': 'int' } } =20 # for testing use of 'str' within alternates { 'alternate': 'AltStrObj', 'data': { 's': 'str', 'o': 'TestStruct' } } diff --git a/tests/qapi-schema/qapi-schema-test.out b/tests/qapi-schema/qap= i-schema-test.out index 1f9585fa9b..043d75c655 100644 --- a/tests/qapi-schema/qapi-schema-test.out +++ b/tests/qapi-schema/qapi-schema-test.out @@ -121,6 +121,10 @@ alternate AltEnumInt tag type case e: EnumOne case i: int +alternate AltListInt + tag type + case l: intList + case i: int alternate AltStrObj tag type case s: str --=20 2.35.1 From nobody Fri May 17 19:45:51 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=1650551946; cv=none; d=zohomail.com; s=zohoarc; b=ka86UZylwHBENxIqQrHsmZnsJEikny9THd2ON52DLAS+D/7lXj44zlp7SVzb5+3trSVM8KRGs4RlR0C7+wSOFWUVc5bN167D9ywG2vA+RAX6p561GO8oHprM1BRqP8c6jW1EmZHFDtEHCdnJh9NFWZhJqxfKmqB0+6ecVmpcZdE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1650551946; 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=GWje4EqdZpxWaBXZ0lpdTZMP30Jg97zPp02phq7hIpI=; b=hAU0lgyniYaO/4aT80xuu+U7uiIhjR9w4Wdn1rhpPF5gtzoakNgr9k0tuc88HEzT4r+v0NTwj1PnVtEv4W8ZZNU2NvHIOuCWGncCRId8+mPsgNOuPN9jbP3doRJ/MhcNcETcCNxCAy5En4v+n08e5uPJYKQJ6kM6UfylCeK3Z0A= 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) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1650551946642129.5946265543638; Thu, 21 Apr 2022 07:39:06 -0700 (PDT) Received: from localhost ([::1]:55582 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nhXxZ-0006mm-E4 for importer@patchew.org; Thu, 21 Apr 2022 10:39:05 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46486) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nhXqS-0002ik-Bu for qemu-devel@nongnu.org; Thu, 21 Apr 2022 10:31:44 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:36990) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nhXqP-0004Kw-5M for qemu-devel@nongnu.org; Thu, 21 Apr 2022 10:31:43 -0400 Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-590-lEQXirqqPbCKJxKi2DvSkQ-1; Thu, 21 Apr 2022 10:31:37 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.rdu2.redhat.com [10.11.54.8]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id DF8543811A39; Thu, 21 Apr 2022 14:31:36 +0000 (UTC) Received: from blackfin.pond.sub.org (unknown [10.36.112.3]) by smtp.corp.redhat.com (Postfix) with ESMTPS id BD6FCC28129; Thu, 21 Apr 2022 14:31:36 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id AA23C21E6A23; Thu, 21 Apr 2022 16:31:35 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1650551500; 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=GWje4EqdZpxWaBXZ0lpdTZMP30Jg97zPp02phq7hIpI=; b=JoOHBrIMHdX0tP+L3/ycu1/n+SKWV9AzgUZIhw6130ZSKqmEnKDgteaguMWJ4M7hZDNs0x L3vF3Z6EtSUCu+6oPnB2rinaCRpow8ivJbP5xQpq37kGZ0Hs0JhARULtnRswWMN//Manm7 5UoB1mDz3uQwb/GaBsOt2bHcoeTn3cY= X-MC-Unique: lEQXirqqPbCKJxKi2DvSkQ-1 From: Markus Armbruster To: qemu-devel@nongnu.org Subject: [PULL 4/7] docs: qapi: Remove outdated reference to simple unions Date: Thu, 21 Apr 2022 16:31:32 +0200 Message-Id: <20220421143135.1491256-5-armbru@redhat.com> In-Reply-To: <20220421143135.1491256-1-armbru@redhat.com> References: <20220421143135.1491256-1-armbru@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 2.85 on 10.11.54.8 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=170.10.133.124; envelope-from=armbru@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -28 X-Spam_score: -2.9 X-Spam_bar: -- X-Spam_report: (-2.9 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.082, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, 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: , Cc: richard.henderson@linaro.org, Andrea Bolognani Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1650551946924100001 Content-Type: text/plain; charset="utf-8" From: Andrea Bolognani Commit 4e99f4b12c0e dropped simple unions and updated most documentation accordingly, but in one case we still claim that there are "two flavors of unions". Signed-off-by: Andrea Bolognani Message-Id: <20220420153408.243584-2-abologna@redhat.com> Reviewed-by: Markus Armbruster Signed-off-by: Markus Armbruster --- docs/devel/qapi-code-gen.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/devel/qapi-code-gen.rst b/docs/devel/qapi-code-gen.rst index 246709ede8..7b968433a6 100644 --- a/docs/devel/qapi-code-gen.rst +++ b/docs/devel/qapi-code-gen.rst @@ -41,8 +41,8 @@ used internally. =20 There are several kinds of types: simple types (a number of built-in types, such as ``int`` and ``str``; as well as enumerations), arrays, -complex types (structs and two flavors of unions), and alternate types -(a choice between other types). +complex types (structs and unions), and alternate types (a choice +between other types). =20 =20 Schema syntax --=20 2.35.1 From nobody Fri May 17 19:45:51 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=1650551992; cv=none; d=zohomail.com; s=zohoarc; b=moP1nyyeKlk5l9sh26ggj7TQECsZDABqlcoDMaUNJZ5Cw0A5cB6lzo4WPPxfjaGVZRRO4tLctrDKhDRh3S8Ur2+XrfBjYIU4iM+qlnPQsAgX3xvwL181k+UdPwymjZ8+8yat0Mf0Ji0IOpJJdKtt8OId899k+5taluuIQBuiLX4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1650551992; 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=wCF3PbQffKFU+Kl11zxKwGlCXgGUV5SMzHc7Iz8xtlQ=; b=e5x/OocNxKJvurzvDXYz8hjiIE4gVRneang6NZ2OIbzycbNn/vwgYgCfBrycNeQD3LaCIDJX8Xf9V6gW1S/ClVVNddBNg9cNXHj6INmNfR6zUMvDZDmaxuLPldZPodMacNeW7Az49DH6iihfALb6wUuwF4LRQAcENaBcdbj5z3g= 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) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1650551992659458.9295963721021; Thu, 21 Apr 2022 07:39:52 -0700 (PDT) Received: from localhost ([::1]:59378 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nhXyJ-0000tC-Lm for importer@patchew.org; Thu, 21 Apr 2022 10:39:51 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46468) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nhXqQ-0002dn-Ku for qemu-devel@nongnu.org; Thu, 21 Apr 2022 10:31:42 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:56011) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nhXqO-0004Ki-Bq for qemu-devel@nongnu.org; Thu, 21 Apr 2022 10:31:42 -0400 Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-624-dxYm8q8sOWOKDPevRic9mw-1; Thu, 21 Apr 2022 10:31:38 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id EE23D973BE7; Thu, 21 Apr 2022 14:31:37 +0000 (UTC) Received: from blackfin.pond.sub.org (unknown [10.36.112.3]) by smtp.corp.redhat.com (Postfix) with ESMTPS id CC1C22026D07; Thu, 21 Apr 2022 14:31:37 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id AB64221E6A24; Thu, 21 Apr 2022 16:31:35 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1650551499; 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=wCF3PbQffKFU+Kl11zxKwGlCXgGUV5SMzHc7Iz8xtlQ=; b=HZwawdfgojPLYwBKjK1iBDeZm/3AaoQJbS0RErV3cnNh7jKgxlFs5agxfA74n5W0mSEsiu U4Z1jXC2chIqidU1iS+KyJ010TRoxeMQO2I9s5l5Gjq+hjt8ALwDsVexJivemrFH417XHf UjD8ZE3aSyuXAi3h3I2lvLHHr86ezfs= X-MC-Unique: dxYm8q8sOWOKDPevRic9mw-1 From: Markus Armbruster To: qemu-devel@nongnu.org Subject: [PULL 5/7] qapi: Fix documentation for query-xen-replication-status Date: Thu, 21 Apr 2022 16:31:33 +0200 Message-Id: <20220421143135.1491256-6-armbru@redhat.com> In-Reply-To: <20220421143135.1491256-1-armbru@redhat.com> References: <20220421143135.1491256-1-armbru@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 2.78 on 10.11.54.4 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=170.10.133.124; envelope-from=armbru@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -28 X-Spam_score: -2.9 X-Spam_bar: -- X-Spam_report: (-2.9 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.082, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, 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: , Cc: richard.henderson@linaro.org, Andrea Bolognani , "Dr . David Alan Gilbert" Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1650551993207100001 Content-Type: text/plain; charset="utf-8" From: Andrea Bolognani The correct return type is ReplicationStatus, not ReplicationResult. Signed-off-by: Andrea Bolognani Message-Id: <20220420153408.243584-3-abologna@redhat.com> Reviewed-by: Dr. David Alan Gilbert Reviewed-by: Markus Armbruster Signed-off-by: Markus Armbruster --- qapi/migration.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qapi/migration.json b/qapi/migration.json index 27d7b28158..409eb086a2 100644 --- a/qapi/migration.json +++ b/qapi/migration.json @@ -1619,7 +1619,7 @@ # # Query replication status while the vm is running. # -# Returns: A @ReplicationResult object showing the status. +# Returns: A @ReplicationStatus object showing the status. # # Example: # --=20 2.35.1 From nobody Fri May 17 19:45:51 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=1650552200; cv=none; d=zohomail.com; s=zohoarc; b=KsGHpkW1TjSUJVn6LJBtzZ9Vp+laH5UrcNhuZhfNFguACyy+JQ/ganPxEj1nc48WrJojgl/PBr8q0ihlbmneS3sfFPduYa8rEw/P6ukwlCuhbL/0SaSx2BXCx7QFiLtyoMxqJwaaabx7jC4VKe5duiwJUfboTn8f+zxGq0BEk3g= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1650552200; 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=l5oxAOHb95NdrvXVwCbmuLPLvOntwSEu4OJZJVBjVs0=; b=YWCBIg/c8uF5VywHaDQEeJGqd2C2c6Nozwc8u07kR80qox7BKgVnHBpeJsZEmKRTWzziDjTtGhssYEup1B951m9jOwGl5urF9Z5cIFfSjCMy1sMlGjLpz7ckMo+sopuKvZwE4eaLbPWRk1dWsJ7mtp/LMdeFG5uqRRChiHKc8y0= 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) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1650552200650777.2849397195203; Thu, 21 Apr 2022 07:43:20 -0700 (PDT) Received: from localhost ([::1]:37914 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nhY1f-0005lT-3h for importer@patchew.org; Thu, 21 Apr 2022 10:43:19 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46454) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nhXqR-0002c4-30 for qemu-devel@nongnu.org; Thu, 21 Apr 2022 10:31:43 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]:25330) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nhXqO-0004Kk-Af for qemu-devel@nongnu.org; Thu, 21 Apr 2022 10:31:41 -0400 Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-551-N_Djl969M-erm-qLMI0NRw-1; Thu, 21 Apr 2022 10:31:38 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id EDEA5973BE5; Thu, 21 Apr 2022 14:31:37 +0000 (UTC) Received: from blackfin.pond.sub.org (unknown [10.36.112.3]) by smtp.corp.redhat.com (Postfix) with ESMTPS id CC1BB2166B4D; Thu, 21 Apr 2022 14:31:37 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id ADC1C21E6A25; Thu, 21 Apr 2022 16:31:35 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1650551499; 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=l5oxAOHb95NdrvXVwCbmuLPLvOntwSEu4OJZJVBjVs0=; b=bJHA1PhLmRHgqkCRiQO1RwKFBDdkwJc1KdFpHfXbT6ZwEEfWrPKuPiN4rv4hcCmDCFY2GE 2DeBTUIZ2qB0yOYx+v+CJQ/koeiPHK7hb5bsJXLfCZG4SeKWWLf9tFHRNAsOTP0vCys5NF nzpBlTD5gEj/aK2KyLuVPQons/TIgmY= X-MC-Unique: N_Djl969M-erm-qLMI0NRw-1 From: Markus Armbruster To: qemu-devel@nongnu.org Subject: [PULL 6/7] qapi: Fix typo Date: Thu, 21 Apr 2022 16:31:34 +0200 Message-Id: <20220421143135.1491256-7-armbru@redhat.com> In-Reply-To: <20220421143135.1491256-1-armbru@redhat.com> References: <20220421143135.1491256-1-armbru@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 2.78 on 10.11.54.6 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=170.10.129.124; envelope-from=armbru@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -28 X-Spam_score: -2.9 X-Spam_bar: -- X-Spam_report: (-2.9 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.082, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, 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: , Cc: richard.henderson@linaro.org, Andrea Bolognani Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1650552202331100001 Content-Type: text/plain; charset="utf-8" From: Andrea Bolognani Signed-off-by: Andrea Bolognani Message-Id: <20220420153408.243584-4-abologna@redhat.com> Reviewed-by: Markus Armbruster Signed-off-by: Markus Armbruster --- qapi/sockets.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qapi/sockets.json b/qapi/sockets.json index 5773d9fcc4..fccc38584b 100644 --- a/qapi/sockets.json +++ b/qapi/sockets.json @@ -149,7 +149,7 @@ # # Note: This type is deprecated in favor of SocketAddress. The # difference between SocketAddressLegacy and SocketAddress is that t= he -# latter is has fewer {} on the wire. +# latter has fewer {} on the wire. # # Since: 1.3 ## --=20 2.35.1 From nobody Fri May 17 19:45:51 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1650551790803241.61852439514973; Thu, 21 Apr 2022 07:36:30 -0700 (PDT) Received: from localhost ([::1]:47202 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nhXv3-00012q-RK for importer@patchew.org; Thu, 21 Apr 2022 10:36:29 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46452) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nhXqQ-0002c2-BH for qemu-devel@nongnu.org; Thu, 21 Apr 2022 10:31:42 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]:25673) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nhXqO-0004Kg-6s for qemu-devel@nongnu.org; Thu, 21 Apr 2022 10:31:41 -0400 Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-499-zEEsoqCBOXO-AcwJzdMjqA-1; Thu, 21 Apr 2022 10:31:38 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.rdu2.redhat.com [10.11.54.8]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id ECD153811A36; Thu, 21 Apr 2022 14:31:37 +0000 (UTC) Received: from blackfin.pond.sub.org (unknown [10.36.112.3]) by smtp.corp.redhat.com (Postfix) with ESMTPS id CC26AC27EBD; Thu, 21 Apr 2022 14:31:37 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id AFC9121E6A26; Thu, 21 Apr 2022 16:31:35 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1650551499; 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=UaSWxSHwOaVEOSu50/urVOZd/RmYPyr4Rsit0zBKVZ0=; b=PzHnsidnfj3ykn85ocLuKkiOK7H+15yMlZqDyFMuKRtykiAZZVSqqMd5r922KneKO4YXcl v9CKCJWjCD+91lxSg8L67NnUL0gW7kn6q/uKWL8esRt+bYBVFkrvYT88/HN2dPH0qJyXoM hhE8MHX/VNiTrX9uful84VhP6cBwbtk= X-MC-Unique: zEEsoqCBOXO-AcwJzdMjqA-1 From: Markus Armbruster To: qemu-devel@nongnu.org Subject: [PULL 7/7] qapi: Fix version of cpu0-id field Date: Thu, 21 Apr 2022 16:31:35 +0200 Message-Id: <20220421143135.1491256-8-armbru@redhat.com> In-Reply-To: <20220421143135.1491256-1-armbru@redhat.com> References: <20220421143135.1491256-1-armbru@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 2.85 on 10.11.54.8 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=170.10.129.124; envelope-from=armbru@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -28 X-Spam_score: -2.9 X-Spam_bar: -- X-Spam_report: (-2.9 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.082, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, 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: , Cc: Dov Murik , richard.henderson@linaro.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1650551792046100001 Content-Type: text/plain; charset="utf-8" From: Dov Murik Commit 811b4ec7f8eb ("qapi, target/i386/sev: Add cpu0-id to query-sev-capabilities") wrongly stated that the new field is available since version 7.0. Fix the QAPI documentation to state that the cpu0-id field is included since 7.1. Signed-off-by: Dov Murik Message-Id: <20220420190129.3532623-1-dovmurik@linux.ibm.com> Reviewed-by: Markus Armbruster Signed-off-by: Markus Armbruster --- qapi/misc-target.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qapi/misc-target.json b/qapi/misc-target.json index bc9355b595..ed4a468aab 100644 --- a/qapi/misc-target.json +++ b/qapi/misc-target.json @@ -144,7 +144,7 @@ # # @cert-chain: PDH certificate chain (base64 encoded) # -# @cpu0-id: Unique ID of CPU0 (base64 encoded) (since 7.0) +# @cpu0-id: Unique ID of CPU0 (base64 encoded) (since 7.1) # # @cbitpos: C-bit location in page table entry # --=20 2.35.1