diff --git a/tests/qemuhotplugtest.c b/tests/qemuhotplugtest.c
index 9dd42664cd..e008c1bf0d 100644
--- a/tests/qemuhotplugtest.c
+++ b/tests/qemuhotplugtest.c
@@ -437,6 +437,8 @@ testQemuHotplugCpuPrepare(const char *test,
 
     priv = data->vm->privateData;
 
+    virQEMUCapsSet(priv->qemuCaps, QEMU_CAPS_QUERY_CPUS_FAST);
+
     if (data->modern)
         virQEMUCapsSet(priv->qemuCaps, QEMU_CAPS_QUERY_HOTPLUGGABLE_CPUS);
 
diff --git a/tests/qemuhotplugtestcpus/ppc64-modern-bulk-monitor.json b/tests/qemuhotplugtestcpus/ppc64-modern-bulk-monitor.json
index c139426b7b..068b45e3c0 100644
--- a/tests/qemuhotplugtestcpus/ppc64-modern-bulk-monitor.json
+++ b/tests/qemuhotplugtestcpus/ppc64-modern-bulk-monitor.json
@@ -35,81 +35,81 @@
   "id": "libvirt-15"
 }
 
-{"execute":"query-cpus","id":"libvirt-2"}
+{"execute":"query-cpus-fast","id":"libvirt-2"}
 
 {
   "return": [
     {
-      "arch": "ppc",
+      "target": "ppc",
       "current": true,
-      "CPU": 0,
+      "cpu-index": 0,
       "nip": -4611686018426772172,
-      "qom_path": "/machine/unattached/device[1]/thread[0]",
+      "qom-path": "/machine/unattached/device[1]/thread[0]",
       "halted": false,
-      "thread_id": 21925
+      "thread-id": 21925
     },
     {
-      "arch": "ppc",
+      "target": "ppc",
       "current": false,
-      "CPU": 1,
+      "cpu-index": 1,
       "nip": -4611686018426772172,
-      "qom_path": "/machine/unattached/device[1]/thread[1]",
+      "qom-path": "/machine/unattached/device[1]/thread[1]",
       "halted": false,
-      "thread_id": 21926
+      "thread-id": 21926
     },
     {
-      "arch": "ppc",
+      "target": "ppc",
       "current": false,
-      "CPU": 2,
+      "cpu-index": 2,
       "nip": -4611686018422360608,
-      "qom_path": "/machine/unattached/device[1]/thread[2]",
+      "qom-path": "/machine/unattached/device[1]/thread[2]",
       "halted": false,
-      "thread_id": 21927
+      "thread-id": 21927
     },
     {
-      "arch": "ppc",
+      "target": "ppc",
       "current": false,
-      "CPU": 3,
+      "cpu-index": 3,
       "nip": -4611686018426772172,
-      "qom_path": "/machine/unattached/device[1]/thread[3]",
+      "qom-path": "/machine/unattached/device[1]/thread[3]",
       "halted": false,
-      "thread_id": 21928
+      "thread-id": 21928
     },
     {
-      "arch": "ppc",
+      "target": "ppc",
       "current": false,
-      "CPU": 4,
+      "cpu-index": 4,
       "nip": -4611686018426772172,
-      "qom_path": "/machine/unattached/device[1]/thread[4]",
+      "qom-path": "/machine/unattached/device[1]/thread[4]",
       "halted": false,
-      "thread_id": 21930
+      "thread-id": 21930
     },
     {
-      "arch": "ppc",
+      "target": "ppc",
       "current": false,
-      "CPU": 5,
+      "cpu-index": 5,
       "nip": -4611686018426772172,
-      "qom_path": "/machine/unattached/device[1]/thread[5]",
+      "qom-path": "/machine/unattached/device[1]/thread[5]",
       "halted": false,
-      "thread_id": 21931
+      "thread-id": 21931
     },
     {
-      "arch": "ppc",
+      "target": "ppc",
       "current": false,
-      "CPU": 6,
+      "cpu-index": 6,
       "nip": -4611686018426772172,
-      "qom_path": "/machine/unattached/device[1]/thread[6]",
+      "qom-path": "/machine/unattached/device[1]/thread[6]",
       "halted": false,
-      "thread_id": 21932
+      "thread-id": 21932
     },
     {
-      "arch": "ppc",
+      "target": "ppc",
       "current": false,
-      "CPU": 7,
+      "cpu-index": 7,
       "nip": -4611686018426772172,
-      "qom_path": "/machine/unattached/device[1]/thread[7]",
+      "qom-path": "/machine/unattached/device[1]/thread[7]",
       "halted": false,
-      "thread_id": 21933
+      "thread-id": 21933
     }
   ],
   "id": "libvirt-12"
@@ -165,153 +165,153 @@
   "id": "libvirt-15"
 }
 
-{"execute":"query-cpus","id":"libvirt-5"}
+{"execute":"query-cpus-fast","id":"libvirt-5"}
 
 {
   "return": [
     {
-      "arch": "ppc",
+      "target": "ppc",
       "current": true,
-      "CPU": 0,
+      "cpu-index": 0,
       "nip": -4611686018426772172,
-      "qom_path": "/machine/unattached/device[1]/thread[0]",
+      "qom-path": "/machine/unattached/device[1]/thread[0]",
       "halted": false,
-      "thread_id": 21925
+      "thread-id": 21925
     },
     {
-      "arch": "ppc",
+      "target": "ppc",
       "current": false,
-      "CPU": 1,
+      "cpu-index": 1,
       "nip": -4611686018426772172,
-      "qom_path": "/machine/unattached/device[1]/thread[1]",
+      "qom-path": "/machine/unattached/device[1]/thread[1]",
       "halted": false,
-      "thread_id": 21926
+      "thread-id": 21926
     },
     {
-      "arch": "ppc",
+      "target": "ppc",
       "current": false,
-      "CPU": 2,
+      "cpu-index": 2,
       "nip": -4611686018426772172,
-      "qom_path": "/machine/unattached/device[1]/thread[2]",
+      "qom-path": "/machine/unattached/device[1]/thread[2]",
       "halted": false,
-      "thread_id": 21927
+      "thread-id": 21927
     },
     {
-      "arch": "ppc",
+      "target": "ppc",
       "current": false,
-      "CPU": 3,
+      "cpu-index": 3,
       "nip": -4611686018426772172,
-      "qom_path": "/machine/unattached/device[1]/thread[3]",
+      "qom-path": "/machine/unattached/device[1]/thread[3]",
       "halted": false,
-      "thread_id": 21928
+      "thread-id": 21928
     },
     {
-      "arch": "ppc",
+      "target": "ppc",
       "current": false,
-      "CPU": 4,
+      "cpu-index": 4,
       "nip": -4611686018426772172,
-      "qom_path": "/machine/unattached/device[1]/thread[4]",
+      "qom-path": "/machine/unattached/device[1]/thread[4]",
       "halted": false,
-      "thread_id": 21930
+      "thread-id": 21930
     },
     {
-      "arch": "ppc",
+      "target": "ppc",
       "current": false,
-      "CPU": 5,
+      "cpu-index": 5,
       "nip": -4611686018426772172,
-      "qom_path": "/machine/unattached/device[1]/thread[5]",
+      "qom-path": "/machine/unattached/device[1]/thread[5]",
       "halted": false,
-      "thread_id": 21931
+      "thread-id": 21931
     },
     {
-      "arch": "ppc",
+      "target": "ppc",
       "current": false,
-      "CPU": 6,
+      "cpu-index": 6,
       "nip": -4611686018426772172,
-      "qom_path": "/machine/unattached/device[1]/thread[6]",
+      "qom-path": "/machine/unattached/device[1]/thread[6]",
       "halted": false,
-      "thread_id": 21932
+      "thread-id": 21932
     },
     {
-      "arch": "ppc",
+      "target": "ppc",
       "current": false,
-      "CPU": 7,
+      "cpu-index": 7,
       "nip": -4611686018426772172,
-      "qom_path": "/machine/unattached/device[1]/thread[7]",
+      "qom-path": "/machine/unattached/device[1]/thread[7]",
       "halted": false,
-      "thread_id": 21933
+      "thread-id": 21933
     },
     {
-      "arch": "ppc",
+      "target": "ppc",
       "current": false,
-      "CPU": 8,
+      "cpu-index": 8,
       "nip": -4611686018426772172,
-      "qom_path": "/machine/peripheral/vcpu1/thread[0]",
+      "qom-path": "/machine/peripheral/vcpu1/thread[0]",
       "halted": false,
-      "thread_id": 22131
+      "thread-id": 22131
     },
     {
-      "arch": "ppc",
+      "target": "ppc",
       "current": false,
-      "CPU": 9,
+      "cpu-index": 9,
       "nip": -4611686018426772172,
-      "qom_path": "/machine/peripheral/vcpu1/thread[1]",
+      "qom-path": "/machine/peripheral/vcpu1/thread[1]",
       "halted": false,
-      "thread_id": 22132
+      "thread-id": 22132
     },
     {
-      "arch": "ppc",
+      "target": "ppc",
       "current": false,
-      "CPU": 10,
+      "cpu-index": 10,
       "nip": -4611686018426772172,
-      "qom_path": "/machine/peripheral/vcpu1/thread[2]",
+      "qom-path": "/machine/peripheral/vcpu1/thread[2]",
       "halted": false,
-      "thread_id": 22133
+      "thread-id": 22133
     },
     {
-      "arch": "ppc",
+      "target": "ppc",
       "current": false,
-      "CPU": 11,
+      "cpu-index": 11,
       "nip": -4611686018426772172,
-      "qom_path": "/machine/peripheral/vcpu1/thread[3]",
+      "qom-path": "/machine/peripheral/vcpu1/thread[3]",
       "halted": false,
-      "thread_id": 22134
+      "thread-id": 22134
     },
     {
-      "arch": "ppc",
+      "target": "ppc",
       "current": false,
-      "CPU": 12,
+      "cpu-index": 12,
       "nip": -4611686018426772172,
-      "qom_path": "/machine/peripheral/vcpu1/thread[4]",
+      "qom-path": "/machine/peripheral/vcpu1/thread[4]",
       "halted": false,
-      "thread_id": 22135
+      "thread-id": 22135
     },
     {
-      "arch": "ppc",
+      "target": "ppc",
       "current": false,
-      "CPU": 13,
+      "cpu-index": 13,
       "nip": -4611686018426772172,
-      "qom_path": "/machine/peripheral/vcpu1/thread[5]",
+      "qom-path": "/machine/peripheral/vcpu1/thread[5]",
       "halted": false,
-      "thread_id": 22136
+      "thread-id": 22136
     },
     {
-      "arch": "ppc",
+      "target": "ppc",
       "current": false,
-      "CPU": 14,
+      "cpu-index": 14,
       "nip": -4611686018426772172,
-      "qom_path": "/machine/peripheral/vcpu1/thread[6]",
+      "qom-path": "/machine/peripheral/vcpu1/thread[6]",
       "halted": false,
-      "thread_id": 22137
+      "thread-id": 22137
     },
     {
-      "arch": "ppc",
+      "target": "ppc",
       "current": false,
-      "CPU": 15,
+      "cpu-index": 15,
       "nip": -4611686018426772172,
-      "qom_path": "/machine/peripheral/vcpu1/thread[7]",
+      "qom-path": "/machine/peripheral/vcpu1/thread[7]",
       "halted": false,
-      "thread_id": 22138
+      "thread-id": 22138
     }
   ],
   "id": "libvirt-14"
@@ -368,225 +368,225 @@
   "id": "libvirt-15"
 }
 
-{"execute":"query-cpus","id":"libvirt-8"}
+{"execute":"query-cpus-fast","id":"libvirt-8"}
 
 {
   "return": [
     {
-      "arch": "ppc",
+      "target": "ppc",
       "current": true,
-      "CPU": 0,
+      "cpu-index": 0,
       "nip": -4611686018426772172,
-      "qom_path": "/machine/unattached/device[1]/thread[0]",
+      "qom-path": "/machine/unattached/device[1]/thread[0]",
       "halted": false,
-      "thread_id": 21925
+      "thread-id": 21925
     },
     {
-      "arch": "ppc",
+      "target": "ppc",
       "current": false,
-      "CPU": 1,
+      "cpu-index": 1,
       "nip": -4611686018426772172,
-      "qom_path": "/machine/unattached/device[1]/thread[1]",
+      "qom-path": "/machine/unattached/device[1]/thread[1]",
       "halted": false,
-      "thread_id": 21926
+      "thread-id": 21926
     },
     {
-      "arch": "ppc",
+      "target": "ppc",
       "current": false,
-      "CPU": 2,
+      "cpu-index": 2,
       "nip": -4611686018422360576,
-      "qom_path": "/machine/unattached/device[1]/thread[2]",
+      "qom-path": "/machine/unattached/device[1]/thread[2]",
       "halted": false,
-      "thread_id": 21927
+      "thread-id": 21927
     },
     {
-      "arch": "ppc",
+      "target": "ppc",
       "current": false,
-      "CPU": 3,
+      "cpu-index": 3,
       "nip": -4611686018422360596,
-      "qom_path": "/machine/unattached/device[1]/thread[3]",
+      "qom-path": "/machine/unattached/device[1]/thread[3]",
       "halted": false,
-      "thread_id": 21928
+      "thread-id": 21928
     },
     {
-      "arch": "ppc",
+      "target": "ppc",
       "current": false,
-      "CPU": 4,
+      "cpu-index": 4,
       "nip": -4611686018426772172,
-      "qom_path": "/machine/unattached/device[1]/thread[4]",
+      "qom-path": "/machine/unattached/device[1]/thread[4]",
       "halted": false,
-      "thread_id": 21930
+      "thread-id": 21930
     },
     {
-      "arch": "ppc",
+      "target": "ppc",
       "current": false,
-      "CPU": 5,
+      "cpu-index": 5,
       "nip": -4611686018426772172,
-      "qom_path": "/machine/unattached/device[1]/thread[5]",
+      "qom-path": "/machine/unattached/device[1]/thread[5]",
       "halted": false,
-      "thread_id": 21931
+      "thread-id": 21931
     },
     {
-      "arch": "ppc",
+      "target": "ppc",
       "current": false,
-      "CPU": 6,
+      "cpu-index": 6,
       "nip": -4611686018426772172,
-      "qom_path": "/machine/unattached/device[1]/thread[6]",
+      "qom-path": "/machine/unattached/device[1]/thread[6]",
       "halted": false,
-      "thread_id": 21932
+      "thread-id": 21932
     },
     {
-      "arch": "ppc",
+      "target": "ppc",
       "current": false,
-      "CPU": 7,
+      "cpu-index": 7,
       "nip": -4611686018422360596,
-      "qom_path": "/machine/unattached/device[1]/thread[7]",
+      "qom-path": "/machine/unattached/device[1]/thread[7]",
       "halted": false,
-      "thread_id": 21933
+      "thread-id": 21933
     },
     {
-      "arch": "ppc",
+      "target": "ppc",
       "current": false,
-      "CPU": 8,
+      "cpu-index": 8,
       "nip": -4611686018426772172,
-      "qom_path": "/machine/peripheral/vcpu1/thread[0]",
+      "qom-path": "/machine/peripheral/vcpu1/thread[0]",
       "halted": false,
-      "thread_id": 22131
+      "thread-id": 22131
     },
     {
-      "arch": "ppc",
+      "target": "ppc",
       "current": false,
-      "CPU": 9,
+      "cpu-index": 9,
       "nip": -4611686018426772172,
-      "qom_path": "/machine/peripheral/vcpu1/thread[1]",
+      "qom-path": "/machine/peripheral/vcpu1/thread[1]",
       "halted": false,
-      "thread_id": 22132
+      "thread-id": 22132
     },
     {
-      "arch": "ppc",
+      "target": "ppc",
       "current": false,
-      "CPU": 10,
+      "cpu-index": 10,
       "nip": -4611686018426772172,
-      "qom_path": "/machine/peripheral/vcpu1/thread[2]",
+      "qom-path": "/machine/peripheral/vcpu1/thread[2]",
       "halted": false,
-      "thread_id": 22133
+      "thread-id": 22133
     },
     {
-      "arch": "ppc",
+      "target": "ppc",
       "current": false,
-      "CPU": 11,
+      "cpu-index": 11,
       "nip": -4611686018426772172,
-      "qom_path": "/machine/peripheral/vcpu1/thread[3]",
+      "qom-path": "/machine/peripheral/vcpu1/thread[3]",
       "halted": false,
-      "thread_id": 22134
+      "thread-id": 22134
     },
     {
-      "arch": "ppc",
+      "target": "ppc",
       "current": false,
-      "CPU": 12,
+      "cpu-index": 12,
       "nip": -4611686018426772172,
-      "qom_path": "/machine/peripheral/vcpu1/thread[4]",
+      "qom-path": "/machine/peripheral/vcpu1/thread[4]",
       "halted": false,
-      "thread_id": 22135
+      "thread-id": 22135
     },
     {
-      "arch": "ppc",
+      "target": "ppc",
       "current": false,
-      "CPU": 13,
+      "cpu-index": 13,
       "nip": -4611686018426772172,
-      "qom_path": "/machine/peripheral/vcpu1/thread[5]",
+      "qom-path": "/machine/peripheral/vcpu1/thread[5]",
       "halted": false,
-      "thread_id": 22136
+      "thread-id": 22136
     },
     {
-      "arch": "ppc",
+      "target": "ppc",
       "current": false,
-      "CPU": 14,
+      "cpu-index": 14,
       "nip": -4611686018426772172,
-      "qom_path": "/machine/peripheral/vcpu1/thread[6]",
+      "qom-path": "/machine/peripheral/vcpu1/thread[6]",
       "halted": false,
-      "thread_id": 22137
+      "thread-id": 22137
     },
     {
-      "arch": "ppc",
+      "target": "ppc",
       "current": false,
-      "CPU": 15,
+      "cpu-index": 15,
       "nip": -4611686018426772172,
-      "qom_path": "/machine/peripheral/vcpu1/thread[7]",
+      "qom-path": "/machine/peripheral/vcpu1/thread[7]",
       "halted": false,
-      "thread_id": 22138
+      "thread-id": 22138
     },
     {
-      "arch": "ppc",
+      "target": "ppc",
       "current": false,
-      "CPU": 16,
+      "cpu-index": 16,
       "nip": -4611686018426772172,
-      "qom_path": "/machine/peripheral/vcpu2/thread[0]",
+      "qom-path": "/machine/peripheral/vcpu2/thread[0]",
       "halted": false,
-      "thread_id": 22223
+      "thread-id": 22223
     },
     {
-      "arch": "ppc",
+      "target": "ppc",
       "current": false,
-      "CPU": 17,
+      "cpu-index": 17,
       "nip": -4611686018426772172,
-      "qom_path": "/machine/peripheral/vcpu2/thread[1]",
+      "qom-path": "/machine/peripheral/vcpu2/thread[1]",
       "halted": false,
-      "thread_id": 22224
+      "thread-id": 22224
     },
     {
-      "arch": "ppc",
+      "target": "ppc",
       "current": false,
-      "CPU": 18,
+      "cpu-index": 18,
       "nip": -4611686018426772172,
-      "qom_path": "/machine/peripheral/vcpu2/thread[2]",
+      "qom-path": "/machine/peripheral/vcpu2/thread[2]",
       "halted": false,
-      "thread_id": 22225
+      "thread-id": 22225
     },
     {
-      "arch": "ppc",
+      "target": "ppc",
       "current": false,
-      "CPU": 19,
+      "cpu-index": 19,
       "nip": -4611686018426772172,
-      "qom_path": "/machine/peripheral/vcpu2/thread[3]",
+      "qom-path": "/machine/peripheral/vcpu2/thread[3]",
       "halted": false,
-      "thread_id": 22226
+      "thread-id": 22226
     },
     {
-      "arch": "ppc",
+      "target": "ppc",
       "current": false,
-      "CPU": 20,
+      "cpu-index": 20,
       "nip": -4611686018426772172,
-      "qom_path": "/machine/peripheral/vcpu2/thread[4]",
+      "qom-path": "/machine/peripheral/vcpu2/thread[4]",
       "halted": false,
-      "thread_id": 22227
+      "thread-id": 22227
     },
     {
-      "arch": "ppc",
+      "target": "ppc",
       "current": false,
-      "CPU": 21,
+      "cpu-index": 21,
       "nip": -4611686018426772172,
-      "qom_path": "/machine/peripheral/vcpu2/thread[5]",
+      "qom-path": "/machine/peripheral/vcpu2/thread[5]",
       "halted": false,
-      "thread_id": 22228
+      "thread-id": 22228
     },
     {
-      "arch": "ppc",
+      "target": "ppc",
       "current": false,
-      "CPU": 22,
+      "cpu-index": 22,
       "nip": -4611686018426772172,
-      "qom_path": "/machine/peripheral/vcpu2/thread[6]",
+      "qom-path": "/machine/peripheral/vcpu2/thread[6]",
       "halted": false,
-      "thread_id": 22229
+      "thread-id": 22229
     },
     {
-      "arch": "ppc",
+      "target": "ppc",
       "current": false,
-      "CPU": 23,
+      "cpu-index": 23,
       "nip": -4611686018426772172,
-      "qom_path": "/machine/peripheral/vcpu2/thread[7]",
+      "qom-path": "/machine/peripheral/vcpu2/thread[7]",
       "halted": false,
-      "thread_id": 22230
+      "thread-id": 22230
     }
   ],
   "id": "libvirt-17"
diff --git a/tests/qemuhotplugtestcpus/ppc64-modern-individual-monitor.json b/tests/qemuhotplugtestcpus/ppc64-modern-individual-monitor.json
index ad5cc984a8..b90c4acb73 100644
--- a/tests/qemuhotplugtestcpus/ppc64-modern-individual-monitor.json
+++ b/tests/qemuhotplugtestcpus/ppc64-modern-individual-monitor.json
@@ -35,81 +35,81 @@
   "id": "libvirt-15"
 }
 
-{"execute":"query-cpus","id":"libvirt-2"}
+{"execute":"query-cpus-fast","id":"libvirt-2"}
 
 {
   "return": [
     {
-      "arch": "ppc",
+      "target": "ppc",
       "current": true,
-      "CPU": 0,
+      "cpu-index": 0,
       "nip": -4611686018426772172,
-      "qom_path": "/machine/unattached/device[1]/thread[0]",
+      "qom-path": "/machine/unattached/device[1]/thread[0]",
       "halted": false,
-      "thread_id": 21925
+      "thread-id": 21925
     },
     {
-      "arch": "ppc",
+      "target": "ppc",
       "current": false,
-      "CPU": 1,
+      "cpu-index": 1,
       "nip": -4611686018426772172,
-      "qom_path": "/machine/unattached/device[1]/thread[1]",
+      "qom-path": "/machine/unattached/device[1]/thread[1]",
       "halted": false,
-      "thread_id": 21926
+      "thread-id": 21926
     },
     {
-      "arch": "ppc",
+      "target": "ppc",
       "current": false,
-      "CPU": 2,
+      "cpu-index": 2,
       "nip": -4611686018422360608,
-      "qom_path": "/machine/unattached/device[1]/thread[2]",
+      "qom-path": "/machine/unattached/device[1]/thread[2]",
       "halted": false,
-      "thread_id": 21927
+      "thread-id": 21927
     },
     {
-      "arch": "ppc",
+      "target": "ppc",
       "current": false,
-      "CPU": 3,
+      "cpu-index": 3,
       "nip": -4611686018426772172,
-      "qom_path": "/machine/unattached/device[1]/thread[3]",
+      "qom-path": "/machine/unattached/device[1]/thread[3]",
       "halted": false,
-      "thread_id": 21928
+      "thread-id": 21928
     },
     {
-      "arch": "ppc",
+      "target": "ppc",
       "current": false,
-      "CPU": 4,
+      "cpu-index": 4,
       "nip": -4611686018426772172,
-      "qom_path": "/machine/unattached/device[1]/thread[4]",
+      "qom-path": "/machine/unattached/device[1]/thread[4]",
       "halted": false,
-      "thread_id": 21930
+      "thread-id": 21930
     },
     {
-      "arch": "ppc",
+      "target": "ppc",
       "current": false,
-      "CPU": 5,
+      "cpu-index": 5,
       "nip": -4611686018426772172,
-      "qom_path": "/machine/unattached/device[1]/thread[5]",
+      "qom-path": "/machine/unattached/device[1]/thread[5]",
       "halted": false,
-      "thread_id": 21931
+      "thread-id": 21931
     },
     {
-      "arch": "ppc",
+      "target": "ppc",
       "current": false,
-      "CPU": 6,
+      "cpu-index": 6,
       "nip": -4611686018426772172,
-      "qom_path": "/machine/unattached/device[1]/thread[6]",
+      "qom-path": "/machine/unattached/device[1]/thread[6]",
       "halted": false,
-      "thread_id": 21932
+      "thread-id": 21932
     },
     {
-      "arch": "ppc",
+      "target": "ppc",
       "current": false,
-      "CPU": 7,
+      "cpu-index": 7,
       "nip": -4611686018426772172,
-      "qom_path": "/machine/unattached/device[1]/thread[7]",
+      "qom-path": "/machine/unattached/device[1]/thread[7]",
       "halted": false,
-      "thread_id": 21933
+      "thread-id": 21933
     }
   ],
   "id": "libvirt-12"
@@ -165,153 +165,153 @@
   "id": "libvirt-15"
 }
 
-{"execute":"query-cpus","id":"libvirt-5"}
+{"execute":"query-cpus-fast","id":"libvirt-5"}
 
 {
   "return": [
     {
-      "arch": "ppc",
+      "target": "ppc",
       "current": true,
-      "CPU": 0,
+      "cpu-index": 0,
       "nip": -4611686018426772172,
-      "qom_path": "/machine/unattached/device[1]/thread[0]",
+      "qom-path": "/machine/unattached/device[1]/thread[0]",
       "halted": false,
-      "thread_id": 21925
+      "thread-id": 21925
     },
     {
-      "arch": "ppc",
+      "target": "ppc",
       "current": false,
-      "CPU": 1,
+      "cpu-index": 1,
       "nip": -4611686018426772172,
-      "qom_path": "/machine/unattached/device[1]/thread[1]",
+      "qom-path": "/machine/unattached/device[1]/thread[1]",
       "halted": false,
-      "thread_id": 21926
+      "thread-id": 21926
     },
     {
-      "arch": "ppc",
+      "target": "ppc",
       "current": false,
-      "CPU": 2,
+      "cpu-index": 2,
       "nip": -4611686018426772172,
-      "qom_path": "/machine/unattached/device[1]/thread[2]",
+      "qom-path": "/machine/unattached/device[1]/thread[2]",
       "halted": false,
-      "thread_id": 21927
+      "thread-id": 21927
     },
     {
-      "arch": "ppc",
+      "target": "ppc",
       "current": false,
-      "CPU": 3,
+      "cpu-index": 3,
       "nip": -4611686018426772172,
-      "qom_path": "/machine/unattached/device[1]/thread[3]",
+      "qom-path": "/machine/unattached/device[1]/thread[3]",
       "halted": false,
-      "thread_id": 21928
+      "thread-id": 21928
     },
     {
-      "arch": "ppc",
+      "target": "ppc",
       "current": false,
-      "CPU": 4,
+      "cpu-index": 4,
       "nip": -4611686018426772172,
-      "qom_path": "/machine/unattached/device[1]/thread[4]",
+      "qom-path": "/machine/unattached/device[1]/thread[4]",
       "halted": false,
-      "thread_id": 21930
+      "thread-id": 21930
     },
     {
-      "arch": "ppc",
+      "target": "ppc",
       "current": false,
-      "CPU": 5,
+      "cpu-index": 5,
       "nip": -4611686018426772172,
-      "qom_path": "/machine/unattached/device[1]/thread[5]",
+      "qom-path": "/machine/unattached/device[1]/thread[5]",
       "halted": false,
-      "thread_id": 21931
+      "thread-id": 21931
     },
     {
-      "arch": "ppc",
+      "target": "ppc",
       "current": false,
-      "CPU": 6,
+      "cpu-index": 6,
       "nip": -4611686018426772172,
-      "qom_path": "/machine/unattached/device[1]/thread[6]",
+      "qom-path": "/machine/unattached/device[1]/thread[6]",
       "halted": false,
-      "thread_id": 21932
+      "thread-id": 21932
     },
     {
-      "arch": "ppc",
+      "target": "ppc",
       "current": false,
-      "CPU": 7,
+      "cpu-index": 7,
       "nip": -4611686018426772172,
-      "qom_path": "/machine/unattached/device[1]/thread[7]",
+      "qom-path": "/machine/unattached/device[1]/thread[7]",
       "halted": false,
-      "thread_id": 21933
+      "thread-id": 21933
     },
     {
-      "arch": "ppc",
+      "target": "ppc",
       "current": false,
-      "CPU": 8,
+      "cpu-index": 8,
       "nip": -4611686018426772172,
-      "qom_path": "/machine/peripheral/vcpu16/thread[0]",
+      "qom-path": "/machine/peripheral/vcpu16/thread[0]",
       "halted": false,
-      "thread_id": 22131
+      "thread-id": 22131
     },
     {
-      "arch": "ppc",
+      "target": "ppc",
       "current": false,
-      "CPU": 9,
+      "cpu-index": 9,
       "nip": -4611686018426772172,
-      "qom_path": "/machine/peripheral/vcpu16/thread[1]",
+      "qom-path": "/machine/peripheral/vcpu16/thread[1]",
       "halted": false,
-      "thread_id": 22132
+      "thread-id": 22132
     },
     {
-      "arch": "ppc",
+      "target": "ppc",
       "current": false,
-      "CPU": 10,
+      "cpu-index": 10,
       "nip": -4611686018426772172,
-      "qom_path": "/machine/peripheral/vcpu16/thread[2]",
+      "qom-path": "/machine/peripheral/vcpu16/thread[2]",
       "halted": false,
-      "thread_id": 22133
+      "thread-id": 22133
     },
     {
-      "arch": "ppc",
+      "target": "ppc",
       "current": false,
-      "CPU": 11,
+      "cpu-index": 11,
       "nip": -4611686018426772172,
-      "qom_path": "/machine/peripheral/vcpu16/thread[3]",
+      "qom-path": "/machine/peripheral/vcpu16/thread[3]",
       "halted": false,
-      "thread_id": 22134
+      "thread-id": 22134
     },
     {
-      "arch": "ppc",
+      "target": "ppc",
       "current": false,
-      "CPU": 12,
+      "cpu-index": 12,
       "nip": -4611686018426772172,
-      "qom_path": "/machine/peripheral/vcpu16/thread[4]",
+      "qom-path": "/machine/peripheral/vcpu16/thread[4]",
       "halted": false,
-      "thread_id": 22135
+      "thread-id": 22135
     },
     {
-      "arch": "ppc",
+      "target": "ppc",
       "current": false,
-      "CPU": 13,
+      "cpu-index": 13,
       "nip": -4611686018426772172,
-      "qom_path": "/machine/peripheral/vcpu16/thread[5]",
+      "qom-path": "/machine/peripheral/vcpu16/thread[5]",
       "halted": false,
-      "thread_id": 22136
+      "thread-id": 22136
     },
     {
-      "arch": "ppc",
+      "target": "ppc",
       "current": false,
-      "CPU": 14,
+      "cpu-index": 14,
       "nip": -4611686018426772172,
-      "qom_path": "/machine/peripheral/vcpu16/thread[6]",
+      "qom-path": "/machine/peripheral/vcpu16/thread[6]",
       "halted": false,
-      "thread_id": 22137
+      "thread-id": 22137
     },
     {
-      "arch": "ppc",
+      "target": "ppc",
       "current": false,
-      "CPU": 15,
+      "cpu-index": 15,
       "nip": -4611686018426772172,
-      "qom_path": "/machine/peripheral/vcpu16/thread[7]",
+      "qom-path": "/machine/peripheral/vcpu16/thread[7]",
       "halted": false,
-      "thread_id": 22138
+      "thread-id": 22138
     }
   ],
   "id": "libvirt-14"
diff --git a/tests/qemuhotplugtestcpus/x86-modern-bulk-monitor.json b/tests/qemuhotplugtestcpus/x86-modern-bulk-monitor.json
index b1d02b8d43..a412ccaf6e 100644
--- a/tests/qemuhotplugtestcpus/x86-modern-bulk-monitor.json
+++ b/tests/qemuhotplugtestcpus/x86-modern-bulk-monitor.json
@@ -83,54 +83,54 @@
   "id": "libvirt-23"
 }
 
-{"execute":"query-cpus","id":"libvirt-2"}
+{"execute":"query-cpus-fast","id":"libvirt-2"}
 
 {
   "return": [
     {
-      "arch": "x86",
+      "target": "x86",
       "current": true,
-      "CPU": 0,
-      "qom_path": "/machine/unattached/device[0]",
+      "cpu-index": 0,
+      "qom-path": "/machine/unattached/device[0]",
       "pc": -2130415978,
       "halted": true,
-      "thread_id": 518291
+      "thread-id": 518291
     },
     {
-      "arch": "x86",
+      "target": "x86",
       "current": false,
-      "CPU": 1,
-      "qom_path": "/machine/unattached/device[2]",
+      "cpu-index": 1,
+      "qom-path": "/machine/unattached/device[2]",
       "pc": -2130415978,
       "halted": true,
-      "thread_id": 518292
+      "thread-id": 518292
     },
     {
-      "arch": "x86",
+      "target": "x86",
       "current": false,
-      "CPU": 2,
-      "qom_path": "/machine/unattached/device[3]",
+      "cpu-index": 2,
+      "qom-path": "/machine/unattached/device[3]",
       "pc": -2130415978,
       "halted": true,
-      "thread_id": 518294
+      "thread-id": 518294
     },
     {
-      "arch": "x86",
+      "target": "x86",
       "current": false,
-      "CPU": 3,
-      "qom_path": "/machine/unattached/device[4]",
+      "cpu-index": 3,
+      "qom-path": "/machine/unattached/device[4]",
       "pc": -2130415978,
       "halted": true,
-      "thread_id": 518295
+      "thread-id": 518295
     },
     {
-      "arch": "x86",
+      "target": "x86",
       "current": false,
-      "CPU": 4,
-      "qom_path": "/machine/unattached/device[5]",
+      "cpu-index": 4,
+      "qom-path": "/machine/unattached/device[5]",
       "pc": -2130415978,
       "halted": true,
-      "thread_id": 518296
+      "thread-id": 518296
     }
   ],
   "id": "libvirt-22"
@@ -236,63 +236,63 @@
   "id": "libvirt-23"
 }
 
-{"execute":"query-cpus","id":"libvirt-5"}
+{"execute":"query-cpus-fast","id":"libvirt-5"}
 
 {
   "return": [
     {
-      "arch": "x86",
+      "target": "x86",
       "current": true,
-      "CPU": 0,
-      "qom_path": "/machine/unattached/device[0]",
+      "cpu-index": 0,
+      "qom-path": "/machine/unattached/device[0]",
       "pc": -2130415978,
       "halted": true,
-      "thread_id": 518291
+      "thread-id": 518291
     },
     {
-      "arch": "x86",
+      "target": "x86",
       "current": false,
-      "CPU": 1,
-      "qom_path": "/machine/unattached/device[2]",
+      "cpu-index": 1,
+      "qom-path": "/machine/unattached/device[2]",
       "pc": -2130415978,
       "halted": true,
-      "thread_id": 518292
+      "thread-id": 518292
     },
     {
-      "arch": "x86",
+      "target": "x86",
       "current": false,
-      "CPU": 2,
-      "qom_path": "/machine/unattached/device[3]",
+      "cpu-index": 2,
+      "qom-path": "/machine/unattached/device[3]",
       "pc": -2130415978,
       "halted": true,
-      "thread_id": 518294
+      "thread-id": 518294
     },
     {
-      "arch": "x86",
+      "target": "x86",
       "current": false,
-      "CPU": 3,
-      "qom_path": "/machine/unattached/device[4]",
+      "cpu-index": 3,
+      "qom-path": "/machine/unattached/device[4]",
       "pc": -2130415978,
       "halted": true,
-      "thread_id": 518295
+      "thread-id": 518295
     },
     {
-      "arch": "x86",
+      "target": "x86",
       "current": false,
-      "CPU": 4,
-      "qom_path": "/machine/unattached/device[5]",
+      "cpu-index": 4,
+      "qom-path": "/machine/unattached/device[5]",
       "pc": -2130415978,
       "halted": true,
-      "thread_id": 518296
+      "thread-id": 518296
     },
     {
-      "arch": "x86",
+      "target": "x86",
       "current": false,
-      "CPU": 5,
-      "qom_path": "/machine/peripheral/vcpu5",
+      "cpu-index": 5,
+      "qom-path": "/machine/peripheral/vcpu5",
       "pc": -2130415978,
       "halted": true,
-      "thread_id": 518297
+      "thread-id": 518297
     }
   ],
   "id": "libvirt-22"
@@ -399,72 +399,72 @@
   "id": "libvirt-23"
 }
 
-{"execute":"query-cpus","id":"libvirt-8"}
+{"execute":"query-cpus-fast","id":"libvirt-8"}
 
 {
   "return": [
     {
-      "arch": "x86",
+      "target": "x86",
       "current": true,
-      "CPU": 0,
-      "qom_path": "/machine/unattached/device[0]",
+      "cpu-index": 0,
+      "qom-path": "/machine/unattached/device[0]",
       "pc": -2130415978,
       "halted": true,
-      "thread_id": 518291
+      "thread-id": 518291
     },
     {
-      "arch": "x86",
+      "target": "x86",
       "current": false,
-      "CPU": 1,
-      "qom_path": "/machine/unattached/device[2]",
+      "cpu-index": 1,
+      "qom-path": "/machine/unattached/device[2]",
       "pc": -2130415978,
       "halted": true,
-      "thread_id": 518292
+      "thread-id": 518292
     },
     {
-      "arch": "x86",
+      "target": "x86",
       "current": false,
-      "CPU": 2,
-      "qom_path": "/machine/unattached/device[3]",
+      "cpu-index": 2,
+      "qom-path": "/machine/unattached/device[3]",
       "pc": -2130415978,
       "halted": true,
-      "thread_id": 518294
+      "thread-id": 518294
     },
     {
-      "arch": "x86",
+      "target": "x86",
       "current": false,
-      "CPU": 3,
-      "qom_path": "/machine/unattached/device[4]",
+      "cpu-index": 3,
+      "qom-path": "/machine/unattached/device[4]",
       "pc": -2130415978,
       "halted": true,
-      "thread_id": 518295
+      "thread-id": 518295
     },
     {
-      "arch": "x86",
+      "target": "x86",
       "current": false,
-      "CPU": 4,
-      "qom_path": "/machine/unattached/device[5]",
+      "cpu-index": 4,
+      "qom-path": "/machine/unattached/device[5]",
       "pc": -2130415978,
       "halted": true,
-      "thread_id": 518296
+      "thread-id": 518296
     },
     {
-      "arch": "x86",
+      "target": "x86",
       "current": false,
-      "CPU": 5,
-      "qom_path": "/machine/peripheral/vcpu5",
+      "cpu-index": 5,
+      "qom-path": "/machine/peripheral/vcpu5",
       "pc": -2130415978,
       "halted": true,
-      "thread_id": 518297
+      "thread-id": 518297
     },
     {
-      "arch": "x86",
+      "target": "x86",
       "current": false,
-      "CPU": 6,
-      "qom_path": "/machine/peripheral/vcpu6",
+      "cpu-index": 6,
+      "qom-path": "/machine/peripheral/vcpu6",
       "pc": -2130415978,
       "halted": true,
-      "thread_id": 518298
+      "thread-id": 518298
     }
   ],
   "id": "libvirt-22"
diff --git a/tests/qemuhotplugtestcpus/x86-modern-individual-add-monitor.json b/tests/qemuhotplugtestcpus/x86-modern-individual-add-monitor.json
index df05e5e3a9..0acf2d0cd9 100644
--- a/tests/qemuhotplugtestcpus/x86-modern-individual-add-monitor.json
+++ b/tests/qemuhotplugtestcpus/x86-modern-individual-add-monitor.json
@@ -83,54 +83,54 @@
   "id": "libvirt-23"
 }
 
-{"execute":"query-cpus","id":"libvirt-2"}
+{"execute":"query-cpus-fast","id":"libvirt-2"}
 
 {
   "return": [
     {
-      "arch": "x86",
+      "target": "x86",
       "current": true,
-      "CPU": 0,
-      "qom_path": "/machine/unattached/device[0]",
+      "cpu-index": 0,
+      "qom-path": "/machine/unattached/device[0]",
       "pc": -2130415978,
       "halted": true,
-      "thread_id": 518291
+      "thread-id": 518291
     },
     {
-      "arch": "x86",
+      "target": "x86",
       "current": false,
-      "CPU": 1,
-      "qom_path": "/machine/unattached/device[2]",
+      "cpu-index": 1,
+      "qom-path": "/machine/unattached/device[2]",
       "pc": -2130415978,
       "halted": true,
-      "thread_id": 518292
+      "thread-id": 518292
     },
     {
-      "arch": "x86",
+      "target": "x86",
       "current": false,
-      "CPU": 2,
-      "qom_path": "/machine/unattached/device[3]",
+      "cpu-index": 2,
+      "qom-path": "/machine/unattached/device[3]",
       "pc": -2130415978,
       "halted": true,
-      "thread_id": 518294
+      "thread-id": 518294
     },
     {
-      "arch": "x86",
+      "target": "x86",
       "current": false,
-      "CPU": 3,
-      "qom_path": "/machine/unattached/device[4]",
+      "cpu-index": 3,
+      "qom-path": "/machine/unattached/device[4]",
       "pc": -2130415978,
       "halted": true,
-      "thread_id": 518295
+      "thread-id": 518295
     },
     {
-      "arch": "x86",
+      "target": "x86",
       "current": false,
-      "CPU": 4,
-      "qom_path": "/machine/unattached/device[5]",
+      "cpu-index": 4,
+      "qom-path": "/machine/unattached/device[5]",
       "pc": -2130415978,
       "halted": true,
-      "thread_id": 518296
+      "thread-id": 518296
     }
   ],
   "id": "libvirt-22"
@@ -236,63 +236,63 @@
   "id": "libvirt-23"
 }
 
-{"execute":"query-cpus","id":"libvirt-5"}
+{"execute":"query-cpus-fast","id":"libvirt-5"}
 
 {
   "return": [
     {
-      "arch": "x86",
+      "target": "x86",
       "current": true,
-      "CPU": 0,
-      "qom_path": "/machine/unattached/device[0]",
+      "cpu-index": 0,
+      "qom-path": "/machine/unattached/device[0]",
       "pc": -2130415978,
       "halted": true,
-      "thread_id": 518291
+      "thread-id": 518291
     },
     {
-      "arch": "x86",
+      "target": "x86",
       "current": false,
-      "CPU": 1,
-      "qom_path": "/machine/unattached/device[2]",
+      "cpu-index": 1,
+      "qom-path": "/machine/unattached/device[2]",
       "pc": -2130415978,
       "halted": true,
-      "thread_id": 518292
+      "thread-id": 518292
     },
     {
-      "arch": "x86",
+      "target": "x86",
       "current": false,
-      "CPU": 2,
-      "qom_path": "/machine/unattached/device[3]",
+      "cpu-index": 2,
+      "qom-path": "/machine/unattached/device[3]",
       "pc": -2130415978,
       "halted": true,
-      "thread_id": 518294
+      "thread-id": 518294
     },
     {
-      "arch": "x86",
+      "target": "x86",
       "current": false,
-      "CPU": 3,
-      "qom_path": "/machine/unattached/device[4]",
+      "cpu-index": 3,
+      "qom-path": "/machine/unattached/device[4]",
       "pc": -2130415978,
       "halted": true,
-      "thread_id": 518295
+      "thread-id": 518295
     },
     {
-      "arch": "x86",
+      "target": "x86",
       "current": false,
-      "CPU": 4,
-      "qom_path": "/machine/unattached/device[5]",
+      "cpu-index": 4,
+      "qom-path": "/machine/unattached/device[5]",
       "pc": -2130415978,
       "halted": true,
-      "thread_id": 518296
+      "thread-id": 518296
     },
     {
-      "arch": "x86",
+      "target": "x86",
       "current": false,
-      "CPU": 5,
-      "qom_path": "/machine/peripheral/vcpu7",
+      "cpu-index": 5,
+      "qom-path": "/machine/peripheral/vcpu7",
       "pc": -2130415978,
       "halted": true,
-      "thread_id": 518297
+      "thread-id": 518297
     }
   ],
   "id": "libvirt-22"
diff --git a/tests/qemuhotplugtestcpus/x86-old-bulk-monitor.json b/tests/qemuhotplugtestcpus/x86-old-bulk-monitor.json
index 6caf8cc184..626c0a5699 100644
--- a/tests/qemuhotplugtestcpus/x86-old-bulk-monitor.json
+++ b/tests/qemuhotplugtestcpus/x86-old-bulk-monitor.json
@@ -1,51 +1,51 @@
-{"execute":"query-cpus","id":"libvirt-1"}
+{"execute":"query-cpus-fast","id":"libvirt-1"}
 
 {
   "return": [
     {
-      "arch": "x86",
+      "target": "x86",
       "current": true,
-      "CPU": 0,
-      "qom_path": "/machine/unattached/device[0]",
+      "cpu-index": 0,
+      "qom-path": "/machine/unattached/device[0]",
       "pc": -2130415978,
       "halted": true,
-      "thread_id": 518291
+      "thread-id": 518291
     },
     {
-      "arch": "x86",
+      "target": "x86",
       "current": false,
-      "CPU": 1,
-      "qom_path": "/machine/unattached/device[2]",
+      "cpu-index": 1,
+      "qom-path": "/machine/unattached/device[2]",
       "pc": -2130415978,
       "halted": true,
-      "thread_id": 518292
+      "thread-id": 518292
     },
     {
-      "arch": "x86",
+      "target": "x86",
       "current": false,
-      "CPU": 2,
-      "qom_path": "/machine/unattached/device[3]",
+      "cpu-index": 2,
+      "qom-path": "/machine/unattached/device[3]",
       "pc": -2130415978,
       "halted": true,
-      "thread_id": 518294
+      "thread-id": 518294
     },
     {
-      "arch": "x86",
+      "target": "x86",
       "current": false,
-      "CPU": 3,
-      "qom_path": "/machine/unattached/device[4]",
+      "cpu-index": 3,
+      "qom-path": "/machine/unattached/device[4]",
       "pc": -2130415978,
       "halted": true,
-      "thread_id": 518295
+      "thread-id": 518295
     },
     {
-      "arch": "x86",
+      "target": "x86",
       "current": false,
-      "CPU": 4,
-      "qom_path": "/machine/unattached/device[5]",
+      "cpu-index": 4,
+      "qom-path": "/machine/unattached/device[5]",
       "pc": -2130415978,
       "halted": true,
-      "thread_id": 518296
+      "thread-id": 518296
     }
   ],
   "id": "libvirt-22"
@@ -55,63 +55,63 @@
 
 {"return": {}}
 
-{"execute":"query-cpus","id":"libvirt-3"}
+{"execute":"query-cpus-fast","id":"libvirt-3"}
 
 {
   "return": [
     {
-      "arch": "x86",
+      "target": "x86",
       "current": true,
-      "CPU": 0,
-      "qom_path": "/machine/unattached/device[0]",
+      "cpu-index": 0,
+      "qom-path": "/machine/unattached/device[0]",
       "pc": -2130415978,
       "halted": true,
-      "thread_id": 518291
+      "thread-id": 518291
     },
     {
-      "arch": "x86",
+      "target": "x86",
       "current": false,
-      "CPU": 1,
-      "qom_path": "/machine/unattached/device[2]",
+      "cpu-index": 1,
+      "qom-path": "/machine/unattached/device[2]",
       "pc": -2130415978,
       "halted": true,
-      "thread_id": 518292
+      "thread-id": 518292
     },
     {
-      "arch": "x86",
+      "target": "x86",
       "current": false,
-      "CPU": 2,
-      "qom_path": "/machine/unattached/device[3]",
+      "cpu-index": 2,
+      "qom-path": "/machine/unattached/device[3]",
       "pc": -2130415978,
       "halted": true,
-      "thread_id": 518294
+      "thread-id": 518294
     },
     {
-      "arch": "x86",
+      "target": "x86",
       "current": false,
-      "CPU": 3,
-      "qom_path": "/machine/unattached/device[4]",
+      "cpu-index": 3,
+      "qom-path": "/machine/unattached/device[4]",
       "pc": -2130415978,
       "halted": true,
-      "thread_id": 518295
+      "thread-id": 518295
     },
     {
-      "arch": "x86",
+      "target": "x86",
       "current": false,
-      "CPU": 4,
-      "qom_path": "/machine/unattached/device[5]",
+      "cpu-index": 4,
+      "qom-path": "/machine/unattached/device[5]",
       "pc": -2130415978,
       "halted": true,
-      "thread_id": 518296
+      "thread-id": 518296
     },
     {
-      "arch": "x86",
+      "target": "x86",
       "current": false,
-      "CPU": 5,
-      "qom_path": "/machine/peripheral/vcpu5",
+      "cpu-index": 5,
+      "qom-path": "/machine/peripheral/vcpu5",
       "pc": -2130415978,
       "halted": true,
-      "thread_id": 518297
+      "thread-id": 518297
     }
   ],
   "id": "libvirt-22"
@@ -121,72 +121,72 @@
 
 {"return": {}}
 
-{"execute":"query-cpus","id":"libvirt-5"}
+{"execute":"query-cpus-fast","id":"libvirt-5"}
 
 {
   "return": [
     {
-      "arch": "x86",
+      "target": "x86",
       "current": true,
-      "CPU": 0,
-      "qom_path": "/machine/unattached/device[0]",
+      "cpu-index": 0,
+      "qom-path": "/machine/unattached/device[0]",
       "pc": -2130415978,
       "halted": true,
-      "thread_id": 518291
+      "thread-id": 518291
     },
     {
-      "arch": "x86",
+      "target": "x86",
       "current": false,
-      "CPU": 1,
-      "qom_path": "/machine/unattached/device[2]",
+      "cpu-index": 1,
+      "qom-path": "/machine/unattached/device[2]",
       "pc": -2130415978,
       "halted": true,
-      "thread_id": 518292
+      "thread-id": 518292
     },
     {
-      "arch": "x86",
+      "target": "x86",
       "current": false,
-      "CPU": 2,
-      "qom_path": "/machine/unattached/device[3]",
+      "cpu-index": 2,
+      "qom-path": "/machine/unattached/device[3]",
       "pc": -2130415978,
       "halted": true,
-      "thread_id": 518294
+      "thread-id": 518294
     },
     {
-      "arch": "x86",
+      "target": "x86",
       "current": false,
-      "CPU": 3,
-      "qom_path": "/machine/unattached/device[4]",
+      "cpu-index": 3,
+      "qom-path": "/machine/unattached/device[4]",
       "pc": -2130415978,
       "halted": true,
-      "thread_id": 518295
+      "thread-id": 518295
     },
     {
-      "arch": "x86",
+      "target": "x86",
       "current": false,
-      "CPU": 4,
-      "qom_path": "/machine/unattached/device[5]",
+      "cpu-index": 4,
+      "qom-path": "/machine/unattached/device[5]",
       "pc": -2130415978,
       "halted": true,
-      "thread_id": 518296
+      "thread-id": 518296
     },
     {
-      "arch": "x86",
+      "target": "x86",
       "current": false,
-      "CPU": 5,
-      "qom_path": "/machine/peripheral/vcpu5",
+      "cpu-index": 5,
+      "qom-path": "/machine/peripheral/vcpu5",
       "pc": -2130415978,
       "halted": true,
-      "thread_id": 518297
+      "thread-id": 518297
     },
     {
-      "arch": "x86",
+      "target": "x86",
       "current": false,
-      "CPU": 6,
-      "qom_path": "/machine/peripheral/vcpu6",
+      "cpu-index": 6,
+      "qom-path": "/machine/peripheral/vcpu6",
       "pc": -2130415978,
       "halted": true,
-      "thread_id": 518298
+      "thread-id": 518298
     }
   ],
   "id": "libvirt-22"