From nobody Mon Feb 9 12:15:27 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) client-ip=63.128.21.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 63.128.21.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=1608050159; cv=none; d=zohomail.com; s=zohoarc; b=UY1xNZp3etXwpDAuMd+hziN3PU5cHgL/wh9nr5Dj9H4oBq/T1FyXBSjYvVGLZfAVJUswXCfCKZoORatw/Ska84LF7S3J8djuZzM/B9pKdYqvhnDeeVtWoqvXfFkRmbZrDbv1iVFwmoOSq6SfbP13IdkKjB/jVTh9To6b75X4Jd8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1608050159; 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=7LmJNBJARr++gxPvFkt8SFj8jR73TPYKqgwlhzmG2ao=; b=A1XHJ+z/VQZCZ9RMSzXTDoLSasL4UtvToRVnhXbdrPrDvFGb+xChPYip9yqKXiXkkfIMGeU4MfdslTxlmqdT/bG+TwoRPzVDBJqGmsZ9D/I3mFlkYrPIv/n2DDEyxMm17ABTgTGZM6gfX9hrq/haAdmpSv+J5On5d2+g/TN5aKY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.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 [63.128.21.124]) by mx.zohomail.com with SMTPS id 1608050158865279.11001759538533; Tue, 15 Dec 2020 08:35:58 -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-228-e3xWyV1fMz6UstkV1M40cA-1; Tue, 15 Dec 2020 11:31:49 -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 83605AFA92; Tue, 15 Dec 2020 16:31:41 +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 5D1C25D9E4; Tue, 15 Dec 2020 16:31:41 +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 3A0174BB7B; Tue, 15 Dec 2020 16:31:40 +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 0BFGPREA025667 for ; Tue, 15 Dec 2020 11:25:27 -0500 Received: by smtp.corp.redhat.com (Postfix) id 378845D9E4; Tue, 15 Dec 2020 16:25:27 +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 73AA45D9D7; Tue, 15 Dec 2020 16:25:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1608049912; 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=7LmJNBJARr++gxPvFkt8SFj8jR73TPYKqgwlhzmG2ao=; b=cYIKhK56QtJFKhz1rl8j3YgLZaWgos9MtLc3eXE6Oh2c5W5bRjJ+zFekSqUdb8YjM+0/PV xyawsXl/zJF8JNybSkjcGJaYnWc0QZDHIBKvIymfR+R0MfKEfVKCb36KemKM4KRxlSSumn E92GiOKVEvcZCVt0g6unDfmZ2S6B8jE= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1608050155; 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=7LmJNBJARr++gxPvFkt8SFj8jR73TPYKqgwlhzmG2ao=; b=M4ahbFENkKOHaNLqCRLfTPgu0MF5pIwJ8//xmLJoCGGZ30Q2SsQzpGwJWYn94loznrqDJf 3G/P0qbjeQeq/TB4TtZUGO/oyl+TQDdGxcoq3mLhxQdLZJeFKMtxE2a5pxYj7wXzECBgVg Y0XTqqtEH7TOlSaQBpmrHhkZF2FCibM= X-MC-Unique: e3xWyV1fMz6UstkV1M40cA-1 From: Tim Wiederhake To: libvir-list@redhat.com Subject: [libvirt PATCH 09/29] cpu-gather: Move static model expansion to new script Date: Tue, 15 Dec 2020 17:24:55 +0100 Message-Id: <20201215162515.53742-10-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) (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Signed-off-by: Tim Wiederhake --- tests/cputestdata/cpu-gather.py | 45 +++++++++++++++++++++++++++++++++ tests/cputestdata/cpu-gather.sh | 7 ----- 2 files changed, 45 insertions(+), 7 deletions(-) diff --git a/tests/cputestdata/cpu-gather.py b/tests/cputestdata/cpu-gather= .py index 7f9479f78d..e4a82fc949 100755 --- a/tests/cputestdata/cpu-gather.py +++ b/tests/cputestdata/cpu-gather.py @@ -2,6 +2,7 @@ =20 import argparse import fcntl +import json import os import struct import subprocess @@ -66,6 +67,47 @@ def gather_msr(): return None, {} =20 =20 +def call_qemu(qemu, qmp_cmds): + cmd =3D [ + qemu, + "-machine", "accel=3Dkvm", + "-cpu", "host", + "-nodefaults", + "-nographic", + "-qmp", "stdio"] + + stdin =3D list() + stdin.append("{\"execute\": \"qmp_capabilities\"}") + stdin.extend([json.dumps(o) for o in qmp_cmds]) + stdin.append("{\"execute\": \"quit\"}") + + try: + output =3D subprocess.check_output( + cmd, + universal_newlines=3DTrue, + input=3D"\n".join(stdin)) + except subprocess.CalledProcessError: + exit("Error: Non-zero exit code from '{}'.".format(qemu)) + except FileNotFoundError: + exit("Error: File not found: '{}'.".format(qemu)) + + return output + + +def gather_static_model(args): + output =3D call_qemu(args.path_to_qemu, [ + { + "execute": "query-cpu-model-expansion", + "arguments": + { + "type": "static", + "model": {"name": "host"} + }, + "id": "model-expansion" + }]) + return output + + def main(): parser =3D argparse.ArgumentParser(description=3D"Gather cpu test data= ") parser.add_argument( @@ -111,9 +153,12 @@ def main(): for key, value in sorted(msr.items()): print(" 0x{:x}: 0x{:016x}\n".format(int(key), value)) =20 + static_model =3D gather_static_model(args) + print(end=3D"", flush=3DTrue) os.environ["CPU_GATHER_PY"] =3D "true" os.environ["qemu"] =3D args.path_to_qemu + os.environ["model"] =3D static_model subprocess.check_call("./cpu-gather.sh") =20 =20 diff --git a/tests/cputestdata/cpu-gather.sh b/tests/cputestdata/cpu-gather= .sh index 4b4ac1a47c..af0f40b61c 100755 --- a/tests/cputestdata/cpu-gather.sh +++ b/tests/cputestdata/cpu-gather.sh @@ -21,13 +21,6 @@ model_expansion() '{"type":"'"$mode"'","model":'"$model"'},"id":"model-expansion"}' } =20 -model=3D$( - $qemu -machine accel=3Dkvm -cpu host -nodefaults -nographic -qmp stdio= <