Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next

[cascardo/linux.git] / include / uapi / linux / virtio_console.h

diff --git a/include/uapi/linux/virtio_console.h b/include/uapi/linux/virtio_console.h
index c312f16..b7fb108 100644 (file)
--- a/include/uapi/linux/virtio_console.h
+++ b/include/uapi/linux/virtio_console.h
@@ -32,12 +32,14 @@
 #ifndef _UAPI_LINUX_VIRTIO_CONSOLE_H
 #define _UAPI_LINUX_VIRTIO_CONSOLE_H
 #include <linux/types.h>
+#include <linux/virtio_types.h>
 #include <linux/virtio_ids.h>
 #include <linux/virtio_config.h>
 
 /* Feature bits */
 #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_F_EMERG_WRITE 2 /* Does host support emergency write? */
 
 #define VIRTIO_CONSOLE_BAD_ID          (~(__u32)0)
 
@@ -48,6 +50,8 @@ struct virtio_console_config {
        __u16 rows;
        /* max. number of ports this device can hold */
        __u32 max_nr_ports;
+       /* emergency write register */
+       __u32 emerg_wr;
 } __attribute__((packed));
 
 /*
@@ -55,9 +59,9 @@ struct virtio_console_config {
  * particular port.
  */
 struct virtio_console_control {
-       __u32 id;               /* Port number */
-       __u16 event;            /* The kind of control event (see below) */
-       __u16 value;            /* Extra information for the key */
+       __virtio32 id;          /* Port number */
+       __virtio16 event;       /* The kind of control event (see below) */
+       __virtio16 value;       /* Extra information for the key */
 };
 
 /* Some events for control messages */