|
@@ -3110,12 +3110,12 @@ static void qemu_chr_parse_ringbuf(QemuOpts *opts, ChardevBackend *backend,
|
|
{
|
|
{
|
|
int val;
|
|
int val;
|
|
|
|
|
|
- backend->memory = g_new0(ChardevRingbuf, 1);
|
|
|
|
|
|
+ backend->ringbuf = g_new0(ChardevRingbuf, 1);
|
|
|
|
|
|
val = qemu_opt_get_size(opts, "size", 0);
|
|
val = qemu_opt_get_size(opts, "size", 0);
|
|
if (val != 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:
|
|
case CHARDEV_BACKEND_KIND_VC:
|
|
chr = vc_init(backend->vc);
|
|
chr = vc_init(backend->vc);
|
|
break;
|
|
break;
|
|
|
|
+ case CHARDEV_BACKEND_KIND_RINGBUF:
|
|
case CHARDEV_BACKEND_KIND_MEMORY:
|
|
case CHARDEV_BACKEND_KIND_MEMORY:
|
|
- chr = qemu_chr_open_ringbuf(backend->memory, errp);
|
|
|
|
|
|
+ chr = qemu_chr_open_ringbuf(backend->ringbuf, errp);
|
|
break;
|
|
break;
|
|
default:
|
|
default:
|
|
error_setg(errp, "unknown chardev backend (%d)", backend->kind);
|
|
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_qapi("null", CHARDEV_BACKEND_KIND_NULL, NULL);
|
|
register_char_driver("socket", qemu_chr_open_socket);
|
|
register_char_driver("socket", qemu_chr_open_socket);
|
|
register_char_driver("udp", qemu_chr_open_udp);
|
|
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);
|
|
qemu_chr_parse_ringbuf);
|
|
register_char_driver_qapi("file", CHARDEV_BACKEND_KIND_FILE,
|
|
register_char_driver_qapi("file", CHARDEV_BACKEND_KIND_FILE,
|
|
qemu_chr_parse_file_out);
|
|
qemu_chr_parse_file_out);
|