[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 08/10] vnc: factor out qmp_query_client_list
From: |
Gerd Hoffmann |
Subject: |
[Qemu-devel] [PULL 08/10] vnc: factor out qmp_query_client_list |
Date: |
Fri, 19 Dec 2014 10:04:24 +0100 |
so we can reuse it for the new vnc query command.
Signed-off-by: Gerd Hoffmann <address@hidden>
---
ui/vnc.c | 30 +++++++++++++++---------------
1 file changed, 15 insertions(+), 15 deletions(-)
diff --git a/ui/vnc.c b/ui/vnc.c
index 2ed16dc..d7c7865 100644
--- a/ui/vnc.c
+++ b/ui/vnc.c
@@ -385,6 +385,20 @@ static VncDisplay *vnc_display_find(const char *id)
return NULL;
}
+static VncClientInfoList *qmp_query_client_list(VncDisplay *vd)
+{
+ VncClientInfoList *cinfo, *prev = NULL;
+ VncState *client;
+
+ QTAILQ_FOREACH(client, &vd->clients, next) {
+ cinfo = g_new0(VncClientInfoList, 1);
+ cinfo->value = qmp_query_vnc_client(client);
+ cinfo->next = prev;
+ prev = cinfo;
+ }
+ return prev;
+}
+
VncInfo *qmp_query_vnc(Error **errp)
{
VncInfo *info = g_malloc0(sizeof(*info));
@@ -393,30 +407,16 @@ VncInfo *qmp_query_vnc(Error **errp)
if (vd == NULL || vd->display == NULL) {
info->enabled = false;
} else {
- VncClientInfoList *cur_item = NULL;
struct sockaddr_storage sa;
socklen_t salen = sizeof(sa);
char host[NI_MAXHOST];
char serv[NI_MAXSERV];
- VncState *client;
info->enabled = true;
/* for compatibility with the original command */
info->has_clients = true;
-
- QTAILQ_FOREACH(client, &vd->clients, next) {
- VncClientInfoList *cinfo = g_malloc0(sizeof(*info));
- cinfo->value = qmp_query_vnc_client(client);
-
- /* XXX: waiting for the qapi to support GSList */
- if (!cur_item) {
- info->clients = cur_item = cinfo;
- } else {
- cur_item->next = cinfo;
- cur_item = cinfo;
- }
- }
+ info->clients = qmp_query_client_list(vd);
if (vd->lsock == -1) {
return info;
--
1.8.3.1
- [Qemu-devel] [PULL 02/10] vnc: remove unused DisplayState parameter, add id instead., (continued)
- [Qemu-devel] [PULL 02/10] vnc: remove unused DisplayState parameter, add id instead., Gerd Hoffmann, 2014/12/19
- [Qemu-devel] [PULL 06/10] vnc: update docs/multiseat.txt, Gerd Hoffmann, 2014/12/19
- [Qemu-devel] [PULL 04/10] vnc: switch to QemuOpts, allow multiple servers, Gerd Hoffmann, 2014/12/19
- [Qemu-devel] [PULL 09/10] monitor: add query-vnc2 command, Gerd Hoffmann, 2014/12/19
- [Qemu-devel] [PULL 10/10] monitor: add vnc websockets, Gerd Hoffmann, 2014/12/19
- [Qemu-devel] [PULL 03/10] vnc: add display id to acl names, Gerd Hoffmann, 2014/12/19
- [Qemu-devel] [PULL 05/10] vnc: allow binding servers to qemu consoles, Gerd Hoffmann, 2014/12/19
- [Qemu-devel] [PULL 07/10] vnc: track & limit connections, Gerd Hoffmann, 2014/12/19
- [Qemu-devel] [PULL 08/10] vnc: factor out qmp_query_client_list,
Gerd Hoffmann <=
- [Qemu-devel] [PULL 01/10] vnc: remove vnc_display global, Gerd Hoffmann, 2014/12/19
- Re: [Qemu-devel] [PULL 00/10] vnc: add support for multiple vnc displays, Markus Armbruster, 2014/12/19