From nobody Thu Dec 5 01:49:17 2024 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 1732311521290744.9792964315466; Fri, 22 Nov 2024 13:38:41 -0800 (PST) Received: by lists.libvirt.org (Postfix, from userid 996) id B900A1B4F; Fri, 22 Nov 2024 16:38:40 -0500 (EST) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id E258416E7; Fri, 22 Nov 2024 16:34:24 -0500 (EST) Received: by lists.libvirt.org (Postfix, from userid 996) id 5F5751677; Fri, 22 Nov 2024 16:34:17 -0500 (EST) 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 AC9EA1539 for ; Fri, 22 Nov 2024 16:33:38 -0500 (EST) Received: from mx-prod-mc-05.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-125-dToxbsPkM6ODLvoIHoUsDg-1; Fri, 22 Nov 2024 16:33:37 -0500 Received: from mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.12]) (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-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 5C5F71956083 for ; Fri, 22 Nov 2024 21:33:36 +0000 (UTC) Received: from orkuz (unknown [10.45.224.26]) by mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id D54DE19560A3 for ; Fri, 22 Nov 2024 21:33:35 +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.5 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=1732311218; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=l46legtJX/u4WIg/CO8l/BVRbq1qkK77GhjtMZnG4Ys=; b=C4gX2P7Qh646DjVw8IQWjUztt9u9EuOhPsw3kOIJfuhJE6wzd2Czw1xbzm8lr4b/uCyDI5 CS5WKZdznxJPUtPAY9tyDOPK+y+I5GDhHoZBhdve0VLzgzwDxECJ3C9rwjySiPeNz/Pf0C qhAUghbcEMYVvLJsCVO8HNFVc5xG4bg= X-MC-Unique: dToxbsPkM6ODLvoIHoUsDg-1 X-Mimecast-MFC-AGG-ID: dToxbsPkM6ODLvoIHoUsDg From: Jiri Denemark To: devel@lists.libvirt.org Subject: [PATCH v2 08/36] sync_qemu_models_i386: Store extra info in a separate file Date: Fri, 22 Nov 2024 22:32:48 +0100 Message-ID: <53966a909ad563d1cafb24fc189c5801d2c51c8b.1732311125.git.jdenemar@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.12 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: F_NDgVbbvTW-B8eFsEL_bOyBOwiSaxa-lZzAEnFF3Kk_1732311216 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: LCCX4J5IF6AH4NU32VWUE7OQHFLTPLYV X-Message-ID-Hash: LCCX4J5IF6AH4NU32VWUE7OQHFLTPLYV X-MailFrom: jdenemar@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: 1732311524530116600 Content-Type: text/plain; charset="utf-8" We don't really need or want the extra info to be included in the CPU model definitions in git, it's mostly useful for verifying the output of the script. Let's store it in a separate file rather than in a comment block of the CPU model definition itself. Signed-off-by: Jiri Denemark Reviewed-by: Daniel P. Berrang=C3=A9 --- Notes: Version 2: - reworked to avoid breaking "sync_qemu_models_i386: Update index.xml" patch src/cpu_map/sync_qemu_models_i386.py | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/src/cpu_map/sync_qemu_models_i386.py b/src/cpu_map/sync_qemu_m= odels_i386.py index 5169d50b08..58600bffe5 100755 --- a/src/cpu_map/sync_qemu_models_i386.py +++ b/src/cpu_map/sync_qemu_models_i386.py @@ -507,12 +507,13 @@ def expand_model(model): yield result =20 =20 -def output_model(f, model): +def output_model(f, extra, model): if model["extra"]: - f.write("\n") + with open(extra, "wt") as ex: + ex.write("# THIS FILE SHOULD NEVER BE ADDED TO A COMMIT\n") + ex.write("extra info from qemu:\n") + for k, v in model["extra"].items(): + ex.write(f" {k}: {v}\n") =20 decode =3D "off" if "base" in model else "on" =20 @@ -573,13 +574,17 @@ def main(): models.extend(expand_model(model)) =20 for model in models: - name =3D os.path.join(args.outdir, f"x86_{model['name']}.xml") - if os.path.isfile(name): + name =3D f"x86_{model['name']}.xml" + path =3D os.path.join(args.outdir, name) + + if os.path.isfile(path): # Ignore existing models as CPU models in libvirt should never # change once released. continue - with open(name, "wt") as f: - output_model(f, model) + + extra =3D os.path.join(args.outdir, f"x86_{model['name']}.extra") + with open(path, "wt") as f: + output_model(f, extra, model) =20 features =3D set() for model in models: --=20 2.47.0