Messages in this thread | | | Subject | Re: [PATCH v2 07/17] vdpa_sim: add device id field in vdpasim_dev_attr | From | Jason Wang <> | Date | Mon, 30 Nov 2020 11:10:38 +0800 |
| |
On 2020/11/26 下午10:49, Stefano Garzarella wrote: > Remove VDPASIM_DEVICE_ID macro and add 'id' field in vdpasim_dev_attr, > that will be returned by vdpasim_get_device_id(). > > Use VIRTIO_ID_NET for vDPA-net simulator device id. > > Co-developed-by: Max Gurtovoy <mgurtovoy@nvidia.com> > Signed-off-by: Max Gurtovoy <mgurtovoy@nvidia.com> > Signed-off-by: Stefano Garzarella <sgarzare@redhat.com> > --- > drivers/vdpa/vdpa_sim/vdpa_sim.c | 7 +++++-- > 1 file changed, 5 insertions(+), 2 deletions(-)
Acked-by: Jason Wang <jasowang@redhat.com>
> > diff --git a/drivers/vdpa/vdpa_sim/vdpa_sim.c b/drivers/vdpa/vdpa_sim/vdpa_sim.c > index f98262add0e1..393b54a9f0e4 100644 > --- a/drivers/vdpa/vdpa_sim/vdpa_sim.c > +++ b/drivers/vdpa/vdpa_sim/vdpa_sim.c > @@ -44,7 +44,6 @@ struct vdpasim_virtqueue { > > #define VDPASIM_QUEUE_ALIGN PAGE_SIZE > #define VDPASIM_QUEUE_MAX 256 > -#define VDPASIM_DEVICE_ID 0x1 > #define VDPASIM_VENDOR_ID 0 > #define VDPASIM_IOTLB_LIMIT 0 /* unlimited */ > #define VDPASIM_VQ_NUM 0x2 > @@ -57,6 +56,7 @@ static u64 vdpasim_features = (1ULL << VIRTIO_F_ANY_LAYOUT) | > > struct vdpasim_dev_attr { > int nvqs; > + u32 id; > }; > > /* State of each vdpasim device */ > @@ -536,7 +536,9 @@ static u16 vdpasim_get_vq_num_max(struct vdpa_device *vdpa) > > static u32 vdpasim_get_device_id(struct vdpa_device *vdpa) > { > - return VDPASIM_DEVICE_ID; > + struct vdpasim *vdpasim = vdpa_to_sim(vdpa); > + > + return vdpasim->dev_attr.id; > } > > static u32 vdpasim_get_vendor_id(struct vdpa_device *vdpa) > @@ -719,6 +721,7 @@ static int __init vdpasim_dev_init(void) > { > struct vdpasim_dev_attr dev_attr = {}; > > + dev_attr.id = VIRTIO_ID_NET; > dev_attr.nvqs = VDPASIM_VQ_NUM; > > vdpasim_dev = vdpasim_create(&dev_attr);
| |