From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1M4I3Z-0007Sy-3N for qemu-devel@nongnu.org; Wed, 13 May 2009 13:15:49 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1M4I3X-0007SK-8s for qemu-devel@nongnu.org; Wed, 13 May 2009 13:15:48 -0400 Received: from [199.232.76.173] (port=37188 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1M4I3X-0007SH-6f for qemu-devel@nongnu.org; Wed, 13 May 2009 13:15:47 -0400 Received: from mx2.redhat.com ([66.187.237.31]:59564) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1M4I3V-00029D-En for qemu-devel@nongnu.org; Wed, 13 May 2009 13:15:45 -0400 Message-ID: <4A0AFE50.4040708@redhat.com> Date: Wed, 13 May 2009 13:07:28 -0400 From: john cooper MIME-Version: 1.0 References: <49F876B2.5000005@third-harmonic.com> In-Reply-To: <49F876B2.5000005@third-harmonic.com> Content-Type: multipart/mixed; boundary="------------060700000106010705000809" Subject: [Qemu-devel] [PATCH 2/2] Add serial number support for virtio_blk, V2 List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: kvm@vger.kernel.org, qemu-devel@nongnu.org Cc: john cooper This is a multi-part message in MIME format. --------------060700000106010705000809 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit -- john.cooper@redhat.com --------------060700000106010705000809 Content-Type: text/x-patch; name="virtio_blk-serial-2.patch" Content-Transfer-Encoding: 7bit Content-Disposition: inline; filename="virtio_blk-serial-2.patch" drivers/block/virtio_blk.c | 35 ++++++++++++++++++++++++++++++++--- include/linux/virtio_blk.h | 10 ++++++++++ 2 files changed, 42 insertions(+), 3 deletions(-) ================================================================= --- a/drivers/block/virtio_blk.c +++ b/drivers/block/virtio_blk.c @@ -146,12 +146,40 @@ static void do_virtblk_request(struct re vblk->vq->vq_ops->kick(vblk->vq); } +/* user passes the address of a char[] for serial# return, and has set char[0] + * to the array size. copy serial# to this char[] and return number of + * characters copied excluding any trailing '\0' pad chars in buffer. + */ +static int get_virtblk_sn(struct block_device *bdev, void *buf) +{ + struct virtio_blk *vblk = bdev->bd_disk->private_data; + unsigned char serial[BLOCK_SERIAL_STRLEN]; + unsigned char snlen; + int rv; + + if (copy_from_user(&snlen, buf, sizeof (snlen))) + rv = -EFAULT; + else if ((rv = virtio_config_val(vblk->vdev, VIRTIO_BLK_F_SN, + offsetof(struct virtio_blk_config, serial), &serial))) + ; + else if (copy_to_user(buf, serial, + snlen = min(snlen, (unsigned char)sizeof (serial)))) + rv = -EFAULT; + else + for (rv = 0; rv < snlen; ++rv) + if (!serial[rv]) + break; + return (rv); +} + 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); + if (cmd == VBLK_GET_SN) + return (get_virtblk_sn(bdev, (void __user *)data)); + else + return scsi_cmd_ioctl(bdev->bd_disk->queue, bdev->bd_disk, + mode, cmd, (void __user *)data); } /* We provide getgeo only to please some old bootloader/partitioning tools */ @@ -356,6 +384,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_SN }; static struct virtio_driver virtio_blk = { ================================================================= --- a/include/linux/virtio_blk.h +++ b/include/linux/virtio_blk.h @@ -15,7 +15,16 @@ #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_SN 8 /* serial number supported */ +/* ioctl cmd to retrieve serial# +*/ +#define VBLK_GET_SN ((unsigned int)('V' << 24 | 'B' << 16 | 'L' << 8 | 'K')) + +#define BLOCK_SERIAL_STRLEN 20 + +/* mapped into pci i/o region 0 + */ struct virtio_blk_config { /* The capacity (in 512-byte sectors). */ @@ -32,6 +41,7 @@ struct virtio_blk_config } geometry; /* block size of device (if VIRTIO_BLK_F_BLK_SIZE) */ __u32 blk_size; + __u8 serial[BLOCK_SERIAL_STRLEN]; } __attribute__((packed)); /* These two define direction. */ --------------060700000106010705000809--