From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54688) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Wx9c1-00013w-0R for qemu-devel@nongnu.org; Wed, 18 Jun 2014 02:45:00 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Wx9br-00034N-TC for qemu-devel@nongnu.org; Wed, 18 Jun 2014 02:44:48 -0400 Received: from mail-wg0-x230.google.com ([2a00:1450:400c:c00::230]:37621) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Wx9br-00034B-Ln for qemu-devel@nongnu.org; Wed, 18 Jun 2014 02:44:39 -0400 Received: by mail-wg0-f48.google.com with SMTP id n12so331802wgh.19 for ; Tue, 17 Jun 2014 23:44:35 -0700 (PDT) Sender: Paolo Bonzini From: Paolo Bonzini Date: Wed, 18 Jun 2014 08:43:37 +0200 Message-Id: <1403073840-32603-14-git-send-email-pbonzini@redhat.com> In-Reply-To: <1403073840-32603-1-git-send-email-pbonzini@redhat.com> References: <1403073840-32603-1-git-send-email-pbonzini@redhat.com> Subject: [Qemu-devel] [PATCH 2.1 13/36] qapi event: convert RESUME List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: wenchaoqemu@gmail.com, lcapitulino@redhat.com From: Wenchao Xia Signed-off-by: Wenchao Xia Signed-off-by: Paolo Bonzini --- 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 bac7fdc..ac903ef 100644 --- a/qapi-event.json +++ b/qapi-event.json @@ -38,3 +38,12 @@ # Since: 0.12.0 ## { 'event': 'STOP' } + +## +# @RESUME +# +# Emitted when the virtual machine resumes execution +# +# Since: 0.12.0 +## +{ 'event': 'RESUME' } diff --git a/vl.c b/vl.c index 097fa65..3d56d40 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(&error_abort); } } -- 1.9.3