From patchwork Mon Jun 23 16:36:19 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luiz Capitulino X-Patchwork-Id: 363066 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 49C4B140085 for ; Tue, 24 Jun 2014 03:25:12 +1000 (EST) Received: from localhost ([::1]:54932 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Wz7RB-0002dj-Fa for incoming@patchwork.ozlabs.org; Mon, 23 Jun 2014 12:49:45 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52643) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Wz7Fh-0004mV-CL for qemu-devel@nongnu.org; Mon, 23 Jun 2014 12:38:01 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Wz7FZ-0004DR-UC for qemu-devel@nongnu.org; Mon, 23 Jun 2014 12:37:53 -0400 Received: from mx1.redhat.com ([209.132.183.28]:25223) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Wz7FZ-0004DI-EP for qemu-devel@nongnu.org; Mon, 23 Jun 2014 12:37:45 -0400 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id s5NGb1Aq009456 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 23 Jun 2014 12:37:01 -0400 Received: from localhost (ovpn-113-42.phx2.redhat.com [10.3.113.42]) by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id s5NGb1Np005530; Mon, 23 Jun 2014 12:37:01 -0400 From: Luiz Capitulino To: peter.maydell@linaro.org Date: Mon, 23 Jun 2014 12:36:19 -0400 Message-Id: <1403541403-16468-20-git-send-email-lcapitulino@redhat.com> In-Reply-To: <1403541403-16468-1-git-send-email-lcapitulino@redhat.com> References: <1403541403-16468-1-git-send-email-lcapitulino@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.22 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: qemu-devel@nongnu.org, anthony@codemonkey.ws Subject: [Qemu-devel] [PULL 19/43] qapi event: convert RESUME X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org From: Wenchao Xia Signed-off-by: Wenchao Xia Signed-off-by: Paolo Bonzini Reviewed-by: Eric Blake Signed-off-by: Luiz Capitulino --- docs/qmp/qmp-events.txt | 12 ------------ qapi-event.json | 9 +++++++++ vl.c | 4 ++-- 3 files changed, 11 insertions(+), 14 deletions(-) diff --git a/docs/qmp/qmp-events.txt b/docs/qmp/qmp-events.txt index cb32530..fb26a1a 100644 --- a/docs/qmp/qmp-events.txt +++ b/docs/qmp/qmp-events.txt @@ -274,18 +274,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 55fabf8..fb91939 100644 --- a/vl.c +++ b/vl.c @@ -736,7 +736,7 @@ void vm_start(void) * the STOP event. */ if (runstate_is_running()) { - monitor_protocol_event(QEVENT_STOP, NULL); + qapi_event_send_stop(&error_abort); } else { cpu_enable_ticks(); runstate_set(RUN_STATE_RUNNING); @@ -744,7 +744,7 @@ void vm_start(void) resume_all_vcpus(); } - monitor_protocol_event(QEVENT_RESUME, NULL); + qapi_event_send_resume(&error_abort); }