From nobody Wed Dec 4 18:59:39 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 1732042441228166.7139916296303; Tue, 19 Nov 2024 10:54:01 -0800 (PST) Received: by lists.libvirt.org (Postfix, from userid 996) id 32D721495; Tue, 19 Nov 2024 13:54:00 -0500 (EST) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id 9C71213E9; Tue, 19 Nov 2024 13:50:36 -0500 (EST) Received: by lists.libvirt.org (Postfix, from userid 996) id ADFD213DC; Tue, 19 Nov 2024 13:50:25 -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 31423137A for ; Tue, 19 Nov 2024 13:50:25 -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-481-RC_JC2KkPfea_UQi-AG2TQ-1; Tue, 19 Nov 2024 13:50:23 -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 CCBB4195608B for ; Tue, 19 Nov 2024 18:50:22 +0000 (UTC) Received: from orkuz (unknown [10.45.226.13]) by mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 4F1F919560A3 for ; Tue, 19 Nov 2024 18:50:22 +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=1732042224; 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=ntIVj1xeN3INbwykT2PEu0XCy68VltG2e268YpD50mU=; b=XfPQUVWArYaf4asx1FxdP6wCulJ+4KOue8Ky1tWepz2ta4YWhPAfkLug6SuNL/OemxAfax 6argX0uSNnb+W5US9RnIGJeGzdw0gpiKR9R3ecDQcu+bblZI1evODQKG6CK2aYzBM7d1iu WEJn/0jmHyjHTZL8F40lsmEIbxQRlLs= X-MC-Unique: RC_JC2KkPfea_UQi-AG2TQ-1 X-Mimecast-MFC-AGG-ID: RC_JC2KkPfea_UQi-AG2TQ From: Jiri Denemark To: devel@lists.libvirt.org Subject: [PATCH 05/32] sync_qemu_models_i386: Do not require full path to QEMU's cpu.c Date: Tue, 19 Nov 2024 19:49:41 +0100 Message-ID: <35bd97f6ac9513866a4d1ca2aa8cb34c89c06c46.1732039836.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: 1QlbZWjUcjysqE0MogJXnw4xB4NxXCMbZ1LPjmoOub8_1732042222 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: HPZEFWAIVHAOYZSCHLJM7LFX6I6YEBIA X-Message-ID-Hash: HPZEFWAIVHAOYZSCHLJM7LFX6I6YEBIA 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: 1732042441736116600 Content-Type: text/plain; charset="utf-8" While the script for synchronizing CPU features expects a path to QEMU source tree, this CPU model script insisted on getting a full patch to cpu.c file, even though it could easily deduce it from the path to QEMU source tree. Signed-off-by: Jiri Denemark Reviewed-by: Daniel P. Berrang=C3=A9 --- src/cpu_map/sync_qemu_models_i386.py | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/src/cpu_map/sync_qemu_models_i386.py b/src/cpu_map/sync_qemu_m= odels_i386.py index f7b06a7716..13f62780e6 100755 --- a/src/cpu_map/sync_qemu_models_i386.py +++ b/src/cpu_map/sync_qemu_models_i386.py @@ -502,8 +502,8 @@ def main(): parser =3D argparse.ArgumentParser( description=3D"Synchronize x86 cpu models from QEMU i386 target.") parser.add_argument( - "cpufile", - help=3D"Path to 'target/i386/cpu.c' file in the QEMU repository", + "qemu", + help=3D"Path to QEMU source code", type=3Dos.path.realpath) parser.add_argument( "outdir", @@ -512,7 +512,12 @@ def main(): =20 args =3D parser.parse_args() =20 - builtin_x86_defs =3D read_builtin_x86_defs(args.cpufile) + cpufile =3D os.path.join(args.qemu, 'target/i386/cpu.c') + if not os.path.isfile(cpufile): + parser.print_help() + exit("QEMU source directory not found") + + builtin_x86_defs =3D read_builtin_x86_defs(cpufile) =20 ast =3D lark.Lark(r""" list: value ( "," value )* ","? --=20 2.47.0