Commit 1a417e46 authored by Prasanna Kumar Kalever's avatar Prasanna Kumar Kalever Committed by Jeff Cody
Browse files

block/gluster: fix QMP to match debug option 



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: default avatarEric Blake <eblake@redhat.com>
Signed-off-by: default avatarPrasanna Kumar Kalever <prasanna.kalever@redhat.com>
Reviewed-by: default avatarEric Blake <eblake@redhat.com>
Signed-off-by: default avatarJeff Cody <jcody@redhat.com>
parent bc66cedb

block/gluster.c

+20 −20
Original line number Diff line number Diff line
@@ -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 {
@@ -434,7 +434,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;

    }
@@ -788,17 +788,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);
@@ -874,8 +874,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);
@@ -1011,14 +1011,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) {

qapi/block-core.json

+2 −2
Original line number Diff line number Diff line
@@ -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' } }



##