Commit 32a97ea1 authored by Laszlo Ersek's avatar Laszlo Ersek Committed by Luiz Capitulino
Browse files

char: report frontend open/closed state in 'query-chardev' 

In addition to the on-line reporting added in the previous patch, allow
libvirt to query frontend state independently of events.

Libvirt's path to identify the guest agent channel it cares about differs
between the event added in the previous patch and the QMP response field
added here. The event identifies the frontend device, by "id". The
'query-chardev' QMP command identifies the backend device (again by "id").
The association is under libvirt's control.

RHBZ: https://bugzilla.redhat.com/show_bug.cgi?id=1080376



Reviewed-by: default avatarAmit Shah <amit.shah@redhat.com>
Signed-off-by: default avatarLaszlo Ersek <lersek@redhat.com>
Reviewed-by: default avatarEric Blake <eblake@redhat.com>
Signed-off-by: default avatarLuiz Capitulino <lcapitulino@redhat.com>
parent e2ae6159

qapi-schema.json

+7 −1
Original line number Diff line number Diff line
@@ -214,12 +214,18 @@ 
#

# @filename: the filename of the character device

#

# @frontend-open: shows whether the frontend device attached to this backend

#                 (eg. with the chardev=... option) is in open or closed state

#                 (since 2.1)

#

# Notes: @filename is encoded using the QEMU command line character device

#        encoding.  See the QEMU man page for details.

#

# Since: 0.14.0

##

{ 'type': 'ChardevInfo', 'data': {'label': 'str', 'filename': 'str'} }

{ 'type': 'ChardevInfo', 'data': {'label': 'str',

                                  'filename': 'str',

                                  'frontend-open': 'bool'} }



##

# @query-chardev:

qemu-char.c

+1 −0
Original line number Diff line number Diff line
@@ -3705,6 +3705,7 @@ ChardevInfoList *qmp_query_chardev(Error **errp) 
        info->value = g_malloc0(sizeof(*info->value));

        info->value->label = g_strdup(chr->label);

        info->value->filename = g_strdup(chr->filename);

        info->value->frontend_open = chr->fe_open;



        info->next = chr_list;

        chr_list = info;

qmp-commands.hx

+14 −5
Original line number Diff line number Diff line
@@ -1921,6 +1921,8 @@ Each json-object contain the following: 


- "label": device's label (json-string)

- "filename": device's file (json-string)

- "frontend-open": open/closed state of the frontend device attached to this

                   backend (json-bool)



Example:
@@ -1928,12 +1930,19 @@ Example: 
<- {

      "return": [

         {

            "label":"monitor",

            "filename":"stdio"

            "label": "charchannel0",

            "filename": "unix:/var/lib/libvirt/qemu/seabios.rhel6.agent,server",

            "frontend-open": false

         },

         {

            "label":"serial0",

            "filename":"vc"

            "label": "charmonitor",

            "filename": "unix:/var/lib/libvirt/qemu/seabios.rhel6.monitor,server",

            "frontend-open": true

         },

         {

            "label": "charserial0",

            "filename": "pty:/dev/pts/2",

            "frontend-open": true

         }

      ]

   }