[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [RFC][PATCH 13/14 v4] support to query dumping status
From: |
Wen Congyang |
Subject: |
[Qemu-devel] [RFC][PATCH 13/14 v4] support to query dumping status |
Date: |
Wed, 04 Jan 2012 14:16:12 +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 query dumping status.
Signed-off-by: Wen Congyang <address@hidden>
---
dump.c | 30 ++++++++++++++++++++++++++++++
hmp-commands.hx | 2 ++
hmp.c | 13 +++++++++++++
hmp.h | 1 +
monitor.c | 7 +++++++
qapi-schema.json | 26 ++++++++++++++++++++++++++
qmp-commands.hx | 47 +++++++++++++++++++++++++++++++++++++++++++++++
7 files changed, 126 insertions(+), 0 deletions(-)
diff --git a/dump.c b/dump.c
index 2131e22..4276cb8 100644
--- a/dump.c
+++ b/dump.c
@@ -746,3 +746,33 @@ void qmp_dump_set_speed(int64_t value, Error **errp)
s->bandwidth = value;
return;
}
+
+DumpInfo *qmp_query_dump(Error **errp)
+{
+ DumpInfo *info = g_malloc0(sizeof(*info));
+ DumpState *s = dump_get_current();
+
+ switch (s->state) {
+ case DUMP_STATE_SETUP:
+ /* no migration has happened ever */
+ break;
+ case DUMP_STATE_ACTIVE:
+ info->has_status = true;
+ info->status = g_strdup("active");
+ break;
+ case DUMP_STATE_COMPLETED:
+ info->has_status = true;
+ info->status = g_strdup("completed");
+ break;
+ case DUMP_STATE_ERROR:
+ info->has_status = true;
+ info->status = g_strdup("failed");
+ break;
+ case DUMP_STATE_CANCELLED:
+ info->has_status = true;
+ info->status = g_strdup("cancelled");
+ break;
+ }
+
+ return info;
+}
diff --git a/hmp-commands.hx b/hmp-commands.hx
index 20543dd..1eaaf18 100644
--- a/hmp-commands.hx
+++ b/hmp-commands.hx
@@ -1397,6 +1397,8 @@ show device tree
show qdev device model list
@item info roms
show roms
address@hidden info dump
+show dumping status
@end table
ETEXI
diff --git a/hmp.c b/hmp.c
index be64075..04ed86a 100644
--- a/hmp.c
+++ b/hmp.c
@@ -690,3 +690,16 @@ void hmp_dump_set_speed(Monitor *mon, const QDict *qdict)
int64_t value = qdict_get_int(qdict, "value");
qmp_dump_set_speed(value, NULL);
}
+
+void hmp_info_dump(Monitor *mon)
+{
+ DumpInfo *info;
+
+ info = qmp_query_dump(NULL);
+
+ if (info->has_status) {
+ monitor_printf(mon, "Dumping status: %s\n", info->status);
+ }
+
+ qapi_free_DumpInfo(info);
+}
diff --git a/hmp.h b/hmp.h
index 3aa947c..5f58b9e 100644
--- a/hmp.h
+++ b/hmp.h
@@ -51,5 +51,6 @@ 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);
void hmp_dump_set_speed(Monitor *mon, const QDict *qdict);
+void hmp_info_dump(Monitor *mon);
#endif
diff --git a/monitor.c b/monitor.c
index edd6aa7..b1d09cc 100644
--- a/monitor.c
+++ b/monitor.c
@@ -2739,6 +2739,13 @@ static mon_cmd_t info_cmds[] = {
.mhandler.info = do_trace_print_events,
},
{
+ .name = "dump",
+ .args_type = "",
+ .params = "",
+ .help = "show dumping status",
+ .mhandler.info = hmp_info_dump,
+ },
+ {
.name = NULL,
},
};
diff --git a/qapi-schema.json b/qapi-schema.json
index ca324d6..087027a 100644
--- a/qapi-schema.json
+++ b/qapi-schema.json
@@ -1303,3 +1303,29 @@
# Since: 1.1
##
{ 'command': 'dump_set_speed', 'data': {'value': 'int'} }
+
+##
+# @DumpInfo
+#
+# Information about current migration process.
+#
+# @status: #optional string describing the current dumping status.
+# As of 1,1 this can be 'active', 'completed', 'failed' or
+# 'cancelled'. If this field is not returned, no migration process
+# has been initiated
+#
+# Since: 1.1
+##
+{ 'type': 'DumpInfo',
+ 'data': {'*status': 'str'} }
+
+##
+# @query-dump
+#
+# Returns information about current dumping process.
+#
+# Returns: @DumpInfo
+#
+# Since: 1.1
+##
+{ 'command': 'query-dump', 'returns': 'DumpInfo' }
diff --git a/qmp-commands.hx b/qmp-commands.hx
index 6f84cdc..bccc3a4 100644
--- a/qmp-commands.hx
+++ b/qmp-commands.hx
@@ -2040,6 +2040,53 @@ EQMP
},
SQMP
+query-dump
+-------------
+
+Dumping status.
+
+Return a json-object.
+
+The main json-object contains the following:
+
+- "status": migration status (json-string)
+ - Possible values: "active", "completed", "failed", "cancelled"
+
+Examples:
+
+1. Before the first migration
+
+-> { "execute": "query-dump" }
+<- { "return": {} }
+
+2. Migration is done and has succeeded
+
+-> { "execute": "query-dump" }
+<- { "return": { "status": "completed" } }
+
+3. Migration is done and has failed
+
+-> { "execute": "query-dump" }
+<- { "return": { "status": "failed" } }
+
+4. Migration is being performed:
+
+-> { "execute": "query-dump" }
+<- {
+ "return":{
+ "status":"active",
+ }
+ }
+
+EQMP
+
+ {
+ .name = "query-dump",
+ .args_type = "",
+ .mhandler.cmd_new = qmp_marshal_input_query_dump,
+ },
+
+SQMP
query-balloon
-------------
--
1.7.1
- [Qemu-devel] [RFC][PATCH 07/14 v4] target-i386: add API to get dump info, (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, 2012/01/04
[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 <=
[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