From nobody Fri May 17 06:54:21 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=1659963986; cv=none; d=zohomail.com; s=zohoarc; b=YQWn8ofTwtkj3mlSz+3rpw5Ll3bpchbHGgPJOh8ULlqTBSnoQ1Aa872azcSvBcRWx2hP7J2lpnhEuLEck47jZ0S2RiEZL6zdeM2csz4XsvZY4f4ZJ6DEFeZVTmvD5afYmq7YD9xtthHl5tzpx3EIM52YuO2RIcz1AVf7ChyFpCQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1659963986; h=Content-Type:Content-Transfer-Encoding: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=VeGQxI32aVwDCzOXGBhcGRssC/mKFv5MyoQaQQ06yRQ=; b=UKB2Yw1rYE4NEgTuFaTaYdpvZ8f1Vid7dNoN/Mm7+DsXY1ZtFq55KxDPk7K1ye3EMufl8tMJmQKKkJoushIaAOCMsQa/17/JWjsm3yueWqEChJdm/Ifp0wOwxKTvD3jebNfmHU0hpsvQ7P4wN1T3gRo/7kMp8KkUOizAa81azT0= 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) 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 1659963986945626.1757434175569; Mon, 8 Aug 2022 06:06:26 -0700 (PDT) Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-20-fvFqBfrVNSqYGopBleYwHw-1; Mon, 08 Aug 2022 09:06:22 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 35BF22803021; Mon, 8 Aug 2022 13:06:18 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (unknown [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 21FA72026D4C; Mon, 8 Aug 2022 13:06:18 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id BFC461946A4F; Mon, 8 Aug 2022 13:06:17 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id A80611946A49 for ; Mon, 8 Aug 2022 13:06:16 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 736E01121315; Mon, 8 Aug 2022 13:06:16 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mimecast04.extmail.prod.ext.rdu2.redhat.com [10.11.55.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 700801121314 for ; Mon, 8 Aug 2022 13:06:16 +0000 (UTC) Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [207.211.31.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 4F7E5101AA48 for ; Mon, 8 Aug 2022 13:06:16 +0000 (UTC) Received: from mail-ej1-f71.google.com (mail-ej1-f71.google.com [209.85.218.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-587-sYnSmQUwNmizxr6nUIGxxw-1; Mon, 08 Aug 2022 09:06:15 -0400 Received: by mail-ej1-f71.google.com with SMTP id go15-20020a1709070d8f00b00730ab9dd8c6so2323697ejc.6 for ; Mon, 08 Aug 2022 06:06:14 -0700 (PDT) Received: from goa-sendmail ([2001:b07:6468:f312:5e2c:eb9a:a8b6:fd3e]) by smtp.gmail.com with ESMTPSA id be26-20020a0564021a3a00b00435651c4a01sm4551888edb.56.2022.08.08.06.06.11 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 08 Aug 2022 06:06:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1659963985; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to: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=VeGQxI32aVwDCzOXGBhcGRssC/mKFv5MyoQaQQ06yRQ=; b=ezDh8jKcPDf3ZknVus08kE+fc61EKlXJLP4hyjjXAi/vsP4xvJG2F1dLRGG0qcoMGKrJNF wXzvceeJEWhz3zJWxTFiPAyNpI0CLKW8NnqNVNIwJljvr34kYTCex4pZa+VNID/PFBkwvg EG6jnI3lYj/azRFcS8cBSuO+n7E4AUA= X-MC-Unique: fvFqBfrVNSqYGopBleYwHw-1 X-Original-To: libvir-list@listman.corp.redhat.com X-MC-Unique: sYnSmQUwNmizxr6nUIGxxw-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc; bh=VeGQxI32aVwDCzOXGBhcGRssC/mKFv5MyoQaQQ06yRQ=; b=RXZUbdRGM2fS0gyrKnHUSkt86qTKSOKp/98hvllRKeqaY/D+5/jIydzkjTAjSdHfrV QtAFqnebF8jPgb5NXthryMKyc58H5Ko32/qWqTgxuCJxBuiGU73IX5rpNYfE02O8nXCP MA55GqtWB7vDSfjZN5w/MMzzAr9WPhSgf6gr9HC0IjwF1aCGpUK9S0Nzg48CAGVDVHpg kO1facccw+sKPovsw7b91b7M7TI6YGxSh5coRH5QQ8ga8vR9wE/Tz9tqZutT8YrtRD78 fOVcecfKCpbz87tit3tvQ3uhMrgB5B9X5CauqWcfQ7zGo/N/JMs6eNbxtZH+19BiVbZ1 qZWw== X-Gm-Message-State: ACgBeo1a/3nDH6jGCMQHwCSIeJIr7Hk1puYpbGljVFTDrra0+xPH1quV TTUwyHwsxcHlB2ekUOnPjIv3Xio5qrz7jnEfwuLJ9syZ67L7agbnsT1gySY3IB/jRyBlBfF+ldP toxTut+VvvMkaLYO3vgaHOgT7kxzWPv8pMwrINCq15RLk6LMh/fkUEPgZxmhfDD2FFsGzOFc= X-Received: by 2002:a05:6402:13c1:b0:43b:e330:9bbf with SMTP id a1-20020a05640213c100b0043be3309bbfmr17417046edx.417.1659963973543; Mon, 08 Aug 2022 06:06:13 -0700 (PDT) X-Google-Smtp-Source: AA6agR5IJn2qCtenKZXLWT/mPRj9KLOEABHD9Zcmhz4uv0/9MO2X+KYU58fTUqt1VUY14+JeXf7r2Q== X-Received: by 2002:a05:6402:13c1:b0:43b:e330:9bbf with SMTP id a1-20020a05640213c100b0043be3309bbfmr17417015edx.417.1659963973117; Mon, 08 Aug 2022 06:06:13 -0700 (PDT) From: Paolo Bonzini To: libvir-list@redhat.com Subject: [PATCH 1/7] tests: remove duplicate cpuinfo test Date: Mon, 8 Aug 2022 15:06:02 +0200 Message-Id: <20220808130608.61257-2-pbonzini@redhat.com> In-Reply-To: <20220808130608.61257-1-pbonzini@redhat.com> References: <20220808130608.61257-1-pbonzini@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.78 on 10.11.54.3 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 2.78 on 10.11.54.4 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1659963989000100001 Content-Type: text/plain; charset="utf-8" All supported versions of QEMU include the query-cpus-fast QMP command. In preparation for dropping support for the old "query-cpus" commands, remove the query-cpus version of the x86-full test. Signed-off-by: Paolo Bonzini --- ...qemumonitorjson-cpuinfo-x86-full-cpus.json | 104 ---------------- ...umonitorjson-cpuinfo-x86-full-hotplug.json | 115 ------------------ .../qemumonitorjson-cpuinfo-x86-full.data | 109 ----------------- tests/qemumonitorjsontest.c | 1 - 4 files changed, 329 deletions(-) delete mode 100644 tests/qemumonitorjsondata/qemumonitorjson-cpuinfo-x86-f= ull-cpus.json delete mode 100644 tests/qemumonitorjsondata/qemumonitorjson-cpuinfo-x86-f= ull-hotplug.json delete mode 100644 tests/qemumonitorjsondata/qemumonitorjson-cpuinfo-x86-f= ull.data diff --git a/tests/qemumonitorjsondata/qemumonitorjson-cpuinfo-x86-full-cpu= s.json b/tests/qemumonitorjsondata/qemumonitorjson-cpuinfo-x86-full-cpus.js= on deleted file mode 100644 index 16f5cc41dc..0000000000 --- a/tests/qemumonitorjsondata/qemumonitorjson-cpuinfo-x86-full-cpus.json +++ /dev/null @@ -1,104 +0,0 @@ -{ - "return": [ - { - "arch": "x86", - "current": true, - "CPU": 0, - "qom_path": "/machine/unattached/device[0]", - "pc": 1042686, - "halted": false, - "thread_id": 895040 - }, - { - "arch": "x86", - "current": false, - "CPU": 1, - "qom_path": "/machine/peripheral/vcpu1", - "pc": 4294967280, - "halted": false, - "thread_id": 895056 - }, - { - "arch": "x86", - "current": false, - "CPU": 2, - "qom_path": "/machine/peripheral/vcpu2", - "pc": 4294967280, - "halted": false, - "thread_id": 895057 - }, - { - "arch": "x86", - "current": false, - "CPU": 3, - "qom_path": "/machine/peripheral/vcpu3", - "pc": 4294967280, - "halted": false, - "thread_id": 895058 - }, - { - "arch": "x86", - "current": false, - "CPU": 4, - "qom_path": "/machine/peripheral/vcpu4", - "pc": 4294967280, - "halted": false, - "thread_id": 895059 - }, - { - "arch": "x86", - "current": false, - "CPU": 5, - "qom_path": "/machine/peripheral/vcpu5", - "pc": 4294967280, - "halted": false, - "thread_id": 895060 - }, - { - "arch": "x86", - "current": false, - "CPU": 6, - "qom_path": "/machine/peripheral/vcpu6", - "pc": 4294967280, - "halted": false, - "thread_id": 895061 - }, - { - "arch": "x86", - "current": false, - "CPU": 7, - "qom_path": "/machine/peripheral/vcpu7", - "pc": 4294967280, - "halted": false, - "thread_id": 895062 - }, - { - "arch": "x86", - "current": false, - "CPU": 8, - "qom_path": "/machine/peripheral/vcpu8", - "pc": 4294967280, - "halted": false, - "thread_id": 895063 - }, - { - "arch": "x86", - "current": false, - "CPU": 9, - "qom_path": "/machine/peripheral/vcpu9", - "pc": 4294967280, - "halted": false, - "thread_id": 895064 - }, - { - "arch": "x86", - "current": false, - "CPU": 10, - "qom_path": "/machine/peripheral/vcpu10", - "pc": 4294967280, - "halted": false, - "thread_id": 895065 - } - ], - "id": "libvirt-52" -} diff --git a/tests/qemumonitorjsondata/qemumonitorjson-cpuinfo-x86-full-hot= plug.json b/tests/qemumonitorjsondata/qemumonitorjson-cpuinfo-x86-full-hotp= lug.json deleted file mode 100644 index aff5aa3c9b..0000000000 --- a/tests/qemumonitorjsondata/qemumonitorjson-cpuinfo-x86-full-hotplug.js= on +++ /dev/null @@ -1,115 +0,0 @@ -{ - "return": [ - { - "props": { - "core-id": 0, - "thread-id": 0, - "socket-id": 10 - }, - "vcpus-count": 1, - "qom-path": "/machine/peripheral/vcpu10", - "type": "Broadwell-x86_64-cpu" - }, - { - "props": { - "core-id": 0, - "thread-id": 0, - "socket-id": 9 - }, - "vcpus-count": 1, - "qom-path": "/machine/peripheral/vcpu9", - "type": "Broadwell-x86_64-cpu" - }, - { - "props": { - "core-id": 0, - "thread-id": 0, - "socket-id": 8 - }, - "vcpus-count": 1, - "qom-path": "/machine/peripheral/vcpu8", - "type": "Broadwell-x86_64-cpu" - }, - { - "props": { - "core-id": 0, - "thread-id": 0, - "socket-id": 7 - }, - "vcpus-count": 1, - "qom-path": "/machine/peripheral/vcpu7", - "type": "Broadwell-x86_64-cpu" - }, - { - "props": { - "core-id": 0, - "thread-id": 0, - "socket-id": 6 - }, - "vcpus-count": 1, - "qom-path": "/machine/peripheral/vcpu6", - "type": "Broadwell-x86_64-cpu" - }, - { - "props": { - "core-id": 0, - "thread-id": 0, - "socket-id": 5 - }, - "vcpus-count": 1, - "qom-path": "/machine/peripheral/vcpu5", - "type": "Broadwell-x86_64-cpu" - }, - { - "props": { - "core-id": 0, - "thread-id": 0, - "socket-id": 4 - }, - "vcpus-count": 1, - "qom-path": "/machine/peripheral/vcpu4", - "type": "Broadwell-x86_64-cpu" - }, - { - "props": { - "core-id": 0, - "thread-id": 0, - "socket-id": 3 - }, - "vcpus-count": 1, - "qom-path": "/machine/peripheral/vcpu3", - "type": "Broadwell-x86_64-cpu" - }, - { - "props": { - "core-id": 0, - "thread-id": 0, - "socket-id": 2 - }, - "vcpus-count": 1, - "qom-path": "/machine/peripheral/vcpu2", - "type": "Broadwell-x86_64-cpu" - }, - { - "props": { - "core-id": 0, - "thread-id": 0, - "socket-id": 1 - }, - "vcpus-count": 1, - "qom-path": "/machine/peripheral/vcpu1", - "type": "Broadwell-x86_64-cpu" - }, - { - "props": { - "core-id": 0, - "thread-id": 0, - "socket-id": 0 - }, - "vcpus-count": 1, - "qom-path": "/machine/unattached/device[0]", - "type": "Broadwell-x86_64-cpu" - } - ], - "id": "libvirt-51" -} diff --git a/tests/qemumonitorjsondata/qemumonitorjson-cpuinfo-x86-full.dat= a b/tests/qemumonitorjsondata/qemumonitorjson-cpuinfo-x86-full.data deleted file mode 100644 index 1908e397c5..0000000000 --- a/tests/qemumonitorjsondata/qemumonitorjson-cpuinfo-x86-full.data +++ /dev/null @@ -1,109 +0,0 @@ -[vcpu libvirt-id=3D'0'] - online=3Dyes - hotpluggable=3Dno - thread-id=3D'895040' - enable-id=3D'1' - query-cpus-id=3D'0' - type=3D'Broadwell-x86_64-cpu' - qom_path=3D'/machine/unattached/device[0]' - topology: socket=3D'0' core=3D'0' thread=3D'0' vcpus=3D'1' -[vcpu libvirt-id=3D'1'] - online=3Dyes - hotpluggable=3Dyes - thread-id=3D'895056' - enable-id=3D'2' - query-cpus-id=3D'1' - type=3D'Broadwell-x86_64-cpu' - alias=3D'vcpu1' - qom_path=3D'/machine/peripheral/vcpu1' - topology: socket=3D'1' core=3D'0' thread=3D'0' vcpus=3D'1' -[vcpu libvirt-id=3D'2'] - online=3Dyes - hotpluggable=3Dyes - thread-id=3D'895057' - enable-id=3D'3' - query-cpus-id=3D'2' - type=3D'Broadwell-x86_64-cpu' - alias=3D'vcpu2' - qom_path=3D'/machine/peripheral/vcpu2' - topology: socket=3D'2' core=3D'0' thread=3D'0' vcpus=3D'1' -[vcpu libvirt-id=3D'3'] - online=3Dyes - hotpluggable=3Dyes - thread-id=3D'895058' - enable-id=3D'4' - query-cpus-id=3D'3' - type=3D'Broadwell-x86_64-cpu' - alias=3D'vcpu3' - qom_path=3D'/machine/peripheral/vcpu3' - topology: socket=3D'3' core=3D'0' thread=3D'0' vcpus=3D'1' -[vcpu libvirt-id=3D'4'] - online=3Dyes - hotpluggable=3Dyes - thread-id=3D'895059' - enable-id=3D'5' - query-cpus-id=3D'4' - type=3D'Broadwell-x86_64-cpu' - alias=3D'vcpu4' - qom_path=3D'/machine/peripheral/vcpu4' - topology: socket=3D'4' core=3D'0' thread=3D'0' vcpus=3D'1' -[vcpu libvirt-id=3D'5'] - online=3Dyes - hotpluggable=3Dyes - thread-id=3D'895060' - enable-id=3D'6' - query-cpus-id=3D'5' - type=3D'Broadwell-x86_64-cpu' - alias=3D'vcpu5' - qom_path=3D'/machine/peripheral/vcpu5' - topology: socket=3D'5' core=3D'0' thread=3D'0' vcpus=3D'1' -[vcpu libvirt-id=3D'6'] - online=3Dyes - hotpluggable=3Dyes - thread-id=3D'895061' - enable-id=3D'7' - query-cpus-id=3D'6' - type=3D'Broadwell-x86_64-cpu' - alias=3D'vcpu6' - qom_path=3D'/machine/peripheral/vcpu6' - topology: socket=3D'6' core=3D'0' thread=3D'0' vcpus=3D'1' -[vcpu libvirt-id=3D'7'] - online=3Dyes - hotpluggable=3Dyes - thread-id=3D'895062' - enable-id=3D'8' - query-cpus-id=3D'7' - type=3D'Broadwell-x86_64-cpu' - alias=3D'vcpu7' - qom_path=3D'/machine/peripheral/vcpu7' - topology: socket=3D'7' core=3D'0' thread=3D'0' vcpus=3D'1' -[vcpu libvirt-id=3D'8'] - online=3Dyes - hotpluggable=3Dyes - thread-id=3D'895063' - enable-id=3D'9' - query-cpus-id=3D'8' - type=3D'Broadwell-x86_64-cpu' - alias=3D'vcpu8' - qom_path=3D'/machine/peripheral/vcpu8' - topology: socket=3D'8' core=3D'0' thread=3D'0' vcpus=3D'1' -[vcpu libvirt-id=3D'9'] - online=3Dyes - hotpluggable=3Dyes - thread-id=3D'895064' - enable-id=3D'10' - query-cpus-id=3D'9' - type=3D'Broadwell-x86_64-cpu' - alias=3D'vcpu9' - qom_path=3D'/machine/peripheral/vcpu9' - topology: socket=3D'9' core=3D'0' thread=3D'0' vcpus=3D'1' -[vcpu libvirt-id=3D'10'] - online=3Dyes - hotpluggable=3Dyes - thread-id=3D'895065' - enable-id=3D'11' - query-cpus-id=3D'10' - type=3D'Broadwell-x86_64-cpu' - alias=3D'vcpu10' - qom_path=3D'/machine/peripheral/vcpu10' - topology: socket=3D'10' core=3D'0' thread=3D'0' vcpus=3D'1' diff --git a/tests/qemumonitorjsontest.c b/tests/qemumonitorjsontest.c index 692aa75791..54ff240e97 100644 --- a/tests/qemumonitorjsontest.c +++ b/tests/qemumonitorjsontest.c @@ -3115,7 +3115,6 @@ mymain(void) DO_TEST_CPU_DATA("ecx"); =20 DO_TEST_CPU_INFO("x86-basic-pluggable", 8); - DO_TEST_CPU_INFO("x86-full", 11); DO_TEST_CPU_INFO("x86-node-full", 8); DO_TEST_CPU_INFO_FAST("x86-full-fast", 11); DO_TEST_CPU_INFO_FAST("x86-dies", 16); --=20 2.37.1 From nobody Fri May 17 06:54:21 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) client-ip=170.10.129.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.129.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=1659963990; cv=none; d=zohomail.com; s=zohoarc; b=C3AXi2Qx/yoBY3UQO57JLhkhuE3mxJHICT65WzVLXJN2I+vjf0IK3N4woDDtPllOzK/CTaYp7LhWopGQJ/ZZOMV6zRpDKu3HeytG7edvHDdPb5inEYcZvdqVJykWXu7jDm9/iRqjjpAC6AVO3UiI1C6QT9hfjQFZygbrUOIkUSs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1659963990; h=Content-Type:Content-Transfer-Encoding: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=cmaABNlTpgNk0kSZe8tImx1SmtCfOGRXE3bcqjRcpQY=; b=Dut09r6AdtBkJJ5E1I70+aC4b9g8vDnivPWQgmh4Yv1gjMsOQHEhg2Y7XT1e0rR8w7vN70ewUSBB26j6QVp5LXHkjR9vv/FfVQhaf7HQctj7qJFop3JjUWFlxKbJa17dP3l+yvU8L5K9qLaXIvIac+s0swpnewY4+Gt6+XajP90= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mx.zohomail.com with SMTPS id 1659963990240747.5474978555758; Mon, 8 Aug 2022 06:06:30 -0700 (PDT) Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-43-d6sRob_AMN6zUaxybn8_Ag-1; Mon, 08 Aug 2022 09:06:25 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id B7D74805F37; Mon, 8 Aug 2022 13:06:19 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (unknown [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id A51821121314; Mon, 8 Aug 2022 13:06:19 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 4D4B01946A4F; Mon, 8 Aug 2022 13:06:19 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 587781946A49 for ; Mon, 8 Aug 2022 13:06:18 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 3BAF094585; Mon, 8 Aug 2022 13:06:18 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mimecast07.extmail.prod.ext.rdu2.redhat.com [10.11.55.23]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 37FA6945D1 for ; Mon, 8 Aug 2022 13:06:18 +0000 (UTC) Received: from us-smtp-1.mimecast.com (us-smtp-1.mimecast.com [207.211.31.81]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 1C0EF3C01DFE for ; Mon, 8 Aug 2022 13:06:18 +0000 (UTC) Received: from mail-ej1-f69.google.com (mail-ej1-f69.google.com [209.85.218.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-589-ApLeGpeeN125Ud85cDJNDA-1; Mon, 08 Aug 2022 09:06:16 -0400 Received: by mail-ej1-f69.google.com with SMTP id s4-20020a170906500400b006feaccb3a0eso2378413ejj.11 for ; Mon, 08 Aug 2022 06:06:16 -0700 (PDT) Received: from goa-sendmail ([2001:b07:6468:f312:5e2c:eb9a:a8b6:fd3e]) by smtp.gmail.com with ESMTPSA id z2-20020a170906668200b00722f069fd40sm5009296ejo.159.2022.08.08.06.06.13 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 08 Aug 2022 06:06:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1659963989; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to: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=cmaABNlTpgNk0kSZe8tImx1SmtCfOGRXE3bcqjRcpQY=; b=FX5WWP4ggIYfD8kfgxT5lJexJx2M/Q9+mAOznirjqiKvHWFp5TjbeLNAF8zwdn+rnhqm9u UXESGkOBP3tsxi/CQL628s71XKVVNaM4NZWhC7MIo4ZO20TLnrHv3cnuqSofElpruSG/Ua hjb/oZBpL3O2jLrmxN2F4I2QoVNis0E= X-MC-Unique: d6sRob_AMN6zUaxybn8_Ag-1 X-Original-To: libvir-list@listman.corp.redhat.com X-MC-Unique: ApLeGpeeN125Ud85cDJNDA-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc; bh=cmaABNlTpgNk0kSZe8tImx1SmtCfOGRXE3bcqjRcpQY=; b=qj8Y391zLAh5XhPjpfahOGA9Qcy8ChBZvhRDRfVMDFMth5n5p9q6jN2eyT1KtqOMyg 1wVlz1QypqD3wgkO5teHMw0n18Tj1m7/tbzxVDmu+rKOGYXCi3/FDHP72ymaKaYnnoEn AKhQOMudwKHG4IOQxgdjiUX0kO6eoEllMOu4Ckrge/fbdwJVBni/UJW04qa6bDd5BzPa d/THW+UJLc5UwIfN3Z/N0n8ILypZuFp5K7vq8ugo3BCpct1Ao4EZER8McMphZeUBjePw 51S7ygunbVRndHptVMKB5o5hL08N/HC4H0Wl91Dag+RNWkxMswoGqDgSg7MFyxOByb9V nZhg== X-Gm-Message-State: ACgBeo2ew1TNqVzbiSYMRa7Et2g+oed9XvgRYeTEm5zN40hclWEe6Evw flh4VNv9jjAq7NSwDM0vv/A1IbrTx0UqXTy0bB1qpS2UcppqKBMaEFJzCcIpR1s1TwkOBlrUwre 1wmxF26R8NMJvuZ6wGKOvcIleeo4Nd5UHeP4Wl5QOJqvbzjhKhRY3JLoL61GNU3zinCdFncA= X-Received: by 2002:a17:906:4fd5:b0:72e:ce13:2438 with SMTP id i21-20020a1709064fd500b0072ece132438mr14128906ejw.175.1659963975328; Mon, 08 Aug 2022 06:06:15 -0700 (PDT) X-Google-Smtp-Source: AA6agR6ACseSjtIHnQPNZvGjQNpOEowBQ6+9BhMOC/LSAMEeD6aA0iWvAVjesjHJ5e1gz6Ubx9aksg== X-Received: by 2002:a17:906:4fd5:b0:72e:ce13:2438 with SMTP id i21-20020a1709064fd500b0072ece132438mr14128876ejw.175.1659963974889; Mon, 08 Aug 2022 06:06:14 -0700 (PDT) From: Paolo Bonzini To: libvir-list@redhat.com Subject: [PATCH 2/7] tests: drop "-fast" from query-cpus-fast tests Date: Mon, 8 Aug 2022 15:06:03 +0200 Message-Id: <20220808130608.61257-3-pbonzini@redhat.com> In-Reply-To: <20220808130608.61257-1-pbonzini@redhat.com> References: <20220808130608.61257-1-pbonzini@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.11.54.5 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 2.78 on 10.11.54.3 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1659963990937100003 Content-Type: text/plain; charset="utf-8" All supported versions of QEMU include the query-cpus-fast QMP command. In preparation for dropping support for the old "query-cpus" commands, remove the "-fast" suffix from both x86-full-fast and s390-fast. Signed-off-by: Paolo Bonzini --- ...-fast-cpus.json =3D> qemumonitorjson-cpuinfo-s390-cpus.json} | 0 ...hotplug.json =3D> qemumonitorjson-cpuinfo-s390-hotplug.json} | 0 ...uinfo-s390-fast.data =3D> qemumonitorjson-cpuinfo-s390.data} | 0 ...t-cpus.json =3D> qemumonitorjson-cpuinfo-x86-full-cpus.json} | 0 ...lug.json =3D> qemumonitorjson-cpuinfo-x86-full-hotplug.json} | 0 ...6-full-fast.data =3D> qemumonitorjson-cpuinfo-x86-full.data} | 0 tests/qemumonitorjsontest.c | 4 ++-- 7 files changed, 2 insertions(+), 2 deletions(-) rename tests/qemumonitorjsondata/{qemumonitorjson-cpuinfo-s390-fast-cpus.j= son =3D> qemumonitorjson-cpuinfo-s390-cpus.json} (100%) rename tests/qemumonitorjsondata/{qemumonitorjson-cpuinfo-s390-fast-hotplu= g.json =3D> qemumonitorjson-cpuinfo-s390-hotplug.json} (100%) rename tests/qemumonitorjsondata/{qemumonitorjson-cpuinfo-s390-fast.data = =3D> qemumonitorjson-cpuinfo-s390.data} (100%) rename tests/qemumonitorjsondata/{qemumonitorjson-cpuinfo-x86-full-fast-cp= us.json =3D> qemumonitorjson-cpuinfo-x86-full-cpus.json} (100%) rename tests/qemumonitorjsondata/{qemumonitorjson-cpuinfo-x86-full-fast-ho= tplug.json =3D> qemumonitorjson-cpuinfo-x86-full-hotplug.json} (100%) rename tests/qemumonitorjsondata/{qemumonitorjson-cpuinfo-x86-full-fast.da= ta =3D> qemumonitorjson-cpuinfo-x86-full.data} (100%) diff --git a/tests/qemumonitorjsondata/qemumonitorjson-cpuinfo-s390-fast-cp= us.json b/tests/qemumonitorjsondata/qemumonitorjson-cpuinfo-s390-cpus.json similarity index 100% rename from tests/qemumonitorjsondata/qemumonitorjson-cpuinfo-s390-fast-cpu= s.json rename to tests/qemumonitorjsondata/qemumonitorjson-cpuinfo-s390-cpus.json diff --git a/tests/qemumonitorjsondata/qemumonitorjson-cpuinfo-s390-fast-ho= tplug.json b/tests/qemumonitorjsondata/qemumonitorjson-cpuinfo-s390-hotplug= .json similarity index 100% rename from tests/qemumonitorjsondata/qemumonitorjson-cpuinfo-s390-fast-hot= plug.json rename to tests/qemumonitorjsondata/qemumonitorjson-cpuinfo-s390-hotplug.js= on diff --git a/tests/qemumonitorjsondata/qemumonitorjson-cpuinfo-s390-fast.da= ta b/tests/qemumonitorjsondata/qemumonitorjson-cpuinfo-s390.data similarity index 100% rename from tests/qemumonitorjsondata/qemumonitorjson-cpuinfo-s390-fast.data rename to tests/qemumonitorjsondata/qemumonitorjson-cpuinfo-s390.data diff --git a/tests/qemumonitorjsondata/qemumonitorjson-cpuinfo-x86-full-fas= t-cpus.json b/tests/qemumonitorjsondata/qemumonitorjson-cpuinfo-x86-full-cp= us.json similarity index 100% rename from tests/qemumonitorjsondata/qemumonitorjson-cpuinfo-x86-full-fast= -cpus.json rename to tests/qemumonitorjsondata/qemumonitorjson-cpuinfo-x86-full-cpus.j= son diff --git a/tests/qemumonitorjsondata/qemumonitorjson-cpuinfo-x86-full-fas= t-hotplug.json b/tests/qemumonitorjsondata/qemumonitorjson-cpuinfo-x86-full= -hotplug.json similarity index 100% rename from tests/qemumonitorjsondata/qemumonitorjson-cpuinfo-x86-full-fast= -hotplug.json rename to tests/qemumonitorjsondata/qemumonitorjson-cpuinfo-x86-full-hotplu= g.json diff --git a/tests/qemumonitorjsondata/qemumonitorjson-cpuinfo-x86-full-fas= t.data b/tests/qemumonitorjsondata/qemumonitorjson-cpuinfo-x86-full.data similarity index 100% rename from tests/qemumonitorjsondata/qemumonitorjson-cpuinfo-x86-full-fast= .data rename to tests/qemumonitorjsondata/qemumonitorjson-cpuinfo-x86-full.data diff --git a/tests/qemumonitorjsontest.c b/tests/qemumonitorjsontest.c index 54ff240e97..d0a12d14e0 100644 --- a/tests/qemumonitorjsontest.c +++ b/tests/qemumonitorjsontest.c @@ -3115,8 +3115,8 @@ mymain(void) DO_TEST_CPU_DATA("ecx"); =20 DO_TEST_CPU_INFO("x86-basic-pluggable", 8); + DO_TEST_CPU_INFO_FAST("x86-full", 11); DO_TEST_CPU_INFO("x86-node-full", 8); - DO_TEST_CPU_INFO_FAST("x86-full-fast", 11); DO_TEST_CPU_INFO_FAST("x86-dies", 16); =20 DO_TEST_CPU_INFO("ppc64-basic", 24); @@ -3125,7 +3125,7 @@ mymain(void) DO_TEST_CPU_INFO("ppc64-hotplug-4", 24); DO_TEST_CPU_INFO("ppc64-no-threads", 16); =20 - DO_TEST_CPU_INFO_FAST("s390-fast", 2); + DO_TEST_CPU_INFO_FAST("s390", 2); =20 #define DO_TEST_BLOCK_NODE_DETECT(testname) \ do { \ --=20 2.37.1 From nobody Fri May 17 06:54:21 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) client-ip=170.10.129.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.129.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=1659963995; cv=none; d=zohomail.com; s=zohoarc; b=lPpIIx+L9HW9LBhOkS01MkniP6Qk/10q1KtqMkBOAI+yAQp3xJ1qjTCwvS1lGj0h00RqENqDxTrZig0nGcStdfKPfngpSCGQBrLFmcmlxuUcKtmbN6x0ZfX+HeLWu2pu9VAGTsn/BafaqTgWtAUga9/3LWlwS48fIzwDA/KtY6s= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1659963995; h=Content-Type:Content-Transfer-Encoding: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=c1q6b+DPduQCXeee22cSAgROF+YUrZRXNw6BsahKw8M=; b=HWOJiIQFGAV0XNsdDgheroQbXZpwFtf3OtB1PSXrSan8l4kaIvkT4kCa7oGDeSwFOCFJtC/jo8Q30RZO2ptZFTsqwkhDtGyPOdG97qFrnkfSXxPhjWq0x6q37DNkPr9U6iim/FRkhwoDk1J6Ykpybj/JFreLueaxbTNPzI0pgTM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mx.zohomail.com with SMTPS id 1659963995292478.215819466556; Mon, 8 Aug 2022 06:06:35 -0700 (PDT) Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-453-K3Uy9vpFNseuw0mgRNrGOg-1; Mon, 08 Aug 2022 09:06:31 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id A3F821C19763; Mon, 8 Aug 2022 13:06:24 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (unknown [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 8C6932166B26; Mon, 8 Aug 2022 13:06:24 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 4E9BE1946A55; Mon, 8 Aug 2022 13:06:24 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id DB7E71946A4F for ; Mon, 8 Aug 2022 13:06:22 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id CE2FC2166B29; Mon, 8 Aug 2022 13:06:22 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mimecast07.extmail.prod.ext.rdu2.redhat.com [10.11.55.23]) by smtp.corp.redhat.com (Postfix) with ESMTPS id CA1482166B26 for ; Mon, 8 Aug 2022 13:06:22 +0000 (UTC) Received: from us-smtp-1.mimecast.com (us-smtp-2.mimecast.com [205.139.110.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id A42223C01DFD for ; Mon, 8 Aug 2022 13:06:22 +0000 (UTC) Received: from mail-ed1-f72.google.com (mail-ed1-f72.google.com [209.85.208.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-184-hxx8-Z3KPhWjimEyxhXESg-1; Mon, 08 Aug 2022 09:06:19 -0400 Received: by mail-ed1-f72.google.com with SMTP id z6-20020a05640240c600b0043e1d52fd98so5690926edb.22 for ; Mon, 08 Aug 2022 06:06:19 -0700 (PDT) Received: from goa-sendmail ([93.56.169.144]) by smtp.gmail.com with ESMTPSA id v26-20020a056402185a00b0043d742104efsm4531688edy.19.2022.08.08.06.06.15 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 08 Aug 2022 06:06:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1659963994; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to: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=c1q6b+DPduQCXeee22cSAgROF+YUrZRXNw6BsahKw8M=; b=XZSmsHz7i/kGANCBFDqZ5HbyLVCnxkxyTFvfa92WGBZDOgEAxztGriV4XVr2dR6gObyduE 8GbiRVYKzJUPia2D0RY/5ImgYvHzDKli+1Z4qraU/imkR+oKtZA6AFEDgub8aSV8V06amJ fivJ2dWXNtMfvGlrvtcelaMWdeVCFFc= X-MC-Unique: K3Uy9vpFNseuw0mgRNrGOg-1 X-Original-To: libvir-list@listman.corp.redhat.com X-MC-Unique: hxx8-Z3KPhWjimEyxhXESg-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc; bh=c1q6b+DPduQCXeee22cSAgROF+YUrZRXNw6BsahKw8M=; b=abo5pj+KIuSweDHYXXlgngKcbjqnCIiVOuQuv2zhgJnQws/pAlObsFaUeGyFBrnPx4 2VAK1f2H0DOGxBn8XcKDMB+AKj57HY1earyykaHIuwYTNPqrLCsIFq1zOvyqQQXgGoCv qnzmJilhVxC+O0ZoX/r7JyThmj0FeEEune4M1lsMbXtzUplJiEKw00xtHhZiULNascQf zrH+NbFSzweEu2gii4ffsZXfWUYqjJt8YMVn3Xc6cf5t4T3M7XKY+ZufAutywQYmXi0E P1FdMmM40Iz8smzIP3bbo6PtoR7TP2Imp8N+wZWasblX4k0a7vPMWmNARgqkBiGDeVmc nL3g== X-Gm-Message-State: ACgBeo3AciazK/59Mr0aBbauJr6eIUJvDwvgAEgD9d00F6b8Pl8V6ihf fFYewkVr2lXDb5dzq3pEDcNQIsjp4RI6/fEPahMwAj0/P7nfvqq+xhHVYckYQYfbvKfH0ey+dvK 6dqSl6yCW8xG8U3eAbcvzcOO8py0AMAb5q4kL2wO9VCae8cBK0k7hqPySd4BMAEonoMyS1Vk= X-Received: by 2002:a05:6402:11cb:b0:43c:c7a3:ff86 with SMTP id j11-20020a05640211cb00b0043cc7a3ff86mr18329533edw.383.1659963977191; Mon, 08 Aug 2022 06:06:17 -0700 (PDT) X-Google-Smtp-Source: AA6agR6zGGHg7fBajlWNPN28YbF9RZIsmp2cb7Jj4q8gKymaNjmZvKrbejbhDs39d9fpVkARnyWlFg== X-Received: by 2002:a05:6402:11cb:b0:43c:c7a3:ff86 with SMTP id j11-20020a05640211cb00b0043cc7a3ff86mr18329476edw.383.1659963976374; Mon, 08 Aug 2022 06:06:16 -0700 (PDT) From: Paolo Bonzini To: libvir-list@redhat.com Subject: [PATCH 3/7] tests: convert ppc64 tests to query-cpus-fast Date: Mon, 8 Aug 2022 15:06:04 +0200 Message-Id: <20220808130608.61257-4-pbonzini@redhat.com> In-Reply-To: <20220808130608.61257-1-pbonzini@redhat.com> References: <20220808130608.61257-1-pbonzini@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.78 on 10.11.54.6 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 2.78 on 10.11.54.6 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1659963997102100003 Content-Type: text/plain; charset="utf-8" All supported versions of QEMU include the query-cpus-fast QMP command. In preparation for dropping support for the old "query-cpus" commands, convert the JSON output for PPC tests to the new format, and drop the "halted" field from the expected output as it is not available anymore. The CPU properties were obtained from the query-hotpluggable-cpus output in tests/qemumonitorjsondata. CPU, thread_id, and qom_path are renamed respectively to cpu-index, qom-path and thread-id, while nip and halted are removed. Signed-off-by: Paolo Bonzini --- ...umonitorjson-cpuinfo-ppc64-basic-cpus.json | 64 ++--- ...itorjson-cpuinfo-ppc64-hotplug-1-cpus.json | 176 ++++++------ ...itorjson-cpuinfo-ppc64-hotplug-2-cpus.json | 264 ++++++++++-------- ...itorjson-cpuinfo-ppc64-hotplug-4-cpus.json | 264 ++++++++++-------- ...mumonitorjson-cpuinfo-ppc64-hotplug-4.data | 8 - ...torjson-cpuinfo-ppc64-no-threads-cpus.json | 88 +++--- tests/qemumonitorjsontest.c | 10 +- 7 files changed, 461 insertions(+), 413 deletions(-) diff --git a/tests/qemumonitorjsondata/qemumonitorjson-cpuinfo-ppc64-basic-= cpus.json b/tests/qemumonitorjsondata/qemumonitorjson-cpuinfo-ppc64-basic-c= pus.json index 27a3d8b89f..d1d3406958 100644 --- a/tests/qemumonitorjsondata/qemumonitorjson-cpuinfo-ppc64-basic-cpus.js= on +++ b/tests/qemumonitorjsondata/qemumonitorjson-cpuinfo-ppc64-basic-cpus.js= on @@ -3,74 +3,58 @@ { "arch": "ppc", "current": true, - "CPU": 0, - "nip": -4611686018426772172, - "qom_path": "/machine/unattached/device[1]/thread[0]", - "halted": false, - "thread_id": 21925 + "cpu-index": 0, + "qom-path": "/machine/unattached/device[1]/thread[0]", + "thread-id": 21925 }, { "arch": "ppc", "current": false, - "CPU": 1, - "nip": -4611686018426772172, - "qom_path": "/machine/unattached/device[1]/thread[1]", - "halted": false, - "thread_id": 21926 + "cpu-index": 1, + "qom-path": "/machine/unattached/device[1]/thread[1]", + "thread-id": 21926 }, { "arch": "ppc", "current": false, - "CPU": 2, - "nip": -4611686018422360608, - "qom_path": "/machine/unattached/device[1]/thread[2]", - "halted": false, - "thread_id": 21927 + "cpu-index": 2, + "qom-path": "/machine/unattached/device[1]/thread[2]", + "thread-id": 21927 }, { "arch": "ppc", "current": false, - "CPU": 3, - "nip": -4611686018426772172, - "qom_path": "/machine/unattached/device[1]/thread[3]", - "halted": false, - "thread_id": 21928 + "cpu-index": 3, + "qom-path": "/machine/unattached/device[1]/thread[3]", + "thread-id": 21928 }, { "arch": "ppc", "current": false, - "CPU": 4, - "nip": -4611686018426772172, - "qom_path": "/machine/unattached/device[1]/thread[4]", - "halted": false, - "thread_id": 21930 + "cpu-index": 4, + "qom-path": "/machine/unattached/device[1]/thread[4]", + "thread-id": 21930 }, { "arch": "ppc", "current": false, - "CPU": 5, - "nip": -4611686018426772172, - "qom_path": "/machine/unattached/device[1]/thread[5]", - "halted": false, - "thread_id": 21931 + "cpu-index": 5, + "qom-path": "/machine/unattached/device[1]/thread[5]", + "thread-id": 21931 }, { "arch": "ppc", "current": false, - "CPU": 6, - "nip": -4611686018426772172, - "qom_path": "/machine/unattached/device[1]/thread[6]", - "halted": false, - "thread_id": 21932 + "cpu-index": 6, + "qom-path": "/machine/unattached/device[1]/thread[6]", + "thread-id": 21932 }, { "arch": "ppc", "current": false, - "CPU": 7, - "nip": -4611686018426772172, - "qom_path": "/machine/unattached/device[1]/thread[7]", - "halted": false, - "thread_id": 21933 + "cpu-index": 7, + "qom-path": "/machine/unattached/device[1]/thread[7]", + "thread-id": 21933 } ], "id": "libvirt-12" diff --git a/tests/qemumonitorjsondata/qemumonitorjson-cpuinfo-ppc64-hotplu= g-1-cpus.json b/tests/qemumonitorjsondata/qemumonitorjson-cpuinfo-ppc64-hot= plug-1-cpus.json index 7771cbc636..1516ccb99f 100644 --- a/tests/qemumonitorjsondata/qemumonitorjson-cpuinfo-ppc64-hotplug-1-cpu= s.json +++ b/tests/qemumonitorjsondata/qemumonitorjson-cpuinfo-ppc64-hotplug-1-cpu= s.json @@ -3,146 +3,162 @@ { "arch": "ppc", "current": true, - "CPU": 0, - "nip": -4611686018426772172, - "qom_path": "/machine/unattached/device[1]/thread[0]", - "halted": false, - "thread_id": 21925 + "cpu-index": 0, + "props": { + "core-id": 0 + }, + "qom-path": "/machine/unattached/device[1]/thread[0]", + "thread-id": 21925 }, { "arch": "ppc", "current": false, - "CPU": 1, - "nip": -4611686018426772172, - "qom_path": "/machine/unattached/device[1]/thread[1]", - "halted": false, - "thread_id": 21926 + "cpu-index": 1, + "props": { + "core-id": 0 + }, + "qom-path": "/machine/unattached/device[1]/thread[1]", + "thread-id": 21926 }, { "arch": "ppc", "current": false, - "CPU": 2, - "nip": -4611686018426772172, - "qom_path": "/machine/unattached/device[1]/thread[2]", - "halted": false, - "thread_id": 21927 + "cpu-index": 2, + "props": { + "core-id": 0 + }, + "qom-path": "/machine/unattached/device[1]/thread[2]", + "thread-id": 21927 }, { "arch": "ppc", "current": false, - "CPU": 3, - "nip": -4611686018426772172, - "qom_path": "/machine/unattached/device[1]/thread[3]", - "halted": false, - "thread_id": 21928 + "cpu-index": 3, + "props": { + "core-id": 0 + }, + "qom-path": "/machine/unattached/device[1]/thread[3]", + "thread-id": 21928 }, { "arch": "ppc", "current": false, - "CPU": 4, - "nip": -4611686018426772172, - "qom_path": "/machine/unattached/device[1]/thread[4]", - "halted": false, - "thread_id": 21930 + "cpu-index": 4, + "props": { + "core-id": 0 + }, + "qom-path": "/machine/unattached/device[1]/thread[4]", + "thread-id": 21930 }, { "arch": "ppc", "current": false, - "CPU": 5, - "nip": -4611686018426772172, - "qom_path": "/machine/unattached/device[1]/thread[5]", - "halted": false, - "thread_id": 21931 + "cpu-index": 5, + "props": { + "core-id": 0 + }, + "qom-path": "/machine/unattached/device[1]/thread[5]", + "thread-id": 21931 }, { "arch": "ppc", "current": false, - "CPU": 6, - "nip": -4611686018426772172, - "qom_path": "/machine/unattached/device[1]/thread[6]", - "halted": false, - "thread_id": 21932 + "cpu-index": 6, + "props": { + "core-id": 0 + }, + "qom-path": "/machine/unattached/device[1]/thread[6]", + "thread-id": 21932 }, { "arch": "ppc", "current": false, - "CPU": 7, - "nip": -4611686018426772172, - "qom_path": "/machine/unattached/device[1]/thread[7]", - "halted": false, - "thread_id": 21933 + "cpu-index": 7, + "props": { + "core-id": 0 + }, + "qom-path": "/machine/unattached/device[1]/thread[7]", + "thread-id": 21933 }, { "arch": "ppc", "current": false, - "CPU": 8, - "nip": -4611686018426772172, - "qom_path": "/machine/peripheral/vcpu0/thread[0]", - "halted": false, - "thread_id": 22131 + "cpu-index": 8, + "props": { + "core-id": 8 + }, + "qom-path": "/machine/peripheral/vcpu0/thread[0]", + "thread-id": 22131 }, { "arch": "ppc", "current": false, - "CPU": 9, - "nip": -4611686018426772172, - "qom_path": "/machine/peripheral/vcpu0/thread[1]", - "halted": false, - "thread_id": 22132 + "cpu-index": 9, + "props": { + "core-id": 8 + }, + "qom-path": "/machine/peripheral/vcpu0/thread[1]", + "thread-id": 22132 }, { "arch": "ppc", "current": false, - "CPU": 10, - "nip": -4611686018426772172, - "qom_path": "/machine/peripheral/vcpu0/thread[2]", - "halted": false, - "thread_id": 22133 + "cpu-index": 10, + "props": { + "core-id": 8 + }, + "qom-path": "/machine/peripheral/vcpu0/thread[2]", + "thread-id": 22133 }, { "arch": "ppc", "current": false, - "CPU": 11, - "nip": -4611686018426772172, - "qom_path": "/machine/peripheral/vcpu0/thread[3]", - "halted": false, - "thread_id": 22134 + "cpu-index": 11, + "props": { + "core-id": 8 + }, + "qom-path": "/machine/peripheral/vcpu0/thread[3]", + "thread-id": 22134 }, { "arch": "ppc", "current": false, - "CPU": 12, - "nip": -4611686018426772172, - "qom_path": "/machine/peripheral/vcpu0/thread[4]", - "halted": false, - "thread_id": 22135 + "cpu-index": 12, + "props": { + "core-id": 8 + }, + "qom-path": "/machine/peripheral/vcpu0/thread[4]", + "thread-id": 22135 }, { "arch": "ppc", "current": false, - "CPU": 13, - "nip": -4611686018426772172, - "qom_path": "/machine/peripheral/vcpu0/thread[5]", - "halted": false, - "thread_id": 22136 + "cpu-index": 13, + "props": { + "core-id": 8 + }, + "qom-path": "/machine/peripheral/vcpu0/thread[5]", + "thread-id": 22136 }, { "arch": "ppc", "current": false, - "CPU": 14, - "nip": -4611686018426772172, - "qom_path": "/machine/peripheral/vcpu0/thread[6]", - "halted": false, - "thread_id": 22137 + "cpu-index": 14, + "props": { + "core-id": 8 + }, + "qom-path": "/machine/peripheral/vcpu0/thread[6]", + "thread-id": 22137 }, { "arch": "ppc", "current": false, - "CPU": 15, - "nip": -4611686018426772172, - "qom_path": "/machine/peripheral/vcpu0/thread[7]", - "halted": false, - "thread_id": 22138 + "cpu-index": 15, + "props": { + "core-id": 8 + }, + "qom-path": "/machine/peripheral/vcpu0/thread[7]", + "thread-id": 22138 } ], "id": "libvirt-14" diff --git a/tests/qemumonitorjsondata/qemumonitorjson-cpuinfo-ppc64-hotplu= g-2-cpus.json b/tests/qemumonitorjsondata/qemumonitorjson-cpuinfo-ppc64-hot= plug-2-cpus.json index b377b6a0f6..d5068df8cc 100644 --- a/tests/qemumonitorjsondata/qemumonitorjson-cpuinfo-ppc64-hotplug-2-cpu= s.json +++ b/tests/qemumonitorjsondata/qemumonitorjson-cpuinfo-ppc64-hotplug-2-cpu= s.json @@ -3,218 +3,242 @@ { "arch": "ppc", "current": true, - "CPU": 0, - "nip": -4611686018426772172, - "qom_path": "/machine/unattached/device[1]/thread[0]", - "halted": false, - "thread_id": 21925 + "cpu-index": 0, + "props": { + "core-id": 0 + }, + "qom-path": "/machine/unattached/device[1]/thread[0]", + "thread-id": 21925 }, { "arch": "ppc", "current": false, - "CPU": 1, - "nip": -4611686018426772172, - "qom_path": "/machine/unattached/device[1]/thread[1]", - "halted": false, - "thread_id": 21926 + "cpu-index": 1, + "props": { + "core-id": 0 + }, + "qom-path": "/machine/unattached/device[1]/thread[1]", + "thread-id": 21926 }, { "arch": "ppc", "current": false, - "CPU": 2, - "nip": -4611686018422360576, - "qom_path": "/machine/unattached/device[1]/thread[2]", - "halted": false, - "thread_id": 21927 + "cpu-index": 2, + "props": { + "core-id": 0 + }, + "qom-path": "/machine/unattached/device[1]/thread[2]", + "thread-id": 21927 }, { "arch": "ppc", "current": false, - "CPU": 3, - "nip": -4611686018422360596, - "qom_path": "/machine/unattached/device[1]/thread[3]", - "halted": false, - "thread_id": 21928 + "cpu-index": 3, + "props": { + "core-id": 0 + }, + "qom-path": "/machine/unattached/device[1]/thread[3]", + "thread-id": 21928 }, { "arch": "ppc", "current": false, - "CPU": 4, - "nip": -4611686018426772172, - "qom_path": "/machine/unattached/device[1]/thread[4]", - "halted": false, - "thread_id": 21930 + "cpu-index": 4, + "props": { + "core-id": 0 + }, + "qom-path": "/machine/unattached/device[1]/thread[4]", + "thread-id": 21930 }, { "arch": "ppc", "current": false, - "CPU": 5, - "nip": -4611686018426772172, - "qom_path": "/machine/unattached/device[1]/thread[5]", - "halted": false, - "thread_id": 21931 + "cpu-index": 5, + "props": { + "core-id": 0 + }, + "qom-path": "/machine/unattached/device[1]/thread[5]", + "thread-id": 21931 }, { "arch": "ppc", "current": false, - "CPU": 6, - "nip": -4611686018426772172, - "qom_path": "/machine/unattached/device[1]/thread[6]", - "halted": false, - "thread_id": 21932 + "cpu-index": 6, + "props": { + "core-id": 0 + }, + "qom-path": "/machine/unattached/device[1]/thread[6]", + "thread-id": 21932 }, { "arch": "ppc", "current": false, - "CPU": 7, - "nip": -4611686018422360596, - "qom_path": "/machine/unattached/device[1]/thread[7]", - "halted": false, - "thread_id": 21933 + "cpu-index": 7, + "props": { + "core-id": 0 + }, + "qom-path": "/machine/unattached/device[1]/thread[7]", + "thread-id": 21933 }, { "arch": "ppc", "current": false, - "CPU": 8, - "nip": -4611686018426772172, - "qom_path": "/machine/peripheral/vcpu0/thread[0]", - "halted": false, - "thread_id": 22131 + "cpu-index": 8, + "props": { + "core-id": 8 + }, + "qom-path": "/machine/peripheral/vcpu0/thread[0]", + "thread-id": 22131 }, { "arch": "ppc", "current": false, - "CPU": 9, - "nip": -4611686018426772172, - "qom_path": "/machine/peripheral/vcpu0/thread[1]", - "halted": false, - "thread_id": 22132 + "cpu-index": 9, + "props": { + "core-id": 8 + }, + "qom-path": "/machine/peripheral/vcpu0/thread[1]", + "thread-id": 22132 }, { "arch": "ppc", "current": false, - "CPU": 10, - "nip": -4611686018426772172, - "qom_path": "/machine/peripheral/vcpu0/thread[2]", - "halted": false, - "thread_id": 22133 + "cpu-index": 10, + "props": { + "core-id": 8 + }, + "qom-path": "/machine/peripheral/vcpu0/thread[2]", + "thread-id": 22133 }, { : false, - "thread_id": 22135 + "cpu-index": 12, + "props": { + "core-id": 8 + }, + "qom-path": "/machine/peripheral/vcpu0/thread[4]", + "thread-id": 22135 }, { "arch": "ppc", "current": false, - "CPU": 13, - "nip": -4611686018426772172, - "qom_path": "/machine/peripheral/vcpu0/thread[5]", - "halted": false, - "thread_id": 22136 + "cpu-index": 13, + "props": { + "core-id": 8 + }, + "qom-path": "/machine/peripheral/vcpu0/thread[5]", + "thread-id": 22136 }, { "arch": "ppc", "current": false, - "CPU": 14, - "nip": -4611686018426772172, - "qom_path": "/machine/peripheral/vcpu0/thread[6]", - "halted": false, - "thread_id": 22137 + "cpu-index": 14, + "props": { + "core-id": 8 + }, + "qom-path": "/machine/peripheral/vcpu0/thread[6]", + "thread-id": 22137 }, { "arch": "ppc", "current": false, - "CPU": 15, - "nip": -4611686018426772172, - "qom_path": "/machine/peripheral/vcpu0/thread[7]", - "halted": false, - "thread_id": 22138 + "cpu-index": 15, + "props": { + "core-id": 8 + }, + "qom-path": "/machine/peripheral/vcpu0/thread[7]", + "thread-id": 22138 }, { "arch": "ppc", "current": false, - "CPU": 16, - "nip": -4611686018426772172, - "qom_path": "/machine/peripheral/vcpu1/thread[0]", - "halted": false, - "thread_id": 22223 + "cpu-index": 16, + "props": { + "core-id": 16 + }, + "qom-path": "/machine/peripheral/vcpu1/thread[0]", + "thread-id": 22223 }, { "arch": "ppc", "current": false, - "CPU": 17, - "nip": -4611686018426772172, - "qom_path": "/machine/peripheral/vcpu1/thread[1]", - "halted": false, - "thread_id": 22224 + "cpu-index": 17, + "props": { + "core-id": 16 + }, + "qom-path": "/machine/peripheral/vcpu1/thread[1]", + "thread-id": 22224 }, { "arch": "ppc", "current": false, - "CPU": 18, - "nip": -4611686018426772172, - "qom_path": "/machine/peripheral/vcpu1/thread[2]", - "halted": false, - "thread_id": 22225 + "cpu-index": 18, + "props": { + "core-id": 16 + }, + "qom-path": "/machine/peripheral/vcpu1/thread[2]", + "thread-id": 22225 }, { "arch": "ppc", "current": false, - "CPU": 19, - "nip": -4611686018426772172, - "qom_path": "/machine/peripheral/vcpu1/thread[3]", - "halted": false, - "thread_id": 22226 + "cpu-index": 19, + "props": { + "core-id": 16 + }, + "qom-path": "/machine/peripheral/vcpu1/thread[3]", + "thread-id": 22226 }, { "arch": "ppc", "current": false, - "CPU": 20, - "nip": -4611686018426772172, - "qom_path": "/machine/peripheral/vcpu1/thread[4]", - "halted": false, - "thread_id": 22227 + "cpu-index": 20, + "props": { + "core-id": 16 + }, + "qom-path": "/machine/peripheral/vcpu1/thread[4]", + "thread-id": 22227 }, { "arch": "ppc", "current": false, - "CPU": 21, - "nip": -4611686018426772172, - "qom_path": "/machine/peripheral/vcpu1/thread[5]", - "halted": false, - "thread_id": 22228 + "cpu-index": 21, + "props": { + "core-id": 16 + }, + "qom-path": "/machine/peripheral/vcpu1/thread[5]", + "thread-id": 22228 }, { "arch": "ppc", "current": false, - "CPU": 22, - "nip": -4611686018426772172, - "qom_path": "/machine/peripheral/vcpu1/thread[6]", - "halted": false, - "thread_id": 22229 + "cpu-index": 22, + "props": { + "core-id": 16 + }, + "qom-path": "/machine/peripheral/vcpu1/thread[6]", + "thread-id": 22229 }, { "arch": "ppc", "current": false, - "CPU": 23, - "nip": -4611686018426772172, - "qom_path": "/machine/peripheral/vcpu1/thread[7]", - "halted": false, - "thread_id": 22230 + "cpu-index": 23, + "props": { + "core-id": 16 + }, + "qom-path": "/machine/peripheral/vcpu1/thread[7]", + "thread-id": 22230 } ], "id": "libvirt-17" diff --git a/tests/qemumonitorjsondata/qemumonitorjson-cpuinfo-ppc64-hotplu= g-4-cpus.json b/tests/qemumonitorjsondata/qemumonitorjson-cpuinfo-ppc64-hot= plug-4-cpus.json index bcb6eab273..2b9a14282d 100644 --- a/tests/qemumonitorjsondata/qemumonitorjson-cpuinfo-ppc64-hotplug-4-cpu= s.json +++ b/tests/qemumonitorjsondata/qemumonitorjson-cpuinfo-ppc64-hotplug-4-cpu= s.json @@ -3,218 +3,242 @@ { "arch": "ppc", "current": true, - "CPU": 0, - "nip": -4611686018426772172, - "qom_path": "/machine/unattached/device[1]/thread[0]", - "halted": false, - "thread_id": 21925 + "cpu-index": 0, + "props": { + "core-id": 0 + }, + "qom-path": "/machine/unattached/device[1]/thread[0]", + "thread-id": 21925 }, { "arch": "ppc", "current": false, - "CPU": 1, - "nip": -4611686018426772172, - "qom_path": "/machine/unattached/device[1]/thread[1]", - "halted": false, - "thread_id": 21926 + "cpu-index": 1, + "props": { + "core-id": 0 + }, + "qom-path": "/machine/unattached/device[1]/thread[1]", + "thread-id": 21926 }, { "arch": "ppc", "current": false, - "CPU": 2, - "nip": -4611686018426772172, - "qom_path": "/machine/unattached/device[1]/thread[2]", - "halted": false, - "thread_id": 21927 + "cpu-index": 2, + "props": { + "core-id": 0 + }, + "qom-path": "/machine/unattached/device[1]/thread[2]", + "thread-id": 21927 }, { "arch": "ppc", "current": false, - "CPU": 3, - "nip": -4611686018426772172, - "qom_path": "/machine/unattached/device[1]/thread[3]", - "halted": false, - "thread_id": 21928 + "cpu-index": 3, + "props": { + "core-id": 0 + }, + "qom-path": "/machine/unattached/device[1]/thread[3]", + "thread-id": 21928 }, { "arch": "ppc", "current": false, - "CPU": 4, - "nip": -4611686018426772172, - "qom_path": "/machine/unattached/device[1]/thread[4]", - "halted": false, - "thread_id": 21930 + "cpu-index": 4, + "props": { + "core-id": 0 + }, + "qom-path": "/machine/unattached/device[1]/thread[4]", + "thread-id": 21930 }, { "arch": "ppc", "current": false, - "CPU": 5, - "nip": -4611686018426772172, - "qom_path": "/machine/unattached/device[1]/thread[5]", - "halted": false, - "thread_id": 21931 + "cpu-index": 5, + "props": { + "core-id": 0 + }, + "qom-path": "/machine/unattached/device[1]/thread[5]", + "thread-id": 21931 }, { "arch": "ppc", "current": false, - "CPU": 6, - "nip": -4611686018426772172, - "qom_path": "/machine/unattached/device[1]/thread[6]", - "halted": false, - "thread_id": 21932 + "cpu-index": 6, + "props": { + "core-id": 0 + }, + "qom-path": "/machine/unattached/device[1]/thread[6]", + "thread-id": 21932 }, { "arch": "ppc", "current": false, - "CPU": 7, - "nip": -4611686018426772172, - "qom_path": "/machine/unattached/device[1]/thread[7]", - "halted": false, - "thread_id": 21933 + "cpu-index": 7, + "props": { + "core-id": 0 + }, + "qom-path": "/machine/unattached/device[1]/thread[7]", + "thread-id": 21933 }, { "arch": "ppc", "current": false, - "CPU": 8, - "nip": -4611686018426772172, - "qom_path": "/machine/peripheral/vcpu1/thread[0]", - "halted": false, - "thread_id": 22741 + "cpu-index": 8, + "props": { + "core-id": 8 + }, + "qom-path": "/machine/peripheral/vcpu1/thread[0]", + "thread-id": 22741 }, { "arch": "ppc", "current": false, - "CPU": 9, - "nip": -4611686018426772172, - "qom_path": "/machine/peripheral/vcpu1/thread[1]", - "halted": false, - "thread_id": 22742 + "cpu-index": 9, + "props": { + "core-id": 8 + }, + "qom-path": "/machine/peripheral/vcpu1/thread[1]", + "thread-id": 22742 }, { "arch": "ppc", "current": false, - "CPU": 10, - "nip": -4611686018426772172, - "qom_path": "/machine/peripheral/vcpu1/thread[2]", - "halted": false, - "thread_id": 22743 + "cpu-index": 10, + "props": { + "core-id": 8 + }, + "qom-path": "/machine/peripheral/vcpu1/thread[2]", + "thread-id": 22743 }, { "arch": "ppc", "current": false, - "CPU": 11, - "nip": -4611686018419474700, - "qom_path": "/machine/peripheral/vcpu1/thread[3]", - "halted": false, - "thread_id": 22744 + "cpu-index": 11, + "props": { + "core-id": 8 + }, + "qom-path": "/machine/peripheral/vcpu1/thread[3]", + "thread-id": 22744 }, { "arch": "ppc", "current": false, - "CPU": 12, - "nip": -4611686018426772172, - "qom_path": "/machine/peripheral/vcpu1/thread[4]", - "halted": false, - "thread_id": 22745 + "cpu-index": 12, + "props": { + "core-id": 8 + }, + "qom-path": "/machine/peripheral/vcpu1/thread[4]", + "thread-id": 22745 }, { "arch": "ppc", "current": false, - "CPU": 13, - "nip": -4611686018426772172, - "qom_path": "/machine/peripheral/vcpu1/thread[5]", - "halted": false, - "thread_id": 22746 + "cpu-index": 13, + "props": { + "core-id": 8 + }, + "qom-path": "/machine/peripheral/vcpu1/thread[5]", + "thread-id": 22746 }, { "arch": "ppc", "current": false, - "CPU": 14, - "nip": -4611686018426772172, - "qom_path": "/machine/peripheral/vcpu1/thread[6]", - "halted": false, - "thread_id": 22747 + "cpu-index": 14, + "props": { + "core-id": 8 + }, + "qom-path": "/machine/peripheral/vcpu1/thread[6]", + "thread-id": 22747 }, { "arch": "ppc", "current": false, - "CPU": 15, - "nip": -4611686018426772172, - "qom_path": "/machine/peripheral/vcpu1/thread[7]", - "halted": false, - "thread_id": 22748 + "cpu-index": 15, + "props": { + "core-id": 8 + }, + "qom-path": "/machine/peripheral/vcpu1/thread[7]", + "thread-id": 22748 }, { "arch": "ppc", "current": false, - "CPU": 16, - "nip": 0, - "qom_path": "/machine/peripheral/vcpu0/thread[0]", - "halted": true, - "thread_id": 23170 + "cpu-index": 16, + "props": { + "core-id": 16 + }, + "qom-path": "/machine/peripheral/vcpu0/thread[0]", + "thread-id": 23170 }, { "arch": "ppc", "current": false, - "CPU": 17, - "nip": 0, - "qom_path": "/machine/peripheral/vcpu0/thread[1]", - "halted": true, - "thread_id": 23171 + "cpu-index": 17, + "props": { + "core-id": 16 + }, + "qom-path": "/machine/peripheral/vcpu0/thread[1]", + "thread-id": 23171 }, { "arch": "ppc", "current": false, - "CPU": 18, - "nip": 0, - "qom_path": "/machine/peripheral/vcpu0/thread[2]", - "halted": true, - "thread_id": 23172 + "cpu-index": 18, + "props": { + "core-id": 16 + }, + "qom-path": "/machine/peripheral/vcpu0/thread[2]", + "thread-id": 23172 }, { "arch": "ppc", "current": false, - "CPU": 19, - "nip": 0, - "qom_path": "/machine/peripheral/vcpu0/thread[3]", - "halted": true, - "thread_id": 23173 + "cpu-index": 19, + "props": { + "core-id": 16 + }, + "qom-path": "/machine/peripheral/vcpu0/thread[3]", + "thread-id": 23173 }, { "arch": "ppc", "current": false, - "CPU": 20, - "nip": 0, - "qom_path": "/machine/peripheral/vcpu0/thread[4]", - "halted": true, - "thread_id": 23174 + "cpu-index": 20, + "props": { + "core-id": 16 + }, + "qom-path": "/machine/peripheral/vcpu0/thread[4]", + "thread-id": 23174 }, { "arch": "ppc", "current": false, - "CPU": 21, - "nip": 0, - "qom_path": "/machine/peripheral/vcpu0/thread[5]", - "halted": true, - "thread_id": 23175 + "cpu-index": 21, + "props": { + "core-id": 16 + }, + "qom-path": "/machine/peripheral/vcpu0/thread[5]", + "thread-id": 23175 }, { "arch": "ppc", "current": false, - "CPU": 22, - "nip": 0, - "qom_path": "/machine/peripheral/vcpu0/thread[6]", - "halted": true, - "thread_id": 23176 + "cpu-index": 22, + "props": { + "core-id": 16 + }, + "qom-path": "/machine/peripheral/vcpu0/thread[6]", + "thread-id": 23176 }, { "arch": "ppc", "current": false, - "CPU": 23, - "nip": 0, - "qom_path": "/machine/peripheral/vcpu0/thread[7]", - "halted": true, - "thread_id": 23177 + "cpu-index": 23, + "props": { + "core-id": 16 + }, + "qom-path": "/machine/peripheral/vcpu0/thread[7]", + "thread-id": 23177 } ], "id": "libvirt-37" diff --git a/tests/qemumonitorjsondata/qemumonitorjson-cpuinfo-ppc64-hotplu= g-4.data b/tests/qemumonitorjsondata/qemumonitorjson-cpuinfo-ppc64-hotplug-= 4.data index 5f6b8656c9..7c9088928b 100644 --- a/tests/qemumonitorjsondata/qemumonitorjson-cpuinfo-ppc64-hotplug-4.data +++ b/tests/qemumonitorjsondata/qemumonitorjson-cpuinfo-ppc64-hotplug-4.data @@ -52,49 +52,41 @@ alias=3D'vcpu0' qom_path=3D'/machine/peripheral/vcpu0' topology: core=3D'8' vcpus=3D'8' - halted [vcpu libvirt-id=3D'9'] online=3Dyes hotpluggable=3Dyes thread-id=3D'23171' query-cpus-id=3D'17' - halted [vcpu libvirt-id=3D'10'] online=3Dyes hotpluggable=3Dyes thread-id=3D'23172' query-cpus-id=3D'18' - halted [vcpu libvirt-id=3D'11'] online=3Dyes hotpluggable=3Dyes thread-id=3D'23173' query-cpus-id=3D'19' - halted [vcpu libvirt-id=3D'12'] online=3Dyes hotpluggable=3Dyes thread-id=3D'23174' query-cpus-id=3D'20' - halted [vcpu libvirt-id=3D'13'] online=3Dyes hotpluggable=3Dyes thread-id=3D'23175' query-cpus-id=3D'21' - halted [vcpu libvirt-id=3D'14'] online=3Dyes hotpluggable=3Dyes thread-id=3D'23176' query-cpus-id=3D'22' - halted [vcpu libvirt-id=3D'15'] online=3Dyes hotpluggable=3Dyes thread-id=3D'23177' query-cpus-id=3D'23' - halted [vcpu libvirt-id=3D'16'] online=3Dyes hotpluggable=3Dyes diff --git a/tests/qemumonitorjsondata/qemumonitorjson-cpuinfo-ppc64-no-thr= eads-cpus.json b/tests/qemumonitorjsondata/qemumonitorjson-cpuinfo-ppc64-no= -threads-cpus.json index 31a3905e43..0ee53ae471 100644 --- a/tests/qemumonitorjsondata/qemumonitorjson-cpuinfo-ppc64-no-threads-cp= us.json +++ b/tests/qemumonitorjsondata/qemumonitorjson-cpuinfo-ppc64-no-threads-cp= us.json @@ -3,74 +3,82 @@ { "arch": "ppc", "current": true, - "CPU": 0, - "nip": -46116860184chine/unattached/device[2]/thread[0]", + "thread-id": 35233 }, { "arch": "ppc", "current": false, - "CPU": 2, - "nip": -4611686018426772876, - "qom_path": "/machine/unattached/device[3]/thread[0]", - "halted": false, - "thread_id": 35234 + "cpu-index": 2, + "props": { + "core-id": 16 + }, + "qom-path": "/machine/unattached/device[3]/thread[0]", + "thread-id": 35234 }, { "arch": "ppc", "current": false, - "CPU": 3, - "nip": -4611686018426772876, - "qom_path": "/machine/unattached/device[4]/thread[0]", - "halted": false, - "thread_id": 35235 + "cpu-index": 3, + "props": { + "core-id": 24 + }, + "qom-path": "/machine/unattached/device[4]/thread[0]", + "thread-id": 35235 }, { "arch": "ppc", "current": false, - "CPU": 4, - "nip": -4611686018426772876, - "qom_path": "/machine/unattached/device[5]/thread[0]", - "halted": false, - "thread_id": 35236 + "cpu-index": 4, + "props": { + "core-id": 32 + }, + "qom-path": "/machine/unattached/device[5]/thread[0]", + "thread-id": 35236 }, { "arch": "ppc", "current": false, - "CPU": 5, - "nip": -4611686018426772876, - "qom_path": "/machine/unattached/device[6]/thread[0]", - "halted": false, - "thread_id": 35237 + "cpu-index": 5, + "props": { + "core-id": 40 + }, + "qom-path": "/machine/unattached/device[6]/thread[0]", + "thread-id": 35237 }, { "arch": "ppc", "current": false, - "CPU": 6, - "nip": -4611686018426772876, - "qom_path": "/machine/unattached/device[7]/thread[0]", - "halted": false, - "thread_id": 35238 + "cpu-index": 6, + "props": { + "core-id": 48 + }, + "qom-path": "/machine/unattached/device[7]/thread[0]", + "thread-id": 35238 }, { "arch": "ppc", "current": false, - "CPU": 7, - "nip": -4611686018426772876, - "qom_path": "/machine/unattached/device[8]/thread[0]", - "halted": false, - "thread_id": 35239 + "cpu-index": 7, + "props": { + "core-id": 56 + }, + "qom-path": "/machine/unattached/device[8]/thread[0]", + "thread-id": 35239 } ], "id": "libvirt-11" diff --git a/tests/qemumonitorjsontest.c b/tests/qemumonitorjsontest.c index d0a12d14e0..56620f16a6 100644 --- a/tests/qemumonitorjsontest.c +++ b/tests/qemumonitorjsontest.c @@ -3119,11 +3119,11 @@ mymain(void) DO_TEST_CPU_INFO("x86-node-full", 8); DO_TEST_CPU_INFO_FAST("x86-dies", 16); =20 - DO_TEST_CPU_INFO("ppc64-basic", 24); - DO_TEST_CPU_INFO("ppc64-hotplug-1", 24); - DO_TEST_CPU_INFO("ppc64-hotplug-2", 24); - DO_TEST_CPU_INFO("ppc64-hotplug-4", 24); - DO_TEST_CPU_INFO("ppc64-no-threads", 16); + DO_TEST_CPU_INFO_FAST("ppc64-basic", 24); + DO_TEST_CPU_INFO_FAST("ppc64-hotplug-1", 24); + DO_TEST_CPU_INFO_FAST("ppc64-hotplug-2", 24); + DO_TEST_CPU_INFO_FAST("ppc64-hotplug-4", 24); + DO_TEST_CPU_INFO_FAST("ppc64-no-threads", 16); =20 DO_TEST_CPU_INFO_FAST("s390", 2); =20 --=20 2.37.1 From nobody Fri May 17 06:54:21 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=1659963992; cv=none; d=zohomail.com; s=zohoarc; b=WlURHfRxgayVEvXmqqZ0KxtubwelABJiDpVH08QIkqHiSZqbNCWM+KlAm8b9I2q6LeGNKcm9Q5lMXNTWNb1vV/HOM98vBgwzRjezjhs1xiGZBOz07I2zUNoMFaPopqodpCD0cETOy8a1Rk1dZIByAuRzEAPrcQkPTrcWUX7l8ZE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1659963992; h=Content-Type:Content-Transfer-Encoding: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=HykxrTkSDuk8E5Toh43GHuy6uHbLOXBnTi1N1iTdEBo=; b=F2KvWfbCFWdfXmtI2nWIFkafY4SLXRS/9VXXdon5jOL+qSp46SBexbhKfkt0M5pkNGVQ7hTN3gKW0AyHh4BerqjxwlCTxvw5je7zgM/GL3HelrtIcFCfTGbji4pugNhcnPuST99nH4iYCL3z2vi+nWD4ohGbgsn/fvE9RTln+50= 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) 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 1659963992062141.8186083266413; Mon, 8 Aug 2022 06:06:32 -0700 (PDT) Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-590-XYp4RlYFNsasAKL_Iu8KFA-1; Mon, 08 Aug 2022 09:06:28 -0400 Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 40C73811766; Mon, 8 Aug 2022 13:06:23 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (unknown [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 2EB61492CA2; Mon, 8 Aug 2022 13:06:23 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 0BEC21946A4F; Mon, 8 Aug 2022 13:06:23 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 36CA91946A49 for ; Mon, 8 Aug 2022 13:06:22 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 2A2564010D27; Mon, 8 Aug 2022 13:06:22 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mimecast03.extmail.prod.ext.rdu2.redhat.com [10.11.55.19]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 26D47404D883 for ; Mon, 8 Aug 2022 13:06:22 +0000 (UTC) Received: from us-smtp-1.mimecast.com (us-smtp-1.mimecast.com [205.139.110.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 0E1BE811E84 for ; Mon, 8 Aug 2022 13:06:22 +0000 (UTC) Received: from mail-ej1-f71.google.com (mail-ej1-f71.google.com [209.85.218.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-300-yvG3n5UxPqOcWsBR1EJ-ug-1; Mon, 08 Aug 2022 09:06:19 -0400 Received: by mail-ej1-f71.google.com with SMTP id sc31-20020a1709078a1f00b0073096c2b4e1so2387679ejc.22 for ; Mon, 08 Aug 2022 06:06:19 -0700 (PDT) Received: from goa-sendmail ([93.56.169.144]) by smtp.gmail.com with ESMTPSA id h7-20020aa7c607000000b0043d7ff1e3bcsm4611648edq.72.2022.08.08.06.06.17 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 08 Aug 2022 06:06:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1659963990; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to: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=HykxrTkSDuk8E5Toh43GHuy6uHbLOXBnTi1N1iTdEBo=; b=b/g2bIMQ0ILkEZCBlAE+YC5IaJnJqNdxorpBI+ObYlmiFIPzid8Uvf9Xr5MyeBcQXPxzZA XGDeLkBwfoQNm1knbyMQZclBwm72tAkoinqVDV7RHd+zGF7Kle78Pb1Ot0IJWevQY0Pelw zylxTZJJOPwgC9V+FVLodtXA+/1xq54= X-MC-Unique: XYp4RlYFNsasAKL_Iu8KFA-1 X-Original-To: libvir-list@listman.corp.redhat.com X-MC-Unique: yvG3n5UxPqOcWsBR1EJ-ug-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc; bh=HykxrTkSDuk8E5Toh43GHuy6uHbLOXBnTi1N1iTdEBo=; b=WKmE/VxUWuNZZa2vb++56SHUtvnvPStSFhJnAim5oOwozylSbRO9N92kKkcIHDyELv UzQt/kav6GBr4rJ6dkdzwQJ/tlddf3UIdSyEStffJyh1Dr8iimvR6VpF3vQGbyDyocRY F/z9TrSWvuoC/BIGcKcq8fkzXXC+KZcx3UZANzOnbc09Mapkzj6SwUUC3ulntRmCutTo hs87JY6Qqaxm7lE+gYv30jTVTdKxq92XxGBeWPMwWHpHnUwsMdeAsan0yvuoJOhhlPVF CKNmCX2bedDfUpCViduNnNJ72g8ogNN43bY76kfGxh2xnSYrPsxAcxwdAYuMYx8jVsNZ I3jQ== X-Gm-Message-State: ACgBeo1PwgqxI0vvFI+SFPN2sFszu/McPf/aVSPP8EEyL0OryBwi4KTt llZYHZXO13RxEhaEmy51AOtoKOEOH4IRFic+9RKo1HO7EByJreetqZ4Z6vXNVPBu1OzXTK0/lxY EOL1+ZEhTYk10K8g6r9LKfNhWMRzFduvJu8SHYjcMUToT3Idj5gROuFZ7Q8/6WRxDED3QY+g= X-Received: by 2002:a05:6402:2b8d:b0:43a:5410:a9fc with SMTP id fj13-20020a0564022b8d00b0043a5410a9fcmr18187860edb.99.1659963978290; Mon, 08 Aug 2022 06:06:18 -0700 (PDT) X-Google-Smtp-Source: AA6agR7jABxnvXKoazTWIAPck1guQAu47dbZ5uedk7t95SXqvOgRjMoWQv5FjJ6U4gkfv0KSYFOd2w== X-Received: by 2002:a05:6402:2b8d:b0:43a:5410:a9fc with SMTP id fj13-20020a0564022b8d00b0043a5410a9fcmr18187838edb.99.1659963977923; Mon, 08 Aug 2022 06:06:17 -0700 (PDT) From: Paolo Bonzini To: libvir-list@redhat.com Subject: [PATCH 4/7] tests: convert x86_64 tests to query-cpus-fast Date: Mon, 8 Aug 2022 15:06:05 +0200 Message-Id: <20220808130608.61257-5-pbonzini@redhat.com> In-Reply-To: <20220808130608.61257-1-pbonzini@redhat.com> References: <20220808130608.61257-1-pbonzini@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.11.54.2 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 2.85 on 10.11.54.9 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1659963992962100005 Content-Type: text/plain; charset="utf-8" All supported versions of QEMU include the query-cpus-fast QMP command. In preparation for dropping support for the old "query-cpus" commands, convert the JSON output for x86 tests to the new format, and drop the "halted" field from the expected output as it is not available anymore. The CPU properties were obtained from the query-hotpluggable-cpus output in tests/qemumonitorjsondata. CPU, thread_id, and qom_path are renamed respectively to cpu-index, qom-path and thread-id, while nip and halted are removed. Signed-off-by: Paolo Bonzini --- ...json-cpuinfo-x86-basic-pluggable-cpus.json | 65 ++++++++++++------- ...nitorjson-cpuinfo-x86-basic-pluggable.data | 5 -- ...onitorjson-cpuinfo-x86-node-full-cpus.json | 16 ++--- ...qemumonitorjson-cpuinfo-x86-node-full.data | 2 - tests/qemumonitorjsontest.c | 4 +- 5 files changed, 48 insertions(+), 44 deletions(-) diff --git a/tests/qemumonitorjsondata/qemumonitorjson-cpuinfo-x86-basic-pl= uggable-cpus.json b/tests/qemumonitorjsondata/qemumonitorjson-cpuinfo-x86-b= asic-pluggable-cpus.json index 7a4973195c..c4250dae1d 100644 --- a/tests/qemumonitorjsondata/qemumonitorjson-cpuinfo-x86-basic-pluggable= -cpus.json +++ b/tests/qemumonitorjsondata/qemumonitorjson-cpuinfo-x86-basic-pluggable= -cpus.json @@ -3,47 +3,62 @@ { "arch": "x86", "current": true, - "CPU": 0, - "qom_path": "/machine/unattached/device[0]", - "pc": -2130415978, - "halted": true, - "thread_id": 518291 + "cpu-index": 0, + "props": { + "core-id": 0, + "thread-id": 0, + "socket-id": 0 + }, + "qom-path": "/machine/unattached/device[0]", + "thread-id": 518291 }, { "arch": "x86", "current": false, - "CPU": 1, - "qom_path": "/machine/unattached/device[2]", - "pc": -2130415978, - "halted": true, - "thread_id": 518292 + "cpu-index": 1, + "props": { + "core-id": 1, + "thread-id": 0, + "socket-id": 0 + }, + "qom-path": "/machine/unattached/device[2]", + "thread-id": 518292 }, { "arch": "x86", "current": false, - "CPU": 2, - "qom_path": "/machine/unattached/device[3]", - "pc": -2130415978, - "halted": true, - "thread_id": 518294 + "cpu-index": 2, + "props": { + "core-id": 1, + "thread-id": 1, + "socket-id": 0 + }, + "qom-path": "/machine/unattached/device[3]", + "thread-id": 518294 }, { "arch": "x86", "current": false, - "CPU": 3, - "qom_path": "/machine/unattached/device[4]", - "pc": -2130415978, - "halted": true, - "thread_id": 518295 + "cpu-index": 3, + "props": { + "core-id": 0, + "thread-id": 0, + "socket-id": 1 + }, + "qom-path": "/machine/unattached/device[4]", + "thread-id": 518295 }, { "arch": "x86", "current": false, - "CPU": 4, - "qom_path": "/machine/unattached/device[5]", - "pc": -2130415978, - "halted": true, - "thread_id": 518296 + "cpu-index": 4, + "props": { + "core-id": 0, + "thread-id": 1, + "socket-id": 1 + }, + "qom-path": "/machine/unattached/device[5]", + "thread-id": 518296 } ], "id": "libvirt-22" diff --git a/tests/qemumonitorjsondata/qemumonitorjson-cpuinfo-x86-basic-pl= uggable.data b/tests/qemumonitorjsondata/qemumonitorjson-cpuinfo-x86-basic-= pluggable.data index 9a1788d947..93cefb9dd2 100644 --- a/tests/qemumonitorjsondata/qemumonitorjson-cpuinfo-x86-basic-pluggable= .data +++ b/tests/qemumonitorjsondata/qemumonitorjson-cpuinfo-x86-basic-pluggable= .data @@ -7,7 +7,6 @@ type=3D'qemu64-x86_64-cpu' qom_path=3D'/machine/unattached/device[0]' topology: socket=3D'0' core=3D'0' thread=3D'0' vcpus=3D'1' - halted [vcpu libvirt-id=3D'1'] online=3Dyes hotpluggable=3Dno @@ -17,7 +16,6 @@ type=3D'qemu64-x86_64-cpu' qom_path=3D'/machine/unattached/device[2]' topology: socket=3D'0' core=3D'0' thread=3D'1' vcpus=3D'1' - halted [vcpu libvirt-id=3D'2'] online=3Dyes hotpluggable=3Dno @@ -27,7 +25,6 @@ type=3D'qemu64-x86_64-cpu' qom_path=3D'/machine/unattached/device[3]' topology: socket=3D'0' core=3D'1' thread=3D'0' vcpus=3D'1' - halted [vcpu libvirt-id=3D'3'] online=3Dyes hotpluggable=3Dno @@ -37,7 +34,6 @@ type=3D'qemu64-x86_64-cpu' qom_path=3D'/machine/unattached/device[4]' topology: socket=3D'0' core=3D'1' thread=3D'1' vcpus=3D'1' - halted [vcpu libvirt-id=3D'4'] online=3Dyes hotpluggable=3Dno @@ -47,7 +43,6 @@ type=3D'qemu64-x86_64-cpu' qom_path=3D'/machine/unattached/device[5]' topology: socket=3D'1' core=3D'0' thread=3D'0' vcpus=3D'1' - halted [vcpu libvirt-id=3D'5'] online=3Dno hotpluggable=3Dyes diff --git a/tests/qemumonitorjsondata/qemumonitorjson-cpuinfo-x86-node-ful= l-cpus.json b/tests/qemumonitorjsondata/qemumonitorjson-cpuinfo-x86-node-fu= ll-cpus.json index 6b39efa69c..a384512330 100644 --- a/tests/qemumonitorjsondata/qemumonitorjson-cpuinfo-x86-node-full-cpus.= json +++ b/tests/qemumonitorjsondata/qemumonitorjson-cpuinfo-x86-node-full-cpus.= json @@ -9,11 +9,9 @@ "node-id": 0, "socket-id": 0 }, - "CPU": 0, - "qom_path": "/machine/unattached/device[0]", - "pc": 1048956, - "halted": true, - "thread_id": 2033724 + "cpu-index": 0, + "qom-path": "/machine/unattached/device[0]", + "thread-id": 2033724 }, { "arch": "x86", @@ -24,11 +22,9 @@ "node-id": 1, "socket-id": 0 }, - "CPU": 1, - "qom_path": "/machine/unattached/device[2]", - "pc": 1037318, - "halted": true, - "thread_id": 2033725 + "cpu-index": 1, + "qom-path": "/machine/unattached/device[2]", + "thread-id": 2033725 } ], "id": "libvirt-21" diff --git a/tests/qemumonitorjsondata/qemumonitorjson-cpuinfo-x86-node-ful= l.data b/tests/qemumonitorjsondata/qemumonitorjson-cpuinfo-x86-node-full.da= ta index 0f7dbf1349..070ea084e7 100644 --- a/tests/qemumonitorjsondata/qemumonitorjson-cpuinfo-x86-node-full.data +++ b/tests/qemumonitorjsondata/qemumonitorjson-cpuinfo-x86-node-full.data @@ -7,7 +7,6 @@ type=3D'Broadwell-x86_64-cpu' qom_path=3D'/machine/unattached/device[0]' topology: socket=3D'0' core=3D'0' thread=3D'0' node=3D'0' vcpus=3D'1' - halted [vcpu libvirt-id=3D'1'] online=3Dyes hotpluggable=3Dno @@ -17,7 +16,6 @@ type=3D'Broadwell-x86_64-cpu' qom_path=3D'/machine/unattached/device[2]' topology: socket=3D'0' core=3D'0' thread=3D'1' node=3D'1' vcpus=3D'1' - halted [vcpu libvirt-id=3D'2'] online=3Dno hotpluggable=3Dyes diff --git a/tests/qemumonitorjsontest.c b/tests/qemumonitorjsontest.c index 56620f16a6..0001df7bb3 100644 --- a/tests/qemumonitorjsontest.c +++ b/tests/qemumonitorjsontest.c @@ -3114,9 +3114,9 @@ mymain(void) DO_TEST_CPU_DATA("full"); DO_TEST_CPU_DATA("ecx"); =20 - DO_TEST_CPU_INFO("x86-basic-pluggable", 8); + DO_TEST_CPU_INFO_FAST("x86-basic-pluggable", 8); DO_TEST_CPU_INFO_FAST("x86-full", 11); - DO_TEST_CPU_INFO("x86-node-full", 8); + DO_TEST_CPU_INFO_FAST("x86-node-full", 8); DO_TEST_CPU_INFO_FAST("x86-dies", 16); =20 DO_TEST_CPU_INFO_FAST("ppc64-basic", 24); --=20 2.37.1 From nobody Fri May 17 06:54:21 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=1659964030; cv=none; d=zohomail.com; s=zohoarc; b=DnUaSzmbvctih6Uuk/f0C3P4rgOHL4H2tDEUGi0p5SZ/ZYCSmAfM8wRq+UBm9NztNb1qYCKYdSAp83yIEE0fyLFLzI3DIko+kQFDIKZV+zdU46mQU8dEKlJRzi0Vcvh/LQyoXycwOOkBE92cfoj0g1C0S1pTioIkBpib6rZ15FY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1659964030; h=Content-Type:Content-Transfer-Encoding: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=i2ODuyJiVZYmqqmUmhhro0POH8O38JWKRWqO1esLeWE=; b=SOrsvlH7SH9aLkn02+/Evsi5qdw26WxhHR+qojuI6HEQ03ZmBblszJX2CWPvfhDxgoyUhcJjW1L33H1xJy1JwGjq87UZprZ+ZMe5aMV4TdjUfw2bjkV06+eK544UuV55RxqcruRhBWv0yyBOuKkx8rkaEmWXIm93/nxoLj7yFGA= 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) 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 1659964030012206.80132907346945; Mon, 8 Aug 2022 06:07:10 -0700 (PDT) Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-662-FW9yYW_0Ntq20ZAulW3rxA-1; Mon, 08 Aug 2022 09:06:31 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 0C6E73801170; Mon, 8 Aug 2022 13:06:25 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (unknown [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id ECB2340D2962; Mon, 8 Aug 2022 13:06:24 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id AE72B1946A55; Mon, 8 Aug 2022 13:06:24 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 84C691946A55 for ; Mon, 8 Aug 2022 13:06:23 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 641CE1121315; Mon, 8 Aug 2022 13:06:23 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mimecast06.extmail.prod.ext.rdu2.redhat.com [10.11.55.22]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 60C9F1121314 for ; Mon, 8 Aug 2022 13:06:23 +0000 (UTC) Received: from us-smtp-1.mimecast.com (us-smtp-2.mimecast.com [205.139.110.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 49EE8180F6E2 for ; Mon, 8 Aug 2022 13:06:23 +0000 (UTC) Received: from mail-ed1-f69.google.com (mail-ed1-f69.google.com [209.85.208.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-552-hiLihRWqPIiMtrVsLRjq_g-1; Mon, 08 Aug 2022 09:06:21 -0400 Received: by mail-ed1-f69.google.com with SMTP id h6-20020a05640250c600b0043d9964d2ceso5574223edb.4 for ; Mon, 08 Aug 2022 06:06:21 -0700 (PDT) Received: from goa-sendmail ([2001:b07:6468:f312:5e2c:eb9a:a8b6:fd3e]) by smtp.gmail.com with ESMTPSA id g12-20020a170906348c00b00711edab7622sm4865260ejb.40.2022.08.08.06.06.18 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 08 Aug 2022 06:06:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1659964028; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to: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=i2ODuyJiVZYmqqmUmhhro0POH8O38JWKRWqO1esLeWE=; b=FK8A3HfBbfIK6CShQqF1sVtA84W2DHBcIdWQU1Bowt5eAVnBdaqr8lRxAgzgSpuaf89HU3 9QtwwdjyIphZovZot8YZbkFg35rBY14v8ZAd9xSbaHrmj3QddShelBLmhtAbAWhmGpMB+s T6cye+OIzLKYdpoE9YV+Qv/xXjpAAhw= X-MC-Unique: FW9yYW_0Ntq20ZAulW3rxA-1 X-Original-To: libvir-list@listman.corp.redhat.com X-MC-Unique: hiLihRWqPIiMtrVsLRjq_g-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc; bh=i2ODuyJiVZYmqqmUmhhro0POH8O38JWKRWqO1esLeWE=; b=xvvgXcj6f03eAn3gw+8kFHjo6bl7Z0mxjF9meQqOtZTye1mmVlt177WFYDYqcSOhjc g2LE6ZfvL8MDlDmVkmtt6BzTCMdxVlDHObY5+T59kcLCMzsYF4r4MuktjDbMtfa/at1a IRr5pLmODCR/2ZZSdepL08MsI/iEd1Dklm+pz2HGi2yFyT+ER982e8jf2a1jJ2NjUGAn B6nA+Zx13kwUwFgwqL5eNn/YASl4WuFevu79Wo3aiE5hh+0yxejiN2sF05tkMCobUU9F SgZnR7lnYSEqodZX0xybMsaaguui07DEuF+TpKAgdEMqOCfji2+sLNnEIZIrJOPzJmoC ceqg== X-Gm-Message-State: ACgBeo1q8DSt7fgoV2bHsTp+0dPFjdZcq6Ldr2ia5U1/OpR1C7RY5nlb i+zxRXmQoogZTMUONumuN/bONCrbabcI74bmg+vG8VWAt/dgzOPSZJSYlok9EYkJRsborpIUTiT Z8GCs8VauW/jZBHHj2373CjhC6k3oztrtz+NGT3TyydNAKK6tcFP1oOs2DlaS3q1TQVguGi8= X-Received: by 2002:a17:907:96ac:b0:731:7274:baed with SMTP id hd44-20020a17090796ac00b007317274baedmr1895334ejc.325.1659963980003; Mon, 08 Aug 2022 06:06:20 -0700 (PDT) X-Google-Smtp-Source: AA6agR5ugBCQrBk0hyq0nQKnaxNIARNU1NyYw6Yd4InGXjQ7z5ng4pWdmJiPHcZ8IAxO7ANaFmkEhA== X-Received: by 2002:a17:907:96ac:b0:731:7274:baed with SMTP id hd44-20020a17090796ac00b007317274baedmr1895306ejc.325.1659963979561; Mon, 08 Aug 2022 06:06:19 -0700 (PDT) From: Paolo Bonzini To: libvir-list@redhat.com Subject: [PATCH 5/7] tests: remove query-cpus tests Date: Mon, 8 Aug 2022 15:06:06 +0200 Message-Id: <20220808130608.61257-6-pbonzini@redhat.com> In-Reply-To: <20220808130608.61257-1-pbonzini@redhat.com> References: <20220808130608.61257-1-pbonzini@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.78 on 10.11.54.3 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 2.84 on 10.11.54.2 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1659964031277100001 Content-Type: text/plain; charset="utf-8" All tests now use query-cpus-fast. Since the QEMU driver will lose support for query-cpus soon, go ahead and remove support for testing it. Signed-off-by: Paolo Bonzini --- tests/qemumonitorjsontest.c | 117 +++++------------------------------- 1 file changed, 15 insertions(+), 102 deletions(-) diff --git a/tests/qemumonitorjsontest.c b/tests/qemumonitorjsontest.c index 0001df7bb3..9d8a315103 100644 --- a/tests/qemumonitorjsontest.c +++ b/tests/qemumonitorjsontest.c @@ -1291,7 +1291,6 @@ testQemuMonitorJSONqemuMonitorJSONQueryCPUsEqual(stru= ct qemuMonitorQueryCpusEntr static int testQEMUMonitorJSONqemuMonitorJSONQueryCPUsHelper(qemuMonitorTest *test, struct qemuMonitorQueryC= pusEntry *expect, - bool fast, size_t num) { struct qemuMonitorQueryCpusEntry *cpudata =3D NULL; @@ -1300,7 +1299,7 @@ testQEMUMonitorJSONqemuMonitorJSONQueryCPUsHelper(qem= uMonitorTest *test, int ret =3D -1; =20 if (qemuMonitorJSONQueryCPUs(qemuMonitorTestGetMonitor(test), - &cpudata, &ncpudata, true, fast) < 0) + &cpudata, &ncpudata, true, true) < 0) goto cleanup; =20 if (ncpudata !=3D num) { @@ -1326,72 +1325,6 @@ testQEMUMonitorJSONqemuMonitorJSONQueryCPUsHelper(qe= muMonitorTest *test, } =20 =20 -static int -testQemuMonitorJSONqemuMonitorJSONQueryCPUs(const void *opaque) -{ - const testGenericData *data =3D opaque; - virDomainXMLOption *xmlopt =3D data->xmlopt; - struct qemuMonitorQueryCpusEntry expect_slow[] =3D { - {0, 17622, (char *) "/machine/unattached/device[0]", true}, - {1, 17624, (char *) "/machine/unattached/device[1]", true}, - {2, 17626, (char *) "/machine/unattached/device[2]", true}, - {3, 17628, NULL, true}, - }; - g_autoptr(qemuMonitorTest) test =3D NULL; - - if (!(test =3D qemuMonitorTestNewSchema(xmlopt, data->schema))) - return -1; - - qemuMonitorTestSkipDeprecatedValidation(test, true); - - if (qemuMonitorTestAddItem(test, "query-cpus", - "{" - " \"return\": [" - " {" - " \"current\": true," - " \"CPU\": 0," - " \"qom_path\": \"/machine/unatt= ached/device[0]\"," - " \"pc\": -2130530478," - " \"halted\": true," - " \"thread_id\": 17622" - " }," - " {" - " \"current\": false," - " \"CPU\": 1," - " \"qom_path\": \"/machine/unatt= ached/device[1]\"," - " \"pc\": -2130530478," - " \"halted\": true," - " \"thread_id\": 17624" - " }," - " {" - " \"current\": false," - " \"CPU\": 2," - " \"qom_path\": \"/machine/unatt= ached/device[2]\"," - " \"pc\": -2130530478," - " \"halted\": true," - " \"thread_id\": 17626" - " }," - " {" - " \"current\": false," - " \"CPU\": 3," - " \"pc\": -2130530478," - " \"halted\": true," - " \"thread_id\": 17628" - " }" - " ]," - " \"id\": \"libvirt-7\"" - "}") < 0) - return -1; - - /* query-cpus */ - if (testQEMUMonitorJSONqemuMonitorJSONQueryCPUsHelper(test, expect_slo= w, - false, 4)) - return -1; - - return 0; -} - - static int testQemuMonitorJSONqemuMonitorJSONQueryCPUsFast(const void *opaque) { @@ -1425,8 +1358,7 @@ testQemuMonitorJSONqemuMonitorJSONQueryCPUsFast(const= void *opaque) return -1; =20 /* query-cpus-fast */ - if (testQEMUMonitorJSONqemuMonitorJSONQueryCPUsHelper(test, expect_fas= t, - true, 2)) + if (testQEMUMonitorJSONqemuMonitorJSONQueryCPUsHelper(test, expect_fas= t, 2)) return -1; =20 return 0; @@ -2337,7 +2269,6 @@ struct testCPUInfoData { const char *name; size_t maxvcpus; virDomainXMLOption *xmlopt; - bool fast; GHashTable *schema; }; =20 @@ -2416,7 +2347,6 @@ testQemuMonitorCPUInfo(const void *opaque) g_autofree char *queryCpusStr =3D NULL; g_autofree char *queryHotpluggableStr =3D NULL; g_autofree char *actual =3D NULL; - const char *queryCpusFunction; qemuMonitorCPUInfo *vcpus =3D NULL; int rc; int ret =3D -1; @@ -2442,14 +2372,7 @@ testQemuMonitorCPUInfo(const void *opaque) queryHotpluggableStr) < 0) goto cleanup; =20 - if (data->fast) { - queryCpusFunction =3D "query-cpus-fast"; - } else { - queryCpusFunction =3D "query-cpus"; - qemuMonitorTestSkipDeprecatedValidation(test, true); - } - - if (qemuMonitorTestAddItem(test, queryCpusFunction, queryCpusStr) < 0) + if (qemuMonitorTestAddItem(test, "query-cpus-fast", queryCpusStr) < 0) goto cleanup; =20 vm =3D qemuMonitorTestGetDomainObj(test); @@ -2457,7 +2380,7 @@ testQemuMonitorCPUInfo(const void *opaque) goto cleanup; =20 rc =3D qemuMonitorGetCPUInfo(qemuMonitorTestGetMonitor(test), - &vcpus, data->maxvcpus, true, data->fast); + &vcpus, data->maxvcpus, true, true); =20 if (rc < 0) goto cleanup; @@ -3016,22 +2939,13 @@ mymain(void) =20 #define DO_TEST_CPU_INFO(name, maxvcpus) \ do { \ - struct testCPUInfoData data =3D {name, maxvcpus, driver.xmlopt, fa= lse, \ + struct testCPUInfoData data =3D {name, maxvcpus, driver.xmlopt, \ qapiData.schema}; \ if (virTestRun("GetCPUInfo(" name ")", testQemuMonitorCPUInfo, \ &data) < 0) \ ret =3D -1; \ } while (0) =20 -#define DO_TEST_CPU_INFO_FAST(name, maxvcpus) \ - do { \ - struct testCPUInfoData data =3D {name, maxvcpus, driver.xmlopt, tr= ue, \ - qapiData.schema }; \ - if (virTestRun("GetCPUInfo(" name ")", testQemuMonitorCPUInfo, \ - &data) < 0) \ - ret =3D -1; \ - } while (0) - DO_TEST(GetStatus); DO_TEST(GetVersion); DO_TEST(GetMachines); @@ -3103,7 +3017,6 @@ mymain(void) DO_TEST(qemuMonitorJSONSetBlockIoThrottle); DO_TEST(qemuMonitorJSONGetTargetArch); DO_TEST(qemuMonitorJSONGetMigrationCapabilities); - DO_TEST(qemuMonitorJSONQueryCPUs); DO_TEST(qemuMonitorJSONQueryCPUsFast); DO_TEST(qemuMonitorJSONSendKey); DO_TEST(qemuMonitorJSONGetDumpGuestMemoryCapability); @@ -3114,18 +3027,18 @@ mymain(void) DO_TEST_CPU_DATA("full"); DO_TEST_CPU_DATA("ecx"); =20 - DO_TEST_CPU_INFO_FAST("x86-basic-pluggable", 8); - DO_TEST_CPU_INFO_FAST("x86-full", 11); - DO_TEST_CPU_INFO_FAST("x86-node-full", 8); - DO_TEST_CPU_INFO_FAST("x86-dies", 16); + DO_TEST_CPU_INFO("x86-basic-pluggable", 8); + DO_TEST_CPU_INFO("x86-full", 11); + DO_TEST_CPU_INFO("x86-node-full", 8); + DO_TEST_CPU_INFO("x86-dies", 16); =20 - DO_TEST_CPU_INFO_FAST("ppc64-basic", 24); - DO_TEST_CPU_INFO_FAST("ppc64-hotplug-1", 24); - DO_TEST_CPU_INFO_FAST("ppc64-hotplug-2", 24); - DO_TEST_CPU_INFO_FAST("ppc64-hotplug-4", 24); - DO_TEST_CPU_INFO_FAST("ppc64-no-threads", 16); + DO_TEST_CPU_INFO("ppc64-basic", 24); + DO_TEST_CPU_INFO("ppc64-hotplug-1", 24); + DO_TEST_CPU_INFO("ppc64-hotplug-2", 24); + DO_TEST_CPU_INFO("ppc64-hotplug-4", 24); + DO_TEST_CPU_INFO("ppc64-no-threads", 16); =20 - DO_TEST_CPU_INFO_FAST("s390", 2); + DO_TEST_CPU_INFO("s390", 2); =20 #define DO_TEST_BLOCK_NODE_DETECT(testname) \ do { \ --=20 2.37.1 From nobody Fri May 17 06:54:21 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=1659963995; cv=none; d=zohomail.com; s=zohoarc; b=T9nIWqSeKxqxHxaBU8Ovyo/hbEsWr7wBlhOIY2Kfq6TxR6Naa06CXBC3fIqYWY42BuyOu0hTIc8McJz8FiP3j28Pqb8hal21LrY50fVwMToCac9wzJ0cDhEo02p/YTXXow5uFFp8KjPJLhU/OhXt/9vPDLfxVZtdaHwJJEYdyN8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1659963995; h=Content-Type:Content-Transfer-Encoding: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=9iZHCIAocWn3njw6QlmsFrAB0yC3FMQpSAXvXB4W048=; b=ivESbNRJILTZ1EfeNpADjwtu+sChL4/iXOyeOqSCe4s7ZNQp7t/0pf4xWCAvtZVnIzOPXKMfW7CH+p1dnTiF4vHZ7mUAjLKMn8z8E4oopy3V20J61aiVIiAFlo1GhDjVBWq0fLTdOPACKKqQqZWiByThAehOtvPa63+UbykCk4k= 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) 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 1659963995324670.7378733475741; Mon, 8 Aug 2022 06:06:35 -0700 (PDT) Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-50-PePu-8e9NJW38PXuAAcDhw-1; Mon, 08 Aug 2022 09:06:31 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id F3E0985A58F; Mon, 8 Aug 2022 13:06:25 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (unknown [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id DDD234047D22; Mon, 8 Aug 2022 13:06:25 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id AACC81946A4F; Mon, 8 Aug 2022 13:06:25 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 270531946A59 for ; Mon, 8 Aug 2022 13:06:25 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 0BD4A4010D27; Mon, 8 Aug 2022 13:06:25 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mimecast10.extmail.prod.ext.rdu2.redhat.com [10.11.55.26]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 083BC4047D22 for ; Mon, 8 Aug 2022 13:06:25 +0000 (UTC) Received: from us-smtp-1.mimecast.com (us-smtp-2.mimecast.com [207.211.31.81]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id DE0D51C1976D for ; Mon, 8 Aug 2022 13:06:24 +0000 (UTC) Received: from mail-ed1-f71.google.com (mail-ed1-f71.google.com [209.85.208.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-137-jXkVGxQaNv-EoR7FcEBvnA-1; Mon, 08 Aug 2022 09:06:23 -0400 Received: by mail-ed1-f71.google.com with SMTP id q18-20020a056402519200b0043dd2ff50feso5584191edd.9 for ; Mon, 08 Aug 2022 06:06:23 -0700 (PDT) Received: from goa-sendmail ([2001:b07:6468:f312:5e2c:eb9a:a8b6:fd3e]) by smtp.gmail.com with ESMTPSA id 11-20020a170906308b00b006fec4ee28d0sm4968761ejv.189.2022.08.08.06.06.20 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 08 Aug 2022 06:06:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1659963994; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to: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=9iZHCIAocWn3njw6QlmsFrAB0yC3FMQpSAXvXB4W048=; b=gjmxXO2dUT7PM+sTE+aVTEqNWZ8otMzU0tAZ6zjMUurNdinH+JiFAk97M+veTmXyAluVj3 qksYWFOjtb/d5F5v1aSMbcN+9tt/shLMouIMN6h1rYlkLqh6VDmksNQNBffdggN4N3YYdA IhQi+1RGwblH5v5XVP1Dbk1ngaQUxTA= X-MC-Unique: PePu-8e9NJW38PXuAAcDhw-1 X-Original-To: libvir-list@listman.corp.redhat.com X-MC-Unique: jXkVGxQaNv-EoR7FcEBvnA-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc; bh=9iZHCIAocWn3njw6QlmsFrAB0yC3FMQpSAXvXB4W048=; b=KGoOBNXMdGHVygoTiEGLRG1oshgei8MFkgfq/HjEltE8DXPMZDm/ahIDD6cGSHGo38 piws3w9IuOM8hCV5DN6f6wYYzwyDEoibDpo1Wm0PTjCT9mUZWoNQixPWedLGxZwE3ldG gOt6m7DdFkn0AmgmOFx2rJL1FQImAvkUBHfqSNu1zblkC0cNuETO0Hn0MeC5Mdu/woov 0J4SF7sdjPi/WBBXya8fMRIFgYAR3cp1j1Q/tG5+VFPr96XX9TdbRNNsCGErR8KBNkoC knXm3plj0hi6B5G2yyPRT5Q5pvjmqoM22IO+SeFIPWZSeaAK/cF/3s4rCBdh7IJhDdRa d0VQ== X-Gm-Message-State: ACgBeo3n91q/4aK33rwcYJA7m9IaM1SrLDfa3SABC/uSEBkgRjJwmaHD FWzfDzKkOcV+V6vUsvq6dX+lFnI1tCwha1hgwsBeEIxEda3hvQ0jtCv6aICvvsfKEIhS2QF8rys r3r6p8kbhWm66UWidOT32A5kAJusChKyAST+AnLrFcXHar0UJcjlsi5kBZxDNwQBNtBoJgic= X-Received: by 2002:a05:6402:3552:b0:43d:a57d:22e9 with SMTP id f18-20020a056402355200b0043da57d22e9mr17676214edd.119.1659963981852; Mon, 08 Aug 2022 06:06:21 -0700 (PDT) X-Google-Smtp-Source: AA6agR4rU1bbpKCqgE9qM4STUS4RJ3KCi5uqU7I849eJxkFrH+hV1CYx0MLK57hXt3urVyg5QWAXYA== X-Received: by 2002:a05:6402:3552:b0:43d:a57d:22e9 with SMTP id f18-20020a056402355200b0043da57d22e9mr17676181edd.119.1659963981368; Mon, 08 Aug 2022 06:06:21 -0700 (PDT) From: Paolo Bonzini To: libvir-list@redhat.com Subject: [PATCH 6/7] qemu: remove support for query-cpus Date: Mon, 8 Aug 2022 15:06:07 +0200 Message-Id: <20220808130608.61257-7-pbonzini@redhat.com> In-Reply-To: <20220808130608.61257-1-pbonzini@redhat.com> References: <20220808130608.61257-1-pbonzini@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.11.54.2 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 2.84 on 10.11.54.2 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1659963997061100002 Content-Type: text/plain; charset="utf-8" The query-cpus-fast command was introduced in 2.12, therefore query-cpus is never used on supported versions of QEMU. Remove the logic to parse its output, as well as the parameters to choose between the two commands. Signed-off-by: Paolo Bonzini --- src/qemu/qemu_domain.c | 22 ++++-------------- src/qemu/qemu_monitor.c | 29 ++++++++++-------------- src/qemu/qemu_monitor.h | 6 ++--- src/qemu/qemu_monitor_json.c | 44 +++++++----------------------------- src/qemu/qemu_monitor_json.h | 3 +-- tests/qemumonitorjsontest.c | 4 ++-- 6 files changed, 30 insertions(+), 78 deletions(-) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 69e0c9e217..bb25266959 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -9618,22 +9618,18 @@ qemuDomainRefreshVcpuInfo(virQEMUDriver *driver, size_t maxvcpus =3D virDomainDefGetVcpusMax(vm->def); size_t i, j; bool hotplug; - bool fast; bool validTIDs =3D true; int rc; int ret =3D -1; =20 hotplug =3D qemuDomainSupportsNewVcpuHotplug(vm); - fast =3D virQEMUCapsGet(QEMU_DOMAIN_PRIVATE(vm)->qemuCaps, - QEMU_CAPS_QUERY_CPUS_FAST); - - VIR_DEBUG("Maxvcpus %zu hotplug %d fast query %d", maxvcpus, hotplug, = fast); + VIR_DEBUG("Maxvcpus %zu hotplug %d", maxvcpus, hotplug); =20 if (qemuDomainObjEnterMonitorAsync(driver, vm, asyncJob) < 0) return -1; =20 rc =3D qemuMonitorGetCPUInfo(qemuDomainGetMonitor(vm), &info, maxvcpus, - hotplug, fast); + hotplug); =20 qemuDomainObjExitMonitor(vm); =20 @@ -9641,7 +9637,7 @@ qemuDomainRefreshVcpuInfo(virQEMUDriver *driver, goto cleanup; =20 /* - * The query-cpus[-fast] commands return information + * The query-cpus-fast commands return information * about the vCPUs, including the OS level PID that * is executing the vCPU. * @@ -9766,7 +9762,6 @@ qemuDomainRefreshVcpuHalted(virQEMUDriver *driver, size_t maxvcpus =3D virDomainDefGetVcpusMax(vm->def); g_autoptr(virBitmap) haltedmap =3D NULL; size_t i; - bool fast; =20 /* Not supported currently for TCG, see qemuDomainRefreshVcpuInfo */ if (vm->def->virtType =3D=3D VIR_DOMAIN_VIRT_QEMU) @@ -9774,21 +9769,14 @@ qemuDomainRefreshVcpuHalted(virQEMUDriver *driver, =20 /* The halted state is interesting only on s390(x). On other platforms * the data would be stale at the time when it would be used. - * Calling qemuMonitorGetCpuHalted() can adversely affect the running - * VM's performance unless QEMU supports query-cpus-fast. */ - if (!ARCH_IS_S390(vm->def->os.arch) || - !virQEMUCapsGet(QEMU_DOMAIN_PRIVATE(vm)->qemuCaps, - QEMU_CAPS_QUERY_CPUS_FAST)) + if (!ARCH_IS_S390(vm->def->os.arch)) return 0; =20 if (qemuDomainObjEnterMonitorAsync(driver, vm, asyncJob) < 0) return -1; =20 - fast =3D virQEMUCapsGet(QEMU_DOMAIN_PRIVATE(vm)->qemuCaps, - QEMU_CAPS_QUERY_CPUS_FAST); - haltedmap =3D qemuMonitorGetCpuHalted(qemuDomainGetMonitor(vm), maxvcp= us, - fast); + haltedmap =3D qemuMonitorGetCpuHalted(qemuDomainGetMonitor(vm), maxvcp= us); qemuDomainObjExitMonitor(vm); =20 if (!haltedmap) diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c index 0c0b07d4a5..9d20acdc11 100644 --- a/src/qemu/qemu_monitor.c +++ b/src/qemu/qemu_monitor.c @@ -1565,16 +1565,16 @@ qemuMonitorGetCPUInfoLegacy(struct qemuMonitorQuery= CpusEntry *cpuentries, * * This function stitches together data retrieved via query-hotpluggable-c= pus * which returns entities on the hotpluggable level (which may describe mo= re - * than one guest logical vcpu) with the output of query-cpus (or - * query-cpus-fast), having an entry per enabled guest logical vcpu. + * than one guest logical vcpu) with the output of query-cpus-fast, + * having an entry per enabled guest logical vcpu. * * query-hotpluggable-cpus conveys following information: * - topology information and number of logical vcpus this entry creates * - device type name of the entry that needs to be used when hotplugging * - qom path in qemu which can be used to map the entry against - * query-cpus[-fast] + * query-cpus-fast * - * query-cpus[-fast] conveys following information: + * query-cpus-fast conveys following information: * - thread id of a given guest logical vcpu * - order in which the vcpus were inserted * - qom path to allow mapping the two together @@ -1609,7 +1609,7 @@ qemuMonitorGetCPUInfoHotplug(struct qemuMonitorQueryH= otpluggableCpusEntry *hotpl for (i =3D 0; i < nhotplugvcpus; i++) totalvcpus +=3D hotplugvcpus[i].vcpus; =20 - /* trim '/thread...' suffix from the data returned by query-cpus[-fast= ] */ + /* trim '/thread...' suffix from the data returned by query-cpus-fast = */ for (i =3D 0; i < ncpuentries; i++) { if (cpuentries[i].qom_path && (tmp =3D strstr(cpuentries[i].qom_path, "/thread"))) @@ -1622,7 +1622,7 @@ qemuMonitorGetCPUInfoHotplug(struct qemuMonitorQueryH= otpluggableCpusEntry *hotpl } =20 /* Note the order in which the hotpluggable entities are inserted by - * matching them to the query-cpus[-fast] entries */ + * matching them to the query-cpus-fast entries */ for (i =3D 0; i < ncpuentries; i++) { for (j =3D 0; j < nhotplugvcpus; j++) { if (!cpuentries[i].qom_path || @@ -1679,7 +1679,7 @@ qemuMonitorGetCPUInfoHotplug(struct qemuMonitorQueryH= otpluggableCpusEntry *hotpl } =20 if (anyvcpu =3D=3D maxvcpus) { - VIR_DEBUG("too many query-cpus[-fast] entries for a given " + VIR_DEBUG("too many query-cpus-fast entries for a given " "query-hotpluggable-cpus entry"); return -1; } @@ -1707,7 +1707,6 @@ qemuMonitorGetCPUInfoHotplug(struct qemuMonitorQueryH= otpluggableCpusEntry *hotpl * @vcpus: pointer filled by array of qemuMonitorCPUInfo structures * @maxvcpus: total possible number of vcpus * @hotplug: query data relevant for hotplug support - * @fast: use QMP query-cpus-fast if supported * * Detects VCPU information. If qemu doesn't support or fails reporting * information this function will return success as other parts of libvirt @@ -1720,8 +1719,7 @@ int qemuMonitorGetCPUInfo(qemuMonitor *mon, qemuMonitorCPUInfo **vcpus, size_t maxvcpus, - bool hotplug, - bool fast) + bool hotplug) { struct qemuMonitorQueryHotpluggableCpusEntry *hotplugcpus =3D NULL; size_t nhotplugcpus =3D 0; @@ -1742,8 +1740,7 @@ qemuMonitorGetCPUInfo(qemuMonitor *mon, (qemuMonitorJSONGetHotpluggableCPUs(mon, &hotplugcpus, &nhotplugcp= us)) < 0) goto cleanup; =20 - rc =3D qemuMonitorJSONQueryCPUs(mon, &cpuentries, &ncpuentries, hotplu= g, - fast); + rc =3D qemuMonitorJSONQueryCPUs(mon, &cpuentries, &ncpuentries, hotplu= g); =20 if (rc < 0) { if (!hotplug && rc =3D=3D -2) { @@ -1779,12 +1776,11 @@ qemuMonitorGetCPUInfo(qemuMonitor *mon, * qemuMonitorGetCpuHalted: * * Returns a bitmap of vcpu id's that are halted. The id's correspond to t= he - * 'CPU' field as reported by query-cpus[-fast]'. + * 'CPU' field as reported by query-cpus-fast'. */ virBitmap * qemuMonitorGetCpuHalted(qemuMonitor *mon, - size_t maxvcpus, - bool fast) + size_t maxvcpus) { struct qemuMonitorQueryCpusEntry *cpuentries =3D NULL; size_t ncpuentries =3D 0; @@ -1794,8 +1790,7 @@ qemuMonitorGetCpuHalted(qemuMonitor *mon, =20 QEMU_CHECK_MONITOR_NULL(mon); =20 - rc =3D qemuMonitorJSONQueryCPUs(mon, &cpuentries, &ncpuentries, false, - fast); + rc =3D qemuMonitorJSONQueryCPUs(mon, &cpuentries, &ncpuentries, false); =20 if (rc < 0) goto cleanup; diff --git a/src/qemu/qemu_monitor.h b/src/qemu/qemu_monitor.h index 742bfd4cdc..49adad85dd 100644 --- a/src/qemu/qemu_monitor.h +++ b/src/qemu/qemu_monitor.h @@ -644,11 +644,9 @@ void qemuMonitorCPUInfoFree(qemuMonitorCPUInfo *list, int qemuMonitorGetCPUInfo(qemuMonitor *mon, qemuMonitorCPUInfo **vcpus, size_t maxvcpus, - bool hotplug, - bool fast); + bool hotplug); virBitmap *qemuMonitorGetCpuHalted(qemuMonitor *mon, - size_t maxvcpus, - bool fast); + size_t maxvcpus); =20 int qemuMonitorGetBalloonInfo(qemuMonitor *mon, unsigned long long *currmem); diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c index 2469165728..dd352d6296 100644 --- a/src/qemu/qemu_monitor_json.c +++ b/src/qemu/qemu_monitor_json.c @@ -1678,21 +1678,8 @@ qemuMonitorJSONExtractCPUS390Info(virJSONValue *json= cpu, * @data: JSON response data * @entries: filled with detected cpu entries on success * @nentries: number of entries returned - * @fast: true if this is a response from query-cpus-fast * * The JSON response @data will have the following format - * in case @fast =3D=3D false - * [{ "arch": "x86", - * "current": true, - * "CPU": 0, - * "qom_path": "/machine/unattached/device[0]", - * "pc": -2130415978, - * "halted": true, - * "thread_id": 2631237, - * ...}, - * {...} - * ] - * and for @fast =3D=3D true * [{ "arch": "x86", * "cpu-index": 0, * "props": { @@ -1724,8 +1711,7 @@ qemuMonitorJSONExtractCPUS390Info(virJSONValue *jsonc= pu, static int qemuMonitorJSONExtractCPUInfo(virJSONValue *data, struct qemuMonitorQueryCpusEntry **entries, - size_t *nentries, - bool fast) + size_t *nentries) { const char *arch =3D NULL; struct qemuMonitorQueryCpusEntry *cpus =3D NULL; @@ -1753,19 +1739,11 @@ qemuMonitorJSONExtractCPUInfo(virJSONValue *data, * non-fatal, simply returning no data. * The return data of query-cpus-fast has different field names */ - if (fast) { - if (!(arch =3D virJSONValueObjectGetString(entry, "target"))) - arch =3D virJSONValueObjectGetString(entry, "arch"); - ignore_value(virJSONValueObjectGetNumberInt(entry, "cpu-index"= , &cpuid)); - ignore_value(virJSONValueObjectGetNumberInt(entry, "thread-id"= , &thread)); - qom_path =3D virJSONValueObjectGetString(entry, "qom-path"); - } else { + if (!(arch =3D virJSONValueObjectGetString(entry, "target"))) arch =3D virJSONValueObjectGetString(entry, "arch"); - ignore_value(virJSONValueObjectGetNumberInt(entry, "CPU", &cpu= id)); - ignore_value(virJSONValueObjectGetNumberInt(entry, "thread_id"= , &thread)); - ignore_value(virJSONValueObjectGetBoolean(entry, "halted", &ha= lted)); - qom_path =3D virJSONValueObjectGetString(entry, "qom_path"); - } + ignore_value(virJSONValueObjectGetNumberInt(entry, "cpu-index", &c= puid)); + ignore_value(virJSONValueObjectGetNumberInt(entry, "thread-id", &t= hread)); + qom_path =3D virJSONValueObjectGetString(entry, "qom-path"); =20 cpus[i].qemu_id =3D cpuid; cpus[i].tid =3D thread; @@ -1794,7 +1772,6 @@ qemuMonitorJSONExtractCPUInfo(virJSONValue *data, * @entries: filled with detected entries on success * @nentries: number of entries returned * @force: force exit on error - * @fast: use query-cpus-fast * * Queries qemu for cpu-related information. Failure to execute the comman= d or * extract results does not produce an error as libvirt can continue witho= ut @@ -1807,18 +1784,13 @@ int qemuMonitorJSONQueryCPUs(qemuMonitor *mon, struct qemuMonitorQueryCpusEntry **entries, size_t *nentries, - bool force, - bool fast) + bool force) { g_autoptr(virJSONValue) cmd =3D NULL; g_autoptr(virJSONValue) reply =3D NULL; virJSONValue *data; =20 - if (fast) - cmd =3D qemuMonitorJSONMakeCommand("query-cpus-fast", NULL); - else - cmd =3D qemuMonitorJSONMakeCommand("query-cpus", NULL); - + cmd =3D qemuMonitorJSONMakeCommand("query-cpus-fast", NULL); if (!cmd) return -1; =20 @@ -1831,7 +1803,7 @@ qemuMonitorJSONQueryCPUs(qemuMonitor *mon, if (!(data =3D virJSONValueObjectGetArray(reply, "return"))) return -2; =20 - return qemuMonitorJSONExtractCPUInfo(data, entries, nentries, fast); + return qemuMonitorJSONExtractCPUInfo(data, entries, nentries); } =20 =20 diff --git a/src/qemu/qemu_monitor_json.h b/src/qemu/qemu_monitor_json.h index e4c65e250e..924238eeec 100644 --- a/src/qemu/qemu_monitor_json.h +++ b/src/qemu/qemu_monitor_json.h @@ -66,8 +66,7 @@ int qemuMonitorJSONQueryCPUs(qemuMonitor *mon, struct qemuMonitorQueryCpusEntry **entries, size_t *nentries, - bool force, - bool fast); + bool force); int qemuMonitorJSONUpdateVideoMemorySize(qemuMonitor *mon, virDomainVideoDef *video, diff --git a/tests/qemumonitorjsontest.c b/tests/qemumonitorjsontest.c index 9d8a315103..e0dd00dc7a 100644 --- a/tests/qemumonitorjsontest.c +++ b/tests/qemumonitorjsontest.c @@ -1299,7 +1299,7 @@ testQEMUMonitorJSONqemuMonitorJSONQueryCPUsHelper(qem= uMonitorTest *test, int ret =3D -1; =20 if (qemuMonitorJSONQueryCPUs(qemuMonitorTestGetMonitor(test), - &cpudata, &ncpudata, true, true) < 0) + &cpudata, &ncpudata, true) < 0) goto cleanup; =20 if (ncpudata !=3D num) { @@ -2380,7 +2380,7 @@ testQemuMonitorCPUInfo(const void *opaque) goto cleanup; =20 rc =3D qemuMonitorGetCPUInfo(qemuMonitorTestGetMonitor(test), - &vcpus, data->maxvcpus, true, true); + &vcpus, data->maxvcpus, true); =20 if (rc < 0) goto cleanup; --=20 2.37.1 From nobody Fri May 17 06:54:21 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) client-ip=170.10.129.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.129.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=1659963995; cv=none; d=zohomail.com; s=zohoarc; b=jq2vn2ddaIzzjBYAYBLUWF/qBKgYy3eDY4MfKYz+rbZOLhTNsXjoiMufUUNPxvuIf1hTGk6IggIanPAoLltYUHlCSxxKlMD5l1lSRIVoRXnV4nRezosmzNBrfDyI4A/ZOb8q1L9QT9bEdgf1WnuKOwC3W9WUP6FzXcEoyxE37P0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1659963995; h=Content-Type:Content-Transfer-Encoding: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=bC9iSQK7RVMAZskqzG3rKk/oA/c+BL8lM0VvQLNWyMk=; b=HERmLsXXoMhi3C1k1ih07LfMuAv3p0qfoErxJ2WaHYVF6PNX8mP1TxpSltS35IyB06QDVfGKGmIYuzwWiKsQNz9IiiSvU9uXO6h6Q0dbnUZLdTOrtbQveiuNNcBkcn1TyUL3WSApS3dDU/O+2Y5T6fMjkT2o7CKgpQ046LShOv0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mx.zohomail.com with SMTPS id 165996399560170.65190164269052; Mon, 8 Aug 2022 06:06:35 -0700 (PDT) Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-397-JEiaolCuNzikoAC_6FZI1w-1; Mon, 08 Aug 2022 09:06:32 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 638332802282; Mon, 8 Aug 2022 13:06:28 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (unknown [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 504111121314; Mon, 8 Aug 2022 13:06:28 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 178961946A4F; Mon, 8 Aug 2022 13:06:28 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.rdu2.redhat.com [10.11.54.8]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id BC3661946A49 for ; Mon, 8 Aug 2022 13:06:26 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 95E2AC15BAA; Mon, 8 Aug 2022 13:06:26 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mimecast08.extmail.prod.ext.rdu2.redhat.com [10.11.55.24]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 90F8AC15BA9 for ; Mon, 8 Aug 2022 13:06:26 +0000 (UTC) Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [207.211.31.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 776723800C42 for ; Mon, 8 Aug 2022 13:06:26 +0000 (UTC) Received: from mail-ej1-f69.google.com (mail-ej1-f69.google.com [209.85.218.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-423-1rZN1gq1PwmqHzKg_lHTSg-1; Mon, 08 Aug 2022 09:06:24 -0400 Received: by mail-ej1-f69.google.com with SMTP id gn23-20020a1709070d1700b0073094d0e02cso2399708ejc.20 for ; Mon, 08 Aug 2022 06:06:24 -0700 (PDT) Received: from goa-sendmail ([2001:b07:6468:f312:5e2c:eb9a:a8b6:fd3e]) by smtp.gmail.com with ESMTPSA id os23-20020a170906af7700b0072ab06bf296sm4940357ejb.23.2022.08.08.06.06.21 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 08 Aug 2022 06:06:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1659963994; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to: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=bC9iSQK7RVMAZskqzG3rKk/oA/c+BL8lM0VvQLNWyMk=; b=FdYegHEWrhnEZp+B7mhhyN/8OSaUaz4Yhz3om//Hfm0n/QfGREQZgdZwp/r7FS5oUhJcd/ FAqAYqdXKI8twIIQRZBtvBHLfGSBta2IpK3hnSpOJp3f1zrDIv2EmQ/ioorleWKKOfsYRs o4JquoLbaB6yMn4ArdDP6F+q4eDNWdc= X-MC-Unique: JEiaolCuNzikoAC_6FZI1w-1 X-Original-To: libvir-list@listman.corp.redhat.com X-MC-Unique: 1rZN1gq1PwmqHzKg_lHTSg-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc; bh=bC9iSQK7RVMAZskqzG3rKk/oA/c+BL8lM0VvQLNWyMk=; b=mvjPhj8gAZE3HB1vyj1hxrJ25HR3KWEwyOSI/ZOHz9v7esGeuPWGC7PiQ+yiQx1Nr/ kPfNJNyyLbn8PzQTaKJuxtWmao8fCrnj4BG9IpLVZ1J/VVnYrr1TW/ifx2gt1A8jj0qW O4PUJ7p3B/EAANYkcfgf/xkw8tfRveiCVYim6cDTMkkYDssevKyEeh6HK5/GtjU1Phi2 bwX49aiL9vMmFQ5f0FTitrLW5eXc2cDACxcFhZyN9cPgHRrnI1NQYAnqS5+whD1qzzvh tYVy7wcqgz8olRdd31wDMh3+lwZOFf66zNDK0SPUWPFjMsYNplfzvPR/GeBfqpYMErhE SnRQ== X-Gm-Message-State: ACgBeo2qolHfByWUnVp+cv/TNYP3YxH2iR+rt55VA76Z0pIyLv0ojZKC H93IHN4AkBjLh0jg0Tt7lm/k5HCptEi0eZ3ipObHDtulOp1kjMDa62vvBQYGMFTONJctEgh5gAg 7ZuDW9JRMXCkEEXTJAVSojTGix/o7UpVbWNgc80luHXHIhxMw7j1kBdZR5ujW4cDj1PFa9yo= X-Received: by 2002:a17:907:7d8e:b0:730:8bd9:6840 with SMTP id oz14-20020a1709077d8e00b007308bd96840mr13080330ejc.370.1659963983498; Mon, 08 Aug 2022 06:06:23 -0700 (PDT) X-Google-Smtp-Source: AA6agR4XtFXt/Zx++tLhW/PRSHStArCJl09H8S9CG4nx0ol1wfrzQ7dNQl+gVQgyalEczTqjU1e53A== X-Received: by 2002:a17:907:7d8e:b0:730:8bd9:6840 with SMTP id oz14-20020a1709077d8e00b007308bd96840mr13080315ejc.370.1659963983183; Mon, 08 Aug 2022 06:06:23 -0700 (PDT) From: Paolo Bonzini To: libvir-list@redhat.com Subject: [PATCH 7/7] qemu: deprecate query-cpus-fast capability Date: Mon, 8 Aug 2022 15:06:08 +0200 Message-Id: <20220808130608.61257-8-pbonzini@redhat.com> In-Reply-To: <20220808130608.61257-1-pbonzini@redhat.com> References: <20220808130608.61257-1-pbonzini@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.85 on 10.11.54.8 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 2.78 on 10.11.54.3 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1659963997023100001 Content-Type: text/plain; charset="utf-8" All supported versions of QEMU have the command. Signed-off-by: Paolo Bonzini --- src/qemu/qemu_capabilities.c | 4 ++-- src/qemu/qemu_capabilities.h | 2 +- tests/qemuhotplugtest.c | 2 -- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index c2c55f4800..1eb006e3ef 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -468,7 +468,7 @@ VIR_ENUM_IMPL(virQEMUCaps, "qcow2-luks", /* QEMU_CAPS_QCOW2_LUKS */ "pcie-pci-bridge", /* QEMU_CAPS_DEVICE_PCIE_PCI_BRIDGE */ "seccomp-blacklist", /* X_QEMU_CAPS_SECCOMP_BLACKLIST */ - "query-cpus-fast", /* QEMU_CAPS_QUERY_CPUS_FAST */ + "query-cpus-fast", /* X_QEMU_CAPS_QUERY_CPUS_FAST */ "disk-write-cache", /* QEMU_CAPS_DISK_WRITE_CACHE */ =20 /* 290 */ @@ -1212,7 +1212,7 @@ struct virQEMUCapsStringFlags virQEMUCapsCommands[] = =3D { { "query-cpu-model-expansion", QEMU_CAPS_QUERY_CPU_MODEL_EXPANSION }, { "query-cpu-definitions", QEMU_CAPS_QUERY_CPU_DEFINITIONS }, { "query-named-block-nodes", QEMU_CAPS_QUERY_NAMED_BLOCK_NODES }, - { "query-cpus-fast", QEMU_CAPS_QUERY_CPUS_FAST }, + { "query-cpus-fast", X_QEMU_CAPS_QUERY_CPUS_FAST }, { "qom-list-properties", QEMU_CAPS_QOM_LIST_PROPERTIES }, { "blockdev-del", QEMU_CAPS_BLOCKDEV_DEL }, { "query-current-machine", QEMU_CAPS_QUERY_CURRENT_MACHINE }, diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index 8f3090e2ce..20b1034ca5 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -447,7 +447,7 @@ typedef enum { /* virQEMUCapsFlags grouping marker for = syntax-check */ QEMU_CAPS_QCOW2_LUKS, /* qcow2 format support LUKS encryption */ QEMU_CAPS_DEVICE_PCIE_PCI_BRIDGE, /* -device pcie-pci-bridge */ X_QEMU_CAPS_SECCOMP_BLACKLIST, /* -sandbox.elevateprivileges */ - QEMU_CAPS_QUERY_CPUS_FAST, /* query-cpus-fast command */ + X_QEMU_CAPS_QUERY_CPUS_FAST, /* query-cpus-fast command */ QEMU_CAPS_DISK_WRITE_CACHE, /* qemu block frontends support write-cach= e param */ =20 /* 290 */ diff --git a/tests/qemuhotplugtest.c b/tests/qemuhotplugtest.c index 3c9dac241a..133145a23a 100644 --- a/tests/qemuhotplugtest.c +++ b/tests/qemuhotplugtest.c @@ -443,8 +443,6 @@ testQemuHotplugCpuPrepare(const char *test, =20 priv =3D data->vm->privateData; =20 - virQEMUCapsSet(priv->qemuCaps, QEMU_CAPS_QUERY_CPUS_FAST); - if (data->modern) virQEMUCapsSet(priv->qemuCaps, QEMU_CAPS_QUERY_HOTPLUGGABLE_CPUS); =20 --=20 2.37.1