From nobody Tue Feb 10 01:19:27 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=1608049576; cv=none; d=zohomail.com; s=zohoarc; b=cRC+KwkDrSIdXrH1R2HeAeZoZRYmUYzmVOVWqwgzXe43mSSQpL7U3wBXH9lgMUwmmYriVB6IIZl17GVub9UE7yltdG5T2Zc6D2o3LJLHHYMTlTEXjB+VIOeX/t45ce2IahqMKFcmaHPI0qqjbmR/cxzoIOc/OzGBpaRBGQOSqas= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1608049576; 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=vYWjGbLp2qY31OMb7chKm+UCIrzTiywwCuqyp7ROpwk=; b=lb3gQy9DOQYNtjmP6EG4YImaH7kxPThYCaeNYBBI591S3FOSLWqYRBdswJPmd17DsUw+2Jx3YAQqsQGgo4ptZcIhuPJ+yqQJDmf6RQ5GjXW1JShxVW0pMhfOUhwl+Sh6XNC/HFM+yVO3GZuOonFd1bcn1AVPHW7Umo01oawMkvI= 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 1608049575903518.3462610940269; Tue, 15 Dec 2020 08:26:15 -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-375-s8xZ9oUCN2GX_nil84Zbow-1; Tue, 15 Dec 2020 11:26:10 -0500 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 602541081B4B; Tue, 15 Dec 2020 16:25:50 +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 397B871D4F; Tue, 15 Dec 2020 16:25:50 +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 F24725002C; Tue, 15 Dec 2020 16:25:49 +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 0BFGPVKI025722 for ; Tue, 15 Dec 2020 11:25:31 -0500 Received: by smtp.corp.redhat.com (Postfix) id D60615D9E4; Tue, 15 Dec 2020 16:25:31 +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 1876A5D9D7; Tue, 15 Dec 2020 16:25:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1608049573; 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=vYWjGbLp2qY31OMb7chKm+UCIrzTiywwCuqyp7ROpwk=; b=XLP8BM57+f8jtmaT2e+5GG5XWMRHt15r/I9x/7fPKqeSinw8UhkxC97jRIKrQ6kbp9toCU jv23q9BXA7eJPmZd+uvm+F8hXv6aRw05g5cCjiT7VGSSu2Ry8pGx2pdXT5dsK4aIjEoq2U 4M2kRYHg+M3XA3KL4j1CBkn3Xs4D2+4= X-MC-Unique: s8xZ9oUCN2GX_nil84Zbow-1 From: Tim Wiederhake To: libvir-list@redhat.com Subject: [libvirt PATCH 13/29] cpu-gather: Merge model gathering logic Date: Tue, 15 Dec 2020 17:24:59 +0100 Message-Id: <20201215162515.53742-14-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.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" Signed-off-by: Tim Wiederhake --- tests/cputestdata/cpu-gather.py | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/tests/cputestdata/cpu-gather.py b/tests/cputestdata/cpu-gather= .py index ea1d42f1ec..c639c433d2 100755 --- a/tests/cputestdata/cpu-gather.py +++ b/tests/cputestdata/cpu-gather.py @@ -96,7 +96,7 @@ def call_qemu(qemu, qmp_cmds): yield json.loads(line) =20 =20 -def gather_static_model(args): +def gather_model(args): output =3D call_qemu(args.path_to_qemu, [ { "execute": "query-cpu-model-expansion", @@ -108,14 +108,11 @@ def gather_static_model(args): "id": "model-expansion" }]) =20 + static_model =3D None for o in output: if o.get("id") =3D=3D "model-expansion": - return o["return"]["model"] + static_model =3D o["return"]["model"] =20 - return None - - -def gather_full_model(args, static_model): if static_model: return call_qemu(args.path_to_qemu, [ { @@ -231,15 +228,13 @@ 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) - model =3D gather_full_model(args, static_model) + model =3D gather_model(args) for o in model: print(json.dumps(o)) =20 print(end=3D"", flush=3DTrue) os.environ["CPU_GATHER_PY"] =3D "true" os.environ["qemu"] =3D args.path_to_qemu - os.environ["model"] =3D json.dumps(static_model) if static_model else = "" subprocess.check_call("./cpu-gather.sh") =20 =20 --=20 2.26.2