aboutsummaryrefslogtreecommitdiff
path: root/hw/virtio-blk.h
diff options
context:
space:
mode:
authorhch@lst.de <hch@lst.de>2010-02-10 23:36:49 +0100
committerAnthony Liguori <aliguori@us.ibm.com>2010-02-10 16:51:31 -0600
commit37d5ddd6f4a898134b6430c0126378baf5abff4b (patch)
treea43e118f4af5628b362d191bc600506c38e6ff6e /hw/virtio-blk.h
parent3f54bfbf81bbd37171bbda2a2ee69ed5357ea8a7 (diff)
downloadqemu-37d5ddd6f4a898134b6430c0126378baf5abff4b.zip
qemu-37d5ddd6f4a898134b6430c0126378baf5abff4b.tar.gz
qemu-37d5ddd6f4a898134b6430c0126378baf5abff4b.tar.bz2
virtio-blk: revert serial number support
The addition of the whole ATA IDENTIY page caused the config space to go above the allowed size in the PCI spec, and thus the feature was already reverted in the Linux guest driver and disabled by default in qemu. Signed-off-by: Christoph Hellwig <hch@lst.de> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Diffstat (limited to 'hw/virtio-blk.h')
-rw-r--r--hw/virtio-blk.h7
1 files changed, 1 insertions, 6 deletions
diff --git a/hw/virtio-blk.h b/hw/virtio-blk.h
index c28f776..5c281ad 100644
--- a/hw/virtio-blk.h
+++ b/hw/virtio-blk.h
@@ -30,13 +30,9 @@
#define VIRTIO_BLK_F_RO 5 /* Disk is read-only */
#define VIRTIO_BLK_F_BLK_SIZE 6 /* Block size of disk is available*/
#define VIRTIO_BLK_F_SCSI 7 /* Supports scsi command passthru */
-#define VIRTIO_BLK_F_IDENTIFY 8 /* ATA IDENTIFY supported */
+/* #define VIRTIO_BLK_F_IDENTIFY 8 ATA IDENTIFY supported, DEPRECATED */
#define VIRTIO_BLK_F_WCACHE 9 /* write cache enabled */
-#define VIRTIO_BLK_ID_LEN 256 /* length of identify u16 array */
-#define VIRTIO_BLK_ID_SN 10 /* start of char * serial# */
-#define VIRTIO_BLK_ID_SN_BYTES 20 /* length in bytes of serial# */
-
struct virtio_blk_config
{
uint64_t capacity;
@@ -46,7 +42,6 @@ struct virtio_blk_config
uint8_t heads;
uint8_t sectors;
uint32_t _blk_size; /* structure pad, currently unused */
- uint16_t identify[VIRTIO_BLK_ID_LEN];
} __attribute__((packed));
/* These two define direction. */