9:06 a.m.
We have some early replies that don't quite match with how
QEMU 2.12.0 as released behaves.
Signed-off-by: Andrea Bolognani <abologna(a)redhat.com>
---
.../caps_2.12.0.aarch64.replies | 165 ++++++++++++------
.../caps_2.12.0.aarch64.xml | 4 +-
2 files changed, 109 insertions(+), 60 deletions(-)
diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.replies
b/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.replies
index 7a3d0fe0e4..c4d9c42d72 100644
--- a/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.replies
+++ b/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.replies
@@ -17,11 +17,11 @@
{
"return": {
"qemu": {
- "micro": 90,
- "minor": 11,
+ "micro": 0,
+ "minor": 12,
"major": 2
},
- "package": "v2.12.0-rc0"
+ "package": "v2.12.0"
},
"id": "libvirt-2"
}
@@ -4268,29 +4268,24 @@
{
"return": [
{
- "name": "serial",
- "type": "str"
+ "name": "min_io_size",
+ "type": "uint16"
},
{
- "name": "port_index",
- "type": "uint16"
+ "name": "secs",
+ "type": "uint32"
},
{
- "name": "dpofua",
+ "name": "removable",
"description": "on/off",
"type": "bool"
},
{
- "name": "bootindex",
- "type": "int32"
- },
- {
- "name": "logical_block_size",
- "description": "A power of two between 512 and 32768",
- "type": "uint16"
+ "name": "channel",
+ "type": "uint32"
},
{
- "name": "discard_granularity",
+ "name": "heads",
"type": "uint32"
},
{
@@ -4298,72 +4293,80 @@
"type": "uint32"
},
{
- "name": "max_unmap_size",
- "type": "uint64"
+ "name": "dpofua",
+ "description": "on/off",
+ "type": "bool"
},
{
- "name": "drive",
- "description": "Node name or ID of a block device to use as a
backend",
+ "name": "ver",
"type": "str"
},
{
- "name": "port_wwn",
- "type": "uint64"
- },
- {
- "name": "write-cache",
- "description": "on/off/auto",
- "type": "OnOffAuto"
+ "name": "scsi-id",
+ "type": "uint32"
},
{
- "name": "share-rw",
- "type": "bool"
+ "name": "cyls",
+ "type": "uint32"
},
{
- "name": "opt_io_size",
- "type": "uint32"
+ "name": "logical_block_size",
+ "description": "A power of two between 512 and 32768",
+ "type": "uint16"
},
{
- "name": "min_io_size",
+ "name": "rotation_rate",
"type": "uint16"
},
{
- "name": "product",
+ "name": "drive",
+ "description": "Node name or ID of a block device to use as a
backend",
"type": "str"
},
{
- "name": "scsi-id",
- "type": "uint32"
+ "name": "scsi_version",
+ "type": "int32"
},
{
- "name": "channel",
+ "name": "werror",
+ "description": "Error handling policy,
report/ignore/enospc/stop/auto",
+ "type": "BlockdevOnError"
+ },
+ {
+ "name": "discard_granularity",
"type": "uint32"
},
{
- "name": "vendor",
- "type": "str"
+ "name": "port_wwn",
+ "type": "uint64"
},
{
- "name": "wwn",
+ "name": "max_unmap_size",
"type": "uint64"
},
{
- "name": "werror",
+ "name": "rerror",
"description": "Error handling policy,
report/ignore/enospc/stop/auto",
"type": "BlockdevOnError"
},
{
- "name": "removable",
- "description": "on/off",
+ "name": "max_io_size",
+ "type": "uint64"
+ },
+ {
+ "name": "wwn",
+ "type": "uint64"
+ },
+ {
+ "name": "share-rw",
"type": "bool"
},
{
- "name": "rerror",
- "description": "Error handling policy,
report/ignore/enospc/stop/auto",
- "type": "BlockdevOnError"
+ "name": "product",
+ "type": "str"
},
{
- "name": "ver",
+ "name": "vendor",
"type": "str"
},
{
@@ -4372,8 +4375,25 @@
"type": "uint16"
},
{
- "name": "max_io_size",
- "type": "uint64"
+ "name": "port_index",
+ "type": "uint16"
+ },
+ {
+ "name": "bootindex",
+ "type": "int32"
+ },
+ {
+ "name": "serial",
+ "type": "str"
+ },
+ {
+ "name": "write-cache",
+ "description": "on/off/auto",
+ "type": "OnOffAuto"
+ },
+ {
+ "name": "opt_io_size",
+ "type": "uint32"
}
],
"id": "libvirt-14"
@@ -4393,6 +4413,10 @@
"name": "serial",
"type": "str"
},
+ {
+ "name": "secs",
+ "type": "uint32"
+ },
{
"name": "logical_block_size",
"description": "A power of two between 512 and 32768",
@@ -4402,14 +4426,22 @@
"name": "discard_granularity",
"type": "uint32"
},
+ {
+ "name": "bootindex",
+ "type": "int32"
+ },
+ {
+ "name": "rotation_rate",
+ "type": "uint16"
+ },
{
"name": "drive",
"description": "Node name or ID of a block device to use as a
backend",
"type": "str"
},
{
- "name": "bootindex",
- "type": "int32"
+ "name": "heads",
+ "type": "uint32"
},
{
"name": "write-cache",
@@ -4432,6 +4464,11 @@
"name": "unit",
"type": "uint32"
},
+ {
+ "name": "bios-chs-trans",
+ "description": "Logical CHS translation algorithm,
auto/none/lba/large/rechs",
+ "type": "BiosAtaTranslation"
+ },
{
"name": "wwn",
"type": "uint64"
@@ -4458,6 +4495,10 @@
"name": "physical_block_size",
"description": "A power of two between 512 and 32768",
"type": "uint16"
+ },
+ {
+ "name": "cyls",
+ "type": "uint32"
}
],
"id": "libvirt-15"
@@ -5287,25 +5328,29 @@
"type": "HostMemPolicy"
},
{
- "name": "share",
+ "name": "dump",
"type": "bool"
},
{
- "name": "host-nodes",
- "type": "int"
+ "name": "share",
+ "type": "bool"
},
{
"name": "prealloc",
"type": "bool"
},
{
- "name": "dump",
- "type": "bool"
+ "name": "size",
+ "type": "int"
},
{
- "name": "size",
+ "name": "host-nodes",
"type": "int"
},
+ {
+ "name": "id",
+ "type": "string"
+ },
{
"name": "merge",
"type": "bool"
@@ -6682,6 +6727,10 @@
},
{
"parameters": [
+ {
+ "name": "x-oob",
+ "type": "boolean"
+ },
{
"name": "pretty",
"type": "boolean"
@@ -14838,9 +14887,9 @@
"type": "int"
},
{
- "name": "static",
+ "name": "preallocation",
"default": null,
- "type": "bool"
+ "type": "356"
}
],
"meta-type": "object"
diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml
b/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml
index 140da91b86..614fd14fb1 100644
--- a/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml
@@ -153,10 +153,10 @@
<flag name='memory-backend-memfd.hugetlb'/>
<flag name='iothread.poll-max-ns'/>
<flag name='memory-backend-file.align'/>
- <version>2011090</version>
+ <version>2012000</version>
<kvmVersion>0</kvmVersion>
<microcodeVersion>61700807</microcodeVersion>
- <package>v2.12.0-rc0</package>
+ <package>v2.12.0</package>
<arch>aarch64</arch>
<cpu type='kvm' name='pxa262'/>
<cpu type='kvm' name='pxa270-a0'/>
--
2.21.0