From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47520) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WsWip-0007xo-LU for qemu-devel@nongnu.org; Thu, 05 Jun 2014 08:24:52 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WsWig-0001E9-DY for qemu-devel@nongnu.org; Thu, 05 Jun 2014 08:24:43 -0400 Received: from mail-pb0-x22e.google.com ([2607:f8b0:400e:c01::22e]:42035) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WsWig-0001Dt-6o for qemu-devel@nongnu.org; Thu, 05 Jun 2014 08:24:34 -0400 Received: by mail-pb0-f46.google.com with SMTP id rq2so1049070pbb.33 for ; Thu, 05 Jun 2014 05:24:33 -0700 (PDT) From: Wenchao Xia Date: Thu, 5 Jun 2014 05:22:05 -0700 Message-Id: <1401970944-18735-11-git-send-email-wenchaoqemu@gmail.com> In-Reply-To: <1401970944-18735-1-git-send-email-wenchaoqemu@gmail.com> References: <1401970944-18735-1-git-send-email-wenchaoqemu@gmail.com> Subject: [Qemu-devel] [PATCH V6 10/29] qapi event: convert RESET List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: mdroth@linux.vnet.ibm.com, armbru@redhat.com, Wenchao Xia , lcapitulino@redhat.com Signed-off-by: Wenchao Xia --- docs/qmp/qmp-events.txt | 12 ------------ qapi-event.json | 9 +++++++++ vl.c | 2 +- 3 files changed, 10 insertions(+), 13 deletions(-) diff --git a/docs/qmp/qmp-events.txt b/docs/qmp/qmp-events.txt index ff2f30d..20e3151 100644 --- a/docs/qmp/qmp-events.txt +++ b/docs/qmp/qmp-events.txt @@ -264,18 +264,6 @@ Example: "data": { "node-name": "1.raw", "sector-num": 345435, "sector-count": 5 }, "timestamp": { "seconds": 1344522075, "microseconds": 745528 } } -RESET ------ - -Emitted when the Virtual Machine is reseted. - -Data: None. - -Example: - -{ "event": "RESET", - "timestamp": { "seconds": 1267041653, "microseconds": 9518 } } - RESUME ------ diff --git a/qapi-event.json b/qapi-event.json index fbdbc7c..6f27555 100644 --- a/qapi-event.json +++ b/qapi-event.json @@ -20,3 +20,12 @@ # Since: 2.1 ## { 'event': 'POWERDOWN' } + +## +# @RESET +# +# Emitted when the virtual machine is reset +# +# Since: 2.1 +## +{ 'event': 'RESET' } diff --git a/vl.c b/vl.c index 69ad0e9..b95fc5e 100644 --- a/vl.c +++ b/vl.c @@ -1907,7 +1907,7 @@ void qemu_system_reset(bool report) qemu_devices_reset(); } if (report) { - monitor_protocol_event(QEVENT_RESET, NULL); + qapi_event_send_reset(NULL); } cpu_synchronize_all_post_reset(); } -- 1.7.1