From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:48034) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WsWj7-0008Sl-Eg for qemu-devel@nongnu.org; Thu, 05 Jun 2014 08:25:10 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WsWix-0001Jg-Ic for qemu-devel@nongnu.org; Thu, 05 Jun 2014 08:25:01 -0400 Received: from mail-pb0-x22d.google.com ([2607:f8b0:400e:c01::22d]:41496) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WsWix-0001JG-BY for qemu-devel@nongnu.org; Thu, 05 Jun 2014 08:24:51 -0400 Received: by mail-pb0-f45.google.com with SMTP id um1so1046833pbc.32 for ; Thu, 05 Jun 2014 05:24:50 -0700 (PDT) From: Wenchao Xia Date: Thu, 5 Jun 2014 05:22:07 -0700 Message-Id: <1401970944-18735-13-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 12/29] qapi event: convert RESUME 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 c241a07..cda67d4 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 } } -RESUME ------- - -Emitted when the Virtual Machine resumes execution. - -Data: None. - -Example: - -{ "event": "RESUME", - "timestamp": { "seconds": 1271770767, "microseconds": 582542 } } - RTC_CHANGE ---------- diff --git a/qapi-event.json b/qapi-event.json index af5a18c..3485985 100644 --- a/qapi-event.json +++ b/qapi-event.json @@ -38,3 +38,12 @@ # Since: 2.1 ## { 'event': 'STOP' } + +## +# @RESUME +# +# Emitted when the virtual machine resumes execution +# +# Since: 2.1 +## +{ 'event': 'RESUME' } diff --git a/vl.c b/vl.c index b95fc5e..d195e50 100644 --- a/vl.c +++ b/vl.c @@ -1755,7 +1755,7 @@ void vm_start(void) runstate_set(RUN_STATE_RUNNING); vm_state_notify(1, RUN_STATE_RUNNING); resume_all_vcpus(); - monitor_protocol_event(QEVENT_RESUME, NULL); + qapi_event_send_resume(NULL); } } -- 1.7.1