From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from [140.186.70.92] (port=40595 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Q1erY-00050C-V2 for qemu-devel@nongnu.org; Mon, 21 Mar 2011 09:09:38 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Q1erX-0007OF-73 for qemu-devel@nongnu.org; Mon, 21 Mar 2011 09:09:36 -0400 Received: from mx1.redhat.com ([209.132.183.28]:35610) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Q1erW-0007O4-Ug for qemu-devel@nongnu.org; Mon, 21 Mar 2011 09:09:35 -0400 From: Amit Shah Date: Mon, 21 Mar 2011 18:39:17 +0530 Message-Id: <0b8b716d6c43b5a1d4e0293df1c77af4fff21bab.1300712809.git.amit.shah@redhat.com> In-Reply-To: References: In-Reply-To: References: Subject: [Qemu-devel] [PATCH 2/7] virtio-serial: Disallow generic ports at id 0 List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Anthony Liguori Cc: Amit Shah , qemu list Port 0 is reserved for virtconsole devices for backward compatibility with the old -virtioconsole (from qemu 0.12) device type. libvirt prior to commit 8e28c5d40200b4c5d483bd585d237b9d870372e5 used port 0 for generic ports. libvirt will no longer do that, but disallow instantiating generic ports at id 0 from qemu as well. Signed-off-by: Amit Shah --- hw/virtio-console.c | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/hw/virtio-console.c b/hw/virtio-console.c index c235b27..4440784 100644 --- a/hw/virtio-console.c +++ b/hw/virtio-console.c @@ -11,6 +11,7 @@ */ #include "qemu-char.h" +#include "qemu-error.h" #include "virtio-serial.h" typedef struct VirtConsole { @@ -113,6 +114,14 @@ static int virtserialport_initfn(VirtIOSerialPort *port) { VirtConsole *vcon = DO_UPCAST(VirtConsole, port, port); + if (port->id == 0) { + /* + * Disallow a generic port at id 0, that's reserved for + * console ports. + */ + error_report("Port number 0 on virtio-serial devices reserved for virtconsole devices for backward compatibility."); + return -1; + } return generic_port_init(vcon, port); } -- 1.7.4