From nobody Sat Apr 5 02:13:57 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=1739565478; cv=none; d=zohomail.com; s=zohoarc; b=E5tyJfbc2SoIRqWT6JTLZcEUpkEZ91Le8C2nQLTtU+/Tr0xfrzKpRIxWZ3tHBhM/u9NRoVa/B9p17r8PLOVQbuVfd2hN8Re6fEkc8VWKxBtS1dYdwDEC2fdYzRU3a4YNmemwLehQ+GOKAmX0D7CZuZi06HjkDjfSo4YEUzz63pc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1739565478; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=N3SVrTqLq8tuMrJJ7lHZyUbVQuh8koYYjB5pQtXNihI=; b=k8olyXiBow9hft7d6VgNns8+jkYkrF0Dc7htupeHl+LkfTDsvHUAo35hqqbmI4H/NL24xBaZIUyXUH1uD9F3rN3v5x5GZyRDWkQjC1FaZRxwqr/yStXifZKoYNNClwBpcd6XHHOotfRG5Vx4spkcxMFoY8eKrW6j5yYiKbhgo5o= 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 1739565478644901.240044587796; Fri, 14 Feb 2025 12:37:58 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tj2Ls-0005Z7-79; Fri, 14 Feb 2025 15:31:57 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tj2KT-00049H-Ez for qemu-devel@nongnu.org; Fri, 14 Feb 2025 15:30:50 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tj2KP-000225-59 for qemu-devel@nongnu.org; Fri, 14 Feb 2025 15:30:28 -0500 Received: from mx-prod-mc-02.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-141-rePO_smrPnONYfBgBjPnWA-1; Fri, 14 Feb 2025 15:30:22 -0500 Received: from mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.111]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-02.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 9879118EB2C6 for ; Fri, 14 Feb 2025 20:30:21 +0000 (UTC) Received: from tapioca.redhat.com (unknown [10.44.32.23]) by mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 513D91800358; Fri, 14 Feb 2025 20:30:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1739565024; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=N3SVrTqLq8tuMrJJ7lHZyUbVQuh8koYYjB5pQtXNihI=; b=alvB0Xohjj9M+/Q8tmvz+cq4D+UvetVULyws+shWYO/+CuEb4mWJh8fLr0GXRq7Aklg6DE FKv7Wq2lP/E+S8J3Fd2QrpeFQa2Q2CUdrvB2XtHQNVDXYNBSLpcqZzgCIKdvzby3gwBu7p F1avZ/S5tqXmS8wmpWJqMMOs9cz0+CI= X-MC-Unique: rePO_smrPnONYfBgBjPnWA-1 X-Mimecast-MFC-AGG-ID: rePO_smrPnONYfBgBjPnWA_1739565021 From: Victor Toso To: qemu-devel@nongnu.org Cc: Markus Armbruster , John Snow , =?UTF-8?q?Daniel=20P=20=2E=20Berrang=C3=A9?= , Andrea Bolognani Subject: [PATCH v4 09/11] qapi: golang: Generate command type Date: Fri, 14 Feb 2025 21:29:42 +0100 Message-ID: <20250214202944.69897-10-victortoso@redhat.com> In-Reply-To: <20250214202944.69897-1-victortoso@redhat.com> References: <20250214202944.69897-1-victortoso@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.111 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=victortoso@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -37 X-Spam_score: -3.8 X-Spam_bar: --- X-Spam_report: (-3.8 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1.732, 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=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001, 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.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1739565481290019100 Content-Type: text/plain; charset="utf-8" This patch handles QAPI command types and generates data structures in Go that handles it. Note that command's id is part of the first layer of unmarshal, so it is a member of protocol.go's Message type. qapi: | ## | # @add-fd: | # | # Add a file descriptor, that was passed via SCM rights, to an fd set. | # | # @fdset-id: The ID of the fd set to add the file descriptor to. | # | # @opaque: A free-form string that can be used to describe the fd. | # | # Returns: | # @AddfdInfo | # | # Errors: | # - If file descriptor was not received, GenericError | # - If @fdset-id is a negative value, GenericError | # | # .. note:: The list of fd sets is shared by all monitor connections. | # | # .. note:: If @fdset-id is not specified, a new fd set will be | # created. | # | # Since: 1.2 | # | # .. qmp-example:: | # | # -> { "execute": "add-fd", "arguments": { "fdset-id": 1 } } | # <- { "return": { "fdset-id": 1, "fd": 3 } } | ## | { 'command': 'add-fd', | 'data': { '*fdset-id': 'int', | '*opaque': 'str' }, | 'returns': 'AddfdInfo' } go: | // Add a file descriptor, that was passed via SCM rights, to an fd | // set. | // | // Returns: @AddfdInfo | // | // Errors: - If file descriptor was not received, GenericError - | // If @fdset-id is a negative value, GenericError | // | // .. note:: The list of fd sets is shared by all monitor connections. | // .. note:: If @fdset-id is not specified, a new fd set will be | // created. | // | // Since: 1.2 | // | // .. qmp-example:: -> { "execute": "add-fd", "arguments": { | // "fdset-id": 1 } } <- { "return": { "fdset-id": 1, "fd": 3 } } | type AddFdCommand struct { | // The ID of the fd set to add the file descriptor to. | FdsetId *int64 `json:"fdset-id,omitempty"` | // A free-form string that can be used to describe the fd. | Opaque *string `json:"opaque,omitempty"` | } Signed-off-by: Victor Toso --- scripts/qapi/golang/golang.py | 52 +++++++++++++++++++++++++++++++++-- 1 file changed, 50 insertions(+), 2 deletions(-) diff --git a/scripts/qapi/golang/golang.py b/scripts/qapi/golang/golang.py index b9a2c47137..a14970fb1f 100644 --- a/scripts/qapi/golang/golang.py +++ b/scripts/qapi/golang/golang.py @@ -316,7 +316,7 @@ def qapi_to_go_type_name(name: str, meta: Optional[str]= =3D None) -> str: name +=3D "".join(word.title() for word in words[1:]) =20 # Handle specific meta suffix - types =3D ["event"] + types =3D ["event", "command"] if meta in types: name =3D name[:-3] if name.endswith("Arg") else name name +=3D meta.title().replace(" ", "") @@ -1009,6 +1009,15 @@ def generate_template_alternate( return "\n" + content =20 =20 +def generate_template_command(commands: dict[str, Tuple[str, str]]) -> str: + content =3D "" + for name in sorted(commands): + type_name, gocode =3D commands[name] + content +=3D gocode + + return content + + def generate_template_event(events: dict[str, Tuple[str, str]]) -> (str, s= tr): content =3D "" methods =3D "" @@ -1069,6 +1078,7 @@ def __init__(self, _: str): # Map each qapi type to the necessary Go imports types =3D { "alternate": ["encoding/json", "errors", "fmt"], + "command": [], "enum": [], "event": [], "struct": ["encoding/json"], @@ -1080,6 +1090,7 @@ def __init__(self, _: str): =20 self.schema: QAPISchema self.events: dict[str, Tuple[str, str]] =3D {} + self.commands: dict[str, Tuple[str, str]] =3D {} self.golang_package_name =3D "qapi" self.duplicate =3D list(gofiles) self.enums: dict[str, str] =3D {} @@ -1140,6 +1151,8 @@ def visit_end(self) -> None: self.types["event"] +=3D evtype self.interfaces["event"] +=3D eviface =20 + self.types["command"] +=3D generate_template_command(self.commands) + def visit_object_type( self, name: str, @@ -1286,7 +1299,42 @@ def visit_command( allow_preconfig: bool, coroutine: bool, ) -> None: - pass + assert name =3D=3D info.defn_name + assert name not in self.commands + + type_name =3D qapi_to_go_type_name(name, info.defn_meta) + + doc =3D self.docmap.get(name, None) + type_doc, _ =3D qapi_to_golang_struct_docs(doc) + + content =3D "" + if boxed or not arg_type or not qapi_name_is_object(arg_type.name): + args: List[dict[str:str]] =3D [] + if arg_type: + args.append( + { + "name": f"{arg_type.name}", + } + ) + content +=3D string_to_code( + generate_struct_type(type_name, type_doc=3Dtype_doc, args= =3Dargs) + ) + else: + assert isinstance(arg_type, QAPISchemaObjectType) + content +=3D string_to_code( + qapi_to_golang_struct( + self, + name, + arg_type.info, + arg_type.ifcond, + arg_type.features, + arg_type.base, + arg_type.members, + arg_type.branches, + ) + ) + + self.commands[name] =3D (type_name, content) =20 def visit_event( self, --=20 2.48.1