diff options
| author | Amit Shah <amit.shah@redhat.com> | 2010-05-20 00:15:47 -0400 |
|---|---|---|
| committer | Rusty Russell <rusty@rustcorp.com.au> | 2010-05-19 08:45:47 -0400 |
| commit | 6dc69f970231387d8fe646a831920da26408b5f5 (patch) | |
| tree | 64596dafbf37893692493cfd0be247e7f0e24a80 | |
| parent | eaeff9608a8cf43a676b6f4b6235ea9d76192230 (diff) | |
virtio: console: Return -EPIPE to hvc_console if we lost the connection
hvc_console handles -EPIPE properly when the connection to the host is
lost.
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.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/drivers/char/virtio_console.c b/drivers/char/virtio_console.c index f63bf77a4825..11a9573f901e 100644 --- a/drivers/char/virtio_console.c +++ b/drivers/char/virtio_console.c | |||
| @@ -653,7 +653,7 @@ static int put_chars(u32 vtermno, const char *buf, int count) | |||
| 653 | 653 | ||
| 654 | port = find_port_by_vtermno(vtermno); | 654 | port = find_port_by_vtermno(vtermno); |
| 655 | if (!port) | 655 | if (!port) |
| 656 | return 0; | 656 | return -EPIPE; |
| 657 | 657 | ||
| 658 | return send_buf(port, (void *)buf, count); | 658 | return send_buf(port, (void *)buf, count); |
| 659 | } | 659 | } |
| @@ -669,9 +669,13 @@ static int get_chars(u32 vtermno, char *buf, int count) | |||
| 669 | { | 669 | { |
| 670 | struct port *port; | 670 | struct port *port; |
| 671 | 671 | ||
| 672 | /* If we've not set up the port yet, we have no input to give. */ | ||
| 673 | if (unlikely(early_put_chars)) | ||
| 674 | return 0; | ||
| 675 | |||
| 672 | port = find_port_by_vtermno(vtermno); | 676 | port = find_port_by_vtermno(vtermno); |
| 673 | if (!port) | 677 | if (!port) |
| 674 | return 0; | 678 | return -EPIPE; |
| 675 | 679 | ||
| 676 | /* If we don't have an input queue yet, we can't get input. */ | 680 | /* If we don't have an input queue yet, we can't get input. */ |
| 677 | BUG_ON(!port->in_vq); | 681 | BUG_ON(!port->in_vq); |
