From patchwork Fri Oct 26 11:21:50 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lei Li X-Patchwork-Id: 194442 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 AB75F2C0093 for ; Fri, 26 Oct 2012 22:23:51 +1100 (EST) Received: from localhost ([::1]:52825 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TRi0z-0007Ri-Ph for incoming@patchwork.ozlabs.org; Fri, 26 Oct 2012 07:23:49 -0400 Received: from eggs.gnu.org ([208.118.235.92]:55205) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TRi0L-0006Am-32 for qemu-devel@nongnu.org; Fri, 26 Oct 2012 07:23:13 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TRi0C-0001ES-St for qemu-devel@nongnu.org; Fri, 26 Oct 2012 07:23:08 -0400 Received: from e28smtp03.in.ibm.com ([122.248.162.3]:60639) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TRi0B-0001Dm-MC for qemu-devel@nongnu.org; Fri, 26 Oct 2012 07:23:00 -0400 Received: from /spool/local by e28smtp03.in.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Fri, 26 Oct 2012 16:52:57 +0530 Received: from d28relay05.in.ibm.com (9.184.220.62) by e28smtp03.in.ibm.com (192.168.1.133) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Fri, 26 Oct 2012 16:52:54 +0530 Received: from d28av02.in.ibm.com (d28av02.in.ibm.com [9.184.220.64]) by d28relay05.in.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id q9QBMsck66453570 for ; Fri, 26 Oct 2012 16:52:54 +0530 Received: from d28av02.in.ibm.com (loopback [127.0.0.1]) by d28av02.in.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id q9QGpoR4002160 for ; Sat, 27 Oct 2012 03:51:51 +1100 Received: from localhost.localdomain ([9.77.182.62]) by d28av02.in.ibm.com (8.14.4/8.13.1/NCO v10.0 AVin) with ESMTP id q9QGpgBH001549; Sat, 27 Oct 2012 03:51:49 +1100 From: Lei Li To: aliguori@us.ibm.com Date: Fri, 26 Oct 2012 19:21:50 +0800 Message-Id: <1351250512-6386-3-git-send-email-lilei@linux.vnet.ibm.com> X-Mailer: git-send-email 1.7.7.6 In-Reply-To: <1351250512-6386-1-git-send-email-lilei@linux.vnet.ibm.com> References: <1351250512-6386-1-git-send-email-lilei@linux.vnet.ibm.com> x-cbid: 12102611-3864-0000-0000-0000053F0EAD X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 122.248.162.3 Cc: blauwirbel@gmail.com, Lei Li , qemu-devel@nongnu.org, lcapitulino@redhat.com Subject: [Qemu-devel] [PATCH 2/4] QAPI: Introduce memchar-write 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 --- hmp-commands.hx | 17 +++++++++++++++++ hmp.c | 15 +++++++++++++++ hmp.h | 1 + qapi-schema.json | 47 +++++++++++++++++++++++++++++++++++++++++++++++ qemu-char.c | 44 ++++++++++++++++++++++++++++++++++++++++++++ qmp-commands.hx | 34 ++++++++++++++++++++++++++++++++++ 6 files changed, 158 insertions(+), 0 deletions(-) diff --git a/hmp-commands.hx b/hmp-commands.hx index e0b537d..a37b8e9 100644 --- a/hmp-commands.hx +++ b/hmp-commands.hx @@ -825,6 +825,23 @@ Inject an NMI on the given CPU (x86 only). ETEXI { + .name = "memchar_write", + .args_type = "chardev:s,data:s", + .params = "chardev data", + .mhandler.cmd = hmp_memchar_write, + }, + +STEXI +@item memchar_write @var{chardev} @var{data} +@findex memchar_write +Provide writing interface for CirMemCharDriver. Write @var{data} +to cirmemchr char device. Note that we will add 'control' options +for read and write command that specifies behavior when the queue +is full/empty, for now just assume a drop behaver in these two commands. + +ETEXI + + { .name = "migrate", .args_type = "detach:-d,blk:-b,inc:-i,uri:s", .params = "[-d] [-b] [-i] uri", diff --git a/hmp.c b/hmp.c index 2b97982..082985b 100644 --- a/hmp.c +++ b/hmp.c @@ -683,6 +683,21 @@ void hmp_pmemsave(Monitor *mon, const QDict *qdict) hmp_handle_error(mon, &errp); } +void hmp_memchar_write(Monitor *mon, const QDict *qdict) +{ + uint32_t size; + const char *chardev = qdict_get_str(qdict, "chardev"); + const char *data = qdict_get_str(qdict, "data"); + enum DataFormat format; + Error *errp = NULL; + + size = strlen(data); + format = DATA_FORMAT_UTF8; + qmp_memchar_write(chardev, size, data, true, format, &errp); + + hmp_handle_error(mon, &errp); +} + static void hmp_cont_cb(void *opaque, int err) { if (!err) { diff --git a/hmp.h b/hmp.h index 71ea384..406ebb1 100644 --- a/hmp.h +++ b/hmp.h @@ -43,6 +43,7 @@ void hmp_system_powerdown(Monitor *mon, const QDict *qdict); void hmp_cpu(Monitor *mon, const QDict *qdict); void hmp_memsave(Monitor *mon, const QDict *qdict); void hmp_pmemsave(Monitor *mon, const QDict *qdict); +void hmp_memchar_write(Monitor *mon, const QDict *qdict); void hmp_cont(Monitor *mon, const QDict *qdict); void hmp_system_wakeup(Monitor *mon, const QDict *qdict); void hmp_inject_nmi(Monitor *mon, const QDict *qdict); diff --git a/qapi-schema.json b/qapi-schema.json index c615ee2..43ef6bc 100644 --- a/qapi-schema.json +++ b/qapi-schema.json @@ -325,6 +325,53 @@ { 'command': 'query-chardev', 'returns': ['ChardevInfo'] } ## +# @DataFormat: +# +# An enumeration of data format. The default value would +# be utf8. +# +# @utf8: The data format is 'utf8'. +# +# @base64: The data format is 'base64'. +# +# Note: The data format start with 'utf8' and 'base64', +# will support other data format as well. +# +# Since: 1.3 +## +{ 'enum': 'DataFormat' + 'data': [ 'utf8', 'base64' ] } + +## +# @memchar-write: +# +# Provide writing interface for memchardev. Write data to memchar +# char device. +# +# @chardev: the name of the memchar char device. +# +# @size: the size to write in bytes. Should be power of 2. +# +# @data: the source data write to memchar. +# +# @format: #optional the format of the data write to memchardev, by +# default is 'utf8'. +# +# Returns: Nothing on success +# If @chardev is not a valid memchr device, DeviceNotFound +# +# Notes: The option 'block' is not supported now due to the miss +# feature in qmp. Will add it later when we gain the necessary +# infrastructure enhancement. For now just assume 'drop' behaver +# for this command. +# +# Since: 1.3 +## +{ 'command': 'memchar-write', + 'data': {'chardev': 'str', 'size': 'int', 'data': 'str', + '*format': 'DataFormat'} } + +## # @CommandInfo: # # Information about a QMP command diff --git a/qemu-char.c b/qemu-char.c index c3ec43d..6114e29 100644 --- a/qemu-char.c +++ b/qemu-char.c @@ -2717,6 +2717,50 @@ fail: return NULL; } +void qmp_memchar_write(const char *chardev, int64_t size, + const char *data, bool has_format, + enum DataFormat format, + Error **errp) +{ + CharDriverState *chr; + guchar *write_data; + int ret; + gsize write_count; + + chr = qemu_chr_find(chardev); + if (!chr) { + error_set(errp, QERR_DEVICE_NOT_FOUND, chardev); + return; + } + + if (strcmp(chr->filename, "memchr") != 0) { + error_setg(errp,"%s is not memory char device\n", chardev); + return; + } + + /* XXX: For the sync command as 'block', waiting for the qmp + * to support necessary feature. Now just act as 'drop' */ + if (cirmem_chr_is_full(chr)) { + error_setg(errp, "Failed to write to memchr %s", chardev); + return; + } + + write_count = (gsize)size; + + if (has_format && (format == DATA_FORMAT_BASE64)) { + write_data = g_base64_decode(data, &write_count); + } else { + write_data = (uint8_t *)data; + } + + ret = cirmem_chr_write(chr, write_data, write_count); + + if (ret < 0) { + error_setg(errp, "Failed to write to memchr %s", chardev); + return; + } +} + 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 5ba8c48..7548b9b 100644 --- a/qmp-commands.hx +++ b/qmp-commands.hx @@ -466,6 +466,40 @@ Note: inject-nmi fails when the guest doesn't support injecting. EQMP { + .name = "memchar-write", + .args_type = "chardev:s,size:i,data:s,format:s?,control:s?", + .help = "write size of data to memchar chardev", + .mhandler.cmd_new = qmp_marshal_input_memchar_write, + }, + +SQMP +memchar-write +------------- + +Provide writing interface for memchardev. Write data to memchar +char device. + +Arguments: + +- "chardev": the name of the char device, must be unique (json-string) +- "size": the memory size, in bytes, should be power of 2 (json-int) +- "data": the source data writed to memchar (json-string) +- "format": the data format write to memchardev, default is + utf8. (json-string, optional) + - Possible values: "utf8", "base64" + +Example: + +-> { "execute": "memchar-write", + "arguments": { "chardev": foo, + "size": 8, + "data": "abcdefgh", + "format": "utf8" } } +<- { "return": {} } + +EQMP + + { .name = "xen-save-devices-state", .args_type = "filename:F", .mhandler.cmd_new = qmp_marshal_input_xen_save_devices_state,