[libvirt] [PATCH] S390: Re-enable capability probing for virtio devices.

[Daniel P. Berrange]

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 at 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 :|