From patchwork Wed May 27 10:03:02 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Hajnoczi X-Patchwork-Id: 477041 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id C606814012C for ; Wed, 27 May 2015 20:08:10 +1000 (AEST) Received: from localhost ([::1]:52881 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YxYFs-0004N2-LC for incoming@patchwork.ozlabs.org; Wed, 27 May 2015 06:08:08 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56345) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YxYBW-0004xP-8I for qemu-devel@nongnu.org; Wed, 27 May 2015 06:03:39 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YxYBU-0002Du-UT for qemu-devel@nongnu.org; Wed, 27 May 2015 06:03:38 -0400 Received: from mx1.redhat.com ([209.132.183.28]:53424) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YxYBU-0002Dd-OH for qemu-devel@nongnu.org; Wed, 27 May 2015 06:03:36 -0400 Received: from int-mx13.intmail.prod.int.phx2.redhat.com (int-mx13.intmail.prod.int.phx2.redhat.com [10.5.11.26]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id t4RA3Yud013490 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL); Wed, 27 May 2015 06:03:35 -0400 Received: from localhost (ovpn-112-78.ams2.redhat.com [10.36.112.78]) by int-mx13.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id t4RA3X1J012482; Wed, 27 May 2015 06:03:34 -0400 From: Stefan Hajnoczi To: Date: Wed, 27 May 2015 11:03:02 +0100 Message-Id: <1432720988-20200-12-git-send-email-stefanha@redhat.com> In-Reply-To: <1432720988-20200-1-git-send-email-stefanha@redhat.com> References: <1432720988-20200-1-git-send-email-stefanha@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.26 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: Peter Maydell , Markus Armbruster , Stefan Hajnoczi Subject: [Qemu-devel] [PULL 11/17] tap: Permit incremental conversion of tap_open() to Error X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org From: Markus Armbruster Convert the trivial ones immediately: tap-aix and tap-haiku. Signed-off-by: Markus Armbruster Reviewed-by: Eric Blake Message-id: 1431691143-1015-11-git-send-email-armbru@redhat.com Signed-off-by: Stefan Hajnoczi --- net/tap-aix.c | 4 ++-- net/tap-bsd.c | 6 ++++-- net/tap-haiku.c | 4 ++-- net/tap-linux.c | 3 ++- net/tap-solaris.c | 3 ++- net/tap.c | 13 +++++++++---- net/tap_int.h | 2 +- 7 files changed, 22 insertions(+), 13 deletions(-) diff --git a/net/tap-aix.c b/net/tap-aix.c index 0a3d461..18fdbf3 100644 --- a/net/tap-aix.c +++ b/net/tap-aix.c @@ -26,9 +26,9 @@ #include int tap_open(char *ifname, int ifname_size, int *vnet_hdr, - int vnet_hdr_required, int mq_required) + int vnet_hdr_required, int mq_required, Error **errp) { - fprintf(stderr, "no tap on AIX\n"); + error_setg(errp, "no tap on AIX"); return -1; } diff --git a/net/tap-bsd.c b/net/tap-bsd.c index 53cdd9f..bbbe446 100644 --- a/net/tap-bsd.c +++ b/net/tap-bsd.c @@ -35,8 +35,9 @@ #ifndef __FreeBSD__ int tap_open(char *ifname, int ifname_size, int *vnet_hdr, - int vnet_hdr_required, int mq_required) + int vnet_hdr_required, int mq_required, Error **errp) { + /* FIXME error_setg(errp, ...) on failure */ int fd; #ifdef TAPGIFNAME struct ifreq ifr; @@ -114,8 +115,9 @@ int tap_open(char *ifname, int ifname_size, int *vnet_hdr, #define PATH_NET_TAP "/dev/tap" int tap_open(char *ifname, int ifname_size, int *vnet_hdr, - int vnet_hdr_required, int mq_required) + int vnet_hdr_required, int mq_required, Error **errp) { + /* FIXME error_setg(errp, ...) on failure */ int fd, s, ret; struct ifreq ifr; diff --git a/net/tap-haiku.c b/net/tap-haiku.c index 0905b28..d18590c 100644 --- a/net/tap-haiku.c +++ b/net/tap-haiku.c @@ -26,9 +26,9 @@ #include int tap_open(char *ifname, int ifname_size, int *vnet_hdr, - int vnet_hdr_required, int mq_required) + int vnet_hdr_required, int mq_required, Error **errp) { - fprintf(stderr, "no tap on Haiku\n"); + error_setg(errp, "no tap on Haiku"); return -1; } diff --git a/net/tap-linux.c b/net/tap-linux.c index 6fa2744..be18382 100644 --- a/net/tap-linux.c +++ b/net/tap-linux.c @@ -37,8 +37,9 @@ #define PATH_NET_TUN "/dev/net/tun" int tap_open(char *ifname, int ifname_size, int *vnet_hdr, - int vnet_hdr_required, int mq_required) + 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); diff --git a/net/tap-solaris.c b/net/tap-solaris.c index 7839323..079046b 100644 --- a/net/tap-solaris.c +++ b/net/tap-solaris.c @@ -174,8 +174,9 @@ static int tap_alloc(char *dev, size_t dev_size) } int tap_open(char *ifname, int ifname_size, int *vnet_hdr, - int vnet_hdr_required, int mq_required) + int vnet_hdr_required, int mq_required, Error **errp) { + /* FIXME error_setg(errp, ...) on failure */ char dev[10]=""; int fd; if( (fd = tap_alloc(dev, sizeof(dev))) < 0 ){ diff --git a/net/tap.c b/net/tap.c index 93075c6..362df42 100644 --- a/net/tap.c +++ b/net/tap.c @@ -581,7 +581,7 @@ int net_init_bridge(const NetClientOptions *opts, const char *name, static int net_tap_init(const NetdevTapOptions *tap, int *vnet_hdr, const char *setup_script, char *ifname, - size_t ifname_sz, int mq_required) + size_t ifname_sz, int mq_required, Error **errp) { Error *err = NULL; int fd, vnet_hdr_required; @@ -595,8 +595,12 @@ static int net_tap_init(const NetdevTapOptions *tap, int *vnet_hdr, } TFR(fd = tap_open(ifname, ifname_sz, vnet_hdr, vnet_hdr_required, - mq_required)); + mq_required, errp)); if (fd < 0) { + /* FIXME drop when all tap_open() store an Error */ + if (errp && !*errp) { + error_setg(errp, "can't open tap device"); + } return -1; } @@ -605,7 +609,7 @@ static int net_tap_init(const NetdevTapOptions *tap, int *vnet_hdr, strcmp(setup_script, "no") != 0) { launch_script(setup_script, ifname, fd, &err); if (err) { - error_report_err(err); + error_propagate(errp, err); close(fd); return -1; } @@ -853,8 +857,9 @@ int net_init_tap(const NetClientOptions *opts, const char *name, for (i = 0; i < queues; i++) { fd = net_tap_init(tap, &vnet_hdr, i >= 1 ? "no" : script, - ifname, sizeof ifname, queues > 1); + ifname, sizeof ifname, queues > 1, &err); if (fd == -1) { + error_report_err(err); return -1; } diff --git a/net/tap_int.h b/net/tap_int.h index 6df271f..d12a409 100644 --- a/net/tap_int.h +++ b/net/tap_int.h @@ -30,7 +30,7 @@ #include "qapi-types.h" int tap_open(char *ifname, int ifname_size, int *vnet_hdr, - int vnet_hdr_required, int mq_required); + int vnet_hdr_required, int mq_required, Error **errp); ssize_t tap_read_packet(int tapfd, uint8_t *buf, int maxlen);