From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:39531) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RiK7i-0006SB-Cb for qemu-devel@nongnu.org; Wed, 04 Jan 2012 01:14:55 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RiK7h-0003n2-BD for qemu-devel@nongnu.org; Wed, 04 Jan 2012 01:14:54 -0500 Received: from [222.73.24.84] (port=63029 helo=song.cn.fujitsu.com) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RiK7g-0003me-SL for qemu-devel@nongnu.org; Wed, 04 Jan 2012 01:14:53 -0500 Message-ID: <4F03EEDD.2000109@cn.fujitsu.com> Date: Wed, 04 Jan 2012 14:17:01 +0800 From: Wen Congyang MIME-Version: 1.0 References: <4F03E735.2050804@cn.fujitsu.com> In-Reply-To: <4F03E735.2050804@cn.fujitsu.com> Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset=ISO-8859-1 Subject: [Qemu-devel] [RFC][PATCH 14/14 v4] auto cancel dumping after vm state is changed to run List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel , Jan Kiszka , Dave Anderson , HATAYAMA Daisuke The command dump does not support to dump while vm is running. If the user resume the vm, we should auto cancel dumping and set the status to failed. Signed-off-by: Wen Congyang --- dump.c | 18 ++++++++++++++++++ 1 files changed, 18 insertions(+), 0 deletions(-) diff --git a/dump.c b/dump.c index 4276cb8..2053c3e 100644 --- a/dump.c +++ b/dump.c @@ -82,6 +82,7 @@ typedef struct DumpState { ram_addr_t start; target_phys_addr_t offset; QEMUTimer *timer; + VMChangeStateEntry *handler; } DumpState; #define DEFAULT_THROTTLE (32 << 20) /* Default dump speed throttling */ @@ -113,6 +114,11 @@ static int dump_cleanup(DumpState *s) qemu_free_timer(s->timer); } + if (s->handler) { + qemu_del_vm_change_state_handler(s->handler); + s->handler = NULL; + } + if (!s->detach && s->error) { monitor_printf(s->mon, "%s", s->error); } @@ -675,6 +681,16 @@ static int create_vmcore(DumpState *s) return 0; } +static void dump_vm_state_change(void *opaque, int running, RunState state) +{ + DumpState *s = opaque; + + if (running) { + qmp_dump_cancel(NULL); + s->state = DUMP_STATE_ERROR; + } +} + int do_dump(Monitor *mon, const QDict *qdict, QObject **ret_data) { const char *file = qdict_get_str(qdict, "file"); @@ -712,6 +728,8 @@ int do_dump(Monitor *mon, const QDict *qdict, QObject **ret_data) return -1; } + s->handler = qemu_add_vm_change_state_handler(dump_vm_state_change, s); + if (s->detach) { s->mon = NULL; } -- 1.7.1