From patchwork Tue Feb 11 17:03:41 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 319364 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 3C3332C00B3 for ; Wed, 12 Feb 2014 04:29:51 +1100 (EST) Received: from localhost ([::1]:34934 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WDGpE-0005fW-1C for incoming@patchwork.ozlabs.org; Tue, 11 Feb 2014 12:08:48 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:49149) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WDGl1-0007HJ-4L for qemu-devel@nongnu.org; Tue, 11 Feb 2014 12:04:35 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WDGkr-0008Ep-SB for qemu-devel@nongnu.org; Tue, 11 Feb 2014 12:04:27 -0500 Received: from mail-qa0-x230.google.com ([2607:f8b0:400d:c00::230]:56581) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WDGkr-0008Ei-Ni for qemu-devel@nongnu.org; Tue, 11 Feb 2014 12:04:17 -0500 Received: by mail-qa0-f48.google.com with SMTP id f11so12161146qae.35 for ; Tue, 11 Feb 2014 09:04:17 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=qGs3pKGgExZ9kzl/zYm3TeWSeU3hTIIklygr/m2ESsw=; b=l5fp3jvdZ41dnTEh7jz84QWMwbn7oC+zesUJYTfupvHeCNY+dQn3ekmzf5GhbpoAD9 dDuDuRXya9ch5H3nwU90iAph6YsxfP3VNkgdX8nSjkKtlUzSYEZ7LxUgSp2bRw7mWP5w ViTaeGkT60XLZfze4KtWVROLLPIbX3EEBiqnuFXK/Hn88ZvVceBrQwI/j8KAMBK4tS3f CCeyyDAw8kNWtsPQXbNXbRjMGd7Wio8F2rX5pNR7VD1rC68fR/Xg3cv6GwluC0lpqcbL 4M9imy3vph9tc2stss7/dLCt9y7GkIHbCOTDI49gopbtDz6FRwxG+EHf8cd5hiBrzUG3 taUw== X-Received: by 10.140.20.175 with SMTP id 44mr55514689qgj.46.1392138257363; Tue, 11 Feb 2014 09:04:17 -0800 (PST) Received: from yakj.usersys.redhat.com (nat-pool-brq-u.redhat.com. [209.132.186.35]) by mx.google.com with ESMTPSA id l40sm29527992qga.13.2014.02.11.09.04.15 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 11 Feb 2014 09:04:16 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Tue, 11 Feb 2014 18:03:41 +0100 Message-Id: <1392138233-26407-9-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.5.3 In-Reply-To: <1392138233-26407-1-git-send-email-pbonzini@redhat.com> References: <1392138233-26407-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2607:f8b0:400d:c00::230 Cc: kwolf@redhat.com, famz@redhat.com Subject: [Qemu-devel] [PATCH v2 08/20] gluster: correctly propagate errors 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 Signed-off-by: Paolo Bonzini --- block/gluster.c | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/block/gluster.c b/block/gluster.c index f9dd37f..bc9c59f 100644 --- a/block/gluster.c +++ b/block/gluster.c @@ -175,7 +175,8 @@ out: return ret; } -static struct glfs *qemu_gluster_init(GlusterConf *gconf, const char *filename) +static struct glfs *qemu_gluster_init(GlusterConf *gconf, const char *filename, + Error **errp) { struct glfs *glfs = NULL; int ret; @@ -183,8 +184,8 @@ static struct glfs *qemu_gluster_init(GlusterConf *gconf, const char *filename) ret = qemu_gluster_parseuri(gconf, filename); if (ret < 0) { - error_report("Usage: file=gluster[+transport]://[server[:port]]/" - "volname/image[?socket=...]"); + error_setg(errp, "Usage: file=gluster[+transport]://[server[:port]]/" + "volname/image[?socket=...]"); errno = -ret; goto out; } @@ -211,9 +212,11 @@ static struct glfs *qemu_gluster_init(GlusterConf *gconf, const char *filename) ret = glfs_init(glfs); if (ret) { - error_report("Gluster connection failed for server=%s port=%d " - "volume=%s image=%s transport=%s", gconf->server, gconf->port, - gconf->volname, gconf->image, gconf->transport); + error_setg_errno(errp, errno, + "Gluster connection failed for server=%s port=%d " + "volume=%s image=%s transport=%s", gconf->server, + gconf->port, gconf->volname, gconf->image, + gconf->transport); goto out; } return glfs; @@ -283,15 +286,14 @@ static int qemu_gluster_open(BlockDriverState *bs, QDict *options, opts = qemu_opts_create(&runtime_opts, NULL, 0, &error_abort); qemu_opts_absorb_qdict(opts, options, &local_err); if (error_is_set(&local_err)) { - qerror_report_err(local_err); - error_free(local_err); + error_propagate(errp, local_err); ret = -EINVAL; goto out; } filename = qemu_opt_get(opts, "filename"); - s->glfs = qemu_gluster_init(gconf, filename); + s->glfs = qemu_gluster_init(gconf, filename, errp); if (!s->glfs) { ret = -errno; goto out; @@ -389,9 +391,9 @@ static int qemu_gluster_create(const char *filename, int64_t total_size = 0; GlusterConf *gconf = g_malloc0(sizeof(GlusterConf)); - glfs = qemu_gluster_init(gconf, filename); + glfs = qemu_gluster_init(gconf, filename, errp); if (!glfs) { - ret = -errno; + ret = -EINVAL; goto out; }