From: Andrea Bolognani <abologna(a)redhat.com>
Sync up to the released version of qemu.
Signed-off-by: Peter Krempa <pkrempa(a)redhat.com>
---
.../qemucapabilitiesdata/caps_2.6.0.ppc64le.replies | 21 +++++++++++----------
tests/qemucapabilitiesdata/caps_2.6.0.ppc64le.xml | 4 +++-
2 files changed, 14 insertions(+), 11 deletions(-)
diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.ppc64le.replies
b/tests/qemucapabilitiesdata/caps_2.6.0.ppc64le.replies
index 1835b6d..1465413 100644
--- a/tests/qemucapabilitiesdata/caps_2.6.0.ppc64le.replies
+++ b/tests/qemucapabilitiesdata/caps_2.6.0.ppc64le.replies
@@ -2,8 +2,8 @@
"QMP": {
"version": {
"qemu": {
- "micro": 94,
- "minor": 5,
+ "micro": 0,
+ "minor": 6,
"major": 2
},
"package": ""
@@ -22,8 +22,8 @@
{
"return": {
"qemu": {
- "micro": 94,
- "minor": 5,
+ "micro": 0,
+ "minor": 6,
"major": 2
},
"package": ""
@@ -451,7 +451,7 @@
{
"return": {
- "fd": 13,
+ "fd": 14,
"fdset-id": 0
},
"id": "libvirt-5"
@@ -786,6 +786,9 @@
"name": "401F2-powerpc64-cpu"
},
{
+ "name": "ccid-card-emulated"
+ },
+ {
"name": "pseries-2.1-machine"
},
{
@@ -1383,6 +1386,9 @@
"name": "PCIE"
},
{
+ "name": "ccid-card-passthru"
+ },
+ {
"name": "750cx_v2.1-powerpc64-cpu"
},
{
@@ -3563,11 +3569,6 @@
"type": "bool"
},
{
- "name": "stats",
- "description": "on/off",
- "type": "bool"
- },
- {
"name": "max_outputs",
"type": "uint32"
}
diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.ppc64le.xml
b/tests/qemucapabilitiesdata/caps_2.6.0.ppc64le.xml
index e63e7c1..721bdee 100644
--- a/tests/qemucapabilitiesdata/caps_2.6.0.ppc64le.xml
+++ b/tests/qemucapabilitiesdata/caps_2.6.0.ppc64le.xml
@@ -21,6 +21,8 @@
<flag name='boot-index'/>
<flag name='hda-duplex'/>
<flag name='drive-aio'/>
+ <flag name='ccid-emulated'/>
+ <flag name='ccid-passthru'/>
<flag name='chardev-spicevmc'/>
<flag name='virtio-tx-alg'/>
<flag name='pci-multifunction'/>
@@ -153,7 +155,7 @@
<flag name='smm'/>
<flag name='virtio-pci-disable-legacy'/>
<flag name='virtio-vga'/>
- <version>2005094</version>
+ <version>2006000</version>
<kvmVersion>0</kvmVersion>
<package></package>
<arch>ppc64</arch>
--
2.10.0