aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAmit Shah <amit.shah@redhat.com>2010-09-02 18:11:44 +0530
committerRusty Russell <rusty@rustcorp.com.au>2010-10-21 17:44:01 +1030
commit8529a504273d4efa6bb004dcd6ef28fe67b64ae9 (patch)
tree3a6046100b725d8b263c4bd94baf6338dd4208b0
parent3709ea7ae7d698b428576c2db0bbb6e08a18cf12 (diff)
downloadlinux-mce-2.6-8529a504273d4efa6bb004dcd6ef28fe67b64ae9.tar.gz
virtio: console: Unblock poll on port hot-unplug
When a port is hot-unplugged while an app is blocked on poll(), unblock the poll() and return. Signed-off-by: Amit Shah <amit.shah@redhat.com> Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
-rw-r--r--drivers/char/virtio_console.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/char/virtio_console.c b/drivers/char/virtio_console.c
index 92f1f65d57a92..47b710ca4ab33 100644
--- a/drivers/char/virtio_console.c
+++ b/drivers/char/virtio_console.c
@@ -663,6 +663,10 @@ static unsigned int port_fops_poll(struct file *filp, poll_table *wait)
port = filp->private_data;
poll_wait(filp, &port->waitqueue, wait);
+ if (!port->guest_connected) {
+ /* Port got unplugged */
+ return POLLHUP;
+ }
ret = 0;
if (!will_read_block(port))
ret |= POLLIN | POLLRDNORM;