[Qemu-devel] [PATCH] hmp: info spice: Show string channel name

[Qemu-devel] [PATCH] hmp: info spice: Show string channel name

[Cole Robinson]

Useful for debugging.

https://bugzilla.redhat.com/show_bug.cgi?id=822418
Signed-off-by: Cole Robinson <crobinso@redhat.com>
---
 hmp.c | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/hmp.c b/hmp.c
index 735097c..93fd5cd 100644
--- a/hmp.c
+++ b/hmp.c
@@ -545,6 +545,11 @@ void hmp_info_spice(Monitor *mon, const QDict *qdict)
 {
     SpiceChannelList *chan;
     SpiceInfo *info;
+    const char *channel_name;
+    /* String representations of SPICE_CHANNEL_* enum */
+    const char * const channel_names[] = {"main", "display", "input", "cursor",
+        "playback", "record", "tunnel", "smartcard", "usbredir", "port",
+        "webdav"};
 
     info = qmp_query_spice(NULL);
 
@@ -581,6 +586,14 @@ void hmp_info_spice(Monitor *mon, const QDict *qdict)
                            chan->value->connection_id);
             monitor_printf(mon, "     channel: %" PRId64 ":%" PRId64 "\n",
                            chan->value->channel_type, chan->value->channel_id);
+
+            channel_name = "unknown";
+            if (chan->value->channel_type > 0 &&
+                chan->value->channel_type <= sizeof(channel_names)) {
+                channel_name = channel_names[chan->value->channel_type - 1];
+            }
+
+            monitor_printf(mon, "     channel name: %s\n", channel_name);
         }
     }
 
-- 
2.1.0

Re: [Qemu-devel] [PATCH] hmp: info spice: Show string channel name

[Eric Blake]

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

On 02/26/2015 12:02 PM, Cole Robinson wrote:
> Useful for debugging.
> 
> https://bugzilla.redhat.com/show_bug.cgi?id=822418
> Signed-off-by: Cole Robinson <crobinso@redhat.com>
> ---
>  hmp.c | 13 +++++++++++++
>  1 file changed, 13 insertions(+)
> 
> diff --git a/hmp.c b/hmp.c
> index 735097c..93fd5cd 100644
> --- a/hmp.c
> +++ b/hmp.c
> @@ -545,6 +545,11 @@ void hmp_info_spice(Monitor *mon, const QDict *qdict)
>  {
>      SpiceChannelList *chan;
>      SpiceInfo *info;
> +    const char *channel_name;
> +    /* String representations of SPICE_CHANNEL_* enum */
> +    const char * const channel_names[] = {"main", "display", "input", "cursor",
> +        "playback", "record", "tunnel", "smartcard", "usbredir", "port",
> +        "webdav"};
>  

Hmm. I wonder if we should have a QAPI enum for this, instead of
open-coding it here.  But as this is already a strict improvement,

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] hmp: info spice: Show string channel name

[Gerd Hoffmann]

On Do, 2015-02-26 at 13:48 -0700, Eric Blake wrote:
> On 02/26/2015 12:02 PM, Cole Robinson wrote:
> > Useful for debugging.
> > 
> > https://bugzilla.redhat.com/show_bug.cgi?id=822418
> > Signed-off-by: Cole Robinson <crobinso@redhat.com>
> > ---
> >  hmp.c | 13 +++++++++++++
> >  1 file changed, 13 insertions(+)
> > 
> > diff --git a/hmp.c b/hmp.c
> > index 735097c..93fd5cd 100644
> > --- a/hmp.c
> > +++ b/hmp.c
> > @@ -545,6 +545,11 @@ void hmp_info_spice(Monitor *mon, const QDict *qdict)
> >  {
> >      SpiceChannelList *chan;
> >      SpiceInfo *info;
> > +    const char *channel_name;
> > +    /* String representations of SPICE_CHANNEL_* enum */
> > +    const char * const channel_names[] = {"main", "display", "input", "cursor",
> > +        "playback", "record", "tunnel", "smartcard", "usbredir", "port",
> > +        "webdav"};
> >  
> 
> Hmm. I wonder if we should have a QAPI enum for this, instead of
> open-coding it here.  But as this is already a strict improvement,

These numbers are defined by spice not qemu, so a qapi enum isn't going
to fly here.

Nevertheless it would be great to declare the array using c99 syntax ...

    [ SPICE_CHANNEL_foo ] = "foo",

... to make clear how we are mapping spice enums (or #defines?) to
strings here.

cheers,
  Gerd

Re: [Qemu-devel] [PATCH] hmp: info spice: Show string channel name

[Cole Robinson]

On 02/27/2015 02:35 AM, Gerd Hoffmann wrote:
> On Do, 2015-02-26 at 13:48 -0700, Eric Blake wrote:
>> On 02/26/2015 12:02 PM, Cole Robinson wrote:
>>> Useful for debugging.
>>>
>>> https://bugzilla.redhat.com/show_bug.cgi?id=822418
>>> Signed-off-by: Cole Robinson <crobinso@redhat.com>
>>> ---
>>>  hmp.c | 13 +++++++++++++
>>>  1 file changed, 13 insertions(+)
>>>
>>> diff --git a/hmp.c b/hmp.c
>>> index 735097c..93fd5cd 100644
>>> --- a/hmp.c
>>> +++ b/hmp.c
>>> @@ -545,6 +545,11 @@ void hmp_info_spice(Monitor *mon, const QDict *qdict)
>>>  {
>>>      SpiceChannelList *chan;
>>>      SpiceInfo *info;
>>> +    const char *channel_name;
>>> +    /* String representations of SPICE_CHANNEL_* enum */
>>> +    const char * const channel_names[] = {"main", "display", "input", "cursor",
>>> +        "playback", "record", "tunnel", "smartcard", "usbredir", "port",
>>> +        "webdav"};
>>>  
>>
>> Hmm. I wonder if we should have a QAPI enum for this, instead of
>> open-coding it here.  But as this is already a strict improvement,
> 
> These numbers are defined by spice not qemu, so a qapi enum isn't going
> to fly here.
> 
> Nevertheless it would be great to declare the array using c99 syntax ...
> 
>     [ SPICE_CHANNEL_foo ] = "foo",
> 
> ... to make clear how we are mapping spice enums (or #defines?) to
> strings here.
> 
> cheers,
>   Gerd
> 
> 
> 

Good idea, I'll send a v2

Thanks,
Cole