On Thu, 27 Jun 2013 16:22:09 +0200 Markus Armbruster <arm...@redhat.com> wrote:
> The driver is new in 1.4, with the documented name "ringbuf". > However, it's actual name is the completely undocumented "memory". > Screwed up in commit 3949e59. Fix code to match documentation. > > Keep the undocumented name working as an alias for compatibility. > > Cc: qemu-sta...@nongnu.org > Signed-off-by: Markus Armbruster <arm...@redhat.com> This patch doesn't apply anymore, can you respin please? > --- > qemu-char.c | 5 ++++- > 1 file changed, 4 insertions(+), 1 deletion(-) > > diff --git a/qemu-char.c b/qemu-char.c > index a8fad65..968f572 100644 > --- a/qemu-char.c > +++ b/qemu-char.c > @@ -3755,7 +3755,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_MEMORY, > qemu_chr_parse_ringbuf); > register_char_driver_qapi("file", CHARDEV_BACKEND_KIND_FILE, > qemu_chr_parse_file_out); > @@ -3773,6 +3773,9 @@ static void register_types(void) > register_char_driver_qapi("console", CHARDEV_BACKEND_KIND_CONSOLE, NULL); > register_char_driver_qapi("pipe", CHARDEV_BACKEND_KIND_PIPE, > qemu_chr_parse_pipe); > + /* Bug-compatibility: */ > + register_char_driver_qapi("memory", CHARDEV_BACKEND_KIND_MEMORY, > + qemu_chr_parse_ringbuf); > } > > type_init(register_types);