From nobody Mon Feb 9 19:52:45 2026 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=1563201028; cv=none; d=zoho.com; s=zohoarc; b=YCvIJzKRT0O4IZUvwgaiY5aWV5ub8sSTZ2rO0Gf5jBab1hT52TElAg8jKNvIYXVoX4Yl6P2ZZNDRkUyF1Pd4lTfyeVdo8X3l53tls3sSM7lm6nb7YoRejsPTOdNDRQxTjSvY2nXLyywM8ByvChMxr1yLkBRDzXJJLcnJAKVhoKc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1563201028; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=keaHyKHU2B4cdxM62uSPGzceYsLz10p+OVj3sR0wtas=; b=TeeWQdAdTnvJHWs3DEsB+3xAIi2Ks4LsdjXR2Aw++QUwrKsgYQhHaCDf64paet6xcT3CYqdl9dcKRxX3Om2at+zzoDNlEE+n7xjrsjMGzz9FznvH3JjMThPWZEBKw6w19UPCplOjGSU2UuMvX5Ykhbwh70dS2WaZnRMKhJVk8vs= 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 1563201028181974.3384794070182; Mon, 15 Jul 2019 07:30:28 -0700 (PDT) Received: from localhost ([::1]:39458 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hn1zm-0008LA-MV for importer@patchew.org; Mon, 15 Jul 2019 10:30:26 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34621) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hn1zC-0006ae-Pd for qemu-devel@nongnu.org; Mon, 15 Jul 2019 10:29:52 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hn1zA-0006Bp-P9 for qemu-devel@nongnu.org; Mon, 15 Jul 2019 10:29:50 -0400 Received: from mx1.redhat.com ([209.132.183.28]:41780) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hn1z8-0006Aa-DO; Mon, 15 Jul 2019 10:29:46 -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 B52ABC057F2B; Mon, 15 Jul 2019 14:29:45 +0000 (UTC) Received: from localhost (unknown [10.40.205.59]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 2F4F65F74; Mon, 15 Jul 2019 14:29:44 +0000 (UTC) From: Max Reitz To: qemu-block@nongnu.org Date: Mon, 15 Jul 2019 16:29:05 +0200 Message-Id: <20190715142905.9078-12-mreitz@redhat.com> In-Reply-To: <20190715142905.9078-1-mreitz@redhat.com> References: <20190715142905.9078-1-mreitz@redhat.com> MIME-Version: 1.0 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.32]); Mon, 15 Jul 2019 14:29:45 +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] [PULL 11/11] 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 , Peter Maydell , qemu-devel@nongnu.org, Max Reitz Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" From: Stefano Garzarella 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 Message-id: 20190715132844.506584-1-sgarzare@redhat.com Signed-off-by: Max Reitz --- 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.21.0