[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 12/17] tap-linux: Convert tap_open() to Error
From: |
Stefan Hajnoczi |
Subject: |
[Qemu-devel] [PULL 12/17] tap-linux: Convert tap_open() to Error |
Date: |
Wed, 27 May 2015 11:03:03 +0100 |
From: Markus Armbruster <address@hidden>
Signed-off-by: Markus Armbruster <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Message-id: address@hidden
Signed-off-by: Stefan Hajnoczi <address@hidden>
---
net/tap-linux.c | 17 +++++++++--------
1 file changed, 9 insertions(+), 8 deletions(-)
diff --git a/net/tap-linux.c b/net/tap-linux.c
index be18382..6c3caef 100644
--- a/net/tap-linux.c
+++ b/net/tap-linux.c
@@ -39,7 +39,6 @@
int tap_open(char *ifname, int ifname_size, int *vnet_hdr,
int vnet_hdr_required, int mq_required, Error **errp)
{
- /* FIXME error_setg(errp, ...) on failure */
struct ifreq ifr;
int fd, ret;
int len = sizeof(struct virtio_net_hdr);
@@ -47,7 +46,7 @@ int tap_open(char *ifname, int ifname_size, int *vnet_hdr,
TFR(fd = open(PATH_NET_TUN, O_RDWR));
if (fd < 0) {
- error_report("could not open %s: %m", PATH_NET_TUN);
+ error_setg_errno(errp, errno, "could not open %s", PATH_NET_TUN);
return -1;
}
memset(&ifr, 0, sizeof(ifr));
@@ -71,8 +70,8 @@ int tap_open(char *ifname, int ifname_size, int *vnet_hdr,
}
if (vnet_hdr_required && !*vnet_hdr) {
- error_report("vnet_hdr=1 requested, but no kernel "
- "support for IFF_VNET_HDR available");
+ error_setg(errp, "vnet_hdr=1 requested, but no kernel "
+ "support for IFF_VNET_HDR available");
close(fd);
return -1;
}
@@ -87,8 +86,8 @@ int tap_open(char *ifname, int ifname_size, int *vnet_hdr,
if (mq_required) {
if (!(features & IFF_MULTI_QUEUE)) {
- error_report("multiqueue required, but no kernel "
- "support for IFF_MULTI_QUEUE available");
+ error_setg(errp, "multiqueue required, but no kernel "
+ "support for IFF_MULTI_QUEUE available");
close(fd);
return -1;
} else {
@@ -103,9 +102,11 @@ int tap_open(char *ifname, int ifname_size, int *vnet_hdr,
ret = ioctl(fd, TUNSETIFF, (void *) &ifr);
if (ret != 0) {
if (ifname[0] != '\0') {
- error_report("could not configure %s (%s): %m", PATH_NET_TUN,
ifr.ifr_name);
+ error_setg_errno(errp, errno, "could not configure %s (%s)",
+ PATH_NET_TUN, ifr.ifr_name);
} else {
- error_report("could not configure %s: %m", PATH_NET_TUN);
+ error_setg_errno(errp, errno, "could not configure %s",
+ PATH_NET_TUN);
}
close(fd);
return -1;
--
2.4.1
- [Qemu-devel] [PULL 02/17] net: Improve error message for -net hubport a bit, (continued)
- [Qemu-devel] [PULL 02/17] net: Improve error message for -net hubport a bit, Stefan Hajnoczi, 2015/05/27
- [Qemu-devel] [PULL 04/17] net: Improve -net nic error reporting, Stefan Hajnoczi, 2015/05/27
- [Qemu-devel] [PULL 05/17] net/dump: Improve -net/host_net_add dump error reporting, Stefan Hajnoczi, 2015/05/27
- [Qemu-devel] [PULL 03/17] net: Permit incremental conversion of init functions to Error, Stefan Hajnoczi, 2015/05/27
- [Qemu-devel] [PULL 06/17] tap: net_tap_fd_init() can't fail, drop dead error handling, Stefan Hajnoczi, 2015/05/27
- [Qemu-devel] [PULL 07/17] tap: Improve -netdev/netdev_add/-net/... bridge error reporting, Stefan Hajnoczi, 2015/05/27
- [Qemu-devel] [PULL 10/17] tap: Convert launch_script() to Error, Stefan Hajnoczi, 2015/05/27
- [Qemu-devel] [PULL 09/17] tap: Convert net_init_tap_one() to Error, Stefan Hajnoczi, 2015/05/27
- [Qemu-devel] [PULL 08/17] tap: Convert tap_set_sndbuf() to Error, Stefan Hajnoczi, 2015/05/27
- [Qemu-devel] [PULL 11/17] tap: Permit incremental conversion of tap_open() to Error, Stefan Hajnoczi, 2015/05/27
- [Qemu-devel] [PULL 12/17] tap-linux: Convert tap_open() to Error,
Stefan Hajnoczi <=
- [Qemu-devel] [PULL 13/17] tap-bsd: Convert tap_open() to Error, Stefan Hajnoczi, 2015/05/27
- [Qemu-devel] [PULL 15/17] tap: Finish conversion of tap_open() to Error, Stefan Hajnoczi, 2015/05/27
- [Qemu-devel] [PULL 14/17] tap-solaris: Convert tap_open() to Error, Stefan Hajnoczi, 2015/05/27
- [Qemu-devel] [PULL 16/17] tap: Improve -netdev/netdev_add/-net/... tap error reporting, Stefan Hajnoczi, 2015/05/27
- [Qemu-devel] [PULL 17/17] net/net: Record usage status of mac address, Stefan Hajnoczi, 2015/05/27
- Re: [Qemu-devel] [PULL 00/17] Net patches, Peter Maydell, 2015/05/28