From 164e4d713715d9d85bd2616cb1bcf0c9c6daec61 Mon Sep 17 00:00:00 2001 From: Amit Shah Date: Wed, 19 May 2010 22:15:47 -0600 Subject: [PATCH] --- yaml --- r: 197865 b: refs/heads/master c: 69eb9a9f69572c0ebe08a0a46f56bdfdcdaa19a0 h: refs/heads/master i: 197863: d25aef1ad97523ce14ae51bfd2208e18267a399e v: v3 --- [refs] | 2 +- trunk/drivers/char/virtio_console.c | 11 +++++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 1ebd58bc9fb3..29c2e8f26193 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6dc69f970231387d8fe646a831920da26408b5f5 +refs/heads/master: 69eb9a9f69572c0ebe08a0a46f56bdfdcdaa19a0 diff --git a/trunk/drivers/char/virtio_console.c b/trunk/drivers/char/virtio_console.c index 11a9573f901e..9a698707e14b 100644 --- a/trunk/drivers/char/virtio_console.c +++ b/trunk/drivers/char/virtio_console.c @@ -869,7 +869,18 @@ static int remove_port(struct port *port) spin_lock_irq(&pdrvdata_lock); list_del(&port->cons.list); spin_unlock_irq(&pdrvdata_lock); +#if 0 + /* + * hvc_remove() not called as removing one hvc port + * results in other hvc ports getting frozen. + * + * Once this is resolved in hvc, this functionality + * will be enabled. Till that is done, the -EPIPE + * return from get_chars() above will help + * hvc_console.c to clean up on ports we remove here. + */ hvc_remove(port->cons.hvc); +#endif } if (port->guest_connected) send_control_msg(port, VIRTIO_CONSOLE_PORT_OPEN, 0);