On Thu, 20 Nov 2014 17:03:05 +0800 Jason Wang <[email protected]> wrote:
> We currently trigger BUG when VIRTIO_NET_F_CTRL_VQ > is not set but one of features depending on it is. > That's not a friendly way to report errors to > hypervisors. > Let's check, and fail probe instead. > > Cc: Rusty Russell <[email protected]> > Cc: Cornelia Huck <[email protected]> > Cc: Wanlong Gao <[email protected]> > Signed-off-by: Michael S. Tsirkin <[email protected]> > Signed-off-by: Jason Wang <[email protected]> > +static bool virtnet_validate_features(struct virtio_device *vdev) > +{ > + if (!virtio_has_feature(vdev, VIRTIO_NET_F_CTRL_VQ) && > + (VIRTNET_FAIL_ON(vdev, VIRTIO_NET_F_CTRL_RX, > + "VIRTIO_NET_F_CTRL_VQ") || > + VIRTNET_FAIL_ON(vdev, VIRTIO_NET_F_CTRL_VLAN, > + "VIRTIO_NET_F_CTRL_VQ") || > + VIRTNET_FAIL_ON(vdev, VIRTIO_NET_F_GUEST_ANNOUNCE, > + "VIRTIO_NET_F_CTRL_VQ") || > + VIRTNET_FAIL_ON(vdev, VIRTIO_NET_F_MQ, "VIRTIO_NET_F_CTRL_VQ") || > + VIRTNET_FAIL_ON(vdev, VIRTIO_NET_F_CTRL_MAC_ADDR, > + "VIRTIO_NET_F_CTRL_VQ"))) { > + return false; > + } > + > + return true; > +} I still think it may make sense to print all incorrectly set bits, but let's just fix the BUG() trigger for now. Acked-by: Cornelia Huck <[email protected]> -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
