[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v10 07/18] vhost_net should call the poll callback o
From: |
Nikolay Nikolaev |
Subject: |
[Qemu-devel] [PATCH v10 07/18] vhost_net should call the poll callback only when it is set |
Date: |
Tue, 27 May 2014 15:04:55 +0300 |
User-agent: |
StGit/0.17.1-dirty |
The poll callback needs to be called when bringing up or down
the vhost_net instance. As it is not mandatory for an NetClient
to implement it, invoke it only when it is set.
Signed-off-by: Antonios Motakis <address@hidden>
Signed-off-by: Nikolay Nikolaev <address@hidden>
---
hw/net/vhost_net.c | 13 ++++++++++---
1 file changed, 10 insertions(+), 3 deletions(-)
diff --git a/hw/net/vhost_net.c b/hw/net/vhost_net.c
index 6a9a32f..dcec0f7 100644
--- a/hw/net/vhost_net.c
+++ b/hw/net/vhost_net.c
@@ -168,7 +168,10 @@ static int vhost_net_start_one(struct vhost_net *net,
goto fail_start;
}
- net->nc->info->poll(net->nc, false);
+ if (net->nc->info->poll) {
+ net->nc->info->poll(net->nc, false);
+ }
+
qemu_set_fd_handler(net->backend, NULL, NULL, NULL);
file.fd = net->backend;
for (file.index = 0; file.index < net->dev.nvqs; ++file.index) {
@@ -185,7 +188,9 @@ fail:
int r = ioctl(net->dev.control, VHOST_NET_SET_BACKEND, &file);
assert(r >= 0);
}
- net->nc->info->poll(net->nc, true);
+ if (net->nc->info->poll) {
+ net->nc->info->poll(net->nc, true);
+ }
vhost_dev_stop(&net->dev, dev);
fail_start:
vhost_dev_disable_notifiers(&net->dev, dev);
@@ -206,7 +211,9 @@ static void vhost_net_stop_one(struct vhost_net *net,
int r = ioctl(net->dev.control, VHOST_NET_SET_BACKEND, &file);
assert(r >= 0);
}
- net->nc->info->poll(net->nc, true);
+ if (net->nc->info->poll) {
+ net->nc->info->poll(net->nc, true);
+ }
vhost_dev_stop(&net->dev, dev);
vhost_dev_disable_notifiers(&net->dev, dev);
}
- [Qemu-devel] [PATCH v10 00/18] Vhost and vhost-net support for userspace based backends, Nikolay Nikolaev, 2014/05/27
- [Qemu-devel] [PATCH v10 01/18] Add kvm_eventfds_enabled function, Nikolay Nikolaev, 2014/05/27
- [Qemu-devel] [PATCH v10 02/18] Add chardev API qemu_chr_fe_read_all, Nikolay Nikolaev, 2014/05/27
- [Qemu-devel] [PATCH v10 03/18] Add chardev API qemu_chr_fe_set_msgfds, Nikolay Nikolaev, 2014/05/27
- [Qemu-devel] [PATCH v10 04/18] Add chardev API qemu_chr_fe_get_msgfds, Nikolay Nikolaev, 2014/05/27
- [Qemu-devel] [PATCH v10 05/18] Add G_IO_HUP handler for socket chardev, Nikolay Nikolaev, 2014/05/27
- [Qemu-devel] [PATCH v10 06/18] vhost: add vhost_get_features and vhost_ack_features, Nikolay Nikolaev, 2014/05/27
- [Qemu-devel] [PATCH v10 07/18] vhost_net should call the poll callback only when it is set,
Nikolay Nikolaev <=
- [Qemu-devel] [PATCH v10 08/18] Refactor virtio-net to use generic get_vhost_net, Nikolay Nikolaev, 2014/05/27
- [Qemu-devel] [PATCH v10 09/18] vhost_net_init will use VhostNetOptions to get all its arguments, Nikolay Nikolaev, 2014/05/27
- [Qemu-devel] [PATCH v10 10/18] Add vhost_ops to vhost_dev struct and replace all relevant ioctls, Nikolay Nikolaev, 2014/05/27
- [Qemu-devel] [PATCH v10 12/18] Add vhost-user as a vhost backend., Nikolay Nikolaev, 2014/05/27
- [Qemu-devel] [PATCH v10 13/18] vhost-net: vhost-user feature bits support, Nikolay Nikolaev, 2014/05/27
- [Qemu-devel] [PATCH v10 14/18] Add new vhost-user netdev backend, Nikolay Nikolaev, 2014/05/27
- [Qemu-devel] [PATCH v10 15/18] Add the vhost-user netdev backend to the command line, Nikolay Nikolaev, 2014/05/27
- [Qemu-devel] [PATCH v10 16/18] Add vhost-user protocol documentation, Nikolay Nikolaev, 2014/05/27
- [Qemu-devel] [PATCH v10 17/18] libqemustub: add stubs to be able to use qemu-char.c, Nikolay Nikolaev, 2014/05/27
- [Qemu-devel] [PATCH v10 18/18] Add qtest for vhost-user, Nikolay Nikolaev, 2014/05/27