[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 05/15] tap: net_tap_fd_init() can't fail, drop dead
From: |
Markus Armbruster |
Subject: |
[Qemu-devel] [PATCH 05/15] tap: net_tap_fd_init() can't fail, drop dead error handling |
Date: |
Tue, 12 May 2015 14:02:57 +0200 |
Signed-off-by: Markus Armbruster <address@hidden>
---
net/tap.c | 14 +-------------
1 file changed, 1 insertion(+), 13 deletions(-)
diff --git a/net/tap.c b/net/tap.c
index 8f06cb7..adb1022 100644
--- a/net/tap.c
+++ b/net/tap.c
@@ -536,7 +536,6 @@ int net_init_bridge(const NetClientOptions *opts, const
char *name,
/* FIXME error_setg(errp, ...) on failure */
const NetdevBridgeOptions *bridge;
const char *helper, *br;
-
TAPState *s;
int fd, vnet_hdr;
@@ -552,14 +551,8 @@ int net_init_bridge(const NetClientOptions *opts, const
char *name,
}
fcntl(fd, F_SETFL, O_NONBLOCK);
-
vnet_hdr = tap_probe_vnet_hdr(fd);
-
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,
br);
@@ -607,14 +600,9 @@ static int net_init_tap_one(const NetdevTapOptions *tap,
NetClientState *peer,
int vnet_hdr, int fd)
{
Error *err = NULL;
- TAPState *s;
+ TAPState *s = net_tap_fd_init(peer, model, name, fd, vnet_hdr);
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) {
return -1;
}
--
1.9.3
- [Qemu-devel] [PATCH 00/15] net: Improve error reporting, Markus Armbruster, 2015/05/12
- [Qemu-devel] [PATCH 04/15] net/dump: Improve -net/host_net_add dump error reporting, Markus Armbruster, 2015/05/12
- [Qemu-devel] [PATCH 03/15] net: Improve -net nic error reporting, Markus Armbruster, 2015/05/12
- [Qemu-devel] [PATCH 07/15] tap: Convert tap_set_sndbuf() to Error, Markus Armbruster, 2015/05/12
- [Qemu-devel] [PATCH 05/15] tap: net_tap_fd_init() can't fail, drop dead error handling,
Markus Armbruster <=
- [Qemu-devel] [PATCH 06/15] tap: Improve -netdev/netdev_add/-net/... bridge error reporting, Markus Armbruster, 2015/05/12
- [Qemu-devel] [PATCH 11/15] tap-linux: Convert tap_open() to Error, Markus Armbruster, 2015/05/12
- [Qemu-devel] [PATCH 10/15] tap: Permit incremental conversion of tap_open() to Error, Markus Armbruster, 2015/05/12
- [Qemu-devel] [PATCH 12/15] tap-bsd: Convert tap_open() to Error, Markus Armbruster, 2015/05/12