From nobody Tue Feb 10 07:39:03 2026 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