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 <pbonz...@redhat.com>
---
 ...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-full-cpus.json
 delete mode 100644 
tests/qemumonitorjsondata/qemumonitorjson-cpuinfo-x86-full-hotplug.json
 delete mode 100644 
tests/qemumonitorjsondata/qemumonitorjson-cpuinfo-x86-full.data

diff --git 
a/tests/qemumonitorjsondata/qemumonitorjson-cpuinfo-x86-full-cpus.json 
b/tests/qemumonitorjsondata/qemumonitorjson-cpuinfo-x86-full-cpus.json
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-hotplug.json 
b/tests/qemumonitorjsondata/qemumonitorjson-cpuinfo-x86-full-hotplug.json
deleted file mode 100644
index aff5aa3c9b..0000000000
--- a/tests/qemumonitorjsondata/qemumonitorjson-cpuinfo-x86-full-hotplug.json
+++ /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.data 
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='0']
-    online=yes
-    hotpluggable=no
-    thread-id='895040'
-    enable-id='1'
-    query-cpus-id='0'
-    type='Broadwell-x86_64-cpu'
-    qom_path='/machine/unattached/device[0]'
-    topology: socket='0' core='0' thread='0' vcpus='1'
-[vcpu libvirt-id='1']
-    online=yes
-    hotpluggable=yes
-    thread-id='895056'
-    enable-id='2'
-    query-cpus-id='1'
-    type='Broadwell-x86_64-cpu'
-    alias='vcpu1'
-    qom_path='/machine/peripheral/vcpu1'
-    topology: socket='1' core='0' thread='0' vcpus='1'
-[vcpu libvirt-id='2']
-    online=yes
-    hotpluggable=yes
-    thread-id='895057'
-    enable-id='3'
-    query-cpus-id='2'
-    type='Broadwell-x86_64-cpu'
-    alias='vcpu2'
-    qom_path='/machine/peripheral/vcpu2'
-    topology: socket='2' core='0' thread='0' vcpus='1'
-[vcpu libvirt-id='3']
-    online=yes
-    hotpluggable=yes
-    thread-id='895058'
-    enable-id='4'
-    query-cpus-id='3'
-    type='Broadwell-x86_64-cpu'
-    alias='vcpu3'
-    qom_path='/machine/peripheral/vcpu3'
-    topology: socket='3' core='0' thread='0' vcpus='1'
-[vcpu libvirt-id='4']
-    online=yes
-    hotpluggable=yes
-    thread-id='895059'
-    enable-id='5'
-    query-cpus-id='4'
-    type='Broadwell-x86_64-cpu'
-    alias='vcpu4'
-    qom_path='/machine/peripheral/vcpu4'
-    topology: socket='4' core='0' thread='0' vcpus='1'
-[vcpu libvirt-id='5']
-    online=yes
-    hotpluggable=yes
-    thread-id='895060'
-    enable-id='6'
-    query-cpus-id='5'
-    type='Broadwell-x86_64-cpu'
-    alias='vcpu5'
-    qom_path='/machine/peripheral/vcpu5'
-    topology: socket='5' core='0' thread='0' vcpus='1'
-[vcpu libvirt-id='6']
-    online=yes
-    hotpluggable=yes
-    thread-id='895061'
-    enable-id='7'
-    query-cpus-id='6'
-    type='Broadwell-x86_64-cpu'
-    alias='vcpu6'
-    qom_path='/machine/peripheral/vcpu6'
-    topology: socket='6' core='0' thread='0' vcpus='1'
-[vcpu libvirt-id='7']
-    online=yes
-    hotpluggable=yes
-    thread-id='895062'
-    enable-id='8'
-    query-cpus-id='7'
-    type='Broadwell-x86_64-cpu'
-    alias='vcpu7'
-    qom_path='/machine/peripheral/vcpu7'
-    topology: socket='7' core='0' thread='0' vcpus='1'
-[vcpu libvirt-id='8']
-    online=yes
-    hotpluggable=yes
-    thread-id='895063'
-    enable-id='9'
-    query-cpus-id='8'
-    type='Broadwell-x86_64-cpu'
-    alias='vcpu8'
-    qom_path='/machine/peripheral/vcpu8'
-    topology: socket='8' core='0' thread='0' vcpus='1'
-[vcpu libvirt-id='9']
-    online=yes
-    hotpluggable=yes
-    thread-id='895064'
-    enable-id='10'
-    query-cpus-id='9'
-    type='Broadwell-x86_64-cpu'
-    alias='vcpu9'
-    qom_path='/machine/peripheral/vcpu9'
-    topology: socket='9' core='0' thread='0' vcpus='1'
-[vcpu libvirt-id='10']
-    online=yes
-    hotpluggable=yes
-    thread-id='895065'
-    enable-id='11'
-    query-cpus-id='10'
-    type='Broadwell-x86_64-cpu'
-    alias='vcpu10'
-    qom_path='/machine/peripheral/vcpu10'
-    topology: socket='10' core='0' thread='0' vcpus='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");
 
     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);
-- 
2.37.1


Reply via email to