aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAmit Shah <amit.shah@redhat.com>2010-09-02 18:11:45 +0530
committerRusty Russell <rusty@rustcorp.com.au>2010-10-21 17:44:01 +1030
commitb3dddb9e6ddab74327f5557c1a6640ea0f56ad1c (patch)
tree10197c4931c48cb9168f0e6697360632348ce627
parent8529a504273d4efa6bb004dcd6ef28fe67b64ae9 (diff)
downloadlinux-mce-2.6-b3dddb9e6ddab74327f5557c1a6640ea0f56ad1c.tar.gz
virtio: console: Make read() return -ENODEV on hot-unplug
When a port is hot-unplugged while an app was blocked on a read() call, the call was unblocked but would not get an error returned. Return -ENODEV to ensure the app knows the port has gone away. 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.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/char/virtio_console.c b/drivers/char/virtio_console.c
index 47b710ca4ab332..e17ecf5d42b522 100644
--- a/drivers/char/virtio_console.c
+++ b/drivers/char/virtio_console.c
@@ -582,6 +582,9 @@ static ssize_t port_fops_read(struct file *filp, char __user *ubuf,
if (ret < 0)
return ret;
}
+ /* Port got hot-unplugged. */
+ if (!port->guest_connected)
+ return -ENODEV;
/*
* We could've received a disconnection message while we were
* waiting for more data.