| Message ID | 20210315163450.254396-11-sgarzare@redhat.com |
|---|---|
| State | New |
| Headers | show |
| Series | vdpa: add vdpa simulator for block device | expand |
在 2021/3/16 上午12:34, Stefano Garzarella 写道: > From: Xie Yongji <xieyongji@bytedance.com> > > Since the config checks are done by the vDPA drivers, we can remove the > virtio-net restriction and we should be able to support all kinds of > virtio devices. > > <linux/virtio_net.h> is not needed anymore, but we need to include > <linux/slab.h> to avoid compilation failures. > > Signed-off-by: Xie Yongji <xieyongji@bytedance.com> > Signed-off-by: Stefano Garzarella <sgarzare@redhat.com> Acked-by: Jason Wang <jasowang@redhat.com> > --- > drivers/vhost/vdpa.c | 6 +----- > 1 file changed, 1 insertion(+), 5 deletions(-) > > diff --git a/drivers/vhost/vdpa.c b/drivers/vhost/vdpa.c > index 7ae4080e57d8..850ed4b62942 100644 > --- a/drivers/vhost/vdpa.c > +++ b/drivers/vhost/vdpa.c > @@ -16,12 +16,12 @@ > #include <linux/cdev.h> > #include <linux/device.h> > #include <linux/mm.h> > +#include <linux/slab.h> > #include <linux/iommu.h> > #include <linux/uuid.h> > #include <linux/vdpa.h> > #include <linux/nospec.h> > #include <linux/vhost.h> > -#include <linux/virtio_net.h> > > #include "vhost.h" > > @@ -1018,10 +1018,6 @@ static int vhost_vdpa_probe(struct vdpa_device *vdpa) > int minor; > int r; > > - /* Currently, we only accept the network devices. */ > - if (ops->get_device_id(vdpa) != VIRTIO_ID_NET) > - return -ENOTSUPP; > - > v = kzalloc(sizeof(*v), GFP_KERNEL | __GFP_RETRY_MAYFAIL); > if (!v) > return -ENOMEM;
diff --git a/drivers/vhost/vdpa.c b/drivers/vhost/vdpa.c index 7ae4080e57d8..850ed4b62942 100644 --- a/drivers/vhost/vdpa.c +++ b/drivers/vhost/vdpa.c @@ -16,12 +16,12 @@ #include <linux/cdev.h> #include <linux/device.h> #include <linux/mm.h> +#include <linux/slab.h> #include <linux/iommu.h> #include <linux/uuid.h> #include <linux/vdpa.h> #include <linux/nospec.h> #include <linux/vhost.h> -#include <linux/virtio_net.h> #include "vhost.h" @@ -1018,10 +1018,6 @@ static int vhost_vdpa_probe(struct vdpa_device *vdpa) int minor; int r; - /* Currently, we only accept the network devices. */ - if (ops->get_device_id(vdpa) != VIRTIO_ID_NET) - return -ENOTSUPP; - v = kzalloc(sizeof(*v), GFP_KERNEL | __GFP_RETRY_MAYFAIL); if (!v) return -ENOMEM;