On 11/20/2014 05:48 PM, Cornelia Huck wrote: > On Thu, 20 Nov 2014 17:03:05 +0800 > Jason Wang <jasowang@xxxxxxxxxx> 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 <rusty@xxxxxxxxxxxxxxx> >> Cc: Cornelia Huck <cornelia.huck@xxxxxxxxxx> >> Cc: Wanlong Gao <gaowanlong@xxxxxxxxxxxxxx> >> Signed-off-by: Michael S. Tsirkin <mst@xxxxxxxxxx> >> Signed-off-by: Jason Wang <jasowang@xxxxxxxxxx> >> +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 <cornelia.huck@xxxxxxxxxx> > Right, will do it in the future. Thanks _______________________________________________ Virtualization mailing list Virtualization@xxxxxxxxxxxxxxxxxxxxxxxxxx https://lists.linuxfoundation.org/mailman/listinfo/virtualization