From patchwork Wed Jun 18 06:43:36 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 361292 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 DABED140081 for ; Wed, 18 Jun 2014 16:54:35 +1000 (EST) Received: from localhost ([::1]:55312 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Wx9lR-00070A-Rt for incoming@patchwork.ozlabs.org; Wed, 18 Jun 2014 02:54:33 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54656) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Wx9bw-0000wR-LA for qemu-devel@nongnu.org; Wed, 18 Jun 2014 02:44:53 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Wx9bn-00033N-Gs for qemu-devel@nongnu.org; Wed, 18 Jun 2014 02:44:44 -0400 Received: from mail-we0-x22b.google.com ([2a00:1450:400c:c03::22b]:49298) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Wx9bn-000339-9S for qemu-devel@nongnu.org; Wed, 18 Jun 2014 02:44:35 -0400 Received: by mail-we0-f171.google.com with SMTP id q58so337980wes.2 for ; Tue, 17 Jun 2014 23:44:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=YrvnK+NdnNaf7xfCMBdhKr9tBHqzHAX7mEpktMbfYxQ=; b=reNIksa87kb+zpAHAdDdgDe4DrR9l/POtDQdFiVrRI8um07sUtME0RzRSzJfMIUKpi ER/NYV0KNmH1lFcxfVlq/GSHeku3bv6vc6fynxsYEP37HbgPR1Ij11Cz6mgIUPNw9Xpu t6zOKE93nUFqMIBawScGtU5FKAt3Ddmqo2o8EzuNfXgUfsPcKY8LON9zXbEhQ4LCTvzP 0UPOJ71y9oivwla1nSkisjXmbnxR+oEG+NRjgCJqSbJIyvdsNVHtRseyDklCQnsYz89k MR3AfRjRMhKWnGOwn/CcSVm4xOtb7IjFYrdyCfiEYyqC7omoc5IvqAi8HdORPuhzF92E zIxg== X-Received: by 10.194.222.197 with SMTP id qo5mr20850721wjc.78.1403073874453; Tue, 17 Jun 2014 23:44:34 -0700 (PDT) Received: from yakj.station (net-37-117-140-88.cust.vodafonedsl.it. [37.117.140.88]) by mx.google.com with ESMTPSA id o49sm3303341eew.30.2014.06.17.23.44.33 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 17 Jun 2014 23:44:33 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Wed, 18 Jun 2014 08:43:36 +0200 Message-Id: <1403073840-32603-13-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.9.3 In-Reply-To: <1403073840-32603-1-git-send-email-pbonzini@redhat.com> References: <1403073840-32603-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2a00:1450:400c:c03::22b Cc: wenchaoqemu@gmail.com, lcapitulino@redhat.com Subject: [Qemu-devel] [PATCH 2.1 12/36] qapi event: convert STOP 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 --- cpus.c | 5 +++-- docs/qmp/qmp-events.txt | 12 ------------ qapi-event.json | 9 +++++++++ 3 files changed, 12 insertions(+), 14 deletions(-) diff --git a/cpus.c b/cpus.c index dd7ac13..87ac99f 100644 --- a/cpus.c +++ b/cpus.c @@ -25,7 +25,7 @@ /* Needed early for CONFIG_BSD etc. */ #include "config-host.h" -#include "monitor/monitor.h" +#include "qapi/qmp/qerror.h" #include "sysemu/sysemu.h" #include "exec/gdbstub.h" #include "sysemu/dma.h" @@ -38,6 +38,7 @@ #include "qemu/main-loop.h" #include "qemu/bitmap.h" #include "qemu/seqlock.h" +#include "qapi-event.h" #ifndef _WIN32 #include "qemu/compatfd.h" @@ -530,7 +531,7 @@ static int do_vm_stop(RunState state) pause_all_vcpus(); runstate_set(state); vm_state_notify(0, state); - monitor_protocol_event(QEVENT_STOP, NULL); + qapi_event_send_stop(&error_abort); } bdrv_drain_all(); diff --git a/docs/qmp/qmp-events.txt b/docs/qmp/qmp-events.txt index 20e3151..c241a07 100644 --- a/docs/qmp/qmp-events.txt +++ b/docs/qmp/qmp-events.txt @@ -354,18 +354,6 @@ Example: "channel-id": 0, "tls": true} }} -STOP ----- - -Emitted when the Virtual Machine is stopped. - -Data: None. - -Example: - -{ "event": "STOP", - "timestamp": { "seconds": 1267041730, "microseconds": 281295 } } - SUSPEND ------- diff --git a/qapi-event.json b/qapi-event.json index f38669d..bac7fdc 100644 --- a/qapi-event.json +++ b/qapi-event.json @@ -29,3 +29,12 @@ # Since: 0.12.0 ## { 'event': 'RESET' } + +## +# @STOP +# +# Emitted when the virtual machine is stopped +# +# Since: 0.12.0 +## +{ 'event': 'STOP' }