From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37841) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WooUQ-00087k-Ih for qemu-devel@nongnu.org; Mon, 26 May 2014 02:34:39 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WooUH-000210-0V for qemu-devel@nongnu.org; Mon, 26 May 2014 02:34:30 -0400 Received: from mail-pb0-x22d.google.com ([2607:f8b0:400e:c01::22d]:42657) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WooUG-000200-MX for qemu-devel@nongnu.org; Mon, 26 May 2014 02:34:20 -0400 Received: by mail-pb0-f45.google.com with SMTP id um1so7225910pbc.32 for ; Sun, 25 May 2014 23:34:19 -0700 (PDT) From: Sanidhya Kashyap Date: Mon, 26 May 2014 12:03:23 +0530 Message-Id: <1401086005-8296-7-git-send-email-sanidhya.iiith@gmail.com> In-Reply-To: <1401086005-8296-1-git-send-email-sanidhya.iiith@gmail.com> References: <1401086005-8296-1-git-send-email-sanidhya.iiith@gmail.com> Subject: [Qemu-devel] [PATCH 6/8] cancel mechanism for an already running dump bitmap process List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu list Cc: ChenLiang , Sanidhya Kashyap , Juan Quintela No particular functional changes. Rectified some previous mistakes. Signed-off-by: Sanidhya Kashyap --- hmp-commands.hx | 14 ++++++++++++++ hmp.c | 5 +++++ hmp.h | 1 + qapi-schema.json | 8 ++++++++ qmp-commands.hx | 20 ++++++++++++++++++++ savevm.c | 19 +++++++++++++++++++ 6 files changed, 67 insertions(+) diff --git a/hmp-commands.hx b/hmp-commands.hx index 1665587..501e011 100644 --- a/hmp-commands.hx +++ b/hmp-commands.hx @@ -1796,6 +1796,20 @@ STEXI dumps the writable working set of a VM's memory to a file ETEXI + { + .name = "ldbc|log-dirty-bitmap-cancel", + .args_type = "", + .params = "", + .help = "cancel the current bitmap dump process", + .mhandler.cmd = hmp_log_dirty_bitmap_cancel, +}, + +STEXI +@item ldbc or log-dirty-bitmap-cancel +@findex log-dirty-bitmap-cancel +Cancel the current bitmap dump process +ETEXI + STEXI @end table ETEXI diff --git a/hmp.c b/hmp.c index a400825..fed8795 100644 --- a/hmp.c +++ b/hmp.c @@ -1330,6 +1330,11 @@ void hmp_log_dirty_bitmap(Monitor *mon, const QDict *qdict) } } +void hmp_log_dirty_bitmap_cancel(Monitor *mon, const QDict *qdict) +{ + qmp_log_dirty_bitmap_cancel(NULL); +} + void hmp_dump_guest_memory(Monitor *mon, const QDict *qdict) { Error *err = NULL; diff --git a/hmp.h b/hmp.h index 3a79a93..b600429 100644 --- a/hmp.h +++ b/hmp.h @@ -94,6 +94,7 @@ void hmp_cpu_add(Monitor *mon, const QDict *qdict); void hmp_object_add(Monitor *mon, const QDict *qdict); void hmp_object_del(Monitor *mon, const QDict *qdict); void hmp_log_dirty_bitmap(Monitor *mon, const QDict *qdict); +void hmp_log_dirty_bitmap_cancel(Monitor *mon, const QDict *qdict); void object_add_completion(ReadLineState *rs, int nb_args, const char *str); void object_del_completion(ReadLineState *rs, int nb_args, const char *str); void device_add_completion(ReadLineState *rs, int nb_args, const char *str); diff --git a/qapi-schema.json b/qapi-schema.json index 2918fc4..9f9f097 100644 --- a/qapi-schema.json +++ b/qapi-schema.json @@ -4744,3 +4744,11 @@ 'data' : { 'filename' : 'str', '*epochs' : 'int', '*frequency' : 'int' } } +## +# @log-dirty-bitmap-cancel +# +# cancel the dirty bitmap logging process +# +# Since 2.1 +## +{ 'command': 'log-dirty-bitmap-cancel' } diff --git a/qmp-commands.hx b/qmp-commands.hx index 183a636..2a8dacc 100644 --- a/qmp-commands.hx +++ b/qmp-commands.hx @@ -3605,3 +3605,23 @@ value is 3 while that of frequency is 10. EQMP + { + .name = "log-dirty-bitmap-cancel", + .args_type = "", + .mhandler.cmd_new = qmp_marshal_input_log_dirty_bitmap_cancel, + }, + +SQMP +log_bitmap_cancel +-------------- + +Cancel the current bitmap dump process. + +Arguments: None. + +Example: + +-> { "execute": "log-dirty-bitmap-cancel" } +<- { "return": {} } + +EQMP diff --git a/savevm.c b/savevm.c index 675c8e5..ff87254 100644 --- a/savevm.c +++ b/savevm.c @@ -1260,6 +1260,25 @@ void qmp_log_dirty_bitmap(const char *filename, bool has_epochs, return; } +static void logging_bitmap_cancel(BitmapLogState *b) +{ + int old_state; + do { + old_state = b->state; + if (old_state != LOG_BITMAP_STATE_SETUP && + old_state != LOG_BITMAP_STATE_ACTIVE) { + break; + } + logging_state_set_status(b, old_state, + LOG_BITMAP_STATE_CANCELING); + } while (b->state != LOG_BITMAP_STATE_CANCELING); +} + +void qmp_log_dirty_bitmap_cancel(Error **errp) +{ + logging_bitmap_cancel(logging_current_state()); +} + void qmp_xen_save_devices_state(const char *filename, Error **errp) { QEMUFile *f; -- 1.8.3.1