From nobody Sun Feb 8 19:19:55 2026 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 1732801704819618.2510518125165; Thu, 28 Nov 2024 05:48:24 -0800 (PST) Received: by lists.libvirt.org (Postfix, from userid 996) id 2A16F1CBF; Thu, 28 Nov 2024 08:48:24 -0500 (EST) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id F1A851CC8; Thu, 28 Nov 2024 08:47:16 -0500 (EST) Received: by lists.libvirt.org (Postfix, from userid 996) id 33C521C73; Thu, 28 Nov 2024 08:47:13 -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 E84021C73 for ; Thu, 28 Nov 2024 08:47:06 -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-637-J3mS-N2rMDam5FcUjiEAKw-1; Thu, 28 Nov 2024 08:47:05 -0500 Received: from mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.4]) (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 A5A7F195609F for ; Thu, 28 Nov 2024 13:47:04 +0000 (UTC) Received: from orkuz (unknown [10.43.3.115]) by mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 32545300018D for ; Thu, 28 Nov 2024 13:47:03 +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=-1.7 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=1732801626; 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=ExvyuWVZxGlElNyrF4Ojq7CrOVLESM1lzrMomW8oUxU=; b=gk+RlLn9mf2X6u9FND2C5Q9qtEIHnb3CjlmNeGbTVvCi/DCKiLU/sHQRbC/nC7uVpRcCdf 15xBz1XYfCxuvzIHPC25qggjCA5Hb4sdTT8d+RxVEc8F4NdxvznHgwe19EGKppkCSzPu+8 bVXDQFzxJ7FZihFtRXlxdE1RbnZDR98= X-MC-Unique: J3mS-N2rMDam5FcUjiEAKw-1 X-Mimecast-MFC-AGG-ID: J3mS-N2rMDam5FcUjiEAKw From: Jiri Denemark To: devel@lists.libvirt.org Subject: [PATCH 2/5] sync_qemu_models_i386: Update meson.build Date: Thu, 28 Nov 2024 14:46:54 +0100 Message-ID: <0b7d75652889bbad4bf4b57031799f0a43d4862d.1732801363.git.jdenemar@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.4 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: aPvpDHwxpahHJxotqa6VjDZJIKYohzp2PJ4haH6aYhg_1732801624 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: 55UDDOZ3V4GNG2HYRXFX5OQRQJP7D4HO X-Message-ID-Hash: 55UDDOZ3V4GNG2HYRXFX5OQRQJP7D4HO 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: 1732801705275019100 Content-Type: text/plain; charset="utf-8" When adding new CPU models to CPU map it's easy (and very common) to forget to add the new files to meson.build. We already update index.xml with the new models so updating meson.build too makes sense. Signed-off-by: Jiri Denemark --- src/cpu_map/sync_qemu_models_i386.py | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/src/cpu_map/sync_qemu_models_i386.py b/src/cpu_map/sync_qemu_m= odels_i386.py index 798d767f4d..11fe1f7435 100755 --- a/src/cpu_map/sync_qemu_models_i386.py +++ b/src/cpu_map/sync_qemu_models_i386.py @@ -596,6 +596,32 @@ def update_index(outdir, models): f.write("\n") =20 =20 +def update_meson(outdir, models): + meson =3D os.path.join(outdir, "meson.build") + + with open(meson, "r") as f: + lines =3D f.readlines() + + start =3D None + end =3D None + for i in range(len(lines)): + if start is None and lines[i].startswith("cpumap_data =3D"): + start =3D i + 1 + + if start is not None and lines[i] =3D=3D "]\n": + end =3D i + break + + xmls =3D lines[start:end] + for files in models.values(): + xmls.extend([f" '{file}',\n" for file in files]) + + with open(meson, "w") as f: + f.writelines(lines[:start]) + f.writelines(sorted(xmls, key=3Dstr.lower)) + f.writelines(lines[end:]) + + def main(): parser =3D argparse.ArgumentParser( description=3D"Synchronize x86 cpu models from QEMU i386 target.") @@ -658,6 +684,7 @@ def main(): output_model(f, extra, model) =20 update_index(args.outdir, files) + update_meson(args.outdir, files) =20 features =3D set() for model in models: --=20 2.47.0