From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:34744) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UeNou-00038F-9R for qemu-devel@nongnu.org; Mon, 20 May 2013 07:00:01 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UeNot-00016J-Ak for qemu-devel@nongnu.org; Mon, 20 May 2013 07:00:00 -0400 Received: from mail-yh0-x229.google.com ([2607:f8b0:4002:c01::229]:50139) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UeNot-000169-6H for qemu-devel@nongnu.org; Mon, 20 May 2013 06:59:59 -0400 Received: by mail-yh0-f41.google.com with SMTP id i72so1582676yha.0 for ; Mon, 20 May 2013 03:59:58 -0700 (PDT) Sender: Paolo Bonzini Message-ID: <519A0226.8000105@redhat.com> Date: Mon, 20 May 2013 12:59:50 +0200 From: Paolo Bonzini MIME-Version: 1.0 References: <1369032665-18159-1-git-send-email-lilei@linux.vnet.ibm.com> <1369032665-18159-3-git-send-email-lilei@linux.vnet.ibm.com> <5199FE5B.9020706@redhat.com> In-Reply-To: <5199FE5B.9020706@redhat.com> Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH 2/3] chardev: Make the name of ringbuf device consistent List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: qemu-devel@nongnu.org, aliguori@us.ibm.com, kraxel@redhat.com, Lei Li , armbru@redhat.com Il 20/05/2013 12:43, Paolo Bonzini ha scritto: > Il 20/05/2013 08:51, Lei Li ha scritto: >> 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); >> > > Same here as for patch 1. Oh, actually this is different. The only inconsistency is in the name of the type, the enum is consistent with the -chardev option and it cannot be renamed because it was in QEMU 1.4. So we can change the type, but we can do that post 1.5. Paolo