From patchwork Thu Jun 5 12:22:22 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wenchao Xia X-Patchwork-Id: 356366 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 85D1D1400DE for ; Thu, 5 Jun 2014 22:35:09 +1000 (EST) Received: from localhost ([::1]:40535 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WsWst-0000Or-Dp for incoming@patchwork.ozlabs.org; Thu, 05 Jun 2014 08:35:07 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52858) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WsWlq-0003zm-8k for qemu-devel@nongnu.org; Thu, 05 Jun 2014 08:27:59 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WsWlh-0002TX-5M for qemu-devel@nongnu.org; Thu, 05 Jun 2014 08:27:50 -0400 Received: from mail-pb0-x22c.google.com ([2607:f8b0:400e:c01::22c]:64198) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WsWlg-0002TP-P4 for qemu-devel@nongnu.org; Thu, 05 Jun 2014 08:27:41 -0400 Received: by mail-pb0-f44.google.com with SMTP id rq2so1057661pbb.3 for ; Thu, 05 Jun 2014 05:27:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=hBnuTdjjxWeyGbEJPm2tKh2ZuOw3BIfs0R6RmhrfjfA=; b=qDO0z/nID1tDmaQipjaxnvXIHYQr+dvVFH3NLUy/fEo593l4dgEN8UnulHNFncyfXS DOkOViWV1eIGs9cjrhllvH2/bzW4JGrRp8K/wJ2ZrugBAhMUQloXfjwLWv1NKnUu1N8e DpYfuRdlDGJkHEk5s1MRyPITkzYor5bLYhQAfM9CVTxdUyyvY3MBf5OqbHpithYztNx1 0FSHKe5kRalmdE5zSy5g/rgoh6dBAe0lawLFn8h/UepevRKj7mdRHFfWgIEsAq5h16L6 wfZR0bkb/4+1Q6LfQ13GJYzleNmVTvKmAKV9z8Tq6XKY6/GYfnG+oB6my7rG/n1geSuD 1qXA== X-Received: by 10.68.223.202 with SMTP id qw10mr39618151pbc.163.1401971259887; Thu, 05 Jun 2014 05:27:39 -0700 (PDT) Received: from localhost.localdomain.localdomain ([222.247.140.12]) by mx.google.com with ESMTPSA id mt1sm22347269pbb.31.2014.06.05.05.27.30 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 05 Jun 2014 05:27:39 -0700 (PDT) From: Wenchao Xia To: qemu-devel@nongnu.org Date: Thu, 5 Jun 2014 05:22:22 -0700 Message-Id: <1401970944-18735-28-git-send-email-wenchaoqemu@gmail.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1401970944-18735-1-git-send-email-wenchaoqemu@gmail.com> References: <1401970944-18735-1-git-send-email-wenchaoqemu@gmail.com> X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2607:f8b0:400e:c01::22c Cc: mdroth@linux.vnet.ibm.com, armbru@redhat.com, Wenchao Xia , lcapitulino@redhat.com Subject: [Qemu-devel] [PATCH V6 27/29] qapi event: convert GUEST_PANICKED 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 'monitor.h' is still included in target-s390x/kvm.c, since I have no good way to verify whether other code need it on my x86 host. Signed-off-by: Wenchao Xia --- docs/qmp/qmp-events.txt | 14 -------------- hw/misc/pvpanic.c | 13 ++----------- qapi-event.json | 12 ++++++++++++ qapi-schema.json | 12 ++++++++++++ target-s390x/kvm.c | 8 +++----- 5 files changed, 29 insertions(+), 30 deletions(-) diff --git a/docs/qmp/qmp-events.txt b/docs/qmp/qmp-events.txt index 1b0e25f..adf45d3 100644 --- a/docs/qmp/qmp-events.txt +++ b/docs/qmp/qmp-events.txt @@ -1,20 +1,6 @@ QEMU Machine Protocol Events ============================ -GUEST_PANICKED --------------- - -Emitted when guest OS panic is detected. - -Data: - -- "action": Action that has been taken (json-string, currently always "pause"). - -Example: - -{ "event": "GUEST_PANICKED", - "data": { "action": "pause" } } - QUORUM_FAILURE -------------- diff --git a/hw/misc/pvpanic.c b/hw/misc/pvpanic.c index 5377fee..d396b74 100644 --- a/hw/misc/pvpanic.c +++ b/hw/misc/pvpanic.c @@ -14,12 +14,12 @@ #include "qapi/qmp/qobject.h" #include "qapi/qmp/qjson.h" -#include "monitor/monitor.h" #include "sysemu/sysemu.h" #include "qemu/log.h" #include "hw/nvram/fw_cfg.h" #include "hw/i386/pc.h" +#include "qapi-event.h" /* The bit of supported pv event */ #define PVPANIC_F_PANICKED 0 @@ -31,15 +31,6 @@ #define ISA_PVPANIC_DEVICE(obj) \ OBJECT_CHECK(PVPanicState, (obj), TYPE_ISA_PVPANIC_DEVICE) -static void panicked_mon_event(const char *action) -{ - QObject *data; - - data = qobject_from_jsonf("{ 'action': %s }", action); - monitor_protocol_event(QEVENT_GUEST_PANICKED, data); - qobject_decref(data); -} - static void handle_event(int event) { static bool logged; @@ -50,7 +41,7 @@ static void handle_event(int event) } if (event & PVPANIC_PANICKED) { - panicked_mon_event("pause"); + qapi_event_send_guest_panicked(GUEST_PANICK_ACTION_PAUSE, NULL); vm_stop(RUN_STATE_GUEST_PANICKED); return; } diff --git a/qapi-event.json b/qapi-event.json index 93f9eeb..6bfc2a7 100644 --- a/qapi-event.json +++ b/qapi-event.json @@ -400,3 +400,15 @@ ## { 'event': 'BALLOON_CHANGE', 'data': { 'actual': 'int' } } + +## +# @GUEST_PANICKED +# +# Emitted when guest OS panic is detected +# +# @action: action that has been taken, currently always "pause" +# +# Since: 2.1 +## +{ 'event': 'GUEST_PANICKED', + 'data': { 'action': 'GuestPanickAction' } } diff --git a/qapi-schema.json b/qapi-schema.json index 23be2bf..badc1bf 100644 --- a/qapi-schema.json +++ b/qapi-schema.json @@ -4837,4 +4837,16 @@ { 'enum': 'IoOperationType', 'data': [ 'read', 'write' ] } +## +# @GuestPanickAction +# +# An enumeration of the actions taken when guest OS panic is detected +# +# @pause: system pauses +# +# Since: 2.1 +## +{ 'enum': 'GuestPanickAction', + 'data': [ 'pause' ] } + { 'include': 'qapi-event.json' } diff --git a/target-s390x/kvm.c b/target-s390x/kvm.c index 7a07f9d..2212583 100644 --- a/target-s390x/kvm.c +++ b/target-s390x/kvm.c @@ -38,6 +38,7 @@ #include "monitor/monitor.h" #include "exec/gdbstub.h" #include "trace.h" +#include "qapi-event.h" /* #define DEBUG_KVM */ @@ -891,11 +892,8 @@ static int handle_intercept(S390CPU *cpu) if (is_special_wait_psw(cs)) { qemu_system_shutdown_request(); } else { - QObject *data; - - data = qobject_from_jsonf("{ 'action': %s }", "pause"); - monitor_protocol_event(QEVENT_GUEST_PANICKED, data); - qobject_decref(data); + qapi_event_send_guest_panicked(GUEST_PANICK_ACTION_PAUSE, + NULL); vm_stop(RUN_STATE_GUEST_PANICKED); } }