diff options
author | Amit Shah <amit.shah@redhat.com> | 2013-07-29 00:51:32 -0400 |
---|---|---|
committer | Rusty Russell <rusty@rustcorp.com.au> | 2013-07-29 01:13:57 -0400 |
commit | 92d3453815fbe74d539c86b60dab39ecdf01bb99 (patch) | |
tree | 1a20a8b9cbc08af95828f673b36e860577409108 /drivers/char/virtio_console.c | |
parent | ea3768b4386a8d1790f4cc9a35de4f55b92d6442 (diff) |
virtio: console: fix raising SIGIO after port unplug
SIGIO should be sent when a port gets unplugged. It should only be sent
to prcesses that have the port opened, and have asked for SIGIO to be
delivered. We were clearing out guest_connected before calling
send_sigio_to_port(), resulting in a sigio not getting sent to
processes.
Fix by setting guest_connected to false after invoking the sigio
function.
CC: <stable@vger.kernel.org>
Signed-off-by: Amit Shah <amit.shah@redhat.com>
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
Diffstat (limited to 'drivers/char/virtio_console.c')
-rw-r--r-- | drivers/char/virtio_console.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/drivers/char/virtio_console.c b/drivers/char/virtio_console.c index 4e684faee10b..e4845f1c9a0b 100644 --- a/drivers/char/virtio_console.c +++ b/drivers/char/virtio_console.c | |||
@@ -1551,12 +1551,14 @@ static void unplug_port(struct port *port) | |||
1551 | spin_unlock_irq(&port->portdev->ports_lock); | 1551 | spin_unlock_irq(&port->portdev->ports_lock); |
1552 | 1552 | ||
1553 | if (port->guest_connected) { | 1553 | if (port->guest_connected) { |
1554 | /* Let the app know the port is going down. */ | ||
1555 | send_sigio_to_port(port); | ||
1556 | |||
1557 | /* Do this after sigio is actually sent */ | ||
1554 | port->guest_connected = false; | 1558 | port->guest_connected = false; |
1555 | port->host_connected = false; | 1559 | port->host_connected = false; |
1556 | wake_up_interruptible(&port->waitqueue); | ||
1557 | 1560 | ||
1558 | /* Let the app know the port is going down. */ | 1561 | wake_up_interruptible(&port->waitqueue); |
1559 | send_sigio_to_port(port); | ||
1560 | } | 1562 | } |
1561 | 1563 | ||
1562 | if (is_console_port(port)) { | 1564 | if (is_console_port(port)) { |