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 <ebl...@redhat.com> > > Signed-off-by: Prasanna Kumar Kalever <prasanna.kale...@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 <ebl...@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