From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:48152) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UsD5T-0004JJ-9R for qemu-devel@nongnu.org; Thu, 27 Jun 2013 10:22:20 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UsD5R-0004DE-KF for qemu-devel@nongnu.org; Thu, 27 Jun 2013 10:22:15 -0400 From: Markus Armbruster Date: Thu, 27 Jun 2013 16:22:09 +0200 Message-Id: <1372342930-28684-4-git-send-email-armbru@redhat.com> In-Reply-To: <1372342930-28684-1-git-send-email-armbru@redhat.com> References: <1372342930-28684-1-git-send-email-armbru@redhat.com> Subject: [Qemu-devel] [PATCH 3/4] qemu-char: Register ring buffer driver with correct name "ringbuf" List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: aliguori@us.ibm.com, lilei@linux.vnet.ibm.com, qemu-stable@nongnu.org, lcapitulino@redhat.com, kraxel@redhat.com 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 --- 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); -- 1.7.11.7