On Wed, Apr 04, 2012 at 12:19:54PM +0300, Michael S. Tsirkin wrote: > disable_cb is just an optimization: it > can not guarantee that there are no callbacks. > > I didn't yet figure out whether a callback > in freeze will trigger a bug, but disable_cb > won't address it in any case. So let's remove > the useless calls as a first step. > > Signed-off-by: Michael S. Tsirkin <mst@xxxxxxxxxx> Looks like this isn't in the 3.5 pull request - just lost in the shuffle? disable_cb is advisory so can't be relied upon. > --- > drivers/net/virtio_net.c | 5 ----- > 1 files changed, 0 insertions(+), 5 deletions(-) > > diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c > index 019da01..971931e5 100644 > --- a/drivers/net/virtio_net.c > +++ b/drivers/net/virtio_net.c > @@ -1182,11 +1182,6 @@ static int virtnet_freeze(struct virtio_device *vdev) > { > struct virtnet_info *vi = vdev->priv; > > - virtqueue_disable_cb(vi->rvq); > - virtqueue_disable_cb(vi->svq); > - if (virtio_has_feature(vi->vdev, VIRTIO_NET_F_CTRL_VQ)) > - virtqueue_disable_cb(vi->cvq); > - > netif_device_detach(vi->dev); > cancel_delayed_work_sync(&vi->refill); > > -- > 1.7.9.111.gf3fb0 -- To unsubscribe from this list: send the line "unsubscribe kvm" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html