Re: [Qemu-devel] [PATCH RFC v5 14/19] s390x/virtio-ccw: enable virtio 1.0

[Cornelia Huck <cornelia.huck@de.ibm.com>]

On Tue, 9 Dec 2014 15:46:46 +0200
"Michael S. Tsirkin" <mst@redhat.com> wrote:

> On Tue, Dec 02, 2014 at 02:00:22PM +0100, Cornelia Huck wrote:
> > virtio-ccw should now have everything in place to operate virtio 1.0
> > devices, so let's enable revision 1.
> > 
> > Signed-off-by: Cornelia Huck <cornelia.huck@de.ibm.com>
> 
> Looks like this will allow revision 1 for all devices,
> we only want this for virtio 1 devices.
> 
> The following should fix it I think:
> 
> Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
> 
> 

> @@ -104,6 +101,12 @@ struct VirtioCcwDevice {
>      uint64_t ind_bit;
>  };
> 
> +/* The maximum virtio revision we support. */
> +static int virtio_ccw_rev_max(VirtioCcwDevice *dev)

Make this "static inline int" and I'm fine with this :)

> +{
> +        return dev->host_features & (1ULL << VIRTIO_F_VERSION_1) ? 1 : 0;
> +}
> +
>  /* virtual css bus type */
>  typedef struct VirtualCssBus {
>      BusState parent_obj;