From patchwork Tue Aug 13 15:11:05 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Roth X-Patchwork-Id: 266843 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (unknown [IPv6:2001:4830:134:3::12]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id B0B972C0143 for ; Wed, 14 Aug 2013 01:23:34 +1000 (EST) Received: from localhost ([::1]:52104 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V9GRY-0002HB-Pq for incoming@patchwork.ozlabs.org; Tue, 13 Aug 2013 11:23:32 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60624) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V9GH8-0005tM-1z for qemu-devel@nongnu.org; Tue, 13 Aug 2013 11:12:54 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1V9GGz-00048i-K8 for qemu-devel@nongnu.org; Tue, 13 Aug 2013 11:12:45 -0400 Received: from mail-oa0-x231.google.com ([2607:f8b0:4003:c02::231]:57928) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V9GGz-00048T-Es; Tue, 13 Aug 2013 11:12:37 -0400 Received: by mail-oa0-f49.google.com with SMTP id n10so6278694oag.36 for ; Tue, 13 Aug 2013 08:12:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=XBAehp6QtuBVNRuUIMoXlgiUFkjBO+/kcTvI71q8xwY=; b=h9KAyVepRGj4kCAIrSr1Tbt3ICG/HjkcbMhQVmZZODJrrOpgrhgDosNqtoPAbuLkCR 8QcXgzTBK0qFcBLofzCACIQZT9nfSwLM9z+jO4sUN3vXYILlUF7dBCRM0qwFzE6ueCmQ 1KkUX+ThRK9im+fWgxZushKWxU4uwuYMm79U9tDYAL67W9UqQKeIhzQJsZ79QB3zSvZ7 Rjbx9HPYrT0Jiw0AP+npqU7Hc+0fY5k8XGnvcZWPWvzeGyqD9d0bddVTpRyEvLxBYWFR NrxMVh92N60dfEMhMpJUveVT4orqPOFjkAKaI7otc2N8o+MExCPGGeRVcbp00r+2sepw Ez3w== X-Received: by 10.182.142.129 with SMTP id rw1mr1237180obb.67.1376406756984; Tue, 13 Aug 2013 08:12:36 -0700 (PDT) Received: from loki.austin.ibm.com ([32.97.110.51]) by mx.google.com with ESMTPSA id uz16sm12947878obc.5.2013.08.13.08.12.35 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 13 Aug 2013 08:12:36 -0700 (PDT) From: Michael Roth To: qemu-devel@nongnu.org Date: Tue, 13 Aug 2013 10:11:05 -0500 Message-Id: <1376406680-16302-42-git-send-email-mdroth@linux.vnet.ibm.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1376406680-16302-1-git-send-email-mdroth@linux.vnet.ibm.com> References: <1376406680-16302-1-git-send-email-mdroth@linux.vnet.ibm.com> X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2607:f8b0:4003:c02::231 Cc: aliguori@us.ibm.com, qemu-stable@nongnu.org Subject: [Qemu-devel] [PATCH 41/56] 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 From: Markus Armbruster 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 Reviewed-by: Eric Blake Message-id: 1374849874-25531-4-git-send-email-armbru@redhat.com Signed-off-by: Anthony Liguori (cherry picked from commit 3a1da42eb35a67d0dbc899dd571ea386fa11c4dd) Signed-off-by: Michael Roth --- 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 9302e7d..1c8503a 100644 --- a/qapi-schema.json +++ b/qapi-schema.json @@ -3288,9 +3288,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 ## @@ -3321,6 +3321,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 c6c4c6b..c16aea1 100644 --- a/qemu-char.c +++ b/qemu-char.c @@ -3115,12 +3115,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_number(opts, "size", 0); if (val != 0) { - backend->memory->has_size = true; - backend->memory->size = val; + backend->ringbuf->has_size = true; + backend->ringbuf->size = val; } } @@ -3713,8 +3713,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); @@ -3764,7 +3765,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);