From patchwork Mon May 20 06:51:04 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lei Li X-Patchwork-Id: 244848 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 34A9B2C00A1 for ; Mon, 20 May 2013 16:52:13 +1000 (EST) Received: from localhost ([::1]:54649 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UeJx5-0000qo-CW for incoming@patchwork.ozlabs.org; Mon, 20 May 2013 02:52:11 -0400 Received: from eggs.gnu.org ([208.118.235.92]:56482) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UeJwd-0000mQ-AA for qemu-devel@nongnu.org; Mon, 20 May 2013 02:51:44 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UeJwc-0008Lz-0B for qemu-devel@nongnu.org; Mon, 20 May 2013 02:51:43 -0400 Received: from e28smtp05.in.ibm.com ([122.248.162.5]:37027) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UeJwb-0008LK-Bw for qemu-devel@nongnu.org; Mon, 20 May 2013 02:51:41 -0400 Received: from /spool/local by e28smtp05.in.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Mon, 20 May 2013 12:17:28 +0530 Received: from d28dlp01.in.ibm.com (9.184.220.126) by e28smtp05.in.ibm.com (192.168.1.135) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Mon, 20 May 2013 12:17:26 +0530 Received: from d28relay04.in.ibm.com (d28relay04.in.ibm.com [9.184.220.61]) by d28dlp01.in.ibm.com (Postfix) with ESMTP id 35397E004F for ; Mon, 20 May 2013 12:24:07 +0530 (IST) Received: from d28av04.in.ibm.com (d28av04.in.ibm.com [9.184.220.66]) by d28relay04.in.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id r4K6pUto60752100 for ; Mon, 20 May 2013 12:21:30 +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 r4K6pWLV027084 for ; Mon, 20 May 2013 16:51:34 +1000 Received: from localhost.cn.ibm.com ([9.115.122.245]) by d28av04.in.ibm.com (8.14.4/8.13.1/NCO v10.0 AVin) with ESMTP id r4K6pQdF026788; Mon, 20 May 2013 16:51:31 +1000 From: Lei Li To: qemu-devel@nongnu.org Date: Mon, 20 May 2013 14:51:04 +0800 Message-Id: <1369032665-18159-3-git-send-email-lilei@linux.vnet.ibm.com> X-Mailer: git-send-email 1.7.7.6 In-Reply-To: <1369032665-18159-1-git-send-email-lilei@linux.vnet.ibm.com> References: <1369032665-18159-1-git-send-email-lilei@linux.vnet.ibm.com> X-TM-AS-MML: No X-Content-Scanned: Fidelis XPS MAILER x-cbid: 13052006-8256-0000-0000-000007916120 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4.x-2.6.x [generic] X-Received-From: 122.248.162.5 Cc: aliguori@us.ibm.com, Lei Li , kraxel@redhat.com, armbru@redhat.com Subject: [Qemu-devel] [PATCH 2/3] chardev: Make the name of ringbuf device consistent 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 Now we have ringbuf char device, but the backend name of it is a little confusion. We actually register it by 'memory', but the description in qemu-option, the name of open functions and the new api backend called it 'ringbuf'. It should keep consistent. This patch named it all to 'ringbuf'. Signed-off-by: Lei Li --- qapi-schema.json | 2 +- qemu-char.c | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/qapi-schema.json b/qapi-schema.json index 9302e7d..61f6b34 100644 --- a/qapi-schema.json +++ b/qapi-schema.json @@ -3321,7 +3321,7 @@ 'spicevmc' : 'ChardevSpiceChannel', 'spiceport' : 'ChardevSpicePort', 'vc' : 'ChardevVC', - 'memory' : 'ChardevRingbuf' } } + 'ringbuf': 'ChardevRingbuf' } } ## # @ChardevReturn: diff --git a/qemu-char.c b/qemu-char.c index cff2896..7163bbf 100644 --- a/qemu-char.c +++ b/qemu-char.c @@ -3195,12 +3195,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; } } @@ -3786,8 +3786,8 @@ ChardevReturn *qmp_chardev_add(const char *id, ChardevBackend *backend, case CHARDEV_BACKEND_KIND_VC: chr = vc_init(backend->vc); break; - case CHARDEV_BACKEND_KIND_MEMORY: - chr = qemu_chr_open_ringbuf(backend->memory, errp); + case CHARDEV_BACKEND_KIND_RINGBUF: + chr = qemu_chr_open_ringbuf(backend->ringbuf, errp); break; default: error_setg(errp, "unknown chardev backend (%d)", backend->kind); @@ -3831,7 +3831,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("memory", 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);