From nobody Wed Dec 4 19:19:54 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 1732042412563236.3600800828956; Tue, 19 Nov 2024 10:53:32 -0800 (PST) Received: by lists.libvirt.org (Postfix, from userid 996) id 6BED5146A; Tue, 19 Nov 2024 13:53:31 -0500 (EST) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id 5B1DE1473; Tue, 19 Nov 2024 13:50:35 -0500 (EST) Received: by lists.libvirt.org (Postfix, from userid 996) id 39F6813DD; Tue, 19 Nov 2024 13:50:24 -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 AFCF613DB for ; Tue, 19 Nov 2024 13:50:23 -0500 (EST) Received: from mx-prod-mc-03.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-473-NiJY7ZXzPKyrDp-63HKdGA-1; Tue, 19 Nov 2024 13:50:21 -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-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id D25A01956057 for ; Tue, 19 Nov 2024 18:50:20 +0000 (UTC) Received: from orkuz (unknown [10.45.226.13]) by mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 56AB430000DF for ; Tue, 19 Nov 2024 18:50:20 +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=1732042223; 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=KuZUq+W25BwJgWF2jh8R3GDqfqYW2kJm1CYTpklVR8E=; b=VMn9nV/CfCXVsoyi13dTbkg2C0fkw5r5A84QuTFEH9d1YxMkC79AZuqWQzbeqop9Eozyrr A9gjFoC+7nvKvo0F82BiBG0NLcbq1f+e+WY9DGO2mM1dVPaGw+orn0lvciGDOa9vEnlZbF ocCemsqi1Ej9I3Bbel4OB9Gk+MoIq64= X-MC-Unique: NiJY7ZXzPKyrDp-63HKdGA-1 X-Mimecast-MFC-AGG-ID: NiJY7ZXzPKyrDp-63HKdGA From: Jiri Denemark To: devel@lists.libvirt.org Subject: [PATCH 04/32] sync_qemu_models_i386: Do not overwrite existing models Date: Tue, 19 Nov 2024 19:49:40 +0100 Message-ID: <00bd943baad5e6d9969fc16fe0c3c4cfcb8514f6.1732039836.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: WfC67qNPl61ZX-7-N57d6or4RBTBdq7BXoBDWJpCsy8_1732042220 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: FRC56JXFIPOJGM7UD66I5GFYYBFIYLM5 X-Message-ID-Hash: FRC56JXFIPOJGM7UD66I5GFYYBFIYLM5 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: 1732042413613116600 Content-Type: text/plain; charset="utf-8" We don't change definitions of CPU models which were already included in a libvirt release to maintain migration compatibility. Thus the script can just skip existing models and save us from having to drop the changes it would do to them. Signed-off-by: Jiri Denemark Reviewed-by: Daniel P. Berrang=C3=A9 --- src/cpu_map/sync_qemu_models_i386.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/cpu_map/sync_qemu_models_i386.py b/src/cpu_map/sync_qemu_m= odels_i386.py index 78c2bffab2..f7b06a7716 100755 --- a/src/cpu_map/sync_qemu_models_i386.py +++ b/src/cpu_map/sync_qemu_models_i386.py @@ -535,6 +535,10 @@ def main(): =20 for model in models: name =3D os.path.join(args.outdir, f"x86_{model['name']}.xml") + if os.path.isfile(name): + # Ignore existing models as CPU models in libvirt should never + # change once released. + continue with open(name, "wt") as f: output_model(f, model) =20 --=20 2.47.0