From patchwork Fri Jul 26 14:44:34 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Markus Armbruster X-Patchwork-Id: 262166 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 6139D2C00E5 for ; Sat, 27 Jul 2013 00:45:11 +1000 (EST) Received: from localhost ([::1]:42947 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V2jGW-0007EF-Na for incoming@patchwork.ozlabs.org; Fri, 26 Jul 2013 10:45:08 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44587) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V2jG2-0007Ai-DV for qemu-devel@nongnu.org; Fri, 26 Jul 2013 10:44:41 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1V2jG1-0003EX-58 for qemu-devel@nongnu.org; Fri, 26 Jul 2013 10:44:38 -0400 Received: from oxygen.pond.sub.org ([2a01:4f8:121:10e4::3]:57749) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V2jG0-0003E2-VD; Fri, 26 Jul 2013 10:44:37 -0400 Received: from blackfin.pond.sub.org (p5B32A9AB.dip0.t-ipconnect.de [91.50.169.171]) by oxygen.pond.sub.org (Postfix) with ESMTPA id 108A3A4615; Fri, 26 Jul 2013 16:44:34 +0200 (CEST) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 55335200B8; Fri, 26 Jul 2013 16:44:34 +0200 (CEST) From: Markus Armbruster To: qemu-devel@nongnu.org Date: Fri, 26 Jul 2013 16:44:34 +0200 Message-Id: <1374849874-25531-4-git-send-email-armbru@redhat.com> X-Mailer: git-send-email 1.7.11.7 In-Reply-To: <1374849874-25531-1-git-send-email-armbru@redhat.com> References: <1374849874-25531-1-git-send-email-armbru@redhat.com> X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2a01:4f8:121:10e4::3 Cc: aliguori@us.ibm.com, lilei@linux.vnet.ibm.com, qemu-stable@nongnu.org, lcapitulino@redhat.com, kraxel@redhat.com, akong@redhat.com Subject: [Qemu-devel] [PATCH v2 3/3] qapi: Rename ChardevBackend member "memory" to "ringbuf" 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 Commit 1da48c6 called the new member "memory" after commit 3949e59 standardized "ringbuf". Rename for consistency. However, member name "memory" is visible in QMP since 1.5. It's undocumented just like the driver name. Keep it working anyway. Cc: qemu-stable@nongnu.org Signed-off-by: Markus Armbruster --- qapi-schema.json | 6 ++++-- qemu-char.c | 11 ++++++----- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/qapi-schema.json b/qapi-schema.json index a56de74..a51f7d2 100644 --- a/qapi-schema.json +++ b/qapi-schema.json @@ -3364,9 +3364,9 @@ ## # @ChardevRingbuf: # -# Configuration info for memory chardevs +# Configuration info for ring buffer chardevs. # -# @size: #optional Ringbuffer size, must be power of two, default is 65536 +# @size: #optional ring buffer size, must be power of two, default is 65536 # # Since: 1.5 ## @@ -3397,6 +3397,8 @@ 'spicevmc' : 'ChardevSpiceChannel', 'spiceport' : 'ChardevSpicePort', 'vc' : 'ChardevVC', + 'ringbuf': 'ChardevRingbuf', + # next one is just for compatibility 'memory' : 'ChardevRingbuf' } } ## diff --git a/qemu-char.c b/qemu-char.c index 742b73b..3f606c9 100644 --- a/qemu-char.c +++ b/qemu-char.c @@ -3110,12 +3110,12 @@ static void qemu_chr_parse_ringbuf(QemuOpts *opts, ChardevBackend *backend, { int val; - backend->memory = g_new0(ChardevRingbuf, 1); + backend->ringbuf = g_new0(ChardevRingbuf, 1); val = qemu_opt_get_size(opts, "size", 0); if (val != 0) { - backend->memory->has_size = true; - backend->memory->size = val; + backend->ringbuf->has_size = true; + backend->ringbuf->size = val; } } @@ -3723,8 +3723,9 @@ ChardevReturn *qmp_chardev_add(const char *id, ChardevBackend *backend, case CHARDEV_BACKEND_KIND_VC: chr = vc_init(backend->vc); break; + case CHARDEV_BACKEND_KIND_RINGBUF: case CHARDEV_BACKEND_KIND_MEMORY: - chr = qemu_chr_open_ringbuf(backend->memory, errp); + chr = qemu_chr_open_ringbuf(backend->ringbuf, errp); break; default: error_setg(errp, "unknown chardev backend (%d)", backend->kind); @@ -3774,7 +3775,7 @@ static void register_types(void) register_char_driver_qapi("null", CHARDEV_BACKEND_KIND_NULL, NULL); register_char_driver("socket", qemu_chr_open_socket); register_char_driver("udp", qemu_chr_open_udp); - register_char_driver_qapi("ringbuf", CHARDEV_BACKEND_KIND_MEMORY, + register_char_driver_qapi("ringbuf", CHARDEV_BACKEND_KIND_RINGBUF, qemu_chr_parse_ringbuf); register_char_driver_qapi("file", CHARDEV_BACKEND_KIND_FILE, qemu_chr_parse_file_out);