From nobody Mon Feb 9 12:42:39 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) client-ip=216.205.24.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1608049552; cv=none; d=zohomail.com; s=zohoarc; b=PLSCnsDsR57TxK8mFK/Iw4gRxE3TPSklVBEHv75MycfXvQ1c/siFSBW1MdAns3wXEZh6WcKHCiicHm5SauCeHbYQIEfc5ND7FMHnBxWP3+OTcCxRbJM3TH0SkSHuI6Ak8BwuKic1luZ5RMTHaB0oDiJjFe6myrYq+PeBvfrqqlE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1608049552; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=7aEwJBoiuK3UNB3SnBcj41Q8dJ827mwqeixVQJ8OBSc=; b=oAzCn7mKqrn4xCzi7EX9LY0VdcUMw8fidwRrOg7J1HjvAekmOTpV1R0/p2HvThKBXuMUUTsbTRMISczyAracUOKQN1hZdchHc3CIp672FCgMgrjGF4ACF9KviPC0X6nbd7YxyGpKN13XNyiNcbTGjWhRxiSPbquepm+pjoXQ+v0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by mx.zohomail.com with SMTPS id 160804955205482.65717937666341; Tue, 15 Dec 2020 08:25:52 -0800 (PST) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-343-rJisYbeuN1-7Zi2Pq15xBg-1; Tue, 15 Dec 2020 11:25:44 -0500 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id B85011012E96; Tue, 15 Dec 2020 16:25:27 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id EFEE05D9E3; Tue, 15 Dec 2020 16:25:26 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 155D84BB40; Tue, 15 Dec 2020 16:25:24 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 0BFGPND4025635 for ; Tue, 15 Dec 2020 11:25:23 -0500 Received: by smtp.corp.redhat.com (Postfix) id CA16A5D9E3; Tue, 15 Dec 2020 16:25:23 +0000 (UTC) Received: from work.redhat.com (ovpn-114-20.ams2.redhat.com [10.36.114.20]) by smtp.corp.redhat.com (Postfix) with ESMTP id 0FD595D9D7; Tue, 15 Dec 2020 16:25:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1608049547; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=7aEwJBoiuK3UNB3SnBcj41Q8dJ827mwqeixVQJ8OBSc=; b=cWvBwDb3oT+ihS4uTOMwzuSGOwCkCDGg44dmxz/aUiyQEe1nyVic9IP69L96P/vbX7DjI7 SzAxQj0JNtblO0yUbKhqniuCvIfIqF2ucQwBqTy6N22S0nJoqKZ89W++N6Wu7dhFyEsOXH cjVqWI6K5Ah6XVnE/Mc21WyG4PbdQFA= X-MC-Unique: rJisYbeuN1-7Zi2Pq15xBg-1 From: Tim Wiederhake To: libvir-list@redhat.com Subject: [libvirt PATCH 06/29] cpu-gather: Allow overwriting cpuid binary location Date: Tue, 15 Dec 2020 17:24:52 +0100 Message-Id: <20201215162515.53742-7-twiederh@redhat.com> In-Reply-To: <20201215162515.53742-1-twiederh@redhat.com> References: <20201215162515.53742-1-twiederh@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-loop: libvir-list@redhat.com Cc: Tim Wiederhake X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" This is useful if cpuid was compiled from source in a non-standard location. Signed-off-by: Tim Wiederhake --- tests/cputestdata/cpu-gather.py | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/tests/cputestdata/cpu-gather.py b/tests/cputestdata/cpu-gather= .py index 97655399c8..75cf290a28 100755 --- a/tests/cputestdata/cpu-gather.py +++ b/tests/cputestdata/cpu-gather.py @@ -18,10 +18,11 @@ def gather_name(args): "Use '--model' to set a model name.") =20 =20 -def gather_cpuid_leaves(): +def gather_cpuid_leaves(args): + cpuid =3D args.path_to_cpuid or "cpuid" try: output =3D subprocess.check_output( - ["cpuid", "-1r"], + [cpuid, "-1r"], universal_newlines=3DTrue) except FileNotFoundError as e: exit("Error: '{}' not found.\n'cpuid' can be usually found in a " @@ -43,13 +44,18 @@ def main(): "--name", help=3D"CPU model name. " "If unset, model name is read from '/proc/cpuinfo'.") + parser.add_argument( + "--path-to-cpuid", + metavar=3D"PATH", + help=3D"Path to 'cpuid' utility. " + "If unset, the first executable 'cpuid' in $PATH is used.") =20 args =3D parser.parse_args() =20 name =3D gather_name(args) print("model name\t: {}".format(name)) =20 - leaves =3D gather_cpuid_leaves() + leaves =3D gather_cpuid_leaves(args) print("CPU:") for leave in leaves: print(" {}".format(leave)) --=20 2.26.2