[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 3/9] vhost-vdpa: remove the unnecessary assert(s->vhost_net)
From: |
Jason Wang |
Subject: |
[PATCH 3/9] vhost-vdpa: remove the unnecessary assert(s->vhost_net) |
Date: |
Mon, 31 Aug 2020 16:27:31 +0800 |
vhost_vdpa_add() can fail before s->vhost_net is set and
net_vhost_vdpa_init() can report error. So there's no need for this
assert. Let's remove it.
Signed-off-by: Jason Wang <jasowang@redhat.com>
---
net/vhost-vdpa.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net/vhost-vdpa.c b/net/vhost-vdpa.c
index b7221beaa1..c4568b885e 100644
--- a/net/vhost-vdpa.c
+++ b/net/vhost-vdpa.c
@@ -190,7 +190,7 @@ static int net_vhost_vdpa_init(NetClientState *peer, const
char *device,
}
s->vhost_vdpa.device_fd = vdpa_device_fd;
ret = vhost_vdpa_add(nc, (void *)&s->vhost_vdpa);
- assert(s->vhost_net);
+
return ret;
}
--
2.20.1
- [PATCH 0/9] refine vhost-vdpa initialization, Jason Wang, 2020/08/31
- [PATCH 1/9] vhost-vdpa: remove the default devname, Jason Wang, 2020/08/31
- [PATCH 2/9] vhost-vdpa: mandate vhostdev, Jason Wang, 2020/08/31
- [PATCH 3/9] vhost-vdpa: remove the unnecessary assert(s->vhost_net),
Jason Wang <=
- [PATCH 4/9] vhost-vdpa: refine info string, Jason Wang, 2020/08/31
- [PATCH 5/9] vhost-vdpa: remove the unnecessary initialization, Jason Wang, 2020/08/31
- [PATCH 6/9] vhost-vdpa: remove the unnecessary queue index assignment, Jason Wang, 2020/08/31
- [PATCH 7/9] vhost-vdpa: squash net_vhost_vdpa_init() into net_init_vhost_vdpa(), Jason Wang, 2020/08/31
- [PATCH 8/9] vhost-vdpa: add accurate error string when fail to open vhost vDPA device, Jason Wang, 2020/08/31
- [PATCH 9/9] vhost-vdpa: allow pre-opend file descriptor, Jason Wang, 2020/08/31