From patchwork Tue Nov 10 09:47:22 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vincenzo Maffione X-Patchwork-Id: 542215 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 9CEB1140323 for ; Tue, 10 Nov 2015 20:50:06 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b=hsDaGfOJ; dkim-atps=neutral Received: from localhost ([::1]:58514 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zw5Yy-0006Dw-JG for incoming@patchwork.ozlabs.org; Tue, 10 Nov 2015 04:50:04 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:43657) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zw5XE-0003De-TZ for qemu-devel@nongnu.org; Tue, 10 Nov 2015 04:48:17 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Zw5XD-00033r-IA for qemu-devel@nongnu.org; Tue, 10 Nov 2015 04:48:16 -0500 Received: from mail-wm0-x235.google.com ([2a00:1450:400c:c09::235]:35201) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zw5XD-00033j-C2 for qemu-devel@nongnu.org; Tue, 10 Nov 2015 04:48:15 -0500 Received: by wmdw130 with SMTP id w130so62903315wmd.0 for ; Tue, 10 Nov 2015 01:48:14 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references :in-reply-to:references; bh=uj81uxei6mw5PGpx42Urfe4hmyj//JfMZx7kq7qh9JI=; b=hsDaGfOJrHW17Wi59j090VVdObBSsJ0/qbSrALxIBjc3dIRqf5NyV74wRMl/oI/dg7 QHvrRjB56hWkQNErTAg6/pyf1Nm1n80XgEjye0XElCD7pN1mu6QnKOCRSxnN/RKkOxsa l5u2fNIukSGMArtmcZVDcamWLS4FM/UbI/+UiJJ3mUcVT6xvkczGu3v/ggoEb1sQx9R1 a+yEmoCWUcWc4x+YwdKyFCjdb00jplzYTSmJg9yf6NIz4agftAjcwhBnIXuvdwl/5hY9 P54N9w3mpayt+FkcJnA0WsZz1zZZDclGKzqdIywlSjcyIPKl0ufLL8Ki/i3446Ur30zu xc3w== X-Received: by 10.28.212.18 with SMTP id l18mr34265675wmg.93.1447148894878; Tue, 10 Nov 2015 01:48:14 -0800 (PST) Received: from ste-linux.lan (prova.iet.unipi.it. [131.114.58.86]) by smtp.gmail.com with ESMTPSA id r12sm18810551wmd.17.2015.11.10.01.48.14 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 10 Nov 2015 01:48:14 -0800 (PST) From: Vincenzo Maffione To: qemu-devel@nongnu.org Date: Tue, 10 Nov 2015 10:47:22 +0100 Message-Id: X-Mailer: git-send-email 2.6.2 In-Reply-To: References: In-Reply-To: References: X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2a00:1450:400c:c09::235 Cc: rizzo@iet.unipi.it, jasowang@redhat.com, armbru@redhat.com, v.maffione@gmail.com, g.lettieri@iet.unipi.it Subject: [Qemu-devel] [PATCH v3 2/2] net: netmap: use error_setg() helpers in place of error_report() 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 This update was required to align error reporting of netmap backend initialization to the modifications introduced by commit a30ecde. Signed-off-by: Vincenzo Maffione --- net/netmap.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/net/netmap.c b/net/netmap.c index 4197a9c..5558368 100644 --- a/net/netmap.c +++ b/net/netmap.c @@ -90,7 +90,7 @@ pkt_copy(const void *_src, void *_dst, int l) * Open a netmap device. We assume there is only one queue * (which is the case for the VALE bridge). */ -static int netmap_open(NetmapPriv *me) +static void netmap_open(NetmapPriv *me, Error **errp) { int fd; int err; @@ -99,9 +99,8 @@ static int netmap_open(NetmapPriv *me) me->fd = fd = open(me->fdname, O_RDWR); if (fd < 0) { - error_report("Unable to open netmap device '%s' (%s)", - me->fdname, strerror(errno)); - return -1; + error_setg_file_open(errp, errno, me->fdname); + return; } memset(&req, 0, sizeof(req)); pstrcpy(req.nr_name, sizeof(req.nr_name), me->ifname); @@ -109,15 +108,14 @@ static int netmap_open(NetmapPriv *me) req.nr_version = NETMAP_API; err = ioctl(fd, NIOCREGIF, &req); if (err) { - error_report("Unable to register %s: %s", me->ifname, strerror(errno)); + error_setg_errno(errp, errno, "Unable to register %s", me->ifname); goto error; } l = me->memsize = req.nr_memsize; me->mem = mmap(0, l, PROT_WRITE | PROT_READ, MAP_SHARED, fd, 0); if (me->mem == MAP_FAILED) { - error_report("Unable to mmap netmap shared memory: %s", - strerror(errno)); + error_setg_errno(errp, errno, "Unable to mmap netmap shared memory"); me->mem = NULL; goto error; } @@ -125,11 +123,11 @@ static int netmap_open(NetmapPriv *me) me->nifp = NETMAP_IF(me->mem, req.nr_offset); me->tx = NETMAP_TXRING(me->nifp, 0); me->rx = NETMAP_RXRING(me->nifp, 0); - return 0; + + return; error: close(me->fd); - return -1; } static void netmap_send(void *opaque); @@ -438,9 +436,9 @@ static NetClientInfo net_netmap_info = { int net_init_netmap(const NetClientOptions *opts, const char *name, NetClientState *peer, Error **errp) { - /* FIXME error_setg(errp, ...) on failure */ const NetdevNetmapOptions *netmap_opts = opts->u.netmap; NetClientState *nc; + Error *err = NULL; NetmapPriv me; NetmapState *s; @@ -448,7 +446,9 @@ int net_init_netmap(const NetClientOptions *opts, netmap_opts->has_devname ? netmap_opts->devname : "/dev/netmap"); /* Set default name for the port if not supplied. */ pstrcpy(me.ifname, sizeof(me.ifname), netmap_opts->ifname); - if (netmap_open(&me)) { + netmap_open(&me, &err); + if (err) { + error_propagate(errp, err); return -1; } /* Create the object. */