From nobody Fri May 3 05:54:06 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=1563197343; cv=none; d=zoho.com; s=zohoarc; b=je8CqyqshC7OqzkqXsa4Sb3O5Aj6N6SZ636FQwJDKRSvcd65MJOxcEeQpbCK0dQ+N2tKFJ0frVcI1nAa8SX77r2s7QRk6yXyIgZamxtxA93DZv/aDrNsIPaBHcANsRvbILZ2YDRDYdzmP8Nh3T5U6R4RTScVEZliwS9R0d+norQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1563197343; 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=X6lqMa8dVtlRSEVX8+xGccJ/gwrvAPa8rZNRENEO3Dg=; b=O5rJvsRXD9DLJi5aRAgsryvICsVZajVq00WwMFh3a5qOe9k1GvcLBMqH5weG3Vp/PPuDQOihk1OcV/LGZRLfdlVRRjfZx9D9GvTxonUvEJ7I7Qfb5N81gt/85kepVA2HmOV0R35APj0Vvygsv4R+Tx2V8GGahDGeSby+OpbiW+0= 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 1563197343034544.666348559058; Mon, 15 Jul 2019 06:29:03 -0700 (PDT) Received: from localhost ([::1]:38592 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hn12M-0000cP-4D for importer@patchew.org; Mon, 15 Jul 2019 09:29:02 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:48964) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hn12B-00008y-2U for qemu-devel@nongnu.org; Mon, 15 Jul 2019 09:28:52 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hn129-0008SI-Vr for qemu-devel@nongnu.org; Mon, 15 Jul 2019 09:28:51 -0400 Received: from mx1.redhat.com ([209.132.183.28]:56112) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hn127-0008QP-Jj; Mon, 15 Jul 2019 09:28:47 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id A0A73C057F30; Mon, 15 Jul 2019 13:28:46 +0000 (UTC) Received: from steredhat.redhat.com (ovpn-117-90.ams2.redhat.com [10.36.117.90]) by smtp.corp.redhat.com (Postfix) with ESMTP id 41AA06012C; Mon, 15 Jul 2019 13:28:44 +0000 (UTC) From: Stefano Garzarella To: qemu-devel@nongnu.org Date: Mon, 15 Jul 2019 15:28:44 +0200 Message-Id: <20190715132844.506584-1-sgarzare@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.32]); Mon, 15 Jul 2019 13:28:46 +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 v2] 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 JSON parameters already parsed. Buglink: https://bugzilla.redhat.com/show_bug.cgi?id=3D1542445 Signed-off-by: Stefano Garzarella --- v2: - check if 'state->bs->exact_filename' is empty, instead to parse 'state->bs->filename' to check if it contains "json:" [Max] --- block/gluster.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/block/gluster.c b/block/gluster.c index 62f8ff2147..f64dc5b01e 100644 --- a/block/gluster.c +++ b/block/gluster.c @@ -931,7 +931,17 @@ 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 'state->bs->exact_filename' is empty, 'state->options' should co= ntain + * the JSON parameters already parsed. + */ + if (state->bs->exact_filename[0] !=3D '\0') { + reop_s->glfs =3D qemu_gluster_init(gconf, state->bs->exact_filenam= e, NULL, + 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