From patchwork Tue Aug 13 15:11:04 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Roth X-Patchwork-Id: 266863 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (unknown [IPv6:2001:4830:134:3::12]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 14F9E2C00F3 for ; Wed, 14 Aug 2013 01:40:48 +1000 (EST) Received: from localhost ([::1]:33334 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V9Gei-0006aB-HL for incoming@patchwork.ozlabs.org; Tue, 13 Aug 2013 11:37:08 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60612) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V9GH7-0005rD-4X for qemu-devel@nongnu.org; Tue, 13 Aug 2013 11:12:53 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1V9GGx-000480-OZ for qemu-devel@nongnu.org; Tue, 13 Aug 2013 11:12:45 -0400 Received: from mail-oa0-x232.google.com ([2607:f8b0:4003:c02::232]:47966) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V9GGx-00047j-Kr; Tue, 13 Aug 2013 11:12:35 -0400 Received: by mail-oa0-f50.google.com with SMTP id i4so11410927oah.23 for ; Tue, 13 Aug 2013 08:12:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=U2UdEzrHtFBsQCCR+kD98l6Yf7Nxvr+uKjqHzUr/uIM=; b=CUAkFtYqwywGDd8QmH8av5vUMPxlrzEwblWVT9sLCg5Yrg4i5fvDoGnIAg+oSR0x4T ApwUGjt+e+67idPf2M9UwViK+ELEM/n/qIl1UkG5xkgNqqAZiXqiexOC1RwCEAqipmSG O39/yPSYEaJzKTwTOu6llNwarXUsiCykPbI/r/UToHg1oGBZuQPONSAAun6DdkzArOgs 0Vjzr9DYUgzH/rIrOeec44ds1UGmBSWnjFir1xnIVfXh9iS42DG+6J3hSAvkxlwLaXDc Il9OGUuo23FlIHxgYgjpOJGLonGBQUZl5b8IsXCpzvKHwgBQL0hDnc6KgEmHxC/Z60pN oovw== X-Received: by 10.182.215.133 with SMTP id oi5mr594360obc.83.1376406755203; Tue, 13 Aug 2013 08:12:35 -0700 (PDT) Received: from loki.austin.ibm.com ([32.97.110.51]) by mx.google.com with ESMTPSA id uz16sm12947878obc.5.2013.08.13.08.12.33 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 13 Aug 2013 08:12:34 -0700 (PDT) From: Michael Roth To: qemu-devel@nongnu.org Date: Tue, 13 Aug 2013 10:11:04 -0500 Message-Id: <1376406680-16302-41-git-send-email-mdroth@linux.vnet.ibm.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1376406680-16302-1-git-send-email-mdroth@linux.vnet.ibm.com> References: <1376406680-16302-1-git-send-email-mdroth@linux.vnet.ibm.com> X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2607:f8b0:4003:c02::232 Cc: aliguori@us.ibm.com, qemu-stable@nongnu.org Subject: [Qemu-devel] [PATCH 40/56] qemu-char: Register ring buffer driver with correct name "ringbuf" X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org From: Markus Armbruster 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 --- qemu-char.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/qemu-char.c b/qemu-char.c index b8ffcba..c6c4c6b 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);