From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1MIoHT-0006Sj-T4 for qemu-devel@nongnu.org; Mon, 22 Jun 2009 14:30:11 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1MIoHO-0006QP-GA for qemu-devel@nongnu.org; Mon, 22 Jun 2009 14:30:10 -0400 Received: from [199.232.76.173] (port=53122 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MIoHO-0006QE-BY for qemu-devel@nongnu.org; Mon, 22 Jun 2009 14:30:06 -0400 Received: from mx2.redhat.com ([66.187.237.31]:48899) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1MIoHN-0005Sy-L5 for qemu-devel@nongnu.org; Mon, 22 Jun 2009 14:30:06 -0400 Message-ID: <4A3FCCEB.1080603@redhat.com> Date: Mon, 22 Jun 2009 14:26:51 -0400 From: john cooper MIME-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Subject: [Qemu-devel] [PATCH] Add serial number support for virtio_blk List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: john.cooper@redhat.com [brought forward to current qemu-kvm.git] This patch implements the missing qemu logic to interpret a '-drive .. serial=XYZ ..' flag for a virtio_blk device. The serial number string is contained in a skeletal IDENTIFY DEVICE data structure and this structure is made available to the guest virtio_blk driver via pci i/o region 0. Signed-off-by: john cooper --- diff --git a/hw/virtio-blk.c b/hw/virtio-blk.c index dad4ef0..8e675a8 100644 --- a/hw/virtio-blk.c +++ b/hw/virtio-blk.c @@ -25,6 +25,7 @@ typedef struct VirtIOBlock BlockDriverState *bs; VirtQueue *vq; void *rq; + char serial_str[BLOCK_SERIAL_STRLEN + 1]; } VirtIOBlock; static VirtIOBlock *to_virtio_blk(VirtIODevice *vdev) @@ -32,6 +33,47 @@ static VirtIOBlock *to_virtio_blk(VirtIODevice *vdev) return (VirtIOBlock *)vdev; } +/* store identify data in little endian format + */ +static inline void put_le16(uint16_t *p, unsigned int v) +{ + *p = cpu_to_le16(v); +} + +/* copy to *dst from *src, nul pad dst tail as needed to len bytes + */ +static inline void padstr(char *dst, const char *src, int len) +{ + while (len--) + *dst++ = *src ? *src++ : '\0'; +} + +/* setup simulated identify data as appropriate for virtio block device + * + * ref: AT Attachment 8 - ATA/ATAPI Command Set (ATA8-ACS) + */ +static inline void virtio_identify_template(struct virtio_blk_config *bc) +{ + uint16_t *p = &bc->identify[0]; + uint64_t lba_sectors = bc->capacity; + + memset(p, 0, sizeof(bc->identify)); + put_le16(p + 0, 0x0); /* ATA device */ + padstr((char *)(p + 23), QEMU_VERSION, 8); /* firmware revision */ + padstr((char *)(p + 27), "QEMU VIRT_BLK", 40); /* model# */ + put_le16(p + 47, 0x80ff); /* max xfer 255 sectors */ + put_le16(p + 49, 0x0b00); /* support IORDY/LBA/DMA */ + put_le16(p + 59, 0x1ff); /* cur xfer 255 sectors */ + put_le16(p + 80, 0x1f0); /* support ATA8/7/6/5/4 */ + put_le16(p + 81, 0x16); + put_le16(p + 82, 0x400); + put_le16(p + 83, 0x400); + put_le16(p + 100, lba_sectors); + put_le16(p + 101, lba_sectors >> 16); + put_le16(p + 102, lba_sectors >> 32); + put_le16(p + 103, lba_sectors >> 48); +} + typedef struct VirtIOBlockReq { VirtIOBlock *dev; @@ -285,6 +327,8 @@ static void virtio_blk_reset(VirtIODevice *vdev) qemu_aio_flush(); } +/* coalesce internal state, copy to pci i/o region 0 + */ static void virtio_blk_update_config(VirtIODevice *vdev, uint8_t *config) { VirtIOBlock *s = to_virtio_blk(vdev); @@ -299,11 +343,15 @@ static void virtio_blk_update_config(VirtIODevice *vdev, uint8_t *config) stw_raw(&blkcfg.cylinders, cylinders); blkcfg.heads = heads; blkcfg.sectors = secs; + virtio_identify_template(&blkcfg); + memcpy(&blkcfg.identify[VIRTIO_BLK_ID_SN], s->serial_str, + VIRTIO_BLK_ID_SN_BYTES); memcpy(config, &blkcfg, sizeof(blkcfg)); } static uint32_t virtio_blk_get_features(VirtIODevice *vdev) { + VirtIOBlock *s = to_virtio_blk(vdev); uint32_t features = 0; features |= (1 << VIRTIO_BLK_F_SEG_MAX); @@ -311,6 +359,8 @@ static uint32_t virtio_blk_get_features(VirtIODevice *vdev) #ifdef __linux__ features |= (1 << VIRTIO_BLK_F_SCSI); #endif + if (strcmp(s->serial_str, "0")) + features |= 1 << VIRTIO_BLK_F_IDENTIFY; return features; } @@ -353,6 +403,7 @@ void *virtio_blk_init(PCIBus *bus, BlockDriverState *bs) VirtIOBlock *s; int cylinders, heads, secs; static int virtio_blk_id; + char *ps; s = (VirtIOBlock *)virtio_init_pci(bus, "virtio-blk", PCI_VENDOR_ID_REDHAT_QUMRANET, @@ -369,6 +420,10 @@ void *virtio_blk_init(PCIBus *bus, BlockDriverState *bs) s->vdev.reset = virtio_blk_reset; s->bs = bs; s->rq = NULL; + if (strlen(ps = (char *)drive_get_serial(bs))) + strncpy(s->serial_str, ps, sizeof(s->serial_str)); + else + snprintf(s->serial_str, sizeof(s->serial_str), "0"); bs->private = &s->vdev.pci_dev; bdrv_guess_geometry(s->bs, &cylinders, &heads, &secs); bdrv_set_geometry_hint(s->bs, cylinders, heads, secs); diff --git a/hw/virtio-blk.h b/hw/virtio-blk.h index 5ef6c36..7555492 100644 --- a/hw/virtio-blk.h +++ b/hw/virtio-blk.h @@ -31,6 +31,11 @@ #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_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 { @@ -40,6 +45,8 @@ struct virtio_blk_config uint16_t cylinders; 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. */ diff --git a/sysemu.h b/sysemu.h index 1f45fd6..185b4e3 100644 --- a/sysemu.h +++ b/sysemu.h @@ -141,6 +141,8 @@ typedef enum { BLOCK_ERR_STOP_ANY } BlockInterfaceErrorAction; +#define BLOCK_SERIAL_STRLEN 20 + typedef struct DriveInfo { BlockDriverState *bdrv; BlockInterfaceType type; @@ -149,7 +151,7 @@ typedef struct DriveInfo { int used; int drive_opt_idx; BlockInterfaceErrorAction onerror; - char serial[21]; + char serial[BLOCK_SERIAL_STRLEN + 1]; } DriveInfo; #define MAX_IDE_DEVS 2 -- john.cooper@redhat.com