[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 5/8] net: return TAPState from net_tap_init()
From: |
Mark McLoughlin |
Subject: |
[Qemu-devel] [PATCH 5/8] net: return TAPState from net_tap_init() |
Date: |
Thu, 18 Jun 2009 18:21:33 +0100 |
net_tap_fd_init() already returns TAPState, so this is a sensible
cleanup in its own right.
Signed-off-by: Mark McLoughlin <address@hidden>
---
net.c | 27 ++++++++++++++++-----------
1 files changed, 16 insertions(+), 11 deletions(-)
diff --git a/net.c b/net.c
index e2e73ef..58f3d51 100644
--- a/net.c
+++ b/net.c
@@ -1429,9 +1429,9 @@ static int launch_script(const char *setup_script, const
char *ifname, int fd)
return -1;
}
-static int net_tap_init(VLANState *vlan, const char *model,
- const char *name, const char *ifname1,
- const char *setup_script, const char *down_script)
+static TAPState *net_tap_init(VLANState *vlan, const char *model,
+ const char *name, const char *ifname1,
+ const char *setup_script, const char
*down_script)
{
TAPState *s;
int fd;
@@ -1443,13 +1443,13 @@ static int net_tap_init(VLANState *vlan, const char
*model,
ifname[0] = '\0';
TFR(fd = tap_open(ifname, sizeof(ifname)));
if (fd < 0)
- return -1;
+ return NULL;
if (!setup_script || !strcmp(setup_script, "no"))
setup_script = "";
- if (setup_script[0] != '\0') {
- if (launch_script(setup_script, ifname, fd))
- return -1;
+ if (setup_script[0] != '\0' &&
+ launch_script(setup_script, ifname, fd)) {
+ return NULL;
}
s = net_tap_fd_init(vlan, model, name, fd);
snprintf(s->vc->info_str, sizeof(s->vc->info_str),
@@ -1459,7 +1459,7 @@ static int net_tap_init(VLANState *vlan, const char
*model,
snprintf(s->down_script, sizeof(s->down_script), "%s", down_script);
snprintf(s->down_script_arg, sizeof(s->down_script_arg), "%s", ifname);
}
- return 0;
+ return s;
}
#endif /* !_WIN32 */
@@ -2291,6 +2291,7 @@ int net_client_init(Monitor *mon, const char *device,
const char *p)
if (!strcmp(device, "tap")) {
char ifname[64], chkbuf[64];
char setup_script[1024], down_script[1024];
+ TAPState *s;
int fd;
vlan->nb_host_devs++;
if (get_param_value(buf, sizeof(buf), "fd", p) > 0) {
@@ -2301,8 +2302,7 @@ int net_client_init(Monitor *mon, const char *device,
const char *p)
}
fd = strtol(buf, NULL, 0);
fcntl(fd, F_SETFL, O_NONBLOCK);
- net_tap_fd_init(vlan, device, name, fd);
- ret = 0;
+ s = net_tap_fd_init(vlan, device, name, fd);
} else {
static const char * const tap_params[] = {
"vlan", "name", "ifname", "script", "downscript", NULL
@@ -2321,7 +2321,12 @@ int net_client_init(Monitor *mon, const char *device,
const char *p)
if (get_param_value(down_script, sizeof(down_script),
"downscript", p) == 0) {
pstrcpy(down_script, sizeof(down_script),
DEFAULT_NETWORK_DOWN_SCRIPT);
}
- ret = net_tap_init(vlan, device, name, ifname, setup_script,
down_script);
+ s = net_tap_init(vlan, device, name, ifname, setup_script,
down_script);
+ }
+ if (s != NULL) {
+ ret = 0;
+ } else {
+ ret = -1;
}
} else
#endif
--
1.6.0.6
- [Qemu-devel] [PATCH 0/8] TUNSETSNDBUF - pushback to help UDP tx, Mark McLoughlin, 2009/06/18
- [Qemu-devel] [PATCH 1/8] net: add qemu_purge_queued_packets(), Mark McLoughlin, 2009/06/18
- [Qemu-devel] [PATCH 2/8] net: purge queued packets in tap_cleanup(), Mark McLoughlin, 2009/06/18
- [Qemu-devel] [PATCH 3/8] net: add tap_read_poll() helper, Mark McLoughlin, 2009/06/18
- [Qemu-devel] [PATCH 4/8] net: handle EAGAIN from tapfd write(), Mark McLoughlin, 2009/06/18
- [Qemu-devel] [PATCH 5/8] net: return TAPState from net_tap_init(),
Mark McLoughlin <=
- [Qemu-devel] [PATCH 6/8] net: add '-net tap,sndbuf=nbytes', Mark McLoughlin, 2009/06/18
- [Qemu-devel] [PATCH 7/8] net: add packet length to NetPacketSent callback, Mark McLoughlin, 2009/06/18
- [Qemu-devel] [PATCH 8/8] virtio-net: implement async packet sending, Mark McLoughlin, 2009/06/18