From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([2001:4830:134:3::10]:56918)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <pbonzini@redhat.com>) id 1WCmA3-00073L-7f
	for qemu-devel@nongnu.org; Mon, 10 Feb 2014 03:24:21 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <pbonzini@redhat.com>) id 1WCm9x-0004ZB-7R
	for qemu-devel@nongnu.org; Mon, 10 Feb 2014 03:24:15 -0500
Received: from mx1.redhat.com ([209.132.183.28]:61090)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <pbonzini@redhat.com>) id 1WCm9w-0004Z4-VA
	for qemu-devel@nongnu.org; Mon, 10 Feb 2014 03:24:09 -0500
Received: from int-mx01.intmail.prod.int.phx2.redhat.com
	(int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11])
	by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id s1A8O7xR008512
	(version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK)
	for <qemu-devel@nongnu.org>; Mon, 10 Feb 2014 03:24:08 -0500
Message-ID: <52F88CA3.7010207@redhat.com>
Date: Mon, 10 Feb 2014 09:24:03 +0100
From: Paolo Bonzini <pbonzini@redhat.com>
MIME-Version: 1.0
References: <1391939335-31580-1-git-send-email-pbonzini@redhat.com>
	<1391939335-31580-3-git-send-email-pbonzini@redhat.com>
	<20140210073807.GD15707@T430.nay.redhat.com>
In-Reply-To: <20140210073807.GD15707@T430.nay.redhat.com>
Content-Type: text/plain; charset=ISO-8859-1; format=flowed
Content-Transfer-Encoding: 7bit
Subject: Re: [Qemu-devel] [PATCH 02/20] nbd: correctly propagate errors
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: Fam Zheng <famz@redhat.com>
Cc: kwolf@redhat.com, qemu-devel@nongnu.org, stefanha@redhat.com, mreitz@redhat.com

Il 10/02/2014 08:38, Fam Zheng ha scritto:
>> >      if (s->client.is_unix) {
>> > -        sock = unix_socket_outgoing(qemu_opt_get(s->socket_opts, "path"));
>> > +        sock = unix_connect(qemu_opt_get(s->socket_opts, "path"), errp);
> Why not use unix_connect_opts like below?

Right!

>> >      } else {
>> > -        sock = tcp_socket_outgoing_opts(s->socket_opts);
>> > +        sock = inet_connect_opts(s->socket_opts, errp, NULL, NULL);
>> >          if (sock >= 0) {
>> >              socket_set_nodelay(sock);
>> >          }
>> > @@ -255,17 +251,19 @@ static int nbd_open(BlockDriverState *bs, QDict *options, int flags,
>> >      BDRVNBDState *s = bs->opaque;
>> >      char *export = NULL;
>> >      int result, sock;
>> > +    Error *local_err = NULL;
>> >
>> >      /* Pop the config into our state object. Exit if invalid. */
>> > -    result = nbd_config(s, options, &export);
>> > -    if (result != 0) {
>> > -        return result;
>> > +    nbd_config(s, options, &export, &local_err);
>> > +    if (local_err) {
> Isn't error_is_set() better here?

No, error_is_set(&foo) is the same as foo != NULL.

So we use error_is_set only with Error**, which really should never 
happen because you miss errors if the errp is NULL. :)

Paolo

>> > +        error_propagate(errp, local_err);
>> > +        return -EINVAL;
>> >      }