From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.3 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id E65E8C742D7 for ; Fri, 12 Jul 2019 18:35:34 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id C35D32064A for ; Fri, 12 Jul 2019 18:35:34 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org C35D32064A Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:51818 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hm0OL-0001dN-Pf for qemu-devel@archiver.kernel.org; Fri, 12 Jul 2019 14:35:33 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58067) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hm0O9-0001Ad-5Y for qemu-devel@nongnu.org; Fri, 12 Jul 2019 14:35:23 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hm0O7-0002y2-U5 for qemu-devel@nongnu.org; Fri, 12 Jul 2019 14:35:21 -0400 Received: from mx1.redhat.com ([209.132.183.28]:33040) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hm0O5-0002vU-Bw; Fri, 12 Jul 2019 14:35:17 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 0E45B30821C2; Fri, 12 Jul 2019 18:35:16 +0000 (UTC) Received: from dresden.str.redhat.com (unknown [10.40.205.208]) by smtp.corp.redhat.com (Postfix) with ESMTPS id AA33419C58; Fri, 12 Jul 2019 18:35:14 +0000 (UTC) To: Stefano Garzarella , qemu-devel@nongnu.org References: <20190712104617.94707-1-sgarzare@redhat.com> From: Max Reitz Openpgp: preference=signencrypt Autocrypt: addr=mreitz@redhat.com; prefer-encrypt=mutual; keydata= mQENBFXOJlcBCADEyyhOTsoa/2ujoTRAJj4MKA21dkxxELVj3cuILpLTmtachWj7QW+TVG8U /PsMCFbpwsQR7oEy8eHHZwuGQsNpEtNC2G/L8Yka0BIBzv7dEgrPzIu+W3anZXQW4702+uES U29G8TP/NGfXRRHGlbBIH9KNUnOSUD2vRtpOLXkWsV5CN6vQFYgQfFvmp5ZpPeUe6xNplu8V mcTw8OSEDW/ZnxJc8TekCKZSpdzYoxfzjm7xGmZqB18VFwgJZlIibt1HE0EB4w5GsD7x5ekh awIe3RwoZgZDLQMdOitJ1tUc8aqaxvgA4tz6J6st8D8pS//m1gAoYJWGwwIVj1DjTYLtABEB AAG0HU1heCBSZWl0eiA8bXJlaXR6QHJlZGhhdC5jb20+iQFTBBMBCAA9AhsDBQkSzAMABQsJ CAcCBhUICQoLAgQWAgMBAh4BAheABQJVzie5FRhoa3A6Ly9rZXlzLmdudXBnLm5ldAAKCRD0 B9sAYdXPQDcIB/9uNkbYEex1rHKz3mr12uxYMwLOOFY9fstP5aoVJQ1nWQVB6m2cfKGdcRe1 2/nFaHSNAzT0NnKz2MjhZVmcrpyd2Gp2QyISCfb1FbT82GMtXFj1wiHmPb3CixYmWGQUUh+I AvUqsevLA+WihgBUyaJq/vuDVM1/K9Un+w+Tz5vpeMidlIsTYhcsMhn0L9wlCjoucljvbDy/ 8C9L2DUdgi3XTa0ORKeflUhdL4gucWoAMrKX2nmPjBMKLgU7WLBc8AtV+84b9OWFML6NEyo4 4cP7cM/07VlJK53pqNg5cHtnWwjHcbpGkQvx6RUx6F1My3y52vM24rNUA3+ligVEgPYBuQEN BFXOJlcBCADAmcVUNTWT6yLWQHvxZ0o47KCP8OcLqD+67T0RCe6d0LP8GsWtrJdeDIQk+T+F xO7DolQPS6iQ6Ak2/lJaPX8L0BkEAiMuLCKFU6Bn3lFOkrQeKp3u05wCSV1iKnhg0UPji9V2 W5eNfy8F4ZQHpeGUGy+liGXlxqkeRVhLyevUqfU0WgNqAJpfhHSGpBgihUupmyUg7lfUPeRM DzAN1pIqoFuxnN+BRHdAecpsLcbR8sQddXmDg9BpSKozO/JyBmaS1RlquI8HERQoe6EynJhd 64aICHDfj61rp+/0jTIcevxIIAzW70IadoS/y3DVIkuhncgDBvGbF3aBtjrJVP+5ABEBAAGJ ASUEGAEIAA8FAlXOJlcCGwwFCRLMAwAACgkQ9AfbAGHVz0CbFwf9F/PXxQR9i4N0iipISYjU sxVdjJOM2TMut+ZZcQ6NSMvhZ0ogQxJ+iEQ5OjnIputKvPVd5U7WRh+4lF1lB/NQGrGZQ1ic alkj6ocscQyFwfib+xIe9w8TG1CVGkII7+TbS5pXHRxZH1niaRpoi/hYtgzkuOPp35jJyqT/ /ELbqQTDAWcqtJhzxKLE/ugcOMK520dJDeb6x2xVES+S5LXby0D4juZlvUj+1fwZu+7Io5+B bkhSVPb/QdOVTpnz7zWNyNw+OONo1aBUKkhq2UIByYXgORPFnbfMY7QWHcjpBVw9MgC4tGeF R4bv+1nAMMxKmb5VvQCExr0eFhJUAHAhVg== Message-ID: <5017daf6-2739-d260-09fd-cfccd6c77bc1@redhat.com> Date: Fri, 12 Jul 2019 20:35:12 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Thunderbird/60.7.2 MIME-Version: 1.0 In-Reply-To: <20190712104617.94707-1-sgarzare@redhat.com> Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="EkaMIiSTWCEbEEDJDjty2n15E6KOk3WRp" X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.47]); Fri, 12 Jul 2019 18:35:16 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: Re: [Qemu-devel] [PATCH] gluster: fix .bdrv_reopen_prepare when backing file is a JSON object X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kevin Wolf , integration@gluster.org, qemu-block@nongnu.org Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --EkaMIiSTWCEbEEDJDjty2n15E6KOk3WRp Content-Type: multipart/mixed; boundary="ifxEAJ4CyqmednUgqqHNnmPy8NcHAT7ha"; protected-headers="v1" From: Max Reitz To: Stefano Garzarella , qemu-devel@nongnu.org Cc: Kevin Wolf , qemu-block@nongnu.org, integration@gluster.org Message-ID: <5017daf6-2739-d260-09fd-cfccd6c77bc1@redhat.com> Subject: Re: [PATCH] gluster: fix .bdrv_reopen_prepare when backing file is a JSON object References: <20190712104617.94707-1-sgarzare@redhat.com> In-Reply-To: <20190712104617.94707-1-sgarzare@redhat.com> --ifxEAJ4CyqmednUgqqHNnmPy8NcHAT7ha Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: quoted-printable On 12.07.19 12:46, Stefano Garzarella wrote: > When the backing_file is specified as a JSON object, the > qemu_gluster_reopen_prepare() fails with this message: > invalid URI json:{"server.0.host": ...} >=20 > In this case, we should call qemu_gluster_init() using the QDict > 'state->options' that contains the parameters already parsed. >=20 > Buglink: https://bugzilla.redhat.com/show_bug.cgi?id=3D1542445 > Signed-off-by: Stefano Garzarella > --- > block/gluster.c | 11 ++++++++++- > 1 file changed, 10 insertions(+), 1 deletion(-) >=20 > diff --git a/block/gluster.c b/block/gluster.c > index 62f8ff2147..26971db1ea 100644 > --- a/block/gluster.c > +++ b/block/gluster.c > @@ -931,7 +931,16 @@ static int qemu_gluster_reopen_prepare(BDRVReopenS= tate *state, > gconf->has_debug =3D true; > gconf->logfile =3D g_strdup(s->logfile); > gconf->has_logfile =3D true; > - reop_s->glfs =3D qemu_gluster_init(gconf, state->bs->filename, NUL= L, errp); > + /* > + * If 'bs->filename' starts with "json:", then 'state->options' wi= ll > + * contain the parameters already parsed. > + */ > + if (state->bs->filename && !strstart(state->bs->filename, "json:",= NULL)) { > + reop_s->glfs =3D qemu_gluster_init(gconf, state->bs->filename,= NULL, > + errp); > + } else { > + reop_s->glfs =3D qemu_gluster_init(gconf, NULL, state->options= , errp); > + } Hmmm, aren=E2=80=99t they always in state->options? Max --ifxEAJ4CyqmednUgqqHNnmPy8NcHAT7ha-- --EkaMIiSTWCEbEEDJDjty2n15E6KOk3WRp Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEEkb62CjDbPohX0Rgp9AfbAGHVz0AFAl0o0uEACgkQ9AfbAGHV z0DVGQf/Q6xQ82Nj5mh+ssybEiL8Cno2V1CUOVZIWayYEWJ3z2tAKm8O70SLNpA7 1HFPu2grsn6c5RO7x4ZA0M7Ic0U54WxiugTQWMkMvfyE8Zbw5wbIh0YQSz/SVwmz AxcAwVQ2T5qVaCjN4xHy0dDcqTr3G/okM49RljPfaJzvQ+f/p074ZKMmogWlqVT+ L0ab6/Fy6pRdv+G0wntVLpmf8HFw04owdLg433sC7EYBBQ2ddGaMGjomOVuN0/ee 6D6iEIxuGu/H7asqzQ+PwPMqC/LcwwEVuyW1jaFXzn9UE+zWhIbCeJX+Ktgtu0Gg MNPBfEYfV5zqvW8NXG6Ursr2VUvIXw== =2Plt -----END PGP SIGNATURE----- --EkaMIiSTWCEbEEDJDjty2n15E6KOk3WRp--