openkylin
/
qemu
mirror of https://gitee.com/openkylin/qemu.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

tap: net_tap_fd_init() can't fail, drop dead error handling 

Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Message-id: 1431691143-1015-6-git-send-email-armbru@redhat.com
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
This commit is contained in:
Markus Armbruster 2015-05-15 13:58:53 +02:00 committed by Stefan Hajnoczi
parent 3791f83ca9
commit da4a4eac26
1 changed files with 1 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
net/tap.c
View File

@ -536,7 +536,6 @@ int net_init_bridge(const NetClientOptions *opts, const char *name,
/* FIXME error_setg(errp, ...) on failure */ /* FIXME error_setg(errp, ...) on failure */
const NetdevBridgeOptions *bridge; const NetdevBridgeOptions *bridge;
const char *helper, *br; const char *helper, *br;
TAPState *s; TAPState *s;
int fd, vnet_hdr; int fd, vnet_hdr;
@ -552,14 +551,8 @@ int net_init_bridge(const NetClientOptions *opts, const char *name,
} }
fcntl(fd, F_SETFL, O_NONBLOCK); fcntl(fd, F_SETFL, O_NONBLOCK);
vnet_hdr = tap_probe_vnet_hdr(fd); vnet_hdr = tap_probe_vnet_hdr(fd);
s = net_tap_fd_init(peer, "bridge", name, fd, vnet_hdr); s = net_tap_fd_init(peer, "bridge", name, fd, vnet_hdr);
if (!s) {
close(fd);
return -1;
}
snprintf(s->nc.info_str, sizeof(s->nc.info_str), "helper=%s,br=%s", helper, snprintf(s->nc.info_str, sizeof(s->nc.info_str), "helper=%s,br=%s", helper,
br); br);
@ -607,14 +600,9 @@ static int net_init_tap_one(const NetdevTapOptions *tap, NetClientState *peer,
int vnet_hdr, int fd) int vnet_hdr, int fd)
{ {
Error *err = NULL; Error *err = NULL;
TAPState *s; TAPState *s = net_tap_fd_init(peer, model, name, fd, vnet_hdr);
int vhostfd; int vhostfd;
s = net_tap_fd_init(peer, model, name, fd, vnet_hdr);
if (!s) {
return -1;
}
if (tap_set_sndbuf(s->fd, tap) < 0) { if (tap_set_sndbuf(s->fd, tap) < 0) {
return -1; return -1;
} }