From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:44211) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UelYO-0000gn-Hz for qemu-devel@nongnu.org; Tue, 21 May 2013 08:20:37 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UelYJ-0002iX-DF for qemu-devel@nongnu.org; Tue, 21 May 2013 08:20:32 -0400 Received: from e23smtp06.au.ibm.com ([202.81.31.148]:47681) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UelYI-0002iB-QW for qemu-devel@nongnu.org; Tue, 21 May 2013 08:20:27 -0400 Received: from /spool/local by e23smtp06.au.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Tue, 21 May 2013 22:13:54 +1000 Received: from d23relay03.au.ibm.com (d23relay03.au.ibm.com [9.190.235.21]) by d23dlp02.au.ibm.com (Postfix) with ESMTP id 6D05D2BB0023 for ; Tue, 21 May 2013 22:20:21 +1000 (EST) Received: from d23av02.au.ibm.com (d23av02.au.ibm.com [9.190.235.138]) by d23relay03.au.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id r4LCKDjC7012606 for ; Tue, 21 May 2013 22:20:13 +1000 Received: from d23av02.au.ibm.com (loopback [127.0.0.1]) by d23av02.au.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id r4LCKKek010288 for ; Tue, 21 May 2013 22:20:20 +1000 Message-ID: <519B666C.1010705@linux.vnet.ibm.com> Date: Tue, 21 May 2013 20:19:56 +0800 From: Lei Li MIME-Version: 1.0 References: <1369132079-11377-1-git-send-email-lilei@linux.vnet.ibm.com> <1369132079-11377-2-git-send-email-lilei@linux.vnet.ibm.com> <519B4DB4.6080900@redhat.com> In-Reply-To: <519B4DB4.6080900@redhat.com> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH 1/2] chardev: Make the name of memory device consistent List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Paolo Bonzini Cc: Markus Armbruster , Anthony Liguori , qemu-devel , Gerd Hoffmann On 05/21/2013 06:34 PM, Paolo Bonzini wrote: > Il 21/05/2013 12:27, Lei Li ha scritto: >> Now we have memory 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 'memory'. >> >> Signed-off-by: Lei Li > Acked-by: Paolo Bonzini This might miss cc to all. :) > >> --- >> qapi-schema.json | 6 +++--- >> qemu-char.c | 16 ++++++++-------- >> qemu-options.hx | 6 +++--- >> 3 files changed, 14 insertions(+), 14 deletions(-) >> >> diff --git a/qapi-schema.json b/qapi-schema.json >> index 9302e7d..664b31f 100644 >> --- a/qapi-schema.json >> +++ b/qapi-schema.json >> @@ -3286,7 +3286,7 @@ >> '*rows' : 'int' } } >> >> ## >> -# @ChardevRingbuf: >> +# @ChardevMemory: >> # >> # Configuration info for memory chardevs >> # >> @@ -3294,7 +3294,7 @@ >> # >> # Since: 1.5 >> ## >> -{ 'type': 'ChardevRingbuf', 'data': { '*size' : 'int' } } >> +{ 'type': 'ChardevMemory', 'data': { '*size' : 'int' } } >> >> ## >> # @ChardevBackend: >> @@ -3321,7 +3321,7 @@ >> 'spicevmc' : 'ChardevSpiceChannel', >> 'spiceport' : 'ChardevSpicePort', >> 'vc' : 'ChardevVC', >> - 'memory' : 'ChardevRingbuf' } } >> + 'memory' : 'ChardevMemory' } } >> >> ## >> # @ChardevReturn: >> diff --git a/qemu-char.c b/qemu-char.c >> index cff2896..ebeed04 100644 >> --- a/qemu-char.c >> +++ b/qemu-char.c >> @@ -2875,8 +2875,8 @@ static void ringbuf_chr_close(struct CharDriverState *chr) >> chr->opaque = NULL; >> } >> >> -static CharDriverState *qemu_chr_open_ringbuf(ChardevRingbuf *opts, >> - Error **errp) >> +static CharDriverState *qemu_chr_open_memory(ChardevMemory *opts, >> + Error **errp) >> { >> CharDriverState *chr; >> RingBufCharDriver *d; >> @@ -2888,7 +2888,7 @@ static CharDriverState *qemu_chr_open_ringbuf(ChardevRingbuf *opts, >> >> /* The size must be power of 2 */ >> if (d->size & (d->size - 1)) { >> - error_setg(errp, "size of ringbuf chardev must be power of two"); >> + error_setg(errp, "size of memory chardev must be power of two"); >> goto fail; >> } >> >> @@ -3190,12 +3190,12 @@ static void qemu_chr_parse_pipe(QemuOpts *opts, ChardevBackend *backend, >> backend->pipe->device = g_strdup(device); >> } >> >> -static void qemu_chr_parse_ringbuf(QemuOpts *opts, ChardevBackend *backend, >> - Error **errp) >> +static void qemu_chr_parse_memory(QemuOpts *opts, ChardevBackend *backend, >> + Error **errp) >> { >> int val; >> >> - backend->memory = g_new0(ChardevRingbuf, 1); >> + backend->memory = g_new0(ChardevMemory, 1); >> >> val = qemu_opt_get_number(opts, "size", 0); >> if (val != 0) { >> @@ -3787,7 +3787,7 @@ ChardevReturn *qmp_chardev_add(const char *id, ChardevBackend *backend, >> chr = vc_init(backend->vc); >> break; >> case CHARDEV_BACKEND_KIND_MEMORY: >> - chr = qemu_chr_open_ringbuf(backend->memory, errp); >> + chr = qemu_chr_open_memory(backend->memory, errp); >> break; >> default: >> error_setg(errp, "unknown chardev backend (%d)", backend->kind); >> @@ -3832,7 +3832,7 @@ static void register_types(void) >> 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, >> - qemu_chr_parse_ringbuf); >> + qemu_chr_parse_memory); >> register_char_driver_qapi("file", CHARDEV_BACKEND_KIND_FILE, >> qemu_chr_parse_file_out); >> register_char_driver_qapi("stdio", CHARDEV_BACKEND_KIND_STDIO, >> diff --git a/qemu-options.hx b/qemu-options.hx >> index fb62b75..fb3961d 100644 >> --- a/qemu-options.hx >> +++ b/qemu-options.hx >> @@ -1779,7 +1779,7 @@ DEF("chardev", HAS_ARG, QEMU_OPTION_chardev, >> "-chardev msmouse,id=id[,mux=on|off]\n" >> "-chardev vc,id=id[[,width=width][,height=height]][[,cols=cols][,rows=rows]]\n" >> " [,mux=on|off]\n" >> - "-chardev ringbuf,id=id[,size=size]\n" >> + "-chardev memory,id=id[,size=size]\n" >> "-chardev file,id=id,path=path[,mux=on|off]\n" >> "-chardev pipe,id=id,path=path[,mux=on|off]\n" >> #ifdef _WIN32 >> @@ -1817,7 +1817,7 @@ Backend is one of: >> @option{udp}, >> @option{msmouse}, >> @option{vc}, >> -@option{ringbuf}, >> +@option{memory}, >> @option{file}, >> @option{pipe}, >> @option{console}, >> @@ -1926,7 +1926,7 @@ the console, in pixels. >> @option{cols} and @option{rows} specify that the console be sized to fit a text >> console with the given dimensions. >> >> -@item -chardev ringbuf ,id=@var{id} [,size=@var{size}] >> +@item -chardev memory ,id=@var{id} [,size=@var{size}] >> >> Create a ring buffer with fixed size @option{size}. >> @var{size} must be a power of two, and defaults to @code{64K}). >> -- Lei