From nobody Sun Dec 22 09:13:53 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 173341996337123.458114733492152; Thu, 5 Dec 2024 09:32:43 -0800 (PST) Received: by lists.libvirt.org (Postfix, from userid 996) id 3B38C1311; Thu, 5 Dec 2024 12:32:42 -0500 (EST) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id DBA5A132C; Thu, 5 Dec 2024 12:31:04 -0500 (EST) Received: by lists.libvirt.org (Postfix, from userid 996) id B5DC912B7; Thu, 5 Dec 2024 12:30:59 -0500 (EST) 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 443801324 for ; Thu, 5 Dec 2024 12:30:44 -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-424-qBYoUv9iOE2bNFavmjYcTA-1; Thu, 05 Dec 2024 12:30:41 -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 B6760195608C for ; Thu, 5 Dec 2024 17:30:40 +0000 (UTC) Received: from orkuz (unknown [10.45.224.59]) by mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 3CFF119560A2 for ; Thu, 5 Dec 2024 17:30: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=1733419843; 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=ZeyngZq9FBNk6YcJx5TuhJ9mlX7+BL+auJPyyrDB64/zdGkuPEFUJSzKwo+jt2TOGI+jCK EGF0/KsZrsjmclzcTyro2i5bRcYRFLvirkDIGTmgSISsuMXICE89p6EiohDNAiZdf8qNlB gf4nIGf2vV//afYV4603E6nTGJ6TwYg= X-MC-Unique: qBYoUv9iOE2bNFavmjYcTA-1 X-Mimecast-MFC-AGG-ID: qBYoUv9iOE2bNFavmjYcTA From: Jiri Denemark To: devel@lists.libvirt.org Subject: [PATCH v2 02/25] sync_qemu_models_i386: Update meson.build Date: Thu, 5 Dec 2024 18:30:09 +0100 Message-ID: <6bc3c4cdfd39a1b05dc8a422dd3ddc5953f9b67f.1733412730.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: gDIR77Bpl84ZZVyaaedhoxM71s4Wh6BMlCXcVdfmDKc_1733419840 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: PYQE4ETSVMQZCRU3RZIHIU7UVVFIMSGF X-Message-ID-Hash: PYQE4ETSVMQZCRU3RZIHIU7UVVFIMSGF 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: 1733419965797116600 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