[Qemu-devel] [PATCH v3 0/3] qemu-doc: update gluster protocol usage guide

[Qemu-devel] [PATCH v3 0/3] qemu-doc: update gluster protocol usage guide

[Prasanna Kumar Kalever]

v3: Address review comments by Eric Blake
This version split to 3 patches
Patch 1/3:
    Fix QMP definition of BlockdevOptionsGluster, change s/debug-level/debug/
Patch 2/3:
    Fix QMP definition of BlockdevOptionsNfs, change s/debug-level/debug/
Patch 3/3:
    no changes to one in v2

v2: Address review comments by Eric Blake on v1
    Mostly grammar related changes, formating for better readability and
    updated commit message
v1: Initial commit

Prasanna Kumar Kalever (3):
  block/gluster: fix QMP to match debug option
  block/nfs: fix QMP to match debug option
  qemu-doc: update gluster protocol usage guide

 block/gluster.c      | 34 +++++++++++++++---------------
 block/nfs.c          |  4 ++--
 qapi/block-core.json |  8 +++----
 qemu-doc.texi        | 59 +++++++++++++++++++++++++++++++++++++++-------------
 qemu-options.hx      | 25 ++++++++++++++++++++--
 5 files changed, 91 insertions(+), 39 deletions(-)

-- 
2.7.4

[Qemu-devel] [PATCH v3 1/3] block/gluster: fix QMP to match debug option

[Prasanna Kumar Kalever]

The QMP definition of BlockdevOptionsGluster:
{ 'struct': 'BlockdevOptionsGluster',
  'data': { 'volume': 'str',
            'path': 'str',
            'server': ['GlusterServer'],
            '*debug-level': 'int',
            '*logfile': 'str' } }

But instead of 'debug-level we have exported 'debug' as the option for choosing
debug level of gluster protocol driver.

This patch fix QMP definition BlockdevOptionsGluster
s/debug-level/debug/

Suggested-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Prasanna Kumar Kalever <prasanna.kalever@redhat.com>
---
 block/gluster.c      | 34 +++++++++++++++++-----------------
 qapi/block-core.json |  4 ++--
 2 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/block/gluster.c b/block/gluster.c
index 0ce15f7..e23dc3b 100644
--- a/block/gluster.c
+++ b/block/gluster.c
@@ -48,7 +48,7 @@ typedef struct BDRVGlusterState {
     struct glfs_fd *fd;
     char *logfile;
     bool supports_seek_data;
-    int debug_level;
+    int debug;
 } BDRVGlusterState;
 
 typedef struct BDRVGlusterReopenState {
@@ -433,7 +433,7 @@ static struct glfs *qemu_gluster_glfs_init(BlockdevOptionsGluster *gconf,
         }
     }
 
-    ret = glfs_set_logging(glfs, gconf->logfile, gconf->debug_level);
+    ret = glfs_set_logging(glfs, gconf->logfile, gconf->debug);
     if (ret < 0) {
         goto out;
     }
@@ -787,17 +787,17 @@ static int qemu_gluster_open(BlockDriverState *bs,  QDict *options,
 
     filename = qemu_opt_get(opts, GLUSTER_OPT_FILENAME);
 
-    s->debug_level = qemu_opt_get_number(opts, GLUSTER_OPT_DEBUG,
+    s->debug = qemu_opt_get_number(opts, GLUSTER_OPT_DEBUG,
                                          GLUSTER_DEBUG_DEFAULT);
-    if (s->debug_level < 0) {
-        s->debug_level = 0;
-    } else if (s->debug_level > GLUSTER_DEBUG_MAX) {
-        s->debug_level = GLUSTER_DEBUG_MAX;
+    if (s->debug < 0) {
+        s->debug = 0;
+    } else if (s->debug > GLUSTER_DEBUG_MAX) {
+        s->debug = GLUSTER_DEBUG_MAX;
     }
 
     gconf = g_new0(BlockdevOptionsGluster, 1);
-    gconf->debug_level = s->debug_level;
-    gconf->has_debug_level = true;
+    gconf->debug = s->debug;
+    gconf->has_debug = true;
 
     logfile = qemu_opt_get(opts, GLUSTER_OPT_LOGFILE);
     s->logfile = g_strdup(logfile ? logfile : GLUSTER_LOGFILE_DEFAULT);
@@ -873,8 +873,8 @@ static int qemu_gluster_reopen_prepare(BDRVReopenState *state,
     qemu_gluster_parse_flags(state->flags, &open_flags);
 
     gconf = g_new0(BlockdevOptionsGluster, 1);
-    gconf->debug_level = s->debug_level;
-    gconf->has_debug_level = true;
+    gconf->debug = s->debug;
+    gconf->has_debug = true;
     gconf->logfile = g_strdup(s->logfile);
     gconf->has_logfile = true;
     reop_s->glfs = qemu_gluster_init(gconf, state->bs->filename, NULL, errp);
@@ -1010,14 +1010,14 @@ static int qemu_gluster_create(const char *filename,
     char *tmp = NULL;
 
     gconf = g_new0(BlockdevOptionsGluster, 1);
-    gconf->debug_level = qemu_opt_get_number_del(opts, GLUSTER_OPT_DEBUG,
+    gconf->debug = qemu_opt_get_number_del(opts, GLUSTER_OPT_DEBUG,
                                                  GLUSTER_DEBUG_DEFAULT);
-    if (gconf->debug_level < 0) {
-        gconf->debug_level = 0;
-    } else if (gconf->debug_level > GLUSTER_DEBUG_MAX) {
-        gconf->debug_level = GLUSTER_DEBUG_MAX;
+    if (gconf->debug < 0) {
+        gconf->debug = 0;
+    } else if (gconf->debug > GLUSTER_DEBUG_MAX) {
+        gconf->debug = GLUSTER_DEBUG_MAX;
     }
-    gconf->has_debug_level = true;
+    gconf->has_debug = true;
 
     gconf->logfile = qemu_opt_get_del(opts, GLUSTER_OPT_LOGFILE);
     if (!gconf->logfile) {
diff --git a/qapi/block-core.json b/qapi/block-core.json
index bcd3b9e..a569cfb 100644
--- a/qapi/block-core.json
+++ b/qapi/block-core.json
@@ -2195,7 +2195,7 @@
 #
 # @server:      gluster servers description
 #
-# @debug-level: #optional libgfapi log level (default '4' which is Error)
+# @debug:       #optional libgfapi log level (default '4' which is Error)
 #
 # @logfile:     #optional libgfapi log file (default /dev/stderr) (Since 2.8)
 #
@@ -2205,7 +2205,7 @@
   'data': { 'volume': 'str',
             'path': 'str',
             'server': ['GlusterServer'],
-            '*debug-level': 'int',
+            '*debug': 'int',
             '*logfile': 'str' } }
 
 ##
-- 
2.7.4

[Qemu-devel] [PATCH v3 2/3] block/nfs: fix QMP to match debug option

[Prasanna Kumar Kalever]

The QMP definition of BlockdevOptionsNfs:
{ 'struct': 'BlockdevOptionsNfs',
  'data': { 'server': 'NFSServer',
            'path': 'str',
            '*user': 'int',
            '*group': 'int',
            '*tcp-syn-count': 'int',
            '*readahead-size': 'int',
            '*page-cache-size': 'int',
            '*debug-level': 'int' } }

To make this consistent with other block protocols like gluster, lets
change s/debug-level/debug/

Suggested-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Prasanna Kumar Kalever <prasanna.kalever@redhat.com>
---
 block/nfs.c          | 4 ++--
 qapi/block-core.json | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/block/nfs.c b/block/nfs.c
index 55c4e0b..21f3c8c 100644
--- a/block/nfs.c
+++ b/block/nfs.c
@@ -134,7 +134,7 @@ static int nfs_parse_uri(const char *filename, QDict *options, Error **errp)
             qdict_put(options, "page-cache-size",
                       qstring_from_str(qp->p[i].value));
         } else if (!strcmp(qp->p[i].name, "debug")) {
-            qdict_put(options, "debug-level",
+            qdict_put(options, "debug",
                       qstring_from_str(qp->p[i].value));
         } else {
             error_setg(errp, "Unknown NFS parameter name: %s",
@@ -165,7 +165,7 @@ static bool nfs_has_filename_options_conflict(QDict *options, Error **errp)
             !strcmp(qe->key, "tcp-syn-count") ||
             !strcmp(qe->key, "readahead-size") ||
             !strcmp(qe->key, "page-cache-size") ||
-            !strcmp(qe->key, "debug-level") ||
+            !strcmp(qe->key, "debug") ||
             strstart(qe->key, "server.", NULL))
         {
             error_setg(errp, "Option %s cannot be used with a filename",
diff --git a/qapi/block-core.json b/qapi/block-core.json
index a569cfb..804da61 100644
--- a/qapi/block-core.json
+++ b/qapi/block-core.json
@@ -2292,7 +2292,7 @@
 # @page-cache-size:         #optional set the pagecache size in bytes (defaults
 #                           to libnfs default)
 #
-# @debug-level:             #optional set the NFS debug level (max 2) (defaults
+# @debug:                   #optional set the NFS debug level (max 2) (defaults
 #                           to libnfs default)
 #
 # Since 2.8
@@ -2305,7 +2305,7 @@
             '*tcp-syn-count': 'int',
             '*readahead-size': 'int',
             '*page-cache-size': 'int',
-            '*debug-level': 'int' } }
+            '*debug': 'int' } }
 
 ##
 # @BlockdevOptionsCurl
-- 
2.7.4

[Qemu-devel] [PATCH v3 3/3] qemu-doc: update gluster protocol usage guide

[Prasanna Kumar Kalever]

Document:
1. The new debug and logfile options with their usages
2. New json format and its usage and
3. update "GlusterFS, Device URL Syntax" section in "Invocation"

Signed-off-by: Prasanna Kumar Kalever <prasanna.kalever@redhat.com>
---
 qemu-doc.texi   | 59 +++++++++++++++++++++++++++++++++++++++++++--------------
 qemu-options.hx | 25 ++++++++++++++++++++++--
 2 files changed, 68 insertions(+), 16 deletions(-)

diff --git a/qemu-doc.texi b/qemu-doc.texi
index 023c140..02cb39d 100644
--- a/qemu-doc.texi
+++ b/qemu-doc.texi
@@ -1041,35 +1041,55 @@ GlusterFS is an user space distributed file system.
 
 You can boot from the GlusterFS disk image with the command:
 @example
-qemu-system-x86_64 -drive file=gluster[+@var{transport}]://[@var{server}[:@var{port}]]/@var{volname}/@var{image}[?socket=...]
+URI:
+qemu-system-x86_64 -drive file=gluster[+@var{type}]://[@var{host}[:@var{port}]]/@var{volume}/@var{path}
+                               [?socket=...][,file.debug=9][,file.logfile=...]
+
+JSON:
+qemu-system-x86_64 'json:@{"driver":"qcow2",
+                           "file":@{"driver":"gluster",
+                                    "volume":"testvol","path":"a.img","debug":9,"logfile":"...",
+                                    "server":[@{"type":"tcp","host":"...","port":"..."@},
+                                              @{"type":"unix","socket":"..."@}]@}@}'
 @end example
 
 @var{gluster} is the protocol.
 
-@var{transport} specifies the transport type used to connect to gluster
+@var{type} specifies the transport type used to connect to gluster
 management daemon (glusterd). Valid transport types are
-tcp, unix and rdma. If a transport type isn't specified, then tcp
-type is assumed.
+tcp and unix. In the URI form, if a transport type isn't specified,
+then tcp type is assumed.
 
-@var{server} specifies the server where the volume file specification for
-the given volume resides. This can be either hostname, ipv4 address
-or ipv6 address. ipv6 address needs to be within square brackets [ ].
-If transport type is unix, then @var{server} field should not be specified.
+@var{host} specifies the server where the volume file specification for
+the given volume resides. This can be either a hostname or an ipv4 address.
+If transport type is unix, then @var{host} field should not be specified.
 Instead @var{socket} field needs to be populated with the path to unix domain
 socket.
 
 @var{port} is the port number on which glusterd is listening. This is optional
-and if not specified, QEMU will send 0 which will make gluster to use the
-default port. If the transport type is unix, then @var{port} should not be
-specified.
+and if not specified, it defaults to port 24007. If the transport type is unix,
+then @var{port} should not be specified.
+
+@var{volume} is the name of the gluster volume which contains the disk image.
+
+@var{path} is the path to the actual disk image that resides on gluster volume.
+
+@var{debug} is the logging level of the gluster protocol driver. Debug levels
+are 0-9, with 9 being the most verbose, and 0 representing no debugging output.
+The default level is 4. The current logging levels defined in the gluster source
+are 0 - None, 1 - Emergency, 2 - Alert, 3 - Critical, 4 - Error, 5 - Warning,
+6 - Notice, 7 - Info, 8 - Debug, 9 - Trace
+
+@var{logfile} is a commandline option to mention log file path which helps in
+logging to the specified file and also help in persisting the gfapi logs. The
+default is stderr.
+
 
-@var{volname} is the name of the gluster volume which contains the disk image.
 
-@var{image} is the path to the actual disk image that resides on gluster volume.
 
 You can create a GlusterFS disk image with the command:
 @example
-qemu-img create gluster://@var{server}/@var{volname}/@var{image} @var{size}
+qemu-img create gluster://@var{host}/@var{volume}/@var{path} @var{size}
 @end example
 
 Examples
@@ -1082,6 +1102,17 @@ qemu-system-x86_64 -drive file=gluster+tcp://[1:2:3:4:5:6:7:8]:24007/testvol/dir
 qemu-system-x86_64 -drive file=gluster+tcp://server.domain.com:24007/testvol/dir/a.img
 qemu-system-x86_64 -drive file=gluster+unix:///testvol/dir/a.img?socket=/tmp/glusterd.socket
 qemu-system-x86_64 -drive file=gluster+rdma://1.2.3.4:24007/testvol/a.img
+qemu-system-x86_64 -drive file=gluster://1.2.3.4/testvol/a.img,file.debug=9,file.logfile=/var/log/qemu-gluster.log
+qemu-system-x86_64 'json:@{"driver":"qcow2",
+                           "file":@{"driver":"gluster",
+                                    "volume":"testvol","path":"a.img",
+                                    "debug":9,"logfile":"/var/log/qemu-gluster.log",
+                                    "server":[@{"type":"tcp","host":"1.2.3.4","port":24007@},
+                                              @{"type":"unix","socket":"/var/run/glusterd.socket"@}]@}@}'
+qemu-system-x86_64 -drive driver=qcow2,file.driver=gluster,file.volume=testvol,file.path=/path/a.img,
+                                       file.debug=9,file.logfile=/var/log/qemu-gluster.log,
+                                       file.server.0.type=tcp,file.server.0.host=1.2.3.4,file.server.0.port=24007,
+                                       file.server.1.type=unix,file.server.1.socket=/var/run/glusterd.socket
 @end example
 
 @node disk_images_ssh
diff --git a/qemu-options.hx b/qemu-options.hx
index 95332cc..03ab9ed 100644
--- a/qemu-options.hx
+++ b/qemu-options.hx
@@ -2595,13 +2595,34 @@ TCP, Unix Domain Sockets and RDMA transport protocols.
 
 Syntax for specifying a VM disk image on GlusterFS volume is
 @example
-gluster[+transport]://[server[:port]]/volname/image[?socket=...]
+
+URI:
+gluster[+type]://[host[:port]]/volume/path[?socket=...][,debug=N][,logfile=...]
+
+JSON:
+'json:@{"driver":"qcow2","file":@{"driver":"gluster","volume":"testvol","path":"a.img","debug":N,"logfile":"...",
+@                                 "server":[@{"type":"tcp","host":"...","port":"..."@},
+@                                           @{"type":"unix","socket":"..."@}]@}@}'
 @end example
 
 
 Example
 @example
-qemu-system-x86_64 --drive file=gluster://192.0.2.1/testvol/a.img
+URI:
+qemu-system-x86_64 --drive file=gluster://192.0.2.1/testvol/a.img,
+@                               file.debug=9,file.logfile=/var/log/qemu-gluster.log
+
+JSON:
+qemu-system-x86_64 'json:@{"driver":"qcow2",
+@                          "file":@{"driver":"gluster",
+@                                   "volume":"testvol","path":"a.img",
+@                                   "debug":9,"logfile":"/var/log/qemu-gluster.log",
+@                                   "server":[@{"type":"tcp","host":"1.2.3.4","port":24007@},
+@                                             @{"type":"unix","socket":"/var/run/glusterd.socket"@}]@}@}'
+qemu-system-x86_64 -drive driver=qcow2,file.driver=gluster,file.volume=testvol,file.path=/path/a.img,
+@                                      file.debug=9,file.logfile=/var/log/qemu-gluster.log,
+@                                      file.server.0.type=tcp,file.server.0.host=1.2.3.4,file.server.0.port=24007,
+@                                      file.server.1.type=unix,file.server.1.socket=/var/run/glusterd.socket
 @end example
 
 See also @url{http://www.gluster.org}.
-- 
2.7.4

Re: [Qemu-devel] [PATCH for-2.8 v3 1/3] block/gluster: fix QMP to match debug option

[Eric Blake]

[-- Attachment #1: Type: text/plain, Size: 2860 bytes --]

On 11/02/2016 11:50 AM, Prasanna Kumar Kalever wrote:
> The QMP definition of BlockdevOptionsGluster:
> { 'struct': 'BlockdevOptionsGluster',
>   'data': { 'volume': 'str',
>             'path': 'str',
>             'server': ['GlusterServer'],
>             '*debug-level': 'int',
>             '*logfile': 'str' } }
> 
> But instead of 'debug-level we have exported 'debug' as the option for choosing
> debug level of gluster protocol driver.
> 
> This patch fix QMP definition BlockdevOptionsGluster
> s/debug-level/debug/
> 
> Suggested-by: Eric Blake <eblake@redhat.com>
> Signed-off-by: Prasanna Kumar Kalever <prasanna.kalever@redhat.com>
> ---
>  block/gluster.c      | 34 +++++++++++++++++-----------------
>  qapi/block-core.json |  4 ++--
>  2 files changed, 19 insertions(+), 19 deletions(-)
> 
> @@ -787,17 +787,17 @@ static int qemu_gluster_open(BlockDriverState *bs,  QDict *options,
>  
>      filename = qemu_opt_get(opts, GLUSTER_OPT_FILENAME);
>  
> -    s->debug_level = qemu_opt_get_number(opts, GLUSTER_OPT_DEBUG,
> +    s->debug = qemu_opt_get_number(opts, GLUSTER_OPT_DEBUG,
>                                           GLUSTER_DEBUG_DEFAULT);

Indentation is now off.  That's minor, a maintainer could fix it on commit.

> @@ -1010,14 +1010,14 @@ static int qemu_gluster_create(const char *filename,
>      char *tmp = NULL;
>  
>      gconf = g_new0(BlockdevOptionsGluster, 1);
> -    gconf->debug_level = qemu_opt_get_number_del(opts, GLUSTER_OPT_DEBUG,
> +    gconf->debug = qemu_opt_get_number_del(opts, GLUSTER_OPT_DEBUG,
>                                                   GLUSTER_DEBUG_DEFAULT);

and again

> +++ b/qapi/block-core.json
> @@ -2195,7 +2195,7 @@
>  #
>  # @server:      gluster servers description
>  #
> -# @debug-level: #optional libgfapi log level (default '4' which is Error)
> +# @debug:       #optional libgfapi log level (default '4' which is Error)
>  #
>  # @logfile:     #optional libgfapi log file (default /dev/stderr) (Since 2.8)
>  #
> @@ -2205,7 +2205,7 @@
>    'data': { 'volume': 'str',
>              'path': 'str',
>              'server': ['GlusterServer'],
> -            '*debug-level': 'int',
> +            '*debug': 'int',

This changes what introspection shows. We already declared that
blockdev-add is not stable in 2.7, and made some radical changes in 2.8
that are visible through introspection.  But we WANT to avoid any more
backwards-incompatible changes beyond 2.8, so on that grounds, this HAS
to go in to 2.8 if it is going in at all (otherwise, we have
inconsistent naming between QMP and the command line that we have to
document and keep forevermore).

Reviewed-by: Eric Blake <eblake@redhat.com>

-- 
Eric Blake   eblake redhat com    +1-919-301-3266
Libvirt virtualization library http://libvirt.org


[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 604 bytes --]

Re: [Qemu-devel] [PATCH for-2.8 v3 2/3] block/nfs: fix QMP to match debug option

[Eric Blake]

[-- Attachment #1: Type: text/plain, Size: 1702 bytes --]

On 11/02/2016 11:50 AM, Prasanna Kumar Kalever wrote:
> The QMP definition of BlockdevOptionsNfs:
> { 'struct': 'BlockdevOptionsNfs',
>   'data': { 'server': 'NFSServer',
>             'path': 'str',
>             '*user': 'int',
>             '*group': 'int',
>             '*tcp-syn-count': 'int',
>             '*readahead-size': 'int',
>             '*page-cache-size': 'int',
>             '*debug-level': 'int' } }
> 
> To make this consistent with other block protocols like gluster, lets
> change s/debug-level/debug/
> 
> Suggested-by: Eric Blake <eblake@redhat.com>
> Signed-off-by: Prasanna Kumar Kalever <prasanna.kalever@redhat.com>
> ---
>  block/nfs.c          | 4 ++--
>  qapi/block-core.json | 4 ++--
>  2 files changed, 4 insertions(+), 4 deletions(-)
> 

> +++ b/qapi/block-core.json
> @@ -2292,7 +2292,7 @@
>  # @page-cache-size:         #optional set the pagecache size in bytes (defaults
>  #                           to libnfs default)
>  #
> -# @debug-level:             #optional set the NFS debug level (max 2) (defaults
> +# @debug:                   #optional set the NFS debug level (max 2) (defaults
>  #                           to libnfs default)
>  #
>  # Since 2.8

This is the first release of this struct. We WANT to avoid making future
name changes, as well as to avoid silly inconsistencies between
different drivers.  So this is definitely 2.8 material.

Apologies for not flagging this thread sooner as needing to go in to one
of the earlier release candidates.

Reviewed-by: Eric Blake <eblake@redhat.com>

-- 
Eric Blake   eblake redhat com    +1-919-301-3266
Libvirt virtualization library http://libvirt.org


[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 604 bytes --]

Re: [Qemu-devel] [PATCH for-2.8 v3 3/3] qemu-doc: update gluster protocol usage guide

[Eric Blake]

[-- Attachment #1: Type: text/plain, Size: 758 bytes --]

On 11/02/2016 11:50 AM, Prasanna Kumar Kalever wrote:
> Document:
> 1. The new debug and logfile options with their usages
> 2. New json format and its usage and
> 3. update "GlusterFS, Device URL Syntax" section in "Invocation"
> 
> Signed-off-by: Prasanna Kumar Kalever <prasanna.kalever@redhat.com>
> ---
>  qemu-doc.texi   | 59 +++++++++++++++++++++++++++++++++++++++++++--------------
>  qemu-options.hx | 25 ++++++++++++++++++++++--
>  2 files changed, 68 insertions(+), 16 deletions(-)

This is documentation-only, so it should be safe (even if a bit late)
for inclusion in 2.8.

Reviewed-by: Eric Blake <eblake@redhat.com>

-- 
Eric Blake   eblake redhat com    +1-919-301-3266
Libvirt virtualization library http://libvirt.org


[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 604 bytes --]

Re: [Qemu-devel] [PATCH for-2.8 v3 1/3] block/gluster: fix QMP to match debug option

[Jeff Cody]

On Mon, Dec 05, 2016 at 03:10:32PM -0600, Eric Blake wrote:
> On 11/02/2016 11:50 AM, Prasanna Kumar Kalever wrote:
> > The QMP definition of BlockdevOptionsGluster:
> > { 'struct': 'BlockdevOptionsGluster',
> >   'data': { 'volume': 'str',
> >             'path': 'str',
> >             'server': ['GlusterServer'],
> >             '*debug-level': 'int',
> >             '*logfile': 'str' } }
> > 
> > But instead of 'debug-level we have exported 'debug' as the option for choosing
> > debug level of gluster protocol driver.
> > 
> > This patch fix QMP definition BlockdevOptionsGluster
> > s/debug-level/debug/
> > 
> > Suggested-by: Eric Blake <eblake@redhat.com>
> > Signed-off-by: Prasanna Kumar Kalever <prasanna.kalever@redhat.com>
> > ---
> >  block/gluster.c      | 34 +++++++++++++++++-----------------
> >  qapi/block-core.json |  4 ++--
> >  2 files changed, 19 insertions(+), 19 deletions(-)
> > 
> > @@ -787,17 +787,17 @@ static int qemu_gluster_open(BlockDriverState *bs,  QDict *options,
> >  
> >      filename = qemu_opt_get(opts, GLUSTER_OPT_FILENAME);
> >  
> > -    s->debug_level = qemu_opt_get_number(opts, GLUSTER_OPT_DEBUG,
> > +    s->debug = qemu_opt_get_number(opts, GLUSTER_OPT_DEBUG,
> >                                           GLUSTER_DEBUG_DEFAULT);
> 
> Indentation is now off.  That's minor, a maintainer could fix it on commit.
> 
> > @@ -1010,14 +1010,14 @@ static int qemu_gluster_create(const char *filename,
> >      char *tmp = NULL;
> >  
> >      gconf = g_new0(BlockdevOptionsGluster, 1);
> > -    gconf->debug_level = qemu_opt_get_number_del(opts, GLUSTER_OPT_DEBUG,
> > +    gconf->debug = qemu_opt_get_number_del(opts, GLUSTER_OPT_DEBUG,
> >                                                   GLUSTER_DEBUG_DEFAULT);
> 
> and again
> 
> > +++ b/qapi/block-core.json
> > @@ -2195,7 +2195,7 @@
> >  #
> >  # @server:      gluster servers description
> >  #
> > -# @debug-level: #optional libgfapi log level (default '4' which is Error)
> > +# @debug:       #optional libgfapi log level (default '4' which is Error)
> >  #
> >  # @logfile:     #optional libgfapi log file (default /dev/stderr) (Since 2.8)
> >  #
> > @@ -2205,7 +2205,7 @@
> >    'data': { 'volume': 'str',
> >              'path': 'str',
> >              'server': ['GlusterServer'],
> > -            '*debug-level': 'int',
> > +            '*debug': 'int',
> 
> This changes what introspection shows. We already declared that
> blockdev-add is not stable in 2.7, and made some radical changes in 2.8
> that are visible through introspection.  But we WANT to avoid any more
> backwards-incompatible changes beyond 2.8, so on that grounds, this HAS
> to go in to 2.8 if it is going in at all (otherwise, we have
> inconsistent naming between QMP and the command line that we have to
> document and keep forevermore).
> 
> Reviewed-by: Eric Blake <eblake@redhat.com>
> 
> -- 
> Eric Blake   eblake redhat com    +1-919-301-3266
> Libvirt virtualization library http://libvirt.org
> 




Thanks,

Applied the series to my block branch, with Eric's indent suggestions fixed:

git://github.com/codyprime/qemu-kvm-jtc.git block

-Jeff