From patchwork Thu Jan 14 16:50:58 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luiz Capitulino X-Patchwork-Id: 42918 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 3E1ECB7CDA for ; Fri, 15 Jan 2010 04:17:08 +1100 (EST) Received: from localhost ([127.0.0.1]:37459 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NVTCp-0006e4-0w for incoming@patchwork.ozlabs.org; Thu, 14 Jan 2010 12:09:59 -0500 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NVSvg-0007LH-SX for qemu-devel@nongnu.org; Thu, 14 Jan 2010 11:52:16 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NVSvb-0007G9-HQ for qemu-devel@nongnu.org; Thu, 14 Jan 2010 11:52:15 -0500 Received: from [199.232.76.173] (port=44459 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NVSva-0007Ft-Te for qemu-devel@nongnu.org; Thu, 14 Jan 2010 11:52:11 -0500 Received: from mx1.redhat.com ([209.132.183.28]:23624) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NVSva-0002F1-9t for qemu-devel@nongnu.org; Thu, 14 Jan 2010 11:52:10 -0500 Received: from int-mx04.intmail.prod.int.phx2.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.17]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id o0EGq9El015938 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Thu, 14 Jan 2010 11:52:09 -0500 Received: from localhost (vpn-10-170.rdu.redhat.com [10.11.10.170]) by int-mx04.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id o0EGq7fc021676; Thu, 14 Jan 2010 11:52:08 -0500 From: Luiz Capitulino To: qemu-devel@nongnu.org Date: Thu, 14 Jan 2010 14:50:58 -0200 Message-Id: <1263487859-6318-8-git-send-email-lcapitulino@redhat.com> In-Reply-To: <1263487859-6318-1-git-send-email-lcapitulino@redhat.com> References: <1263487859-6318-1-git-send-email-lcapitulino@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.17 X-detected-operating-system: by monty-python.gnu.org: Genre and OS details not recognized. Cc: armbru@redhat.com Subject: [Qemu-devel] [PATCH 7/8] QMP: Introduce VNC_DISCONNECTED event X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org It's emitted when a VNC client disconnects from QEMU, client's information such as port and IP address are provided. Event example: { "event": "VNC_DISCONNECTED", "timestamp": { "seconds": 1262976601, "microseconds": 975795 }, "data": { "server": { "auth": "sasl", "family": "ipv4", "service": "5901", "host": "0.0.0.0" }, "client": { "family": "ipv4", "service": "58425", "host": "127.0.0.1", "sasl_username": "foo" } } } Signed-off-by: Luiz Capitulino --- QMP/qmp-events.txt | 6 ++++++ monitor.c | 3 +++ monitor.h | 1 + vnc.c | 2 ++ 4 files changed, 12 insertions(+), 0 deletions(-) diff --git a/QMP/qmp-events.txt b/QMP/qmp-events.txt index d36da46..1e87eb1 100644 --- a/QMP/qmp-events.txt +++ b/QMP/qmp-events.txt @@ -31,3 +31,9 @@ Data: None. Description: Issued when a VNC client establishes a connection. Data: 'server' and 'client' keys with the same keys as 'query-vnc', except that authentication ID is not provided. + +5 VNC_DISCONNECTED +------------------ + +Description: Issued when the conection is closed. +Data: 'server' and 'client' keys with the same keys as 'query-vnc'. diff --git a/monitor.c b/monitor.c index 4a6af42..5ac1c5c 100644 --- a/monitor.c +++ b/monitor.c @@ -360,6 +360,9 @@ void monitor_protocol_event(MonitorEvent event, QObject *data) case QEVENT_VNC_CONNECTED: event_name = "VNC_CONNECTED"; break; + case QEVENT_VNC_DISCONNECTED: + event_name = "VNC_DISCONNECTED"; + break; default: abort(); break; diff --git a/monitor.h b/monitor.h index 4d57679..42386de 100644 --- a/monitor.h +++ b/monitor.h @@ -21,6 +21,7 @@ typedef enum MonitorEvent { QEVENT_POWERDOWN, QEVENT_STOP, QEVENT_VNC_CONNECTED, + QEVENT_VNC_DISCONNECTED, QEVENT_MAX, } MonitorEvent; diff --git a/vnc.c b/vnc.c index 6d488e5..a590bb9 100644 --- a/vnc.c +++ b/vnc.c @@ -1108,6 +1108,8 @@ static void vnc_disconnect_start(VncState *vs) static void vnc_disconnect_finish(VncState *vs) { + vnc_qmp_event(vs, QEVENT_VNC_DISCONNECTED); + if (vs->input.buffer) { qemu_free(vs->input.buffer); vs->input.buffer = NULL;