[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 2/3] chardev: Make the name of ringbuf device consis
From: |
Lei Li |
Subject: |
[Qemu-devel] [PATCH 2/3] chardev: Make the name of ringbuf device consistent |
Date: |
Mon, 20 May 2013 14:51:04 +0800 |
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 <address@hidden>
---
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);
--
1.7.7.6
[Qemu-devel] [PATCH 3/3] chardev: Get filename for new qapi backend, Lei Li, 2013/05/20