From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57529) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WCmD1-0000y3-W3 for qemu-devel@nongnu.org; Mon, 10 Feb 2014 03:27:26 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WCmCv-0005Vc-W0 for qemu-devel@nongnu.org; Mon, 10 Feb 2014 03:27:19 -0500 Received: from mx1.redhat.com ([209.132.183.28]:42845) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WCmCv-0005VX-O1 for qemu-devel@nongnu.org; Mon, 10 Feb 2014 03:27:13 -0500 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id s1A8RCfx010701 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Mon, 10 Feb 2014 03:27:13 -0500 Message-ID: <52F88D5A.90601@redhat.com> Date: Mon, 10 Feb 2014 09:27:06 +0100 From: Paolo Bonzini MIME-Version: 1.0 References: <1391939335-31580-1-git-send-email-pbonzini@redhat.com> <1391939335-31580-9-git-send-email-pbonzini@redhat.com> <20140210080200.GJ15707@T430.nay.redhat.com> In-Reply-To: <20140210080200.GJ15707@T430.nay.redhat.com> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH 08/20] gluster: correctly propagate errors List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Fam Zheng Cc: kwolf@redhat.com, qemu-devel@nongnu.org, stefanha@redhat.com, mreitz@redhat.com Il 10/02/2014 09:02, Fam Zheng ha scritto: > On Sun, 02/09 10:48, Paolo Bonzini wrote: >> > 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; > Why dropping -errno here? Because it is not applicable for the usage error messages. Anyway nothing is lost because the errno is already embedded in the error if applicable. If the Error* is set to non-NULL, the caller of drv->bdrv_open ignores the return value except to check that it is <0. Paolo