Re: [Qemu-devel] [V3 1/3] Enhance "info block" to display hostcache setting

[Kevin Wolf]

Am 17.06.2011 18:37, schrieb Supriya Kannery:
> Enhance "info block" to display hostcache setting for each
> block device.
> 
> Example:
> (qemu) info block
> ide0-hd0: type=hd removable=0 file=../rhel6-32.qcow2 ro=0 drv=qcow2
> encrypted=0
> 
> Enhanced to display "hostcache" setting:
> (qemu) info block
> ide0-hd0: type=hd removable=0 hostcache=true file=../rhel6-32.qcow2 
> ro=0 drv=qcow2 encrypted=0
> 
> Signed-off-by: Supriya Kannery <address@hidden>
> 
> ---
>  block.c         |   21 +++++++++++++++++----
>  qmp-commands.hx |    2 ++
>  2 files changed, 19 insertions(+), 4 deletions(-)
> 
> Index: qemu/block.c
> ===================================================================
> --- qemu.orig/block.c
> +++ qemu/block.c
> @@ -1694,6 +1694,14 @@ static void bdrv_print_dict(QObject *obj
>          monitor_printf(mon, " locked=%d", qdict_get_bool(bs_dict, "locked"));
>      }
>  
> +     if (qdict_haskey(bs_dict, "open_flags")) {
> +             int open_flags = qdict_get_int(bs_dict, "open_flags");
> +             if (open_flags & BDRV_O_NOCACHE)
> +                     monitor_printf(mon, " hostcache=false");
> +             else
> +                     monitor_printf(mon, " hostcache=true");

Coding style requires braces.

> +     }
> +
>      if (qdict_haskey(bs_dict, "inserted")) {
>          QDict *qdict = qobject_to_qdict(qdict_get(bs_dict, "inserted"));
>  
> @@ -1730,13 +1738,18 @@ void bdrv_info(Monitor *mon, QObject **r
>          QObject *bs_obj;
>  
>          bs_obj = qobject_from_jsonf("{ 'device': %s, 'type': 'unknown', "
> -                                    "'removable': %i, 'locked': %i }",
> -                                    bs->device_name, bs->removable,
> -                                    bs->locked);
> +                                                                      
> "'removable': %i, 'locked': %i, "
> +                                                                      
> "'hostcache': %s }",
> +                                                                      
> bs->device_name, bs->removable,
> +                                                                      
> bs->locked,
> +                                                                      
> (bs->open_flags & BDRV_O_NOCACHE) ?
> +                                                                      
> "false" : "true");

Don't use tabs.

Kevin