tests: qemucaps: Make JSON output identical to python's 'json.dump' method

YAJL formats empty objects and arrays in a weird way:

 {
   "emptyarray": [

   ],
   "emptyobject": {

   }
 }

We want to use empty lines to separate commands and replies as well as
be compatible with python's 'json.dump' method, thus we drop any
whitespace between array/object braces.

Adjust the two formatters which are used for capabilities and fix all
output files.

Note that the code is duplicated in qemucapabilitiesnumbering.c and
qemucapsprobemock.c, but later patches will replace
qemucapabilitiesnumbering.c by a python tool.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
Reviewed-by: Andrea Bolognani <abologna@redhat.com>

diff --git a/tests/qemucapabilitiesdata/caps_4.2.0_aarch64.replies b/tests/qemucapabilitiesdata/caps_4.2.0_aarch64.replies
index 28f76b2e9673768fd7aacf7ed9a6fa7328b330ca..ec0dad666ac6add97b92e998f95b6aebe6a04462 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_4.2.0_aarch64.replies
+++ b/tests/qemucapabilitiesdata/caps_4.2.0_aarch64.replies
@@ -4,8 +4,7 @@
 }
 
 {
-  "return": {
-  },
+  "return": {},
   "id": "libvirt-1"
 }
 
@@ -1326,8 +1325,7 @@
     },
     {
       "name": "0",
-      "members": [
-      ],
+      "members": [],
       "meta-type": "object"
     },
     {
@@ -12252,8 +12250,7 @@
     },
     {
       "name": "501",
-      "members": [
-      ],
+      "members": [],
       "meta-type": "object"
     },
     {
@@ -19643,8 +19640,7 @@
 }
 
 {
-  "return": [
-  ],
+  "return": [],
   "id": "libvirt-36"
 }
 
@@ -19654,8 +19650,7 @@
 }
 
 {
-  "return": [
-  ],
+  "return": [],
   "id": "libvirt-37"
 }
 
@@ -19791,8 +19786,7 @@
       "option": "vnc"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": "smbios"
     },
     {
@@ -20080,8 +20074,7 @@
       "option": "icount"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": "numa"
     },
     {
@@ -20136,13 +20129,11 @@
       "option": "realtime"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": "tpmdev"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": "object"
     },
     {
@@ -20446,23 +20437,19 @@
       "option": "rtc"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": "net"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": "nic"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": "netdev"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": "device"
     },
     {
@@ -21028,8 +21015,7 @@
 }
 
 {
-  "return": {
-  },
+  "return": {},
   "id": "libvirt-1"
 }
 

diff --git a/tests/qemucapabilitiesdata/caps_4.2.0_ppc64.replies b/tests/qemucapabilitiesdata/caps_4.2.0_ppc64.replies
index 62393c85fda19e0eb3c18080171038b905aff588..8b97e89f9461e94fbb0120447156ff2c71a6c16d 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_4.2.0_ppc64.replies
+++ b/tests/qemucapabilitiesdata/caps_4.2.0_ppc64.replies
@@ -4,8 +4,7 @@
 }
 
 {
-  "return": {
-  },
+  "return": {},
   "id": "libvirt-1"
 }
 
@@ -1301,8 +1300,7 @@
     },
     {
       "name": "0",
-      "members": [
-      ],
+      "members": [],
       "meta-type": "object"
     },
     {
@@ -11910,8 +11908,7 @@
     },
     {
       "name": "496",
-      "members": [
-      ],
+      "members": [],
       "meta-type": "object"
     },
     {
@@ -20597,8 +20594,7 @@
 }
 
 {
-  "return": [
-  ],
+  "return": [],
   "id": "libvirt-35"
 }
 
@@ -20608,8 +20604,7 @@
 }
 
 {
-  "return": [
-  ],
+  "return": [],
   "id": "libvirt-36"
 }
 
@@ -20971,8 +20966,7 @@
       "option": "fw_cfg"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": ""
     },
     {
@@ -21005,8 +20999,7 @@
       "option": "icount"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": "numa"
     },
     {
@@ -21061,13 +21054,11 @@
       "option": "realtime"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": "tpmdev"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": "object"
     },
     {
@@ -21371,23 +21362,19 @@
       "option": "rtc"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": "net"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": "nic"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": "netdev"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": "device"
     },
     {
@@ -21846,8 +21833,7 @@
 }
 
 {
-  "return": {
-  },
+  "return": {},
   "id": "libvirt-1"
 }
 

diff --git a/tests/qemucapabilitiesdata/caps_4.2.0_s390x.replies b/tests/qemucapabilitiesdata/caps_4.2.0_s390x.replies
index 9c010db799bac6d710e9e5521aa6eb1b114fdb88..def97a8aa903287e74a7db9c42223be734ac8b77 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_4.2.0_s390x.replies
+++ b/tests/qemucapabilitiesdata/caps_4.2.0_s390x.replies
@@ -4,8 +4,7 @@
 }
 
 {
-  "return": {
-  },
+  "return": {},
   "id": "libvirt-1"
 }
 
@@ -1338,8 +1337,7 @@
     },
     {
       "name": "0",
-      "members": [
-      ],
+      "members": [],
       "meta-type": "object"
     },
     {
@@ -12303,8 +12301,7 @@
     },
     {
       "name": "501",
-      "members": [
-      ],
+      "members": [],
       "meta-type": "object"
     },
     {
@@ -16897,592 +16894,518 @@
     {
       "name": "z800-base",
       "typename": "z800-base-s390x-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": true,
       "migration-safe": true
     },
     {
       "name": "z890.2-base",
       "typename": "z890.2-base-s390x-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": true,
       "migration-safe": true
     },
     {
       "name": "z9EC.2",
       "typename": "z9EC.2-s390x-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true
     },
     {
       "name": "z13.2",
       "typename": "z13.2-s390x-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true
     },
     {
       "name": "z9BC-base",
       "typename": "z9BC-base-s390x-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": true,
       "migration-safe": true
     },
     {
       "name": "z990.5-base",
       "typename": "z990.5-base-s390x-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": true,
       "migration-safe": true
     },
     {
       "name": "z890.2",
       "typename": "z890.2-s390x-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true
     },
     {
       "name": "z890",
       "typename": "z890-s390x-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true
     },
     {
       "name": "z9BC",
       "typename": "z9BC-s390x-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true
     },
     {
       "name": "z13",
       "typename": "z13-s390x-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true
     },
     {
       "name": "z196",
       "typename": "z196-s390x-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true
     },
     {
       "name": "z13s",
       "typename": "z13s-s390x-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true
     },
     {
       "name": "host",
       "typename": "host-s390x-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": false
     },
     {
       "name": "z990.3",
       "typename": "z990.3-s390x-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true
     },
     {
       "name": "z13s-base",
       "typename": "z13s-base-s390x-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": true,
       "migration-safe": true
     },
     {
       "name": "z9EC",
       "typename": "z9EC-s390x-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true
     },
     {
       "name": "gen15a",
       "typename": "gen15a-s390x-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true
     },
     {
       "name": "z14ZR1-base",
       "typename": "z14ZR1-base-s390x-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": true,
       "migration-safe": true
     },
     {
       "name": "z14.2-base",
       "typename": "z14.2-base-s390x-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": true,
       "migration-safe": true
     },
     {
       "name": "z900.3-base",
       "typename": "z900.3-base-s390x-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": true,
       "migration-safe": true
     },
     {
       "name": "z13.2-base",
       "typename": "z13.2-base-s390x-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": true,
       "migration-safe": true
     },
     {
       "name": "z196.2-base",
       "typename": "z196.2-base-s390x-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": true,
       "migration-safe": true
     },
     {
       "name": "zBC12-base",
       "typename": "zBC12-base-s390x-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": true,
       "migration-safe": true
     },
     {
       "name": "z9BC.2-base",
       "typename": "z9BC.2-base-s390x-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": true,
       "migration-safe": true
     },
     {
       "name": "z900.2-base",
       "typename": "z900.2-base-s390x-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": true,
       "migration-safe": true
     },
     {
       "name": "z9EC.3",
       "typename": "z9EC.3-s390x-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true
     },
     {
       "name": "zEC12",
       "typename": "zEC12-s390x-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true
     },
     {
       "name": "z900",
       "typename": "z900-s390x-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true
     },
     {
       "name": "z114-base",
       "typename": "z114-base-s390x-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": true,
       "migration-safe": true
     },
     {
       "name": "zEC12-base",
       "typename": "zEC12-base-s390x-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": true,
       "migration-safe": true
     },
     {
       "name": "z10EC.2",
       "typename": "z10EC.2-s390x-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true
     },
     {
       "name": "z10EC-base",
       "typename": "z10EC-base-s390x-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": true,
       "migration-safe": true
     },
     {
       "name": "z900.3",
       "typename": "z900.3-s390x-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true
     },
     {
       "name": "z14ZR1",
       "typename": "z14ZR1-s390x-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true
     },
     {
       "name": "z10BC",
       "typename": "z10BC-s390x-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true
     },
     {
       "name": "z10BC.2-base",
       "typename": "z10BC.2-base-s390x-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": true,
       "migration-safe": true
     },
     {
       "name": "z990.2",
       "typename": "z990.2-s390x-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true
     },
     {
       "name": "z9BC.2",
       "typename": "z9BC.2-s390x-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true
     },
     {
       "name": "z990",
       "typename": "z990-s390x-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true
     },
     {
       "name": "z14",
       "typename": "z14-s390x-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true
     },
     {
       "name": "gen15b-base",
       "typename": "gen15b-base-s390x-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": true,
       "migration-safe": true
     },
     {
       "name": "z990.4",
       "typename": "z990.4-s390x-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true
     },
     {
       "name": "max",
       "typename": "max-s390x-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": false
     },
     {
       "name": "z10EC.2-base",
       "typename": "z10EC.2-base-s390x-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": true,
       "migration-safe": true
     },
     {
       "name": "gen15a-base",
       "typename": "gen15a-base-s390x-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": true,
       "migration-safe": true
     },
     {
       "name": "z800",
       "typename": "z800-s390x-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true
     },
     {
       "name": "zEC12.2",
       "typename": "zEC12.2-s390x-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true
     },
     {
       "name": "z10EC",
       "typename": "z10EC-s390x-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true
     },
     {
       "name": "z990.2-base",
       "typename": "z990.2-base-s390x-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": true,
       "migration-safe": true
     },
     {
       "name": "z900-base",
       "typename": "z900-base-s390x-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": true,
       "migration-safe": true
     },
     {
       "name": "z10BC.2",
       "typename": "z10BC.2-s390x-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true
     },
     {
       "name": "z9EC-base",
       "typename": "z9EC-base-s390x-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": true,
       "migration-safe": true
     },
     {
       "name": "z9EC.3-base",
       "typename": "z9EC.3-base-s390x-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": true,
       "migration-safe": true
     },
     {
       "name": "z114",
       "typename": "z114-s390x-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true
     },
     {
       "name": "z890.3",
       "typename": "z890.3-s390x-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true
     },
     {
       "name": "z196-base",
       "typename": "z196-base-s390x-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": true,
       "migration-safe": true
     },
     {
       "name": "z9EC.2-base",
       "typename": "z9EC.2-base-s390x-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": true,
       "migration-safe": true
     },
     {
       "name": "z196.2",
       "typename": "z196.2-s390x-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true
     },
     {
       "name": "z14.2",
       "typename": "z14.2-s390x-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true
     },
     {
       "name": "z990-base",
       "typename": "z990-base-s390x-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": true,
       "migration-safe": true
     },
     {
       "name": "z900.2",
       "typename": "z900.2-s390x-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true
     },
     {
       "name": "z890-base",
       "typename": "z890-base-s390x-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": true,
       "migration-safe": true
     },
     {
       "name": "z10EC.3",
       "typename": "z10EC.3-s390x-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true
     },
     {
       "name": "z14-base",
       "typename": "z14-base-s390x-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": true,
       "migration-safe": true
     },
     {
       "name": "z990.4-base",
       "typename": "z990.4-base-s390x-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": true,
       "migration-safe": true
     },
     {
       "name": "z10EC.3-base",
       "typename": "z10EC.3-base-s390x-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": true,
       "migration-safe": true
     },
     {
       "name": "z10BC-base",
       "typename": "z10BC-base-s390x-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": true,
       "migration-safe": true
     },
     {
       "name": "z13-base",
       "typename": "z13-base-s390x-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": true,
       "migration-safe": true
     },
     {
       "name": "z990.3-base",
       "typename": "z990.3-base-s390x-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": true,
       "migration-safe": true
     },
     {
       "name": "zEC12.2-base",
       "typename": "zEC12.2-base-s390x-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": true,
       "migration-safe": true
     },
     {
       "name": "zBC12",
       "typename": "zBC12-s390x-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true
     },
     {
       "name": "z890.3-base",
       "typename": "z890.3-base-s390x-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": true,
       "migration-safe": true
     },
     {
       "name": "z990.5",
       "typename": "z990.5-s390x-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true
     },
     {
       "name": "gen15b",
       "typename": "gen15b-s390x-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true
     },
@@ -17505,8 +17428,7 @@
 }
 
 {
-  "return": [
-  ],
+  "return": [],
   "id": "libvirt-33"
 }
 
@@ -17516,8 +17438,7 @@
 }
 
 {
-  "return": [
-  ],
+  "return": [],
   "id": "libvirt-34"
 }
 
@@ -17887,8 +17808,7 @@
       "option": "fw_cfg"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": ""
     },
     {
@@ -17921,8 +17841,7 @@
       "option": "icount"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": "numa"
     },
     {
@@ -17977,13 +17896,11 @@
       "option": "realtime"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": "tpmdev"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": "object"
     },
     {
@@ -18287,23 +18204,19 @@
       "option": "rtc"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": "net"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": "nic"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": "netdev"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": "device"
     },
     {
@@ -18827,8 +18740,7 @@
 }
 
 {
-  "return": {
-  },
+  "return": {},
   "id": "libvirt-1"
 }
 
@@ -18842,8 +18754,7 @@
     {
       "name": "z800-base",
       "typename": "z800-base-s390x-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": true,
       "migration-safe": true
     },
@@ -19528,8 +19439,7 @@
     {
       "name": "host",
       "typename": "host-s390x-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": false
     },
@@ -19851,8 +19761,7 @@
     {
       "name": "z900.3-base",
       "typename": "z900.3-base-s390x-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": true,
       "migration-safe": true
     },
@@ -19983,8 +19892,7 @@
     {
       "name": "z900.2-base",
       "typename": "z900.2-base-s390x-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": true,
       "migration-safe": true
     },
@@ -20147,8 +20055,7 @@
     {
       "name": "z900",
       "typename": "z900-s390x-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true
     },
@@ -20283,8 +20190,7 @@
     {
       "name": "z900.3",
       "typename": "z900.3-s390x-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true
     },
@@ -20774,8 +20680,7 @@
     {
       "name": "max",
       "typename": "max-s390x-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": false
     },
@@ -20852,8 +20757,7 @@
     {
       "name": "z800",
       "typename": "z800-s390x-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true
     },
@@ -21043,8 +20947,7 @@
     {
       "name": "z900-base",
       "typename": "z900-base-s390x-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": true,
       "migration-safe": true
     },
@@ -21623,8 +21526,7 @@
     {
       "name": "z900.2",
       "typename": "z900.2-s390x-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true
     },
@@ -22212,8 +22114,7 @@
     {
       "name": "qemu",
       "typename": "qemu-s390x-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true
     }

diff --git a/tests/qemucapabilitiesdata/caps_4.2.0_x86_64.replies b/tests/qemucapabilitiesdata/caps_4.2.0_x86_64.replies
index 5abb3d09696b359ec1bacf8f7f6e67feafe1438c..d54e955cbf4b3bea0efe72e58e581ae1b51c27b8 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_4.2.0_x86_64.replies
+++ b/tests/qemucapabilitiesdata/caps_4.2.0_x86_64.replies
@@ -4,8 +4,7 @@
 }
 
 {
-  "return": {
-  },
+  "return": {},
   "id": "libvirt-1"
 }
 
@@ -1370,8 +1369,7 @@
     },
     {
       "name": "0",
-      "members": [
-      ],
+      "members": [],
       "meta-type": "object"
     },
     {
@@ -12600,8 +12598,7 @@
     },
     {
       "name": "501",
-      "members": [
-      ],
+      "members": [],
       "meta-type": "object"
     },
     {
@@ -20205,40 +20202,35 @@
     {
       "name": "max",
       "typename": "max-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": false
     },
     {
       "name": "host",
       "typename": "host-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": false
     },
     {
       "name": "base",
       "typename": "base-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": true,
       "migration-safe": true
     },
     {
       "name": "qemu64-v1",
       "typename": "qemu64-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true
     },
     {
       "name": "qemu64",
       "typename": "qemu64-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "qemu64-v1",
       "static": false,
       "migration-safe": true
@@ -20246,16 +20238,14 @@
     {
       "name": "qemu32-v1",
       "typename": "qemu32-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true
     },
     {
       "name": "qemu32",
       "typename": "qemu32-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "qemu32-v1",
       "static": false,
       "migration-safe": true
@@ -20292,16 +20282,14 @@
     {
       "name": "pentium3-v1",
       "typename": "pentium3-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true
     },
     {
       "name": "pentium3",
       "typename": "pentium3-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "pentium3-v1",
       "static": false,
       "migration-safe": true
@@ -20309,16 +20297,14 @@
     {
       "name": "pentium2-v1",
       "typename": "pentium2-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true
     },
     {
       "name": "pentium2",
       "typename": "pentium2-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "pentium2-v1",
       "static": false,
       "migration-safe": true
@@ -20326,16 +20312,14 @@
     {
       "name": "pentium-v1",
       "typename": "pentium-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true
     },
     {
       "name": "pentium",
       "typename": "pentium-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "pentium-v1",
       "static": false,
       "migration-safe": true
@@ -20343,16 +20327,14 @@
     {
       "name": "n270-v1",
       "typename": "n270-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true
     },
     {
       "name": "n270",
       "typename": "n270-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "n270-v1",
       "static": false,
       "migration-safe": true
@@ -20360,16 +20342,14 @@
     {
       "name": "kvm64-v1",
       "typename": "kvm64-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true
     },
     {
       "name": "kvm64",
       "typename": "kvm64-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "kvm64-v1",
       "static": false,
       "migration-safe": true
@@ -20377,16 +20357,14 @@
     {
       "name": "kvm32-v1",
       "typename": "kvm32-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true
     },
     {
       "name": "kvm32",
       "typename": "kvm32-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "kvm32-v1",
       "static": false,
       "migration-safe": true
@@ -20394,16 +20372,14 @@
     {
       "name": "coreduo-v1",
       "typename": "coreduo-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true
     },
     {
       "name": "coreduo",
       "typename": "coreduo-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "coreduo-v1",
       "static": false,
       "migration-safe": true
@@ -20411,16 +20387,14 @@
     {
       "name": "core2duo-v1",
       "typename": "core2duo-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true
     },
     {
       "name": "core2duo",
       "typename": "core2duo-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "core2duo-v1",
       "static": false,
       "migration-safe": true
@@ -20451,24 +20425,21 @@
     {
       "name": "Westmere-v2",
       "typename": "Westmere-v2-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true
     },
     {
       "name": "Westmere-v1",
       "typename": "Westmere-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true
     },
     {
       "name": "Westmere-IBRS",
       "typename": "Westmere-IBRS-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "Westmere-v2",
       "static": false,
       "migration-safe": true
@@ -20476,8 +20447,7 @@
     {
       "name": "Westmere",
       "typename": "Westmere-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "Westmere-v2",
       "static": false,
       "migration-safe": true
@@ -20651,32 +20621,28 @@
     {
       "name": "Skylake-Client-v3",
       "typename": "Skylake-Client-v3-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true
     },
     {
       "name": "Skylake-Client-v2",
       "typename": "Skylake-Client-v2-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true
     },
     {
       "name": "Skylake-Client-v1",
       "typename": "Skylake-Client-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true
     },
     {
       "name": "Skylake-Client-noTSX-IBRS",
       "typename": "Skylake-Client-noTSX-IBRS-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "Skylake-Client-v3",
       "static": false,
       "migration-safe": true
@@ -20684,8 +20650,7 @@
     {
       "name": "Skylake-Client-IBRS",
       "typename": "Skylake-Client-IBRS-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "Skylake-Client-v2",
       "static": false,
       "migration-safe": true
@@ -20693,8 +20658,7 @@
     {
       "name": "Skylake-Client",
       "typename": "Skylake-Client-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "Skylake-Client-v3",
       "static": false,
       "migration-safe": true
@@ -20702,24 +20666,21 @@
     {
       "name": "SandyBridge-v2",
       "typename": "SandyBridge-v2-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true
     },
     {
       "name": "SandyBridge-v1",
       "typename": "SandyBridge-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true
     },
     {
       "name": "SandyBridge-IBRS",
       "typename": "SandyBridge-IBRS-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "SandyBridge-v2",
       "static": false,
       "migration-safe": true
@@ -20727,8 +20688,7 @@
     {
       "name": "SandyBridge",
       "typename": "SandyBridge-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "SandyBridge-v2",
       "static": false,
       "migration-safe": true
@@ -20736,16 +20696,14 @@
     {
       "name": "Penryn-v1",
       "typename": "Penryn-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true
     },
     {
       "name": "Penryn",
       "typename": "Penryn-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "Penryn-v1",
       "static": false,
       "migration-safe": true
@@ -20834,16 +20792,14 @@
     {
       "name": "Opteron_G2-v1",
       "typename": "Opteron_G2-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true
     },
     {
       "name": "Opteron_G2",
       "typename": "Opteron_G2-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "Opteron_G2-v1",
       "static": false,
       "migration-safe": true
@@ -20851,16 +20807,14 @@
     {
       "name": "Opteron_G1-v1",
       "typename": "Opteron_G1-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true
     },
     {
       "name": "Opteron_G1",
       "typename": "Opteron_G1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "Opteron_G1-v1",
       "static": false,
       "migration-safe": true
@@ -20868,24 +20822,21 @@
     {
       "name": "Nehalem-v2",
       "typename": "Nehalem-v2-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true
     },
     {
       "name": "Nehalem-v1",
       "typename": "Nehalem-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true
     },
     {
       "name": "Nehalem-IBRS",
       "typename": "Nehalem-IBRS-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "Nehalem-v2",
       "static": false,
       "migration-safe": true
@@ -20893,8 +20844,7 @@
     {
       "name": "Nehalem",
       "typename": "Nehalem-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "Nehalem-v2",
       "static": false,
       "migration-safe": true
@@ -20939,24 +20889,21 @@
     {
       "name": "IvyBridge-v2",
       "typename": "IvyBridge-v2-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true
     },
     {
       "name": "IvyBridge-v1",
       "typename": "IvyBridge-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true
     },
     {
       "name": "IvyBridge-IBRS",
       "typename": "IvyBridge-IBRS-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "IvyBridge-v2",
       "static": false,
       "migration-safe": true
@@ -20964,8 +20911,7 @@
     {
       "name": "IvyBridge",
       "typename": "IvyBridge-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "IvyBridge-v2",
       "static": false,
       "migration-safe": true
@@ -21169,40 +21115,35 @@
     {
       "name": "Haswell-v4",
       "typename": "Haswell-v4-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true
     },
     {
       "name": "Haswell-v3",
       "typename": "Haswell-v3-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true
     },
     {
       "name": "Haswell-v2",
       "typename": "Haswell-v2-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true
     },
     {
       "name": "Haswell-v1",
       "typename": "Haswell-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true
     },
     {
       "name": "Haswell-noTSX-IBRS",
       "typename": "Haswell-noTSX-IBRS-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "Haswell-v4",
       "static": false,
       "migration-safe": true
@@ -21210,8 +21151,7 @@
     {
       "name": "Haswell-noTSX",
       "typename": "Haswell-noTSX-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "Haswell-v2",
       "static": false,
       "migration-safe": true
@@ -21219,8 +21159,7 @@
     {
       "name": "Haswell-IBRS",
       "typename": "Haswell-IBRS-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "Haswell-v3",
       "static": false,
       "migration-safe": true
@@ -21228,8 +21167,7 @@
     {
       "name": "Haswell",
       "typename": "Haswell-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "Haswell-v4",
       "static": false,
       "migration-safe": true
@@ -21366,16 +21304,14 @@
     {
       "name": "Conroe-v1",
       "typename": "Conroe-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true
     },
     {
       "name": "Conroe",
       "typename": "Conroe-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "Conroe-v1",
       "static": false,
       "migration-safe": true
@@ -21497,40 +21433,35 @@
     {
       "name": "Broadwell-v4",
       "typename": "Broadwell-v4-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true
     },
     {
       "name": "Broadwell-v3",
       "typename": "Broadwell-v3-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true
     },
     {
       "name": "Broadwell-v2",
       "typename": "Broadwell-v2-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true
     },
     {
       "name": "Broadwell-v1",
       "typename": "Broadwell-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true
     },
     {
       "name": "Broadwell-noTSX-IBRS",
       "typename": "Broadwell-noTSX-IBRS-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "Broadwell-v4",
       "static": false,
       "migration-safe": true
@@ -21538,8 +21469,7 @@
     {
       "name": "Broadwell-noTSX",
       "typename": "Broadwell-noTSX-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "Broadwell-v2",
       "static": false,
       "migration-safe": true
@@ -21547,8 +21477,7 @@
     {
       "name": "Broadwell-IBRS",
       "typename": "Broadwell-IBRS-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "Broadwell-v3",
       "static": false,
       "migration-safe": true
@@ -21556,8 +21485,7 @@
     {
       "name": "Broadwell",
       "typename": "Broadwell-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "Broadwell-v4",
       "static": false,
       "migration-safe": true
@@ -21565,16 +21493,14 @@
     {
       "name": "486-v1",
       "typename": "486-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true
     },
     {
       "name": "486",
       "typename": "486-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "486-v1",
       "static": false,
       "migration-safe": true
@@ -21870,13 +21796,11 @@
       "option": "spice"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": "smbios"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": "acpi"
     },
     {
@@ -22114,8 +22038,7 @@
       "option": "fw_cfg"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": ""
     },
     {
@@ -22148,8 +22071,7 @@
       "option": "icount"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": "numa"
     },
     {
@@ -22204,13 +22126,11 @@
       "option": "realtime"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": "tpmdev"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": "object"
     },
     {
@@ -22514,23 +22434,19 @@
       "option": "rtc"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": "net"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": "nic"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": "netdev"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": "device"
     },
     {
@@ -23948,8 +23864,7 @@
 }
 
 {
-  "return": {
-  },
+  "return": {},
   "id": "libvirt-1"
 }
 
@@ -23963,8 +23878,7 @@
     {
       "name": "max",
       "typename": "max-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": false
     },
@@ -23980,24 +23894,21 @@
     {
       "name": "base",
       "typename": "base-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": true,
       "migration-safe": true
     },
     {
       "name": "qemu64-v1",
       "typename": "qemu64-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true
     },
     {
       "name": "qemu64",
       "typename": "qemu64-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "qemu64-v1",
       "static": false,
       "migration-safe": true
@@ -24005,16 +23916,14 @@
     {
       "name": "qemu32-v1",
       "typename": "qemu32-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true
     },
     {
       "name": "qemu32",
       "typename": "qemu32-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "qemu32-v1",
       "static": false,
       "migration-safe": true
@@ -24041,16 +23950,14 @@
     {
       "name": "pentium3-v1",
       "typename": "pentium3-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true
     },
     {
       "name": "pentium3",
       "typename": "pentium3-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "pentium3-v1",
       "static": false,
       "migration-safe": true
@@ -24058,16 +23965,14 @@
     {
       "name": "pentium2-v1",
       "typename": "pentium2-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true
     },
     {
       "name": "pentium2",
       "typename": "pentium2-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "pentium2-v1",
       "static": false,
       "migration-safe": true
@@ -24075,16 +23980,14 @@
     {
       "name": "pentium-v1",
       "typename": "pentium-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true
     },
     {
       "name": "pentium",
       "typename": "pentium-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "pentium-v1",
       "static": false,
       "migration-safe": true
@@ -24092,16 +23995,14 @@
     {
       "name": "n270-v1",
       "typename": "n270-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true
     },
     {
       "name": "n270",
       "typename": "n270-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "n270-v1",
       "static": false,
       "migration-safe": true
@@ -24109,16 +24010,14 @@
     {
       "name": "kvm64-v1",
       "typename": "kvm64-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true
     },
     {
       "name": "kvm64",
       "typename": "kvm64-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "kvm64-v1",
       "static": false,
       "migration-safe": true
@@ -24126,16 +24025,14 @@
     {
       "name": "kvm32-v1",
       "typename": "kvm32-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true
     },
     {
       "name": "kvm32",
       "typename": "kvm32-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "kvm32-v1",
       "static": false,
       "migration-safe": true
@@ -24143,16 +24040,14 @@
     {
       "name": "coreduo-v1",
       "typename": "coreduo-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true
     },
     {
       "name": "coreduo",
       "typename": "coreduo-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "coreduo-v1",
       "static": false,
       "migration-safe": true
@@ -24160,16 +24055,14 @@
     {
       "name": "core2duo-v1",
       "typename": "core2duo-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true
     },
     {
       "name": "core2duo",
       "typename": "core2duo-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "core2duo-v1",
       "static": false,
       "migration-safe": true
@@ -24177,16 +24070,14 @@
     {
       "name": "athlon-v1",
       "typename": "athlon-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true
     },
     {
       "name": "athlon",
       "typename": "athlon-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "athlon-v1",
       "static": false,
       "migration-safe": true
@@ -24203,8 +24094,7 @@
     {
       "name": "Westmere-v1",
       "typename": "Westmere-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true
     },
@@ -24639,16 +24529,14 @@
     {
       "name": "Penryn-v1",
       "typename": "Penryn-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true
     },
     {
       "name": "Penryn",
       "typename": "Penryn-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "Penryn-v1",
       "static": false,
       "migration-safe": true
@@ -24739,16 +24627,14 @@
     {
       "name": "Opteron_G2-v1",
       "typename": "Opteron_G2-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true
     },
     {
       "name": "Opteron_G2",
       "typename": "Opteron_G2-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "Opteron_G2-v1",
       "static": false,
       "migration-safe": true
@@ -24756,16 +24642,14 @@
     {
       "name": "Opteron_G1-v1",
       "typename": "Opteron_G1-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true
     },
     {
       "name": "Opteron_G1",
       "typename": "Opteron_G1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "Opteron_G1-v1",
       "static": false,
       "migration-safe": true
@@ -24782,8 +24666,7 @@
     {
       "name": "Nehalem-v1",
       "typename": "Nehalem-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true
     },
@@ -25500,16 +25383,14 @@
     {
       "name": "Conroe-v1",
       "typename": "Conroe-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true
     },
     {
       "name": "Conroe",
       "typename": "Conroe-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "Conroe-v1",
       "static": false,
       "migration-safe": true
@@ -25837,16 +25718,14 @@
     {
       "name": "486-v1",
       "typename": "486-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true
     },
     {
       "name": "486",
       "typename": "486-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "486-v1",
       "static": false,
       "migration-safe": true

diff --git a/tests/qemucapabilitiesdata/caps_5.0.0_aarch64.replies b/tests/qemucapabilitiesdata/caps_5.0.0_aarch64.replies
index 80cccad97a1af51966ac3f09fe37491eb5316d6e..2a372fb685a1d5173729b36881bdef9f6bfe2f4e 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_5.0.0_aarch64.replies
+++ b/tests/qemucapabilitiesdata/caps_5.0.0_aarch64.replies
@@ -4,8 +4,7 @@
 }
 
 {
-  "return": {
-  },
+  "return": {},
   "id": "libvirt-1"
 }
 
@@ -1358,8 +1357,7 @@
     },
     {
       "name": "0",
-      "members": [
-      ],
+      "members": [],
       "meta-type": "object"
     },
     {
@@ -13061,8 +13059,7 @@
     },
     {
       "name": "521",
-      "members": [
-      ],
+      "members": [],
       "meta-type": "object"
     },
     {
@@ -21154,8 +21151,7 @@
       "option": "vnc"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": "smbios"
     },
     {
@@ -21443,8 +21439,7 @@
       "option": "icount"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": "numa"
     },
     {
@@ -21499,13 +21494,11 @@
       "option": "realtime"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": "tpmdev"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": "object"
     },
     {
@@ -21608,8 +21601,7 @@
       "option": "memory"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": "accel"
     },
     {
@@ -21799,23 +21791,19 @@
       "option": "rtc"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": "net"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": "nic"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": "netdev"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": "device"
     },
     {
@@ -22383,8 +22371,7 @@
 }
 
 {
-  "return": {
-  },
+  "return": {},
   "id": "libvirt-1"
 }
 

diff --git a/tests/qemucapabilitiesdata/caps_5.0.0_ppc64.replies b/tests/qemucapabilitiesdata/caps_5.0.0_ppc64.replies
index 2a2f4f174a6f1d88bef55eb1a633b43dbf43b62a..6bca70e0e50ac992ebc10c28ce5bd59d5edb71f5 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_5.0.0_ppc64.replies
+++ b/tests/qemucapabilitiesdata/caps_5.0.0_ppc64.replies
@@ -4,8 +4,7 @@
 }
 
 {
-  "return": {
-  },
+  "return": {},
   "id": "libvirt-1"
 }
 
@@ -1346,8 +1345,7 @@
     },
     {
       "name": "0",
-      "members": [
-      ],
+      "members": [],
       "meta-type": "object"
     },
     {
@@ -13002,8 +13000,7 @@
     },
     {
       "name": "521",
-      "members": [
-      ],
+      "members": [],
       "meta-type": "object"
     },
     {
@@ -22873,8 +22870,7 @@
       "option": "fw_cfg"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": ""
     },
     {
@@ -22907,8 +22903,7 @@
       "option": "icount"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": "numa"
     },
     {
@@ -22963,13 +22958,11 @@
       "option": "realtime"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": "tpmdev"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": "object"
     },
     {
@@ -23072,8 +23065,7 @@
       "option": "memory"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": "accel"
     },
     {
@@ -23263,23 +23255,19 @@
       "option": "rtc"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": "net"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": "nic"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": "netdev"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": "device"
     },
     {
@@ -23738,8 +23726,7 @@
 }
 
 {
-  "return": {
-  },
+  "return": {},
   "id": "libvirt-1"
 }
 

diff --git a/tests/qemucapabilitiesdata/caps_5.0.0_riscv64.replies b/tests/qemucapabilitiesdata/caps_5.0.0_riscv64.replies
index df4e415458f223eb19d399fb2887195dac165672..e588adca311ce94b4f00095cbde0ee408fe7d067 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_5.0.0_riscv64.replies
+++ b/tests/qemucapabilitiesdata/caps_5.0.0_riscv64.replies
@@ -4,8 +4,7 @@
 }
 
 {
-  "return": {
-  },
+  "return": {},
   "id": "libvirt-1"
 }
 
@@ -1361,8 +1360,7 @@
     },
     {
       "name": "0",
-      "members": [
-      ],
+      "members": [],
       "meta-type": "object"
     },
     {
@@ -13220,8 +13218,7 @@
     },
     {
       "name": "521",
-      "members": [
-      ],
+      "members": [],
       "meta-type": "object"
     },
     {
@@ -18143,8 +18140,7 @@
 }
 
 {
-  "return": [
-  ],
+  "return": [],
   "id": "libvirt-36"
 }
 
@@ -18154,8 +18150,7 @@
 }
 
 {
-  "return": [
-  ],
+  "return": [],
   "id": "libvirt-37"
 }
 
@@ -18654,8 +18649,7 @@
       "option": "fw_cfg"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": ""
     },
     {
@@ -18688,8 +18682,7 @@
       "option": "icount"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": "numa"
     },
     {
@@ -18744,13 +18737,11 @@
       "option": "realtime"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": "tpmdev"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": "object"
     },
     {
@@ -18853,8 +18844,7 @@
       "option": "memory"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": "accel"
     },
     {
@@ -19044,23 +19034,19 @@
       "option": "rtc"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": "net"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": "nic"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": "netdev"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": "device"
     },
     {

diff --git a/tests/qemucapabilitiesdata/caps_5.0.0_x86_64.replies b/tests/qemucapabilitiesdata/caps_5.0.0_x86_64.replies
index 5fa15f8e5e9e2a134b44dc0db2f23d1a66d53400..133479a82cbfdb19a239365ec301498ae44f6e43 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_5.0.0_x86_64.replies
+++ b/tests/qemucapabilitiesdata/caps_5.0.0_x86_64.replies
@@ -4,8 +4,7 @@
 }
 
 {
-  "return": {
-  },
+  "return": {},
   "id": "libvirt-1"
 }
 
@@ -1402,8 +1401,7 @@
     },
     {
       "name": "0",
-      "members": [
-      ],
+      "members": [],
       "meta-type": "object"
     },
     {
@@ -13410,8 +13408,7 @@
     },
     {
       "name": "521",
-      "members": [
-      ],
+      "members": [],
       "meta-type": "object"
     },
     {
@@ -21505,40 +21502,35 @@
     {
       "name": "max",
       "typename": "max-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": false
     },
     {
       "name": "host",
       "typename": "host-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": false
     },
     {
       "name": "base",
       "typename": "base-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": true,
       "migration-safe": true
     },
     {
       "name": "qemu64-v1",
       "typename": "qemu64-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true
     },
     {
       "name": "qemu64",
       "typename": "qemu64-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "qemu64-v1",
       "static": false,
       "migration-safe": true
@@ -21546,16 +21538,14 @@
     {
       "name": "qemu32-v1",
       "typename": "qemu32-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true
     },
     {
       "name": "qemu32",
       "typename": "qemu32-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "qemu32-v1",
       "static": false,
       "migration-safe": true
@@ -21592,16 +21582,14 @@
     {
       "name": "pentium3-v1",
       "typename": "pentium3-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true
     },
     {
       "name": "pentium3",
       "typename": "pentium3-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "pentium3-v1",
       "static": false,
       "migration-safe": true
@@ -21609,16 +21597,14 @@
     {
       "name": "pentium2-v1",
       "typename": "pentium2-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true
     },
     {
       "name": "pentium2",
       "typename": "pentium2-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "pentium2-v1",
       "static": false,
       "migration-safe": true
@@ -21626,16 +21612,14 @@
     {
       "name": "pentium-v1",
       "typename": "pentium-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true
     },
     {
       "name": "pentium",
       "typename": "pentium-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "pentium-v1",
       "static": false,
       "migration-safe": true
@@ -21643,16 +21627,14 @@
     {
       "name": "n270-v1",
       "typename": "n270-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true
     },
     {
       "name": "n270",
       "typename": "n270-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "n270-v1",
       "static": false,
       "migration-safe": true
@@ -21660,16 +21642,14 @@
     {
       "name": "kvm64-v1",
       "typename": "kvm64-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true
     },
     {
       "name": "kvm64",
       "typename": "kvm64-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "kvm64-v1",
       "static": false,
       "migration-safe": true
@@ -21677,16 +21657,14 @@
     {
       "name": "kvm32-v1",
       "typename": "kvm32-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true
     },
     {
       "name": "kvm32",
       "typename": "kvm32-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "kvm32-v1",
       "static": false,
       "migration-safe": true
@@ -21694,16 +21672,14 @@
     {
       "name": "coreduo-v1",
       "typename": "coreduo-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true
     },
     {
       "name": "coreduo",
       "typename": "coreduo-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "coreduo-v1",
       "static": false,
       "migration-safe": true
@@ -21711,16 +21687,14 @@
     {
       "name": "core2duo-v1",
       "typename": "core2duo-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true
     },
     {
       "name": "core2duo",
       "typename": "core2duo-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "core2duo-v1",
       "static": false,
       "migration-safe": true
@@ -21751,24 +21725,21 @@
     {
       "name": "Westmere-v2",
       "typename": "Westmere-v2-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true
     },
     {
       "name": "Westmere-v1",
       "typename": "Westmere-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true
     },
     {
       "name": "Westmere-IBRS",
       "typename": "Westmere-IBRS-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "Westmere-v2",
       "static": false,
       "migration-safe": true
@@ -21776,8 +21747,7 @@
     {
       "name": "Westmere",
       "typename": "Westmere-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "Westmere-v1",
       "static": false,
       "migration-safe": true
@@ -21951,32 +21921,28 @@
     {
       "name": "Skylake-Client-v3",
       "typename": "Skylake-Client-v3-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true
     },
     {
       "name": "Skylake-Client-v2",
       "typename": "Skylake-Client-v2-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true
     },
     {
       "name": "Skylake-Client-v1",
       "typename": "Skylake-Client-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true
     },
     {
       "name": "Skylake-Client-noTSX-IBRS",
       "typename": "Skylake-Client-noTSX-IBRS-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "Skylake-Client-v3",
       "static": false,
       "migration-safe": true
@@ -21984,8 +21950,7 @@
     {
       "name": "Skylake-Client-IBRS",
       "typename": "Skylake-Client-IBRS-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "Skylake-Client-v2",
       "static": false,
       "migration-safe": true
@@ -21993,8 +21958,7 @@
     {
       "name": "Skylake-Client",
       "typename": "Skylake-Client-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "Skylake-Client-v1",
       "static": false,
       "migration-safe": true
@@ -22002,24 +21966,21 @@
     {
       "name": "SandyBridge-v2",
       "typename": "SandyBridge-v2-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true
     },
     {
       "name": "SandyBridge-v1",
       "typename": "SandyBridge-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true
     },
     {
       "name": "SandyBridge-IBRS",
       "typename": "SandyBridge-IBRS-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "SandyBridge-v2",
       "static": false,
       "migration-safe": true
@@ -22027,8 +21988,7 @@
     {
       "name": "SandyBridge",
       "typename": "SandyBridge-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "SandyBridge-v1",
       "static": false,
       "migration-safe": true
@@ -22036,16 +21996,14 @@
     {
       "name": "Penryn-v1",
       "typename": "Penryn-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true
     },
     {
       "name": "Penryn",
       "typename": "Penryn-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "Penryn-v1",
       "static": false,
       "migration-safe": true
@@ -22134,16 +22092,14 @@
     {
       "name": "Opteron_G2-v1",
       "typename": "Opteron_G2-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true
     },
     {
       "name": "Opteron_G2",
       "typename": "Opteron_G2-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "Opteron_G2-v1",
       "static": false,
       "migration-safe": true
@@ -22151,16 +22107,14 @@
     {
       "name": "Opteron_G1-v1",
       "typename": "Opteron_G1-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true
     },
     {
       "name": "Opteron_G1",
       "typename": "Opteron_G1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "Opteron_G1-v1",
       "static": false,
       "migration-safe": true
@@ -22168,24 +22122,21 @@
     {
       "name": "Nehalem-v2",
       "typename": "Nehalem-v2-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true
     },
     {
       "name": "Nehalem-v1",
       "typename": "Nehalem-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true
     },
     {
       "name": "Nehalem-IBRS",
       "typename": "Nehalem-IBRS-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "Nehalem-v2",
       "static": false,
       "migration-safe": true
@@ -22193,8 +22144,7 @@
     {
       "name": "Nehalem",
       "typename": "Nehalem-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "Nehalem-v1",
       "static": false,
       "migration-safe": true
@@ -22239,24 +22189,21 @@
     {
       "name": "IvyBridge-v2",
       "typename": "IvyBridge-v2-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true
     },
     {
       "name": "IvyBridge-v1",
       "typename": "IvyBridge-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true
     },
     {
       "name": "IvyBridge-IBRS",
       "typename": "IvyBridge-IBRS-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "IvyBridge-v2",
       "static": false,
       "migration-safe": true
@@ -22264,8 +22211,7 @@
     {
       "name": "IvyBridge",
       "typename": "IvyBridge-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "IvyBridge-v1",
       "static": false,
       "migration-safe": true
@@ -22502,40 +22448,35 @@
     {
       "name": "Haswell-v4",
       "typename": "Haswell-v4-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true
     },
     {
       "name": "Haswell-v3",
       "typename": "Haswell-v3-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true
     },
     {
       "name": "Haswell-v2",
       "typename": "Haswell-v2-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true
     },
     {
       "name": "Haswell-v1",
       "typename": "Haswell-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true
     },
     {
       "name": "Haswell-noTSX-IBRS",
       "typename": "Haswell-noTSX-IBRS-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "Haswell-v4",
       "static": false,
       "migration-safe": true
@@ -22543,8 +22484,7 @@
     {
       "name": "Haswell-noTSX",
       "typename": "Haswell-noTSX-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "Haswell-v2",
       "static": false,
       "migration-safe": true
@@ -22552,8 +22492,7 @@
     {
       "name": "Haswell-IBRS",
       "typename": "Haswell-IBRS-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "Haswell-v3",
       "static": false,
       "migration-safe": true
@@ -22561,8 +22500,7 @@
     {
       "name": "Haswell",
       "typename": "Haswell-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "Haswell-v1",
       "static": false,
       "migration-safe": true
@@ -22831,16 +22769,14 @@
     {
       "name": "Conroe-v1",
       "typename": "Conroe-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true
     },
     {
       "name": "Conroe",
       "typename": "Conroe-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "Conroe-v1",
       "static": false,
       "migration-safe": true
@@ -22959,40 +22895,35 @@
     {
       "name": "Broadwell-v4",
       "typename": "Broadwell-v4-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true
     },
     {
       "name": "Broadwell-v3",
       "typename": "Broadwell-v3-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true
     },
     {
       "name": "Broadwell-v2",
       "typename": "Broadwell-v2-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true
     },
     {
       "name": "Broadwell-v1",
       "typename": "Broadwell-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true
     },
     {
       "name": "Broadwell-noTSX-IBRS",
       "typename": "Broadwell-noTSX-IBRS-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "Broadwell-v4",
       "static": false,
       "migration-safe": true
@@ -23000,8 +22931,7 @@
     {
       "name": "Broadwell-noTSX",
       "typename": "Broadwell-noTSX-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "Broadwell-v2",
       "static": false,
       "migration-safe": true
@@ -23009,8 +22939,7 @@
     {
       "name": "Broadwell-IBRS",
       "typename": "Broadwell-IBRS-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "Broadwell-v3",
       "static": false,
       "migration-safe": true
@@ -23018,8 +22947,7 @@
     {
       "name": "Broadwell",
       "typename": "Broadwell-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "Broadwell-v1",
       "static": false,
       "migration-safe": true
@@ -23027,16 +22955,14 @@
     {
       "name": "486-v1",
       "typename": "486-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true
     },
     {
       "name": "486",
       "typename": "486-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "486-v1",
       "static": false,
       "migration-safe": true
@@ -23332,13 +23258,11 @@
       "option": "spice"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": "smbios"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": "acpi"
     },
     {
@@ -23576,8 +23500,7 @@
       "option": "fw_cfg"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": ""
     },
     {
@@ -23610,8 +23533,7 @@
       "option": "icount"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": "numa"
     },
     {
@@ -23666,13 +23588,11 @@
       "option": "realtime"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": "tpmdev"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": "object"
     },
     {
@@ -23775,8 +23695,7 @@
       "option": "memory"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": "accel"
     },
     {
@@ -23966,23 +23885,19 @@
       "option": "rtc"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": "net"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": "nic"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": "netdev"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": "device"
     },
     {
@@ -25403,8 +25318,7 @@
 }
 
 {
-  "return": {
-  },
+  "return": {},
   "id": "libvirt-1"
 }
 
@@ -25418,8 +25332,7 @@
     {
       "name": "max",
       "typename": "max-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": false
     },
@@ -25435,24 +25348,21 @@
     {
       "name": "base",
       "typename": "base-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": true,
       "migration-safe": true
     },
     {
       "name": "qemu64-v1",
       "typename": "qemu64-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true
     },
     {
       "name": "qemu64",
       "typename": "qemu64-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "qemu64-v1",
       "static": false,
       "migration-safe": true
@@ -25460,16 +25370,14 @@
     {
       "name": "qemu32-v1",
       "typename": "qemu32-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true
     },
     {
       "name": "qemu32",
       "typename": "qemu32-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "qemu32-v1",
       "static": false,
       "migration-safe": true
@@ -25496,16 +25404,14 @@
     {
       "name": "pentium3-v1",
       "typename": "pentium3-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true
     },
     {
       "name": "pentium3",
       "typename": "pentium3-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "pentium3-v1",
       "static": false,
       "migration-safe": true
@@ -25513,16 +25419,14 @@
     {
       "name": "pentium2-v1",
       "typename": "pentium2-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true
     },
     {
       "name": "pentium2",
       "typename": "pentium2-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "pentium2-v1",
       "static": false,
       "migration-safe": true
@@ -25530,16 +25434,14 @@
     {
       "name": "pentium-v1",
       "typename": "pentium-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true
     },
     {
       "name": "pentium",
       "typename": "pentium-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "pentium-v1",
       "static": false,
       "migration-safe": true
@@ -25547,16 +25449,14 @@
     {
       "name": "n270-v1",
       "typename": "n270-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true
     },
     {
       "name": "n270",
       "typename": "n270-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "n270-v1",
       "static": false,
       "migration-safe": true
@@ -25564,16 +25464,14 @@
     {
       "name": "kvm64-v1",
       "typename": "kvm64-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true
     },
     {
       "name": "kvm64",
       "typename": "kvm64-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "kvm64-v1",
       "static": false,
       "migration-safe": true
@@ -25581,16 +25479,14 @@
     {
       "name": "kvm32-v1",
       "typename": "kvm32-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true
     },
     {
       "name": "kvm32",
       "typename": "kvm32-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "kvm32-v1",
       "static": false,
       "migration-safe": true
@@ -25598,16 +25494,14 @@
     {
       "name": "coreduo-v1",
       "typename": "coreduo-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true
     },
     {
       "name": "coreduo",
       "typename": "coreduo-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "coreduo-v1",
       "static": false,
       "migration-safe": true
@@ -25615,16 +25509,14 @@
     {
       "name": "core2duo-v1",
       "typename": "core2duo-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true
     },
     {
       "name": "core2duo",
       "typename": "core2duo-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "core2duo-v1",
       "static": false,
       "migration-safe": true
@@ -25632,16 +25524,14 @@
     {
       "name": "athlon-v1",
       "typename": "athlon-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true
     },
     {
       "name": "athlon",
       "typename": "athlon-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "athlon-v1",
       "static": false,
       "migration-safe": true
@@ -25658,8 +25548,7 @@
     {
       "name": "Westmere-v1",
       "typename": "Westmere-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true
     },
@@ -25676,8 +25565,7 @@
     {
       "name": "Westmere",
       "typename": "Westmere-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "Westmere-v1",
       "static": false,
       "migration-safe": true
@@ -26094,16 +25982,14 @@
     {
       "name": "Penryn-v1",
       "typename": "Penryn-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true
     },
     {
       "name": "Penryn",
       "typename": "Penryn-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "Penryn-v1",
       "static": false,
       "migration-safe": true
@@ -26194,16 +26080,14 @@
     {
       "name": "Opteron_G2-v1",
       "typename": "Opteron_G2-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true
     },
     {
       "name": "Opteron_G2",
       "typename": "Opteron_G2-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "Opteron_G2-v1",
       "static": false,
       "migration-safe": true
@@ -26211,16 +26095,14 @@
     {
       "name": "Opteron_G1-v1",
       "typename": "Opteron_G1-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true
     },
     {
       "name": "Opteron_G1",
       "typename": "Opteron_G1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "Opteron_G1-v1",
       "static": false,
       "migration-safe": true
@@ -26237,8 +26119,7 @@
     {
       "name": "Nehalem-v1",
       "typename": "Nehalem-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true
     },
@@ -26255,8 +26136,7 @@
     {
       "name": "Nehalem",
       "typename": "Nehalem-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "Nehalem-v1",
       "static": false,
       "migration-safe": true
@@ -27183,16 +27063,14 @@
     {
       "name": "Conroe-v1",
       "typename": "Conroe-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true
     },
     {
       "name": "Conroe",
       "typename": "Conroe-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "Conroe-v1",
       "static": false,
       "migration-safe": true
@@ -27518,16 +27396,14 @@
     {
       "name": "486-v1",
       "typename": "486-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true
     },
     {
       "name": "486",
       "typename": "486-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "486-v1",
       "static": false,
       "migration-safe": true

diff --git a/tests/qemucapabilitiesdata/caps_5.1.0_sparc.replies b/tests/qemucapabilitiesdata/caps_5.1.0_sparc.replies
index ebb285f810702c48daf8da478a8f5e946f695e1a..7650f09233ed7720d918d75932420dd6b67e5d95 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_5.1.0_sparc.replies
+++ b/tests/qemucapabilitiesdata/caps_5.1.0_sparc.replies
@@ -4,8 +4,7 @@
 }
 
 {
-  "return": {
-  },
+  "return": {},
   "id": "libvirt-1"
 }
 
@@ -1377,8 +1376,7 @@
     },
     {
       "name": "0",
-      "members": [
-      ],
+      "members": [],
       "meta-type": "object"
     },
     {
@@ -13627,8 +13625,7 @@
     },
     {
       "name": "531",
-      "members": [
-      ],
+      "members": [],
       "meta-type": "object"
     },
     {
@@ -15425,8 +15422,7 @@
 }
 
 {
-  "return": [
-  ],
+  "return": [],
   "id": "libvirt-22"
 }
 
@@ -15436,8 +15432,7 @@
 }
 
 {
-  "return": [
-  ],
+  "return": [],
   "id": "libvirt-23"
 }
 
@@ -15941,8 +15936,7 @@
       "option": "fw_cfg"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": ""
     },
     {
@@ -15975,8 +15969,7 @@
       "option": "icount"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": "numa"
     },
     {
@@ -16036,13 +16029,11 @@
       "option": "realtime"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": "tpmdev"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": "object"
     },
     {
@@ -16145,8 +16136,7 @@
       "option": "memory"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": "accel"
     },
     {
@@ -16336,23 +16326,19 @@
       "option": "rtc"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": "net"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": "nic"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": "netdev"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": "device"
     },
     {

diff --git a/tests/qemucapabilitiesdata/caps_5.1.0_x86_64.replies b/tests/qemucapabilitiesdata/caps_5.1.0_x86_64.replies
index 6d16c9fa5e16a41084c4e7bf69af344b3288c70d..12843404baf2090256f2f85942fc2f8b835ac79a 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_5.1.0_x86_64.replies
+++ b/tests/qemucapabilitiesdata/caps_5.1.0_x86_64.replies
@@ -4,8 +4,7 @@
 }
 
 {
-  "return": {
-  },
+  "return": {},
   "id": "libvirt-1"
 }
 
@@ -1413,8 +1412,7 @@
     },
     {
       "name": "0",
-      "members": [
-      ],
+      "members": [],
       "meta-type": "object"
     },
     {
@@ -13801,8 +13799,7 @@
     },
     {
       "name": "531",
-      "members": [
-      ],
+      "members": [],
       "meta-type": "object"
     },
     {
@@ -22278,40 +22275,35 @@
     {
       "name": "max",
       "typename": "max-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": false
     },
     {
       "name": "host",
       "typename": "host-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": false
     },
     {
       "name": "base",
       "typename": "base-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": true,
       "migration-safe": true
     },
     {
       "name": "qemu64-v1",
       "typename": "qemu64-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true
     },
     {
       "name": "qemu64",
       "typename": "qemu64-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "qemu64-v1",
       "static": false,
       "migration-safe": true
@@ -22319,16 +22311,14 @@
     {
       "name": "qemu32-v1",
       "typename": "qemu32-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true
     },
     {
       "name": "qemu32",
       "typename": "qemu32-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "qemu32-v1",
       "static": false,
       "migration-safe": true
@@ -22357,16 +22347,14 @@
     {
       "name": "pentium3-v1",
       "typename": "pentium3-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true
     },
     {
       "name": "pentium3",
       "typename": "pentium3-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "pentium3-v1",
       "static": false,
       "migration-safe": true
@@ -22374,16 +22362,14 @@
     {
       "name": "pentium2-v1",
       "typename": "pentium2-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true
     },
     {
       "name": "pentium2",
       "typename": "pentium2-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "pentium2-v1",
       "static": false,
       "migration-safe": true
@@ -22391,16 +22377,14 @@
     {
       "name": "pentium-v1",
       "typename": "pentium-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true
     },
     {
       "name": "pentium",
       "typename": "pentium-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "pentium-v1",
       "static": false,
       "migration-safe": true
@@ -22427,16 +22411,14 @@
     {
       "name": "kvm64-v1",
       "typename": "kvm64-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true
     },
     {
       "name": "kvm64",
       "typename": "kvm64-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "kvm64-v1",
       "static": false,
       "migration-safe": true
@@ -22444,16 +22426,14 @@
     {
       "name": "kvm32-v1",
       "typename": "kvm32-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true
     },
     {
       "name": "kvm32",
       "typename": "kvm32-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "kvm32-v1",
       "static": false,
       "migration-safe": true
@@ -22529,8 +22509,7 @@
     {
       "name": "Westmere-v1",
       "typename": "Westmere-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true
     },
@@ -22547,8 +22526,7 @@
     {
       "name": "Westmere",
       "typename": "Westmere-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "Westmere-v1",
       "static": false,
       "migration-safe": true
@@ -22864,8 +22842,7 @@
     {
       "name": "SandyBridge-v1",
       "typename": "SandyBridge-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true
     },
@@ -22882,8 +22859,7 @@
     {
       "name": "SandyBridge",
       "typename": "SandyBridge-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "SandyBridge-v1",
       "static": false,
       "migration-safe": true
@@ -22891,16 +22867,14 @@
     {
       "name": "Penryn-v1",
       "typename": "Penryn-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true
     },
     {
       "name": "Penryn",
       "typename": "Penryn-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "Penryn-v1",
       "static": false,
       "migration-safe": true
@@ -22952,16 +22926,14 @@
     {
       "name": "Opteron_G3-v1",
       "typename": "Opteron_G3-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true
     },
     {
       "name": "Opteron_G3",
       "typename": "Opteron_G3-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "Opteron_G3-v1",
       "static": false,
       "migration-safe": true
@@ -22969,16 +22941,14 @@
     {
       "name": "Opteron_G2-v1",
       "typename": "Opteron_G2-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true
     },
     {
       "name": "Opteron_G2",
       "typename": "Opteron_G2-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "Opteron_G2-v1",
       "static": false,
       "migration-safe": true
@@ -22986,16 +22956,14 @@
     {
       "name": "Opteron_G1-v1",
       "typename": "Opteron_G1-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true
     },
     {
       "name": "Opteron_G1",
       "typename": "Opteron_G1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "Opteron_G1-v1",
       "static": false,
       "migration-safe": true
@@ -23012,8 +22980,7 @@
     {
       "name": "Nehalem-v1",
       "typename": "Nehalem-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true
     },
@@ -23030,8 +22997,7 @@
     {
       "name": "Nehalem",
       "typename": "Nehalem-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "Nehalem-v1",
       "static": false,
       "migration-safe": true
@@ -23516,40 +23482,35 @@
     {
       "name": "EPYC-v3",
       "typename": "EPYC-v3-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true
     },
     {
       "name": "EPYC-v2",
       "typename": "EPYC-v2-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true
     },
     {
       "name": "EPYC-v1",
       "typename": "EPYC-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true
     },
     {
       "name": "EPYC-Rome-v1",
       "typename": "EPYC-Rome-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true
     },
     {
       "name": "EPYC-Rome",
       "typename": "EPYC-Rome-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "EPYC-Rome-v1",
       "static": false,
       "migration-safe": true
@@ -23557,8 +23518,7 @@
     {
       "name": "EPYC-IBPB",
       "typename": "EPYC-IBPB-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "EPYC-v2",
       "static": false,
       "migration-safe": true
@@ -23566,8 +23526,7 @@
     {
       "name": "EPYC",
       "typename": "EPYC-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "EPYC-v1",
       "static": false,
       "migration-safe": true
@@ -23575,16 +23534,14 @@
     {
       "name": "Dhyana-v1",
       "typename": "Dhyana-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true
     },
     {
       "name": "Dhyana",
       "typename": "Dhyana-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "Dhyana-v1",
       "static": false,
       "migration-safe": true
@@ -23686,16 +23643,14 @@
     {
       "name": "Conroe-v1",
       "typename": "Conroe-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true
     },
     {
       "name": "Conroe",
       "typename": "Conroe-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "Conroe-v1",
       "static": false,
       "migration-safe": true
@@ -23957,16 +23912,14 @@
     {
       "name": "486-v1",
       "typename": "486-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true
     },
     {
       "name": "486",
       "typename": "486-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "486-v1",
       "static": false,
       "migration-safe": true
@@ -24262,13 +24215,11 @@
       "option": "spice"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": "smbios"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": "acpi"
     },
     {
@@ -24511,8 +24462,7 @@
       "option": "fw_cfg"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": ""
     },
     {
@@ -24545,8 +24495,7 @@
       "option": "icount"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": "numa"
     },
     {
@@ -24606,13 +24555,11 @@
       "option": "realtime"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": "tpmdev"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": "object"
     },
     {
@@ -24715,8 +24662,7 @@
       "option": "memory"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": "accel"
     },
     {
@@ -24906,23 +24852,19 @@
       "option": "rtc"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": "net"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": "nic"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": "netdev"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": "device"
     },
     {
@@ -26367,8 +26309,7 @@
 }
 
 {
-  "return": {
-  },
+  "return": {},
   "id": "libvirt-1"
 }
 
@@ -26382,8 +26323,7 @@
     {
       "name": "max",
       "typename": "max-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": false
     },
@@ -26399,24 +26339,21 @@
     {
       "name": "base",
       "typename": "base-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": true,
       "migration-safe": true
     },
     {
       "name": "qemu64-v1",
       "typename": "qemu64-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true
     },
     {
       "name": "qemu64",
       "typename": "qemu64-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "qemu64-v1",
       "static": false,
       "migration-safe": true
@@ -26424,16 +26361,14 @@
     {
       "name": "qemu32-v1",
       "typename": "qemu32-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true
     },
     {
       "name": "qemu32",
       "typename": "qemu32-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "qemu32-v1",
       "static": false,
       "migration-safe": true
@@ -26460,16 +26395,14 @@
     {
       "name": "pentium3-v1",
       "typename": "pentium3-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true
     },
     {
       "name": "pentium3",
       "typename": "pentium3-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "pentium3-v1",
       "static": false,
       "migration-safe": true
@@ -26477,16 +26410,14 @@
     {
       "name": "pentium2-v1",
       "typename": "pentium2-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true
     },
     {
       "name": "pentium2",
       "typename": "pentium2-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "pentium2-v1",
       "static": false,
       "migration-safe": true
@@ -26494,16 +26425,14 @@
     {
       "name": "pentium-v1",
       "typename": "pentium-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true
     },
     {
       "name": "pentium",
       "typename": "pentium-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "pentium-v1",
       "static": false,
       "migration-safe": true
@@ -26511,16 +26440,14 @@
     {
       "name": "n270-v1",
       "typename": "n270-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true
     },
     {
       "name": "n270",
       "typename": "n270-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "n270-v1",
       "static": false,
       "migration-safe": true
@@ -26528,16 +26455,14 @@
     {
       "name": "kvm64-v1",
       "typename": "kvm64-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true
     },
     {
       "name": "kvm64",
       "typename": "kvm64-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "kvm64-v1",
       "static": false,
       "migration-safe": true
@@ -26545,16 +26470,14 @@
     {
       "name": "kvm32-v1",
       "typename": "kvm32-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true
     },
     {
       "name": "kvm32",
       "typename": "kvm32-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "kvm32-v1",
       "static": false,
       "migration-safe": true
@@ -26562,16 +26485,14 @@
     {
       "name": "coreduo-v1",
       "typename": "coreduo-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true
     },
     {
       "name": "coreduo",
       "typename": "coreduo-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "coreduo-v1",
       "static": false,
       "migration-safe": true
@@ -26579,16 +26500,14 @@
     {
       "name": "core2duo-v1",
       "typename": "core2duo-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true
     },
     {
       "name": "core2duo",
       "typename": "core2duo-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "core2duo-v1",
       "static": false,
       "migration-safe": true
@@ -26596,16 +26515,14 @@
     {
       "name": "athlon-v1",
       "typename": "athlon-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true
     },
     {
       "name": "athlon",
       "typename": "athlon-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "athlon-v1",
       "static": false,
       "migration-safe": true
@@ -26622,8 +26539,7 @@
     {
       "name": "Westmere-v1",
       "typename": "Westmere-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true
     },
@@ -26640,8 +26556,7 @@
     {
       "name": "Westmere",
       "typename": "Westmere-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "Westmere-v1",
       "static": false,
       "migration-safe": true
@@ -27083,16 +26998,14 @@
     {
       "name": "Penryn-v1",
       "typename": "Penryn-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true
     },
     {
       "name": "Penryn",
       "typename": "Penryn-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "Penryn-v1",
       "static": false,
       "migration-safe": true
@@ -27183,16 +27096,14 @@
     {
       "name": "Opteron_G2-v1",
       "typename": "Opteron_G2-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true
     },
     {
       "name": "Opteron_G2",
       "typename": "Opteron_G2-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "Opteron_G2-v1",
       "static": false,
       "migration-safe": true
@@ -27200,16 +27111,14 @@
     {
       "name": "Opteron_G1-v1",
       "typename": "Opteron_G1-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true
     },
     {
       "name": "Opteron_G1",
       "typename": "Opteron_G1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "Opteron_G1-v1",
       "static": false,
       "migration-safe": true
@@ -27226,8 +27135,7 @@
     {
       "name": "Nehalem-v1",
       "typename": "Nehalem-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true
     },
@@ -27244,8 +27152,7 @@
     {
       "name": "Nehalem",
       "typename": "Nehalem-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "Nehalem-v1",
       "static": false,
       "migration-safe": true
@@ -28219,16 +28126,14 @@
     {
       "name": "Conroe-v1",
       "typename": "Conroe-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true
     },
     {
       "name": "Conroe",
       "typename": "Conroe-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "Conroe-v1",
       "static": false,
       "migration-safe": true
@@ -28586,16 +28491,14 @@
     {
       "name": "486-v1",
       "typename": "486-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true
     },
     {
       "name": "486",
       "typename": "486-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "486-v1",
       "static": false,
       "migration-safe": true

diff --git a/tests/qemucapabilitiesdata/caps_5.2.0_aarch64.replies b/tests/qemucapabilitiesdata/caps_5.2.0_aarch64.replies
index e7cdce76ec89a21aab4ea61857b0bfb2fa57684b..2c07f6a0f859dbf68f31a416deb1ece6e0409340 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_5.2.0_aarch64.replies
+++ b/tests/qemucapabilitiesdata/caps_5.2.0_aarch64.replies
@@ -4,8 +4,7 @@
 }
 
 {
-  "return": {
-  },
+  "return": {},
   "id": "libvirt-1"
 }
 
@@ -1430,8 +1429,7 @@
     },
     {
       "name": "0",
-      "members": [
-      ],
+      "members": [],
       "meta-type": "object"
     },
     {
@@ -13907,8 +13905,7 @@
     },
     {
       "name": "552",
-      "members": [
-      ],
+      "members": [],
       "meta-type": "object"
     },
     {
@@ -22719,8 +22716,7 @@
       "option": "fsdev"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": "smbios"
     },
     {
@@ -22888,8 +22884,7 @@
       "option": "icount"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": "numa"
     },
     {
@@ -22949,13 +22944,11 @@
       "option": "realtime"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": "tpmdev"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": "object"
     },
     {
@@ -23058,8 +23051,7 @@
       "option": "memory"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": "accel"
     },
     {
@@ -23249,23 +23241,19 @@
       "option": "rtc"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": "net"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": "nic"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": "netdev"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": "device"
     },
     {
@@ -23844,8 +23832,7 @@
 }
 
 {
-  "return": {
-  },
+  "return": {},
   "id": "libvirt-1"
 }
 

diff --git a/tests/qemucapabilitiesdata/caps_5.2.0_ppc64.replies b/tests/qemucapabilitiesdata/caps_5.2.0_ppc64.replies
index 1cf12bf77eb2baf19f6a79947c0c28cc00794cbd..04db65df5a9e1e86cfc535008cec6057a5ade615 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_5.2.0_ppc64.replies
+++ b/tests/qemucapabilitiesdata/caps_5.2.0_ppc64.replies
@@ -4,8 +4,7 @@
 }
 
 {
-  "return": {
-  },
+  "return": {},
   "id": "libvirt-1"
 }
 
@@ -1418,8 +1417,7 @@
     },
     {
       "name": "0",
-      "members": [
-      ],
+      "members": [],
       "meta-type": "object"
     },
     {
@@ -13848,8 +13846,7 @@
     },
     {
       "name": "552",
-      "members": [
-      ],
+      "members": [],
       "meta-type": "object"
     },
     {
@@ -24404,8 +24401,7 @@
       "option": "fw_cfg"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": ""
     },
     {
@@ -24438,8 +24434,7 @@
       "option": "icount"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": "numa"
     },
     {
@@ -24499,13 +24494,11 @@
       "option": "realtime"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": "tpmdev"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": "object"
     },
     {
@@ -24608,8 +24601,7 @@
       "option": "memory"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": "accel"
     },
     {
@@ -24799,23 +24791,19 @@
       "option": "rtc"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": "net"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": "nic"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": "netdev"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": "device"
     },
     {
@@ -25283,8 +25271,7 @@
 }
 
 {
-  "return": {
-  },
+  "return": {},
   "id": "libvirt-1"
 }
 

diff --git a/tests/qemucapabilitiesdata/caps_5.2.0_riscv64.replies b/tests/qemucapabilitiesdata/caps_5.2.0_riscv64.replies
index 715dfc6c2ae19fe0ab0cf361fb103a73de080012..fa4f2ded89c62d5b6518a20e7c112c366144a979 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_5.2.0_riscv64.replies
+++ b/tests/qemucapabilitiesdata/caps_5.2.0_riscv64.replies
@@ -4,8 +4,7 @@
 }
 
 {
-  "return": {
-  },
+  "return": {},
   "id": "libvirt-1"
 }
 
@@ -1433,8 +1432,7 @@
     },
     {
       "name": "0",
-      "members": [
-      ],
+      "members": [],
       "meta-type": "object"
     },
     {
@@ -14063,8 +14061,7 @@
     },
     {
       "name": "552",
-      "members": [
-      ],
+      "members": [],
       "meta-type": "object"
     },
     {
@@ -19155,8 +19152,7 @@
 }
 
 {
-  "return": [
-  ],
+  "return": [],
   "id": "libvirt-36"
 }
 
@@ -19166,8 +19162,7 @@
 }
 
 {
-  "return": [
-  ],
+  "return": [],
   "id": "libvirt-37"
 }
 
@@ -19671,8 +19666,7 @@
       "option": "fw_cfg"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": ""
     },
     {
@@ -19705,8 +19699,7 @@
       "option": "icount"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": "numa"
     },
     {
@@ -19766,13 +19759,11 @@
       "option": "realtime"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": "tpmdev"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": "object"
     },
     {
@@ -19875,8 +19866,7 @@
       "option": "memory"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": "accel"
     },
     {
@@ -20066,23 +20056,19 @@
       "option": "rtc"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": "net"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": "nic"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": "netdev"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": "device"
     },
     {

diff --git a/tests/qemucapabilitiesdata/caps_5.2.0_s390x.replies b/tests/qemucapabilitiesdata/caps_5.2.0_s390x.replies
index 758c6607eb43051b9d0fb2c745bafc5c95473ac6..3dfd0b502d55631db5f4b679ea66aa116c24b0e4 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_5.2.0_s390x.replies
+++ b/tests/qemucapabilitiesdata/caps_5.2.0_s390x.replies
@@ -4,8 +4,7 @@
 }
 
 {
-  "return": {
-  },
+  "return": {},
   "id": "libvirt-1"
 }
 
@@ -1442,8 +1441,7 @@
     },
     {
       "name": "0",
-      "members": [
-      ],
+      "members": [],
       "meta-type": "object"
     },
     {
@@ -13959,8 +13957,7 @@
     },
     {
       "name": "552",
-      "members": [
-      ],
+      "members": [],
       "meta-type": "object"
     },
     {
@@ -19265,8 +19262,7 @@
     {
       "name": "z800-base",
       "typename": "z800-base-s390x-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": true,
       "migration-safe": true,
       "deprecated": false
@@ -19274,8 +19270,7 @@
     {
       "name": "z890.2-base",
       "typename": "z890.2-base-s390x-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": true,
       "migration-safe": true,
       "deprecated": false
@@ -19283,8 +19278,7 @@
     {
       "name": "z9EC.2",
       "typename": "z9EC.2-s390x-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -19292,8 +19286,7 @@
     {
       "name": "z13.2",
       "typename": "z13.2-s390x-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -19301,8 +19294,7 @@
     {
       "name": "z990.5-base",
       "typename": "z990.5-base-s390x-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": true,
       "migration-safe": true,
       "deprecated": false
@@ -19310,8 +19302,7 @@
     {
       "name": "z9BC-base",
       "typename": "z9BC-base-s390x-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": true,
       "migration-safe": true,
       "deprecated": false
@@ -19319,8 +19310,7 @@
     {
       "name": "z890.2",
       "typename": "z890.2-s390x-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -19328,8 +19318,7 @@
     {
       "name": "z890",
       "typename": "z890-s390x-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -19337,8 +19326,7 @@
     {
       "name": "z9BC",
       "typename": "z9BC-s390x-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -19346,8 +19334,7 @@
     {
       "name": "z13",
       "typename": "z13-s390x-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -19355,8 +19342,7 @@
     {
       "name": "z196",
       "typename": "z196-s390x-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -19364,8 +19350,7 @@
     {
       "name": "z13s",
       "typename": "z13s-s390x-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -19373,8 +19358,7 @@
     {
       "name": "host",
       "typename": "host-s390x-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": false,
       "deprecated": false
@@ -19382,8 +19366,7 @@
     {
       "name": "z990.3",
       "typename": "z990.3-s390x-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -19391,8 +19374,7 @@
     {
       "name": "z13s-base",
       "typename": "z13s-base-s390x-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": true,
       "migration-safe": true,
       "deprecated": false
@@ -19400,8 +19382,7 @@
     {
       "name": "z9EC",
       "typename": "z9EC-s390x-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -19409,8 +19390,7 @@
     {
       "name": "gen15a",
       "typename": "gen15a-s390x-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -19418,8 +19398,7 @@
     {
       "name": "z14ZR1-base",
       "typename": "z14ZR1-base-s390x-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": true,
       "migration-safe": true,
       "deprecated": false
@@ -19427,8 +19406,7 @@
     {
       "name": "z14.2-base",
       "typename": "z14.2-base-s390x-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": true,
       "migration-safe": true,
       "deprecated": false
@@ -19436,8 +19414,7 @@
     {
       "name": "z900.3-base",
       "typename": "z900.3-base-s390x-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": true,
       "migration-safe": true,
       "deprecated": false
@@ -19445,8 +19422,7 @@
     {
       "name": "z13.2-base",
       "typename": "z13.2-base-s390x-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": true,
       "migration-safe": true,
       "deprecated": false
@@ -19454,8 +19430,7 @@
     {
       "name": "z196.2-base",
       "typename": "z196.2-base-s390x-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": true,
       "migration-safe": true,
       "deprecated": false
@@ -19463,8 +19438,7 @@
     {
       "name": "zBC12-base",
       "typename": "zBC12-base-s390x-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": true,
       "migration-safe": true,
       "deprecated": false
@@ -19472,8 +19446,7 @@
     {
       "name": "z9BC.2-base",
       "typename": "z9BC.2-base-s390x-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": true,
       "migration-safe": true,
       "deprecated": false
@@ -19481,8 +19454,7 @@
     {
       "name": "z900.2-base",
       "typename": "z900.2-base-s390x-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": true,
       "migration-safe": true,
       "deprecated": false
@@ -19490,8 +19462,7 @@
     {
       "name": "z9EC.3",
       "typename": "z9EC.3-s390x-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -19499,8 +19470,7 @@
     {
       "name": "zEC12",
       "typename": "zEC12-s390x-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -19508,8 +19478,7 @@
     {
       "name": "z900",
       "typename": "z900-s390x-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -19517,8 +19486,7 @@
     {
       "name": "z114-base",
       "typename": "z114-base-s390x-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": true,
       "migration-safe": true,
       "deprecated": false
@@ -19526,8 +19494,7 @@
     {
       "name": "zEC12-base",
       "typename": "zEC12-base-s390x-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": true,
       "migration-safe": true,
       "deprecated": false
@@ -19535,8 +19502,7 @@
     {
       "name": "z10EC.2",
       "typename": "z10EC.2-s390x-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -19544,8 +19510,7 @@
     {
       "name": "z10EC-base",
       "typename": "z10EC-base-s390x-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": true,
       "migration-safe": true,
       "deprecated": false
@@ -19553,8 +19518,7 @@
     {
       "name": "z900.3",
       "typename": "z900.3-s390x-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -19562,8 +19526,7 @@
     {
       "name": "z14ZR1",
       "typename": "z14ZR1-s390x-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -19571,8 +19534,7 @@
     {
       "name": "z10BC",
       "typename": "z10BC-s390x-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -19580,8 +19542,7 @@
     {
       "name": "z10BC.2-base",
       "typename": "z10BC.2-base-s390x-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": true,
       "migration-safe": true,
       "deprecated": false
@@ -19589,8 +19550,7 @@
     {
       "name": "z9BC.2",
       "typename": "z9BC.2-s390x-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -19598,8 +19558,7 @@
     {
       "name": "z990",
       "typename": "z990-s390x-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -19607,8 +19566,7 @@
     {
       "name": "z990.2",
       "typename": "z990.2-s390x-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -19616,8 +19574,7 @@
     {
       "name": "z14",
       "typename": "z14-s390x-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -19625,8 +19582,7 @@
     {
       "name": "gen15b-base",
       "typename": "gen15b-base-s390x-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": true,
       "migration-safe": true,
       "deprecated": false
@@ -19634,8 +19590,7 @@
     {
       "name": "z990.4",
       "typename": "z990.4-s390x-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -19643,8 +19598,7 @@
     {
       "name": "max",
       "typename": "max-s390x-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": false,
       "deprecated": false
@@ -19652,8 +19606,7 @@
     {
       "name": "z990.2-base",
       "typename": "z990.2-base-s390x-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": true,
       "migration-safe": true,
       "deprecated": false
@@ -19661,8 +19614,7 @@
     {
       "name": "z10EC.2-base",
       "typename": "z10EC.2-base-s390x-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": true,
       "migration-safe": true,
       "deprecated": false
@@ -19670,8 +19622,7 @@
     {
       "name": "gen15a-base",
       "typename": "gen15a-base-s390x-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": true,
       "migration-safe": true,
       "deprecated": false
@@ -19679,8 +19630,7 @@
     {
       "name": "z800",
       "typename": "z800-s390x-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -19688,8 +19638,7 @@
     {
       "name": "z10EC",
       "typename": "z10EC-s390x-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -19697,8 +19646,7 @@
     {
       "name": "zEC12.2",
       "typename": "zEC12.2-s390x-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -19706,8 +19654,7 @@
     {
       "name": "z900-base",
       "typename": "z900-base-s390x-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": true,
       "migration-safe": true,
       "deprecated": false
@@ -19715,8 +19662,7 @@
     {
       "name": "z10BC.2",
       "typename": "z10BC.2-s390x-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -19724,8 +19670,7 @@
     {
       "name": "z9EC-base",
       "typename": "z9EC-base-s390x-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": true,
       "migration-safe": true,
       "deprecated": false
@@ -19733,8 +19678,7 @@
     {
       "name": "z9EC.3-base",
       "typename": "z9EC.3-base-s390x-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": true,
       "migration-safe": true,
       "deprecated": false
@@ -19742,8 +19686,7 @@
     {
       "name": "z114",
       "typename": "z114-s390x-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -19751,8 +19694,7 @@
     {
       "name": "z890.3",
       "typename": "z890.3-s390x-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -19760,8 +19702,7 @@
     {
       "name": "z196-base",
       "typename": "z196-base-s390x-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": true,
       "migration-safe": true,
       "deprecated": false
@@ -19769,8 +19710,7 @@
     {
       "name": "z9EC.2-base",
       "typename": "z9EC.2-base-s390x-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": true,
       "migration-safe": true,
       "deprecated": false
@@ -19778,8 +19718,7 @@
     {
       "name": "z196.2",
       "typename": "z196.2-s390x-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -19787,8 +19726,7 @@
     {
       "name": "z14.2",
       "typename": "z14.2-s390x-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -19796,8 +19734,7 @@
     {
       "name": "z990-base",
       "typename": "z990-base-s390x-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": true,
       "migration-safe": true,
       "deprecated": false
@@ -19805,8 +19742,7 @@
     {
       "name": "z900.2",
       "typename": "z900.2-s390x-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -19814,8 +19750,7 @@
     {
       "name": "z10EC.3",
       "typename": "z10EC.3-s390x-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -19823,8 +19758,7 @@
     {
       "name": "z890-base",
       "typename": "z890-base-s390x-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": true,
       "migration-safe": true,
       "deprecated": false
@@ -19832,8 +19766,7 @@
     {
       "name": "z14-base",
       "typename": "z14-base-s390x-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": true,
       "migration-safe": true,
       "deprecated": false
@@ -19841,8 +19774,7 @@
     {
       "name": "z990.4-base",
       "typename": "z990.4-base-s390x-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": true,
       "migration-safe": true,
       "deprecated": false
@@ -19850,8 +19782,7 @@
     {
       "name": "z10EC.3-base",
       "typename": "z10EC.3-base-s390x-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": true,
       "migration-safe": true,
       "deprecated": false
@@ -19859,8 +19790,7 @@
     {
       "name": "z10BC-base",
       "typename": "z10BC-base-s390x-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": true,
       "migration-safe": true,
       "deprecated": false
@@ -19868,8 +19798,7 @@
     {
       "name": "z13-base",
       "typename": "z13-base-s390x-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": true,
       "migration-safe": true,
       "deprecated": false
@@ -19877,8 +19806,7 @@
     {
       "name": "z990.3-base",
       "typename": "z990.3-base-s390x-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": true,
       "migration-safe": true,
       "deprecated": false
@@ -19886,8 +19814,7 @@
     {
       "name": "zEC12.2-base",
       "typename": "zEC12.2-base-s390x-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": true,
       "migration-safe": true,
       "deprecated": false
@@ -19895,8 +19822,7 @@
     {
       "name": "zBC12",
       "typename": "zBC12-s390x-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -19904,8 +19830,7 @@
     {
       "name": "z890.3-base",
       "typename": "z890.3-base-s390x-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": true,
       "migration-safe": true,
       "deprecated": false
@@ -19913,8 +19838,7 @@
     {
       "name": "z990.5",
       "typename": "z990.5-s390x-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -19922,8 +19846,7 @@
     {
       "name": "gen15b",
       "typename": "gen15b-s390x-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -19931,8 +19854,7 @@
     {
       "name": "qemu",
       "typename": "qemu-s390x-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -19947,8 +19869,7 @@
 }
 
 {
-  "return": [
-  ],
+  "return": [],
   "id": "libvirt-34"
 }
 
@@ -19958,8 +19879,7 @@
 }
 
 {
-  "return": [
-  ],
+  "return": [],
   "id": "libvirt-35"
 }
 
@@ -20334,8 +20254,7 @@
       "option": "fw_cfg"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": ""
     },
     {
@@ -20368,8 +20287,7 @@
       "option": "icount"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": "numa"
     },
     {
@@ -20429,13 +20347,11 @@
       "option": "realtime"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": "tpmdev"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": "object"
     },
     {
@@ -20538,8 +20454,7 @@
       "option": "memory"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": "accel"
     },
     {
@@ -20729,23 +20644,19 @@
       "option": "rtc"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": "net"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": "nic"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": "netdev"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": "device"
     },
     {
@@ -21280,8 +21191,7 @@
 }
 
 {
-  "return": {
-  },
+  "return": {},
   "id": "libvirt-1"
 }
 
@@ -21295,8 +21205,7 @@
     {
       "name": "z800-base",
       "typename": "z800-base-s390x-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": true,
       "migration-safe": true,
       "deprecated": false
@@ -21993,8 +21902,7 @@
     {
       "name": "host",
       "typename": "host-s390x-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": false,
       "deprecated": false
@@ -22325,8 +22233,7 @@
     {
       "name": "z900.3-base",
       "typename": "z900.3-base-s390x-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": true,
       "migration-safe": true,
       "deprecated": false
@@ -22462,8 +22369,7 @@
     {
       "name": "z900.2-base",
       "typename": "z900.2-base-s390x-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": true,
       "migration-safe": true,
       "deprecated": false
@@ -22629,8 +22535,7 @@
     {
       "name": "z900",
       "typename": "z900-s390x-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -22770,8 +22675,7 @@
     {
       "name": "z900.3",
       "typename": "z900.3-s390x-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -23278,8 +23182,7 @@
     {
       "name": "max",
       "typename": "max-s390x-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": false,
       "deprecated": false
@@ -23379,8 +23282,7 @@
     {
       "name": "z800",
       "typename": "z800-s390x-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -23553,8 +23455,7 @@
     {
       "name": "z900-base",
       "typename": "z900-base-s390x-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": true,
       "migration-safe": true,
       "deprecated": false
@@ -24148,8 +24049,7 @@
     {
       "name": "z900.2",
       "typename": "z900.2-s390x-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -24754,8 +24654,7 @@
     {
       "name": "qemu",
       "typename": "qemu-s390x-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false

diff --git a/tests/qemucapabilitiesdata/caps_5.2.0_x86_64.replies b/tests/qemucapabilitiesdata/caps_5.2.0_x86_64.replies
index 04998336f54d7efc6b6f0b9de481312b97e9758b..58ac2c0eaad868146f1c8b441c979e64560b3e7b 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_5.2.0_x86_64.replies
+++ b/tests/qemucapabilitiesdata/caps_5.2.0_x86_64.replies
@@ -4,8 +4,7 @@
 }
 
 {
-  "return": {
-  },
+  "return": {},
   "id": "libvirt-1"
 }
 
@@ -1474,8 +1473,7 @@
     },
     {
       "name": "0",
-      "members": [
-      ],
+      "members": [],
       "meta-type": "object"
     },
     {
@@ -14256,8 +14254,7 @@
     },
     {
       "name": "552",
-      "members": [
-      ],
+      "members": [],
       "meta-type": "object"
     },
     {
@@ -22919,8 +22916,7 @@
     {
       "name": "max",
       "typename": "max-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": false,
       "deprecated": false
@@ -22928,8 +22924,7 @@
     {
       "name": "host",
       "typename": "host-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": false,
       "deprecated": false
@@ -22937,8 +22932,7 @@
     {
       "name": "base",
       "typename": "base-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": true,
       "migration-safe": true,
       "deprecated": false
@@ -22946,8 +22940,7 @@
     {
       "name": "qemu64-v1",
       "typename": "qemu64-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -22955,8 +22948,7 @@
     {
       "name": "qemu64",
       "typename": "qemu64-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "qemu64-v1",
       "static": false,
       "migration-safe": true,
@@ -22965,8 +22957,7 @@
     {
       "name": "qemu32-v1",
       "typename": "qemu32-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -22974,8 +22965,7 @@
     {
       "name": "qemu32",
       "typename": "qemu32-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "qemu32-v1",
       "static": false,
       "migration-safe": true,
@@ -23007,8 +22997,7 @@
     {
       "name": "pentium3-v1",
       "typename": "pentium3-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -23016,8 +23005,7 @@
     {
       "name": "pentium3",
       "typename": "pentium3-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "pentium3-v1",
       "static": false,
       "migration-safe": true,
@@ -23026,8 +23014,7 @@
     {
       "name": "pentium2-v1",
       "typename": "pentium2-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -23035,8 +23022,7 @@
     {
       "name": "pentium2",
       "typename": "pentium2-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "pentium2-v1",
       "static": false,
       "migration-safe": true,
@@ -23045,8 +23031,7 @@
     {
       "name": "pentium-v1",
       "typename": "pentium-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -23054,8 +23039,7 @@
     {
       "name": "pentium",
       "typename": "pentium-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "pentium-v1",
       "static": false,
       "migration-safe": true,
@@ -23085,8 +23069,7 @@
     {
       "name": "kvm64-v1",
       "typename": "kvm64-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -23094,8 +23077,7 @@
     {
       "name": "kvm64",
       "typename": "kvm64-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "kvm64-v1",
       "static": false,
       "migration-safe": true,
@@ -23104,8 +23086,7 @@
     {
       "name": "kvm32-v1",
       "typename": "kvm32-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -23113,8 +23094,7 @@
     {
       "name": "kvm32",
       "typename": "kvm32-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "kvm32-v1",
       "static": false,
       "migration-safe": true,
@@ -23198,8 +23178,7 @@
     {
       "name": "Westmere-v1",
       "typename": "Westmere-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -23218,8 +23197,7 @@
     {
       "name": "Westmere",
       "typename": "Westmere-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "Westmere-v1",
       "static": false,
       "migration-safe": true,
@@ -23553,8 +23531,7 @@
     {
       "name": "SandyBridge-v1",
       "typename": "SandyBridge-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -23573,8 +23550,7 @@
     {
       "name": "SandyBridge",
       "typename": "SandyBridge-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "SandyBridge-v1",
       "static": false,
       "migration-safe": true,
@@ -23583,8 +23559,7 @@
     {
       "name": "Penryn-v1",
       "typename": "Penryn-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -23592,8 +23567,7 @@
     {
       "name": "Penryn",
       "typename": "Penryn-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "Penryn-v1",
       "static": false,
       "migration-safe": true,
@@ -23650,8 +23624,7 @@
     {
       "name": "Opteron_G3-v1",
       "typename": "Opteron_G3-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -23659,8 +23632,7 @@
     {
       "name": "Opteron_G3",
       "typename": "Opteron_G3-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "Opteron_G3-v1",
       "static": false,
       "migration-safe": true,
@@ -23669,8 +23641,7 @@
     {
       "name": "Opteron_G2-v1",
       "typename": "Opteron_G2-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -23678,8 +23649,7 @@
     {
       "name": "Opteron_G2",
       "typename": "Opteron_G2-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "Opteron_G2-v1",
       "static": false,
       "migration-safe": true,
@@ -23688,8 +23658,7 @@
     {
       "name": "Opteron_G1-v1",
       "typename": "Opteron_G1-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -23697,8 +23666,7 @@
     {
       "name": "Opteron_G1",
       "typename": "Opteron_G1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "Opteron_G1-v1",
       "static": false,
       "migration-safe": true,
@@ -23717,8 +23685,7 @@
     {
       "name": "Nehalem-v1",
       "typename": "Nehalem-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -23737,8 +23704,7 @@
     {
       "name": "Nehalem",
       "typename": "Nehalem-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "Nehalem-v1",
       "static": false,
       "migration-safe": true,
@@ -24248,8 +24214,7 @@
     {
       "name": "EPYC-v3",
       "typename": "EPYC-v3-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -24257,8 +24222,7 @@
     {
       "name": "EPYC-v2",
       "typename": "EPYC-v2-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -24266,8 +24230,7 @@
     {
       "name": "EPYC-v1",
       "typename": "EPYC-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -24275,8 +24238,7 @@
     {
       "name": "EPYC-Rome-v1",
       "typename": "EPYC-Rome-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -24284,8 +24246,7 @@
     {
       "name": "EPYC-Rome",
       "typename": "EPYC-Rome-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "EPYC-Rome-v1",
       "static": false,
       "migration-safe": true,
@@ -24294,8 +24255,7 @@
     {
       "name": "EPYC-IBPB",
       "typename": "EPYC-IBPB-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "EPYC-v2",
       "static": false,
       "migration-safe": true,
@@ -24304,8 +24264,7 @@
     {
       "name": "EPYC",
       "typename": "EPYC-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "EPYC-v1",
       "static": false,
       "migration-safe": true,
@@ -24314,8 +24273,7 @@
     {
       "name": "Dhyana-v1",
       "typename": "Dhyana-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -24323,8 +24281,7 @@
     {
       "name": "Dhyana",
       "typename": "Dhyana-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "Dhyana-v1",
       "static": false,
       "migration-safe": true,
@@ -24432,8 +24389,7 @@
     {
       "name": "Conroe-v1",
       "typename": "Conroe-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -24441,8 +24397,7 @@
     {
       "name": "Conroe",
       "typename": "Conroe-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "Conroe-v1",
       "static": false,
       "migration-safe": true,
@@ -24719,8 +24674,7 @@
     {
       "name": "486-v1",
       "typename": "486-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -24728,8 +24682,7 @@
     {
       "name": "486",
       "typename": "486-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "486-v1",
       "static": false,
       "migration-safe": true,
@@ -24922,8 +24875,7 @@
       "option": "sandbox"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": "smbios"
     },
     {
@@ -25056,8 +25008,7 @@
       "option": "spice"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": "acpi"
     },
     {
@@ -25275,8 +25226,7 @@
       "option": "fw_cfg"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": ""
     },
     {
@@ -25309,8 +25259,7 @@
       "option": "icount"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": "numa"
     },
     {
@@ -25370,13 +25319,11 @@
       "option": "realtime"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": "tpmdev"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": "object"
     },
     {
@@ -25479,8 +25426,7 @@
       "option": "memory"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": "accel"
     },
     {
@@ -25670,23 +25616,19 @@
       "option": "rtc"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": "net"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": "nic"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": "netdev"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": "device"
     },
     {
@@ -27134,8 +27076,7 @@
 }
 
 {
-  "return": {
-  },
+  "return": {},
   "id": "libvirt-1"
 }
 
@@ -27149,8 +27090,7 @@
     {
       "name": "max",
       "typename": "max-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": false,
       "deprecated": false
@@ -27168,8 +27108,7 @@
     {
       "name": "base",
       "typename": "base-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": true,
       "migration-safe": true,
       "deprecated": false
@@ -27177,8 +27116,7 @@
     {
       "name": "qemu64-v1",
       "typename": "qemu64-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -27186,8 +27124,7 @@
     {
       "name": "qemu64",
       "typename": "qemu64-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "qemu64-v1",
       "static": false,
       "migration-safe": true,
@@ -27196,8 +27133,7 @@
     {
       "name": "qemu32-v1",
       "typename": "qemu32-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -27205,8 +27141,7 @@
     {
       "name": "qemu32",
       "typename": "qemu32-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "qemu32-v1",
       "static": false,
       "migration-safe": true,
@@ -27236,8 +27171,7 @@
     {
       "name": "pentium3-v1",
       "typename": "pentium3-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -27245,8 +27179,7 @@
     {
       "name": "pentium3",
       "typename": "pentium3-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "pentium3-v1",
       "static": false,
       "migration-safe": true,
@@ -27255,8 +27188,7 @@
     {
       "name": "pentium2-v1",
       "typename": "pentium2-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -27264,8 +27196,7 @@
     {
       "name": "pentium2",
       "typename": "pentium2-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "pentium2-v1",
       "static": false,
       "migration-safe": true,
@@ -27274,8 +27205,7 @@
     {
       "name": "pentium-v1",
       "typename": "pentium-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -27283,8 +27213,7 @@
     {
       "name": "pentium",
       "typename": "pentium-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "pentium-v1",
       "static": false,
       "migration-safe": true,
@@ -27293,8 +27222,7 @@
     {
       "name": "n270-v1",
       "typename": "n270-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -27302,8 +27230,7 @@
     {
       "name": "n270",
       "typename": "n270-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "n270-v1",
       "static": false,
       "migration-safe": true,
@@ -27312,8 +27239,7 @@
     {
       "name": "kvm64-v1",
       "typename": "kvm64-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -27321,8 +27247,7 @@
     {
       "name": "kvm64",
       "typename": "kvm64-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "kvm64-v1",
       "static": false,
       "migration-safe": true,
@@ -27331,8 +27256,7 @@
     {
       "name": "kvm32-v1",
       "typename": "kvm32-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -27340,8 +27264,7 @@
     {
       "name": "kvm32",
       "typename": "kvm32-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "kvm32-v1",
       "static": false,
       "migration-safe": true,
@@ -27350,8 +27273,7 @@
     {
       "name": "coreduo-v1",
       "typename": "coreduo-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -27359,8 +27281,7 @@
     {
       "name": "coreduo",
       "typename": "coreduo-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "coreduo-v1",
       "static": false,
       "migration-safe": true,
@@ -27369,8 +27290,7 @@
     {
       "name": "core2duo-v1",
       "typename": "core2duo-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -27378,8 +27298,7 @@
     {
       "name": "core2duo",
       "typename": "core2duo-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "core2duo-v1",
       "static": false,
       "migration-safe": true,
@@ -27388,8 +27307,7 @@
     {
       "name": "athlon-v1",
       "typename": "athlon-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -27397,8 +27315,7 @@
     {
       "name": "athlon",
       "typename": "athlon-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "athlon-v1",
       "static": false,
       "migration-safe": true,
@@ -27417,8 +27334,7 @@
     {
       "name": "Westmere-v1",
       "typename": "Westmere-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -27437,8 +27353,7 @@
     {
       "name": "Westmere",
       "typename": "Westmere-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "Westmere-v1",
       "static": false,
       "migration-safe": true,
@@ -27901,8 +27816,7 @@
     {
       "name": "Penryn-v1",
       "typename": "Penryn-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -27910,8 +27824,7 @@
     {
       "name": "Penryn",
       "typename": "Penryn-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "Penryn-v1",
       "static": false,
       "migration-safe": true,
@@ -28009,8 +27922,7 @@
     {
       "name": "Opteron_G2-v1",
       "typename": "Opteron_G2-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -28018,8 +27930,7 @@
     {
       "name": "Opteron_G2",
       "typename": "Opteron_G2-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "Opteron_G2-v1",
       "static": false,
       "migration-safe": true,
@@ -28028,8 +27939,7 @@
     {
       "name": "Opteron_G1-v1",
       "typename": "Opteron_G1-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -28037,8 +27947,7 @@
     {
       "name": "Opteron_G1",
       "typename": "Opteron_G1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "Opteron_G1-v1",
       "static": false,
       "migration-safe": true,
@@ -28057,8 +27966,7 @@
     {
       "name": "Nehalem-v1",
       "typename": "Nehalem-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -28077,8 +27985,7 @@
     {
       "name": "Nehalem",
       "typename": "Nehalem-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "Nehalem-v1",
       "static": false,
       "migration-safe": true,
@@ -29091,8 +28998,7 @@
     {
       "name": "Conroe-v1",
       "typename": "Conroe-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -29100,8 +29006,7 @@
     {
       "name": "Conroe",
       "typename": "Conroe-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "Conroe-v1",
       "static": false,
       "migration-safe": true,
@@ -29474,8 +29379,7 @@
     {
       "name": "486-v1",
       "typename": "486-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -29483,8 +29387,7 @@
     {
       "name": "486",
       "typename": "486-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "486-v1",
       "static": false,
       "migration-safe": true,

diff --git a/tests/qemucapabilitiesdata/caps_6.0.0_aarch64.replies b/tests/qemucapabilitiesdata/caps_6.0.0_aarch64.replies
index 4be2ad5045dadab7e96314d33a9f5cfb3e0e7c89..097662dc6fda146a10118ce2a09f56204f929857 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_6.0.0_aarch64.replies
+++ b/tests/qemucapabilitiesdata/caps_6.0.0_aarch64.replies
@@ -4,8 +4,7 @@
 }
 
 {
-  "return": {
-  },
+  "return": {},
   "id": "libvirt-1"
 }
 
@@ -1405,8 +1404,7 @@
     },
     {
       "name": "0",
-      "members": [
-      ],
+      "members": [],
       "meta-type": "object"
     },
     {
@@ -15401,8 +15399,7 @@
     },
     {
       "name": "601",
-      "members": [
-      ],
+      "members": [],
       "meta-type": "object"
     },
     {
@@ -24441,8 +24438,7 @@
       "option": "iscsi"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": "smbios"
     },
     {
@@ -24849,8 +24845,7 @@
       "option": "icount"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": "numa"
     },
     {
@@ -24901,13 +24896,11 @@
       "option": "overcommit"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": "tpmdev"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": "object"
     },
     {
@@ -25010,8 +25003,7 @@
       "option": "memory"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": "accel"
     },
     {
@@ -25201,23 +25193,19 @@
       "option": "rtc"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": "net"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": "nic"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": "netdev"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": "device"
     },
     {
@@ -25804,8 +25792,7 @@
 }
 
 {
-  "return": {
-  },
+  "return": {},
   "id": "libvirt-1"
 }
 

diff --git a/tests/qemucapabilitiesdata/caps_6.0.0_s390x.replies b/tests/qemucapabilitiesdata/caps_6.0.0_s390x.replies
index a0a9c42b20e574e390ef9cdb7f8e48a1b78ee210..6fcc0a484b94da9fcb2bbdf63c71f3755a60814b 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_6.0.0_s390x.replies
+++ b/tests/qemucapabilitiesdata/caps_6.0.0_s390x.replies
@@ -4,8 +4,7 @@
 }
 
 {
-  "return": {
-  },
+  "return": {},
   "id": "libvirt-1"
 }
 
@@ -1417,8 +1416,7 @@
     },
     {
       "name": "0",
-      "members": [
-      ],
+      "members": [],
       "meta-type": "object"
     },
     {
@@ -15453,8 +15451,7 @@
     },
     {
       "name": "601",
-      "members": [
-      ],
+      "members": [],
       "meta-type": "object"
     },
     {
@@ -20928,8 +20925,7 @@
     {
       "name": "z800-base",
       "typename": "z800-base-s390x-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": true,
       "migration-safe": true,
       "deprecated": false
@@ -20937,8 +20933,7 @@
     {
       "name": "z890.2-base",
       "typename": "z890.2-base-s390x-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": true,
       "migration-safe": true,
       "deprecated": false
@@ -20946,8 +20941,7 @@
     {
       "name": "z9EC.2",
       "typename": "z9EC.2-s390x-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -20955,8 +20949,7 @@
     {
       "name": "z13.2",
       "typename": "z13.2-s390x-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -20964,8 +20957,7 @@
     {
       "name": "z990.5-base",
       "typename": "z990.5-base-s390x-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": true,
       "migration-safe": true,
       "deprecated": false
@@ -20973,8 +20965,7 @@
     {
       "name": "z9BC-base",
       "typename": "z9BC-base-s390x-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": true,
       "migration-safe": true,
       "deprecated": false
@@ -20982,8 +20973,7 @@
     {
       "name": "z890.2",
       "typename": "z890.2-s390x-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -20991,8 +20981,7 @@
     {
       "name": "z890",
       "typename": "z890-s390x-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -21000,8 +20989,7 @@
     {
       "name": "z9BC",
       "typename": "z9BC-s390x-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -21009,8 +20997,7 @@
     {
       "name": "z13",
       "typename": "z13-s390x-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -21018,8 +21005,7 @@
     {
       "name": "z196",
       "typename": "z196-s390x-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -21027,8 +21013,7 @@
     {
       "name": "z13s",
       "typename": "z13s-s390x-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -21036,8 +21021,7 @@
     {
       "name": "host",
       "typename": "host-s390x-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": false,
       "deprecated": false
@@ -21045,8 +21029,7 @@
     {
       "name": "z990.3",
       "typename": "z990.3-s390x-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -21054,8 +21037,7 @@
     {
       "name": "z13s-base",
       "typename": "z13s-base-s390x-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": true,
       "migration-safe": true,
       "deprecated": false
@@ -21063,8 +21045,7 @@
     {
       "name": "z9EC",
       "typename": "z9EC-s390x-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -21072,8 +21053,7 @@
     {
       "name": "gen15a",
       "typename": "gen15a-s390x-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -21081,8 +21061,7 @@
     {
       "name": "z14ZR1-base",
       "typename": "z14ZR1-base-s390x-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": true,
       "migration-safe": true,
       "deprecated": false
@@ -21090,8 +21069,7 @@
     {
       "name": "z14.2-base",
       "typename": "z14.2-base-s390x-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": true,
       "migration-safe": true,
       "deprecated": false
@@ -21099,8 +21077,7 @@
     {
       "name": "z900.3-base",
       "typename": "z900.3-base-s390x-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": true,
       "migration-safe": true,
       "deprecated": false
@@ -21108,8 +21085,7 @@
     {
       "name": "z13.2-base",
       "typename": "z13.2-base-s390x-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": true,
       "migration-safe": true,
       "deprecated": false
@@ -21117,8 +21093,7 @@
     {
       "name": "z196.2-base",
       "typename": "z196.2-base-s390x-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": true,
       "migration-safe": true,
       "deprecated": false
@@ -21126,8 +21101,7 @@
     {
       "name": "zBC12-base",
       "typename": "zBC12-base-s390x-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": true,
       "migration-safe": true,
       "deprecated": false
@@ -21135,8 +21109,7 @@
     {
       "name": "z9BC.2-base",
       "typename": "z9BC.2-base-s390x-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": true,
       "migration-safe": true,
       "deprecated": false
@@ -21144,8 +21117,7 @@
     {
       "name": "z900.2-base",
       "typename": "z900.2-base-s390x-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": true,
       "migration-safe": true,
       "deprecated": false
@@ -21153,8 +21125,7 @@
     {
       "name": "z9EC.3",
       "typename": "z9EC.3-s390x-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -21162,8 +21133,7 @@
     {
       "name": "zEC12",
       "typename": "zEC12-s390x-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -21171,8 +21141,7 @@
     {
       "name": "z900",
       "typename": "z900-s390x-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -21180,8 +21149,7 @@
     {
       "name": "z114-base",
       "typename": "z114-base-s390x-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": true,
       "migration-safe": true,
       "deprecated": false
@@ -21189,8 +21157,7 @@
     {
       "name": "zEC12-base",
       "typename": "zEC12-base-s390x-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": true,
       "migration-safe": true,
       "deprecated": false
@@ -21198,8 +21165,7 @@
     {
       "name": "z10EC.2",
       "typename": "z10EC.2-s390x-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -21207,8 +21173,7 @@
     {
       "name": "z10EC-base",
       "typename": "z10EC-base-s390x-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": true,
       "migration-safe": true,
       "deprecated": false
@@ -21216,8 +21181,7 @@
     {
       "name": "z900.3",
       "typename": "z900.3-s390x-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -21225,8 +21189,7 @@
     {
       "name": "z14ZR1",
       "typename": "z14ZR1-s390x-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -21234,8 +21197,7 @@
     {
       "name": "z10BC",
       "typename": "z10BC-s390x-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -21243,8 +21205,7 @@
     {
       "name": "z10BC.2-base",
       "typename": "z10BC.2-base-s390x-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": true,
       "migration-safe": true,
       "deprecated": false
@@ -21252,8 +21213,7 @@
     {
       "name": "z9BC.2",
       "typename": "z9BC.2-s390x-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -21261,8 +21221,7 @@
     {
       "name": "z990",
       "typename": "z990-s390x-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -21270,8 +21229,7 @@
     {
       "name": "z990.2",
       "typename": "z990.2-s390x-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -21279,8 +21237,7 @@
     {
       "name": "z14",
       "typename": "z14-s390x-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -21288,8 +21245,7 @@
     {
       "name": "gen15b-base",
       "typename": "gen15b-base-s390x-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": true,
       "migration-safe": true,
       "deprecated": false
@@ -21297,8 +21253,7 @@
     {
       "name": "z990.4",
       "typename": "z990.4-s390x-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -21306,8 +21261,7 @@
     {
       "name": "max",
       "typename": "max-s390x-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": false,
       "deprecated": false
@@ -21315,8 +21269,7 @@
     {
       "name": "z10EC.2-base",
       "typename": "z10EC.2-base-s390x-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": true,
       "migration-safe": true,
       "deprecated": false
@@ -21324,8 +21277,7 @@
     {
       "name": "gen15a-base",
       "typename": "gen15a-base-s390x-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": true,
       "migration-safe": true,
       "deprecated": false
@@ -21333,8 +21285,7 @@
     {
       "name": "z800",
       "typename": "z800-s390x-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -21342,8 +21293,7 @@
     {
       "name": "z10EC",
       "typename": "z10EC-s390x-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -21351,8 +21301,7 @@
     {
       "name": "zEC12.2",
       "typename": "zEC12.2-s390x-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -21360,8 +21309,7 @@
     {
       "name": "z990.2-base",
       "typename": "z990.2-base-s390x-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": true,
       "migration-safe": true,
       "deprecated": false
@@ -21369,8 +21317,7 @@
     {
       "name": "z900-base",
       "typename": "z900-base-s390x-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": true,
       "migration-safe": true,
       "deprecated": false
@@ -21378,8 +21325,7 @@
     {
       "name": "z10BC.2",
       "typename": "z10BC.2-s390x-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -21387,8 +21333,7 @@
     {
       "name": "z9EC-base",
       "typename": "z9EC-base-s390x-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": true,
       "migration-safe": true,
       "deprecated": false
@@ -21396,8 +21341,7 @@
     {
       "name": "z9EC.3-base",
       "typename": "z9EC.3-base-s390x-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": true,
       "migration-safe": true,
       "deprecated": false
@@ -21405,8 +21349,7 @@
     {
       "name": "z114",
       "typename": "z114-s390x-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -21414,8 +21357,7 @@
     {
       "name": "z890.3",
       "typename": "z890.3-s390x-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -21423,8 +21365,7 @@
     {
       "name": "z196-base",
       "typename": "z196-base-s390x-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": true,
       "migration-safe": true,
       "deprecated": false
@@ -21432,8 +21373,7 @@
     {
       "name": "z9EC.2-base",
       "typename": "z9EC.2-base-s390x-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": true,
       "migration-safe": true,
       "deprecated": false
@@ -21441,8 +21381,7 @@
     {
       "name": "z196.2",
       "typename": "z196.2-s390x-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -21450,8 +21389,7 @@
     {
       "name": "z14.2",
       "typename": "z14.2-s390x-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -21459,8 +21397,7 @@
     {
       "name": "z990-base",
       "typename": "z990-base-s390x-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": true,
       "migration-safe": true,
       "deprecated": false
@@ -21468,8 +21405,7 @@
     {
       "name": "z900.2",
       "typename": "z900.2-s390x-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -21477,8 +21413,7 @@
     {
       "name": "z890-base",
       "typename": "z890-base-s390x-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": true,
       "migration-safe": true,
       "deprecated": false
@@ -21486,8 +21421,7 @@
     {
       "name": "z10EC.3",
       "typename": "z10EC.3-s390x-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -21495,8 +21429,7 @@
     {
       "name": "z14-base",
       "typename": "z14-base-s390x-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": true,
       "migration-safe": true,
       "deprecated": false
@@ -21504,8 +21437,7 @@
     {
       "name": "z990.4-base",
       "typename": "z990.4-base-s390x-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": true,
       "migration-safe": true,
       "deprecated": false
@@ -21513,8 +21445,7 @@
     {
       "name": "z10EC.3-base",
       "typename": "z10EC.3-base-s390x-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": true,
       "migration-safe": true,
       "deprecated": false
@@ -21522,8 +21453,7 @@
     {
       "name": "z10BC-base",
       "typename": "z10BC-base-s390x-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": true,
       "migration-safe": true,
       "deprecated": false
@@ -21531,8 +21461,7 @@
     {
       "name": "z13-base",
       "typename": "z13-base-s390x-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": true,
       "migration-safe": true,
       "deprecated": false
@@ -21540,8 +21469,7 @@
     {
       "name": "z990.3-base",
       "typename": "z990.3-base-s390x-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": true,
       "migration-safe": true,
       "deprecated": false
@@ -21549,8 +21477,7 @@
     {
       "name": "zEC12.2-base",
       "typename": "zEC12.2-base-s390x-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": true,
       "migration-safe": true,
       "deprecated": false
@@ -21558,8 +21485,7 @@
     {
       "name": "zBC12",
       "typename": "zBC12-s390x-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -21567,8 +21493,7 @@
     {
       "name": "z890.3-base",
       "typename": "z890.3-base-s390x-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": true,
       "migration-safe": true,
       "deprecated": false
@@ -21576,8 +21501,7 @@
     {
       "name": "z990.5",
       "typename": "z990.5-s390x-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -21585,8 +21509,7 @@
     {
       "name": "gen15b",
       "typename": "gen15b-s390x-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -21594,8 +21517,7 @@
     {
       "name": "qemu",
       "typename": "qemu-s390x-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -21610,8 +21532,7 @@
 }
 
 {
-  "return": [
-  ],
+  "return": [],
   "id": "libvirt-34"
 }
 
@@ -21621,8 +21542,7 @@
 }
 
 {
-  "return": [
-  ],
+  "return": [],
   "id": "libvirt-35"
 }
 
@@ -22022,8 +21942,7 @@
       "option": "fw_cfg"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": ""
     },
     {
@@ -22056,8 +21975,7 @@
       "option": "icount"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": "numa"
     },
     {
@@ -22108,13 +22026,11 @@
       "option": "overcommit"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": "tpmdev"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": "object"
     },
     {
@@ -22217,8 +22133,7 @@
       "option": "memory"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": "accel"
     },
     {
@@ -22408,23 +22323,19 @@
       "option": "rtc"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": "net"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": "nic"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": "netdev"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": "device"
     },
     {
@@ -22968,8 +22879,7 @@
 }
 
 {
-  "return": {
-  },
+  "return": {},
   "id": "libvirt-1"
 }
 
@@ -22983,8 +22893,7 @@
     {
       "name": "z800-base",
       "typename": "z800-base-s390x-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": true,
       "migration-safe": true,
       "deprecated": false
@@ -23681,8 +23590,7 @@
     {
       "name": "host",
       "typename": "host-s390x-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": false,
       "deprecated": false
@@ -24013,8 +23921,7 @@
     {
       "name": "z900.3-base",
       "typename": "z900.3-base-s390x-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": true,
       "migration-safe": true,
       "deprecated": false
@@ -24150,8 +24057,7 @@
     {
       "name": "z900.2-base",
       "typename": "z900.2-base-s390x-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": true,
       "migration-safe": true,
       "deprecated": false
@@ -24317,8 +24223,7 @@
     {
       "name": "z900",
       "typename": "z900-s390x-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -24458,8 +24363,7 @@
     {
       "name": "z900.3",
       "typename": "z900.3-s390x-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -24966,8 +24870,7 @@
     {
       "name": "max",
       "typename": "max-s390x-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": false,
       "deprecated": false
@@ -25046,8 +24949,7 @@
     {
       "name": "z800",
       "typename": "z800-s390x-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -25241,8 +25143,7 @@
     {
       "name": "z900-base",
       "typename": "z900-base-s390x-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": true,
       "migration-safe": true,
       "deprecated": false
@@ -25836,8 +25737,7 @@
     {
       "name": "z900.2",
       "typename": "z900.2-s390x-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -26442,8 +26342,7 @@
     {
       "name": "qemu",
       "typename": "qemu-s390x-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false

diff --git a/tests/qemucapabilitiesdata/caps_6.0.0_x86_64.replies b/tests/qemucapabilitiesdata/caps_6.0.0_x86_64.replies
index 60451ac4bbbedc5247bcad4ccd9e87ca0832496e..88948d306a7e7b15fb5742de8fc3ef299253b7eb 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_6.0.0_x86_64.replies
+++ b/tests/qemucapabilitiesdata/caps_6.0.0_x86_64.replies
@@ -4,8 +4,7 @@
 }
 
 {
-  "return": {
-  },
+  "return": {},
   "id": "libvirt-1"
 }
 
@@ -1455,8 +1454,7 @@
     },
     {
       "name": "0",
-      "members": [
-      ],
+      "members": [],
       "meta-type": "object"
     },
     {
@@ -15778,8 +15776,7 @@
     },
     {
       "name": "601",
-      "members": [
-      ],
+      "members": [],
       "meta-type": "object"
     },
     {
@@ -24747,8 +24744,7 @@
     {
       "name": "max",
       "typename": "max-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": false,
       "deprecated": false
@@ -24756,8 +24752,7 @@
     {
       "name": "host",
       "typename": "host-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": false,
       "deprecated": false
@@ -24765,8 +24760,7 @@
     {
       "name": "base",
       "typename": "base-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": true,
       "migration-safe": true,
       "deprecated": false
@@ -24774,8 +24768,7 @@
     {
       "name": "qemu64-v1",
       "typename": "qemu64-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -24783,8 +24776,7 @@
     {
       "name": "qemu64",
       "typename": "qemu64-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "qemu64-v1",
       "static": false,
       "migration-safe": true,
@@ -24793,8 +24785,7 @@
     {
       "name": "qemu32-v1",
       "typename": "qemu32-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -24802,8 +24793,7 @@
     {
       "name": "qemu32",
       "typename": "qemu32-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "qemu32-v1",
       "static": false,
       "migration-safe": true,
@@ -24835,8 +24825,7 @@
     {
       "name": "pentium3-v1",
       "typename": "pentium3-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -24844,8 +24833,7 @@
     {
       "name": "pentium3",
       "typename": "pentium3-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "pentium3-v1",
       "static": false,
       "migration-safe": true,
@@ -24854,8 +24842,7 @@
     {
       "name": "pentium2-v1",
       "typename": "pentium2-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -24863,8 +24850,7 @@
     {
       "name": "pentium2",
       "typename": "pentium2-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "pentium2-v1",
       "static": false,
       "migration-safe": true,
@@ -24873,8 +24859,7 @@
     {
       "name": "pentium-v1",
       "typename": "pentium-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -24882,8 +24867,7 @@
     {
       "name": "pentium",
       "typename": "pentium-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "pentium-v1",
       "static": false,
       "migration-safe": true,
@@ -24913,8 +24897,7 @@
     {
       "name": "kvm64-v1",
       "typename": "kvm64-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -24922,8 +24905,7 @@
     {
       "name": "kvm64",
       "typename": "kvm64-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "kvm64-v1",
       "static": false,
       "migration-safe": true,
@@ -24932,8 +24914,7 @@
     {
       "name": "kvm32-v1",
       "typename": "kvm32-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -24941,8 +24922,7 @@
     {
       "name": "kvm32",
       "typename": "kvm32-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "kvm32-v1",
       "static": false,
       "migration-safe": true,
@@ -25026,8 +25006,7 @@
     {
       "name": "Westmere-v1",
       "typename": "Westmere-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -25046,8 +25025,7 @@
     {
       "name": "Westmere",
       "typename": "Westmere-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "Westmere-v1",
       "static": false,
       "migration-safe": true,
@@ -25381,8 +25359,7 @@
     {
       "name": "SandyBridge-v1",
       "typename": "SandyBridge-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -25401,8 +25378,7 @@
     {
       "name": "SandyBridge",
       "typename": "SandyBridge-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "SandyBridge-v1",
       "static": false,
       "migration-safe": true,
@@ -25411,8 +25387,7 @@
     {
       "name": "Penryn-v1",
       "typename": "Penryn-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -25420,8 +25395,7 @@
     {
       "name": "Penryn",
       "typename": "Penryn-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "Penryn-v1",
       "static": false,
       "migration-safe": true,
@@ -25478,8 +25452,7 @@
     {
       "name": "Opteron_G3-v1",
       "typename": "Opteron_G3-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -25487,8 +25460,7 @@
     {
       "name": "Opteron_G3",
       "typename": "Opteron_G3-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "Opteron_G3-v1",
       "static": false,
       "migration-safe": true,
@@ -25497,8 +25469,7 @@
     {
       "name": "Opteron_G2-v1",
       "typename": "Opteron_G2-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -25506,8 +25477,7 @@
     {
       "name": "Opteron_G2",
       "typename": "Opteron_G2-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "Opteron_G2-v1",
       "static": false,
       "migration-safe": true,
@@ -25516,8 +25486,7 @@
     {
       "name": "Opteron_G1-v1",
       "typename": "Opteron_G1-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -25525,8 +25494,7 @@
     {
       "name": "Opteron_G1",
       "typename": "Opteron_G1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "Opteron_G1-v1",
       "static": false,
       "migration-safe": true,
@@ -25545,8 +25513,7 @@
     {
       "name": "Nehalem-v1",
       "typename": "Nehalem-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -25565,8 +25532,7 @@
     {
       "name": "Nehalem",
       "typename": "Nehalem-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "Nehalem-v1",
       "static": false,
       "migration-safe": true,
@@ -26076,8 +26042,7 @@
     {
       "name": "EPYC-v3",
       "typename": "EPYC-v3-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -26085,8 +26050,7 @@
     {
       "name": "EPYC-v2",
       "typename": "EPYC-v2-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -26094,8 +26058,7 @@
     {
       "name": "EPYC-v1",
       "typename": "EPYC-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -26113,8 +26076,7 @@
     {
       "name": "EPYC-Rome-v1",
       "typename": "EPYC-Rome-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -26122,8 +26084,7 @@
     {
       "name": "EPYC-Rome",
       "typename": "EPYC-Rome-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "EPYC-Rome-v1",
       "static": false,
       "migration-safe": true,
@@ -26165,8 +26126,7 @@
     {
       "name": "EPYC-IBPB",
       "typename": "EPYC-IBPB-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "EPYC-v2",
       "static": false,
       "migration-safe": true,
@@ -26175,8 +26135,7 @@
     {
       "name": "EPYC",
       "typename": "EPYC-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "EPYC-v1",
       "static": false,
       "migration-safe": true,
@@ -26185,8 +26144,7 @@
     {
       "name": "Dhyana-v1",
       "typename": "Dhyana-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -26194,8 +26152,7 @@
     {
       "name": "Dhyana",
       "typename": "Dhyana-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "Dhyana-v1",
       "static": false,
       "migration-safe": true,
@@ -26303,8 +26260,7 @@
     {
       "name": "Conroe-v1",
       "typename": "Conroe-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -26312,8 +26268,7 @@
     {
       "name": "Conroe",
       "typename": "Conroe-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "Conroe-v1",
       "static": false,
       "migration-safe": true,
@@ -26590,8 +26545,7 @@
     {
       "name": "486-v1",
       "typename": "486-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -26599,8 +26553,7 @@
     {
       "name": "486",
       "typename": "486-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "486-v1",
       "static": false,
       "migration-safe": true,
@@ -26772,8 +26725,7 @@
       "option": "vnc"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": "smbios"
     },
     {
@@ -27124,8 +27076,7 @@
       "option": "spice"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": "acpi"
     },
     {
@@ -27175,8 +27126,7 @@
       "option": "fw_cfg"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": ""
     },
     {
@@ -27209,8 +27159,7 @@
       "option": "icount"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": "numa"
     },
     {
@@ -27261,13 +27210,11 @@
       "option": "overcommit"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": "tpmdev"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": "object"
     },
     {
@@ -27370,8 +27317,7 @@
       "option": "memory"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": "accel"
     },
     {
@@ -27561,23 +27507,19 @@
       "option": "rtc"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": "net"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": "nic"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": "netdev"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": "device"
     },
     {
@@ -29071,8 +29013,7 @@
 }
 
 {
-  "return": {
-  },
+  "return": {},
   "id": "libvirt-1"
 }
 
@@ -29086,8 +29027,7 @@
     {
       "name": "max",
       "typename": "max-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": false,
       "deprecated": false
@@ -29105,8 +29045,7 @@
     {
       "name": "base",
       "typename": "base-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": true,
       "migration-safe": true,
       "deprecated": false
@@ -29114,8 +29053,7 @@
     {
       "name": "qemu64-v1",
       "typename": "qemu64-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -29123,8 +29061,7 @@
     {
       "name": "qemu64",
       "typename": "qemu64-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "qemu64-v1",
       "static": false,
       "migration-safe": true,
@@ -29133,8 +29070,7 @@
     {
       "name": "qemu32-v1",
       "typename": "qemu32-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -29142,8 +29078,7 @@
     {
       "name": "qemu32",
       "typename": "qemu32-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "qemu32-v1",
       "static": false,
       "migration-safe": true,
@@ -29173,8 +29108,7 @@
     {
       "name": "pentium3-v1",
       "typename": "pentium3-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -29182,8 +29116,7 @@
     {
       "name": "pentium3",
       "typename": "pentium3-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "pentium3-v1",
       "static": false,
       "migration-safe": true,
@@ -29192,8 +29125,7 @@
     {
       "name": "pentium2-v1",
       "typename": "pentium2-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -29201,8 +29133,7 @@
     {
       "name": "pentium2",
       "typename": "pentium2-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "pentium2-v1",
       "static": false,
       "migration-safe": true,
@@ -29211,8 +29142,7 @@
     {
       "name": "pentium-v1",
       "typename": "pentium-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -29220,8 +29150,7 @@
     {
       "name": "pentium",
       "typename": "pentium-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "pentium-v1",
       "static": false,
       "migration-safe": true,
@@ -29230,8 +29159,7 @@
     {
       "name": "n270-v1",
       "typename": "n270-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -29239,8 +29167,7 @@
     {
       "name": "n270",
       "typename": "n270-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "n270-v1",
       "static": false,
       "migration-safe": true,
@@ -29249,8 +29176,7 @@
     {
       "name": "kvm64-v1",
       "typename": "kvm64-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -29258,8 +29184,7 @@
     {
       "name": "kvm64",
       "typename": "kvm64-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "kvm64-v1",
       "static": false,
       "migration-safe": true,
@@ -29268,8 +29193,7 @@
     {
       "name": "kvm32-v1",
       "typename": "kvm32-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -29277,8 +29201,7 @@
     {
       "name": "kvm32",
       "typename": "kvm32-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "kvm32-v1",
       "static": false,
       "migration-safe": true,
@@ -29287,8 +29210,7 @@
     {
       "name": "coreduo-v1",
       "typename": "coreduo-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -29296,8 +29218,7 @@
     {
       "name": "coreduo",
       "typename": "coreduo-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "coreduo-v1",
       "static": false,
       "migration-safe": true,
@@ -29306,8 +29227,7 @@
     {
       "name": "core2duo-v1",
       "typename": "core2duo-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -29315,8 +29235,7 @@
     {
       "name": "core2duo",
       "typename": "core2duo-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "core2duo-v1",
       "static": false,
       "migration-safe": true,
@@ -29325,8 +29244,7 @@
     {
       "name": "athlon-v1",
       "typename": "athlon-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -29334,8 +29252,7 @@
     {
       "name": "athlon",
       "typename": "athlon-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "athlon-v1",
       "static": false,
       "migration-safe": true,
@@ -29354,8 +29271,7 @@
     {
       "name": "Westmere-v1",
       "typename": "Westmere-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -29374,8 +29290,7 @@
     {
       "name": "Westmere",
       "typename": "Westmere-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "Westmere-v1",
       "static": false,
       "migration-safe": true,
@@ -29838,8 +29753,7 @@
     {
       "name": "Penryn-v1",
       "typename": "Penryn-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -29847,8 +29761,7 @@
     {
       "name": "Penryn",
       "typename": "Penryn-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "Penryn-v1",
       "static": false,
       "migration-safe": true,
@@ -29946,8 +29859,7 @@
     {
       "name": "Opteron_G2-v1",
       "typename": "Opteron_G2-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -29955,8 +29867,7 @@
     {
       "name": "Opteron_G2",
       "typename": "Opteron_G2-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "Opteron_G2-v1",
       "static": false,
       "migration-safe": true,
@@ -29965,8 +29876,7 @@
     {
       "name": "Opteron_G1-v1",
       "typename": "Opteron_G1-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -29974,8 +29884,7 @@
     {
       "name": "Opteron_G1",
       "typename": "Opteron_G1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "Opteron_G1-v1",
       "static": false,
       "migration-safe": true,
@@ -29994,8 +29903,7 @@
     {
       "name": "Nehalem-v1",
       "typename": "Nehalem-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -30014,8 +29922,7 @@
     {
       "name": "Nehalem",
       "typename": "Nehalem-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "Nehalem-v1",
       "static": false,
       "migration-safe": true,
@@ -31136,8 +31043,7 @@
     {
       "name": "Conroe-v1",
       "typename": "Conroe-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -31145,8 +31051,7 @@
     {
       "name": "Conroe",
       "typename": "Conroe-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "Conroe-v1",
       "static": false,
       "migration-safe": true,
@@ -31519,8 +31424,7 @@
     {
       "name": "486-v1",
       "typename": "486-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -31528,8 +31432,7 @@
     {
       "name": "486",
       "typename": "486-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "486-v1",
       "static": false,
       "migration-safe": true,

diff --git a/tests/qemucapabilitiesdata/caps_6.1.0_x86_64.replies b/tests/qemucapabilitiesdata/caps_6.1.0_x86_64.replies
index 8b1eb5d3ae865bc2617d0ccf73c0c589b764757b..5872007954f9a809f51095000a0d59161db5197e 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_6.1.0_x86_64.replies
+++ b/tests/qemucapabilitiesdata/caps_6.1.0_x86_64.replies
@@ -4,8 +4,7 @@
 }
 
 {
-  "return": {
-  },
+  "return": {},
   "id": "libvirt-1"
 }
 
@@ -1461,8 +1460,7 @@
     },
     {
       "name": "0",
-      "members": [
-      ],
+      "members": [],
       "meta-type": "object"
     },
     {
@@ -15907,8 +15905,7 @@
     },
     {
       "name": "611",
-      "members": [
-      ],
+      "members": [],
       "meta-type": "object"
     },
     {
@@ -25021,8 +25018,7 @@
     {
       "name": "max",
       "typename": "max-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": false,
       "deprecated": false
@@ -25030,8 +25026,7 @@
     {
       "name": "host",
       "typename": "host-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": false,
       "deprecated": false
@@ -25039,8 +25034,7 @@
     {
       "name": "base",
       "typename": "base-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": true,
       "migration-safe": true,
       "deprecated": false
@@ -25048,8 +25042,7 @@
     {
       "name": "qemu64-v1",
       "typename": "qemu64-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -25057,8 +25050,7 @@
     {
       "name": "qemu64",
       "typename": "qemu64-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "qemu64-v1",
       "static": false,
       "migration-safe": true,
@@ -25067,8 +25059,7 @@
     {
       "name": "qemu32-v1",
       "typename": "qemu32-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -25076,8 +25067,7 @@
     {
       "name": "qemu32",
       "typename": "qemu32-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "qemu32-v1",
       "static": false,
       "migration-safe": true,
@@ -25109,8 +25099,7 @@
     {
       "name": "pentium3-v1",
       "typename": "pentium3-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -25118,8 +25107,7 @@
     {
       "name": "pentium3",
       "typename": "pentium3-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "pentium3-v1",
       "static": false,
       "migration-safe": true,
@@ -25128,8 +25116,7 @@
     {
       "name": "pentium2-v1",
       "typename": "pentium2-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -25137,8 +25124,7 @@
     {
       "name": "pentium2",
       "typename": "pentium2-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "pentium2-v1",
       "static": false,
       "migration-safe": true,
@@ -25147,8 +25133,7 @@
     {
       "name": "pentium-v1",
       "typename": "pentium-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -25156,8 +25141,7 @@
     {
       "name": "pentium",
       "typename": "pentium-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "pentium-v1",
       "static": false,
       "migration-safe": true,
@@ -25187,8 +25171,7 @@
     {
       "name": "kvm64-v1",
       "typename": "kvm64-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -25196,8 +25179,7 @@
     {
       "name": "kvm64",
       "typename": "kvm64-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "kvm64-v1",
       "static": false,
       "migration-safe": true,
@@ -25206,8 +25188,7 @@
     {
       "name": "kvm32-v1",
       "typename": "kvm32-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -25215,8 +25196,7 @@
     {
       "name": "kvm32",
       "typename": "kvm32-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "kvm32-v1",
       "static": false,
       "migration-safe": true,
@@ -25300,8 +25280,7 @@
     {
       "name": "Westmere-v1",
       "typename": "Westmere-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -25320,8 +25299,7 @@
     {
       "name": "Westmere",
       "typename": "Westmere-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "Westmere-v1",
       "static": false,
       "migration-safe": true,
@@ -25708,8 +25686,7 @@
     {
       "name": "SandyBridge-v1",
       "typename": "SandyBridge-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -25728,8 +25705,7 @@
     {
       "name": "SandyBridge",
       "typename": "SandyBridge-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "SandyBridge-v1",
       "static": false,
       "migration-safe": true,
@@ -25738,8 +25714,7 @@
     {
       "name": "Penryn-v1",
       "typename": "Penryn-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -25747,8 +25722,7 @@
     {
       "name": "Penryn",
       "typename": "Penryn-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "Penryn-v1",
       "static": false,
       "migration-safe": true,
@@ -25805,8 +25779,7 @@
     {
       "name": "Opteron_G3-v1",
       "typename": "Opteron_G3-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -25814,8 +25787,7 @@
     {
       "name": "Opteron_G3",
       "typename": "Opteron_G3-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "Opteron_G3-v1",
       "static": false,
       "migration-safe": true,
@@ -25824,8 +25796,7 @@
     {
       "name": "Opteron_G2-v1",
       "typename": "Opteron_G2-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -25833,8 +25804,7 @@
     {
       "name": "Opteron_G2",
       "typename": "Opteron_G2-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "Opteron_G2-v1",
       "static": false,
       "migration-safe": true,
@@ -25843,8 +25813,7 @@
     {
       "name": "Opteron_G1-v1",
       "typename": "Opteron_G1-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -25852,8 +25821,7 @@
     {
       "name": "Opteron_G1",
       "typename": "Opteron_G1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "Opteron_G1-v1",
       "static": false,
       "migration-safe": true,
@@ -25872,8 +25840,7 @@
     {
       "name": "Nehalem-v1",
       "typename": "Nehalem-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -25892,8 +25859,7 @@
     {
       "name": "Nehalem",
       "typename": "Nehalem-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "Nehalem-v1",
       "static": false,
       "migration-safe": true,
@@ -26462,8 +26428,7 @@
     {
       "name": "EPYC-v3",
       "typename": "EPYC-v3-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -26471,8 +26436,7 @@
     {
       "name": "EPYC-v2",
       "typename": "EPYC-v2-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -26480,8 +26444,7 @@
     {
       "name": "EPYC-v1",
       "typename": "EPYC-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -26499,8 +26462,7 @@
     {
       "name": "EPYC-Rome-v1",
       "typename": "EPYC-Rome-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -26508,8 +26470,7 @@
     {
       "name": "EPYC-Rome",
       "typename": "EPYC-Rome-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "EPYC-Rome-v1",
       "static": false,
       "migration-safe": true,
@@ -26551,8 +26512,7 @@
     {
       "name": "EPYC-IBPB",
       "typename": "EPYC-IBPB-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "EPYC-v2",
       "static": false,
       "migration-safe": true,
@@ -26561,8 +26521,7 @@
     {
       "name": "EPYC",
       "typename": "EPYC-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "EPYC-v1",
       "static": false,
       "migration-safe": true,
@@ -26571,8 +26530,7 @@
     {
       "name": "Dhyana-v2",
       "typename": "Dhyana-v2-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -26580,8 +26538,7 @@
     {
       "name": "Dhyana-v1",
       "typename": "Dhyana-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -26589,8 +26546,7 @@
     {
       "name": "Dhyana",
       "typename": "Dhyana-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "Dhyana-v1",
       "static": false,
       "migration-safe": true,
@@ -26741,8 +26697,7 @@
     {
       "name": "Conroe-v1",
       "typename": "Conroe-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -26750,8 +26705,7 @@
     {
       "name": "Conroe",
       "typename": "Conroe-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "Conroe-v1",
       "static": false,
       "migration-safe": true,
@@ -27053,8 +27007,7 @@
     {
       "name": "486-v1",
       "typename": "486-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -27062,8 +27015,7 @@
     {
       "name": "486",
       "typename": "486-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "486-v1",
       "static": false,
       "migration-safe": true,
@@ -27380,13 +27332,11 @@
       "option": "spice"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": "smbios"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": "acpi"
     },
     {
@@ -27743,8 +27693,7 @@
       "option": "fw_cfg"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": ""
     },
     {
@@ -27777,8 +27726,7 @@
       "option": "icount"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": "numa"
     },
     {
@@ -27829,13 +27777,11 @@
       "option": "overcommit"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": "tpmdev"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": "object"
     },
     {
@@ -27938,8 +27884,7 @@
       "option": "memory"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": "accel"
     },
     {
@@ -27956,8 +27901,7 @@
       "option": "option-rom"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": "plugin"
     },
     {
@@ -28029,23 +27973,19 @@
       "option": "rtc"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": "net"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": "nic"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": "netdev"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": "device"
     },
     {
@@ -29551,8 +29491,7 @@
 }
 
 {
-  "return": {
-  },
+  "return": {},
   "id": "libvirt-1"
 }
 
@@ -29566,8 +29505,7 @@
     {
       "name": "max",
       "typename": "max-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": false,
       "deprecated": false
@@ -29585,8 +29523,7 @@
     {
       "name": "base",
       "typename": "base-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": true,
       "migration-safe": true,
       "deprecated": false
@@ -29594,8 +29531,7 @@
     {
       "name": "qemu64-v1",
       "typename": "qemu64-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -29603,8 +29539,7 @@
     {
       "name": "qemu64",
       "typename": "qemu64-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "qemu64-v1",
       "static": false,
       "migration-safe": true,
@@ -29613,8 +29548,7 @@
     {
       "name": "qemu32-v1",
       "typename": "qemu32-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -29622,8 +29556,7 @@
     {
       "name": "qemu32",
       "typename": "qemu32-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "qemu32-v1",
       "static": false,
       "migration-safe": true,
@@ -29653,8 +29586,7 @@
     {
       "name": "pentium3-v1",
       "typename": "pentium3-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -29662,8 +29594,7 @@
     {
       "name": "pentium3",
       "typename": "pentium3-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "pentium3-v1",
       "static": false,
       "migration-safe": true,
@@ -29672,8 +29603,7 @@
     {
       "name": "pentium2-v1",
       "typename": "pentium2-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -29681,8 +29611,7 @@
     {
       "name": "pentium2",
       "typename": "pentium2-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "pentium2-v1",
       "static": false,
       "migration-safe": true,
@@ -29691,8 +29620,7 @@
     {
       "name": "pentium-v1",
       "typename": "pentium-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -29700,8 +29628,7 @@
     {
       "name": "pentium",
       "typename": "pentium-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "pentium-v1",
       "static": false,
       "migration-safe": true,
@@ -29710,8 +29637,7 @@
     {
       "name": "n270-v1",
       "typename": "n270-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -29719,8 +29645,7 @@
     {
       "name": "n270",
       "typename": "n270-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "n270-v1",
       "static": false,
       "migration-safe": true,
@@ -29729,8 +29654,7 @@
     {
       "name": "kvm64-v1",
       "typename": "kvm64-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -29738,8 +29662,7 @@
     {
       "name": "kvm64",
       "typename": "kvm64-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "kvm64-v1",
       "static": false,
       "migration-safe": true,
@@ -29748,8 +29671,7 @@
     {
       "name": "kvm32-v1",
       "typename": "kvm32-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -29757,8 +29679,7 @@
     {
       "name": "kvm32",
       "typename": "kvm32-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "kvm32-v1",
       "static": false,
       "migration-safe": true,
@@ -29767,8 +29688,7 @@
     {
       "name": "coreduo-v1",
       "typename": "coreduo-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -29776,8 +29696,7 @@
     {
       "name": "coreduo",
       "typename": "coreduo-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "coreduo-v1",
       "static": false,
       "migration-safe": true,
@@ -29786,8 +29705,7 @@
     {
       "name": "core2duo-v1",
       "typename": "core2duo-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -29795,8 +29713,7 @@
     {
       "name": "core2duo",
       "typename": "core2duo-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "core2duo-v1",
       "static": false,
       "migration-safe": true,
@@ -29805,8 +29722,7 @@
     {
       "name": "athlon-v1",
       "typename": "athlon-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -29814,8 +29730,7 @@
     {
       "name": "athlon",
       "typename": "athlon-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "athlon-v1",
       "static": false,
       "migration-safe": true,
@@ -29834,8 +29749,7 @@
     {
       "name": "Westmere-v1",
       "typename": "Westmere-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -29854,8 +29768,7 @@
     {
       "name": "Westmere",
       "typename": "Westmere-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "Westmere-v1",
       "static": false,
       "migration-safe": true,
@@ -30393,8 +30306,7 @@
     {
       "name": "Penryn-v1",
       "typename": "Penryn-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -30402,8 +30314,7 @@
     {
       "name": "Penryn",
       "typename": "Penryn-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "Penryn-v1",
       "static": false,
       "migration-safe": true,
@@ -30501,8 +30412,7 @@
     {
       "name": "Opteron_G2-v1",
       "typename": "Opteron_G2-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -30510,8 +30420,7 @@
     {
       "name": "Opteron_G2",
       "typename": "Opteron_G2-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "Opteron_G2-v1",
       "static": false,
       "migration-safe": true,
@@ -30520,8 +30429,7 @@
     {
       "name": "Opteron_G1-v1",
       "typename": "Opteron_G1-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -30529,8 +30437,7 @@
     {
       "name": "Opteron_G1",
       "typename": "Opteron_G1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "Opteron_G1-v1",
       "static": false,
       "migration-safe": true,
@@ -30549,8 +30456,7 @@
     {
       "name": "Nehalem-v1",
       "typename": "Nehalem-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -30569,8 +30475,7 @@
     {
       "name": "Nehalem",
       "typename": "Nehalem-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "Nehalem-v1",
       "static": false,
       "migration-safe": true,
@@ -31860,8 +31765,7 @@
     {
       "name": "Conroe-v1",
       "typename": "Conroe-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -31869,8 +31773,7 @@
     {
       "name": "Conroe",
       "typename": "Conroe-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "Conroe-v1",
       "static": false,
       "migration-safe": true,
@@ -32277,8 +32180,7 @@
     {
       "name": "486-v1",
       "typename": "486-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -32286,8 +32188,7 @@
     {
       "name": "486",
       "typename": "486-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "486-v1",
       "static": false,
       "migration-safe": true,

diff --git a/tests/qemucapabilitiesdata/caps_6.2.0_aarch64.replies b/tests/qemucapabilitiesdata/caps_6.2.0_aarch64.replies
index fd66e700d5ec615b1beb8d65ff999ad7608f996b..e2e26b29327fc75dabf78c62fe1f3dbf5946ac12 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_6.2.0_aarch64.replies
+++ b/tests/qemucapabilitiesdata/caps_6.2.0_aarch64.replies
@@ -4,8 +4,7 @@
 }
 
 {
-  "return": {
-  },
+  "return": {},
   "id": "libvirt-1"
 }
 
@@ -1442,8 +1441,7 @@
     },
     {
       "name": "0",
-      "members": [
-      ],
+      "members": [],
       "meta-type": "object"
     },
     {
@@ -15923,8 +15921,7 @@
     },
     {
       "name": "615",
-      "members": [
-      ],
+      "members": [],
       "meta-type": "object"
     },
     {
@@ -25613,13 +25610,11 @@
       "option": "spice"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": "smbios"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": "acpi"
     },
     {
@@ -26026,8 +26021,7 @@
       "option": "icount"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": "numa"
     },
     {
@@ -26078,13 +26072,11 @@
       "option": "overcommit"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": "tpmdev"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": "object"
     },
     {
@@ -26187,8 +26179,7 @@
       "option": "memory"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": "accel"
     },
     {
@@ -26205,8 +26196,7 @@
       "option": "option-rom"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": "plugin"
     },
     {
@@ -26278,23 +26268,19 @@
       "option": "rtc"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": "net"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": "nic"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": "netdev"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": "device"
     },
     {
@@ -26889,8 +26875,7 @@
 }
 
 {
-  "return": {
-  },
+  "return": {},
   "id": "libvirt-1"
 }
 

diff --git a/tests/qemucapabilitiesdata/caps_6.2.0_ppc64.replies b/tests/qemucapabilitiesdata/caps_6.2.0_ppc64.replies
index 6f0079c815b27f083d897f246346af93a4a07dee..ceced46e4b611110797c8110a8118b4c90e6455c 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_6.2.0_ppc64.replies
+++ b/tests/qemucapabilitiesdata/caps_6.2.0_ppc64.replies
@@ -4,8 +4,7 @@
 }
 
 {
-  "return": {
-  },
+  "return": {},
   "id": "libvirt-1"
 }
 
@@ -1509,8 +1508,7 @@
     },
     {
       "name": "0",
-      "members": [
-      ],
+      "members": [],
       "meta-type": "object"
     },
     {
@@ -18342,8 +18340,7 @@
     },
     {
       "name": "619",
-      "members": [
-      ],
+      "members": [],
       "meta-type": "object"
     },
     {
@@ -29107,8 +29104,7 @@
       "option": "machine"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": "acpi"
     },
     {
@@ -29440,8 +29436,7 @@
       "option": "fw_cfg"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": ""
     },
     {
@@ -29474,8 +29469,7 @@
       "option": "icount"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": "numa"
     },
     {
@@ -29526,13 +29520,11 @@
       "option": "overcommit"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": "tpmdev"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": "object"
     },
     {
@@ -29635,8 +29627,7 @@
       "option": "memory"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": "accel"
     },
     {
@@ -29653,8 +29644,7 @@
       "option": "option-rom"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": "plugin"
     },
     {
@@ -29726,23 +29716,19 @@
       "option": "rtc"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": "net"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": "nic"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": "netdev"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": "device"
     },
     {
@@ -30226,8 +30212,7 @@
 }
 
 {
-  "return": {
-  },
+  "return": {},
   "id": "libvirt-1"
 }
 

diff --git a/tests/qemucapabilitiesdata/caps_6.2.0_x86_64.replies b/tests/qemucapabilitiesdata/caps_6.2.0_x86_64.replies
index 8faf985392c282e51af48992115941a0f1affd18..bd7e1f00a415f9cef0473a58aed320c06e95de52 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_6.2.0_x86_64.replies
+++ b/tests/qemucapabilitiesdata/caps_6.2.0_x86_64.replies
@@ -4,8 +4,7 @@
 }
 
 {
-  "return": {
-  },
+  "return": {},
   "id": "libvirt-1"
 }
 
@@ -1589,8 +1588,7 @@
     },
     {
       "name": "0",
-      "members": [
-      ],
+      "members": [],
       "meta-type": "object"
     },
     {
@@ -18965,8 +18963,7 @@
     },
     {
       "name": "619",
-      "members": [
-      ],
+      "members": [],
       "meta-type": "object"
     },
     {
@@ -28269,8 +28266,7 @@
     {
       "name": "max",
       "typename": "max-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": false,
       "deprecated": false
@@ -28278,8 +28274,7 @@
     {
       "name": "host",
       "typename": "host-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": false,
       "deprecated": false
@@ -28287,8 +28282,7 @@
     {
       "name": "base",
       "typename": "base-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": true,
       "migration-safe": true,
       "deprecated": false
@@ -28296,8 +28290,7 @@
     {
       "name": "qemu64-v1",
       "typename": "qemu64-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -28305,8 +28298,7 @@
     {
       "name": "qemu64",
       "typename": "qemu64-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "qemu64-v1",
       "static": false,
       "migration-safe": true,
@@ -28315,8 +28307,7 @@
     {
       "name": "qemu32-v1",
       "typename": "qemu32-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -28324,8 +28315,7 @@
     {
       "name": "qemu32",
       "typename": "qemu32-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "qemu32-v1",
       "static": false,
       "migration-safe": true,
@@ -28357,8 +28347,7 @@
     {
       "name": "pentium3-v1",
       "typename": "pentium3-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -28366,8 +28355,7 @@
     {
       "name": "pentium3",
       "typename": "pentium3-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "pentium3-v1",
       "static": false,
       "migration-safe": true,
@@ -28376,8 +28364,7 @@
     {
       "name": "pentium2-v1",
       "typename": "pentium2-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -28385,8 +28372,7 @@
     {
       "name": "pentium2",
       "typename": "pentium2-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "pentium2-v1",
       "static": false,
       "migration-safe": true,
@@ -28395,8 +28381,7 @@
     {
       "name": "pentium-v1",
       "typename": "pentium-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -28404,8 +28389,7 @@
     {
       "name": "pentium",
       "typename": "pentium-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "pentium-v1",
       "static": false,
       "migration-safe": true,
@@ -28435,8 +28419,7 @@
     {
       "name": "kvm64-v1",
       "typename": "kvm64-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -28444,8 +28427,7 @@
     {
       "name": "kvm64",
       "typename": "kvm64-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "kvm64-v1",
       "static": false,
       "migration-safe": true,
@@ -28454,8 +28436,7 @@
     {
       "name": "kvm32-v1",
       "typename": "kvm32-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -28463,8 +28444,7 @@
     {
       "name": "kvm32",
       "typename": "kvm32-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "kvm32-v1",
       "static": false,
       "migration-safe": true,
@@ -28548,8 +28528,7 @@
     {
       "name": "Westmere-v1",
       "typename": "Westmere-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -28568,8 +28547,7 @@
     {
       "name": "Westmere",
       "typename": "Westmere-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "Westmere-v1",
       "static": false,
       "migration-safe": true,
@@ -28971,8 +28949,7 @@
     {
       "name": "SandyBridge-v1",
       "typename": "SandyBridge-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -28991,8 +28968,7 @@
     {
       "name": "SandyBridge",
       "typename": "SandyBridge-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "SandyBridge-v1",
       "static": false,
       "migration-safe": true,
@@ -29001,8 +28977,7 @@
     {
       "name": "Penryn-v1",
       "typename": "Penryn-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -29010,8 +28985,7 @@
     {
       "name": "Penryn",
       "typename": "Penryn-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "Penryn-v1",
       "static": false,
       "migration-safe": true,
@@ -29068,8 +29042,7 @@
     {
       "name": "Opteron_G3-v1",
       "typename": "Opteron_G3-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -29077,8 +29050,7 @@
     {
       "name": "Opteron_G3",
       "typename": "Opteron_G3-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "Opteron_G3-v1",
       "static": false,
       "migration-safe": true,
@@ -29087,8 +29059,7 @@
     {
       "name": "Opteron_G2-v1",
       "typename": "Opteron_G2-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -29096,8 +29067,7 @@
     {
       "name": "Opteron_G2",
       "typename": "Opteron_G2-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "Opteron_G2-v1",
       "static": false,
       "migration-safe": true,
@@ -29106,8 +29076,7 @@
     {
       "name": "Opteron_G1-v1",
       "typename": "Opteron_G1-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -29115,8 +29084,7 @@
     {
       "name": "Opteron_G1",
       "typename": "Opteron_G1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "Opteron_G1-v1",
       "static": false,
       "migration-safe": true,
@@ -29135,8 +29103,7 @@
     {
       "name": "Nehalem-v1",
       "typename": "Nehalem-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -29155,8 +29122,7 @@
     {
       "name": "Nehalem",
       "typename": "Nehalem-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "Nehalem-v1",
       "static": false,
       "migration-safe": true,
@@ -29725,8 +29691,7 @@
     {
       "name": "EPYC-v3",
       "typename": "EPYC-v3-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -29734,8 +29699,7 @@
     {
       "name": "EPYC-v2",
       "typename": "EPYC-v2-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -29743,8 +29707,7 @@
     {
       "name": "EPYC-v1",
       "typename": "EPYC-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -29762,8 +29725,7 @@
     {
       "name": "EPYC-Rome-v1",
       "typename": "EPYC-Rome-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -29771,8 +29733,7 @@
     {
       "name": "EPYC-Rome",
       "typename": "EPYC-Rome-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "EPYC-Rome-v1",
       "static": false,
       "migration-safe": true,
@@ -29814,8 +29775,7 @@
     {
       "name": "EPYC-IBPB",
       "typename": "EPYC-IBPB-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "EPYC-v2",
       "static": false,
       "migration-safe": true,
@@ -29824,8 +29784,7 @@
     {
       "name": "EPYC",
       "typename": "EPYC-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "EPYC-v1",
       "static": false,
       "migration-safe": true,
@@ -29834,8 +29793,7 @@
     {
       "name": "Dhyana-v2",
       "typename": "Dhyana-v2-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -29843,8 +29801,7 @@
     {
       "name": "Dhyana-v1",
       "typename": "Dhyana-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -29852,8 +29809,7 @@
     {
       "name": "Dhyana",
       "typename": "Dhyana-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "Dhyana-v1",
       "static": false,
       "migration-safe": true,
@@ -30001,8 +29957,7 @@
     {
       "name": "Conroe-v1",
       "typename": "Conroe-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -30010,8 +29965,7 @@
     {
       "name": "Conroe",
       "typename": "Conroe-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "Conroe-v1",
       "static": false,
       "migration-safe": true,
@@ -30313,8 +30267,7 @@
     {
       "name": "486-v1",
       "typename": "486-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -30322,8 +30275,7 @@
     {
       "name": "486",
       "typename": "486-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "486-v1",
       "static": false,
       "migration-safe": true,
@@ -30640,13 +30592,11 @@
       "option": "spice"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": "smbios"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": "acpi"
     },
     {
@@ -31003,8 +30953,7 @@
       "option": "fw_cfg"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": ""
     },
     {
@@ -31037,8 +30986,7 @@
       "option": "icount"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": "numa"
     },
     {
@@ -31089,13 +31037,11 @@
       "option": "overcommit"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": "tpmdev"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": "object"
     },
     {
@@ -31198,8 +31144,7 @@
       "option": "memory"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": "accel"
     },
     {
@@ -31216,8 +31161,7 @@
       "option": "option-rom"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": "plugin"
     },
     {
@@ -31289,23 +31233,19 @@
       "option": "rtc"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": "net"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": "nic"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": "netdev"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": "device"
     },
     {
@@ -32854,8 +32794,7 @@
 }
 
 {
-  "return": {
-  },
+  "return": {},
   "id": "libvirt-1"
 }
 
@@ -32869,8 +32808,7 @@
     {
       "name": "max",
       "typename": "max-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": false,
       "deprecated": false
@@ -32888,8 +32826,7 @@
     {
       "name": "base",
       "typename": "base-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": true,
       "migration-safe": true,
       "deprecated": false
@@ -32897,8 +32834,7 @@
     {
       "name": "qemu64-v1",
       "typename": "qemu64-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -32906,8 +32842,7 @@
     {
       "name": "qemu64",
       "typename": "qemu64-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "qemu64-v1",
       "static": false,
       "migration-safe": true,
@@ -32916,8 +32851,7 @@
     {
       "name": "qemu32-v1",
       "typename": "qemu32-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -32925,8 +32859,7 @@
     {
       "name": "qemu32",
       "typename": "qemu32-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "qemu32-v1",
       "static": false,
       "migration-safe": true,
@@ -32956,8 +32889,7 @@
     {
       "name": "pentium3-v1",
       "typename": "pentium3-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -32965,8 +32897,7 @@
     {
       "name": "pentium3",
       "typename": "pentium3-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "pentium3-v1",
       "static": false,
       "migration-safe": true,
@@ -32975,8 +32906,7 @@
     {
       "name": "pentium2-v1",
       "typename": "pentium2-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -32984,8 +32914,7 @@
     {
       "name": "pentium2",
       "typename": "pentium2-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "pentium2-v1",
       "static": false,
       "migration-safe": true,
@@ -32994,8 +32923,7 @@
     {
       "name": "pentium-v1",
       "typename": "pentium-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -33003,8 +32931,7 @@
     {
       "name": "pentium",
       "typename": "pentium-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "pentium-v1",
       "static": false,
       "migration-safe": true,
@@ -33013,8 +32940,7 @@
     {
       "name": "n270-v1",
       "typename": "n270-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -33022,8 +32948,7 @@
     {
       "name": "n270",
       "typename": "n270-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "n270-v1",
       "static": false,
       "migration-safe": true,
@@ -33032,8 +32957,7 @@
     {
       "name": "kvm64-v1",
       "typename": "kvm64-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -33041,8 +32965,7 @@
     {
       "name": "kvm64",
       "typename": "kvm64-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "kvm64-v1",
       "static": false,
       "migration-safe": true,
@@ -33051,8 +32974,7 @@
     {
       "name": "kvm32-v1",
       "typename": "kvm32-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -33060,8 +32982,7 @@
     {
       "name": "kvm32",
       "typename": "kvm32-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "kvm32-v1",
       "static": false,
       "migration-safe": true,
@@ -33070,8 +32991,7 @@
     {
       "name": "coreduo-v1",
       "typename": "coreduo-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -33079,8 +32999,7 @@
     {
       "name": "coreduo",
       "typename": "coreduo-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "coreduo-v1",
       "static": false,
       "migration-safe": true,
@@ -33089,8 +33008,7 @@
     {
       "name": "core2duo-v1",
       "typename": "core2duo-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -33098,8 +33016,7 @@
     {
       "name": "core2duo",
       "typename": "core2duo-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "core2duo-v1",
       "static": false,
       "migration-safe": true,
@@ -33108,8 +33025,7 @@
     {
       "name": "athlon-v1",
       "typename": "athlon-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -33117,8 +33033,7 @@
     {
       "name": "athlon",
       "typename": "athlon-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "athlon-v1",
       "static": false,
       "migration-safe": true,
@@ -33137,8 +33052,7 @@
     {
       "name": "Westmere-v1",
       "typename": "Westmere-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -33157,8 +33071,7 @@
     {
       "name": "Westmere",
       "typename": "Westmere-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "Westmere-v1",
       "static": false,
       "migration-safe": true,
@@ -33720,8 +33633,7 @@
     {
       "name": "Penryn-v1",
       "typename": "Penryn-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -33729,8 +33641,7 @@
     {
       "name": "Penryn",
       "typename": "Penryn-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "Penryn-v1",
       "static": false,
       "migration-safe": true,
@@ -33828,8 +33739,7 @@
     {
       "name": "Opteron_G2-v1",
       "typename": "Opteron_G2-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -33837,8 +33747,7 @@
     {
       "name": "Opteron_G2",
       "typename": "Opteron_G2-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "Opteron_G2-v1",
       "static": false,
       "migration-safe": true,
@@ -33847,8 +33756,7 @@
     {
       "name": "Opteron_G1-v1",
       "typename": "Opteron_G1-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -33856,8 +33764,7 @@
     {
       "name": "Opteron_G1",
       "typename": "Opteron_G1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "Opteron_G1-v1",
       "static": false,
       "migration-safe": true,
@@ -33876,8 +33783,7 @@
     {
       "name": "Nehalem-v1",
       "typename": "Nehalem-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -33896,8 +33802,7 @@
     {
       "name": "Nehalem",
       "typename": "Nehalem-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "Nehalem-v1",
       "static": false,
       "migration-safe": true,
@@ -35182,8 +35087,7 @@
     {
       "name": "Conroe-v1",
       "typename": "Conroe-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -35191,8 +35095,7 @@
     {
       "name": "Conroe",
       "typename": "Conroe-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "Conroe-v1",
       "static": false,
       "migration-safe": true,
@@ -35599,8 +35502,7 @@
     {
       "name": "486-v1",
       "typename": "486-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -35608,8 +35510,7 @@
     {
       "name": "486",
       "typename": "486-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "486-v1",
       "static": false,
       "migration-safe": true,

diff --git a/tests/qemucapabilitiesdata/caps_7.0.0_aarch64+hvf.replies b/tests/qemucapabilitiesdata/caps_7.0.0_aarch64+hvf.replies
index 42b1a035d0f681e0c31568d972b0c610f65d0625..4948ac03d82699b1887a04afe0caafd46e9a6ed4 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_7.0.0_aarch64+hvf.replies
+++ b/tests/qemucapabilitiesdata/caps_7.0.0_aarch64+hvf.replies
@@ -4,8 +4,7 @@
 }
 
 {
-  "return": {
-  },
+  "return": {},
   "id": "libvirt-1"
 }
 
@@ -1548,8 +1547,7 @@
     },
     {
       "name": "0",
-      "members": [
-      ],
+      "members": [],
       "meta-type": "object"
     },
     {
@@ -19012,8 +19010,7 @@
     },
     {
       "name": "628",
-      "members": [
-      ],
+      "members": [],
       "meta-type": "object"
     },
     {
@@ -29334,13 +29331,11 @@
       "option": "spice"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": "smbios"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": "acpi"
     },
     {
@@ -29747,8 +29742,7 @@
       "option": "icount"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": "numa"
     },
     {
@@ -29799,13 +29793,11 @@
       "option": "overcommit"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": "tpmdev"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": "object"
     },
     {
@@ -29912,8 +29904,7 @@
       "option": "memory"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": "accel"
     },
     {
@@ -29930,8 +29921,7 @@
       "option": "option-rom"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": "plugin"
     },
     {
@@ -30003,23 +29993,19 @@
       "option": "rtc"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": "net"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": "nic"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": "netdev"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": "device"
     },
     {
@@ -30616,8 +30602,7 @@
 }
 
 {
-  "return": {
-  },
+  "return": {},
   "id": "libvirt-1"
 }
 

diff --git a/tests/qemucapabilitiesdata/caps_7.0.0_aarch64.replies b/tests/qemucapabilitiesdata/caps_7.0.0_aarch64.replies
index cdcf4fd76fd99f6257e76179b41ab55d0e61935a..17055d94a4cda668e1bcc560ae8b0e981f0c248c 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_7.0.0_aarch64.replies
+++ b/tests/qemucapabilitiesdata/caps_7.0.0_aarch64.replies
@@ -4,8 +4,7 @@
 }
 
 {
-  "return": {
-  },
+  "return": {},
   "id": "libvirt-1"
 }
 
@@ -1548,8 +1547,7 @@
     },
     {
       "name": "0",
-      "members": [
-      ],
+      "members": [],
       "meta-type": "object"
     },
     {
@@ -19012,8 +19010,7 @@
     },
     {
       "name": "628",
-      "members": [
-      ],
+      "members": [],
       "meta-type": "object"
     },
     {
@@ -29334,13 +29331,11 @@
       "option": "spice"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": "smbios"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": "acpi"
     },
     {
@@ -29747,8 +29742,7 @@
       "option": "icount"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": "numa"
     },
     {
@@ -29799,13 +29793,11 @@
       "option": "overcommit"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": "tpmdev"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": "object"
     },
     {
@@ -29912,8 +29904,7 @@
       "option": "memory"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": "accel"
     },
     {
@@ -29930,8 +29921,7 @@
       "option": "option-rom"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": "plugin"
     },
     {
@@ -30003,23 +29993,19 @@
       "option": "rtc"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": "net"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": "nic"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": "netdev"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": "device"
     },
     {
@@ -30616,8 +30602,7 @@
 }
 
 {
-  "return": {
-  },
+  "return": {},
   "id": "libvirt-1"
 }
 

diff --git a/tests/qemucapabilitiesdata/caps_7.0.0_ppc64.replies b/tests/qemucapabilitiesdata/caps_7.0.0_ppc64.replies
index 801285ca00c3750472e189ab0aab84d998f18b58..0183997cafa7dcf173b8a11ff6cc89ecf3b3f205 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_7.0.0_ppc64.replies
+++ b/tests/qemucapabilitiesdata/caps_7.0.0_ppc64.replies
@@ -4,8 +4,7 @@
 }
 
 {
-  "return": {
-  },
+  "return": {},
   "id": "libvirt-1"
 }
 
@@ -1510,8 +1509,7 @@
     },
     {
       "name": "0",
-      "members": [
-      ],
+      "members": [],
       "meta-type": "object"
     },
     {
@@ -18658,8 +18656,7 @@
     },
     {
       "name": "628",
-      "members": [
-      ],
+      "members": [],
       "meta-type": "object"
     },
     {
@@ -29734,8 +29731,7 @@
       "option": "iscsi"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": "acpi"
     },
     {
@@ -30092,8 +30088,7 @@
       "option": "fw_cfg"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": ""
     },
     {
@@ -30126,8 +30121,7 @@
       "option": "icount"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": "numa"
     },
     {
@@ -30178,13 +30172,11 @@
       "option": "overcommit"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": "tpmdev"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": "object"
     },
     {
@@ -30291,8 +30283,7 @@
       "option": "memory"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": "accel"
     },
     {
@@ -30309,8 +30300,7 @@
       "option": "option-rom"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": "plugin"
     },
     {
@@ -30382,23 +30372,19 @@
       "option": "rtc"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": "net"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": "nic"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": "netdev"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": "device"
     },
     {
@@ -30882,8 +30868,7 @@
 }
 
 {
-  "return": {
-  },
+  "return": {},
   "id": "libvirt-1"
 }
 

diff --git a/tests/qemucapabilitiesdata/caps_7.0.0_x86_64.replies b/tests/qemucapabilitiesdata/caps_7.0.0_x86_64.replies
index 454cffbb14ebb46e144e8ce5e96510365e559817..9c639b3c31c855b5137ceabeb06dc9666e80792f 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_7.0.0_x86_64.replies
+++ b/tests/qemucapabilitiesdata/caps_7.0.0_x86_64.replies
@@ -4,8 +4,7 @@
 }
 
 {
-  "return": {
-  },
+  "return": {},
   "id": "libvirt-1"
 }
 
@@ -1590,8 +1589,7 @@
     },
     {
       "name": "0",
-      "members": [
-      ],
+      "members": [],
       "meta-type": "object"
     },
     {
@@ -19244,8 +19242,7 @@
     },
     {
       "name": "628",
-      "members": [
-      ],
+      "members": [],
       "meta-type": "object"
     },
     {
@@ -28839,8 +28836,7 @@
     {
       "name": "max",
       "typename": "max-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": false,
       "deprecated": false
@@ -28848,8 +28844,7 @@
     {
       "name": "host",
       "typename": "host-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": false,
       "deprecated": false
@@ -28857,8 +28852,7 @@
     {
       "name": "base",
       "typename": "base-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": true,
       "migration-safe": true,
       "deprecated": false
@@ -28866,8 +28860,7 @@
     {
       "name": "qemu64-v1",
       "typename": "qemu64-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -28875,8 +28868,7 @@
     {
       "name": "qemu64",
       "typename": "qemu64-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "qemu64-v1",
       "static": false,
       "migration-safe": true,
@@ -28885,8 +28877,7 @@
     {
       "name": "qemu32-v1",
       "typename": "qemu32-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -28894,8 +28885,7 @@
     {
       "name": "qemu32",
       "typename": "qemu32-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "qemu32-v1",
       "static": false,
       "migration-safe": true,
@@ -28927,8 +28917,7 @@
     {
       "name": "pentium3-v1",
       "typename": "pentium3-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -28936,8 +28925,7 @@
     {
       "name": "pentium3",
       "typename": "pentium3-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "pentium3-v1",
       "static": false,
       "migration-safe": true,
@@ -28946,8 +28934,7 @@
     {
       "name": "pentium2-v1",
       "typename": "pentium2-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -28955,8 +28942,7 @@
     {
       "name": "pentium2",
       "typename": "pentium2-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "pentium2-v1",
       "static": false,
       "migration-safe": true,
@@ -28965,8 +28951,7 @@
     {
       "name": "pentium-v1",
       "typename": "pentium-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -28974,8 +28959,7 @@
     {
       "name": "pentium",
       "typename": "pentium-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "pentium-v1",
       "static": false,
       "migration-safe": true,
@@ -29005,8 +28989,7 @@
     {
       "name": "kvm64-v1",
       "typename": "kvm64-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -29014,8 +28997,7 @@
     {
       "name": "kvm64",
       "typename": "kvm64-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "kvm64-v1",
       "static": false,
       "migration-safe": true,
@@ -29024,8 +29006,7 @@
     {
       "name": "kvm32-v1",
       "typename": "kvm32-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -29033,8 +29014,7 @@
     {
       "name": "kvm32",
       "typename": "kvm32-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "kvm32-v1",
       "static": false,
       "migration-safe": true,
@@ -29118,8 +29098,7 @@
     {
       "name": "Westmere-v1",
       "typename": "Westmere-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -29138,8 +29117,7 @@
     {
       "name": "Westmere",
       "typename": "Westmere-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "Westmere-v1",
       "static": false,
       "migration-safe": true,
@@ -29541,8 +29519,7 @@
     {
       "name": "SandyBridge-v1",
       "typename": "SandyBridge-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -29561,8 +29538,7 @@
     {
       "name": "SandyBridge",
       "typename": "SandyBridge-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "SandyBridge-v1",
       "static": false,
       "migration-safe": true,
@@ -29571,8 +29547,7 @@
     {
       "name": "Penryn-v1",
       "typename": "Penryn-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -29580,8 +29555,7 @@
     {
       "name": "Penryn",
       "typename": "Penryn-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "Penryn-v1",
       "static": false,
       "migration-safe": true,
@@ -29638,8 +29612,7 @@
     {
       "name": "Opteron_G3-v1",
       "typename": "Opteron_G3-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -29647,8 +29620,7 @@
     {
       "name": "Opteron_G3",
       "typename": "Opteron_G3-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "Opteron_G3-v1",
       "static": false,
       "migration-safe": true,
@@ -29657,8 +29629,7 @@
     {
       "name": "Opteron_G2-v1",
       "typename": "Opteron_G2-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -29666,8 +29637,7 @@
     {
       "name": "Opteron_G2",
       "typename": "Opteron_G2-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "Opteron_G2-v1",
       "static": false,
       "migration-safe": true,
@@ -29676,8 +29646,7 @@
     {
       "name": "Opteron_G1-v1",
       "typename": "Opteron_G1-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -29685,8 +29654,7 @@
     {
       "name": "Opteron_G1",
       "typename": "Opteron_G1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "Opteron_G1-v1",
       "static": false,
       "migration-safe": true,
@@ -29705,8 +29673,7 @@
     {
       "name": "Nehalem-v1",
       "typename": "Nehalem-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -29725,8 +29692,7 @@
     {
       "name": "Nehalem",
       "typename": "Nehalem-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "Nehalem-v1",
       "static": false,
       "migration-safe": true,
@@ -30331,8 +30297,7 @@
     {
       "name": "EPYC-v3",
       "typename": "EPYC-v3-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -30340,8 +30305,7 @@
     {
       "name": "EPYC-v2",
       "typename": "EPYC-v2-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -30349,8 +30313,7 @@
     {
       "name": "EPYC-v1",
       "typename": "EPYC-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -30368,8 +30331,7 @@
     {
       "name": "EPYC-Rome-v1",
       "typename": "EPYC-Rome-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -30377,8 +30339,7 @@
     {
       "name": "EPYC-Rome",
       "typename": "EPYC-Rome-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "EPYC-Rome-v1",
       "static": false,
       "migration-safe": true,
@@ -30420,8 +30381,7 @@
     {
       "name": "EPYC-IBPB",
       "typename": "EPYC-IBPB-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "EPYC-v2",
       "static": false,
       "migration-safe": true,
@@ -30430,8 +30390,7 @@
     {
       "name": "EPYC",
       "typename": "EPYC-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "EPYC-v1",
       "static": false,
       "migration-safe": true,
@@ -30440,8 +30399,7 @@
     {
       "name": "Dhyana-v2",
       "typename": "Dhyana-v2-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -30449,8 +30407,7 @@
     {
       "name": "Dhyana-v1",
       "typename": "Dhyana-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -30458,8 +30415,7 @@
     {
       "name": "Dhyana",
       "typename": "Dhyana-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "Dhyana-v1",
       "static": false,
       "migration-safe": true,
@@ -30607,8 +30563,7 @@
     {
       "name": "Conroe-v1",
       "typename": "Conroe-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -30616,8 +30571,7 @@
     {
       "name": "Conroe",
       "typename": "Conroe-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "Conroe-v1",
       "static": false,
       "migration-safe": true,
@@ -30919,8 +30873,7 @@
     {
       "name": "486-v1",
       "typename": "486-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -30928,8 +30881,7 @@
     {
       "name": "486",
       "typename": "486-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "486-v1",
       "static": false,
       "migration-safe": true,
@@ -31246,13 +31198,11 @@
       "option": "iscsi"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": "smbios"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": "acpi"
     },
     {
@@ -31609,8 +31559,7 @@
       "option": "fw_cfg"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": ""
     },
     {
@@ -31643,8 +31592,7 @@
       "option": "icount"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": "numa"
     },
     {
@@ -31695,13 +31643,11 @@
       "option": "overcommit"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": "tpmdev"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": "object"
     },
     {
@@ -31808,8 +31754,7 @@
       "option": "memory"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": "accel"
     },
     {
@@ -31826,8 +31771,7 @@
       "option": "option-rom"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": "plugin"
     },
     {
@@ -31899,23 +31843,19 @@
       "option": "rtc"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": "net"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": "nic"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": "netdev"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": "device"
     },
     {
@@ -33489,8 +33429,7 @@
 }
 
 {
-  "return": {
-  },
+  "return": {},
   "id": "libvirt-1"
 }
 
@@ -33504,8 +33443,7 @@
     {
       "name": "max",
       "typename": "max-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": false,
       "deprecated": false
@@ -33523,8 +33461,7 @@
     {
       "name": "base",
       "typename": "base-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": true,
       "migration-safe": true,
       "deprecated": false
@@ -33532,8 +33469,7 @@
     {
       "name": "qemu64-v1",
       "typename": "qemu64-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -33541,8 +33477,7 @@
     {
       "name": "qemu64",
       "typename": "qemu64-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "qemu64-v1",
       "static": false,
       "migration-safe": true,
@@ -33551,8 +33486,7 @@
     {
       "name": "qemu32-v1",
       "typename": "qemu32-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -33560,8 +33494,7 @@
     {
       "name": "qemu32",
       "typename": "qemu32-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "qemu32-v1",
       "static": false,
       "migration-safe": true,
@@ -33591,8 +33524,7 @@
     {
       "name": "pentium3-v1",
       "typename": "pentium3-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -33600,8 +33532,7 @@
     {
       "name": "pentium3",
       "typename": "pentium3-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "pentium3-v1",
       "static": false,
       "migration-safe": true,
@@ -33610,8 +33541,7 @@
     {
       "name": "pentium2-v1",
       "typename": "pentium2-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -33619,8 +33549,7 @@
     {
       "name": "pentium2",
       "typename": "pentium2-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "pentium2-v1",
       "static": false,
       "migration-safe": true,
@@ -33629,8 +33558,7 @@
     {
       "name": "pentium-v1",
       "typename": "pentium-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -33638,8 +33566,7 @@
     {
       "name": "pentium",
       "typename": "pentium-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "pentium-v1",
       "static": false,
       "migration-safe": true,
@@ -33648,8 +33575,7 @@
     {
       "name": "n270-v1",
       "typename": "n270-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -33657,8 +33583,7 @@
     {
       "name": "n270",
       "typename": "n270-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "n270-v1",
       "static": false,
       "migration-safe": true,
@@ -33667,8 +33592,7 @@
     {
       "name": "kvm64-v1",
       "typename": "kvm64-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -33676,8 +33600,7 @@
     {
       "name": "kvm64",
       "typename": "kvm64-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "kvm64-v1",
       "static": false,
       "migration-safe": true,
@@ -33686,8 +33609,7 @@
     {
       "name": "kvm32-v1",
       "typename": "kvm32-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -33695,8 +33617,7 @@
     {
       "name": "kvm32",
       "typename": "kvm32-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "kvm32-v1",
       "static": false,
       "migration-safe": true,
@@ -33705,8 +33626,7 @@
     {
       "name": "coreduo-v1",
       "typename": "coreduo-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -33714,8 +33634,7 @@
     {
       "name": "coreduo",
       "typename": "coreduo-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "coreduo-v1",
       "static": false,
       "migration-safe": true,
@@ -33724,8 +33643,7 @@
     {
       "name": "core2duo-v1",
       "typename": "core2duo-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -33733,8 +33651,7 @@
     {
       "name": "core2duo",
       "typename": "core2duo-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "core2duo-v1",
       "static": false,
       "migration-safe": true,
@@ -33743,8 +33660,7 @@
     {
       "name": "athlon-v1",
       "typename": "athlon-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -33752,8 +33668,7 @@
     {
       "name": "athlon",
       "typename": "athlon-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "athlon-v1",
       "static": false,
       "migration-safe": true,
@@ -33772,8 +33687,7 @@
     {
       "name": "Westmere-v1",
       "typename": "Westmere-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -33792,8 +33706,7 @@
     {
       "name": "Westmere",
       "typename": "Westmere-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "Westmere-v1",
       "static": false,
       "migration-safe": true,
@@ -34350,8 +34263,7 @@
     {
       "name": "Penryn-v1",
       "typename": "Penryn-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -34359,8 +34271,7 @@
     {
       "name": "Penryn",
       "typename": "Penryn-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "Penryn-v1",
       "static": false,
       "migration-safe": true,
@@ -34458,8 +34369,7 @@
     {
       "name": "Opteron_G2-v1",
       "typename": "Opteron_G2-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -34467,8 +34377,7 @@
     {
       "name": "Opteron_G2",
       "typename": "Opteron_G2-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "Opteron_G2-v1",
       "static": false,
       "migration-safe": true,
@@ -34477,8 +34386,7 @@
     {
       "name": "Opteron_G1-v1",
       "typename": "Opteron_G1-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -34486,8 +34394,7 @@
     {
       "name": "Opteron_G1",
       "typename": "Opteron_G1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "Opteron_G1-v1",
       "static": false,
       "migration-safe": true,
@@ -34506,8 +34413,7 @@
     {
       "name": "Nehalem-v1",
       "typename": "Nehalem-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -34526,8 +34432,7 @@
     {
       "name": "Nehalem",
       "typename": "Nehalem-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "Nehalem-v1",
       "static": false,
       "migration-safe": true,
@@ -35843,8 +35748,7 @@
     {
       "name": "Conroe-v1",
       "typename": "Conroe-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -35852,8 +35756,7 @@
     {
       "name": "Conroe",
       "typename": "Conroe-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "Conroe-v1",
       "static": false,
       "migration-safe": true,
@@ -36260,8 +36163,7 @@
     {
       "name": "486-v1",
       "typename": "486-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -36269,8 +36171,7 @@
     {
       "name": "486",
       "typename": "486-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "486-v1",
       "static": false,
       "migration-safe": true,

diff --git a/tests/qemucapabilitiesdata/caps_7.1.0_ppc64.replies b/tests/qemucapabilitiesdata/caps_7.1.0_ppc64.replies
index 39615ed626273e522b7335c5aff656cc311de359..931d1c320687c71a75282822a904390334503cdd 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_7.1.0_ppc64.replies
+++ b/tests/qemucapabilitiesdata/caps_7.1.0_ppc64.replies
@@ -4,8 +4,7 @@
 }
 
 {
-  "return": {
-  },
+  "return": {},
   "id": "libvirt-1"
 }
 
@@ -1551,8 +1550,7 @@
     },
     {
       "name": "0",
-      "members": [
-      ],
+      "members": [],
       "meta-type": "object"
     },
     {
@@ -19293,8 +19291,7 @@
     },
     {
       "name": "658",
-      "members": [
-      ],
+      "members": [],
       "meta-type": "object"
     },
     {
@@ -30655,8 +30652,7 @@
       "option": "fsdev"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": "acpi"
     },
     {
@@ -30799,8 +30795,7 @@
       "option": "fw_cfg"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": ""
     },
     {
@@ -30833,8 +30828,7 @@
       "option": "icount"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": "numa"
     },
     {
@@ -30885,13 +30879,11 @@
       "option": "overcommit"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": "tpmdev"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": "object"
     },
     {
@@ -30998,8 +30990,7 @@
       "option": "memory"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": "accel"
     },
     {
@@ -31016,8 +31007,7 @@
       "option": "option-rom"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": "plugin"
     },
     {
@@ -31089,23 +31079,19 @@
       "option": "rtc"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": "net"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": "nic"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": "netdev"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": "device"
     },
     {
@@ -31597,8 +31583,7 @@
 }
 
 {
-  "return": {
-  },
+  "return": {},
   "id": "libvirt-1"
 }
 

diff --git a/tests/qemucapabilitiesdata/caps_7.1.0_x86_64.replies b/tests/qemucapabilitiesdata/caps_7.1.0_x86_64.replies
index e09f696806acffa94ce4a7b582cb470f9dac2ad9..302a34fd49a38470ba8cd39a81df6de0ac339a41 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_7.1.0_x86_64.replies
+++ b/tests/qemucapabilitiesdata/caps_7.1.0_x86_64.replies
@@ -4,8 +4,7 @@
 }
 
 {
-  "return": {
-  },
+  "return": {},
   "id": "libvirt-1"
 }
 
@@ -1631,8 +1630,7 @@
     },
     {
       "name": "0",
-      "members": [
-      ],
+      "members": [],
       "meta-type": "object"
     },
     {
@@ -19899,8 +19897,7 @@
     },
     {
       "name": "658",
-      "members": [
-      ],
+      "members": [],
       "meta-type": "object"
     },
     {
@@ -29627,8 +29624,7 @@
     {
       "name": "max",
       "typename": "max-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": false,
       "deprecated": false
@@ -29636,8 +29632,7 @@
     {
       "name": "host",
       "typename": "host-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": false,
       "deprecated": false
@@ -29645,8 +29640,7 @@
     {
       "name": "base",
       "typename": "base-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": true,
       "migration-safe": true,
       "deprecated": false
@@ -29654,8 +29648,7 @@
     {
       "name": "qemu64-v1",
       "typename": "qemu64-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -29663,8 +29656,7 @@
     {
       "name": "qemu64",
       "typename": "qemu64-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "qemu64-v1",
       "static": false,
       "migration-safe": true,
@@ -29673,8 +29665,7 @@
     {
       "name": "qemu32-v1",
       "typename": "qemu32-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -29682,8 +29673,7 @@
     {
       "name": "qemu32",
       "typename": "qemu32-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "qemu32-v1",
       "static": false,
       "migration-safe": true,
@@ -29715,8 +29705,7 @@
     {
       "name": "pentium3-v1",
       "typename": "pentium3-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -29724,8 +29713,7 @@
     {
       "name": "pentium3",
       "typename": "pentium3-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "pentium3-v1",
       "static": false,
       "migration-safe": true,
@@ -29734,8 +29722,7 @@
     {
       "name": "pentium2-v1",
       "typename": "pentium2-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -29743,8 +29730,7 @@
     {
       "name": "pentium2",
       "typename": "pentium2-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "pentium2-v1",
       "static": false,
       "migration-safe": true,
@@ -29753,8 +29739,7 @@
     {
       "name": "pentium-v1",
       "typename": "pentium-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -29762,8 +29747,7 @@
     {
       "name": "pentium",
       "typename": "pentium-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "pentium-v1",
       "static": false,
       "migration-safe": true,
@@ -29793,8 +29777,7 @@
     {
       "name": "kvm64-v1",
       "typename": "kvm64-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -29802,8 +29785,7 @@
     {
       "name": "kvm64",
       "typename": "kvm64-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "kvm64-v1",
       "static": false,
       "migration-safe": true,
@@ -29812,8 +29794,7 @@
     {
       "name": "kvm32-v1",
       "typename": "kvm32-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -29821,8 +29802,7 @@
     {
       "name": "kvm32",
       "typename": "kvm32-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "kvm32-v1",
       "static": false,
       "migration-safe": true,
@@ -29906,8 +29886,7 @@
     {
       "name": "Westmere-v1",
       "typename": "Westmere-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -29926,8 +29905,7 @@
     {
       "name": "Westmere",
       "typename": "Westmere-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "Westmere-v1",
       "static": false,
       "migration-safe": true,
@@ -30329,8 +30307,7 @@
     {
       "name": "SandyBridge-v1",
       "typename": "SandyBridge-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -30349,8 +30326,7 @@
     {
       "name": "SandyBridge",
       "typename": "SandyBridge-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "SandyBridge-v1",
       "static": false,
       "migration-safe": true,
@@ -30359,8 +30335,7 @@
     {
       "name": "Penryn-v1",
       "typename": "Penryn-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -30368,8 +30343,7 @@
     {
       "name": "Penryn",
       "typename": "Penryn-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "Penryn-v1",
       "static": false,
       "migration-safe": true,
@@ -30426,8 +30400,7 @@
     {
       "name": "Opteron_G3-v1",
       "typename": "Opteron_G3-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -30435,8 +30408,7 @@
     {
       "name": "Opteron_G3",
       "typename": "Opteron_G3-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "Opteron_G3-v1",
       "static": false,
       "migration-safe": true,
@@ -30445,8 +30417,7 @@
     {
       "name": "Opteron_G2-v1",
       "typename": "Opteron_G2-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -30454,8 +30425,7 @@
     {
       "name": "Opteron_G2",
       "typename": "Opteron_G2-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "Opteron_G2-v1",
       "static": false,
       "migration-safe": true,
@@ -30464,8 +30434,7 @@
     {
       "name": "Opteron_G1-v1",
       "typename": "Opteron_G1-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -30473,8 +30442,7 @@
     {
       "name": "Opteron_G1",
       "typename": "Opteron_G1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "Opteron_G1-v1",
       "static": false,
       "migration-safe": true,
@@ -30493,8 +30461,7 @@
     {
       "name": "Nehalem-v1",
       "typename": "Nehalem-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -30513,8 +30480,7 @@
     {
       "name": "Nehalem",
       "typename": "Nehalem-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "Nehalem-v1",
       "static": false,
       "migration-safe": true,
@@ -30998,8 +30964,7 @@
     {
       "name": "EPYC-v3",
       "typename": "EPYC-v3-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -31007,8 +30972,7 @@
     {
       "name": "EPYC-v2",
       "typename": "EPYC-v2-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -31016,8 +30980,7 @@
     {
       "name": "EPYC-v1",
       "typename": "EPYC-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -31035,8 +30998,7 @@
     {
       "name": "EPYC-Rome-v1",
       "typename": "EPYC-Rome-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -31044,8 +31006,7 @@
     {
       "name": "EPYC-Rome",
       "typename": "EPYC-Rome-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "EPYC-Rome-v1",
       "static": false,
       "migration-safe": true,
@@ -31087,8 +31048,7 @@
     {
       "name": "EPYC-IBPB",
       "typename": "EPYC-IBPB-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "EPYC-v2",
       "static": false,
       "migration-safe": true,
@@ -31097,8 +31057,7 @@
     {
       "name": "EPYC",
       "typename": "EPYC-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "EPYC-v1",
       "static": false,
       "migration-safe": true,
@@ -31107,8 +31066,7 @@
     {
       "name": "Dhyana-v2",
       "typename": "Dhyana-v2-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -31116,8 +31074,7 @@
     {
       "name": "Dhyana-v1",
       "typename": "Dhyana-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -31125,8 +31082,7 @@
     {
       "name": "Dhyana",
       "typename": "Dhyana-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "Dhyana-v1",
       "static": false,
       "migration-safe": true,
@@ -31274,8 +31230,7 @@
     {
       "name": "Conroe-v1",
       "typename": "Conroe-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -31283,8 +31238,7 @@
     {
       "name": "Conroe",
       "typename": "Conroe-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "Conroe-v1",
       "static": false,
       "migration-safe": true,
@@ -31586,8 +31540,7 @@
     {
       "name": "486-v1",
       "typename": "486-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -31595,8 +31548,7 @@
     {
       "name": "486",
       "typename": "486-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "486-v1",
       "static": false,
       "migration-safe": true,
@@ -32127,13 +32079,11 @@
       "option": "fsdev"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": "smbios"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": "acpi"
     },
     {
@@ -32276,8 +32226,7 @@
       "option": "fw_cfg"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": ""
     },
     {
@@ -32310,8 +32259,7 @@
       "option": "icount"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": "numa"
     },
     {
@@ -32362,13 +32310,11 @@
       "option": "overcommit"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": "tpmdev"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": "object"
     },
     {
@@ -32475,8 +32421,7 @@
       "option": "memory"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": "accel"
     },
     {
@@ -32493,8 +32438,7 @@
       "option": "option-rom"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": "plugin"
     },
     {
@@ -32566,23 +32510,19 @@
       "option": "rtc"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": "net"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": "nic"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": "netdev"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": "device"
     },
     {
@@ -34154,8 +34094,7 @@
 }
 
 {
-  "return": {
-  },
+  "return": {},
   "id": "libvirt-1"
 }
 
@@ -34169,8 +34108,7 @@
     {
       "name": "max",
       "typename": "max-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": false,
       "deprecated": false
@@ -34188,8 +34126,7 @@
     {
       "name": "base",
       "typename": "base-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": true,
       "migration-safe": true,
       "deprecated": false
@@ -34197,8 +34134,7 @@
     {
       "name": "qemu64-v1",
       "typename": "qemu64-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -34206,8 +34142,7 @@
     {
       "name": "qemu64",
       "typename": "qemu64-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "qemu64-v1",
       "static": false,
       "migration-safe": true,
@@ -34216,8 +34151,7 @@
     {
       "name": "qemu32-v1",
       "typename": "qemu32-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -34225,8 +34159,7 @@
     {
       "name": "qemu32",
       "typename": "qemu32-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "qemu32-v1",
       "static": false,
       "migration-safe": true,
@@ -34256,8 +34189,7 @@
     {
       "name": "pentium3-v1",
       "typename": "pentium3-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -34265,8 +34197,7 @@
     {
       "name": "pentium3",
       "typename": "pentium3-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "pentium3-v1",
       "static": false,
       "migration-safe": true,
@@ -34275,8 +34206,7 @@
     {
       "name": "pentium2-v1",
       "typename": "pentium2-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -34284,8 +34214,7 @@
     {
       "name": "pentium2",
       "typename": "pentium2-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "pentium2-v1",
       "static": false,
       "migration-safe": true,
@@ -34294,8 +34223,7 @@
     {
       "name": "pentium-v1",
       "typename": "pentium-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -34303,8 +34231,7 @@
     {
       "name": "pentium",
       "typename": "pentium-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "pentium-v1",
       "static": false,
       "migration-safe": true,
@@ -34313,8 +34240,7 @@
     {
       "name": "n270-v1",
       "typename": "n270-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -34322,8 +34248,7 @@
     {
       "name": "n270",
       "typename": "n270-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "n270-v1",
       "static": false,
       "migration-safe": true,
@@ -34332,8 +34257,7 @@
     {
       "name": "kvm64-v1",
       "typename": "kvm64-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -34341,8 +34265,7 @@
     {
       "name": "kvm64",
       "typename": "kvm64-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "kvm64-v1",
       "static": false,
       "migration-safe": true,
@@ -34351,8 +34274,7 @@
     {
       "name": "kvm32-v1",
       "typename": "kvm32-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -34360,8 +34282,7 @@
     {
       "name": "kvm32",
       "typename": "kvm32-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "kvm32-v1",
       "static": false,
       "migration-safe": true,
@@ -34370,8 +34291,7 @@
     {
       "name": "coreduo-v1",
       "typename": "coreduo-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -34379,8 +34299,7 @@
     {
       "name": "coreduo",
       "typename": "coreduo-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "coreduo-v1",
       "static": false,
       "migration-safe": true,
@@ -34389,8 +34308,7 @@
     {
       "name": "core2duo-v1",
       "typename": "core2duo-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -34398,8 +34316,7 @@
     {
       "name": "core2duo",
       "typename": "core2duo-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "core2duo-v1",
       "static": false,
       "migration-safe": true,
@@ -34408,8 +34325,7 @@
     {
       "name": "athlon-v1",
       "typename": "athlon-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -34417,8 +34333,7 @@
     {
       "name": "athlon",
       "typename": "athlon-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "athlon-v1",
       "static": false,
       "migration-safe": true,
@@ -34437,8 +34352,7 @@
     {
       "name": "Westmere-v1",
       "typename": "Westmere-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -34457,8 +34371,7 @@
     {
       "name": "Westmere",
       "typename": "Westmere-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "Westmere-v1",
       "static": false,
       "migration-safe": true,
@@ -35015,8 +34928,7 @@
     {
       "name": "Penryn-v1",
       "typename": "Penryn-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -35024,8 +34936,7 @@
     {
       "name": "Penryn",
       "typename": "Penryn-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "Penryn-v1",
       "static": false,
       "migration-safe": true,
@@ -35123,8 +35034,7 @@
     {
       "name": "Opteron_G2-v1",
       "typename": "Opteron_G2-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -35132,8 +35042,7 @@
     {
       "name": "Opteron_G2",
       "typename": "Opteron_G2-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "Opteron_G2-v1",
       "static": false,
       "migration-safe": true,
@@ -35142,8 +35051,7 @@
     {
       "name": "Opteron_G1-v1",
       "typename": "Opteron_G1-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -35151,8 +35059,7 @@
     {
       "name": "Opteron_G1",
       "typename": "Opteron_G1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "Opteron_G1-v1",
       "static": false,
       "migration-safe": true,
@@ -35171,8 +35078,7 @@
     {
       "name": "Nehalem-v1",
       "typename": "Nehalem-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -35191,8 +35097,7 @@
     {
       "name": "Nehalem",
       "typename": "Nehalem-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "Nehalem-v1",
       "static": false,
       "migration-safe": true,
@@ -36346,8 +36251,7 @@
     {
       "name": "Conroe-v1",
       "typename": "Conroe-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -36355,8 +36259,7 @@
     {
       "name": "Conroe",
       "typename": "Conroe-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "Conroe-v1",
       "static": false,
       "migration-safe": true,
@@ -36763,8 +36666,7 @@
     {
       "name": "486-v1",
       "typename": "486-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -36772,8 +36674,7 @@
     {
       "name": "486",
       "typename": "486-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "486-v1",
       "static": false,
       "migration-safe": true,

diff --git a/tests/qemucapabilitiesdata/caps_7.2.0_ppc.replies b/tests/qemucapabilitiesdata/caps_7.2.0_ppc.replies
index 879b6c093152b6b1ac823421b2dc2975bab02d22..5cd0d7e87da276b510943ed5a1ac64af989c12b8 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_7.2.0_ppc.replies
+++ b/tests/qemucapabilitiesdata/caps_7.2.0_ppc.replies
@@ -4,8 +4,7 @@
 }
 
 {
-  "return": {
-  },
+  "return": {},
   "id": "libvirt-1"
 }
 
@@ -1638,8 +1637,7 @@
     },
     {
       "name": "0",
-      "members": [
-      ],
+      "members": [],
       "meta-type": "object"
     },
     {
@@ -20487,8 +20485,7 @@
     },
     {
       "name": "685",
-      "members": [
-      ],
+      "members": [],
       "meta-type": "object"
     },
     {
@@ -30158,8 +30155,7 @@
 }
 
 {
-  "return": [
-  ],
+  "return": [],
   "id": "libvirt-36"
 }
 
@@ -30169,8 +30165,7 @@
 }
 
 {
-  "return": [
-  ],
+  "return": [],
   "id": "libvirt-37"
 }
 
@@ -30669,8 +30664,7 @@
       "option": "fsdev"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": "acpi"
     },
     {
@@ -30813,8 +30807,7 @@
       "option": "fw_cfg"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": ""
     },
     {
@@ -30847,8 +30840,7 @@
       "option": "icount"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": "numa"
     },
     {
@@ -30899,13 +30891,11 @@
       "option": "overcommit"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": "tpmdev"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": "object"
     },
     {
@@ -31012,8 +31002,7 @@
       "option": "memory"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": "accel"
     },
     {
@@ -31098,23 +31087,19 @@
       "option": "rtc"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": "net"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": "nic"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": "netdev"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": "device"
     },
     {

diff --git a/tests/qemucapabilitiesdata/caps_7.2.0_x86_64+hvf.replies b/tests/qemucapabilitiesdata/caps_7.2.0_x86_64+hvf.replies
index 87c553c813f3fa7814b897066c78fdaf0d479b3a..0cfbbb7aa0a1deda3af32e37b4a3183662f18018 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_7.2.0_x86_64+hvf.replies
+++ b/tests/qemucapabilitiesdata/caps_7.2.0_x86_64+hvf.replies
@@ -4,8 +4,7 @@
 }
 
 {
-  "return": {
-  },
+  "return": {},
   "id": "libvirt-1"
 }
 
@@ -1692,8 +1691,7 @@
     },
     {
       "name": "0",
-      "members": [
-      ],
+      "members": [],
       "meta-type": "object"
     },
     {
@@ -20731,8 +20729,7 @@
     },
     {
       "name": "685",
-      "members": [
-      ],
+      "members": [],
       "meta-type": "object"
     },
     {
@@ -30624,8 +30621,7 @@
     {
       "name": "max",
       "typename": "max-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": false,
       "deprecated": false
@@ -30633,8 +30629,7 @@
     {
       "name": "host",
       "typename": "host-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": false,
       "deprecated": false
@@ -30642,8 +30637,7 @@
     {
       "name": "base",
       "typename": "base-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": true,
       "migration-safe": true,
       "deprecated": false
@@ -30651,8 +30645,7 @@
     {
       "name": "qemu64-v1",
       "typename": "qemu64-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -30660,8 +30653,7 @@
     {
       "name": "qemu64",
       "typename": "qemu64-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "qemu64-v1",
       "static": false,
       "migration-safe": true,
@@ -30670,8 +30662,7 @@
     {
       "name": "qemu32-v1",
       "typename": "qemu32-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -30679,8 +30670,7 @@
     {
       "name": "qemu32",
       "typename": "qemu32-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "qemu32-v1",
       "static": false,
       "migration-safe": true,
@@ -30712,8 +30702,7 @@
     {
       "name": "pentium3-v1",
       "typename": "pentium3-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -30721,8 +30710,7 @@
     {
       "name": "pentium3",
       "typename": "pentium3-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "pentium3-v1",
       "static": false,
       "migration-safe": true,
@@ -30731,8 +30719,7 @@
     {
       "name": "pentium2-v1",
       "typename": "pentium2-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -30740,8 +30727,7 @@
     {
       "name": "pentium2",
       "typename": "pentium2-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "pentium2-v1",
       "static": false,
       "migration-safe": true,
@@ -30750,8 +30736,7 @@
     {
       "name": "pentium-v1",
       "typename": "pentium-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -30759,8 +30744,7 @@
     {
       "name": "pentium",
       "typename": "pentium-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "pentium-v1",
       "static": false,
       "migration-safe": true,
@@ -30790,8 +30774,7 @@
     {
       "name": "kvm64-v1",
       "typename": "kvm64-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -30799,8 +30782,7 @@
     {
       "name": "kvm64",
       "typename": "kvm64-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "kvm64-v1",
       "static": false,
       "migration-safe": true,
@@ -30809,8 +30791,7 @@
     {
       "name": "kvm32-v1",
       "typename": "kvm32-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -30818,8 +30799,7 @@
     {
       "name": "kvm32",
       "typename": "kvm32-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "kvm32-v1",
       "static": false,
       "migration-safe": true,
@@ -30903,8 +30883,7 @@
     {
       "name": "Westmere-v1",
       "typename": "Westmere-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -30923,8 +30902,7 @@
     {
       "name": "Westmere",
       "typename": "Westmere-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "Westmere-v1",
       "static": false,
       "migration-safe": true,
@@ -31326,8 +31304,7 @@
     {
       "name": "SandyBridge-v1",
       "typename": "SandyBridge-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -31346,8 +31323,7 @@
     {
       "name": "SandyBridge",
       "typename": "SandyBridge-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "SandyBridge-v1",
       "static": false,
       "migration-safe": true,
@@ -31356,8 +31332,7 @@
     {
       "name": "Penryn-v1",
       "typename": "Penryn-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -31365,8 +31340,7 @@
     {
       "name": "Penryn",
       "typename": "Penryn-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "Penryn-v1",
       "static": false,
       "migration-safe": true,
@@ -31423,8 +31397,7 @@
     {
       "name": "Opteron_G3-v1",
       "typename": "Opteron_G3-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -31432,8 +31405,7 @@
     {
       "name": "Opteron_G3",
       "typename": "Opteron_G3-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "Opteron_G3-v1",
       "static": false,
       "migration-safe": true,
@@ -31442,8 +31414,7 @@
     {
       "name": "Opteron_G2-v1",
       "typename": "Opteron_G2-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -31451,8 +31422,7 @@
     {
       "name": "Opteron_G2",
       "typename": "Opteron_G2-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "Opteron_G2-v1",
       "static": false,
       "migration-safe": true,
@@ -31461,8 +31431,7 @@
     {
       "name": "Opteron_G1-v1",
       "typename": "Opteron_G1-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -31470,8 +31439,7 @@
     {
       "name": "Opteron_G1",
       "typename": "Opteron_G1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "Opteron_G1-v1",
       "static": false,
       "migration-safe": true,
@@ -31490,8 +31458,7 @@
     {
       "name": "Nehalem-v1",
       "typename": "Nehalem-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -31510,8 +31477,7 @@
     {
       "name": "Nehalem",
       "typename": "Nehalem-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "Nehalem-v1",
       "static": false,
       "migration-safe": true,
@@ -31995,8 +31961,7 @@
     {
       "name": "EPYC-v3",
       "typename": "EPYC-v3-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -32004,8 +31969,7 @@
     {
       "name": "EPYC-v2",
       "typename": "EPYC-v2-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -32013,8 +31977,7 @@
     {
       "name": "EPYC-v1",
       "typename": "EPYC-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -32032,8 +31995,7 @@
     {
       "name": "EPYC-Rome-v1",
       "typename": "EPYC-Rome-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -32041,8 +32003,7 @@
     {
       "name": "EPYC-Rome",
       "typename": "EPYC-Rome-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "EPYC-Rome-v1",
       "static": false,
       "migration-safe": true,
@@ -32084,8 +32045,7 @@
     {
       "name": "EPYC-IBPB",
       "typename": "EPYC-IBPB-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "EPYC-v2",
       "static": false,
       "migration-safe": true,
@@ -32094,8 +32054,7 @@
     {
       "name": "EPYC",
       "typename": "EPYC-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "EPYC-v1",
       "static": false,
       "migration-safe": true,
@@ -32104,8 +32063,7 @@
     {
       "name": "Dhyana-v2",
       "typename": "Dhyana-v2-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -32113,8 +32071,7 @@
     {
       "name": "Dhyana-v1",
       "typename": "Dhyana-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -32122,8 +32079,7 @@
     {
       "name": "Dhyana",
       "typename": "Dhyana-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "Dhyana-v1",
       "static": false,
       "migration-safe": true,
@@ -32271,8 +32227,7 @@
     {
       "name": "Conroe-v1",
       "typename": "Conroe-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -32280,8 +32235,7 @@
     {
       "name": "Conroe",
       "typename": "Conroe-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "Conroe-v1",
       "static": false,
       "migration-safe": true,
@@ -32583,8 +32537,7 @@
     {
       "name": "486-v1",
       "typename": "486-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -32592,8 +32545,7 @@
     {
       "name": "486",
       "typename": "486-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "486-v1",
       "static": false,
       "migration-safe": true,
@@ -33124,13 +33076,11 @@
       "option": "fsdev"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": "smbios"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": "acpi"
     },
     {
@@ -33273,8 +33223,7 @@
       "option": "fw_cfg"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": ""
     },
     {
@@ -33307,8 +33256,7 @@
       "option": "icount"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": "numa"
     },
     {
@@ -33359,13 +33307,11 @@
       "option": "overcommit"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": "tpmdev"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": "object"
     },
     {
@@ -33472,8 +33418,7 @@
       "option": "memory"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": "accel"
     },
     {
@@ -33490,8 +33435,7 @@
       "option": "option-rom"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": "plugin"
     },
     {
@@ -33563,23 +33507,19 @@
       "option": "rtc"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": "net"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": "nic"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": "netdev"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": "device"
     },
     {
@@ -35151,8 +35091,7 @@
 }
 
 {
-  "return": {
-  },
+  "return": {},
   "id": "libvirt-1"
 }
 
@@ -35166,8 +35105,7 @@
     {
       "name": "max",
       "typename": "max-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": false,
       "deprecated": false
@@ -35185,8 +35123,7 @@
     {
       "name": "base",
       "typename": "base-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": true,
       "migration-safe": true,
       "deprecated": false
@@ -35194,8 +35131,7 @@
     {
       "name": "qemu64-v1",
       "typename": "qemu64-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -35203,8 +35139,7 @@
     {
       "name": "qemu64",
       "typename": "qemu64-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "qemu64-v1",
       "static": false,
       "migration-safe": true,
@@ -35213,8 +35148,7 @@
     {
       "name": "qemu32-v1",
       "typename": "qemu32-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -35222,8 +35156,7 @@
     {
       "name": "qemu32",
       "typename": "qemu32-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "qemu32-v1",
       "static": false,
       "migration-safe": true,
@@ -35253,8 +35186,7 @@
     {
       "name": "pentium3-v1",
       "typename": "pentium3-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -35262,8 +35194,7 @@
     {
       "name": "pentium3",
       "typename": "pentium3-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "pentium3-v1",
       "static": false,
       "migration-safe": true,
@@ -35272,8 +35203,7 @@
     {
       "name": "pentium2-v1",
       "typename": "pentium2-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -35281,8 +35211,7 @@
     {
       "name": "pentium2",
       "typename": "pentium2-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "pentium2-v1",
       "static": false,
       "migration-safe": true,
@@ -35291,8 +35220,7 @@
     {
       "name": "pentium-v1",
       "typename": "pentium-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -35300,8 +35228,7 @@
     {
       "name": "pentium",
       "typename": "pentium-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "pentium-v1",
       "static": false,
       "migration-safe": true,
@@ -35310,8 +35237,7 @@
     {
       "name": "n270-v1",
       "typename": "n270-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -35319,8 +35245,7 @@
     {
       "name": "n270",
       "typename": "n270-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "n270-v1",
       "static": false,
       "migration-safe": true,
@@ -35329,8 +35254,7 @@
     {
       "name": "kvm64-v1",
       "typename": "kvm64-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -35338,8 +35262,7 @@
     {
       "name": "kvm64",
       "typename": "kvm64-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "kvm64-v1",
       "static": false,
       "migration-safe": true,
@@ -35348,8 +35271,7 @@
     {
       "name": "kvm32-v1",
       "typename": "kvm32-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -35357,8 +35279,7 @@
     {
       "name": "kvm32",
       "typename": "kvm32-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "kvm32-v1",
       "static": false,
       "migration-safe": true,
@@ -35367,8 +35288,7 @@
     {
       "name": "coreduo-v1",
       "typename": "coreduo-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -35376,8 +35296,7 @@
     {
       "name": "coreduo",
       "typename": "coreduo-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "coreduo-v1",
       "static": false,
       "migration-safe": true,
@@ -35386,8 +35305,7 @@
     {
       "name": "core2duo-v1",
       "typename": "core2duo-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -35395,8 +35313,7 @@
     {
       "name": "core2duo",
       "typename": "core2duo-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "core2duo-v1",
       "static": false,
       "migration-safe": true,
@@ -35405,8 +35322,7 @@
     {
       "name": "athlon-v1",
       "typename": "athlon-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -35414,8 +35330,7 @@
     {
       "name": "athlon",
       "typename": "athlon-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "athlon-v1",
       "static": false,
       "migration-safe": true,
@@ -35434,8 +35349,7 @@
     {
       "name": "Westmere-v1",
       "typename": "Westmere-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -35454,8 +35368,7 @@
     {
       "name": "Westmere",
       "typename": "Westmere-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "Westmere-v1",
       "static": false,
       "migration-safe": true,
@@ -35948,8 +35861,7 @@
     {
       "name": "Penryn-v1",
       "typename": "Penryn-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -35957,8 +35869,7 @@
     {
       "name": "Penryn",
       "typename": "Penryn-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "Penryn-v1",
       "static": false,
       "migration-safe": true,
@@ -36048,8 +35959,7 @@
     {
       "name": "Opteron_G2-v1",
       "typename": "Opteron_G2-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -36057,8 +35967,7 @@
     {
       "name": "Opteron_G2",
       "typename": "Opteron_G2-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "Opteron_G2-v1",
       "static": false,
       "migration-safe": true,
@@ -36067,8 +35976,7 @@
     {
       "name": "Opteron_G1-v1",
       "typename": "Opteron_G1-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -36076,8 +35984,7 @@
     {
       "name": "Opteron_G1",
       "typename": "Opteron_G1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "Opteron_G1-v1",
       "static": false,
       "migration-safe": true,
@@ -36096,8 +36003,7 @@
     {
       "name": "Nehalem-v1",
       "typename": "Nehalem-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -36116,8 +36022,7 @@
     {
       "name": "Nehalem",
       "typename": "Nehalem-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "Nehalem-v1",
       "static": false,
       "migration-safe": true,
@@ -37119,8 +37024,7 @@
     {
       "name": "Conroe-v1",
       "typename": "Conroe-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -37128,8 +37032,7 @@
     {
       "name": "Conroe",
       "typename": "Conroe-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "Conroe-v1",
       "static": false,
       "migration-safe": true,
@@ -37476,8 +37379,7 @@
     {
       "name": "486-v1",
       "typename": "486-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -37485,8 +37387,7 @@
     {
       "name": "486",
       "typename": "486-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "486-v1",
       "static": false,
       "migration-safe": true,

diff --git a/tests/qemucapabilitiesdata/caps_7.2.0_x86_64.replies b/tests/qemucapabilitiesdata/caps_7.2.0_x86_64.replies
index 074c917ee94bcffe001956990b49f434c8f38141..0f4ba1722f7afc8519a309e850d55862883ebfff 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_7.2.0_x86_64.replies
+++ b/tests/qemucapabilitiesdata/caps_7.2.0_x86_64.replies
@@ -4,8 +4,7 @@
 }
 
 {
-  "return": {
-  },
+  "return": {},
   "id": "libvirt-1"
 }
 
@@ -1692,8 +1691,7 @@
     },
     {
       "name": "0",
-      "members": [
-      ],
+      "members": [],
       "meta-type": "object"
     },
     {
@@ -20731,8 +20729,7 @@
     },
     {
       "name": "685",
-      "members": [
-      ],
+      "members": [],
       "meta-type": "object"
     },
     {
@@ -30624,8 +30621,7 @@
     {
       "name": "max",
       "typename": "max-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": false,
       "deprecated": false
@@ -30633,8 +30629,7 @@
     {
       "name": "host",
       "typename": "host-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": false,
       "deprecated": false
@@ -30642,8 +30637,7 @@
     {
       "name": "base",
       "typename": "base-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": true,
       "migration-safe": true,
       "deprecated": false
@@ -30651,8 +30645,7 @@
     {
       "name": "qemu64-v1",
       "typename": "qemu64-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -30660,8 +30653,7 @@
     {
       "name": "qemu64",
       "typename": "qemu64-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "qemu64-v1",
       "static": false,
       "migration-safe": true,
@@ -30670,8 +30662,7 @@
     {
       "name": "qemu32-v1",
       "typename": "qemu32-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -30679,8 +30670,7 @@
     {
       "name": "qemu32",
       "typename": "qemu32-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "qemu32-v1",
       "static": false,
       "migration-safe": true,
@@ -30712,8 +30702,7 @@
     {
       "name": "pentium3-v1",
       "typename": "pentium3-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -30721,8 +30710,7 @@
     {
       "name": "pentium3",
       "typename": "pentium3-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "pentium3-v1",
       "static": false,
       "migration-safe": true,
@@ -30731,8 +30719,7 @@
     {
       "name": "pentium2-v1",
       "typename": "pentium2-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -30740,8 +30727,7 @@
     {
       "name": "pentium2",
       "typename": "pentium2-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "pentium2-v1",
       "static": false,
       "migration-safe": true,
@@ -30750,8 +30736,7 @@
     {
       "name": "pentium-v1",
       "typename": "pentium-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -30759,8 +30744,7 @@
     {
       "name": "pentium",
       "typename": "pentium-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "pentium-v1",
       "static": false,
       "migration-safe": true,
@@ -30790,8 +30774,7 @@
     {
       "name": "kvm64-v1",
       "typename": "kvm64-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -30799,8 +30782,7 @@
     {
       "name": "kvm64",
       "typename": "kvm64-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "kvm64-v1",
       "static": false,
       "migration-safe": true,
@@ -30809,8 +30791,7 @@
     {
       "name": "kvm32-v1",
       "typename": "kvm32-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -30818,8 +30799,7 @@
     {
       "name": "kvm32",
       "typename": "kvm32-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "kvm32-v1",
       "static": false,
       "migration-safe": true,
@@ -30903,8 +30883,7 @@
     {
       "name": "Westmere-v1",
       "typename": "Westmere-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -30923,8 +30902,7 @@
     {
       "name": "Westmere",
       "typename": "Westmere-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "Westmere-v1",
       "static": false,
       "migration-safe": true,
@@ -31326,8 +31304,7 @@
     {
       "name": "SandyBridge-v1",
       "typename": "SandyBridge-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -31346,8 +31323,7 @@
     {
       "name": "SandyBridge",
       "typename": "SandyBridge-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "SandyBridge-v1",
       "static": false,
       "migration-safe": true,
@@ -31356,8 +31332,7 @@
     {
       "name": "Penryn-v1",
       "typename": "Penryn-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -31365,8 +31340,7 @@
     {
       "name": "Penryn",
       "typename": "Penryn-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "Penryn-v1",
       "static": false,
       "migration-safe": true,
@@ -31423,8 +31397,7 @@
     {
       "name": "Opteron_G3-v1",
       "typename": "Opteron_G3-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -31432,8 +31405,7 @@
     {
       "name": "Opteron_G3",
       "typename": "Opteron_G3-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "Opteron_G3-v1",
       "static": false,
       "migration-safe": true,
@@ -31442,8 +31414,7 @@
     {
       "name": "Opteron_G2-v1",
       "typename": "Opteron_G2-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -31451,8 +31422,7 @@
     {
       "name": "Opteron_G2",
       "typename": "Opteron_G2-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "Opteron_G2-v1",
       "static": false,
       "migration-safe": true,
@@ -31461,8 +31431,7 @@
     {
       "name": "Opteron_G1-v1",
       "typename": "Opteron_G1-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -31470,8 +31439,7 @@
     {
       "name": "Opteron_G1",
       "typename": "Opteron_G1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "Opteron_G1-v1",
       "static": false,
       "migration-safe": true,
@@ -31490,8 +31458,7 @@
     {
       "name": "Nehalem-v1",
       "typename": "Nehalem-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -31510,8 +31477,7 @@
     {
       "name": "Nehalem",
       "typename": "Nehalem-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "Nehalem-v1",
       "static": false,
       "migration-safe": true,
@@ -31995,8 +31961,7 @@
     {
       "name": "EPYC-v3",
       "typename": "EPYC-v3-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -32004,8 +31969,7 @@
     {
       "name": "EPYC-v2",
       "typename": "EPYC-v2-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -32013,8 +31977,7 @@
     {
       "name": "EPYC-v1",
       "typename": "EPYC-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -32032,8 +31995,7 @@
     {
       "name": "EPYC-Rome-v1",
       "typename": "EPYC-Rome-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -32041,8 +32003,7 @@
     {
       "name": "EPYC-Rome",
       "typename": "EPYC-Rome-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "EPYC-Rome-v1",
       "static": false,
       "migration-safe": true,
@@ -32084,8 +32045,7 @@
     {
       "name": "EPYC-IBPB",
       "typename": "EPYC-IBPB-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "EPYC-v2",
       "static": false,
       "migration-safe": true,
@@ -32094,8 +32054,7 @@
     {
       "name": "EPYC",
       "typename": "EPYC-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "EPYC-v1",
       "static": false,
       "migration-safe": true,
@@ -32104,8 +32063,7 @@
     {
       "name": "Dhyana-v2",
       "typename": "Dhyana-v2-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -32113,8 +32071,7 @@
     {
       "name": "Dhyana-v1",
       "typename": "Dhyana-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -32122,8 +32079,7 @@
     {
       "name": "Dhyana",
       "typename": "Dhyana-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "Dhyana-v1",
       "static": false,
       "migration-safe": true,
@@ -32271,8 +32227,7 @@
     {
       "name": "Conroe-v1",
       "typename": "Conroe-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -32280,8 +32235,7 @@
     {
       "name": "Conroe",
       "typename": "Conroe-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "Conroe-v1",
       "static": false,
       "migration-safe": true,
@@ -32583,8 +32537,7 @@
     {
       "name": "486-v1",
       "typename": "486-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -32592,8 +32545,7 @@
     {
       "name": "486",
       "typename": "486-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "486-v1",
       "static": false,
       "migration-safe": true,
@@ -33124,13 +33076,11 @@
       "option": "fsdev"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": "smbios"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": "acpi"
     },
     {
@@ -33273,8 +33223,7 @@
       "option": "fw_cfg"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": ""
     },
     {
@@ -33307,8 +33256,7 @@
       "option": "icount"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": "numa"
     },
     {
@@ -33359,13 +33307,11 @@
       "option": "overcommit"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": "tpmdev"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": "object"
     },
     {
@@ -33472,8 +33418,7 @@
       "option": "memory"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": "accel"
     },
     {
@@ -33490,8 +33435,7 @@
       "option": "option-rom"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": "plugin"
     },
     {
@@ -33563,23 +33507,19 @@
       "option": "rtc"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": "net"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": "nic"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": "netdev"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": "device"
     },
     {
@@ -35151,8 +35091,7 @@
 }
 
 {
-  "return": {
-  },
+  "return": {},
   "id": "libvirt-1"
 }
 
@@ -35166,8 +35105,7 @@
     {
       "name": "max",
       "typename": "max-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": false,
       "deprecated": false
@@ -35185,8 +35123,7 @@
     {
       "name": "base",
       "typename": "base-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": true,
       "migration-safe": true,
       "deprecated": false
@@ -35194,8 +35131,7 @@
     {
       "name": "qemu64-v1",
       "typename": "qemu64-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -35203,8 +35139,7 @@
     {
       "name": "qemu64",
       "typename": "qemu64-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "qemu64-v1",
       "static": false,
       "migration-safe": true,
@@ -35213,8 +35148,7 @@
     {
       "name": "qemu32-v1",
       "typename": "qemu32-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -35222,8 +35156,7 @@
     {
       "name": "qemu32",
       "typename": "qemu32-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "qemu32-v1",
       "static": false,
       "migration-safe": true,
@@ -35253,8 +35186,7 @@
     {
       "name": "pentium3-v1",
       "typename": "pentium3-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -35262,8 +35194,7 @@
     {
       "name": "pentium3",
       "typename": "pentium3-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "pentium3-v1",
       "static": false,
       "migration-safe": true,
@@ -35272,8 +35203,7 @@
     {
       "name": "pentium2-v1",
       "typename": "pentium2-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -35281,8 +35211,7 @@
     {
       "name": "pentium2",
       "typename": "pentium2-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "pentium2-v1",
       "static": false,
       "migration-safe": true,
@@ -35291,8 +35220,7 @@
     {
       "name": "pentium-v1",
       "typename": "pentium-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -35300,8 +35228,7 @@
     {
       "name": "pentium",
       "typename": "pentium-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "pentium-v1",
       "static": false,
       "migration-safe": true,
@@ -35310,8 +35237,7 @@
     {
       "name": "n270-v1",
       "typename": "n270-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -35319,8 +35245,7 @@
     {
       "name": "n270",
       "typename": "n270-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "n270-v1",
       "static": false,
       "migration-safe": true,
@@ -35329,8 +35254,7 @@
     {
       "name": "kvm64-v1",
       "typename": "kvm64-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -35338,8 +35262,7 @@
     {
       "name": "kvm64",
       "typename": "kvm64-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "kvm64-v1",
       "static": false,
       "migration-safe": true,
@@ -35348,8 +35271,7 @@
     {
       "name": "kvm32-v1",
       "typename": "kvm32-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -35357,8 +35279,7 @@
     {
       "name": "kvm32",
       "typename": "kvm32-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "kvm32-v1",
       "static": false,
       "migration-safe": true,
@@ -35367,8 +35288,7 @@
     {
       "name": "coreduo-v1",
       "typename": "coreduo-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -35376,8 +35296,7 @@
     {
       "name": "coreduo",
       "typename": "coreduo-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "coreduo-v1",
       "static": false,
       "migration-safe": true,
@@ -35386,8 +35305,7 @@
     {
       "name": "core2duo-v1",
       "typename": "core2duo-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -35395,8 +35313,7 @@
     {
       "name": "core2duo",
       "typename": "core2duo-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "core2duo-v1",
       "static": false,
       "migration-safe": true,
@@ -35405,8 +35322,7 @@
     {
       "name": "athlon-v1",
       "typename": "athlon-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -35414,8 +35330,7 @@
     {
       "name": "athlon",
       "typename": "athlon-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "athlon-v1",
       "static": false,
       "migration-safe": true,
@@ -35434,8 +35349,7 @@
     {
       "name": "Westmere-v1",
       "typename": "Westmere-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -35454,8 +35368,7 @@
     {
       "name": "Westmere",
       "typename": "Westmere-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "Westmere-v1",
       "static": false,
       "migration-safe": true,
@@ -35948,8 +35861,7 @@
     {
       "name": "Penryn-v1",
       "typename": "Penryn-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -35957,8 +35869,7 @@
     {
       "name": "Penryn",
       "typename": "Penryn-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "Penryn-v1",
       "static": false,
       "migration-safe": true,
@@ -36048,8 +35959,7 @@
     {
       "name": "Opteron_G2-v1",
       "typename": "Opteron_G2-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -36057,8 +35967,7 @@
     {
       "name": "Opteron_G2",
       "typename": "Opteron_G2-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "Opteron_G2-v1",
       "static": false,
       "migration-safe": true,
@@ -36067,8 +35976,7 @@
     {
       "name": "Opteron_G1-v1",
       "typename": "Opteron_G1-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -36076,8 +35984,7 @@
     {
       "name": "Opteron_G1",
       "typename": "Opteron_G1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "Opteron_G1-v1",
       "static": false,
       "migration-safe": true,
@@ -36096,8 +36003,7 @@
     {
       "name": "Nehalem-v1",
       "typename": "Nehalem-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -36116,8 +36022,7 @@
     {
       "name": "Nehalem",
       "typename": "Nehalem-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "Nehalem-v1",
       "static": false,
       "migration-safe": true,
@@ -37119,8 +37024,7 @@
     {
       "name": "Conroe-v1",
       "typename": "Conroe-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -37128,8 +37032,7 @@
     {
       "name": "Conroe",
       "typename": "Conroe-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "Conroe-v1",
       "static": false,
       "migration-safe": true,
@@ -37476,8 +37379,7 @@
     {
       "name": "486-v1",
       "typename": "486-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -37485,8 +37387,7 @@
     {
       "name": "486",
       "typename": "486-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "486-v1",
       "static": false,
       "migration-safe": true,

diff --git a/tests/qemucapabilitiesdata/caps_8.0.0_riscv64.replies b/tests/qemucapabilitiesdata/caps_8.0.0_riscv64.replies
index e4b9114820943e1fdfcf88e3daee3be0de6b0090..50e1fe583509a69e9dcb3f3e8618de6f9640b568 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_8.0.0_riscv64.replies
+++ b/tests/qemucapabilitiesdata/caps_8.0.0_riscv64.replies
@@ -4,8 +4,7 @@
 }
 
 {
-  "return": {
-  },
+  "return": {},
   "id": "libvirt-1"
 }
 
@@ -1632,8 +1631,7 @@
     },
     {
       "name": "0",
-      "members": [
-      ],
+      "members": [],
       "meta-type": "object"
     },
     {
@@ -20183,8 +20181,7 @@
     },
     {
       "name": "685",
-      "members": [
-      ],
+      "members": [],
       "meta-type": "object"
     },
     {
@@ -27166,8 +27163,7 @@
       "option": "icount"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": "numa"
     },
     {
@@ -27218,13 +27214,11 @@
       "option": "overcommit"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": "tpmdev"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": "object"
     },
     {
@@ -27331,8 +27325,7 @@
       "option": "memory"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": "accel"
     },
     {
@@ -27349,8 +27342,7 @@
       "option": "option-rom"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": "plugin"
     },
     {
@@ -27422,23 +27414,19 @@
       "option": "rtc"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": "net"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": "nic"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": "netdev"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": "device"
     },
     {

diff --git a/tests/qemucapabilitiesdata/caps_8.0.0_x86_64.replies b/tests/qemucapabilitiesdata/caps_8.0.0_x86_64.replies
index fa3e16af9a7fa98674dde63c80bf0b5508a162ed..fc5aab3828072b77ab0cae3625d279dd234f8a54 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_8.0.0_x86_64.replies
+++ b/tests/qemucapabilitiesdata/caps_8.0.0_x86_64.replies
@@ -4,8 +4,7 @@
 }
 
 {
-  "return": {
-  },
+  "return": {},
   "id": "libvirt-1"
 }
 
@@ -1734,8 +1733,7 @@
     },
     {
       "name": "0",
-      "members": [
-      ],
+      "members": [],
       "meta-type": "object"
     },
     {
@@ -21917,8 +21915,7 @@
     },
     {
       "name": "720",
-      "members": [
-      ],
+      "members": [],
       "meta-type": "object"
     },
     {
@@ -32098,8 +32095,7 @@
     {
       "name": "max",
       "typename": "max-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": false,
       "deprecated": false
@@ -32107,8 +32103,7 @@
     {
       "name": "host",
       "typename": "host-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": false,
       "deprecated": false
@@ -32116,8 +32111,7 @@
     {
       "name": "base",
       "typename": "base-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": true,
       "migration-safe": true,
       "deprecated": false
@@ -32125,8 +32119,7 @@
     {
       "name": "qemu64-v1",
       "typename": "qemu64-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -32134,8 +32127,7 @@
     {
       "name": "qemu64",
       "typename": "qemu64-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "qemu64-v1",
       "static": false,
       "migration-safe": true,
@@ -32144,8 +32136,7 @@
     {
       "name": "qemu32-v1",
       "typename": "qemu32-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -32153,8 +32144,7 @@
     {
       "name": "qemu32",
       "typename": "qemu32-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "qemu32-v1",
       "static": false,
       "migration-safe": true,
@@ -32186,8 +32176,7 @@
     {
       "name": "pentium3-v1",
       "typename": "pentium3-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -32195,8 +32184,7 @@
     {
       "name": "pentium3",
       "typename": "pentium3-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "pentium3-v1",
       "static": false,
       "migration-safe": true,
@@ -32205,8 +32193,7 @@
     {
       "name": "pentium2-v1",
       "typename": "pentium2-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -32214,8 +32201,7 @@
     {
       "name": "pentium2",
       "typename": "pentium2-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "pentium2-v1",
       "static": false,
       "migration-safe": true,
@@ -32224,8 +32210,7 @@
     {
       "name": "pentium-v1",
       "typename": "pentium-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -32233,8 +32218,7 @@
     {
       "name": "pentium",
       "typename": "pentium-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "pentium-v1",
       "static": false,
       "migration-safe": true,
@@ -32264,8 +32248,7 @@
     {
       "name": "kvm64-v1",
       "typename": "kvm64-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -32273,8 +32256,7 @@
     {
       "name": "kvm64",
       "typename": "kvm64-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "kvm64-v1",
       "static": false,
       "migration-safe": true,
@@ -32283,8 +32265,7 @@
     {
       "name": "kvm32-v1",
       "typename": "kvm32-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -32292,8 +32273,7 @@
     {
       "name": "kvm32",
       "typename": "kvm32-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "kvm32-v1",
       "static": false,
       "migration-safe": true,
@@ -32377,8 +32357,7 @@
     {
       "name": "Westmere-v1",
       "typename": "Westmere-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -32397,8 +32376,7 @@
     {
       "name": "Westmere",
       "typename": "Westmere-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "Westmere-v1",
       "static": false,
       "migration-safe": true,
@@ -32907,8 +32885,7 @@
     {
       "name": "SandyBridge-v1",
       "typename": "SandyBridge-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -32927,8 +32904,7 @@
     {
       "name": "SandyBridge",
       "typename": "SandyBridge-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "SandyBridge-v1",
       "static": false,
       "migration-safe": true,
@@ -32937,8 +32913,7 @@
     {
       "name": "Penryn-v1",
       "typename": "Penryn-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -32946,8 +32921,7 @@
     {
       "name": "Penryn",
       "typename": "Penryn-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "Penryn-v1",
       "static": false,
       "migration-safe": true,
@@ -33004,8 +32978,7 @@
     {
       "name": "Opteron_G3-v1",
       "typename": "Opteron_G3-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -33013,8 +32986,7 @@
     {
       "name": "Opteron_G3",
       "typename": "Opteron_G3-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "Opteron_G3-v1",
       "static": false,
       "migration-safe": true,
@@ -33023,8 +32995,7 @@
     {
       "name": "Opteron_G2-v1",
       "typename": "Opteron_G2-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -33032,8 +33003,7 @@
     {
       "name": "Opteron_G2",
       "typename": "Opteron_G2-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "Opteron_G2-v1",
       "static": false,
       "migration-safe": true,
@@ -33042,8 +33012,7 @@
     {
       "name": "Opteron_G1-v1",
       "typename": "Opteron_G1-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -33051,8 +33020,7 @@
     {
       "name": "Opteron_G1",
       "typename": "Opteron_G1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "Opteron_G1-v1",
       "static": false,
       "migration-safe": true,
@@ -33071,8 +33039,7 @@
     {
       "name": "Nehalem-v1",
       "typename": "Nehalem-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -33091,8 +33058,7 @@
     {
       "name": "Nehalem",
       "typename": "Nehalem-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "Nehalem-v1",
       "static": false,
       "migration-safe": true,
@@ -33576,8 +33542,7 @@
     {
       "name": "EPYC-v3",
       "typename": "EPYC-v3-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -33585,8 +33550,7 @@
     {
       "name": "EPYC-v2",
       "typename": "EPYC-v2-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -33594,8 +33558,7 @@
     {
       "name": "EPYC-v1",
       "typename": "EPYC-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -33613,8 +33576,7 @@
     {
       "name": "EPYC-Rome-v1",
       "typename": "EPYC-Rome-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -33622,8 +33584,7 @@
     {
       "name": "EPYC-Rome",
       "typename": "EPYC-Rome-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "EPYC-Rome-v1",
       "static": false,
       "migration-safe": true,
@@ -33665,8 +33626,7 @@
     {
       "name": "EPYC-IBPB",
       "typename": "EPYC-IBPB-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "EPYC-v2",
       "static": false,
       "migration-safe": true,
@@ -33675,8 +33635,7 @@
     {
       "name": "EPYC",
       "typename": "EPYC-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "EPYC-v1",
       "static": false,
       "migration-safe": true,
@@ -33685,8 +33644,7 @@
     {
       "name": "Dhyana-v2",
       "typename": "Dhyana-v2-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -33694,8 +33652,7 @@
     {
       "name": "Dhyana-v1",
       "typename": "Dhyana-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -33703,8 +33660,7 @@
     {
       "name": "Dhyana",
       "typename": "Dhyana-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "Dhyana-v1",
       "static": false,
       "migration-safe": true,
@@ -33852,8 +33808,7 @@
     {
       "name": "Conroe-v1",
       "typename": "Conroe-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -33861,8 +33816,7 @@
     {
       "name": "Conroe",
       "typename": "Conroe-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "Conroe-v1",
       "static": false,
       "migration-safe": true,
@@ -34164,8 +34118,7 @@
     {
       "name": "486-v1",
       "typename": "486-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -34173,8 +34126,7 @@
     {
       "name": "486",
       "typename": "486-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "486-v1",
       "static": false,
       "migration-safe": true,
@@ -34822,13 +34774,11 @@
       "option": "fsdev"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": "smbios"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": "acpi"
     },
     {
@@ -34971,8 +34921,7 @@
       "option": "fw_cfg"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": ""
     },
     {
@@ -35005,8 +34954,7 @@
       "option": "icount"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": "numa"
     },
     {
@@ -35057,13 +35005,11 @@
       "option": "overcommit"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": "tpmdev"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": "object"
     },
     {
@@ -35170,8 +35116,7 @@
       "option": "memory"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": "accel"
     },
     {
@@ -35188,8 +35133,7 @@
       "option": "option-rom"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": "plugin"
     },
     {
@@ -35261,23 +35205,19 @@
       "option": "rtc"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": "net"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": "nic"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": "netdev"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": "device"
     },
     {
@@ -36970,8 +36910,7 @@
 }
 
 {
-  "return": {
-  },
+  "return": {},
   "id": "libvirt-1"
 }
 
@@ -36985,8 +36924,7 @@
     {
       "name": "max",
       "typename": "max-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": false,
       "deprecated": false
@@ -37004,8 +36942,7 @@
     {
       "name": "base",
       "typename": "base-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": true,
       "migration-safe": true,
       "deprecated": false
@@ -37013,8 +36950,7 @@
     {
       "name": "qemu64-v1",
       "typename": "qemu64-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -37022,8 +36958,7 @@
     {
       "name": "qemu64",
       "typename": "qemu64-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "qemu64-v1",
       "static": false,
       "migration-safe": true,
@@ -37032,8 +36967,7 @@
     {
       "name": "qemu32-v1",
       "typename": "qemu32-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -37041,8 +36975,7 @@
     {
       "name": "qemu32",
       "typename": "qemu32-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "qemu32-v1",
       "static": false,
       "migration-safe": true,
@@ -37072,8 +37005,7 @@
     {
       "name": "pentium3-v1",
       "typename": "pentium3-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -37081,8 +37013,7 @@
     {
       "name": "pentium3",
       "typename": "pentium3-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "pentium3-v1",
       "static": false,
       "migration-safe": true,
@@ -37091,8 +37022,7 @@
     {
       "name": "pentium2-v1",
       "typename": "pentium2-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -37100,8 +37030,7 @@
     {
       "name": "pentium2",
       "typename": "pentium2-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "pentium2-v1",
       "static": false,
       "migration-safe": true,
@@ -37110,8 +37039,7 @@
     {
       "name": "pentium-v1",
       "typename": "pentium-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -37119,8 +37047,7 @@
     {
       "name": "pentium",
       "typename": "pentium-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "pentium-v1",
       "static": false,
       "migration-safe": true,
@@ -37129,8 +37056,7 @@
     {
       "name": "n270-v1",
       "typename": "n270-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -37138,8 +37064,7 @@
     {
       "name": "n270",
       "typename": "n270-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "n270-v1",
       "static": false,
       "migration-safe": true,
@@ -37148,8 +37073,7 @@
     {
       "name": "kvm64-v1",
       "typename": "kvm64-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -37157,8 +37081,7 @@
     {
       "name": "kvm64",
       "typename": "kvm64-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "kvm64-v1",
       "static": false,
       "migration-safe": true,
@@ -37167,8 +37090,7 @@
     {
       "name": "kvm32-v1",
       "typename": "kvm32-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -37176,8 +37098,7 @@
     {
       "name": "kvm32",
       "typename": "kvm32-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "kvm32-v1",
       "static": false,
       "migration-safe": true,
@@ -37186,8 +37107,7 @@
     {
       "name": "coreduo-v1",
       "typename": "coreduo-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -37195,8 +37115,7 @@
     {
       "name": "coreduo",
       "typename": "coreduo-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "coreduo-v1",
       "static": false,
       "migration-safe": true,
@@ -37205,8 +37124,7 @@
     {
       "name": "core2duo-v1",
       "typename": "core2duo-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -37214,8 +37132,7 @@
     {
       "name": "core2duo",
       "typename": "core2duo-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "core2duo-v1",
       "static": false,
       "migration-safe": true,
@@ -37224,8 +37141,7 @@
     {
       "name": "athlon-v1",
       "typename": "athlon-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -37233,8 +37149,7 @@
     {
       "name": "athlon",
       "typename": "athlon-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "athlon-v1",
       "static": false,
       "migration-safe": true,
@@ -37253,8 +37168,7 @@
     {
       "name": "Westmere-v1",
       "typename": "Westmere-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -37273,8 +37187,7 @@
     {
       "name": "Westmere",
       "typename": "Westmere-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "Westmere-v1",
       "static": false,
       "migration-safe": true,
@@ -37876,8 +37789,7 @@
     {
       "name": "Penryn-v1",
       "typename": "Penryn-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -37885,8 +37797,7 @@
     {
       "name": "Penryn",
       "typename": "Penryn-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "Penryn-v1",
       "static": false,
       "migration-safe": true,
@@ -37976,8 +37887,7 @@
     {
       "name": "Opteron_G2-v1",
       "typename": "Opteron_G2-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -37985,8 +37895,7 @@
     {
       "name": "Opteron_G2",
       "typename": "Opteron_G2-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "Opteron_G2-v1",
       "static": false,
       "migration-safe": true,
@@ -37995,8 +37904,7 @@
     {
       "name": "Opteron_G1-v1",
       "typename": "Opteron_G1-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -38004,8 +37912,7 @@
     {
       "name": "Opteron_G1",
       "typename": "Opteron_G1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "Opteron_G1-v1",
       "static": false,
       "migration-safe": true,
@@ -38024,8 +37931,7 @@
     {
       "name": "Nehalem-v1",
       "typename": "Nehalem-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -38044,8 +37950,7 @@
     {
       "name": "Nehalem",
       "typename": "Nehalem-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "Nehalem-v1",
       "static": false,
       "migration-safe": true,
@@ -39042,8 +38947,7 @@
     {
       "name": "Conroe-v1",
       "typename": "Conroe-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -39051,8 +38955,7 @@
     {
       "name": "Conroe",
       "typename": "Conroe-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "Conroe-v1",
       "static": false,
       "migration-safe": true,
@@ -39399,8 +39302,7 @@
     {
       "name": "486-v1",
       "typename": "486-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -39408,8 +39310,7 @@
     {
       "name": "486",
       "typename": "486-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "486-v1",
       "static": false,
       "migration-safe": true,

diff --git a/tests/qemucapabilitiesdata/caps_8.1.0_s390x.replies b/tests/qemucapabilitiesdata/caps_8.1.0_s390x.replies
index 57ce64e88e496a1e8c48559fdb988f3737f4aa17..2ee9655774fa4d60e1d120af23ed735b5e961219 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_8.1.0_s390x.replies
+++ b/tests/qemucapabilitiesdata/caps_8.1.0_s390x.replies
@@ -4,8 +4,7 @@
 }
 
 {
-  "return": {
-  },
+  "return": {},
   "id": "libvirt-1"
 }
 
@@ -1666,8 +1665,7 @@
     },
     {
       "name": "0",
-      "members": [
-      ],
+      "members": [],
       "meta-type": "object"
     },
     {
@@ -21328,8 +21326,7 @@
     },
     {
       "name": "722",
-      "members": [
-      ],
+      "members": [],
       "meta-type": "object"
     },
     {
@@ -27516,8 +27513,7 @@
     {
       "name": "gen16a-base",
       "typename": "gen16a-base-s390x-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": true,
       "migration-safe": true,
       "deprecated": false
@@ -27525,8 +27521,7 @@
     {
       "name": "gen16a",
       "typename": "gen16a-s390x-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -27534,8 +27529,7 @@
     {
       "name": "z800-base",
       "typename": "z800-base-s390x-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": true,
       "migration-safe": true,
       "deprecated": false
@@ -27543,8 +27537,7 @@
     {
       "name": "z890.2-base",
       "typename": "z890.2-base-s390x-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": true,
       "migration-safe": true,
       "deprecated": false
@@ -27552,8 +27545,7 @@
     {
       "name": "z9EC.2",
       "typename": "z9EC.2-s390x-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -27561,8 +27553,7 @@
     {
       "name": "z13.2",
       "typename": "z13.2-s390x-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -27570,8 +27561,7 @@
     {
       "name": "z990.5-base",
       "typename": "z990.5-base-s390x-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": true,
       "migration-safe": true,
       "deprecated": false
@@ -27579,8 +27569,7 @@
     {
       "name": "z9BC-base",
       "typename": "z9BC-base-s390x-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": true,
       "migration-safe": true,
       "deprecated": false
@@ -27588,8 +27577,7 @@
     {
       "name": "z890",
       "typename": "z890-s390x-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -27597,8 +27585,7 @@
     {
       "name": "z890.2",
       "typename": "z890.2-s390x-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -27606,8 +27593,7 @@
     {
       "name": "z9BC",
       "typename": "z9BC-s390x-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -27615,8 +27601,7 @@
     {
       "name": "z13",
       "typename": "z13-s390x-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -27624,8 +27609,7 @@
     {
       "name": "z196",
       "typename": "z196-s390x-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -27633,8 +27617,7 @@
     {
       "name": "z13s",
       "typename": "z13s-s390x-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -27642,8 +27625,7 @@
     {
       "name": "host",
       "typename": "host-s390x-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": false,
       "deprecated": false
@@ -27651,8 +27633,7 @@
     {
       "name": "gen16b-base",
       "typename": "gen16b-base-s390x-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": true,
       "migration-safe": true,
       "deprecated": false
@@ -27660,8 +27641,7 @@
     {
       "name": "z990.3",
       "typename": "z990.3-s390x-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -27669,8 +27649,7 @@
     {
       "name": "z13s-base",
       "typename": "z13s-base-s390x-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": true,
       "migration-safe": true,
       "deprecated": false
@@ -27678,8 +27657,7 @@
     {
       "name": "z9EC",
       "typename": "z9EC-s390x-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -27687,8 +27665,7 @@
     {
       "name": "gen15a",
       "typename": "gen15a-s390x-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -27696,8 +27673,7 @@
     {
       "name": "z14ZR1-base",
       "typename": "z14ZR1-base-s390x-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": true,
       "migration-safe": true,
       "deprecated": false
@@ -27705,8 +27681,7 @@
     {
       "name": "z14.2-base",
       "typename": "z14.2-base-s390x-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": true,
       "migration-safe": true,
       "deprecated": false
@@ -27714,8 +27689,7 @@
     {
       "name": "z900.3-base",
       "typename": "z900.3-base-s390x-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": true,
       "migration-safe": true,
       "deprecated": false
@@ -27723,8 +27697,7 @@
     {
       "name": "z13.2-base",
       "typename": "z13.2-base-s390x-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": true,
       "migration-safe": true,
       "deprecated": false
@@ -27732,8 +27705,7 @@
     {
       "name": "z196.2-base",
       "typename": "z196.2-base-s390x-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": true,
       "migration-safe": true,
       "deprecated": false
@@ -27741,8 +27713,7 @@
     {
       "name": "zBC12-base",
       "typename": "zBC12-base-s390x-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": true,
       "migration-safe": true,
       "deprecated": false
@@ -27750,8 +27721,7 @@
     {
       "name": "z9BC.2-base",
       "typename": "z9BC.2-base-s390x-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": true,
       "migration-safe": true,
       "deprecated": false
@@ -27759,8 +27729,7 @@
     {
       "name": "z900.2-base",
       "typename": "z900.2-base-s390x-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": true,
       "migration-safe": true,
       "deprecated": false
@@ -27768,8 +27737,7 @@
     {
       "name": "z9EC.3",
       "typename": "z9EC.3-s390x-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -27777,8 +27745,7 @@
     {
       "name": "zEC12",
       "typename": "zEC12-s390x-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -27786,8 +27753,7 @@
     {
       "name": "z900",
       "typename": "z900-s390x-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -27795,8 +27761,7 @@
     {
       "name": "z114-base",
       "typename": "z114-base-s390x-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": true,
       "migration-safe": true,
       "deprecated": false
@@ -27804,8 +27769,7 @@
     {
       "name": "zEC12-base",
       "typename": "zEC12-base-s390x-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": true,
       "migration-safe": true,
       "deprecated": false
@@ -27813,8 +27777,7 @@
     {
       "name": "z10EC.2",
       "typename": "z10EC.2-s390x-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -27822,8 +27785,7 @@
     {
       "name": "z10EC-base",
       "typename": "z10EC-base-s390x-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": true,
       "migration-safe": true,
       "deprecated": false
@@ -27831,8 +27793,7 @@
     {
       "name": "z900.3",
       "typename": "z900.3-s390x-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -27840,8 +27801,7 @@
     {
       "name": "z14ZR1",
       "typename": "z14ZR1-s390x-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -27849,8 +27809,7 @@
     {
       "name": "z10BC",
       "typename": "z10BC-s390x-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -27858,8 +27817,7 @@
     {
       "name": "z10BC.2-base",
       "typename": "z10BC.2-base-s390x-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": true,
       "migration-safe": true,
       "deprecated": false
@@ -27867,8 +27825,7 @@
     {
       "name": "z9BC.2",
       "typename": "z9BC.2-s390x-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -27876,8 +27833,7 @@
     {
       "name": "z990.2",
       "typename": "z990.2-s390x-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -27885,8 +27841,7 @@
     {
       "name": "z990",
       "typename": "z990-s390x-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -27894,8 +27849,7 @@
     {
       "name": "z14",
       "typename": "z14-s390x-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -27903,8 +27857,7 @@
     {
       "name": "gen15b-base",
       "typename": "gen15b-base-s390x-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": true,
       "migration-safe": true,
       "deprecated": false
@@ -27912,8 +27865,7 @@
     {
       "name": "z990.4",
       "typename": "z990.4-s390x-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -27921,8 +27873,7 @@
     {
       "name": "max",
       "typename": "max-s390x-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": false,
       "deprecated": false
@@ -27930,8 +27881,7 @@
     {
       "name": "z10EC.2-base",
       "typename": "z10EC.2-base-s390x-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": true,
       "migration-safe": true,
       "deprecated": false
@@ -27939,8 +27889,7 @@
     {
       "name": "gen15a-base",
       "typename": "gen15a-base-s390x-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": true,
       "migration-safe": true,
       "deprecated": false
@@ -27948,8 +27897,7 @@
     {
       "name": "z800",
       "typename": "z800-s390x-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -27957,8 +27905,7 @@
     {
       "name": "z10EC",
       "typename": "z10EC-s390x-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -27966,8 +27913,7 @@
     {
       "name": "zEC12.2",
       "typename": "zEC12.2-s390x-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -27975,8 +27921,7 @@
     {
       "name": "z990.2-base",
       "typename": "z990.2-base-s390x-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": true,
       "migration-safe": true,
       "deprecated": false
@@ -27984,8 +27929,7 @@
     {
       "name": "gen16b",
       "typename": "gen16b-s390x-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -27993,8 +27937,7 @@
     {
       "name": "z900-base",
       "typename": "z900-base-s390x-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": true,
       "migration-safe": true,
       "deprecated": false
@@ -28002,8 +27945,7 @@
     {
       "name": "z10BC.2",
       "typename": "z10BC.2-s390x-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -28011,8 +27953,7 @@
     {
       "name": "z9EC-base",
       "typename": "z9EC-base-s390x-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": true,
       "migration-safe": true,
       "deprecated": false
@@ -28020,8 +27961,7 @@
     {
       "name": "z9EC.3-base",
       "typename": "z9EC.3-base-s390x-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": true,
       "migration-safe": true,
       "deprecated": false
@@ -28029,8 +27969,7 @@
     {
       "name": "z114",
       "typename": "z114-s390x-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -28038,8 +27977,7 @@
     {
       "name": "z890.3",
       "typename": "z890.3-s390x-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -28047,8 +27985,7 @@
     {
       "name": "z196-base",
       "typename": "z196-base-s390x-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": true,
       "migration-safe": true,
       "deprecated": false
@@ -28056,8 +27993,7 @@
     {
       "name": "z9EC.2-base",
       "typename": "z9EC.2-base-s390x-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": true,
       "migration-safe": true,
       "deprecated": false
@@ -28065,8 +28001,7 @@
     {
       "name": "z196.2",
       "typename": "z196.2-s390x-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -28074,8 +28009,7 @@
     {
       "name": "z14.2",
       "typename": "z14.2-s390x-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -28083,8 +28017,7 @@
     {
       "name": "z990-base",
       "typename": "z990-base-s390x-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": true,
       "migration-safe": true,
       "deprecated": false
@@ -28092,8 +28025,7 @@
     {
       "name": "z900.2",
       "typename": "z900.2-s390x-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -28101,8 +28033,7 @@
     {
       "name": "z890-base",
       "typename": "z890-base-s390x-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": true,
       "migration-safe": true,
       "deprecated": false
@@ -28110,8 +28041,7 @@
     {
       "name": "z10EC.3",
       "typename": "z10EC.3-s390x-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -28119,8 +28049,7 @@
     {
       "name": "z14-base",
       "typename": "z14-base-s390x-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": true,
       "migration-safe": true,
       "deprecated": false
@@ -28128,8 +28057,7 @@
     {
       "name": "z990.4-base",
       "typename": "z990.4-base-s390x-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": true,
       "migration-safe": true,
       "deprecated": false
@@ -28137,8 +28065,7 @@
     {
       "name": "z10EC.3-base",
       "typename": "z10EC.3-base-s390x-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": true,
       "migration-safe": true,
       "deprecated": false
@@ -28146,8 +28073,7 @@
     {
       "name": "z10BC-base",
       "typename": "z10BC-base-s390x-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": true,
       "migration-safe": true,
       "deprecated": false
@@ -28155,8 +28081,7 @@
     {
       "name": "z13-base",
       "typename": "z13-base-s390x-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": true,
       "migration-safe": true,
       "deprecated": false
@@ -28164,8 +28089,7 @@
     {
       "name": "z990.3-base",
       "typename": "z990.3-base-s390x-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": true,
       "migration-safe": true,
       "deprecated": false
@@ -28173,8 +28097,7 @@
     {
       "name": "z990.5",
       "typename": "z990.5-s390x-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -28182,8 +28105,7 @@
     {
       "name": "zEC12.2-base",
       "typename": "zEC12.2-base-s390x-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": true,
       "migration-safe": true,
       "deprecated": false
@@ -28191,8 +28113,7 @@
     {
       "name": "zBC12",
       "typename": "zBC12-s390x-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -28200,8 +28121,7 @@
     {
       "name": "z890.3-base",
       "typename": "z890.3-base-s390x-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": true,
       "migration-safe": true,
       "deprecated": false
@@ -28209,8 +28129,7 @@
     {
       "name": "qemu",
       "typename": "qemu-s390x-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -28218,8 +28137,7 @@
     {
       "name": "gen15b",
       "typename": "gen15b-s390x-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -28234,8 +28152,7 @@
 }
 
 {
-  "return": [
-  ],
+  "return": [],
   "id": "libvirt-33"
 }
 
@@ -28245,8 +28162,7 @@
 }
 
 {
-  "return": [
-  ],
+  "return": [],
   "id": "libvirt-34"
 }
 
@@ -28775,8 +28691,7 @@
       "option": "fw_cfg"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": ""
     },
     {
@@ -28809,8 +28724,7 @@
       "option": "icount"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": "numa"
     },
     {
@@ -28861,13 +28775,11 @@
       "option": "overcommit"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": "tpmdev"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": "object"
     },
     {
@@ -28974,8 +28886,7 @@
       "option": "memory"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": "accel"
     },
     {
@@ -28992,8 +28903,7 @@
       "option": "option-rom"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": "plugin"
     },
     {
@@ -29065,23 +28975,19 @@
       "option": "rtc"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": "net"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": "nic"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": "netdev"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": "device"
     },
     {
@@ -29651,8 +29557,7 @@
 }
 
 {
-  "return": {
-  },
+  "return": {},
   "id": "libvirt-1"
 }
 
@@ -29869,8 +29774,7 @@
     {
       "name": "z800-base",
       "typename": "z800-base-s390x-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": true,
       "migration-safe": true,
       "deprecated": false
@@ -30583,8 +30487,7 @@
     {
       "name": "host",
       "typename": "host-s390x-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": false,
       "deprecated": false
@@ -30953,8 +30856,7 @@
     {
       "name": "z900.3-base",
       "typename": "z900.3-base-s390x-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": true,
       "migration-safe": true,
       "deprecated": false
@@ -31090,8 +30992,7 @@
     {
       "name": "z900.2-base",
       "typename": "z900.2-base-s390x-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": true,
       "migration-safe": true,
       "deprecated": false
@@ -31261,8 +31162,7 @@
     {
       "name": "z900",
       "typename": "z900-s390x-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -31406,8 +31306,7 @@
     {
       "name": "z900.3",
       "typename": "z900.3-s390x-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -31920,8 +31819,7 @@
     {
       "name": "max",
       "typename": "max-s390x-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": false,
       "deprecated": false
@@ -31998,8 +31896,7 @@
     {
       "name": "z800",
       "typename": "z800-s390x-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -32364,8 +32261,7 @@
     {
       "name": "z900-base",
       "typename": "z900-base-s390x-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": true,
       "migration-safe": true,
       "deprecated": false
@@ -32973,8 +32869,7 @@
     {
       "name": "z900.2",
       "typename": "z900.2-s390x-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -33430,8 +33325,7 @@
     {
       "name": "qemu",
       "typename": "qemu-s390x-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false

diff --git a/tests/qemucapabilitiesdata/caps_8.1.0_x86_64.replies b/tests/qemucapabilitiesdata/caps_8.1.0_x86_64.replies
index c28073c16ce52e4c326af9ea09cbf46d71afa976..3972c34b481946ee7c426b907937ab341097c9d1 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_8.1.0_x86_64.replies
+++ b/tests/qemucapabilitiesdata/caps_8.1.0_x86_64.replies
@@ -4,8 +4,7 @@
 }
 
 {
-  "return": {
-  },
+  "return": {},
   "id": "libvirt-1"
 }
 
@@ -1749,8 +1748,7 @@
     },
     {
       "name": "0",
-      "members": [
-      ],
+      "members": [],
       "meta-type": "object"
     },
     {
@@ -22394,8 +22392,7 @@
     },
     {
       "name": "729",
-      "members": [
-      ],
+      "members": [],
       "meta-type": "object"
     },
     {
@@ -32958,8 +32955,7 @@
     {
       "name": "max",
       "typename": "max-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": false,
       "deprecated": false
@@ -32967,8 +32963,7 @@
     {
       "name": "host",
       "typename": "host-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": false,
       "deprecated": false
@@ -32976,8 +32971,7 @@
     {
       "name": "base",
       "typename": "base-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": true,
       "migration-safe": true,
       "deprecated": false
@@ -32985,8 +32979,7 @@
     {
       "name": "qemu64-v1",
       "typename": "qemu64-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -32994,8 +32987,7 @@
     {
       "name": "qemu64",
       "typename": "qemu64-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "qemu64-v1",
       "static": false,
       "migration-safe": true,
@@ -33004,8 +32996,7 @@
     {
       "name": "qemu32-v1",
       "typename": "qemu32-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -33013,8 +33004,7 @@
     {
       "name": "qemu32",
       "typename": "qemu32-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "qemu32-v1",
       "static": false,
       "migration-safe": true,
@@ -33046,8 +33036,7 @@
     {
       "name": "pentium3-v1",
       "typename": "pentium3-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -33055,8 +33044,7 @@
     {
       "name": "pentium3",
       "typename": "pentium3-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "pentium3-v1",
       "static": false,
       "migration-safe": true,
@@ -33065,8 +33053,7 @@
     {
       "name": "pentium2-v1",
       "typename": "pentium2-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -33074,8 +33061,7 @@
     {
       "name": "pentium2",
       "typename": "pentium2-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "pentium2-v1",
       "static": false,
       "migration-safe": true,
@@ -33084,8 +33070,7 @@
     {
       "name": "pentium-v1",
       "typename": "pentium-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -33093,8 +33078,7 @@
     {
       "name": "pentium",
       "typename": "pentium-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "pentium-v1",
       "static": false,
       "migration-safe": true,
@@ -33124,8 +33108,7 @@
     {
       "name": "kvm64-v1",
       "typename": "kvm64-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -33133,8 +33116,7 @@
     {
       "name": "kvm64",
       "typename": "kvm64-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "kvm64-v1",
       "static": false,
       "migration-safe": true,
@@ -33143,8 +33125,7 @@
     {
       "name": "kvm32-v1",
       "typename": "kvm32-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -33152,8 +33133,7 @@
     {
       "name": "kvm32",
       "typename": "kvm32-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "kvm32-v1",
       "static": false,
       "migration-safe": true,
@@ -33237,8 +33217,7 @@
     {
       "name": "Westmere-v1",
       "typename": "Westmere-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -33257,8 +33236,7 @@
     {
       "name": "Westmere",
       "typename": "Westmere-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "Westmere-v1",
       "static": false,
       "migration-safe": true,
@@ -33830,8 +33808,7 @@
     {
       "name": "SandyBridge-v1",
       "typename": "SandyBridge-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -33850,8 +33827,7 @@
     {
       "name": "SandyBridge",
       "typename": "SandyBridge-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "SandyBridge-v1",
       "static": false,
       "migration-safe": true,
@@ -33860,8 +33836,7 @@
     {
       "name": "Penryn-v1",
       "typename": "Penryn-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -33869,8 +33844,7 @@
     {
       "name": "Penryn",
       "typename": "Penryn-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "Penryn-v1",
       "static": false,
       "migration-safe": true,
@@ -33927,8 +33901,7 @@
     {
       "name": "Opteron_G3-v1",
       "typename": "Opteron_G3-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -33936,8 +33909,7 @@
     {
       "name": "Opteron_G3",
       "typename": "Opteron_G3-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "Opteron_G3-v1",
       "static": false,
       "migration-safe": true,
@@ -33946,8 +33918,7 @@
     {
       "name": "Opteron_G2-v1",
       "typename": "Opteron_G2-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -33955,8 +33926,7 @@
     {
       "name": "Opteron_G2",
       "typename": "Opteron_G2-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "Opteron_G2-v1",
       "static": false,
       "migration-safe": true,
@@ -33965,8 +33935,7 @@
     {
       "name": "Opteron_G1-v1",
       "typename": "Opteron_G1-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -33974,8 +33943,7 @@
     {
       "name": "Opteron_G1",
       "typename": "Opteron_G1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "Opteron_G1-v1",
       "static": false,
       "migration-safe": true,
@@ -33994,8 +33962,7 @@
     {
       "name": "Nehalem-v1",
       "typename": "Nehalem-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -34014,8 +33981,7 @@
     {
       "name": "Nehalem",
       "typename": "Nehalem-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "Nehalem-v1",
       "static": false,
       "migration-safe": true,
@@ -34644,8 +34610,7 @@
     {
       "name": "EPYC-v2",
       "typename": "EPYC-v2-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -34653,8 +34618,7 @@
     {
       "name": "EPYC-v1",
       "typename": "EPYC-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -34772,8 +34736,7 @@
     {
       "name": "EPYC-IBPB",
       "typename": "EPYC-IBPB-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "EPYC-v2",
       "static": false,
       "migration-safe": true,
@@ -34863,8 +34826,7 @@
     {
       "name": "EPYC",
       "typename": "EPYC-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "EPYC-v1",
       "static": false,
       "migration-safe": true,
@@ -34883,8 +34845,7 @@
     {
       "name": "Dhyana-v1",
       "typename": "Dhyana-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -34892,8 +34853,7 @@
     {
       "name": "Dhyana",
       "typename": "Dhyana-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "Dhyana-v1",
       "static": false,
       "migration-safe": true,
@@ -35043,8 +35003,7 @@
     {
       "name": "Conroe-v1",
       "typename": "Conroe-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -35052,8 +35011,7 @@
     {
       "name": "Conroe",
       "typename": "Conroe-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "Conroe-v1",
       "static": false,
       "migration-safe": true,
@@ -35356,8 +35314,7 @@
     {
       "name": "486-v1",
       "typename": "486-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -35365,8 +35322,7 @@
     {
       "name": "486",
       "typename": "486-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "486-v1",
       "static": false,
       "migration-safe": true,
@@ -36027,13 +35983,11 @@
       "option": "fsdev"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": "smbios"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": "acpi"
     },
     {
@@ -36176,8 +36130,7 @@
       "option": "fw_cfg"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": ""
     },
     {
@@ -36210,8 +36163,7 @@
       "option": "icount"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": "numa"
     },
     {
@@ -36262,13 +36214,11 @@
       "option": "overcommit"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": "tpmdev"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": "object"
     },
     {
@@ -36375,8 +36325,7 @@
       "option": "memory"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": "accel"
     },
     {
@@ -36393,8 +36342,7 @@
       "option": "option-rom"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": "plugin"
     },
     {
@@ -36466,23 +36414,19 @@
       "option": "rtc"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": "net"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": "nic"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": "netdev"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": "device"
     },
     {
@@ -38247,8 +38191,7 @@
 }
 
 {
-  "return": {
-  },
+  "return": {},
   "id": "libvirt-1"
 }
 
@@ -38262,8 +38205,7 @@
     {
       "name": "max",
       "typename": "max-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": false,
       "deprecated": false
@@ -38281,8 +38223,7 @@
     {
       "name": "base",
       "typename": "base-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": true,
       "migration-safe": true,
       "deprecated": false
@@ -38290,8 +38231,7 @@
     {
       "name": "qemu64-v1",
       "typename": "qemu64-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -38299,8 +38239,7 @@
     {
       "name": "qemu64",
       "typename": "qemu64-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "qemu64-v1",
       "static": false,
       "migration-safe": true,
@@ -38309,8 +38248,7 @@
     {
       "name": "qemu32-v1",
       "typename": "qemu32-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -38318,8 +38256,7 @@
     {
       "name": "qemu32",
       "typename": "qemu32-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "qemu32-v1",
       "static": false,
       "migration-safe": true,
@@ -38349,8 +38286,7 @@
     {
       "name": "pentium3-v1",
       "typename": "pentium3-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -38358,8 +38294,7 @@
     {
       "name": "pentium3",
       "typename": "pentium3-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "pentium3-v1",
       "static": false,
       "migration-safe": true,
@@ -38368,8 +38303,7 @@
     {
       "name": "pentium2-v1",
       "typename": "pentium2-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -38377,8 +38311,7 @@
     {
       "name": "pentium2",
       "typename": "pentium2-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "pentium2-v1",
       "static": false,
       "migration-safe": true,
@@ -38387,8 +38320,7 @@
     {
       "name": "pentium-v1",
       "typename": "pentium-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -38396,8 +38328,7 @@
     {
       "name": "pentium",
       "typename": "pentium-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "pentium-v1",
       "static": false,
       "migration-safe": true,
@@ -38406,8 +38337,7 @@
     {
       "name": "n270-v1",
       "typename": "n270-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -38415,8 +38345,7 @@
     {
       "name": "n270",
       "typename": "n270-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "n270-v1",
       "static": false,
       "migration-safe": true,
@@ -38425,8 +38354,7 @@
     {
       "name": "kvm64-v1",
       "typename": "kvm64-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -38434,8 +38362,7 @@
     {
       "name": "kvm64",
       "typename": "kvm64-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "kvm64-v1",
       "static": false,
       "migration-safe": true,
@@ -38444,8 +38371,7 @@
     {
       "name": "kvm32-v1",
       "typename": "kvm32-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -38453,8 +38379,7 @@
     {
       "name": "kvm32",
       "typename": "kvm32-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "kvm32-v1",
       "static": false,
       "migration-safe": true,
@@ -38463,8 +38388,7 @@
     {
       "name": "coreduo-v1",
       "typename": "coreduo-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -38472,8 +38396,7 @@
     {
       "name": "coreduo",
       "typename": "coreduo-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "coreduo-v1",
       "static": false,
       "migration-safe": true,
@@ -38482,8 +38405,7 @@
     {
       "name": "core2duo-v1",
       "typename": "core2duo-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -38491,8 +38413,7 @@
     {
       "name": "core2duo",
       "typename": "core2duo-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "core2duo-v1",
       "static": false,
       "migration-safe": true,
@@ -38501,8 +38422,7 @@
     {
       "name": "athlon-v1",
       "typename": "athlon-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -38510,8 +38430,7 @@
     {
       "name": "athlon",
       "typename": "athlon-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "athlon-v1",
       "static": false,
       "migration-safe": true,
@@ -38530,8 +38449,7 @@
     {
       "name": "Westmere-v1",
       "typename": "Westmere-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -38550,8 +38468,7 @@
     {
       "name": "Westmere",
       "typename": "Westmere-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "Westmere-v1",
       "static": false,
       "migration-safe": true,
@@ -39137,8 +39054,7 @@
     {
       "name": "Penryn-v1",
       "typename": "Penryn-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -39146,8 +39062,7 @@
     {
       "name": "Penryn",
       "typename": "Penryn-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "Penryn-v1",
       "static": false,
       "migration-safe": true,
@@ -39233,8 +39148,7 @@
     {
       "name": "Opteron_G2-v1",
       "typename": "Opteron_G2-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -39242,8 +39156,7 @@
     {
       "name": "Opteron_G2",
       "typename": "Opteron_G2-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "Opteron_G2-v1",
       "static": false,
       "migration-safe": true,
@@ -39252,8 +39165,7 @@
     {
       "name": "Opteron_G1-v1",
       "typename": "Opteron_G1-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -39261,8 +39173,7 @@
     {
       "name": "Opteron_G1",
       "typename": "Opteron_G1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "Opteron_G1-v1",
       "static": false,
       "migration-safe": true,
@@ -39281,8 +39192,7 @@
     {
       "name": "Nehalem-v1",
       "typename": "Nehalem-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -39301,8 +39211,7 @@
     {
       "name": "Nehalem",
       "typename": "Nehalem-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "Nehalem-v1",
       "static": false,
       "migration-safe": true,
@@ -40446,8 +40355,7 @@
     {
       "name": "Conroe-v1",
       "typename": "Conroe-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -40455,8 +40363,7 @@
     {
       "name": "Conroe",
       "typename": "Conroe-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "Conroe-v1",
       "static": false,
       "migration-safe": true,
@@ -40753,8 +40660,7 @@
     {
       "name": "486-v1",
       "typename": "486-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -40762,8 +40668,7 @@
     {
       "name": "486",
       "typename": "486-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "486-v1",
       "static": false,
       "migration-safe": true,

diff --git a/tests/qemucapabilitiesdata/caps_8.2.0_aarch64.replies b/tests/qemucapabilitiesdata/caps_8.2.0_aarch64.replies
index aea02842d1f6bfeaf41835e8a871c9d24e5e533a..203774ecff413e0f39d8e7751d936d82648dd0f1 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_8.2.0_aarch64.replies
+++ b/tests/qemucapabilitiesdata/caps_8.2.0_aarch64.replies
@@ -4,8 +4,7 @@
 }
 
 {
-  "return": {
-  },
+  "return": {},
   "id": "libvirt-1"
 }
 
@@ -1686,8 +1685,7 @@
     },
     {
       "name": "0",
-      "members": [
-      ],
+      "members": [],
       "meta-type": "object"
     },
     {
@@ -22230,8 +22228,7 @@
     },
     {
       "name": "751",
-      "members": [
-      ],
+      "members": [],
       "meta-type": "object"
     },
     {
@@ -31074,8 +31071,7 @@
       "type": "bool"
     },
     {
-      "default-value": [
-      ],
+      "default-value": [],
       "name": "reserved-regions",
       "type": "list"
     },
@@ -33857,13 +33853,11 @@
       "option": "fsdev"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": "smbios"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": "acpi"
     },
     {
@@ -34073,8 +34067,7 @@
       "option": "icount"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": "numa"
     },
     {
@@ -34125,13 +34118,11 @@
       "option": "overcommit"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": "tpmdev"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": "object"
     },
     {
@@ -34246,8 +34237,7 @@
       "option": "memory"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": "accel"
     },
     {
@@ -34264,8 +34254,7 @@
       "option": "option-rom"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": "plugin"
     },
     {
@@ -34337,23 +34326,19 @@
       "option": "rtc"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": "net"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": "nic"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": "netdev"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": "device"
     },
     {
@@ -34945,8 +34930,7 @@
 }
 
 {
-  "return": {
-  },
+  "return": {},
   "id": "libvirt-1"
 }
 

diff --git a/tests/qemucapabilitiesdata/caps_8.2.0_x86_64.replies b/tests/qemucapabilitiesdata/caps_8.2.0_x86_64.replies
index 56011f8317d7b16a4d6f07b53df95015edc13baf..cc2190dfd3ae368a9793993f563ef5788fb008bf 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_8.2.0_x86_64.replies
+++ b/tests/qemucapabilitiesdata/caps_8.2.0_x86_64.replies
@@ -4,8 +4,7 @@
 }
 
 {
-  "return": {
-  },
+  "return": {},
   "id": "libvirt-1"
 }
 
@@ -1766,8 +1765,7 @@
     },
     {
       "name": "0",
-      "members": [
-      ],
+      "members": [],
       "meta-type": "object"
     },
     {
@@ -22895,8 +22893,7 @@
     },
     {
       "name": "751",
-      "members": [
-      ],
+      "members": [],
       "meta-type": "object"
     },
     {
@@ -30705,8 +30702,7 @@
       "type": "bool"
     },
     {
-      "default-value": [
-      ],
+      "default-value": [],
       "name": "reserved-regions",
       "type": "list"
     },
@@ -33651,8 +33647,7 @@
     {
       "name": "max",
       "typename": "max-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": false,
       "deprecated": false
@@ -33660,8 +33655,7 @@
     {
       "name": "host",
       "typename": "host-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": false,
       "deprecated": false
@@ -33669,8 +33663,7 @@
     {
       "name": "base",
       "typename": "base-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": true,
       "migration-safe": true,
       "deprecated": false
@@ -33678,8 +33671,7 @@
     {
       "name": "qemu64-v1",
       "typename": "qemu64-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -33687,8 +33679,7 @@
     {
       "name": "qemu64",
       "typename": "qemu64-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "qemu64-v1",
       "static": false,
       "migration-safe": true,
@@ -33697,8 +33688,7 @@
     {
       "name": "qemu32-v1",
       "typename": "qemu32-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -33706,8 +33696,7 @@
     {
       "name": "qemu32",
       "typename": "qemu32-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "qemu32-v1",
       "static": false,
       "migration-safe": true,
@@ -33739,8 +33728,7 @@
     {
       "name": "pentium3-v1",
       "typename": "pentium3-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -33748,8 +33736,7 @@
     {
       "name": "pentium3",
       "typename": "pentium3-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "pentium3-v1",
       "static": false,
       "migration-safe": true,
@@ -33758,8 +33745,7 @@
     {
       "name": "pentium2-v1",
       "typename": "pentium2-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -33767,8 +33753,7 @@
     {
       "name": "pentium2",
       "typename": "pentium2-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "pentium2-v1",
       "static": false,
       "migration-safe": true,
@@ -33777,8 +33762,7 @@
     {
       "name": "pentium-v1",
       "typename": "pentium-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -33786,8 +33770,7 @@
     {
       "name": "pentium",
       "typename": "pentium-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "pentium-v1",
       "static": false,
       "migration-safe": true,
@@ -33817,8 +33800,7 @@
     {
       "name": "kvm64-v1",
       "typename": "kvm64-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -33826,8 +33808,7 @@
     {
       "name": "kvm64",
       "typename": "kvm64-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "kvm64-v1",
       "static": false,
       "migration-safe": true,
@@ -33836,8 +33817,7 @@
     {
       "name": "kvm32-v1",
       "typename": "kvm32-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -33845,8 +33825,7 @@
     {
       "name": "kvm32",
       "typename": "kvm32-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "kvm32-v1",
       "static": false,
       "migration-safe": true,
@@ -33930,8 +33909,7 @@
     {
       "name": "Westmere-v1",
       "typename": "Westmere-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -33950,8 +33928,7 @@
     {
       "name": "Westmere",
       "typename": "Westmere-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "Westmere-v1",
       "static": false,
       "migration-safe": true,
@@ -34523,8 +34500,7 @@
     {
       "name": "SandyBridge-v1",
       "typename": "SandyBridge-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -34543,8 +34519,7 @@
     {
       "name": "SandyBridge",
       "typename": "SandyBridge-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "SandyBridge-v1",
       "static": false,
       "migration-safe": true,
@@ -34553,8 +34528,7 @@
     {
       "name": "Penryn-v1",
       "typename": "Penryn-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -34562,8 +34536,7 @@
     {
       "name": "Penryn",
       "typename": "Penryn-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "Penryn-v1",
       "static": false,
       "migration-safe": true,
@@ -34620,8 +34593,7 @@
     {
       "name": "Opteron_G3-v1",
       "typename": "Opteron_G3-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -34629,8 +34601,7 @@
     {
       "name": "Opteron_G3",
       "typename": "Opteron_G3-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "Opteron_G3-v1",
       "static": false,
       "migration-safe": true,
@@ -34639,8 +34610,7 @@
     {
       "name": "Opteron_G2-v1",
       "typename": "Opteron_G2-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -34648,8 +34618,7 @@
     {
       "name": "Opteron_G2",
       "typename": "Opteron_G2-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "Opteron_G2-v1",
       "static": false,
       "migration-safe": true,
@@ -34658,8 +34627,7 @@
     {
       "name": "Opteron_G1-v1",
       "typename": "Opteron_G1-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -34667,8 +34635,7 @@
     {
       "name": "Opteron_G1",
       "typename": "Opteron_G1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "Opteron_G1-v1",
       "static": false,
       "migration-safe": true,
@@ -34687,8 +34654,7 @@
     {
       "name": "Nehalem-v1",
       "typename": "Nehalem-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -34707,8 +34673,7 @@
     {
       "name": "Nehalem",
       "typename": "Nehalem-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "Nehalem-v1",
       "static": false,
       "migration-safe": true,
@@ -35337,8 +35302,7 @@
     {
       "name": "EPYC-v2",
       "typename": "EPYC-v2-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -35346,8 +35310,7 @@
     {
       "name": "EPYC-v1",
       "typename": "EPYC-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -35465,8 +35428,7 @@
     {
       "name": "EPYC-IBPB",
       "typename": "EPYC-IBPB-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "EPYC-v2",
       "static": false,
       "migration-safe": true,
@@ -35556,8 +35518,7 @@
     {
       "name": "EPYC",
       "typename": "EPYC-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "EPYC-v1",
       "static": false,
       "migration-safe": true,
@@ -35576,8 +35537,7 @@
     {
       "name": "Dhyana-v1",
       "typename": "Dhyana-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -35585,8 +35545,7 @@
     {
       "name": "Dhyana",
       "typename": "Dhyana-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "Dhyana-v1",
       "static": false,
       "migration-safe": true,
@@ -35736,8 +35695,7 @@
     {
       "name": "Conroe-v1",
       "typename": "Conroe-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -35745,8 +35703,7 @@
     {
       "name": "Conroe",
       "typename": "Conroe-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "Conroe-v1",
       "static": false,
       "migration-safe": true,
@@ -36049,8 +36006,7 @@
     {
       "name": "486-v1",
       "typename": "486-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -36058,8 +36014,7 @@
     {
       "name": "486",
       "typename": "486-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "486-v1",
       "static": false,
       "migration-safe": true,
@@ -36712,13 +36667,11 @@
       "option": "fsdev"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": "smbios"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": "acpi"
     },
     {
@@ -36874,8 +36827,7 @@
       "option": "fw_cfg"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": ""
     },
     {
@@ -36908,8 +36860,7 @@
       "option": "icount"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": "numa"
     },
     {
@@ -36960,13 +36911,11 @@
       "option": "overcommit"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": "tpmdev"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": "object"
     },
     {
@@ -37081,8 +37030,7 @@
       "option": "memory"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": "accel"
     },
     {
@@ -37099,8 +37047,7 @@
       "option": "option-rom"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": "plugin"
     },
     {
@@ -37172,23 +37119,19 @@
       "option": "rtc"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": "net"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": "nic"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": "netdev"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": "device"
     },
     {
@@ -38965,8 +38908,7 @@
 }
 
 {
-  "return": {
-  },
+  "return": {},
   "id": "libvirt-1"
 }
 
@@ -38980,8 +38922,7 @@
     {
       "name": "max",
       "typename": "max-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": false,
       "deprecated": false
@@ -38999,8 +38940,7 @@
     {
       "name": "base",
       "typename": "base-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": true,
       "migration-safe": true,
       "deprecated": false
@@ -39008,8 +38948,7 @@
     {
       "name": "qemu64-v1",
       "typename": "qemu64-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -39017,8 +38956,7 @@
     {
       "name": "qemu64",
       "typename": "qemu64-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "qemu64-v1",
       "static": false,
       "migration-safe": true,
@@ -39027,8 +38965,7 @@
     {
       "name": "qemu32-v1",
       "typename": "qemu32-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -39036,8 +38973,7 @@
     {
       "name": "qemu32",
       "typename": "qemu32-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "qemu32-v1",
       "static": false,
       "migration-safe": true,
@@ -39067,8 +39003,7 @@
     {
       "name": "pentium3-v1",
       "typename": "pentium3-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -39076,8 +39011,7 @@
     {
       "name": "pentium3",
       "typename": "pentium3-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "pentium3-v1",
       "static": false,
       "migration-safe": true,
@@ -39086,8 +39020,7 @@
     {
       "name": "pentium2-v1",
       "typename": "pentium2-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -39095,8 +39028,7 @@
     {
       "name": "pentium2",
       "typename": "pentium2-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "pentium2-v1",
       "static": false,
       "migration-safe": true,
@@ -39105,8 +39037,7 @@
     {
       "name": "pentium-v1",
       "typename": "pentium-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -39114,8 +39045,7 @@
     {
       "name": "pentium",
       "typename": "pentium-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "pentium-v1",
       "static": false,
       "migration-safe": true,
@@ -39124,8 +39054,7 @@
     {
       "name": "n270-v1",
       "typename": "n270-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -39133,8 +39062,7 @@
     {
       "name": "n270",
       "typename": "n270-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "n270-v1",
       "static": false,
       "migration-safe": true,
@@ -39143,8 +39071,7 @@
     {
       "name": "kvm64-v1",
       "typename": "kvm64-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -39152,8 +39079,7 @@
     {
       "name": "kvm64",
       "typename": "kvm64-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "kvm64-v1",
       "static": false,
       "migration-safe": true,
@@ -39162,8 +39088,7 @@
     {
       "name": "kvm32-v1",
       "typename": "kvm32-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -39171,8 +39096,7 @@
     {
       "name": "kvm32",
       "typename": "kvm32-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "kvm32-v1",
       "static": false,
       "migration-safe": true,
@@ -39181,8 +39105,7 @@
     {
       "name": "coreduo-v1",
       "typename": "coreduo-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -39190,8 +39113,7 @@
     {
       "name": "coreduo",
       "typename": "coreduo-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "coreduo-v1",
       "static": false,
       "migration-safe": true,
@@ -39200,8 +39122,7 @@
     {
       "name": "core2duo-v1",
       "typename": "core2duo-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -39209,8 +39130,7 @@
     {
       "name": "core2duo",
       "typename": "core2duo-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "core2duo-v1",
       "static": false,
       "migration-safe": true,
@@ -39219,8 +39139,7 @@
     {
       "name": "athlon-v1",
       "typename": "athlon-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -39228,8 +39147,7 @@
     {
       "name": "athlon",
       "typename": "athlon-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "athlon-v1",
       "static": false,
       "migration-safe": true,
@@ -39248,8 +39166,7 @@
     {
       "name": "Westmere-v1",
       "typename": "Westmere-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -39268,8 +39185,7 @@
     {
       "name": "Westmere",
       "typename": "Westmere-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "Westmere-v1",
       "static": false,
       "migration-safe": true,
@@ -39847,8 +39763,7 @@
     {
       "name": "Penryn-v1",
       "typename": "Penryn-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -39856,8 +39771,7 @@
     {
       "name": "Penryn",
       "typename": "Penryn-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "Penryn-v1",
       "static": false,
       "migration-safe": true,
@@ -39943,8 +39857,7 @@
     {
       "name": "Opteron_G2-v1",
       "typename": "Opteron_G2-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -39952,8 +39865,7 @@
     {
       "name": "Opteron_G2",
       "typename": "Opteron_G2-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "Opteron_G2-v1",
       "static": false,
       "migration-safe": true,
@@ -39962,8 +39874,7 @@
     {
       "name": "Opteron_G1-v1",
       "typename": "Opteron_G1-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -39971,8 +39882,7 @@
     {
       "name": "Opteron_G1",
       "typename": "Opteron_G1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "Opteron_G1-v1",
       "static": false,
       "migration-safe": true,
@@ -39991,8 +39901,7 @@
     {
       "name": "Nehalem-v1",
       "typename": "Nehalem-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -40011,8 +39920,7 @@
     {
       "name": "Nehalem",
       "typename": "Nehalem-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "Nehalem-v1",
       "static": false,
       "migration-safe": true,
@@ -41131,8 +41039,7 @@
     {
       "name": "Conroe-v1",
       "typename": "Conroe-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -41140,8 +41047,7 @@
     {
       "name": "Conroe",
       "typename": "Conroe-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "Conroe-v1",
       "static": false,
       "migration-safe": true,
@@ -41438,8 +41344,7 @@
     {
       "name": "486-v1",
       "typename": "486-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -41447,8 +41352,7 @@
     {
       "name": "486",
       "typename": "486-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "486-v1",
       "static": false,
       "migration-safe": true,

diff --git a/tests/qemucapabilitiesdata/caps_9.0.0_x86_64.replies b/tests/qemucapabilitiesdata/caps_9.0.0_x86_64.replies
index 7eaabff81911a9df887a1f1c0b2244457d4bc3e5..f13457a763bddda1a30f44ffe8e3c8a94655bcc3 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_9.0.0_x86_64.replies
+++ b/tests/qemucapabilitiesdata/caps_9.0.0_x86_64.replies
@@ -4,8 +4,7 @@
 }
 
 {
-  "return": {
-  },
+  "return": {},
   "id": "libvirt-1"
 }
 
@@ -1766,8 +1765,7 @@
     },
     {
       "name": "0",
-      "members": [
-      ],
+      "members": [],
       "meta-type": "object"
     },
     {
@@ -22914,8 +22912,7 @@
     },
     {
       "name": "752",
-      "members": [
-      ],
+      "members": [],
       "meta-type": "object"
     },
     {
@@ -30749,8 +30746,7 @@
       "type": "bool"
     },
     {
-      "default-value": [
-      ],
+      "default-value": [],
       "name": "reserved-regions",
       "type": "list"
     },
@@ -33715,8 +33711,7 @@
     {
       "name": "max",
       "typename": "max-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": false,
       "deprecated": false
@@ -33724,8 +33719,7 @@
     {
       "name": "host",
       "typename": "host-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": false,
       "deprecated": false
@@ -33733,8 +33727,7 @@
     {
       "name": "base",
       "typename": "base-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": true,
       "migration-safe": true,
       "deprecated": false
@@ -33742,8 +33735,7 @@
     {
       "name": "qemu64-v1",
       "typename": "qemu64-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -33751,8 +33743,7 @@
     {
       "name": "qemu64",
       "typename": "qemu64-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "qemu64-v1",
       "static": false,
       "migration-safe": true,
@@ -33761,8 +33752,7 @@
     {
       "name": "qemu32-v1",
       "typename": "qemu32-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -33770,8 +33760,7 @@
     {
       "name": "qemu32",
       "typename": "qemu32-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "qemu32-v1",
       "static": false,
       "migration-safe": true,
@@ -33803,8 +33792,7 @@
     {
       "name": "pentium3-v1",
       "typename": "pentium3-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -33812,8 +33800,7 @@
     {
       "name": "pentium3",
       "typename": "pentium3-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "pentium3-v1",
       "static": false,
       "migration-safe": true,
@@ -33822,8 +33809,7 @@
     {
       "name": "pentium2-v1",
       "typename": "pentium2-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -33831,8 +33817,7 @@
     {
       "name": "pentium2",
       "typename": "pentium2-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "pentium2-v1",
       "static": false,
       "migration-safe": true,
@@ -33841,8 +33826,7 @@
     {
       "name": "pentium-v1",
       "typename": "pentium-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -33850,8 +33834,7 @@
     {
       "name": "pentium",
       "typename": "pentium-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "pentium-v1",
       "static": false,
       "migration-safe": true,
@@ -33881,8 +33864,7 @@
     {
       "name": "kvm64-v1",
       "typename": "kvm64-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -33890,8 +33872,7 @@
     {
       "name": "kvm64",
       "typename": "kvm64-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "kvm64-v1",
       "static": false,
       "migration-safe": true,
@@ -33900,8 +33881,7 @@
     {
       "name": "kvm32-v1",
       "typename": "kvm32-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -33909,8 +33889,7 @@
     {
       "name": "kvm32",
       "typename": "kvm32-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "kvm32-v1",
       "static": false,
       "migration-safe": true,
@@ -33994,8 +33973,7 @@
     {
       "name": "Westmere-v1",
       "typename": "Westmere-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -34014,8 +33992,7 @@
     {
       "name": "Westmere",
       "typename": "Westmere-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "Westmere-v1",
       "static": false,
       "migration-safe": true,
@@ -34587,8 +34564,7 @@
     {
       "name": "SandyBridge-v1",
       "typename": "SandyBridge-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -34607,8 +34583,7 @@
     {
       "name": "SandyBridge",
       "typename": "SandyBridge-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "SandyBridge-v1",
       "static": false,
       "migration-safe": true,
@@ -34617,8 +34592,7 @@
     {
       "name": "Penryn-v1",
       "typename": "Penryn-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -34626,8 +34600,7 @@
     {
       "name": "Penryn",
       "typename": "Penryn-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "Penryn-v1",
       "static": false,
       "migration-safe": true,
@@ -34684,8 +34657,7 @@
     {
       "name": "Opteron_G3-v1",
       "typename": "Opteron_G3-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -34693,8 +34665,7 @@
     {
       "name": "Opteron_G3",
       "typename": "Opteron_G3-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "Opteron_G3-v1",
       "static": false,
       "migration-safe": true,
@@ -34703,8 +34674,7 @@
     {
       "name": "Opteron_G2-v1",
       "typename": "Opteron_G2-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -34712,8 +34682,7 @@
     {
       "name": "Opteron_G2",
       "typename": "Opteron_G2-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "Opteron_G2-v1",
       "static": false,
       "migration-safe": true,
@@ -34722,8 +34691,7 @@
     {
       "name": "Opteron_G1-v1",
       "typename": "Opteron_G1-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -34731,8 +34699,7 @@
     {
       "name": "Opteron_G1",
       "typename": "Opteron_G1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "Opteron_G1-v1",
       "static": false,
       "migration-safe": true,
@@ -34751,8 +34718,7 @@
     {
       "name": "Nehalem-v1",
       "typename": "Nehalem-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -34771,8 +34737,7 @@
     {
       "name": "Nehalem",
       "typename": "Nehalem-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "Nehalem-v1",
       "static": false,
       "migration-safe": true,
@@ -35401,8 +35366,7 @@
     {
       "name": "EPYC-v2",
       "typename": "EPYC-v2-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -35410,8 +35374,7 @@
     {
       "name": "EPYC-v1",
       "typename": "EPYC-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -35529,8 +35492,7 @@
     {
       "name": "EPYC-IBPB",
       "typename": "EPYC-IBPB-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "EPYC-v2",
       "static": false,
       "migration-safe": true,
@@ -35620,8 +35582,7 @@
     {
       "name": "EPYC",
       "typename": "EPYC-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "EPYC-v1",
       "static": false,
       "migration-safe": true,
@@ -35640,8 +35601,7 @@
     {
       "name": "Dhyana-v1",
       "typename": "Dhyana-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -35649,8 +35609,7 @@
     {
       "name": "Dhyana",
       "typename": "Dhyana-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "Dhyana-v1",
       "static": false,
       "migration-safe": true,
@@ -35800,8 +35759,7 @@
     {
       "name": "Conroe-v1",
       "typename": "Conroe-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -35809,8 +35767,7 @@
     {
       "name": "Conroe",
       "typename": "Conroe-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "Conroe-v1",
       "static": false,
       "migration-safe": true,
@@ -36113,8 +36070,7 @@
     {
       "name": "486-v1",
       "typename": "486-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -36122,8 +36078,7 @@
     {
       "name": "486",
       "typename": "486-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "486-v1",
       "static": false,
       "migration-safe": true,
@@ -36776,13 +36731,11 @@
       "option": "fsdev"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": "smbios"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": "acpi"
     },
     {
@@ -36938,8 +36891,7 @@
       "option": "fw_cfg"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": ""
     },
     {
@@ -36972,8 +36924,7 @@
       "option": "icount"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": "numa"
     },
     {
@@ -37024,13 +36975,11 @@
       "option": "overcommit"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": "tpmdev"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": "object"
     },
     {
@@ -37145,8 +37094,7 @@
       "option": "memory"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": "accel"
     },
     {
@@ -37163,8 +37111,7 @@
       "option": "option-rom"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": "plugin"
     },
     {
@@ -37236,23 +37183,19 @@
       "option": "rtc"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": "net"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": "nic"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": "netdev"
     },
     {
-      "parameters": [
-      ],
+      "parameters": [],
       "option": "device"
     },
     {
@@ -39029,8 +38972,7 @@
 }
 
 {
-  "return": {
-  },
+  "return": {},
   "id": "libvirt-1"
 }
 
@@ -39044,8 +38986,7 @@
     {
       "name": "max",
       "typename": "max-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": false,
       "deprecated": false
@@ -39063,8 +39004,7 @@
     {
       "name": "base",
       "typename": "base-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": true,
       "migration-safe": true,
       "deprecated": false
@@ -39072,8 +39012,7 @@
     {
       "name": "qemu64-v1",
       "typename": "qemu64-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -39081,8 +39020,7 @@
     {
       "name": "qemu64",
       "typename": "qemu64-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "qemu64-v1",
       "static": false,
       "migration-safe": true,
@@ -39091,8 +39029,7 @@
     {
       "name": "qemu32-v1",
       "typename": "qemu32-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -39100,8 +39037,7 @@
     {
       "name": "qemu32",
       "typename": "qemu32-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "qemu32-v1",
       "static": false,
       "migration-safe": true,
@@ -39131,8 +39067,7 @@
     {
       "name": "pentium3-v1",
       "typename": "pentium3-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -39140,8 +39075,7 @@
     {
       "name": "pentium3",
       "typename": "pentium3-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "pentium3-v1",
       "static": false,
       "migration-safe": true,
@@ -39150,8 +39084,7 @@
     {
       "name": "pentium2-v1",
       "typename": "pentium2-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -39159,8 +39092,7 @@
     {
       "name": "pentium2",
       "typename": "pentium2-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "pentium2-v1",
       "static": false,
       "migration-safe": true,
@@ -39169,8 +39101,7 @@
     {
       "name": "pentium-v1",
       "typename": "pentium-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -39178,8 +39109,7 @@
     {
       "name": "pentium",
       "typename": "pentium-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "pentium-v1",
       "static": false,
       "migration-safe": true,
@@ -39188,8 +39118,7 @@
     {
       "name": "n270-v1",
       "typename": "n270-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -39197,8 +39126,7 @@
     {
       "name": "n270",
       "typename": "n270-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "n270-v1",
       "static": false,
       "migration-safe": true,
@@ -39207,8 +39135,7 @@
     {
       "name": "kvm64-v1",
       "typename": "kvm64-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -39216,8 +39143,7 @@
     {
       "name": "kvm64",
       "typename": "kvm64-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "kvm64-v1",
       "static": false,
       "migration-safe": true,
@@ -39226,8 +39152,7 @@
     {
       "name": "kvm32-v1",
       "typename": "kvm32-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -39235,8 +39160,7 @@
     {
       "name": "kvm32",
       "typename": "kvm32-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "kvm32-v1",
       "static": false,
       "migration-safe": true,
@@ -39245,8 +39169,7 @@
     {
       "name": "coreduo-v1",
       "typename": "coreduo-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -39254,8 +39177,7 @@
     {
       "name": "coreduo",
       "typename": "coreduo-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "coreduo-v1",
       "static": false,
       "migration-safe": true,
@@ -39264,8 +39186,7 @@
     {
       "name": "core2duo-v1",
       "typename": "core2duo-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -39273,8 +39194,7 @@
     {
       "name": "core2duo",
       "typename": "core2duo-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "core2duo-v1",
       "static": false,
       "migration-safe": true,
@@ -39283,8 +39203,7 @@
     {
       "name": "athlon-v1",
       "typename": "athlon-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -39292,8 +39211,7 @@
     {
       "name": "athlon",
       "typename": "athlon-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "athlon-v1",
       "static": false,
       "migration-safe": true,
@@ -39312,8 +39230,7 @@
     {
       "name": "Westmere-v1",
       "typename": "Westmere-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -39332,8 +39249,7 @@
     {
       "name": "Westmere",
       "typename": "Westmere-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "Westmere-v1",
       "static": false,
       "migration-safe": true,
@@ -39911,8 +39827,7 @@
     {
       "name": "Penryn-v1",
       "typename": "Penryn-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -39920,8 +39835,7 @@
     {
       "name": "Penryn",
       "typename": "Penryn-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "Penryn-v1",
       "static": false,
       "migration-safe": true,
@@ -40007,8 +39921,7 @@
     {
       "name": "Opteron_G2-v1",
       "typename": "Opteron_G2-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -40016,8 +39929,7 @@
     {
       "name": "Opteron_G2",
       "typename": "Opteron_G2-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "Opteron_G2-v1",
       "static": false,
       "migration-safe": true,
@@ -40026,8 +39938,7 @@
     {
       "name": "Opteron_G1-v1",
       "typename": "Opteron_G1-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -40035,8 +39946,7 @@
     {
       "name": "Opteron_G1",
       "typename": "Opteron_G1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "Opteron_G1-v1",
       "static": false,
       "migration-safe": true,
@@ -40055,8 +39965,7 @@
     {
       "name": "Nehalem-v1",
       "typename": "Nehalem-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -40075,8 +39984,7 @@
     {
       "name": "Nehalem",
       "typename": "Nehalem-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "Nehalem-v1",
       "static": false,
       "migration-safe": true,
@@ -41195,8 +41103,7 @@
     {
       "name": "Conroe-v1",
       "typename": "Conroe-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -41204,8 +41111,7 @@
     {
       "name": "Conroe",
       "typename": "Conroe-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "Conroe-v1",
       "static": false,
       "migration-safe": true,
@@ -41502,8 +41408,7 @@
     {
       "name": "486-v1",
       "typename": "486-v1-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "static": false,
       "migration-safe": true,
       "deprecated": false
@@ -41511,8 +41416,7 @@
     {
       "name": "486",
       "typename": "486-x86_64-cpu",
-      "unavailable-features": [
-      ],
+      "unavailable-features": [],
       "alias-of": "486-v1",
       "static": false,
       "migration-safe": true,

diff --git a/tests/qemucapabilitiesnumbering.c b/tests/qemucapabilitiesnumbering.c
index 6f33321e17234fbbe19e215f8f2bc80166091f49..2aabdf72c7ba88804807d23bbf6a66d61db2cc37 100644 (file)
--- a/tests/qemucapabilitiesnumbering.c
+++ b/tests/qemucapabilitiesnumbering.c
@@ -137,10 +137,32 @@ printLineSkipEmpty(const char *p,
                    virBuffer *buf)
 {
     for (; *p; p++) {
-        if (p[0] == '\n' && p[1] == '\n')
-            continue;
-
         virBufferAddChar(buf, *p);
+
+        /* YAJL formats empty objects and arrays in a weird way:
+         *
+         * {
+         *   "emptyarray": [
+         *
+         *   ],
+         *   "emptyobject": {
+         *
+         *   }
+         * }
+         *
+         * We want to use empty lines to separate commands and replies as
+         * well as be compatible with python's 'json.dump' method, thus we drop
+         * any whitespace between array/object braces.
+         */
+        if ((p[0] == '{' || p[0] == '[') && p[1] == '\n') {
+            const char *l = p + 1;
+
+            while (*l && g_ascii_isspace(*l))
+                l++;
+
+            if (*l == '}' || *l == ']')
+                p = l - 1;
+        }
     }
 }
 

diff --git a/tests/qemucapsprobemock.c b/tests/qemucapsprobemock.c
index 0263b0ad01ddb35dcdd9090eae2c8830b6cfda51..f4e37ac83b93dae250f46d16dc8b78fe1a8ffa7f 100644 (file)
--- a/tests/qemucapsprobemock.c
+++ b/tests/qemucapsprobemock.c
@@ -45,10 +45,32 @@ printLineSkipEmpty(const char *line,
     const char *p;
 
     for (p = line; *p; p++) {
-        if (p[0] == '\n' && p[1] == '\n')
-            continue;
-
         fputc(*p, fp);
+
+        /* YAJL formats empty objects and arrays in a weird way:
+         *
+         * {
+         *   "emptyarray": [
+         *
+         *   ],
+         *   "emptyobject": {
+         *
+         *   }
+         * }
+         *
+         * We want to use empty lines to separate commands and replies as
+         * well as be compatible with python's 'json.dump' method, thus we drop
+         * any whitespace between array/object braces.
+         */
+        if ((p[0] == '{' || p[0] == '[') && p[1] == '\n') {
+            const char *l = p + 1;
+
+            while (*l && g_ascii_isspace(*l))
+                l++;
+
+            if (*l == '}' || *l == ']')
+                p = l - 1;
+        }
     }
 }