From nobody Thu Mar 28 15:19:19 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1562928411; cv=none; d=zoho.com; s=zohoarc; b=NZ6iptgQpL37vadkkimHuAEt1zszOvP2lLp9Sa6DsMA2lvdrXNx0k2laByaANgqGc5OJCvz1SjOJOSZodZ99MftRYkmTJquSxSqkQpK1abwKYGIN0Wmwvxj90kPaHCQWv7/xB26AEM+sYHvV367hz5xxoLu4vkl7TQVYvMMyi1c= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1562928411; h=Content-Transfer-Encoding:Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To:ARC-Authentication-Results; bh=Ugdx0L8+777kQHA/6l6wzgjWd1ijXCOTfMCY8hyciQc=; b=Xsjw+9CumfMJ2GE4zFmG5Yywse/U+tsEa/o7+S+dXNocacglziQDIe2z9M5vL+IJE/c7OOIwyVECMCsOitTcAoIfi35qK9P3A5xKjs9RtCAWVAK5G/UsvzucLWygFHoOTtc/njr8oAX2tf2HsYNWhhlG3TSbx3jD4AjTCsmiayA= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1562928411169627.2978359718147; Fri, 12 Jul 2019 03:46:51 -0700 (PDT) Received: from localhost ([::1]:48118 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hlt4j-0001TK-LV for importer@patchew.org; Fri, 12 Jul 2019 06:46:49 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:38234) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hlt4N-0000sT-0R for qemu-devel@nongnu.org; Fri, 12 Jul 2019 06:46:28 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hlt4K-0006lF-2n for qemu-devel@nongnu.org; Fri, 12 Jul 2019 06:46:25 -0400 Received: from mx1.redhat.com ([209.132.183.28]:57024) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hlt4G-0006eo-I0; Fri, 12 Jul 2019 06:46:20 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 89F8A2F8BED; Fri, 12 Jul 2019 10:46:19 +0000 (UTC) Received: from steredhat.redhat.com (ovpn-117-13.ams2.redhat.com [10.36.117.13]) by smtp.corp.redhat.com (Postfix) with ESMTP id 18E556062A; Fri, 12 Jul 2019 10:46:17 +0000 (UTC) From: Stefano Garzarella To: qemu-devel@nongnu.org Date: Fri, 12 Jul 2019 12:46:17 +0200 Message-Id: <20190712104617.94707-1-sgarzare@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.38]); Fri, 12 Jul 2019 10:46:19 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [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, Max Reitz Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" 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": ...} In this case, we should call qemu_gluster_init() using the QDict 'state->options' that contains the parameters already parsed. 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(-) 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(BDRVReopenState= *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, NULL, e= rrp); + /* + * If 'bs->filename' starts with "json:", then 'state->options' will + * contain the parameters already parsed. + */ + if (state->bs->filename && !strstart(state->bs->filename, "json:", NUL= L)) { + reop_s->glfs =3D qemu_gluster_init(gconf, state->bs->filename, NUL= L, + errp); + } else { + reop_s->glfs =3D qemu_gluster_init(gconf, NULL, state->options, er= rp); + } if (reop_s->glfs =3D=3D NULL) { ret =3D -errno; goto exit; --=20 2.20.1