Skip to content

Commit

Permalink
virtio: console: Let host know of port or device add failures
Browse files Browse the repository at this point in the history
The host may want to know and let management apps notify of port or
device add failures. Send a control message saying the device or port is
not ready in this case.

Signed-off-by: Amit Shah <amit.shah@redhat.com>
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
  • Loading branch information
Amit Shah authored and Rusty Russell committed May 19, 2010
1 parent 3425e70 commit eaeff96
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 0 deletions.
5 changes: 5 additions & 0 deletions drivers/char/virtio_console.c
Original file line number Diff line number Diff line change
Expand Up @@ -1210,6 +1210,8 @@ static int add_port(struct ports_device *portdev, u32 id)
free_port:
kfree(port);
fail:
/* The host might want to notify management sw about port add failure */
send_control_msg(port, VIRTIO_CONSOLE_PORT_READY, 0);
return err;
}

Expand Down Expand Up @@ -1488,6 +1490,9 @@ static int __devinit virtcons_probe(struct virtio_device *vdev)
free:
kfree(portdev);
fail:
/* The host might want to notify mgmt sw about device add failure */
__send_control_msg(portdev, VIRTIO_CONSOLE_BAD_ID,
VIRTIO_CONSOLE_DEVICE_READY, 0);
return err;
}

Expand Down
3 changes: 3 additions & 0 deletions include/linux/virtio_console.h
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@
#define VIRTIO_CONSOLE_F_SIZE 0 /* Does host provide console size? */
#define VIRTIO_CONSOLE_F_MULTIPORT 1 /* Does host provide multiple ports? */

#define VIRTIO_CONSOLE_BAD_ID (~(u32)0)

struct virtio_console_config {
/* colums of the screens */
__u16 cols;
Expand Down Expand Up @@ -42,6 +44,7 @@ struct virtio_console_control {
#define VIRTIO_CONSOLE_PORT_OPEN 3
#define VIRTIO_CONSOLE_PORT_NAME 4
#define VIRTIO_CONSOLE_PORT_REMOVE 5
#define VIRTIO_CONSOLE_DEVICE_READY 6

#ifdef __KERNEL__
int __init virtio_cons_early_init(int (*put_chars)(u32, const char *, int));
Expand Down

0 comments on commit eaeff96

Please sign in to comment.