From patchwork Wed Jun 15 08:25:46 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Prasanna Kumar Kalever X-Patchwork-Id: 9177841 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 91AB16021C for ; Wed, 15 Jun 2016 08:30:24 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7CE711FE7B for ; Wed, 15 Jun 2016 08:30:24 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 6F8C128337; Wed, 15 Jun 2016 08:30:24 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 88D1A1FE7B for ; Wed, 15 Jun 2016 08:30:23 +0000 (UTC) Received: from localhost ([::1]:40664 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bD6DO-0000bT-6Y for patchwork-qemu-devel@patchwork.kernel.org; Wed, 15 Jun 2016 04:30:22 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:43767) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bD69l-0005gQ-TD for qemu-devel@nongnu.org; Wed, 15 Jun 2016 04:26:39 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bD69j-0008MU-1e for qemu-devel@nongnu.org; Wed, 15 Jun 2016 04:26:36 -0400 Received: from mx1.redhat.com ([209.132.183.28]:56416) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bD69i-0008MP-Q1 for qemu-devel@nongnu.org; Wed, 15 Jun 2016 04:26:34 -0400 Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 6C98B80F6B; Wed, 15 Jun 2016 08:26:34 +0000 (UTC) Received: from dhcp1-86.lab.eng.blr.redhat.com (pkalever.blr.redhat.com [10.70.1.86]) by int-mx11.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id u5F8QFrU025643; Wed, 15 Jun 2016 04:26:31 -0400 From: Prasanna Kumar Kalever To: qemu-devel@nongnu.org Date: Wed, 15 Jun 2016 13:55:46 +0530 Message-Id: <1465979147-1993-4-git-send-email-prasanna.kalever@redhat.com> In-Reply-To: <1465979147-1993-1-git-send-email-prasanna.kalever@redhat.com> References: <1465979147-1993-1-git-send-email-prasanna.kalever@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.24 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.27]); Wed, 15 Jun 2016 08:26:34 +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: [Qemu-devel] [PATCH v17 3/4] block/gluster: using new qapi schema 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: kwolf@redhat.com, pkrempa@redhat.com, jcody@redhat.com, deepakcs@redhat.com, bharata@linux.vnet.ibm.com, rtalur@redhat.com, Prasanna Kumar Kalever Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP this patch adds 'GlusterServer' related schema in qapi/block-core.json Signed-off-by: Prasanna Kumar Kalever --- block/gluster.c | 101 ++++++++++++++++++++++++++------------------------- qapi/block-core.json | 64 +++++++++++++++++++++++++++++--- 2 files changed, 110 insertions(+), 55 deletions(-) diff --git a/block/gluster.c b/block/gluster.c index 45072b1..c129b0b 100644 --- a/block/gluster.c +++ b/block/gluster.c @@ -13,6 +13,10 @@ #include "qapi/error.h" #include "qemu/uri.h" +#define GLUSTER_OPT_FILENAME "filename" +#define GLUSTER_DEFAULT_PORT 24007 + + typedef struct GlusterAIOCB { int64_t size; int ret; @@ -31,15 +35,6 @@ typedef struct BDRVGlusterReopenState { struct glfs_fd *fd; } BDRVGlusterReopenState; -typedef struct GlusterConf { - char *host; - int port; - char *volume; - char *path; - char *transport; -} GlusterConf; - - static QemuOptsList qemu_gluster_create_opts = { .name = "qemu-gluster-create-opts", .head = QTAILQ_HEAD_INITIALIZER(qemu_gluster_create_opts.head), @@ -63,7 +58,7 @@ static QemuOptsList runtime_opts = { .head = QTAILQ_HEAD_INITIALIZER(runtime_opts.head), .desc = { { - .name = "filename", + .name = GLUSTER_OPT_FILENAME, .type = QEMU_OPT_STRING, .help = "URL to the gluster image", }, @@ -72,18 +67,7 @@ static QemuOptsList runtime_opts = { }; -static void qemu_gluster_gconf_free(GlusterConf *gconf) -{ - if (gconf) { - g_free(gconf->host); - g_free(gconf->volume); - g_free(gconf->path); - g_free(gconf->transport); - g_free(gconf); - } -} - -static int parse_volume_options(GlusterConf *gconf, char *path) +static int parse_volume_options(BlockdevOptionsGluster *gconf, char *path) { char *p, *q; @@ -145,8 +129,10 @@ static int parse_volume_options(GlusterConf *gconf, char *path) * file=gluster+unix:///testvol/dir/a.img?socket=/tmp/glusterd.socket * file=gluster+rdma://1.2.3.4:24007/testvol/a.img */ -static int qemu_gluster_parseuri(GlusterConf *gconf, const char *filename) +static int qemu_gluster_parseuri(BlockdevOptionsGluster **pgconf, + const char *filename) { + BlockdevOptionsGluster *gconf; URI *uri; QueryParams *qp = NULL; bool is_unix = false; @@ -157,20 +143,24 @@ static int qemu_gluster_parseuri(GlusterConf *gconf, const char *filename) return -EINVAL; } + gconf = g_new0(BlockdevOptionsGluster, 1); + gconf->server = g_new0(GlusterServer, 1); + /* transport */ if (!uri->scheme || !strcmp(uri->scheme, "gluster")) { - gconf->transport = g_strdup("tcp"); + gconf->server->transport = GLUSTER_TRANSPORT_TCP; } else if (!strcmp(uri->scheme, "gluster+tcp")) { - gconf->transport = g_strdup("tcp"); + gconf->server->transport = GLUSTER_TRANSPORT_TCP; } else if (!strcmp(uri->scheme, "gluster+unix")) { - gconf->transport = g_strdup("unix"); + gconf->server->transport = GLUSTER_TRANSPORT_UNIX; is_unix = true; } else if (!strcmp(uri->scheme, "gluster+rdma")) { - gconf->transport = g_strdup("rdma"); + gconf->server->transport = GLUSTER_TRANSPORT_RDMA; } else { ret = -EINVAL; goto out; } + gconf->server->has_transport = true; ret = parse_volume_options(gconf, uri->path); if (ret < 0) { @@ -192,13 +182,23 @@ static int qemu_gluster_parseuri(GlusterConf *gconf, const char *filename) ret = -EINVAL; goto out; } - gconf->host = g_strdup(qp->p[0].value); + gconf->server->host = g_strdup(qp->p[0].value); } else { - gconf->host = g_strdup(uri->server ? uri->server : "localhost"); - gconf->port = uri->port; + gconf->server->host = g_strdup(uri->server ? uri->server : "localhost"); + if (uri->port) { + gconf->server->port = uri->port; + } else { + gconf->server->port = GLUSTER_DEFAULT_PORT; + } + gconf->server->has_port = true; } + *pgconf = gconf; + out: + if (ret < 0) { + qapi_free_BlockdevOptionsGluster(gconf); + } if (qp) { query_params_free(qp); } @@ -206,14 +206,15 @@ out: return ret; } -static struct glfs *qemu_gluster_init(GlusterConf *gconf, const char *filename, - Error **errp) +static struct glfs *qemu_gluster_init(BlockdevOptionsGluster **pgconf, + const char *filename, Error **errp) { struct glfs *glfs = NULL; int ret; int old_errno; + BlockdevOptionsGluster *gconf = NULL; - ret = qemu_gluster_parseuri(gconf, filename); + ret = qemu_gluster_parseuri(&gconf, filename); if (ret < 0) { error_setg(errp, "Usage: file=gluster[+transport]://[host[:port]]/" "volume/path[?socket=...]"); @@ -226,8 +227,9 @@ static struct glfs *qemu_gluster_init(GlusterConf *gconf, const char *filename, goto out; } - ret = glfs_set_volfile_server(glfs, gconf->transport, gconf->host, - gconf->port); + ret = glfs_set_volfile_server(glfs, + GlusterTransport_lookup[gconf->server->transport], + gconf->server->host, gconf->server->port); if (ret < 0) { goto out; } @@ -245,9 +247,9 @@ static struct glfs *qemu_gluster_init(GlusterConf *gconf, const char *filename, if (ret) { error_setg_errno(errp, errno, "Gluster connection failed for host=%s port=%d " - "volume=%s path=%s transport=%s", gconf->host, - gconf->port, gconf->volume, gconf->path, - gconf->transport); + "volume=%s path=%s transport=%s", gconf->server->host, + gconf->server->port, gconf->volume, gconf->path, + GlusterTransport_lookup[gconf->server->transport]); /* glfs_init sometimes doesn't set errno although docs suggest that */ if (errno == 0) @@ -255,9 +257,11 @@ static struct glfs *qemu_gluster_init(GlusterConf *gconf, const char *filename, goto out; } + *pgconf = gconf; return glfs; out: + qapi_free_BlockdevOptionsGluster(gconf); if (glfs) { old_errno = errno; glfs_fini(glfs); @@ -317,7 +321,7 @@ static int qemu_gluster_open(BlockDriverState *bs, QDict *options, BDRVGlusterState *s = bs->opaque; int open_flags = 0; int ret = 0; - GlusterConf *gconf = g_new0(GlusterConf, 1); + BlockdevOptionsGluster *gconf = NULL; QemuOpts *opts; Error *local_err = NULL; const char *filename; @@ -331,8 +335,7 @@ static int qemu_gluster_open(BlockDriverState *bs, QDict *options, } filename = qemu_opt_get(opts, "filename"); - - s->glfs = qemu_gluster_init(gconf, filename, errp); + s->glfs = qemu_gluster_init(&gconf, filename, errp); if (!s->glfs) { ret = -errno; goto out; @@ -364,7 +367,7 @@ static int qemu_gluster_open(BlockDriverState *bs, QDict *options, out: qemu_opts_del(opts); - qemu_gluster_gconf_free(gconf); + qapi_free_BlockdevOptionsGluster(gconf); if (!ret) { return ret; } @@ -382,7 +385,7 @@ static int qemu_gluster_reopen_prepare(BDRVReopenState *state, { int ret = 0; BDRVGlusterReopenState *reop_s; - GlusterConf *gconf = NULL; + BlockdevOptionsGluster *gconf = NULL; int open_flags = 0; assert(state != NULL); @@ -393,9 +396,7 @@ static int qemu_gluster_reopen_prepare(BDRVReopenState *state, qemu_gluster_parse_flags(state->flags, &open_flags); - gconf = g_new0(GlusterConf, 1); - - reop_s->glfs = qemu_gluster_init(gconf, state->bs->filename, errp); + reop_s->glfs = qemu_gluster_init(&gconf, state->bs->filename, errp); if (reop_s->glfs == NULL) { ret = -errno; goto exit; @@ -420,7 +421,7 @@ static int qemu_gluster_reopen_prepare(BDRVReopenState *state, exit: /* state->opaque will be freed in either the _abort or _commit */ - qemu_gluster_gconf_free(gconf); + qapi_free_BlockdevOptionsGluster(gconf); return ret; } @@ -522,15 +523,15 @@ static inline int qemu_gluster_zerofill(struct glfs_fd *fd, int64_t offset, static int qemu_gluster_create(const char *filename, QemuOpts *opts, Error **errp) { + BlockdevOptionsGluster *gconf = NULL; struct glfs *glfs; struct glfs_fd *fd; int ret = 0; int prealloc = 0; int64_t total_size = 0; char *tmp = NULL; - GlusterConf *gconf = g_new0(GlusterConf, 1); - glfs = qemu_gluster_init(gconf, filename, errp); + glfs = qemu_gluster_init(&gconf, filename, errp); if (!glfs) { ret = -errno; goto out; @@ -570,7 +571,7 @@ static int qemu_gluster_create(const char *filename, } out: g_free(tmp); - qemu_gluster_gconf_free(gconf); + qapi_free_BlockdevOptionsGluster(gconf); if (glfs) { glfs_fini(glfs); } diff --git a/qapi/block-core.json b/qapi/block-core.json index 98a20d2..93fbca3 100644 --- a/qapi/block-core.json +++ b/qapi/block-core.json @@ -1634,13 +1634,14 @@ # @host_device, @host_cdrom: Since 2.1 # # Since: 2.0 +# @gluster: Since 2.7 ## { 'enum': 'BlockdevDriver', 'data': [ 'archipelago', 'blkdebug', 'blkverify', 'bochs', 'cloop', - 'dmg', 'file', 'ftp', 'ftps', 'host_cdrom', 'host_device', - 'http', 'https', 'luks', 'null-aio', 'null-co', 'parallels', - 'qcow', 'qcow2', 'qed', 'quorum', 'raw', 'tftp', 'vdi', 'vhdx', - 'vmdk', 'vpc', 'vvfat' ] } + 'dmg', 'file', 'ftp', 'ftps', 'gluster', 'host_cdrom', + 'host_device', 'http', 'https', 'luks', 'null-aio', 'null-co', + 'parallels', 'qcow', 'qcow2', 'qed', 'quorum', 'raw', 'tftp', + 'vdi', 'vhdx', 'vmdk', 'vpc', 'vvfat' ] } ## # @BlockdevOptionsFile @@ -2032,6 +2033,59 @@ '*read-pattern': 'QuorumReadPattern' } } ## +# @GlusterTransport +# +# An enumeration of Gluster transport type +# +# @tcp: TCP - Transmission Control Protocol +# +# @unix: UNIX - Unix domain socket +# +# @rdma: RDMA - Remote direct memory access +# +# Since: 2.7 +## +{ 'enum': 'GlusterTransport', 'data': [ 'tcp', 'unix', 'rdma'] } + +## +# @GlusterServer +# +# Details for connecting to a gluster server +# +# @host: host address (hostname/ipv4/ipv6 addresses) +# +# @port: #optional port number on which glusterd is listening +# (default 24007) +# +# @transport: #optional transport type used to connect to gluster management +# daemon (default 'tcp') +# +# Since: 2.7 +## +{ 'struct': 'GlusterServer', + 'data': { 'host': 'str', + '*port': 'uint16', + '*transport': 'GlusterTransport' } } + +## +# @BlockdevOptionsGluster +# +# Driver specific block device options for Gluster +# +# @volume: name of gluster volume where VM image resides +# +# @path: absolute path to image file in gluster volume +# +# @servers: gluster server description +# +# Since: 2.7 +## +{ 'struct': 'BlockdevOptionsGluster', + 'data': { 'volume': 'str', + 'path': 'str', + 'server': 'GlusterServer' } } + +## # @BlockdevOptions # # Options for creating a block device. Many options are available for all @@ -2094,7 +2148,7 @@ 'file': 'BlockdevOptionsFile', 'ftp': 'BlockdevOptionsFile', 'ftps': 'BlockdevOptionsFile', -# TODO gluster: Wait for structured options + 'gluster': 'BlockdevOptionsGluster', 'host_cdrom': 'BlockdevOptionsFile', 'host_device':'BlockdevOptionsFile', 'http': 'BlockdevOptionsFile',