From nobody Thu Mar 28 14:06:46 2024 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=1619512052; cv=none; d=zohomail.com; s=zohoarc; b=WTH4g1nD/fE0vtfwOLt/kKanQA1oLi6Fh5ktItJtxiG9OPTcWRmNkL7B1GY8Bdk7v6rGs45KQ/kKcCM5ch4j8/NgbeL6TqXog6QJcR2OUryD94qRU7YbtKjJj1JZ7sTLMnKF4VjTqqT1wFefmMbv9Cs2qk/UyBmGyvyroTQIn2Y= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1619512052; 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=/NGiq5pW6uaugQF/tBtMfr9CNhjORYNHNbKVVeYtFX4=; b=UVuh5YnBTaSlBRzILH4d1QWCatmdhcK9zEgYKEy6P3i7R2GBI+GcFFmKESqYgbKqi5uAGcJ2AF4Aem8lx2/ghcseKprXjAqWuGaNmS4yU6SZpHSL9jdbQsUclTHWDOxc8yFeX7VO2r/vA+9rLCYxlIs8pqC1bpsV6+k2LMsC1Rg= 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 1619512052443133.8408904298791; Tue, 27 Apr 2021 01:27:32 -0700 (PDT) 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-207-rEsekTEKMHC70k9ZV6gb-w-1; Tue, 27 Apr 2021 04:27:28 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id B669A18B62A3; Tue, 27 Apr 2021 08:27:22 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 3EEDA5F9B7; Tue, 27 Apr 2021 08:27:22 +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 2E8D41806D1B; Tue, 27 Apr 2021 08:27:20 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 13R8PNET024171 for ; Tue, 27 Apr 2021 04:25:23 -0400 Received: by smtp.corp.redhat.com (Postfix) id E491A7EA8C; Tue, 27 Apr 2021 08:25:22 +0000 (UTC) Received: from work.redhat.com (ovpn-113-91.ams2.redhat.com [10.36.113.91]) by smtp.corp.redhat.com (Postfix) with ESMTP id DFA457EA8A; Tue, 27 Apr 2021 08:25:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1619512051; 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=/NGiq5pW6uaugQF/tBtMfr9CNhjORYNHNbKVVeYtFX4=; b=HorjeGmVbdjZyf3sEHTip/xGKmlc1W4BQbgI9a/uyGylM6AGIR69s8GCdYQ79hfQPEcNWi bJZdaUuF9RD99MZ3M4iDh4/kfwpOrYDY2cxR1s9+ySCNaeNMwK9bydzyOe1qc9K2Z2Ds7h Stw2C2DPLFlsYnJlYlAylwxCdqtPm84= X-MC-Unique: rEsekTEKMHC70k9ZV6gb-w-1 From: Tim Wiederhake To: libvir-list@redhat.com Subject: [libvirt PATCH 1/3] cpu-data.py: Factor out cpuid parsing Date: Tue, 27 Apr 2021 10:25:01 +0200 Message-Id: <20210427082503.25573-2-twiederh@redhat.com> In-Reply-To: <20210427082503.25573-1-twiederh@redhat.com> References: <20210427082503.25573-1-twiederh@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 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.16 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" Preparation for next patch. Signed-off-by: Tim Wiederhake Reviewed-by: Michal Privoznik --- tests/cputestdata/cpu-data.py | 44 +++++++++++++++++++---------------- 1 file changed, 24 insertions(+), 20 deletions(-) diff --git a/tests/cputestdata/cpu-data.py b/tests/cputestdata/cpu-data.py index df71132c25..ac4d0ff8e7 100755 --- a/tests/cputestdata/cpu-data.py +++ b/tests/cputestdata/cpu-data.py @@ -35,14 +35,7 @@ def gather_name(args): "Use '--model' to set a model name.") =20 =20 -def gather_cpuid_leaves(args): - def mask(regs, eax_in, ecx_in, eax_mask, ebx_mask, ecx_mask, edx_mask): - if regs["eax_in"] =3D=3D eax_in and regs["ecx_in"] =3D=3D ecx_in: - regs["eax"] &=3D eax_mask - regs["ebx"] &=3D ebx_mask - regs["ecx"] &=3D ecx_mask - regs["edx"] &=3D edx_mask - +def gather_cpuid_leaves_cpuid(output): leave_pattern =3D re.compile( "^\\s*" "(0x[0-9a-f]+)\\s*" @@ -52,22 +45,11 @@ def gather_cpuid_leaves(args): "ecx=3D(0x[0-9a-f]+)\\s*" "edx=3D(0x[0-9a-f]+)\\s*$") =20 - cpuid =3D args.path_to_cpuid or "cpuid" - try: - output =3D subprocess.check_output( - [cpuid, "-1r"], - universal_newlines=3DTrue) - except FileNotFoundError as e: - exit("Error: '{}' not found.\n'cpuid' can be usually found in a " - "package named identically. If your distro does not provide s= uch " - "package, you can find the sources or binary packages at " - "'http://www.etallen.com/cpuid.html'.".format(e.filename)) - for line in output.split("\n"): match =3D leave_pattern.match(line) if not match: continue - regs =3D { + yield { "eax_in": int(match.group(1), 0), "ecx_in": int(match.group(2), 0), "eax": int(match.group(3), 0), @@ -75,6 +57,28 @@ def gather_cpuid_leaves(args): "ecx": int(match.group(5), 0), "edx": int(match.group(6), 0)} =20 + +def gather_cpuid_leaves(args): + def mask(regs, eax_in, ecx_in, eax_mask, ebx_mask, ecx_mask, edx_mask): + if regs["eax_in"] =3D=3D eax_in and regs["ecx_in"] =3D=3D ecx_in: + regs["eax"] &=3D eax_mask + regs["ebx"] &=3D ebx_mask + regs["ecx"] &=3D ecx_mask + regs["edx"] &=3D edx_mask + + cpuid =3D args.path_to_cpuid or "cpuid" + try: + output =3D subprocess.check_output( + [cpuid, "-1r"], + universal_newlines=3DTrue) + except FileNotFoundError as e: + exit("Error: '{}' not found.\n'cpuid' can be usually found in a " + "package named identically. If your distro does not provide s= uch " + "package, you can find the sources or binary packages at " + "'http://www.etallen.com/cpuid.html'.".format(e.filename)) + + reglist =3D gather_cpuid_leaves_cpuid(output) + for regs in reglist: # local apic id. Pretend to always run on logical processor #0. mask(regs, 0x01, 0x00, 0xffffffff, 0x00ffffff, 0xffffffff, 0xfffff= fff) mask(regs, 0x0b, 0x00, 0xffffffff, 0xffffffff, 0xffffffff, 0xfffff= f00) --=20 2.26.3 From nobody Thu Mar 28 14:06:46 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.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 170.10.133.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=1619511981; cv=none; d=zohomail.com; s=zohoarc; b=Hmw/nswxw+edB3+VpyAidBIEkM2yOfxEjIT0NBqf2ag49hzk886KeWtVD3BNBvV2CD16a/vpNxBJ3Pmgmv8BIzzA4W4hIsI654O/issJP2QPfl7MffLCJ/XOAISs8IEWV28pIZAPJ2M4RQapyspPBHlKnQ5+KbhCBOXdltV7FyA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1619511981; 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=iX06uJlyzFbuRyWaz0Q1e/tGMI117e2/fz/vdjenego=; b=gCI49zGEgmv3m8auRdh8+VYx+ysTqUst6agxdObbiXDAV5Be9cJDU6RjRvH2Xo/adWR31pWGTWYtfVOI4fcRtP8RVhkjnYvnYMRwbfVYsQn6zqX4mQV43h8N8arZpkr/w9g2RkbjJOBkhXPLtbLt2c0ToriUErlqJ9v3Qix0H44= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.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 [170.10.133.124]) by mx.zohomail.com with SMTPS id 1619511981675691.8988942478803; Tue, 27 Apr 2021 01:26:21 -0700 (PDT) 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-458-Z50Ieaa6PzeM1S8wBkEn4w-1; Tue, 27 Apr 2021 04:26:17 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 760868049DA; Tue, 27 Apr 2021 08:26:11 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 1EFF319D7D; Tue, 27 Apr 2021 08:26:09 +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 4050818095C9; Tue, 27 Apr 2021 08:26:02 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 13R8PNf1024179 for ; Tue, 27 Apr 2021 04:25:23 -0400 Received: by smtp.corp.redhat.com (Postfix) id C0F5062AF7; Tue, 27 Apr 2021 08:25:23 +0000 (UTC) Received: from work.redhat.com (ovpn-113-91.ams2.redhat.com [10.36.113.91]) by smtp.corp.redhat.com (Postfix) with ESMTP id 08AAF6A90C; Tue, 27 Apr 2021 08:25:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1619511980; 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=iX06uJlyzFbuRyWaz0Q1e/tGMI117e2/fz/vdjenego=; b=X9rvfrezKtc86W1b/R6GwPROofy5Db8KAUpLIjwFOXM/foOnPL5JZAwBaRa6+4sDMnVUco hMBJ9WqP3AYwziVG4c6W5P823jKiz5NKPmeW9+uY78BvkJdK9DUuNu6VEXZxx/ZuTy7qQy KNEtmyUO7ZoY/NyLfOIkiaqBIXJDx0A= X-MC-Unique: Z50Ieaa6PzeM1S8wBkEn4w-1 From: Tim Wiederhake To: libvir-list@redhat.com Subject: [libvirt PATCH 2/3] cpu-data.py: Parse kcpuid output Date: Tue, 27 Apr 2021 10:25:02 +0200 Message-Id: <20210427082503.25573-3-twiederh@redhat.com> In-Reply-To: <20210427082503.25573-1-twiederh@redhat.com> References: <20210427082503.25573-1-twiederh@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 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.84 on 10.5.11.23 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" Linux 5.13 introduces "kcpuid", a tool similar to "cpuid", see https://lore.kernel.org/lkml/1614928878-86075-1-git-send-email-feng.tang@in= tel.com/ Output formats of cpuid and kcpuid differ slightly. This adds support for the latter. Signed-off-by: Tim Wiederhake Reviewed-by: Michal Privoznik --- tests/cputestdata/cpu-data.py | 53 ++++++++++++++++++++++++++++++++++- 1 file changed, 52 insertions(+), 1 deletion(-) diff --git a/tests/cputestdata/cpu-data.py b/tests/cputestdata/cpu-data.py index ac4d0ff8e7..4305aacf35 100755 --- a/tests/cputestdata/cpu-data.py +++ b/tests/cputestdata/cpu-data.py @@ -58,6 +58,53 @@ def gather_cpuid_leaves_cpuid(output): "edx": int(match.group(6), 0)} =20 =20 +def gather_cpuid_leaves_kcpuid(output): + leave_pattern =3D re.compile( + "^(0x[0-9a-f]+): " + "EAX=3D(0x[0-9a-f]+), " + "EBX=3D(0x[0-9a-f]+), " + "ECX=3D(0x[0-9a-f]+), " + "EDX=3D(0x[0-9a-f]+)$") + branch_pattern_head =3D re.compile( + "^(0x[0-9a-f]+): " + "subleafs:$") + branch_pattern_body =3D re.compile( + "^\\s*([0-9]+): " + "EAX=3D(0x[0-9a-f]+), " + "EBX=3D(0x[0-9a-f]+), " + "ECX=3D(0x[0-9a-f]+), " + "EDX=3D(0x[0-9a-f]+)$") + + regs =3D list() + eax_in =3D 0 + for line in output.split("\n"): + match =3D branch_pattern_head.match(line) + if match: + eax_in =3D int(match.group(1), 0) + continue + match =3D branch_pattern_body.match(line) + if match: + regs.append({ + "eax_in": eax_in, + "ecx_in": int(match.group(1), 0), + "eax": int(match.group(2), 0), + "ebx": int(match.group(3), 0), + "ecx": int(match.group(4), 0), + "edx": int(match.group(5), 0)}) + continue + match =3D leave_pattern.match(line) + if match: + regs.append({ + "eax_in": int(match.group(1), 0), + "ecx_in": 0, + "eax": int(match.group(2), 0), + "ebx": int(match.group(3), 0), + "ecx": int(match.group(4), 0), + "edx": int(match.group(5), 0)}) + continue + return regs + + def gather_cpuid_leaves(args): def mask(regs, eax_in, ecx_in, eax_mask, ebx_mask, ecx_mask, edx_mask): if regs["eax_in"] =3D=3D eax_in and regs["ecx_in"] =3D=3D ecx_in: @@ -77,7 +124,11 @@ def gather_cpuid_leaves(args): "package, you can find the sources or binary packages at " "'http://www.etallen.com/cpuid.html'.".format(e.filename)) =20 - reglist =3D gather_cpuid_leaves_cpuid(output) + if "=3D=3D=3D=3D=3D" in output: + reglist =3D gather_cpuid_leaves_kcpuid(output) + else: + reglist =3D gather_cpuid_leaves_cpuid(output) + for regs in reglist: # local apic id. Pretend to always run on logical processor #0. mask(regs, 0x01, 0x00, 0xffffffff, 0x00ffffff, 0xffffffff, 0xfffff= fff) --=20 2.26.3 From nobody Thu Mar 28 14:06:46 2024 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=1619512056; cv=none; d=zohomail.com; s=zohoarc; b=CGjwl2TY+VvrKvGvuGqW90h6agujleJkM5m/39sgPzoM0P91/hhEVLHeHQ8f5QdAaAHqgwOo50rMAzpSuhfI0QLyuQh/BA01NZEdhQC/he92nB7JQbx/4fDA3DBojUGQmceoN58NakHS9hTc0h5u09o2PqRgOl07evG3QweXQK8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1619512056; 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=70dzbX1/aVnXc2fqi2vFlz5aombywAbFnuKOQsa+pVA=; b=SBtOYoZm13OQTkrWoCceuYdcN17rAdrLmSj/SiLZtGPJF8qQY9K6lT4SjGi2XY+zdqYBeIK+voZBmULJymgpK9wDKKeEAHeinIegSxBxPGuu0Gj1bQbe9jieqwAbl1E8Y6BtPOHvl/3BKNOhJ7mYKcEVCGZByTCC+R2tNwAtSzY= 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 1619512056774234.2038850066416; Tue, 27 Apr 2021 01:27:36 -0700 (PDT) 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-271-H25C6nzVPnarp-ySICCabg-1; Tue, 27 Apr 2021 04:27:33 -0400 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 3959B107ACCA; Tue, 27 Apr 2021 08:27: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 1539B5DAA5; Tue, 27 Apr 2021 08:27:27 +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 CDB7B44A58; Tue, 27 Apr 2021 08:27:26 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 13R8PODG024187 for ; Tue, 27 Apr 2021 04:25:24 -0400 Received: by smtp.corp.redhat.com (Postfix) id CB61C55760; Tue, 27 Apr 2021 08:25:24 +0000 (UTC) Received: from work.redhat.com (ovpn-113-91.ams2.redhat.com [10.36.113.91]) by smtp.corp.redhat.com (Postfix) with ESMTP id 1CEE562AF7; Tue, 27 Apr 2021 08:25:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1619512055; 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=70dzbX1/aVnXc2fqi2vFlz5aombywAbFnuKOQsa+pVA=; b=fMSXJsjYhOUDnrD+6pbqTQVnFU+EN0huGAChI5RiAY+bm3/23REVh3MI/QdtXp48Rxo7B0 9prutZ0Zp+FOhfKS37HTpjmi8ADoSlmxwnMc4CMXZZt4a70qBK7OKEJ4ycIScDEqqAnE/Q yr0QTZC3aRCXfm+uwBmy2vqK0J13eFk= X-MC-Unique: H25C6nzVPnarp-ySICCabg-1 From: Tim Wiederhake To: libvir-list@redhat.com Subject: [libvirt PATCH 3/3] cpu-data.py: Automatically adjust command line for kcpuid Date: Tue, 27 Apr 2021 10:25:03 +0200 Message-Id: <20210427082503.25573-4-twiederh@redhat.com> In-Reply-To: <20210427082503.25573-1-twiederh@redhat.com> References: <20210427082503.25573-1-twiederh@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 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" kcpuid does not have a "-1" flag. Signed-off-by: Tim Wiederhake Reviewed-by: Michal Privoznik --- tests/cputestdata/cpu-data.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/cputestdata/cpu-data.py b/tests/cputestdata/cpu-data.py index 4305aacf35..d8a89ebc2a 100755 --- a/tests/cputestdata/cpu-data.py +++ b/tests/cputestdata/cpu-data.py @@ -116,7 +116,7 @@ def gather_cpuid_leaves(args): cpuid =3D args.path_to_cpuid or "cpuid" try: output =3D subprocess.check_output( - [cpuid, "-1r"], + [cpuid, "-r" if "kcpuid" in cpuid else "-1r"], universal_newlines=3DTrue) except FileNotFoundError as e: exit("Error: '{}' not found.\n'cpuid' can be usually found in a " --=20 2.26.3