From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1M9tXl-00008R-GU for qemu-devel@nongnu.org; Fri, 29 May 2009 00:18:09 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1M9tXg-00005q-Sf for qemu-devel@nongnu.org; Fri, 29 May 2009 00:18:08 -0400 Received: from [199.232.76.173] (port=45976 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1M9tXg-00005a-DG for qemu-devel@nongnu.org; Fri, 29 May 2009 00:18:04 -0400 Received: from mx2.redhat.com ([66.187.237.31]:53803) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1M9tXf-0001su-SG for qemu-devel@nongnu.org; Fri, 29 May 2009 00:18:04 -0400 Message-ID: <4A1F615F.1090701@redhat.com> Date: Fri, 29 May 2009 00:15:27 -0400 From: john cooper MIME-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Subject: [Qemu-devel] [PATCH 2/2] Add serial number support for virtio_blk, V4 List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: KVM list , qemu-devel@nongnu.org Cc: john.cooper@redhat.com, Rusty Russell , Christoph Hellwig virtio_blk-serial-4.patch drivers/block/virtio_blk.c | 41 ++++++++++++++++++++++++++++++++++++++--- include/linux/virtio_blk.h | 7 +++++++ 2 files changed, 45 insertions(+), 3 deletions(-) ================================================================= --- a/drivers/block/virtio_blk.c +++ b/drivers/block/virtio_blk.c @@ -146,12 +146,46 @@ static void do_virtblk_request(struct re vblk->vq->vq_ops->kick(vblk->vq); } +/* return ATA identify data + */ +static int virtblk_identify(struct gendisk *disk, void *argp) +{ + struct virtio_blk *vblk = disk->private_data; + u16 *id; + int err = -ENOMEM; + + id = kmalloc(VIRTIO_BLK_ID_BYTES, GFP_KERNEL); + if (!id) + goto out; + + err = virtio_config_buf(vblk->vdev, VIRTIO_BLK_F_IDENTIFY, + offsetof(struct virtio_blk_config, identify), id, + VIRTIO_BLK_ID_BYTES); + + if (err) + goto out_kfree; + + if (copy_to_user(argp, id, VIRTIO_BLK_ID_BYTES)) + err = -EFAULT; + +out_kfree: + kfree(id); +out: + return err; +} + static int virtblk_ioctl(struct block_device *bdev, fmode_t mode, unsigned cmd, unsigned long data) { - return scsi_cmd_ioctl(bdev->bd_disk->queue, - bdev->bd_disk, mode, cmd, - (void __user *)data); + struct gendisk *disk = bdev->bd_disk; + void __user *argp = (void __user *)data; + + switch (cmd) { + case HDIO_GET_IDENTITY: + return virtblk_identify(disk, argp); + default: + return scsi_cmd_ioctl(disk->queue, disk, mode, cmd, argp); + } } /* We provide getgeo only to please some old bootloader/partitioning tools */ @@ -356,6 +390,7 @@ static struct virtio_device_id id_table[ static unsigned int features[] = { VIRTIO_BLK_F_BARRIER, VIRTIO_BLK_F_SEG_MAX, VIRTIO_BLK_F_SIZE_MAX, VIRTIO_BLK_F_GEOMETRY, VIRTIO_BLK_F_RO, VIRTIO_BLK_F_BLK_SIZE, + VIRTIO_BLK_F_IDENTIFY }; static struct virtio_driver virtio_blk = { ================================================================= --- a/include/linux/virtio_blk.h +++ b/include/linux/virtio_blk.h @@ -15,7 +15,13 @@ #define VIRTIO_BLK_F_GEOMETRY 4 /* Legacy geometry available */ #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_IDENTIFY 8 /* ATA IDENTIFY supported */ +#define VIRTIO_BLK_ID_LEN 256 +#define VIRTIO_BLK_ID_BYTES (VIRTIO_BLK_ID_LEN * sizeof (u16)) + +/* mapped into pci i/o region 0 + */ struct virtio_blk_config { /* The capacity (in 512-byte sectors). */ @@ -32,6 +38,7 @@ struct virtio_blk_config } geometry; /* block size of device (if VIRTIO_BLK_F_BLK_SIZE) */ __u32 blk_size; + __u16 identify[VIRTIO_BLK_ID_LEN]; } __attribute__((packed)); /* These two define direction. */ -- john.cooper@redhat.com