Merge branch 'upstream' into for-linus

[karo-tx-linux.git] / include / linux / virtio_blk.h

diff --git a/include/linux/virtio_blk.h b/include/linux/virtio_blk.h
index e52029e98919bb38401dd1848de418277ba271a9..167720d695ed00bb94b9174381de80f13fd6d009 100644 (file)
--- a/include/linux/virtio_blk.h
+++ b/include/linux/virtio_blk.h
@@ -17,6 +17,8 @@
 #define VIRTIO_BLK_F_FLUSH     9       /* Cache flush command support */
 #define VIRTIO_BLK_F_TOPOLOGY  10      /* Topology information is available */
 
+#define VIRTIO_BLK_ID_BYTES    20      /* ID string length */
+
 struct virtio_blk_config {
        /* The capacity (in 512-byte sectors). */
        __u64 capacity;
@@ -67,6 +69,9 @@ struct virtio_blk_config {
 /* Cache flush command */
 #define VIRTIO_BLK_T_FLUSH     4
 
+/* Get device ID command */
+#define VIRTIO_BLK_T_GET_ID    8
+
 /* Barrier before this op. */
 #define VIRTIO_BLK_T_BARRIER   0x80000000