[libvirt] [PATCH] S390: Re-enable capability probing for virtio devices.
Since we switched to QMP probing, the object types are spelled out explicitly, i.e. virtio-net-pci. This has effectively disabled the capability detection of s390 virtio devices. The trivial fix is to add the s390 virtio types explicitly to qemuCapsObjectProps. Signed-off-by: Viktor Mihajlovski <mihajlov@linux.vnet.ibm.com> --- src/qemu/qemu_capabilities.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index a6ac169..a705a53 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -1400,6 +1400,10 @@ static struct qemuCapsObjectTypeProps qemuCapsObjectProps[] = { ARRAY_CARDINALITY(qemuCapsObjectPropsVirtioBlk) }, { "virtio-net-pci", qemuCapsObjectPropsVirtioNet, ARRAY_CARDINALITY(qemuCapsObjectPropsVirtioNet) }, + { "virtio-blk-s390", qemuCapsObjectPropsVirtioBlk, + ARRAY_CARDINALITY(qemuCapsObjectPropsVirtioBlk) }, + { "virtio-net-s390", qemuCapsObjectPropsVirtioNet, + ARRAY_CARDINALITY(qemuCapsObjectPropsVirtioNet) }, { "pci-assign", qemuCapsObjectPropsPciAssign, ARRAY_CARDINALITY(qemuCapsObjectPropsPciAssign) }, { "kvm-pci-assign", qemuCapsObjectPropsPciAssign, -- 1.7.9.5
On Fri, Dec 21, 2012 at 10:16:12AM +0100, Viktor Mihajlovski wrote:
Since we switched to QMP probing, the object types are spelled out explicitly, i.e. virtio-net-pci. This has effectively disabled the capability detection of s390 virtio devices. The trivial fix is to add the s390 virtio types explicitly to qemuCapsObjectProps.
Signed-off-by: Viktor Mihajlovski <mihajlov@linux.vnet.ibm.com> --- src/qemu/qemu_capabilities.c | 4 ++++ 1 file changed, 4 insertions(+)
diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index a6ac169..a705a53 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -1400,6 +1400,10 @@ static struct qemuCapsObjectTypeProps qemuCapsObjectProps[] = { ARRAY_CARDINALITY(qemuCapsObjectPropsVirtioBlk) }, { "virtio-net-pci", qemuCapsObjectPropsVirtioNet, ARRAY_CARDINALITY(qemuCapsObjectPropsVirtioNet) }, + { "virtio-blk-s390", qemuCapsObjectPropsVirtioBlk, + ARRAY_CARDINALITY(qemuCapsObjectPropsVirtioBlk) }, + { "virtio-net-s390", qemuCapsObjectPropsVirtioNet, + ARRAY_CARDINALITY(qemuCapsObjectPropsVirtioNet) }, { "pci-assign", qemuCapsObjectPropsPciAssign, ARRAY_CARDINALITY(qemuCapsObjectPropsPciAssign) }, { "kvm-pci-assign", qemuCapsObjectPropsPciAssign,
ACK, sorry about causing that regression. Daniel -- |: http://berrange.com -o- http://www.flickr.com/photos/dberrange/ :| |: http://libvirt.org -o- http://virt-manager.org :| |: http://autobuild.org -o- http://search.cpan.org/~danberr/ :| |: http://entangle-photo.org -o- http://live.gnome.org/gtk-vnc :|
On 12/21/2012 10:57 AM, Daniel P. Berrange wrote:
ACK, sorry about causing that regression.
Daniel
never mind, the new structure is so much cleaner now. Would you also be so kind to push the patch (if not done already)? Thanks and a Happy New Year to All! (Or Happy Doomsday, if preferred ;-) -- Mit freundlichen Grüßen/Kind Regards Viktor Mihajlovski IBM Deutschland Research & Development GmbH Vorsitzender des Aufsichtsrats: Martina Köderitz Geschäftsführung: Dirk Wittkopp Sitz der Gesellschaft: Böblingen Registergericht: Amtsgericht Stuttgart, HRB 243294
On 12/21/2012 05:36 AM, Viktor Mihajlovski wrote:
On 12/21/2012 10:57 AM, Daniel P. Berrange wrote:
ACK, sorry about causing that regression.
Daniel
never mind, the new structure is so much cleaner now. Would you also be so kind to push the patch (if not done already)?
Done.
Thanks and a Happy New Year to All! (Or Happy Doomsday, if preferred ;-)
I'll echo those warm holiday wishes to all the list readers :) -- Eric Blake eblake redhat com +1-919-301-3266 Libvirt virtualization library http://libvirt.org
participants (3)
-
Daniel P. Berrange -
Eric Blake -
Viktor Mihajlovski