From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54626) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Wx9bs-0000pQ-Qu for qemu-devel@nongnu.org; Wed, 18 Jun 2014 02:44:49 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Wx9bi-00031p-Ua for qemu-devel@nongnu.org; Wed, 18 Jun 2014 02:44:40 -0400 Received: from mail-we0-x235.google.com ([2a00:1450:400c:c03::235]:51914) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Wx9bi-00031W-MW for qemu-devel@nongnu.org; Wed, 18 Jun 2014 02:44:30 -0400 Received: by mail-we0-f181.google.com with SMTP id q59so328282wes.40 for ; Tue, 17 Jun 2014 23:44:29 -0700 (PDT) Sender: Paolo Bonzini From: Paolo Bonzini Date: Wed, 18 Jun 2014 08:43:33 +0200 Message-Id: <1403073840-32603-10-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 09/36] qapi event: convert SHUTDOWN 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 This patch also eliminates build time warning caused by QAPI_EVENT_MAX = 0. Signed-off-by: Wenchao Xia Signed-off-by: Paolo Bonzini --- docs/qmp/qmp-events.txt | 15 --------------- qapi-event.json | 12 ++++++++++++ vl.c | 3 ++- 3 files changed, 14 insertions(+), 16 deletions(-) diff --git a/docs/qmp/qmp-events.txt b/docs/qmp/qmp-events.txt index 145402e..ff2f30d 100644 --- a/docs/qmp/qmp-events.txt +++ b/docs/qmp/qmp-events.txt @@ -304,21 +304,6 @@ Example: "data": { "offset": 78 }, "timestamp": { "seconds": 1267020223, "microseconds": 435656 } } -SHUTDOWN --------- - -Emitted when the Virtual Machine is powered down. - -Data: None. - -Example: - -{ "event": "SHUTDOWN", - "timestamp": { "seconds": 1267040730, "microseconds": 682951 } } - -Note: If the command-line option "-no-shutdown" has been specified, a STOP -event will eventually follow the SHUTDOWN event. - SPICE_CONNECTED, SPICE_DISCONNECTED ----------------------------------- diff --git a/qapi-event.json b/qapi-event.json index e69de29..7a6e6bf 100644 --- a/qapi-event.json +++ b/qapi-event.json @@ -0,0 +1,12 @@ +## +# @SHUTDOWN +# +# Emitted when the virtual machine has shutdown, possibly indicating that QEMU +# is about about to exit. +# +# Note: If the command-line option "-no-shutdown" has been specified, qemu will +# not exit, and a STOP event will eventually follow the SHUTDOWN event +# +# Since: 0.12.0 +## +{ 'event': 'SHUTDOWN' } diff --git a/vl.c b/vl.c index be69c7f..4dc21d3 100644 --- a/vl.c +++ b/vl.c @@ -117,6 +117,7 @@ int main(int argc, char **argv) #include "ui/qemu-spice.h" #include "qapi/string-input-visitor.h" #include "qom/object_interfaces.h" +#include "qapi-event.h" #define DEFAULT_RAM_SIZE 128 @@ -2028,7 +2029,7 @@ static bool main_loop_should_exit(void) } if (qemu_shutdown_requested()) { qemu_kill_report(); - monitor_protocol_event(QEVENT_SHUTDOWN, NULL); + qapi_event_send_shutdown(&error_abort); if (no_shutdown) { vm_stop(RUN_STATE_SHUTDOWN); } else { -- 1.9.3