[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v6 21/33] vhost-net: vhost_migration_done is vhost-u
From: |
marcandre . lureau |
Subject: |
[Qemu-devel] [PATCH v6 21/33] vhost-net: vhost_migration_done is vhost-user specific |
Date: |
Wed, 27 Jul 2016 01:15:15 +0400 |
From: Marc-André Lureau <address@hidden>
Either the callback is mandatory to implement, in which case an assert()
is more appropriate, or it's not and we can't tell much whether the
function should fail or not (given it's name, I guess it should silently
success by default). Instead, make the implementation mandatory and
vhost-user specific to be more clear about its usage.
Signed-off-by: Marc-André Lureau <address@hidden>
---
hw/net/vhost_net.c | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
diff --git a/hw/net/vhost_net.c b/hw/net/vhost_net.c
index 54cf015..dd41a8e 100644
--- a/hw/net/vhost_net.c
+++ b/hw/net/vhost_net.c
@@ -383,13 +383,11 @@ void vhost_net_cleanup(struct vhost_net *net)
int vhost_net_notify_migration_done(struct vhost_net *net, char* mac_addr)
{
const VhostOps *vhost_ops = net->dev.vhost_ops;
- int r = -1;
- if (vhost_ops->vhost_migration_done) {
- r = vhost_ops->vhost_migration_done(&net->dev, mac_addr);
- }
+ assert(vhost_ops->backend_type == VHOST_BACKEND_TYPE_USER);
+ assert(vhost_ops->vhost_migration_done);
- return r;
+ return vhost_ops->vhost_migration_done(&net->dev, mac_addr);
}
bool vhost_net_virtqueue_pending(VHostNetState *net, int idx)
--
2.9.0
- [Qemu-devel] [PATCH v6 11/33] vhost: do not assert() on vhost_ops failure, (continued)
- [Qemu-devel] [PATCH v6 11/33] vhost: do not assert() on vhost_ops failure, marcandre . lureau, 2016/07/26
- [Qemu-devel] [PATCH v6 12/33] vhost: add missing VHOST_OPS_DEBUG, marcandre . lureau, 2016/07/26
- [Qemu-devel] [PATCH v6 14/33] qemu-char: fix qemu_chr_fe_set_msgfds() crash when disconnected, marcandre . lureau, 2016/07/26
- [Qemu-devel] [PATCH v6 13/33] vhost: use error_report() instead of fprintf(stderr, ...), marcandre . lureau, 2016/07/26
- [Qemu-devel] [PATCH v6 15/33] vhost-user: call set_msgfds unconditionally, marcandre . lureau, 2016/07/26
- [Qemu-devel] [PATCH v6 16/33] vhost-user: check qemu_chr_fe_set_msgfds() return value, marcandre . lureau, 2016/07/26
- [Qemu-devel] [PATCH v6 17/33] vhost-user: check vhost_user_{read, write}() return value, marcandre . lureau, 2016/07/26
- [Qemu-devel] [PATCH v6 18/33] vhost-user: keep vhost_net after a disconnection, marcandre . lureau, 2016/07/26
- [Qemu-devel] [PATCH v6 19/33] vhost-user: add get_vhost_net() assertions, marcandre . lureau, 2016/07/26
- [Qemu-devel] [PATCH v6 20/33] Revert "vhost-net: do not crash if backend is not present", marcandre . lureau, 2016/07/26
- [Qemu-devel] [PATCH v6 21/33] vhost-net: vhost_migration_done is vhost-user specific,
marcandre . lureau <=
- [Qemu-devel] [PATCH v6 22/33] vhost: add assert() to check runtime behaviour, marcandre . lureau, 2016/07/26
- [Qemu-devel] [PATCH v6 23/33] char: add chr_wait_connected callback, marcandre . lureau, 2016/07/26
- [Qemu-devel] [PATCH v6 24/33] char: add and use tcp_chr_wait_connected, marcandre . lureau, 2016/07/26
- [Qemu-devel] [PATCH v6 25/33] vhost-user: wait until backend init is completed, marcandre . lureau, 2016/07/26
- [Qemu-devel] [PATCH v6 26/33] tests: plug some leaks in virtio-net-test, marcandre . lureau, 2016/07/26
- [Qemu-devel] [PATCH v6 27/33] tests: fix vhost-user-test leak, marcandre . lureau, 2016/07/26
- [Qemu-devel] [PATCH v6 29/33] tests: add a simple /vhost-user/multiqueue test, marcandre . lureau, 2016/07/26
- [Qemu-devel] [PATCH v6 28/33] tests: add /vhost-user/connect-fail test, marcandre . lureau, 2016/07/26
- [Qemu-devel] [PATCH v6 30/33] vhost-user: add error report in vhost_user_write(), marcandre . lureau, 2016/07/26