[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v7 05/13] vhost_net should call the poll callback on
From: |
Antonios Motakis |
Subject: |
[Qemu-devel] [PATCH v7 05/13] vhost_net should call the poll callback only when it is set |
Date: |
Fri, 31 Jan 2014 18:34:34 +0100 |
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 006576d..6aa6e87 100644
--- a/hw/net/vhost_net.c
+++ b/hw/net/vhost_net.c
@@ -166,7 +166,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) {
@@ -183,7 +186,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);
@@ -204,7 +209,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);
}
--
1.8.3.2
- [Qemu-devel] [PATCH v7 00/13] Vhost and vhost-net support for userspace based backends, Antonios Motakis, 2014/01/31
- [Qemu-devel] [PATCH v7 01/13] Convert -mem-path to QemuOpts and add prealloc and share properties, Antonios Motakis, 2014/01/31
- [Qemu-devel] [PATCH v7 02/13] Add chardev API qemu_chr_fe_read_all, Antonios Motakis, 2014/01/31
- [Qemu-devel] [PATCH v7 03/13] Add chardev API qemu_chr_fe_set_msgfds, Antonios Motakis, 2014/01/31
- [Qemu-devel] [PATCH v7 04/13] Add G_IO_HUP handler for socket chardev, Antonios Motakis, 2014/01/31
- [Qemu-devel] [PATCH v7 05/13] vhost_net should call the poll callback only when it is set,
Antonios Motakis <=
- [Qemu-devel] [PATCH v7 07/13] vhost_net_init will use VhostNetOptions to get all its arguments, Antonios Motakis, 2014/01/31
- [Qemu-devel] [PATCH v7 06/13] Refactor virtio-net to use a generic get_vhost_net, Antonios Motakis, 2014/01/31
- [Qemu-devel] [PATCH v7 08/13] Add vhost_ops to the vhost_dev struct and replace all relevant ioctls, Antonios Motakis, 2014/01/31
- [Qemu-devel] [PATCH v7 09/13] Add vhost-backend and VhostBackendType, Antonios Motakis, 2014/01/31
- [Qemu-devel] [PATCH v7 10/13] Add vhost-user as a vhost backend., Antonios Motakis, 2014/01/31
- [Qemu-devel] [PATCH v7 11/13] Add new vhost-user netdev backend, Antonios Motakis, 2014/01/31
- [Qemu-devel] [PATCH v7 12/13] Add the vhost-user netdev backend to command line, Antonios Motakis, 2014/01/31
- [Qemu-devel] [PATCH v7 13/13] Add vhost-user protocol documentation, Antonios Motakis, 2014/01/31