Re: [Qemu-devel] [PATCH 1/2] chardev: Make the name of memory device consistent

[Lei Li <lilei@linux.vnet.ibm.com>]

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 <lilei@linux.vnet.ibm.com>
> Acked-by: Paolo Bonzini <pbonzini@redhat.com>

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