From: Pekka Enberg <penberg@kernel.org>
Date: Mon, 10 Jan 2011 19:21:06 +0000 (+0200)
Subject: kvm,8250: Make ttyS1 and ttyS2 disabled
X-Git-Tag: next-20110824~3^2~524
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=27908ca3d046c07f31ccb5704f0d957fb5e08e61;p=karo-tx-linux.git

kvm,8250: Make ttyS1 and ttyS2 disabled

This patch fixes the 8250 serial emulation to not have undefined ioports but
rather make them explicitly disabled.

Signed-off-by: Pekka Enberg <penberg@kernel.org>
---

diff --git a/tools/kvm/8250-serial.c b/tools/kvm/8250-serial.c
index f5e66a601785..6056ed6b30d0 100644
--- a/tools/kvm/8250-serial.c
+++ b/tools/kvm/8250-serial.c
@@ -25,7 +25,7 @@ struct serial8250_device {
 	uint8_t			scr;
 };
 
-static struct serial8250_device devices[1] = {
+static struct serial8250_device devices[] = {
 	/* ttyS0 */
 	[0]	= {
 		.iobase			= 0x3f8,
@@ -33,6 +33,16 @@ static struct serial8250_device devices[1] = {
 
 		.lsr			= UART_LSR_TEMT | UART_LSR_THRE,
 	},
+	/* ttyS1 */
+	[1]	= {
+		.iobase			= 0x2f8,
+		.irq			= 3,
+	},
+	/* ttyS2 */
+	[2]	= {
+		.iobase			= 0x3e8,
+		.irq			= 4,
+	},
 };
 
 static int read_char(int fd)