From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54645) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Wx9bu-0000tH-Uy for qemu-devel@nongnu.org; Wed, 18 Jun 2014 02:44:51 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Wx9bl-00032w-UT for qemu-devel@nongnu.org; Wed, 18 Jun 2014 02:44:42 -0400 Received: from mail-we0-x230.google.com ([2a00:1450:400c:c03::230]:57001) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Wx9bl-00032j-OM for qemu-devel@nongnu.org; Wed, 18 Jun 2014 02:44:33 -0400 Received: by mail-we0-f176.google.com with SMTP id u56so337747wes.35 for ; Tue, 17 Jun 2014 23:44:32 -0700 (PDT) Sender: Paolo Bonzini From: Paolo Bonzini Date: Wed, 18 Jun 2014 08:43:35 +0200 Message-Id: <1403073840-32603-12-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 11/36] qapi event: convert RESET 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 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 ca08289..f38669d 100644 --- a/qapi-event.json +++ b/qapi-event.json @@ -20,3 +20,12 @@ # Since: 0.12.0 ## { 'event': 'POWERDOWN' } + +## +# @RESET +# +# Emitted when the virtual machine is reset +# +# Since: 0.12.0 +## +{ 'event': 'RESET' } diff --git a/vl.c b/vl.c index 9ade3cb..097fa65 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(&error_abort); } cpu_synchronize_all_post_reset(); } -- 1.9.3