From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:39342) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VziqL-0000EP-A4 for qemu-devel@nongnu.org; Sun, 05 Jan 2014 03:14:03 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VziqE-000707-MM for qemu-devel@nongnu.org; Sun, 05 Jan 2014 03:13:57 -0500 Received: from fgwmail8.fujitsu.co.jp ([192.51.44.38]:33055) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VziqE-0006zy-7u for qemu-devel@nongnu.org; Sun, 05 Jan 2014 03:13:50 -0500 Received: from fgwmail6.fujitsu.co.jp (fgwmail6.fujitsu.co.jp [192.51.44.36]) by fgwmail8.fujitsu.co.jp (Postfix) with ESMTP id 516F1179398D for ; Sun, 5 Jan 2014 16:28:44 +0900 (JST) Received: from m4.gw.fujitsu.co.jp (unknown [10.0.50.74]) by fgwmail6.fujitsu.co.jp (Postfix) with ESMTP id 6E07D3EE0AE for ; Sun, 5 Jan 2014 16:28:43 +0900 (JST) Received: from smail (m4 [127.0.0.1]) by outgoing.m4.gw.fujitsu.co.jp (Postfix) with ESMTP id 606C545DE4D for ; Sun, 5 Jan 2014 16:28:43 +0900 (JST) Received: from s4.gw.fujitsu.co.jp (s4.gw.nic.fujitsu.com [10.0.50.94]) by m4.gw.fujitsu.co.jp (Postfix) with ESMTP id 3DFCC45DD76 for ; Sun, 5 Jan 2014 16:28:43 +0900 (JST) Received: from s4.gw.fujitsu.co.jp (localhost.localdomain [127.0.0.1]) by s4.gw.fujitsu.co.jp (Postfix) with ESMTP id 258C71DB8032 for ; Sun, 5 Jan 2014 16:28:43 +0900 (JST) Received: from s01.gw.fujitsu.co.jp (s01.gw.nic.fujitsu.com [133.161.11.16]) by s4.gw.fujitsu.co.jp (Postfix) with ESMTP id C91F31DB8037 for ; Sun, 5 Jan 2014 16:28:42 +0900 (JST) Received: from s01.gw.fujitsu.co.jp (yt-mxio2.gw.nic.fujitsu.com [10.134.25.142]) by s01.gw.fujitsu.co.jp (Postfix) with ESMTP id 955BAD8107 for ; Sun, 5 Jan 2014 16:28:42 +0900 (JST) Received: from G08FNSTD100518.localdomain (unknown [10.167.226.68]) by s01.gw.fujitsu.co.jp (Postfix) with ESMTP id CCB0C8A018 for ; Sun, 5 Jan 2014 16:28:41 +0900 (JST) From: Qiao Nuohan Date: Sun, 5 Jan 2014 15:27:44 +0800 Message-Id: <1388906864-1083-12-git-send-email-qiaonuohan@cn.fujitsu.com> In-Reply-To: <1388906864-1083-1-git-send-email-qiaonuohan@cn.fujitsu.com> References: <1388906864-1083-1-git-send-email-qiaonuohan@cn.fujitsu.com> Subject: [Qemu-devel] [PATCH v6 11/11] Add 'query-dump-guest-memory-capability' command List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: stefanha@gmail.com, lcapitulino@redhat.com, afaerber@suse.de, eblake@redhat.com Cc: qemu-devel@nongnu.org, qiaonuohan@cn.fujitsu.com, kumagai-atsushi@mxc.nes.nec.co.jp, anderson@redhat.com, akong@redhat.com, lersek@redhat.com 'query-dump-guest-memory-capability' is used to query whether option 'format' is available for 'dump-guest-memory' and the available format. The output of the command will be like: -> { "execute": "query-dump-guest-memory-capability" } <- { "return": { "format-option": "optional", "capabilities": [ {"available": true, "format": "elf"}, {"available": true, "format": "kdump-zlib"}, {"available": true, "format": "kdump-lzo"}, {"available": true, "format": "kdump-snappy"} ] } Signed-off-by: Qiao Nuohan --- dump.c | 38 ++++++++++++++++++++++++++++++++++++++ qapi-schema.json | 13 +++++++++++++ qmp-commands.hx | 7 +++++++ 3 files changed, 58 insertions(+), 0 deletions(-) diff --git a/dump.c b/dump.c index b4e79ff..51fe23a 100644 --- a/dump.c +++ b/dump.c @@ -1757,3 +1757,41 @@ void qmp_dump_guest_memory(bool paging, const char *file, bool has_begin, g_free(s); } + +DumpGuestMemoryCapability *qmp_query_dump_guest_memory_capability(Error **errp) +{ + int i; + DumpGuestMemoryCapabilityStatusList *item; + DumpGuestMemoryCapability *cap = + g_malloc0(sizeof(DumpGuestMemoryCapability)); + + cap->format_option = g_strdup_printf("optional"); + + for (i = 0; i < DUMP_GUEST_MEMORY_FORMAT_MAX; i++) { + if (cap->capabilities == NULL) { + item = g_malloc0(sizeof(DumpGuestMemoryCapabilityStatusList)); + cap->capabilities = item; + } else { + item->next = g_malloc0(sizeof(DumpGuestMemoryCapabilityStatusList)); + item = item->next; + } + + item->value = g_malloc0(sizeof(struct DumpGuestMemoryCapabilityStatus)); + item->value->format = i; + item->value->available = true; + + if (i == DUMP_GUEST_MEMORY_FORMAT_KDUMP_LZO) { +#ifndef CONFIG_LZO + item->value->available = false; +#endif + } + + if (i == DUMP_GUEST_MEMORY_FORMAT_KDUMP_SNAPPY) { +#ifndef CONFIG_SNAPPY + item->value->available = false; +#endif + } + } + + return cap; +} diff --git a/qapi-schema.json b/qapi-schema.json index 19b2b23..e545e0f 100644 --- a/qapi-schema.json +++ b/qapi-schema.json @@ -2740,6 +2740,19 @@ '*length': 'int', '*format': 'DumpGuestMemoryFormat' } } ## +# Since: 1.8 +## +{ 'type': 'DumpGuestMemoryCapabilityStatus', + 'data': { 'format': 'DumpGuestMemoryFormat', 'available': 'bool' } } + +{ 'type': 'DumpGuestMemoryCapability', + 'data': { + 'format-option': 'str', + 'capabilities': ['DumpGuestMemoryCapabilityStatus'] } } + +{ 'command': 'query-dump-guest-memory-capability', 'returns': 'DumpGuestMemoryCapability' } + +## # @netdev_add: # # Add a network backend. diff --git a/qmp-commands.hx b/qmp-commands.hx index 3de9e7d..3379c75 100644 --- a/qmp-commands.hx +++ b/qmp-commands.hx @@ -828,6 +828,13 @@ Notes: EQMP { + .name = "query-dump-guest-memory-capability", + .args_type = "", + .mhandler.cmd_new = qmp_marshal_input_query_dump_guest_memory_capability, + }, + + + { .name = "netdev_add", .args_type = "netdev:O", .mhandler.cmd_new = qmp_netdev_add, -- 1.7.1