3:20 a.m.
Peter Krempa (2):
test: qemucaps: Bump 2.8.0 state to current master
qemu: capabilities: Add gluster.debug_level detection for 2.8.0+
src/qemu/qemu_capabilities.c | 1 +
tests/qemucapabilitiesdata/caps_2.8.0.x86_64.replies | 12 ++++++------
tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml | 5 +++--
3 files changed, 10 insertions(+), 8 deletions(-)
--
2.10.2
3:20 a.m.
New subject: [libvirt] [PATCH 1/2] test: qemucaps: Bump 2.8.0 state to current master
Qemu decided to change a parameter name in rc-state which was not
captured by the 2.8.0 data. Bump it to current version.
---
tests/qemucapabilitiesdata/caps_2.8.0.x86_64.replies | 12 ++++++------
tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml | 4 ++--
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.replies
b/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.replies
index 56281cd..60cb771 100644
--- a/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.replies
+++ b/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.replies
@@ -2,11 +2,11 @@
"QMP": {
"version": {
"qemu": {
- "micro": 91,
+ "micro": 93,
"minor": 7,
"major": 2
},
- "package": " (v2.8.0-rc1-dirty)"
+ "package": " (v2.8.0-rc3-dirty)"
},
"capabilities": [
]
@@ -22,11 +22,11 @@
{
"return": {
"qemu": {
- "micro": 91,
+ "micro": 93,
"minor": 7,
"major": 2
},
- "package": " (v2.8.0-rc1-dirty)"
+ "package": " (v2.8.0-rc3-dirty)"
},
"id": "libvirt-2"
}
@@ -10626,7 +10626,7 @@
"type": "[276]"
},
{
- "name": "debug-level",
+ "name": "debug",
"default": null,
"type": "int"
},
@@ -10710,7 +10710,7 @@
"type": "int"
},
{
- "name": "debug-level",
+ "name": "debug",
"default": null,
"type": "int"
}
diff --git a/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml
b/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml
index f5e467c..110865e 100644
--- a/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml
@@ -197,9 +197,9 @@
<flag name='query-qmp-schema'/>
<flag name='vhost-scsi'/>
<flag name='drive-iotune-group'/>
- <version>2007091</version>
+ <version>2007093</version>
<kvmVersion>0</kvmVersion>
- <package> (v2.8.0-rc1-dirty)</package>
+ <package> (v2.8.0-rc3-dirty)</package>
<arch>x86_64</arch>
<cpu type='kvm' name='host' usable='yes'/>
<cpu type='kvm' name='qemu64' usable='yes'/>
--
2.10.2
3:20 a.m.
New subject: [libvirt] [PATCH 2/2] qemu: capabilities: Add gluster.debug_level detection for 2.8.0+
Qemu 2.8.0+ changes arguments structure for blockdev-add in the effort
to make it finally stable. Since libvirt recently added the detection of
gluster debug support relying on the old syntax we need to add the new
as well.
---
src/qemu/qemu_capabilities.c | 1 +
tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml | 1 +
2 files changed, 2 insertions(+)
diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
index df417f2..081afc5 100644
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@@ -1725,6 +1725,7 @@ static struct virQEMUCapsStringFlags
virQEMUCapsObjectPropsUSBNECXHCI[] = {
/* see documentation for virQEMUCapsQMPSchemaGetByPath for the query format */
static struct virQEMUCapsStringFlags virQEMUCapsQMPSchemaQueries[] = {
{ "blockdev-add/arg-type/options/+gluster/debug-level",
QEMU_CAPS_GLUSTER_DEBUG_LEVEL},
+ { "blockdev-add/arg-type/+gluster/debug", QEMU_CAPS_GLUSTER_DEBUG_LEVEL},
};
struct virQEMUCapsObjectTypeProps {
diff --git a/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml
b/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml
index 110865e..9757bd2 100644
--- a/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml
@@ -195,6 +195,7 @@
<flag name='ivshmem-plain'/>
<flag name='ivshmem-doorbell'/>
<flag name='query-qmp-schema'/>
+ <flag name='gluster.debug_level'/>
<flag name='vhost-scsi'/>
<flag name='drive-iotune-group'/>
<version>2007093</version>
--
2.10.2
3:22 a.m.
On Wed, Dec 07, 2016 at 10:20:33 +0100, Peter Krempa wrote:
Peter Krempa (2):
test: qemucaps: Bump 2.8.0 state to current master
qemu: capabilities: Add gluster.debug_level detection for 2.8.0+
src/qemu/qemu_capabilities.c | 1 +
tests/qemucapabilitiesdata/caps_2.8.0.x86_64.replies | 12 ++++++------
tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml | 5 +++--
3 files changed, 10 insertions(+), 8 deletions(-)
ACK series
Jirka
2910
days inactive
2910
days old
3 comments
2 participants
participants (2)
-
Jiri Denemark -
Peter Krempa