[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH V3 09/20] tap: factor out common tap initialization
From: |
Jason Wang |
Subject: |
[Qemu-devel] [PATCH V3 09/20] tap: factor out common tap initialization |
Date: |
Tue, 29 Jan 2013 21:51:21 +0800 |
This patch factors out the common initialization of tap into a new helper
net_init_tap_one(). This will be used by multiqueue tap patches.
Signed-off-by: Jason Wang <address@hidden>
---
net/tap.c | 130 ++++++++++++++++++++++++++++++++++---------------------------
1 files changed, 73 insertions(+), 57 deletions(-)
diff --git a/net/tap.c b/net/tap.c
index eb40c42..67080f1 100644
--- a/net/tap.c
+++ b/net/tap.c
@@ -593,6 +593,73 @@ static int net_tap_init(const NetdevTapOptions *tap, int
*vnet_hdr,
return fd;
}
+static int net_init_tap_one(const NetdevTapOptions *tap, NetClientState *peer,
+ const char *model, const char *name,
+ const char *ifname, const char *script,
+ const char *downscript, const char *vhostfdname,
+ int vnet_hdr, int fd)
+{
+ TAPState *s;
+
+ s = net_tap_fd_init(peer, model, name, fd, vnet_hdr);
+ if (!s) {
+ close(fd);
+ return -1;
+ }
+
+ if (tap_set_sndbuf(s->fd, tap) < 0) {
+ return -1;
+ }
+
+ if (tap->has_fd) {
+ snprintf(s->nc.info_str, sizeof(s->nc.info_str), "fd=%d", fd);
+ } else if (tap->has_helper) {
+ snprintf(s->nc.info_str, sizeof(s->nc.info_str), "helper=%s",
+ tap->helper);
+ } else {
+ const char *downscript;
+
+ downscript = tap->has_downscript ? tap->downscript :
+ DEFAULT_NETWORK_DOWN_SCRIPT;
+
+ snprintf(s->nc.info_str, sizeof(s->nc.info_str),
+ "ifname=%s,script=%s,downscript=%s", ifname, script,
+ downscript);
+
+ if (strcmp(downscript, "no") != 0) {
+ snprintf(s->down_script, sizeof(s->down_script), "%s", downscript);
+ snprintf(s->down_script_arg, sizeof(s->down_script_arg),
+ "%s", ifname);
+ }
+ }
+
+ if (tap->has_vhost ? tap->vhost :
+ vhostfdname || (tap->has_vhostforce && tap->vhostforce)) {
+ int vhostfd;
+
+ if (tap->has_vhostfd) {
+ vhostfd = monitor_handle_fd_param(cur_mon, vhostfdname);
+ if (vhostfd == -1) {
+ return -1;
+ }
+ } else {
+ vhostfd = -1;
+ }
+
+ s->vhost_net = vhost_net_init(&s->nc, vhostfd,
+ tap->has_vhostforce && tap->vhostforce);
+ if (!s->vhost_net) {
+ error_report("vhost-net requested but could not be initialized");
+ return -1;
+ }
+ } else if (tap->has_vhostfd) {
+ error_report("vhostfd= is not valid without vhost");
+ return -1;
+ }
+
+ return 0;
+}
+
int net_init_tap(const NetClientOptions *opts, const char *name,
NetClientState *peer)
{
@@ -600,10 +667,10 @@ int net_init_tap(const NetClientOptions *opts, const char
*name,
int fd, vnet_hdr = 0;
const char *model;
- TAPState *s;
/* for the no-fd, no-helper case */
const char *script = NULL; /* suppress wrong "uninit'd use" gcc warning */
+ const char *downscript = NULL;
char ifname[128];
assert(opts->kind == NET_CLIENT_OPTIONS_KIND_TAP);
@@ -649,6 +716,8 @@ int net_init_tap(const NetClientOptions *opts, const char
*name,
} else {
script = tap->has_script ? tap->script : DEFAULT_NETWORK_SCRIPT;
+ downscript = tap->has_downscript ? tap->downscript :
+ DEFAULT_NETWORK_DOWN_SCRIPT;
fd = net_tap_init(tap, &vnet_hdr, script, ifname, sizeof ifname);
if (fd == -1) {
return -1;
@@ -657,62 +726,9 @@ int net_init_tap(const NetClientOptions *opts, const char
*name,
model = "tap";
}
- s = net_tap_fd_init(peer, model, name, fd, vnet_hdr);
- if (!s) {
- close(fd);
- return -1;
- }
-
- if (tap_set_sndbuf(s->fd, tap) < 0) {
- return -1;
- }
-
- if (tap->has_fd) {
- snprintf(s->nc.info_str, sizeof(s->nc.info_str), "fd=%d", fd);
- } else if (tap->has_helper) {
- snprintf(s->nc.info_str, sizeof(s->nc.info_str), "helper=%s",
- tap->helper);
- } else {
- const char *downscript;
-
- downscript = tap->has_downscript ? tap->downscript :
- DEFAULT_NETWORK_DOWN_SCRIPT;
-
- snprintf(s->nc.info_str, sizeof(s->nc.info_str),
- "ifname=%s,script=%s,downscript=%s", ifname, script,
- downscript);
-
- if (strcmp(downscript, "no") != 0) {
- snprintf(s->down_script, sizeof(s->down_script), "%s", downscript);
- snprintf(s->down_script_arg, sizeof(s->down_script_arg), "%s",
ifname);
- }
- }
-
- if (tap->has_vhost ? tap->vhost :
- tap->has_vhostfd || (tap->has_vhostforce && tap->vhostforce)) {
- int vhostfd;
-
- if (tap->has_vhostfd) {
- vhostfd = monitor_handle_fd_param(cur_mon, tap->vhostfd);
- if (vhostfd == -1) {
- return -1;
- }
- } else {
- vhostfd = -1;
- }
-
- s->vhost_net = vhost_net_init(&s->nc, vhostfd,
- tap->has_vhostforce && tap->vhostforce);
- if (!s->vhost_net) {
- error_report("vhost-net requested but could not be initialized");
- return -1;
- }
- } else if (tap->has_vhostfd) {
- error_report("vhostfd= is not valid without vhost");
- return -1;
- }
-
- return 0;
+ return net_init_tap_one(tap, peer, model, name, ifname, script,
+ downscript, tap->has_vhostfd ? tap->vhostfd : NULL,
+ vnet_hdr, fd);
}
VHostNetState *tap_get_vhost_net(NetClientState *nc)
--
1.7.1
- [Qemu-devel] [PATCH V3 00/20] Multiqueue virtio-net, Jason Wang, 2013/01/29
- [Qemu-devel] [PATCH V3 04/20] net: introduce qemu_find_net_clients_except(), Jason Wang, 2013/01/29
- [Qemu-devel] [PATCH V3 03/20] net: intorduce qemu_del_nic(), Jason Wang, 2013/01/29
- [Qemu-devel] [PATCH V3 01/20] net: introduce qemu_get_queue(), Jason Wang, 2013/01/29
- [Qemu-devel] [PATCH V3 05/20] net: introduce qemu_net_client_setup(), Jason Wang, 2013/01/29
- [Qemu-devel] [PATCH V3 02/20] net: introduce qemu_get_nic(), Jason Wang, 2013/01/29
- [Qemu-devel] [PATCH V3 06/20] net: introduce NetClientState destructor, Jason Wang, 2013/01/29
- [Qemu-devel] [PATCH V3 07/20] net: multiqueue support, Jason Wang, 2013/01/29
- [Qemu-devel] [PATCH V3 08/20] tap: import linux multiqueue constants, Jason Wang, 2013/01/29
- [Qemu-devel] [PATCH V3 09/20] tap: factor out common tap initialization,
Jason Wang <=
- [Qemu-devel] [PATCH V3 10/20] tap: add Linux multiqueue support, Jason Wang, 2013/01/29
- [Qemu-devel] [PATCH V3 11/20] tap: support enabling or disabling a queue, Jason Wang, 2013/01/29
- [Qemu-devel] [PATCH V3 12/20] tap: introduce a helper to get the name of an interface, Jason Wang, 2013/01/29
- [Qemu-devel] [PATCH V3 15/20] virtio: introduce virtio_del_queue(), Jason Wang, 2013/01/29
- [Qemu-devel] [PATCH V3 13/20] tap: multiqueue support, Jason Wang, 2013/01/29
- [Qemu-devel] [PATCH V3 17/20] virtio-net: separate virtqueue from VirtIONet, Jason Wang, 2013/01/29
- [Qemu-devel] [PATCH V3 18/20] virtio-net: multiqueue support, Jason Wang, 2013/01/29
- [Qemu-devel] [PATCH V3 19/20] virtio-net: migration support for multiqueue, Jason Wang, 2013/01/29
- [Qemu-devel] [PATCH V3 20/20] virtio-net: compat multiqueue support, Jason Wang, 2013/01/29
- [Qemu-devel] [PATCH V3 16/20] virtio: add a queue_index to VirtQueue, Jason Wang, 2013/01/29