From nobody Wed Dec 17 07:14:01 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) client-ip=8.43.85.245; envelope-from=devel-bounces@lists.libvirt.org; helo=lists.libvirt.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 174188148699037.97071438283706; Thu, 13 Mar 2025 08:58:06 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 5E3FB222C; Thu, 13 Mar 2025 11:58:06 -0400 (EDT) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id 375341F07; Thu, 13 Mar 2025 11:57:46 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 8D31D1E8D; Thu, 13 Mar 2025 11:57:43 -0400 (EDT) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id DDE421EDB for ; Thu, 13 Mar 2025 11:57:42 -0400 (EDT) Received: from mx-prod-mc-01.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-631-uj75qUyVOn2_O-Ciy8x1aQ-1; Thu, 13 Mar 2025 11:57:41 -0400 Received: from mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.17]) (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-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 5BA611956050 for ; Thu, 13 Mar 2025 15:57:40 +0000 (UTC) Received: from toolbx.redhat.com (unknown [10.42.28.159]) by mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 96A3F1955F2D; Thu, 13 Mar 2025 15:57:39 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on lists.libvirt.org X-Spam-Level: X-Spam-Status: No, score=-0.8 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H5,RCVD_IN_MSPIKE_WL,RCVD_IN_VALIDITY_RPBL_BLOCKED, RCVD_IN_VALIDITY_SAFE_BLOCKED,SPF_HELO_NONE autolearn=unavailable autolearn_force=no version=3.4.4 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1741881462; 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=7RmaxYoRrD7ChTLRV2h1TyITq+2oYrYNTh5AyHc86Rs=; b=djDnQjOpxhYoFDxnj/T0ZtGEhPLNQHJ0ygYvYj5Kpp3Yvky0SRmRz0y4DpH+EsSvLO+9wS chvT+E7dNTt8MqAa6ePRRPq0XSzHcd8uXvtfpHYJopLZl+bxzyOKtUM7YPCp+JZnFaXkSE xtC9PeQ9IKIoO9iKIGG37KBMv4iSVSo= X-MC-Unique: uj75qUyVOn2_O-Ciy8x1aQ-1 X-Mimecast-MFC-AGG-ID: uj75qUyVOn2_O-Ciy8x1aQ_1741881460 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: devel@lists.libvirt.org Cc: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= Subject: [PATCH 1/2] src: normalize whitespace in protocol structs files Date: Thu, 13 Mar 2025 15:57:36 +0000 Message-ID: <20250313155737.2008606-2-berrange@redhat.com> In-Reply-To: <20250313155737.2008606-1-berrange@redhat.com> References: <20250313155737.2008606-1-berrange@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.17 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: GSbww9cFmbU7nDipR7Gb5CKr-yv1FEq5GU-Zz6g-Yd0_1741881460 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: YZW7J4LWO24BVVPDGE6N7S4A7K2VWB3I X-Message-ID-Hash: YZW7J4LWO24BVVPDGE6N7S4A7K2VWB3I X-MailFrom: berrange@redhat.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-config-1; header-match-config-2; header-match-config-3; header-match-devel.lists.libvirt.org-0; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; suspicious-header X-Mailman-Version: 3.2.2 Precedence: list List-Id: Development discussions about the libvirt library & tools Archived-At: List-Archive: List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1741881489411019000 Content-Type: text/plain; charset="utf-8" This makes the output match what current pdwtags will emit, modulo some whitespace changes made by the check script before comparison. Signed-off-by: Daniel P. Berrang=C3=A9 Reviewed-by: Martin Kletzander --- src/admin_protocol-structs | 2 +- src/qemu_protocol-structs | 2 +- src/remote_protocol-structs | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/admin_protocol-structs b/src/admin_protocol-structs index 8caac59824..f6988cf76d 100644 --- a/src/admin_protocol-structs +++ b/src/admin_protocol-structs @@ -167,5 +167,5 @@ enum admin_procedure { ADMIN_PROC_CONNECT_SET_LOGGING_OUTPUTS =3D 16, ADMIN_PROC_CONNECT_SET_LOGGING_FILTERS =3D 17, ADMIN_PROC_SERVER_UPDATE_TLS_FILES =3D 18, - ADMIN_PROC_CONNECT_SET_DAEMON_TIMEOUT =3D 19, + ADMIN_PROC_CONNECT_SET_DAEMON_TIMEOUT =3D 19, }; diff --git a/src/qemu_protocol-structs b/src/qemu_protocol-structs index ea0854385f..7c78e5ab5a 100644 --- a/src/qemu_protocol-structs +++ b/src/qemu_protocol-structs @@ -62,5 +62,5 @@ enum qemu_procedure { QEMU_PROC_CONNECT_DOMAIN_MONITOR_EVENT_REGISTER =3D 4, QEMU_PROC_CONNECT_DOMAIN_MONITOR_EVENT_DEREGISTER =3D 5, QEMU_PROC_DOMAIN_MONITOR_EVENT =3D 6, - QEMU_PROC_DOMAIN_MONITOR_COMMAND_WITH_FILES =3D 7, + QEMU_PROC_DOMAIN_MONITOR_COMMAND_WITH_FILES =3D 7, }; diff --git a/src/remote_protocol-structs b/src/remote_protocol-structs index 4d3dc2d249..ed7e2fbcb0 100644 --- a/src/remote_protocol-structs +++ b/src/remote_protocol-structs @@ -569,7 +569,7 @@ struct remote_domain_save_params_args { u_int params_len; remote_typed_param * params_val; } params; - u_int flags; + u_int flags; }; struct remote_domain_restore_args { remote_nonnull_string from; @@ -1115,7 +1115,7 @@ struct remote_network_create_xml_ret { }; struct remote_network_create_xml_flags_args { remote_nonnull_string xml; - u_int flags; + u_int flags; }; struct remote_network_create_xml_flags_ret { remote_nonnull_network net; @@ -1128,7 +1128,7 @@ struct remote_network_define_xml_ret { }; struct remote_network_define_xml_flags_args { remote_nonnull_string xml; - u_int flags; + u_int flags; }; struct remote_network_define_xml_flags_ret { remote_nonnull_network net; --=20 2.48.1 From nobody Wed Dec 17 07:14:01 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) client-ip=8.43.85.245; envelope-from=devel-bounces@lists.libvirt.org; helo=lists.libvirt.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 17418815093281004.526479047949; Thu, 13 Mar 2025 08:58:29 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 996) id B0E4D1EF2; Thu, 13 Mar 2025 11:58:28 -0400 (EDT) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id F294121BE; Thu, 13 Mar 2025 11:57:47 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 4BB451E8D; Thu, 13 Mar 2025 11:57:44 -0400 (EDT) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id BF6CA1EDB for ; Thu, 13 Mar 2025 11:57:43 -0400 (EDT) Received: from mx-prod-mc-06.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-340-1O0ebQIVPbKKJuo4pGEKLA-1; Thu, 13 Mar 2025 11:57:42 -0400 Received: from mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.17]) (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-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 88AF7180049D for ; Thu, 13 Mar 2025 15:57:41 +0000 (UTC) Received: from toolbx.redhat.com (unknown [10.42.28.159]) by mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id B2B2F1955F2D; Thu, 13 Mar 2025 15:57:40 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on lists.libvirt.org X-Spam-Level: X-Spam-Status: No, score=-0.8 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2,RCVD_IN_VALIDITY_RPBL_BLOCKED, RCVD_IN_VALIDITY_SAFE_BLOCKED,SPF_HELO_NONE autolearn=unavailable autolearn_force=no version=3.4.4 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1741881463; 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=uuZ1Orz4NNmYF3ilAfp9XjdVuQaggE7F9QTiH565nQw=; b=B3//TGGFmQ8YCU3214S1+Mb/FH6pdMtOsl3KbqqcWDPymFZUkh3g3Jnw9frpD5UAb+3nXz 8E1m2joZ+uc0UVnNvBDP0jWx97MkGxFSO9KOVDWCWjqbDFt4osZ6yZ8FjT0f9a8eY0lZdL 816FU46KwEDR2h55o5U8eQT6JaF6eGU= X-MC-Unique: 1O0ebQIVPbKKJuo4pGEKLA-1 X-Mimecast-MFC-AGG-ID: 1O0ebQIVPbKKJuo4pGEKLA_1741881461 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: devel@lists.libvirt.org Cc: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= Subject: [PATCH 2/2] src: add new target for regenerating protocol structs files Date: Thu, 13 Mar 2025 15:57:37 +0000 Message-ID: <20250313155737.2008606-3-berrange@redhat.com> In-Reply-To: <20250313155737.2008606-1-berrange@redhat.com> References: <20250313155737.2008606-1-berrange@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.17 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: 3bEYhLdvs8C7Y_Khrzl-48unpDAKPHWNm0uZvKwj6sE_1741881461 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: CCJJ2RK2SV6JFQXYYZISE2GKJRFXBPAO X-Message-ID-Hash: CCJJ2RK2SV6JFQXYYZISE2GKJRFXBPAO X-MailFrom: berrange@redhat.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-config-1; header-match-config-2; header-match-config-3; header-match-devel.lists.libvirt.org-0; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; suspicious-header X-Mailman-Version: 3.2.2 Precedence: list List-Id: Development discussions about the libvirt library & tools Archived-At: List-Archive: List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1741881511818019000 Content-Type: text/plain; charset="utf-8" Introduce a new ninja target ninja -C build regen-{PROTO} eg ninja -C build regen-admin_protocol that will re-create the reference output file based on what the current pdwtags command emits. A small change is made to squash whitespace on enum declarations so that introducing a new longer enum name dosn't trigger re-indent of all existing enum names. Signed-off-by: Daniel P. Berrang=C3=A9 Reviewed-by: Martin Kletzander --- scripts/check-remote-protocol.py | 27 ++++++++++++++++++++++++++- src/meson.build | 14 ++++++++++++++ 2 files changed, 40 insertions(+), 1 deletion(-) diff --git a/scripts/check-remote-protocol.py b/scripts/check-remote-protoc= ol.py index 40c4b481be..9de0a4a93d 100644 --- a/scripts/check-remote-protocol.py +++ b/scripts/check-remote-protocol.py @@ -36,6 +36,9 @@ targetname =3D sys.argv[2] libpath =3D sys.argv[3] pdwtags =3D sys.argv[4] expected =3D sys.argv[5] +regen =3D False +if len(sys.argv) =3D=3D 7 and sys.argv[6] =3D=3D "--regenerate": + regen =3D True =20 builddir =3D os.path.dirname(libpath) libname =3D os.path.basename(libpath) @@ -128,7 +131,29 @@ actualstr =3D "\n".join(actual) + "\n" # know our RPC structs are suitably aligned to not need # packing, so we can just trim the attribute. actualstr =3D re.sub(r'''} __attribute__\(\(__packed__\)\);''', "};", actu= alstr) +actualstr =3D re.sub(r'''([A-Z0-9]+)\s+=3D\s+(\d)''', r'''\1 =3D \2''', ac= tualstr) =20 diff.communicate(input=3Dactualstr.encode("utf-8")) =20 -sys.exit(diff.returncode) +if diff.returncode !=3D 0: + if regen: + with open(expected, "w") as fh: + print(actualstr, file=3Dfh, end=3D'') + + print("") + print("WARNING: reference output was re-generated to apply") + print("WARNING: the above diff. Validate the changes are") + print("WARNING: expected and correct before committing") + print("") + sys.exit(0) + else: + print("") + print("WARNING: validate the above protocol changes are") + print("WARNING: expected and correct. To re-generate the") + print("WARNING: reference output invoke") + print("") + print(" $ ninja regen-%s" % name) + + sys.exit(diff.returncode) +else: + sys.exit(0) diff --git a/src/meson.build b/src/meson.build index 9413192a55..9a818dab50 100644 --- a/src/meson.build +++ b/src/meson.build @@ -1088,6 +1088,20 @@ if tests_enabled[0] depends: [ lib ], suite: 'script' ) + + run_target( + 'regen-@0@'.format(proto['name']), + command: [python3_prog, + check_remote_protocol_prog.full_path(), + proto['name'], + lib.name(), + lib.full_path(), + pdwtags_prog.full_path(), + files('@0@-structs'.format(proto['name'])), + '--regenerate', + ], + env: runutf8, + depends: [ lib ]) endforeach endif endif --=20 2.48.1