From: Markus Armbruster Date: Fri, 26 Jul 2013 14:44:33 +0000 (+0200) Subject: qemu-char: Register ring buffer driver with correct name "ringbuf" X-Git-Tag: v1.5.3~20 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2b7e5f19dcc763a989ccbcf4bd5e2188a46f114e;p=thirdparty%2Fqemu.git qemu-char: Register ring buffer driver with correct name "ringbuf" 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-stable@nongnu.org Signed-off-by: Markus Armbruster Reviewed-by: Eric Blake Message-id: 1374849874-25531-3-git-send-email-armbru@redhat.com Signed-off-by: Anthony Liguori (cherry picked from commit c11ed9666d69abaf217c8800f299c519b487b7d3) Conflicts: qemu-char.c * removed dependency on command-line specifiable mux (bb6fb7c0) Signed-off-by: Michael Roth --- diff --git a/qemu-char.c b/qemu-char.c index b8ffcba42f8..c6c4c6b3100 100644 --- a/qemu-char.c +++ b/qemu-char.c @@ -3764,7 +3764,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); @@ -3782,6 +3782,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);