From nobody Mon Feb 9 23:01:00 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1529376511942578.386647104537; Mon, 18 Jun 2018 19:48:31 -0700 (PDT) Received: from localhost ([::1]:38753 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fV6h5-00006E-54 for importer@patchew.org; Mon, 18 Jun 2018 22:48:31 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:46366) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fV5ih-0002Jn-EO for qemu-devel@nongnu.org; Mon, 18 Jun 2018 21:46:08 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fV5id-0000En-Gy for qemu-devel@nongnu.org; Mon, 18 Jun 2018 21:46:07 -0400 Received: from mail-ot0-x22e.google.com ([2607:f8b0:4003:c0f::22e]:37972) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fV5id-0000EY-Bj; Mon, 18 Jun 2018 21:46:03 -0400 Received: by mail-ot0-x22e.google.com with SMTP id p95-v6so20770384ota.5; Mon, 18 Jun 2018 18:46:03 -0700 (PDT) Received: from localhost (76-251-165-188.lightspeed.austtx.sbcglobal.net. [76.251.165.188]) by smtp.gmail.com with ESMTPSA id z96-v6sm7902655ota.28.2018.06.18.18.46.00 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 18 Jun 2018 18:46:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=/AkBUeJ0emDX8Gp1VJiDyYrDiNk3WFHEPBbeqTkrfhE=; b=r5YRDvYFEk4jYvc1K7ez3GBIeZj1OgJybyAl0g1GVsKXsXMW1xzTagbBv+krwg1Cj6 Uo6vkaypPvcYgFMUEmIM7s05fqMnuQVvnfKfLBduPOXluqmPBomi93IxaQgeaVVont55 eZcjbAMgpRQ6uO6SdAke/v+ChhKs+SfpxqjjtLhmiYi9y4kqC17oCarux1FioLsD77vx niXtpTUC9V99Ei/gTCRi/t59Ji6C8BrxZw7blpHLH5Zhe9Vf6KpKH/rZMUzECQKJYgKr iE4zdUWRrH1pt2Qmqxj3CAFJZstWqAY09uXGUsmLPyLS8Wpr3XfEVXduzkCs8IF5lBaj Z/Iw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=/AkBUeJ0emDX8Gp1VJiDyYrDiNk3WFHEPBbeqTkrfhE=; b=K9C3fIvNAeOMJhbTtxbMQ4Gaucftb9pAzoxPBDJtp1ERjCKWbpAwE+ar3oRQXGhsX4 qx3TLGq6uCLsnrfNzRBQB2UEsAoyNMNXyROfWJKzmLhBuym48JK9HJkMIq9c+wMzabFo qoWUifNlkUQDx2n5CITQLdQ2z1WM/1QVTZaBN18/SCuRLAM5EP/F8oJiK2iYtQek6gEO iruEu29kLG20sowtwjfYtrGkeUYm4y7t+LCJ59TeddULyUmneTcWt+6HDSzkUE+TQb1F k2wJ6jUhXp2WuG4flSIJv3zAV3QaTt07GNAWrmeFdzgTciuFcNTKDZpORtDCK3+BUgEa AvAA== X-Gm-Message-State: APt69E3KFn3056jDlWILqVriVqmGfGJEYmnLdAWmlLMSZX4uCjw9QMpx 6rNZBsR0pNe3KlcWbYSluWTjek7a X-Google-Smtp-Source: ADUXVKISpbjCDudcXEpzEE2Qb8GwhSMYE70cBJkTz244zZn59q5MQ8NH9SJEHHJqpPiiwBBGGK9m0A== X-Received: by 2002:a9d:400d:: with SMTP id m13-v6mr9903470ote.105.1529372762085; Mon, 18 Jun 2018 18:46:02 -0700 (PDT) From: Michael Roth To: qemu-devel@nongnu.org Date: Mon, 18 Jun 2018 20:42:19 -0500 Message-Id: <20180619014319.28272-54-mdroth@linux.vnet.ibm.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20180619014319.28272-1-mdroth@linux.vnet.ibm.com> References: <20180619014319.28272-1-mdroth@linux.vnet.ibm.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4003:c0f::22e Subject: [Qemu-devel] [PATCH 053/113] gluster: Fix blockdev-add with server.N.type=unix X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kevin Wolf , Jeff Cody , qemu-stable@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: Kevin Wolf The legacy command line interface gets the socket path from an option called 'socket'. QAPI in contract uses SocketAddress, where the corresponding option is called 'path'. Fix the gluster block driver to accept both 'socket' and 'path', with 'path' being the preferred syntax. https://bugzilla.redhat.com/show_bug.cgi?id=3D1545155 Cc: qemu-stable@nongnu.org Signed-off-by: Kevin Wolf Message-id: 20180403110810.25624-1-kwolf@redhat.com Signed-off-by: Jeff Cody (cherry picked from commit 9dae635afa98f83688806861cefe77ff1b4d76a8) Signed-off-by: Michael Roth --- block/gluster.c | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/block/gluster.c b/block/gluster.c index 0f4265a3a4..d09f4f2283 100644 --- a/block/gluster.c +++ b/block/gluster.c @@ -164,7 +164,12 @@ static QemuOptsList runtime_unix_opts =3D { { .name =3D GLUSTER_OPT_SOCKET, .type =3D QEMU_OPT_STRING, - .help =3D "socket file path)", + .help =3D "socket file path (legacy)", + }, + { + .name =3D GLUSTER_OPT_PATH, + .type =3D QEMU_OPT_STRING, + .help =3D "socket file path (QAPI)", }, { /* end of list */ } }, @@ -612,10 +617,18 @@ static int qemu_gluster_parse_json(BlockdevOptionsGlu= ster *gconf, goto out; } =20 - ptr =3D qemu_opt_get(opts, GLUSTER_OPT_SOCKET); + ptr =3D qemu_opt_get(opts, GLUSTER_OPT_PATH); + if (!ptr) { + ptr =3D qemu_opt_get(opts, GLUSTER_OPT_SOCKET); + } else if (qemu_opt_get(opts, GLUSTER_OPT_SOCKET)) { + error_setg(&local_err, + "Conflicting parameters 'path' and 'socket'"); + error_append_hint(&local_err, GERR_INDEX_HINT, i); + goto out; + } if (!ptr) { error_setg(&local_err, QERR_MISSING_PARAMETER, - GLUSTER_OPT_SOCKET); + GLUSTER_OPT_PATH); error_append_hint(&local_err, GERR_INDEX_HINT, i); goto out; } @@ -680,7 +693,7 @@ static struct glfs *qemu_gluster_init(BlockdevOptionsGl= uster *gconf, "file.server.0.host=3D1.2.3.4," "file.server.0.port=3D24007," "file.server.1.transport=3Dunix," - "file.server.1.socket=3D/var/run/glusterd.soc= ket ..." + "file.server.1.path=3D/var/run/glusterd.socke= t ..." "\n"); errno =3D -ret; return NULL; --=20 2.11.0