aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorRusty Russell <rusty@rustcorp.com.au>2009-10-22 18:39:28 -0400
committerRusty Russell <rusty@rustcorp.com.au>2009-10-22 02:09:30 -0400
commit3225beaba05d4f06087593f5e903ce867b6e118a (patch)
treee68653a5f31ef98cbc96e170680187311e881fa0 /include
parente95646c3ec33c8ec0693992da4332a6b32eb7e31 (diff)
virtio_blk: Revert serial number support
This reverts "Add serial number support for virtio_blk, V4a". Turns out that virtio_pci, lguest and s/390 all have an 8 bit limit on virtio config space, so noone could ever use this. This is coming back later in a cleaner form. Signed-off-by: Rusty Russell <rusty@rustcorp.com.au> Cc: john cooper <john.cooper@redhat.com> Cc: Jens Axboe <jens.axboe@oracle.com>
Diffstat (limited to 'include')
-rw-r--r--include/linux/virtio_blk.h4
1 files changed, 0 insertions, 4 deletions
diff --git a/include/linux/virtio_blk.h b/include/linux/virtio_blk.h
index 1e19470d2da2..fd294c56d571 100644
--- a/include/linux/virtio_blk.h
+++ b/include/linux/virtio_blk.h
@@ -14,11 +14,8 @@
14#define VIRTIO_BLK_F_RO 5 /* Disk is read-only */ 14#define VIRTIO_BLK_F_RO 5 /* Disk is read-only */
15#define VIRTIO_BLK_F_BLK_SIZE 6 /* Block size of disk is available*/ 15#define VIRTIO_BLK_F_BLK_SIZE 6 /* Block size of disk is available*/
16#define VIRTIO_BLK_F_SCSI 7 /* Supports scsi command passthru */ 16#define VIRTIO_BLK_F_SCSI 7 /* Supports scsi command passthru */
17#define VIRTIO_BLK_F_IDENTIFY 8 /* ATA IDENTIFY supported */
18#define VIRTIO_BLK_F_FLUSH 9 /* Cache flush command support */ 17#define VIRTIO_BLK_F_FLUSH 9 /* Cache flush command support */
19 18
20#define VIRTIO_BLK_ID_BYTES (sizeof(__u16[256])) /* IDENTIFY DATA */
21
22struct virtio_blk_config { 19struct virtio_blk_config {
23 /* The capacity (in 512-byte sectors). */ 20 /* The capacity (in 512-byte sectors). */
24 __u64 capacity; 21 __u64 capacity;
@@ -34,7 +31,6 @@ struct virtio_blk_config {
34 } geometry; 31 } geometry;
35 /* block size of device (if VIRTIO_BLK_F_BLK_SIZE) */ 32 /* block size of device (if VIRTIO_BLK_F_BLK_SIZE) */
36 __u32 blk_size; 33 __u32 blk_size;
37 __u8 identify[VIRTIO_BLK_ID_BYTES];
38} __attribute__((packed)); 34} __attribute__((packed));
39 35
40/* 36/*