[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 09/17] tap: Convert net_init_tap_one() to Error
From: |
Stefan Hajnoczi |
Subject: |
[Qemu-devel] [PULL 09/17] tap: Convert net_init_tap_one() to Error |
Date: |
Wed, 27 May 2015 11:03:00 +0100 |
From: Markus Armbruster <address@hidden>
[Dropped %s from "tap: open vhost char device failed: %s" since
error_setg_errno() already prints a human-readable error string and
there is no format string argument.
--Stefan]
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.c | 70 ++++++++++++++++++++++++++++++++++-----------------------------
1 file changed, 38 insertions(+), 32 deletions(-)
diff --git a/net/tap.c b/net/tap.c
index d54222d..49f8586 100644
--- a/net/tap.c
+++ b/net/tap.c
@@ -600,11 +600,11 @@ static int net_tap_init(const NetdevTapOptions *tap, int
*vnet_hdr,
#define MAX_TAP_QUEUES 1024
-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)
+static void 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, Error **errp)
{
Error *err = NULL;
TAPState *s = net_tap_fd_init(peer, model, name, fd, vnet_hdr);
@@ -612,8 +612,8 @@ static int net_init_tap_one(const NetdevTapOptions *tap,
NetClientState *peer,
tap_set_sndbuf(s->fd, tap, &err);
if (err) {
- error_report_err(err);
- return -1;
+ error_propagate(errp, err);
+ return;
}
if (tap->has_fd || tap->has_fds) {
@@ -644,30 +644,28 @@ static int net_init_tap_one(const NetdevTapOptions *tap,
NetClientState *peer,
if (tap->has_vhostfd || tap->has_vhostfds) {
vhostfd = monitor_fd_param(cur_mon, vhostfdname, &err);
if (vhostfd == -1) {
- error_report_err(err);
- return -1;
+ error_propagate(errp, err);
+ return;
}
} else {
vhostfd = open("/dev/vhost-net", O_RDWR);
if (vhostfd < 0) {
- error_report("tap: open vhost char device failed: %s",
- strerror(errno));
- return -1;
+ error_setg_errno(errp, errno,
+ "tap: open vhost char device failed");
+ return;
}
}
options.opaque = (void *)(uintptr_t)vhostfd;
s->vhost_net = vhost_net_init(&options);
if (!s->vhost_net) {
- error_report("vhost-net requested but could not be initialized");
- return -1;
+ error_setg(errp,
+ "vhost-net requested but could not be initialized");
+ return;
}
} else if (tap->has_vhostfd || tap->has_vhostfds) {
- error_report("vhostfd= is not valid without vhost");
- return -1;
+ error_setg(errp, "vhostfd= is not valid without vhost");
}
-
- return 0;
}
static int get_fds(char *str, char *fds[], int max)
@@ -741,9 +739,11 @@ int net_init_tap(const NetClientOptions *opts, const char
*name,
vnet_hdr = tap_probe_vnet_hdr(fd);
- if (net_init_tap_one(tap, peer, "tap", name, NULL,
- script, downscript,
- vhostfdname, vnet_hdr, fd)) {
+ net_init_tap_one(tap, peer, "tap", name, NULL,
+ script, downscript,
+ vhostfdname, vnet_hdr, fd, &err);
+ if (err) {
+ error_report_err(err);
return -1;
}
} else if (tap->has_fds) {
@@ -786,10 +786,12 @@ int net_init_tap(const NetClientOptions *opts, const char
*name,
return -1;
}
- if (net_init_tap_one(tap, peer, "tap", name, ifname,
- script, downscript,
- tap->has_vhostfds ? vhost_fds[i] : NULL,
- vnet_hdr, fd)) {
+ net_init_tap_one(tap, peer, "tap", name, ifname,
+ script, downscript,
+ tap->has_vhostfds ? vhost_fds[i] : NULL,
+ vnet_hdr, fd, &err);
+ if (err) {
+ error_report_err(err);
return -1;
}
}
@@ -810,9 +812,11 @@ int net_init_tap(const NetClientOptions *opts, const char
*name,
fcntl(fd, F_SETFL, O_NONBLOCK);
vnet_hdr = tap_probe_vnet_hdr(fd);
- if (net_init_tap_one(tap, peer, "bridge", name, ifname,
- script, downscript, vhostfdname,
- vnet_hdr, fd)) {
+ net_init_tap_one(tap, peer, "bridge", name, ifname,
+ script, downscript, vhostfdname,
+ vnet_hdr, fd, &err);
+ if (err) {
+ error_report_err(err);
close(fd);
return -1;
}
@@ -846,10 +850,12 @@ int net_init_tap(const NetClientOptions *opts, const char
*name,
}
}
- if (net_init_tap_one(tap, peer, "tap", name, ifname,
- i >= 1 ? "no" : script,
- i >= 1 ? "no" : downscript,
- vhostfdname, vnet_hdr, fd)) {
+ net_init_tap_one(tap, peer, "tap", name, ifname,
+ i >= 1 ? "no" : script,
+ i >= 1 ? "no" : downscript,
+ vhostfdname, vnet_hdr, fd, &err);
+ if (err) {
+ error_report_err(err);
close(fd);
return -1;
}
--
2.4.1
- [Qemu-devel] [PULL 00/17] Net patches, Stefan Hajnoczi, 2015/05/27
- [Qemu-devel] [PULL 01/17] net: Change help text to list -netdev instead of -net by default, Stefan Hajnoczi, 2015/05/27
- [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 <=
- [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, 2015/05/27
- [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