From patchwork Wed Aug 1 09:48:58 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lei Li X-Patchwork-Id: 174424 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id CA1FF2C00AF for ; Wed, 1 Aug 2012 19:49:46 +1000 (EST) Received: from localhost ([::1]:35378 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SwVYm-0004sj-Ro for incoming@patchwork.ozlabs.org; Wed, 01 Aug 2012 05:49:44 -0400 Received: from eggs.gnu.org ([208.118.235.92]:59448) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SwVYU-0004la-09 for qemu-devel@nongnu.org; Wed, 01 Aug 2012 05:49:29 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SwVYS-0000w7-J3 for qemu-devel@nongnu.org; Wed, 01 Aug 2012 05:49:25 -0400 Received: from e28smtp06.in.ibm.com ([122.248.162.6]:46998) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SwVYR-0000vU-Uo for qemu-devel@nongnu.org; Wed, 01 Aug 2012 05:49:24 -0400 Received: from /spool/local by e28smtp06.in.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Wed, 1 Aug 2012 15:19:20 +0530 Received: from d28relay01.in.ibm.com (9.184.220.58) by e28smtp06.in.ibm.com (192.168.1.136) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Wed, 1 Aug 2012 15:19:19 +0530 Received: from d28av04.in.ibm.com (d28av04.in.ibm.com [9.184.220.66]) by d28relay01.in.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id q719nIwo27853044 for ; Wed, 1 Aug 2012 15:19:18 +0530 Received: from d28av04.in.ibm.com (loopback [127.0.0.1]) by d28av04.in.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id q719nHGN002110 for ; Wed, 1 Aug 2012 19:49:18 +1000 Received: from localhost.localdomain.cn.ibm.com ([9.115.122.84]) by d28av04.in.ibm.com (8.14.4/8.13.1/NCO v10.0 AVin) with ESMTP id q719nCjE001796; Wed, 1 Aug 2012 19:49:16 +1000 From: Lei Li To: qemu-devel@nongnu.org Date: Wed, 1 Aug 2012 17:48:58 +0800 Message-Id: <1343814538-27591-5-git-send-email-lilei@linux.vnet.ibm.com> X-Mailer: git-send-email 1.7.7.6 In-Reply-To: <1343814538-27591-1-git-send-email-lilei@linux.vnet.ibm.com> References: <1343814538-27591-1-git-send-email-lilei@linux.vnet.ibm.com> x-cbid: 12080109-9574-0000-0000-000003CBD838 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 122.248.162.6 Cc: aliguori@us.ibm.com, stefanha@linux.vnet.ibm.com, Lei Li Subject: [Qemu-devel] [RFC PATCH 4/4] qmp: Introduce memchar_read QMP command X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Signed-off-by: Lei Li --- qapi-schema.json | 20 ++++++++++++++++++++ qemu-char.c | 16 ++++++++++++++++ qmp-commands.hx | 28 ++++++++++++++++++++++++++++ 3 files changed, 64 insertions(+), 0 deletions(-) diff --git a/qapi-schema.json b/qapi-schema.json index 3c8530f..23edda9 100644 --- a/qapi-schema.json +++ b/qapi-schema.json @@ -226,6 +226,26 @@ 'data': {'chardev': 'str', 'size': 'int', 'data': 'str'} } ## +# @memchar_read: +# +# Provide read interface for memchardev. Read from memchar +# char device and return the data. +# +# @chardev: the name of the memchar char device. +# +# @size: the size to write in bytes. +# +# Returns: The data read from memchar as string. +# If @chardev is not a valid memchar device, DeviceNotFound +# If an I/O error occurs while reading, IOError +# +# Since: 1.2 +## +{ 'command': 'memchar_read', + 'data': {'chardev': 'str', 'size': 'int'}, + 'returns': 'str' } + +## # @CommandInfo: # # Information about a QMP command diff --git a/qemu-char.c b/qemu-char.c index 1012e65..545a792 100644 --- a/qemu-char.c +++ b/qemu-char.c @@ -2655,6 +2655,22 @@ void qmp_memchar_write(const char *chardev, int64_t size, } } +char *qmp_memchar_read(const char *chardev, int64_t size, + Error **errp) +{ + CharDriverState *chr; + char *out_data; + + chr = qemu_chr_find(chardev); + if(!chr) { + error_set(errp, QERR_DEVICE_NOT_FOUND, chardev); + return NULL; + } + + mem_chr_read(chr, (uint8_t *)out_data, size); + return out_data; +} + QemuOpts *qemu_chr_parse_compat(const char *label, const char *filename) { char host[65], port[33], width[8], height[8]; diff --git a/qmp-commands.hx b/qmp-commands.hx index 182f1e6..163e547 100644 --- a/qmp-commands.hx +++ b/qmp-commands.hx @@ -470,6 +470,34 @@ Example: EQMP { + .name = "memchar_read", + .args_type = "id:s,size:i", + .mhandler.cmd_new = qmp_marshal_input_memchar_read, + }, + +SQMP +memchar_read +------------- + +Provide read interface for memchardev. Read from memchar +char device and return the data. + +Arguments: + +- "chardev": the name of the char device, must be unique (json-string) +- "size": the memory size in bytes, init size of the memchar + by default (json-int) + +Example: + +-> { "execute": "memchar_read", + "arguments": { "chardev": foo, + "size": 1000, +<- { "return": "data string" } + +EQMP + + { .name = "xen-save-devices-state", .args_type = "filename:F", .mhandler.cmd_new = qmp_marshal_input_xen_save_devices_state,