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

[Qemu-devel] [PATCH v2] 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>
---
v2:
    Explicitly list spice channel mappings
    Use ARRAY_SIZE macro

 hmp.c | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/hmp.c b/hmp.c
index 735097c..9e76368 100644
--- a/hmp.c
+++ b/hmp.c
@@ -29,6 +29,10 @@
 #include "block/qapi.h"
 #include "qemu-io.h"
 
+#ifdef CONFIG_SPICE
+#include <spice/enums.h>
+#endif
+
 static void hmp_handle_error(Monitor *mon, Error **errp)
 {
     assert(errp);
@@ -545,6 +549,20 @@ void hmp_info_spice(Monitor *mon, const QDict *qdict)
 {
     SpiceChannelList *chan;
     SpiceInfo *info;
+    const char *channel_name;
+    const char * const channel_names[] = {
+        [ SPICE_CHANNEL_MAIN ] = "main",
+        [ SPICE_CHANNEL_DISPLAY] = "display",
+        [ SPICE_CHANNEL_INPUTS ] = "input",
+        [ SPICE_CHANNEL_CURSOR ] = "cursor",
+        [ SPICE_CHANNEL_PLAYBACK ] = "playback",
+        [ SPICE_CHANNEL_RECORD ] = "record",
+        [ SPICE_CHANNEL_TUNNEL ] = "tunnel",
+        [ SPICE_CHANNEL_SMARTCARD ] = "smartcard",
+        [ SPICE_CHANNEL_USBREDIR ] = "usbredir",
+        [ SPICE_CHANNEL_PORT ] = "port",
+        [ SPICE_CHANNEL_WEBDAV ] = "webdav",
+    };
 
     info = qmp_query_spice(NULL);
 
@@ -581,6 +599,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 < ARRAY_SIZE(channel_names)) {
+                channel_name = channel_names[chan->value->channel_type];
+            }
+
+            monitor_printf(mon, "     channel name: %s\n", channel_name);
         }
     }
 
-- 
2.1.0

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

[Eric Blake]

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

On 02/27/2015 08:36 AM, Cole Robinson wrote:
> Useful for debugging.
> 
> https://bugzilla.redhat.com/show_bug.cgi?id=822418
> Signed-off-by: Cole Robinson <crobinso@redhat.com>
> ---
> v2:
>     Explicitly list spice channel mappings
>     Use ARRAY_SIZE macro
> 
>  hmp.c | 26 ++++++++++++++++++++++++++
>  1 file changed, 26 insertions(+)
> 

> +    const char *channel_name;
> +    const char * const channel_names[] = {
> +        [ SPICE_CHANNEL_MAIN ] = "main",
> +        [ SPICE_CHANNEL_DISPLAY] = "display",
> +        [ SPICE_CHANNEL_INPUTS ] = "input",

Why 'input' instead of 'inputs'?

> +        [ SPICE_CHANNEL_CURSOR ] = "cursor",
> +        [ SPICE_CHANNEL_PLAYBACK ] = "playback",
> +        [ SPICE_CHANNEL_RECORD ] = "record",
> +        [ SPICE_CHANNEL_TUNNEL ] = "tunnel",
> +        [ SPICE_CHANNEL_SMARTCARD ] = "smartcard",
> +        [ SPICE_CHANNEL_USBREDIR ] = "usbredir",
> +        [ SPICE_CHANNEL_PORT ] = "port",
> +        [ SPICE_CHANNEL_WEBDAV ] = "webdav",
> +    };

Are we guaranteed that this array is never sparse?

> +            channel_name = "unknown";
> +            if (chan->value->channel_type > 0 &&
> +                chan->value->channel_type < ARRAY_SIZE(channel_names)) {
> +                channel_name = channel_names[chan->value->channel_type];

If it could be sparse, you might need an additional '&&
channel_names[chan->value->channel_type]' in the conditional.  Otherwise,

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

[Cole Robinson]

On 02/27/2015 01:26 PM, Eric Blake wrote:
> On 02/27/2015 08:36 AM, Cole Robinson wrote:
>> Useful for debugging.
>>
>> https://bugzilla.redhat.com/show_bug.cgi?id=822418
>> Signed-off-by: Cole Robinson <crobinso@redhat.com>
>> ---
>> v2:
>>     Explicitly list spice channel mappings
>>     Use ARRAY_SIZE macro
>>
>>  hmp.c | 26 ++++++++++++++++++++++++++
>>  1 file changed, 26 insertions(+)
>>
> 
>> +    const char *channel_name;
>> +    const char * const channel_names[] = {
>> +        [ SPICE_CHANNEL_MAIN ] = "main",
>> +        [ SPICE_CHANNEL_DISPLAY] = "display",
>> +        [ SPICE_CHANNEL_INPUTS ] = "input",
> 
> Why 'input' instead of 'inputs'?
> 
>> +        [ SPICE_CHANNEL_CURSOR ] = "cursor",
>> +        [ SPICE_CHANNEL_PLAYBACK ] = "playback",
>> +        [ SPICE_CHANNEL_RECORD ] = "record",
>> +        [ SPICE_CHANNEL_TUNNEL ] = "tunnel",
>> +        [ SPICE_CHANNEL_SMARTCARD ] = "smartcard",
>> +        [ SPICE_CHANNEL_USBREDIR ] = "usbredir",
>> +        [ SPICE_CHANNEL_PORT ] = "port",
>> +        [ SPICE_CHANNEL_WEBDAV ] = "webdav",
>> +    };
> 
> Are we guaranteed that this array is never sparse?
> 
>> +            channel_name = "unknown";
>> +            if (chan->value->channel_type > 0 &&
>> +                chan->value->channel_type < ARRAY_SIZE(channel_names)) {
>> +                channel_name = channel_names[chan->value->channel_type];
> 
> If it could be sparse, you might need an additional '&&
> channel_names[chan->value->channel_type]' in the conditional.  Otherwise,
> 
> Reviewed-by: Eric Blake <eblake@redhat.com>
> 

I've sent v3 with those bits fixed (and some checkpatch warnings :/ )

Thanks,
Cole