From nobody Mon Feb 9 12:15: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=1608049583; cv=none; d=zohomail.com; s=zohoarc; b=cCC1KsGwXbLiDOS54fDbgnwnQGKVfew9OKzTfcormAGW8dhagV0ohGOQgjD+V8gHg2qZtSk/osLKdUAXxMFI5xxZjL0ww5/OZ22DPvxR06J/X/s8FgMPwuJxZAWxtOq4UlBb+2L8PbIFwm+VLXL4/zbH7PO7GCxD3PcRQxoubgU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1608049583; 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=XfiZwIJ2VJ9GhIReOgstqydA3JuynQ05z9IADR4vh+M=; b=JahlE+SyAUg9AFT8l7puiGGm89kBKC1tHfTdVAxUa0WZMqgq2RdXXTomzRvglsprUZIkkXLcGJLt8I9eZPhjX60kb+UY7iIMz83s9VuIzUsUb8sop9AN4HGcWky3LVYTDt7spxN5FZzwWYjGgyETL753JJKEOOV1DBzAhiBfnvc= 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 1608049583096338.41155798923705; Tue, 15 Dec 2020 08:26:23 -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-199-qlNU-2JzPa-f9cjfFNttQA-1; Tue, 15 Dec 2020 11:26:05 -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 94DD7809DCE; Tue, 15 Dec 2020 16:25:47 +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 555DF5D9F1; Tue, 15 Dec 2020 16:25:47 +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 1354F1809CA2; Tue, 15 Dec 2020 16:25:47 +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 0BFGPUi1025708 for ; Tue, 15 Dec 2020 11:25:30 -0500 Received: by smtp.corp.redhat.com (Postfix) id AFE0E5D9E4; Tue, 15 Dec 2020 16:25:30 +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 DDEB35D9D7; Tue, 15 Dec 2020 16:25:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1608049581; 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=XfiZwIJ2VJ9GhIReOgstqydA3JuynQ05z9IADR4vh+M=; b=Jku9uaAW+WOBEvrNE1MhnA1GwVjdg83fAOwyUa3MXVE02KljX/dMqrHEpW66OOFB0Sp18N WDC52pP8yKIO02CsYGJC69D0Pvb/YSO59TC8v26+166km9Oz72E3O0UmC+GHZshgOtDakW K97ZpUB8TE7KHfvt0+a8JuLHlCa5HVo= X-MC-Unique: qlNU-2JzPa-f9cjfFNttQA-1 From: Tim Wiederhake To: libvir-list@redhat.com Subject: [libvirt PATCH 12/29] cpu-gather: Move full model extraction to new script Date: Tue, 15 Dec 2020 17:24:58 +0100 Message-Id: <20201215162515.53742-13-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" Signed-off-by: Tim Wiederhake --- tests/cputestdata/cpu-gather.py | 16 +++++++++++++++- tests/cputestdata/cpu-gather.sh | 20 -------------------- 2 files changed, 15 insertions(+), 21 deletions(-) diff --git a/tests/cputestdata/cpu-gather.py b/tests/cputestdata/cpu-gather= .py index 5c03d226b6..ea1d42f1ec 100755 --- a/tests/cputestdata/cpu-gather.py +++ b/tests/cputestdata/cpu-gather.py @@ -117,7 +117,21 @@ def gather_static_model(args): =20 def gather_full_model(args, static_model): if static_model: - return [] + return call_qemu(args.path_to_qemu, [ + { + "execute": "query-cpu-model-expansion", + "arguments": + { + "type": "full", + "model": static_model + }, + "id": "model-expansion" + }, + { + "execute": "query-cpu-definitions", + "id": "definitions" + } + ]) else: return call_qemu(args.path_to_qemu, [ { diff --git a/tests/cputestdata/cpu-gather.sh b/tests/cputestdata/cpu-gather= .sh index 05faf14a96..5cef26c8e6 100755 --- a/tests/cputestdata/cpu-gather.sh +++ b/tests/cputestdata/cpu-gather.sh @@ -4,23 +4,3 @@ if [ -z "${CPU_GATHER_PY}" ]; then echo >&2 "Do not call this script directly. Use 'cpu-gather.py' instea= d." exit 1 fi - -model_expansion() -{ - mode=3D$1 - model=3D$2 - - echo '{"execute":"query-cpu-model-expansion","arguments":' \ - '{"type":"'"$mode"'","model":'"$model"'},"id":"model-expansion"}' -} - -$qemu -machine accel=3Dkvm -cpu host -nodefaults -nographic -qmp stdio <