On Thu, Jun 1, 2023 at 3:49 PM Hawkins Jiawei <yin31...@gmail.com> wrote:
>
> We can use virtio_vdev_has_feature() instead of manually
> accessing the features.
>
> Signed-off-by: Hawkins Jiawei <yin31...@gmail.com>
Acked-by: Eugenio Pérez <epere...@redhat.com>
> ---
> net/vhost-vdpa.c | 6 ++----
> 1 file changed, 2 insertions(+), 4 deletions(-)
>
> diff --git a/net/vhost-vdpa.c b/net/vhost-vdpa.c
> index 37cdc84562..e907a3c792 100644
> --- a/net/vhost-vdpa.c
> +++ b/net/vhost-vdpa.c
> @@ -643,8 +643,7 @@ static ssize_t vhost_vdpa_net_load_cmd(VhostVDPAState *s,
> uint8_t class,
>
> static int vhost_vdpa_net_load_mac(VhostVDPAState *s, const VirtIONet *n)
> {
> - uint64_t features = n->parent_obj.guest_features;
> - if (features & BIT_ULL(VIRTIO_NET_F_CTRL_MAC_ADDR)) {
> + if (virtio_vdev_has_feature(&n->parent_obj, VIRTIO_NET_F_CTRL_MAC_ADDR))
> {
> ssize_t dev_written = vhost_vdpa_net_load_cmd(s, VIRTIO_NET_CTRL_MAC,
>
> VIRTIO_NET_CTRL_MAC_ADDR_SET,
> n->mac, sizeof(n->mac));
> @@ -662,10 +661,9 @@ static int vhost_vdpa_net_load_mq(VhostVDPAState *s,
> const VirtIONet *n)
> {
> struct virtio_net_ctrl_mq mq;
> - uint64_t features = n->parent_obj.guest_features;
> ssize_t dev_written;
>
> - if (!(features & BIT_ULL(VIRTIO_NET_F_MQ))) {
> + if (!virtio_vdev_has_feature(&n->parent_obj, VIRTIO_NET_F_MQ)) {
> return 0;
> }
>
> --
> 2.25.1
>
