From nobody Fri May 17 02:03:22 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=1659971719; cv=none; d=zohomail.com; s=zohoarc; b=R0hqBLXylNdMSl1tKr2c3ImWgJoPR+lytaL3MEBtnmLjIDxgRyHUfHf/UBA5EFjiJcyZL4FWGmjXL3eD1Vso+0Yky+0EH/v8EQrrLwTlsrrM6HP0NGkXcNdXj6CPH32xmhE9usE5VySsJVbV9KnfWRw4WPjQlLaHGGKuxQzIrTQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1659971719; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=VeGQxI32aVwDCzOXGBhcGRssC/mKFv5MyoQaQQ06yRQ=; b=WsMxeNlHaGnuJy2IhcN80mATPGiwQyRDb60uepPUd+f6RX86o2vpajAOQLU3svI8V0VBdQ4Wzuq9qHkc8wQ3soav7TR9vCfK3Uziodeyy5bNsCH8HKJ4vjBhUfpGaxL0sYRfVwW1ydkdSliTzmdvHVw2uk7xzrOHZyCh5ilwUFw= 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 1659971719760768.3278411312165; Mon, 8 Aug 2022 08:15:19 -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-81-AeRHi2WwMw6aDEFmGvPtkg-1; Mon, 08 Aug 2022 11:15:16 -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 A4C83381685D; Mon, 8 Aug 2022 15:15:13 +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 925391121315; Mon, 8 Aug 2022 15:15:13 +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 0DFAA194F846; Mon, 8 Aug 2022 15:15:12 +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 C85721946A61 for ; Mon, 8 Aug 2022 15:15:11 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id B24AF2166B2A; Mon, 8 Aug 2022 15:15:11 +0000 (UTC) Received: from avogadro.lan (unknown [10.39.192.65]) by smtp.corp.redhat.com (Postfix) with ESMTP id E69832166B26; Mon, 8 Aug 2022 15:15:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1659971717; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=VeGQxI32aVwDCzOXGBhcGRssC/mKFv5MyoQaQQ06yRQ=; b=QdPoYmgW6WeJmP1ZgtMmQO/TJrViYrwsZ1KXBjV8WZEKbV774ug8GcOBcWQS5myuOHlnRx maB7TSHZbOrT41vBOwm1TdCHyoLI28iplDSFy3oX0gwrFK+90cD6iKWrD8nDCwgGjshkeI b+ohuPfmRBIxjlkYduKjFC86uOqj8Y4= X-MC-Unique: AeRHi2WwMw6aDEFmGvPtkg-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Paolo Bonzini To: libvir-list@redhat.com Subject: [PATCH v2 1/7] tests: remove duplicate cpuinfo test Date: Mon, 8 Aug 2022 17:15:02 +0200 Message-Id: <20220808151508.74044-2-pbonzini@redhat.com> In-Reply-To: <20220808151508.74044-1-pbonzini@redhat.com> References: <20220808151508.74044-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: , Cc: pkrempa@redhat.com, phrdina@redhat.com 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: 1659971720313100001 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 Reviewed-by: Pavel Hrdina Reviewed-by: Peter Krempa --- ...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 02:03:22 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=1659971722; cv=none; d=zohomail.com; s=zohoarc; b=YhfoUHJAwUS9+nf5homua5xzJ+bWDkrpbspEDvz/L+mx12QkPEikxket1ZJEX2ANsqgbEy4/VskkPZrZ/vJ3xZqARpYp/Lzzp9TDQTYGtOkmEBqp79wHXjT3Vs+u161hnWcBcyaY0Wr0pFsxZdDEhJHixPD9yptEwnYqpF3HNAY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1659971722; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=cmaABNlTpgNk0kSZe8tImx1SmtCfOGRXE3bcqjRcpQY=; b=htjFbiORmZUsSclRty9JSCoM+Zeb+ue8v+Y9xPPOx9K0uMRCe4YWVi6ukrH4pVguEZjKEooiT+6lvUW4AXHqUiAWnIe0PAoKW3fBpQ+ro0aX5VBEt6MS1IpktY4oHN15UhvOa8HoH7tr4X2qLS8TiKL9WdomflgMVvHx93l1REA= 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 1659971722485488.4404612973028; Mon, 8 Aug 2022 08:15:22 -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-427-iNoKH4p_NaS4RzT4X0Qm5Q-1; Mon, 08 Aug 2022 11:15:18 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.rdu2.redhat.com [10.11.54.7]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 0345B858EFE; Mon, 8 Aug 2022 15:15:16 +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 D854C140EBE3; Mon, 8 Aug 2022 15:15:15 +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 5A8CB1946A50; Mon, 8 Aug 2022 15:15:13 +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 0823A1946A50 for ; Mon, 8 Aug 2022 15:15:13 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id D75D42166B2B; Mon, 8 Aug 2022 15:15:12 +0000 (UTC) Received: from avogadro.lan (unknown [10.39.192.65]) by smtp.corp.redhat.com (Postfix) with ESMTP id 0A1CE2166B26; Mon, 8 Aug 2022 15:15:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1659971720; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=cmaABNlTpgNk0kSZe8tImx1SmtCfOGRXE3bcqjRcpQY=; b=SLrw5tD1ka5CQhtCOZTYBFwaHCjD6pQGqf1aA7XSKp35PzBC2e2JW10q1A+BbZAXSmAw8Y mtHzyHqieTNskqMQofQo80ii8CvSyuAvJBCSOJGuAlvN9EY6Scu+4P20lA++EWfPao/Kos UbeqjFQq60Djc1NnN4TajgxZBWx4qjg= X-MC-Unique: iNoKH4p_NaS4RzT4X0Qm5Q-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Paolo Bonzini To: libvir-list@redhat.com Subject: [PATCH v2 2/7] tests: drop "-fast" from query-cpus-fast tests Date: Mon, 8 Aug 2022 17:15:03 +0200 Message-Id: <20220808151508.74044-3-pbonzini@redhat.com> In-Reply-To: <20220808151508.74044-1-pbonzini@redhat.com> References: <20220808151508.74044-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: , Cc: pkrempa@redhat.com, phrdina@redhat.com Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 2.85 on 10.11.54.7 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: 1659971724312100005 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 Reviewed-by: Pavel Hrdina Reviewed-by: Peter Krempa --- ...-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 02:03:22 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=1659971848; cv=none; d=zohomail.com; s=zohoarc; b=BOwmUfGCvEfHclKMLflU8UupwsU6R9X3o3JPsDM8IO+p7LFw/oMOlaOeXQ6Y2h1/et2dwqNl8NHGmVl7Lkw9yFfT0YNdpdc1QX1n0t+/TG57PIbNAFgIOhVBCkZy2+S5peBTi5YAqXSdqI1SIFLIpFg8GwzvmFY/upNtrsqqa2M= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1659971848; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=xfy+8NvAkleDMX7VqgWLlS/WMBQC1oY/PuD0isddfIk=; b=Q6MbV3787LwzZn9prYabMcllHOWJk8os2bNakNFtMJnSICpvfTOtTb2SH1BCsFWAXG4M+Om2CKDlr13J7ZchPLzmBrtgQ7ywBAdd/QxtSTaQRx8FmgGmQRf5W/xyDWblRjn+88y8F4Hvq6e7rtFkNDliWsrzWCIltXFdnOwmg+w= 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 1659971848504917.9593657303769; Mon, 8 Aug 2022 08:17:28 -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-385-8rDmT__hPYGv2gWk_etGiw-1; Mon, 08 Aug 2022 11:16:53 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.rdu2.redhat.com [10.11.54.8]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 776661C1F1F2; Mon, 8 Aug 2022 15:15:16 +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 618D0C15BA1; Mon, 8 Aug 2022 15:15:16 +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 C0BFC1946A55; Mon, 8 Aug 2022 15:15:15 +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 3DACE1946A49 for ; Mon, 8 Aug 2022 15:15:14 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 2648A2166B2C; Mon, 8 Aug 2022 15:15:14 +0000 (UTC) Received: from avogadro.lan (unknown [10.39.192.65]) by smtp.corp.redhat.com (Postfix) with ESMTP id 3658A2166B26; Mon, 8 Aug 2022 15:15:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1659971847; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=xfy+8NvAkleDMX7VqgWLlS/WMBQC1oY/PuD0isddfIk=; b=WADylWXCW5vLfACelyg+Ss9hKEFhDU0fo9+QGyUUSts5LV0xQxRSeLOgdBSRcziVnp1gHC VKcsEY+G+TirMdKId6DOnQV6PLZzhccO4TRRh59qwoQwbQoxkykxzX0x1fJC/cuvDk4PQP 5I+WiK6MMv9gGeALXGzjZbAN2yZPhP4= X-MC-Unique: 8rDmT__hPYGv2gWk_etGiw-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Paolo Bonzini To: libvir-list@redhat.com Subject: [PATCH v2 3/7] tests: convert ppc64 tests to query-cpus-fast Date: Mon, 8 Aug 2022 17:15:04 +0200 Message-Id: <20220808151508.74044-4-pbonzini@redhat.com> In-Reply-To: <20220808151508.74044-1-pbonzini@redhat.com> References: <20220808151508.74044-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: , Cc: pkrempa@redhat.com, phrdina@redhat.com Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 2.85 on 10.11.54.8 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: 1659971849460100001 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 Reviewed-by: Pavel Hrdina Reviewed-by: Peter Krempa --- ...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 }, { "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 }, { "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": -4611686018426772876, - "qom_path": "/machine/unattached/device[1]/thread[0]", - "halted": false, - "thread_id": 35232 + "cpu-index": 0, + "props": { + "core-id": 0 + }, + "qom-path": "/machine/unattached/device[1]/thread[0]", + "thread-id": 35232 }, { "arch": "ppc", "current": false, - "CPU": 1, - "nip": -4611686018426772876, - "qom_path": "/machine/unattached/device[2]/thread[0]", - "halted": false, - "thread_id": 35233 + "cpu-index": 1, + "props": { + "core-id": 8 + }, + "qom-path": "/machine/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 02:03:22 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=1659971741; cv=none; d=zohomail.com; s=zohoarc; b=WgAFTPvIQK4H+4RXgzzGlHOj96EiU65uar7AYPlxCjikWlY1qwpN6zu+xTckEFt1g7Za6ENTRXT9UfsJkYjw+S0cR2aT1bs3hrWPnaqHXBRfRTfW3G6JaFCjiA8WwKaCd+NYoO14R0jOiiiSv65Ftpc27QBv+2PSH6iCN6UXnBk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1659971741; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=HykxrTkSDuk8E5Toh43GHuy6uHbLOXBnTi1N1iTdEBo=; b=g6DsYDNqLMwOAVIR7S/MUWRZqz10G/3Bb7q72qTwiPQW7w725eGishP+469DwZh9juIJGp42IYaEbFXMMMK5q5EctOeBQceGVYa6gypJUbFw2hp8HqT+63nG6CmiNsDZ3U1Q9l8z4SuJxe8M37xoTZRWh77uPXEzeZRXl25MlGg= 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 1659971741184108.44766682409227; Mon, 8 Aug 2022 08:15:41 -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-620-8C6Xd_fOOV2MIbDrDhtSSg-1; Mon, 08 Aug 2022 11:15:36 -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 AF66D2919EC4; Mon, 8 Aug 2022 15:15:29 +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 9C7042026D4C; Mon, 8 Aug 2022 15:15:29 +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 75F001946A4F; Mon, 8 Aug 2022 15:15:29 +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 714811946A49 for ; Mon, 8 Aug 2022 15:15:15 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 3EFE72166B29; Mon, 8 Aug 2022 15:15:15 +0000 (UTC) Received: from avogadro.lan (unknown [10.39.192.65]) by smtp.corp.redhat.com (Postfix) with ESMTP id 708B52166B26; Mon, 8 Aug 2022 15:15:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1659971740; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=HykxrTkSDuk8E5Toh43GHuy6uHbLOXBnTi1N1iTdEBo=; b=B0c3pH0OCE9LqGaPShd07MCxkp+jzkjTr8c49COr5sy2R7CcWHa6tGKv9+RulOEc54DiGo jYnGpsYxhaqWjfbyFWFo0QZ6A7oQ1jmIFTVdc31Z0SuVmGewIHuyLJZDaKpZSIB5ke/g04 0+BEpUVIZtMjDQO8fJc77uJXqaTmeKk= X-MC-Unique: 8C6Xd_fOOV2MIbDrDhtSSg-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Paolo Bonzini To: libvir-list@redhat.com Subject: [PATCH v2 4/7] tests: convert x86_64 tests to query-cpus-fast Date: Mon, 8 Aug 2022 17:15:05 +0200 Message-Id: <20220808151508.74044-5-pbonzini@redhat.com> In-Reply-To: <20220808151508.74044-1-pbonzini@redhat.com> References: <20220808151508.74044-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: , Cc: pkrempa@redhat.com, phrdina@redhat.com 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: 1659971742545100001 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 Reviewed-by: Pavel Hrdina Reviewed-by: Peter Krempa --- ...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 02:03:22 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=1659971734; cv=none; d=zohomail.com; s=zohoarc; b=aVK11mfM/d49voGvTkM/1wgWao2FSWpL4lOxzkApw3DcHYsZcXm77ehMVWKaemRVwr8tzqUugLUjamxJfqZl+8vpUc2yOx78P9dV3/pPYUOy+PbNMqsE1uPYai57sD25zk8/T9Bjhxl/jJlj8uNhBn7jAgI/iBfFi7bV2KHkOEA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1659971734; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=i2ODuyJiVZYmqqmUmhhro0POH8O38JWKRWqO1esLeWE=; b=Ac7ANgdxr6r1/ANQTqrwN0odPICVv9f0+o8980nZE1BE1KH7iXfgkvn2OJm9nn9fzH+uooPwQWu1Q9HBjRFLt0O71Q/CxbWaToBeIB0y9eQmqLcmUAJegvnMFyev1dig+G5Qcr3NiDAxH3K0uyKmdxIb8u5Ote1RkSZmBEzmgac= 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 1659971734219324.5675396390668; Mon, 8 Aug 2022 08:15:34 -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-187-fkhs8bofP-eV7r3m3XSzvA-1; Mon, 08 Aug 2022 11:15:29 -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 2770A805F47; Mon, 8 Aug 2022 15:15:26 +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 108811121315; Mon, 8 Aug 2022 15:15:26 +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 C67D41946A5B; Mon, 8 Aug 2022 15:15:25 +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 8922A1946A49 for ; Mon, 8 Aug 2022 15:15:16 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 57C272166B2E; Mon, 8 Aug 2022 15:15:16 +0000 (UTC) Received: from avogadro.lan (unknown [10.39.192.65]) by smtp.corp.redhat.com (Postfix) with ESMTP id 8C3832166B29; Mon, 8 Aug 2022 15:15:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1659971733; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=i2ODuyJiVZYmqqmUmhhro0POH8O38JWKRWqO1esLeWE=; b=iBpfnxmv74GfMTpcQPPdvfXe9428e3JwpV7Sz5C0bBQhqcrd4gwiQIPTrdRBHtdqxz/7RG QtB4kvbKoV92RrgtoDhNy1CMKL+sAIns33QRV4KtqKviuEzBafpJSH3TzN5Bng9GnhOk4e T3US7AYBhjF63J5oJHPdwlxY/6E47co= X-MC-Unique: fkhs8bofP-eV7r3m3XSzvA-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Paolo Bonzini To: libvir-list@redhat.com Subject: [PATCH v2 5/7] tests: remove query-cpus tests Date: Mon, 8 Aug 2022 17:15:06 +0200 Message-Id: <20220808151508.74044-6-pbonzini@redhat.com> In-Reply-To: <20220808151508.74044-1-pbonzini@redhat.com> References: <20220808151508.74044-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: , Cc: pkrempa@redhat.com, phrdina@redhat.com 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: 1659971736414100001 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 Reviewed-by: Pavel Hrdina Reviewed-by: Peter Krempa --- 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 02:03:22 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=1659971730; cv=none; d=zohomail.com; s=zohoarc; b=JCHuzuZR3DW+waKTDsxeAqrIyTP8AcWCFtRjPbOkWnIrkbtwlHX0SCfLtkBxMjIQsfmqm0XGJBdbV5J/4ClPq40z69jkzg847PfUB39a8wygpwofk/3N5QUKs0V8gqtfnwCIIRXt/UZQP3Cz7xQJic2gsMUBsK4FrQjFdEJeJ2s= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1659971730; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=9iZHCIAocWn3njw6QlmsFrAB0yC3FMQpSAXvXB4W048=; b=lqyf6LV6f9F9NWdUpk/kF0DFyBMIrvu1gUAhPQ59KEen2WtMxRGHJxu7tGsHB42ISOVza1iQOIPgKBFlPrizw/zPY0lLde5MBmmgOeZewBxtKopFOpR2HigePF+x5phojvDl6mdd/bXN+D+5ingGYK2sL5Bh4+Txyq9AXog7dn4= 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 1659971730865532.1195846936463; Mon, 8 Aug 2022 08:15:30 -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-400-a6ULoozSPhi6PgsiHTOMyw-1; Mon, 08 Aug 2022 11:15:25 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.rdu2.redhat.com [10.11.54.7]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 4F577380670E; Mon, 8 Aug 2022 15:15: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 3B0D4140EBE3; Mon, 8 Aug 2022 15:15: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 DC20E1946A50; Mon, 8 Aug 2022 15:15:18 +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 9F9B01946A49 for ; Mon, 8 Aug 2022 15:15:17 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 762B92166B29; Mon, 8 Aug 2022 15:15:17 +0000 (UTC) Received: from avogadro.lan (unknown [10.39.192.65]) by smtp.corp.redhat.com (Postfix) with ESMTP id A7DFC2166B33; Mon, 8 Aug 2022 15:15:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1659971728; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=9iZHCIAocWn3njw6QlmsFrAB0yC3FMQpSAXvXB4W048=; b=JdrvSFFDIeZWFsJfvwsmzPDyYJq9UDlq/UswGWq7xgIsI1a/WvApn0sfAkqgKn3atFaJJ6 b2lN6t9vSa2q6RSRo4QqQdb9bDdWmkgJEzNgF8dSVg+k4+oobJDo+Fl4b2DiYXrWWaYAC1 SHmE7Iox2DvTGVI+zANep/vwAf1EaoY= X-MC-Unique: a6ULoozSPhi6PgsiHTOMyw-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Paolo Bonzini To: libvir-list@redhat.com Subject: [PATCH v2 6/7] qemu: remove support for query-cpus Date: Mon, 8 Aug 2022 17:15:07 +0200 Message-Id: <20220808151508.74044-7-pbonzini@redhat.com> In-Reply-To: <20220808151508.74044-1-pbonzini@redhat.com> References: <20220808151508.74044-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: , Cc: pkrempa@redhat.com, phrdina@redhat.com Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 2.85 on 10.11.54.7 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: 1659971732720100003 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 Reviewed-by: Pavel Hrdina Reviewed-by: Peter Krempa --- 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 02:03:22 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=1659971728; cv=none; d=zohomail.com; s=zohoarc; b=cNZzyjEl8j2WTRinRWnQ3htd19aCW1ZCtg3PxAHQy2Zrce4i6I3AAv2PtDH3EyPmyfpTqeOe1WWWtqFoJlzT7zaGIG5sgWkkCIqkVHWO0n2oqFg0ib8lQGlanryGUmdt/PZSjLdU67mxocGkpPfEgRbtKH6CyDXKEXKb6saqk2Q= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1659971728; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=JYOQsfT26Hd7pFImKrip1ObIQpdYzhM1sM+NUmKc0mo=; b=OFQSP5KcKyiCGQwMNk70QI6yRWyb4snxiujcMVGNhZxyvYaHSr35tQgtiGywrf5DtXPqjisVqHHp/mH7zADAGQhETdgIGZbPHpdswBHT/l4dPYmK2fKQmpQyrlWCABcysL8CTTM2qE0Zr+ixnTdm2EVj1vYzxP8Eik5BmhCGZ2w= 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 165997172831881.25295373481958; Mon, 8 Aug 2022 08:15:28 -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-581--0MYhcS6MD6l9jaYvD6RXw-1; Mon, 08 Aug 2022 11:15:23 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.rdu2.redhat.com [10.11.54.7]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 9B41C3C11E6F; Mon, 8 Aug 2022 15:15:20 +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 8352A1415124; Mon, 8 Aug 2022 15:15:20 +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 4C48F1946A50; Mon, 8 Aug 2022 15:15:20 +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 CE21C1946A49 for ; Mon, 8 Aug 2022 15:15:18 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 97C882166B2A; Mon, 8 Aug 2022 15:15:18 +0000 (UTC) Received: from avogadro.lan (unknown [10.39.192.65]) by smtp.corp.redhat.com (Postfix) with ESMTP id C29CA2166B26; Mon, 8 Aug 2022 15:15:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1659971727; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=JYOQsfT26Hd7pFImKrip1ObIQpdYzhM1sM+NUmKc0mo=; b=Zgjro+aLJuplnGucxCqkNlqZdx70teIyjJ5E6XEeJU7OPJ26PgRqcoxbxkOfdR+Wtf72aw ckVm5TFKhbUfoTgBMKWAC6U396KqLHHhPcnnvwzgcUljPlQoL5m6wYkhqNWX5ozQ3rln7N lFQHZhw3StwpQdYmRWQ7qoNfeJM2zfA= X-MC-Unique: -0MYhcS6MD6l9jaYvD6RXw-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Paolo Bonzini To: libvir-list@redhat.com Subject: [PATCH v2 7/7] qemu: deprecate query-cpus-fast capability Date: Mon, 8 Aug 2022 17:15:08 +0200 Message-Id: <20220808151508.74044-8-pbonzini@redhat.com> In-Reply-To: <20220808151508.74044-1-pbonzini@redhat.com> References: <20220808151508.74044-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: , Cc: pkrempa@redhat.com, phrdina@redhat.com Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 2.85 on 10.11.54.7 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: 1659971730403100001 Content-Type: text/plain; charset="utf-8" All supported versions of QEMU have the command. Signed-off-by: Paolo Bonzini Reviewed-by: Pavel Hrdina Reviewed-by: Peter Krempa --- src/qemu/qemu_capabilities.c | 1 - src/qemu/qemu_capabilities.h | 2 +- tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_4.0.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_4.0.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_4.0.0.riscv32.xml | 1 - tests/qemucapabilitiesdata/caps_4.0.0.riscv64.xml | 1 - tests/qemucapabilitiesdata/caps_4.0.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml | 1 - tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml | 1 - tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml | 1 - tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml | 1 - tests/qemuhotplugtest.c | 2 -- 38 files changed, 1 insertion(+), 39 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index c2c55f4800..ca1f32beca 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,6 @@ 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 }, { "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/qemucapabilitiesdata/caps_3.1.0.ppc64.xml b/tests/qemuca= pabilitiesdata/caps_3.1.0.ppc64.xml index 6d4cc74a4d..d31168271b 100644 --- a/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml @@ -97,7 +97,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml b/tests/qemuc= apabilitiesdata/caps_3.1.0.x86_64.xml index b5cee8476c..240bf4e7e8 100644 --- a/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml @@ -137,7 +137,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.aarch64.xml b/tests/qemu= capabilitiesdata/caps_4.0.0.aarch64.xml index 88a1a7d0be..5cceb1e3a1 100644 --- a/tests/qemucapabilitiesdata/caps_4.0.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_4.0.0.aarch64.xml @@ -104,7 +104,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.ppc64.xml b/tests/qemuca= pabilitiesdata/caps_4.0.0.ppc64.xml index 457a223c3f..bac4c110f5 100644 --- a/tests/qemucapabilitiesdata/caps_4.0.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_4.0.0.ppc64.xml @@ -104,7 +104,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.riscv32.xml b/tests/qemu= capabilitiesdata/caps_4.0.0.riscv32.xml index bc04b28218..fbff56bf7b 100644 --- a/tests/qemucapabilitiesdata/caps_4.0.0.riscv32.xml +++ b/tests/qemucapabilitiesdata/caps_4.0.0.riscv32.xml @@ -105,7 +105,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.riscv64.xml b/tests/qemu= capabilitiesdata/caps_4.0.0.riscv64.xml index d0b6617a85..69c0d3ae47 100644 --- a/tests/qemucapabilitiesdata/caps_4.0.0.riscv64.xml +++ b/tests/qemucapabilitiesdata/caps_4.0.0.riscv64.xml @@ -105,7 +105,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.s390x.xml b/tests/qemuca= pabilitiesdata/caps_4.0.0.s390x.xml index 7fc803030d..d7380da977 100644 --- a/tests/qemucapabilitiesdata/caps_4.0.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_4.0.0.s390x.xml @@ -72,7 +72,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml b/tests/qemuc= apabilitiesdata/caps_4.0.0.x86_64.xml index 4de052d3cb..eb3b824e6b 100644 --- a/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml @@ -136,7 +136,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml b/tests/qemuc= apabilitiesdata/caps_4.1.0.x86_64.xml index c3ff50a4f9..5df8b7008f 100644 --- a/tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml @@ -136,7 +136,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml b/tests/qemu= capabilitiesdata/caps_4.2.0.aarch64.xml index 36b649ab91..976c279767 100644 --- a/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml @@ -106,7 +106,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml b/tests/qemuca= pabilitiesdata/caps_4.2.0.ppc64.xml index d302ab3813..5b1a04c72c 100644 --- a/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml @@ -104,7 +104,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml b/tests/qemuca= pabilitiesdata/caps_4.2.0.s390x.xml index 134eddcb6c..51bb08b550 100644 --- a/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml @@ -72,7 +72,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml b/tests/qemuc= apabilitiesdata/caps_4.2.0.x86_64.xml index 36e12d511a..77e7ba2284 100644 --- a/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml @@ -137,7 +137,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml b/tests/qemu= capabilitiesdata/caps_5.0.0.aarch64.xml index 615c8e8813..6e7e850772 100644 --- a/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml @@ -108,7 +108,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml b/tests/qemuca= pabilitiesdata/caps_5.0.0.ppc64.xml index 3db9743c36..784897971a 100644 --- a/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml @@ -106,7 +106,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml b/tests/qemu= capabilitiesdata/caps_5.0.0.riscv64.xml index 81c6b5807f..291a9e9132 100644 --- a/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml +++ b/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml @@ -105,7 +105,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml b/tests/qemuc= apabilitiesdata/caps_5.0.0.x86_64.xml index e0e67aebec..c5620d0470 100644 --- a/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml @@ -137,7 +137,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml b/tests/qemuca= pabilitiesdata/caps_5.1.0.sparc.xml index 1db1b1b16c..80dfd89abf 100644 --- a/tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml +++ b/tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml @@ -40,7 +40,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml b/tests/qemuc= apabilitiesdata/caps_5.1.0.x86_64.xml index ab2a92bab2..1fa35e9766 100644 --- a/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml @@ -136,7 +136,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml b/tests/qemu= capabilitiesdata/caps_5.2.0.aarch64.xml index 088266fcd0..6b6853b003 100644 --- a/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml @@ -107,7 +107,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml b/tests/qemuca= pabilitiesdata/caps_5.2.0.ppc64.xml index 9ba3ef5717..4dec299c39 100644 --- a/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml @@ -104,7 +104,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml b/tests/qemu= capabilitiesdata/caps_5.2.0.riscv64.xml index ee5469db9d..6c3cadc7b3 100644 --- a/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml +++ b/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml @@ -103,7 +103,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml b/tests/qemuca= pabilitiesdata/caps_5.2.0.s390x.xml index 5e38a0b571..dc96b5f450 100644 --- a/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml @@ -70,7 +70,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml b/tests/qemuc= apabilitiesdata/caps_5.2.0.x86_64.xml index b79de664bd..6a96e77590 100644 --- a/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml @@ -136,7 +136,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml b/tests/qemu= capabilitiesdata/caps_6.0.0.aarch64.xml index 4afd7b26ce..b414058420 100644 --- a/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml @@ -108,7 +108,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml b/tests/qemuca= pabilitiesdata/caps_6.0.0.s390x.xml index c9cb85daa0..96f4bb17cf 100644 --- a/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml @@ -70,7 +70,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml b/tests/qemuc= apabilitiesdata/caps_6.0.0.x86_64.xml index 508804521c..5a02518b94 100644 --- a/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml @@ -135,7 +135,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml b/tests/qemuc= apabilitiesdata/caps_6.1.0.x86_64.xml index d4a540fafd..9c8baafc09 100644 --- a/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml @@ -134,7 +134,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml b/tests/qemu= capabilitiesdata/caps_6.2.0.aarch64.xml index 71697fac95..3e9d2a9d64 100644 --- a/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml @@ -115,7 +115,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml b/tests/qemuca= pabilitiesdata/caps_6.2.0.ppc64.xml index 3f86e03f18..3d7b1a076d 100644 --- a/tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml @@ -104,7 +104,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml b/tests/qemuc= apabilitiesdata/caps_6.2.0.x86_64.xml index 1a1a9643d4..2cccbd7636 100644 --- a/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml @@ -134,7 +134,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml b/tests/qemu= capabilitiesdata/caps_7.0.0.aarch64.xml index a3991e9853..0114ab1d95 100644 --- a/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml @@ -115,7 +115,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml b/tests/qemuca= pabilitiesdata/caps_7.0.0.ppc64.xml index 67dff32f50..127d7237cf 100644 --- a/tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml @@ -110,7 +110,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml b/tests/qemuc= apabilitiesdata/caps_7.0.0.x86_64.xml index 8ce423557e..2cc00148f2 100644 --- a/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml @@ -134,7 +134,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml b/tests/qemuc= apabilitiesdata/caps_7.1.0.x86_64.xml index 2e30fc5f2e..f8f65be2c9 100644 --- a/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml @@ -134,7 +134,6 @@ - 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