From patchwork Mon Sep 7 08:41:16 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pavel Dovgalyuk X-Patchwork-Id: 515025 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 651921401CB for ; Mon, 7 Sep 2015 18:46:57 +1000 (AEST) Received: from localhost ([::1]:54686 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZYs4l-0003N9-4Q for incoming@patchwork.ozlabs.org; Mon, 07 Sep 2015 04:46:55 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:42149) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZYrzK-0002OI-4E for qemu-devel@nongnu.org; Mon, 07 Sep 2015 04:41:22 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZYrzJ-0000mF-83 for qemu-devel@nongnu.org; Mon, 07 Sep 2015 04:41:18 -0400 Received: from mail.ispras.ru ([83.149.199.45]:52586) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZYrzJ-0000m0-1n for qemu-devel@nongnu.org; Mon, 07 Sep 2015 04:41:17 -0400 Received: from [10.10.150.149] (unknown [85.142.117.224]) by mail.ispras.ru (Postfix) with ESMTPSA id 5427A5401A9; Mon, 7 Sep 2015 11:41:16 +0300 (MSK) To: qemu-devel@nongnu.org From: Pavel Dovgalyuk Date: Mon, 07 Sep 2015 11:41:16 +0300 Message-ID: <20150907084116.1664.66836.stgit@PASHA-ISP> In-Reply-To: <20150907084005.1664.19540.stgit@PASHA-ISP> References: <20150907084005.1664.19540.stgit@PASHA-ISP> User-Agent: StGit/0.16 MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 83.149.199.45 Cc: edgar.iglesias@xilinx.com, peter.maydell@linaro.org, igor.rubinov@gmail.com, alex.bennee@linaro.org, mark.burton@greensocs.com, real@ispras.ru, batuzovk@ispras.ru, maria.klimushenkova@ispras.ru, pavel.dovgaluk@ispras.ru, pbonzini@redhat.com, hines@cert.org, fred.konrad@greensocs.com Subject: [Qemu-devel] [PATCH v17 12/21] replay: shutdown event 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 This patch records and replays simulator shutdown event. Reviewed-by: Paolo Bonzini Signed-off-by: Pavel Dovgalyuk --- replay/replay-internal.h | 2 ++ replay/replay.c | 14 ++++++++++++++ replay/replay.h | 5 +++++ vl.c | 1 + 4 files changed, 22 insertions(+), 0 deletions(-) diff --git a/replay/replay-internal.h b/replay/replay-internal.h index f042c46..4414695 100755 --- a/replay/replay-internal.h +++ b/replay/replay-internal.h @@ -23,6 +23,8 @@ enum ReplayEvents { EVENT_EXCEPTION, /* for async events */ EVENT_ASYNC, + /* for shutdown request */ + EVENT_SHUTDOWN, /* for clock read/writes */ /* some of greater codes are reserved for clocks */ EVENT_CLOCK, diff --git a/replay/replay.c b/replay/replay.c index d072ef7..83b0f8c 100755 --- a/replay/replay.c +++ b/replay/replay.c @@ -14,6 +14,7 @@ #include "replay-internal.h" #include "qemu/timer.h" #include "qemu/main-loop.h" +#include "sysemu/sysemu.h" ReplayMode replay_mode = REPLAY_MODE_NONE; @@ -34,6 +35,10 @@ bool replay_next_event_is(int event) res = true; } switch (replay_data_kind) { + case EVENT_SHUTDOWN: + replay_finish_event(); + qemu_system_shutdown_request(); + break; default: /* clock, time_t, checkpoint and other events */ return res; @@ -146,3 +151,12 @@ bool replay_has_interrupt(void) } return res; } + +void replay_shutdown_request(void) +{ + if (replay_mode == REPLAY_MODE_RECORD) { + replay_mutex_lock(); + replay_put_event(EVENT_SHUTDOWN); + replay_mutex_unlock(); + } +} diff --git a/replay/replay.h b/replay/replay.h index 2398509..fcc93d1 100755 --- a/replay/replay.h +++ b/replay/replay.h @@ -66,6 +66,11 @@ int64_t replay_read_clock(ReplayClockKind kind); ? replay_save_clock((clock), (value)) \ : (value)) +/* Events */ + +/*! Called when qemu shutdown is requested. */ +void replay_shutdown_request(void); + /* Asynchronous events queue */ /*! Disables storing events in the queue */ diff --git a/vl.c b/vl.c index 584ca88..9ff801d 100644 --- a/vl.c +++ b/vl.c @@ -1814,6 +1814,7 @@ void qemu_system_killed(int signal, pid_t pid) void qemu_system_shutdown_request(void) { trace_qemu_system_shutdown_request(); + replay_shutdown_request(); shutdown_requested = 1; qemu_notify_event(); }