Commit 3a1da42e authored by Markus Armbruster's avatar Markus Armbruster Committed by Anthony Liguori
Browse files

qapi: Rename ChardevBackend member "memory" to "ringbuf" 



Commit 1da48c65 called the new member "memory" after commit 3949e594
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: default avatarMarkus Armbruster <armbru@redhat.com>
Reviewed-by: default avatarEric Blake <eblake@redhat.com>
Message-id: 1374849874-25531-4-git-send-email-armbru@redhat.com
Signed-off-by: default avatarAnthony Liguori <aliguori@us.ibm.com>
parent c11ed966

qapi-schema.json

+4 −2
Original line number Diff line number Diff line
@@ -3364,9 +3364,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

##
@@ -3397,6 +3397,8 @@ 
                                       'spicevmc' : 'ChardevSpiceChannel',

                                       'spiceport' : 'ChardevSpicePort',

                                       'vc'     : 'ChardevVC',

                                       'ringbuf': 'ChardevRingbuf',

                                       # next one is just for compatibility

                                       'memory' : 'ChardevRingbuf' } }



##

qemu-char.c

+6 −5
Original line number Diff line number Diff line
@@ -3110,12 +3110,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_size(opts, "size", 0);

    if (val != 0) {

        backend->memory->has_size = true;

        backend->memory->size = val;

        backend->ringbuf->has_size = true;

        backend->ringbuf->size = val;

    }

}
@@ -3723,8 +3723,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);
@@ -3774,7 +3775,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);