From c11ed9666d69abaf217c8800f299c519b487b7d3 Mon Sep 17 00:00:00 2001 From: Markus Armbruster Date: Fri, 26 Jul 2013 16:44:33 +0200 Subject: 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 --- qemu-char.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'qemu-char.c') diff --git a/qemu-char.c b/qemu-char.c index bd1aefb8b5..742b73ba69 100644 --- a/qemu-char.c +++ b/qemu-char.c @@ -3774,7 +3774,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); @@ -3794,6 +3794,9 @@ static void register_types(void) qemu_chr_parse_pipe); register_char_driver_qapi("mux", CHARDEV_BACKEND_KIND_MUX, qemu_chr_parse_mux); + /* Bug-compatibility: */ + register_char_driver_qapi("memory", CHARDEV_BACKEND_KIND_MEMORY, + qemu_chr_parse_ringbuf); } type_init(register_types); -- cgit v1.2.1