[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [RFC][PATCH 11/14 v4] support to cancel the current dumping
From: |
Wen Congyang |
Subject: |
[Qemu-devel] [RFC][PATCH 11/14 v4] support to cancel the current dumping |
Date: |
Wed, 04 Jan 2012 14:14:02 +0800 |
User-agent: |
Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv:1.9.1.9) Gecko/20100413 Fedora/3.0.4-2.fc13 Thunderbird/3.0.4 |
Add API to allow the user to cancel the current dumping.
Signed-off-by: Wen Congyang <address@hidden>
---
dump.c | 14 ++++++++++++++
hmp-commands.hx | 14 ++++++++++++++
hmp.c | 5 +++++
hmp.h | 1 +
qapi-schema.json | 13 +++++++++++++
qmp-commands.hx | 21 +++++++++++++++++++++
6 files changed, 68 insertions(+), 0 deletions(-)
diff --git a/dump.c b/dump.c
index 6acc252..3848d25 100644
--- a/dump.c
+++ b/dump.c
@@ -24,6 +24,7 @@
#include "sysemu.h"
#include "bswap.h"
#include "memory_mapping.h"
+#include "qmp-commands.h"
#define CPU_CONVERT_TO_TARGET16(val) \
({ \
@@ -720,3 +721,16 @@ int do_dump(Monitor *mon, const QDict *qdict, QObject
**ret_data)
return 0;
}
+
+void qmp_dump_cancel(Error **errp)
+{
+ DumpState *s = dump_get_current();
+
+ if (s->state != DUMP_STATE_ACTIVE) {
+ return;
+ }
+
+ s->state = DUMP_STATE_CANCELLED;
+ dump_cleanup(s);
+ return;
+}
diff --git a/hmp-commands.hx b/hmp-commands.hx
index ef0d53a..83d40b6 100644
--- a/hmp-commands.hx
+++ b/hmp-commands.hx
@@ -844,6 +844,20 @@ Dump to @var{file} (using -d to not wait for completion).
ETEXI
{
+ .name = "dump_cancel",
+ .args_type = "",
+ .params = "",
+ .help = "cancel the current VM dumping",
+ .mhandler.cmd = hmp_dump_cancel,
+ },
+
+STEXI
address@hidden dump_cancel
address@hidden dump_cancel
+Cancel the current VM dumping.
+ETEXI
+
+ {
.name = "snapshot_blkdev",
.args_type = "device:B,snapshot-file:s?,format:s?",
.params = "device [new-image-file] [format]",
diff --git a/hmp.c b/hmp.c
index e7659d5..7fc89db 100644
--- a/hmp.c
+++ b/hmp.c
@@ -679,3 +679,8 @@ void hmp_migrate_set_speed(Monitor *mon, const QDict *qdict)
int64_t value = qdict_get_int(qdict, "value");
qmp_migrate_set_speed(value, NULL);
}
+
+void hmp_dump_cancel(Monitor *mon, const QDict *qdict)
+{
+ qmp_dump_cancel(NULL);
+}
diff --git a/hmp.h b/hmp.h
index 093242d..409e809 100644
--- a/hmp.h
+++ b/hmp.h
@@ -49,5 +49,6 @@ void hmp_snapshot_blkdev(Monitor *mon, const QDict *qdict);
void hmp_migrate_cancel(Monitor *mon, const QDict *qdict);
void hmp_migrate_set_downtime(Monitor *mon, const QDict *qdict);
void hmp_migrate_set_speed(Monitor *mon, const QDict *qdict);
+void hmp_dump_cancel(Monitor *mon, const QDict *qdict);
#endif
diff --git a/qapi-schema.json b/qapi-schema.json
index 44cf764..f5f79b0 100644
--- a/qapi-schema.json
+++ b/qapi-schema.json
@@ -1275,3 +1275,16 @@
{ 'command': 'qom-set',
'data': { 'path': 'str', 'property': 'str', 'value': 'visitor' },
'gen': 'no' }
+
+##
+# @dump_cancel
+#
+# Cancel the current executing dumping process.
+#
+# Returns: nothing on success
+#
+# Notes: This command succeeds even if there is no dumping process running.
+#
+# Since: 1.1
+##
+{ 'command': 'dump_cancel' }
diff --git a/qmp-commands.hx b/qmp-commands.hx
index f359dff..5207a41 100644
--- a/qmp-commands.hx
+++ b/qmp-commands.hx
@@ -599,6 +599,27 @@ Example:
EQMP
{
+ .name = "dump_cancel",
+ .args_type = "",
+ .mhandler.cmd_new = qmp_marshal_input_dump_cancel,
+ },
+
+SQMP
+dump_cancel
+
+
+Cancel the current dumping.
+
+Arguments: None.
+
+Example:
+
+-> { "execute": "dump_cancel" }
+<- { "return": {} }
+
+EQMP
+
+ {
.name = "netdev_add",
.args_type = "netdev:O",
.params = "[user|tap|socket],id=str[,prop=value][,...]",
--
1.7.1
- [Qemu-devel] [RFC][PATCH 05/14 v4] target-i386: Add API to write elf notes to core file, (continued)
[Qemu-devel] [RFC][PATCH 09/14 v4] run dump at the background, Wen Congyang, 2012/01/04
[Qemu-devel] [RFC][PATCH 10/14 v4] support detached dump, Wen Congyang, 2012/01/04
[Qemu-devel] [RFC][PATCH 11/14 v4] support to cancel the current dumping,
Wen Congyang <=
[Qemu-devel] [RFC][PATCH 12/14 v4] support to set dumping speed, Wen Congyang, 2012/01/04
[Qemu-devel] [RFC][PATCH 13/14 v4] support to query dumping status, Wen Congyang, 2012/01/04
[Qemu-devel] [RFC][PATCH 14/14 v4] auto cancel dumping after vm state is changed to run, Wen Congyang, 2012/01/04
Re: [Qemu-devel] [RFC][PATCT 0/14 v4] dump memory when host pci device is used by guest, Wen Congyang, 2012/01/10