mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

qemu: make virtio-blk PCI compliant by default

Browse Source 
commit bf011293fa made virtio-blk-pci not
PCI-compliant, since it makes region 0 (which is an i/o region)
size > 256, and, since PCI 2.1, i/o regions are limited to 256 bytes size.

When the ATA serial number feature is off, which is the default,
make the device spec compliant again, by making region 0 smaller.

Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Reported-by: Vadim Rozenfeld <vrozenfe@redhat.com>
Tested-by: Vadim Rozenfeld <vrozenfe@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
This commit is contained in:
Michael S. Tsirkin 2009-09-07 21:14:37 +03:00 committed by Anthony Liguori
parent c4c0e236be
commit 711bf3d954
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
hw/virtio-blk.c
View File

@ -27,6 +27,7 @@ typedef struct VirtIOBlock
void *rq; void *rq;
char serial_str[BLOCK_SERIAL_STRLEN + 1]; char serial_str[BLOCK_SERIAL_STRLEN + 1];
QEMUBH *bh; QEMUBH *bh;
size_t config_size;
} VirtIOBlock; } VirtIOBlock;
static VirtIOBlock *to_virtio_blk(VirtIODevice *vdev) static VirtIOBlock *to_virtio_blk(VirtIODevice *vdev)
@ -406,7 +407,7 @@ static void virtio_blk_update_config(VirtIODevice *vdev, uint8_t *config)
virtio_identify_template(&blkcfg); virtio_identify_template(&blkcfg);
memcpy(&blkcfg.identify[VIRTIO_BLK_ID_SN], s->serial_str, memcpy(&blkcfg.identify[VIRTIO_BLK_ID_SN], s->serial_str,
VIRTIO_BLK_ID_SN_BYTES); VIRTIO_BLK_ID_SN_BYTES);
memcpy(config, &blkcfg, sizeof(blkcfg)); memcpy(config, &blkcfg, s->config_size);
} }
static uint32_t virtio_blk_get_features(VirtIODevice *vdev) static uint32_t virtio_blk_get_features(VirtIODevice *vdev)
@ -463,18 +464,21 @@ VirtIODevice *virtio_blk_init(DeviceState *dev, DriveInfo *dinfo)
VirtIOBlock *s; VirtIOBlock *s;
int cylinders, heads, secs; int cylinders, heads, secs;
static int virtio_blk_id; static int virtio_blk_id;
char *ps; char *ps = (char *)drive_get_serial(dinfo->bdrv);
size_t size = strlen(ps) ? sizeof(struct virtio_blk_config) :
offsetof(struct virtio_blk_config, _blk_size);
s = (VirtIOBlock *)virtio_common_init("virtio-blk", VIRTIO_ID_BLOCK, s = (VirtIOBlock *)virtio_common_init("virtio-blk", VIRTIO_ID_BLOCK,
sizeof(struct virtio_blk_config), size,
sizeof(VirtIOBlock)); sizeof(VirtIOBlock));
s->config_size = size;
s->vdev.get_config = virtio_blk_update_config; s->vdev.get_config = virtio_blk_update_config;
s->vdev.get_features = virtio_blk_get_features; s->vdev.get_features = virtio_blk_get_features;
s->vdev.reset = virtio_blk_reset; s->vdev.reset = virtio_blk_reset;
s->bs = dinfo->bdrv; s->bs = dinfo->bdrv;
s->rq = NULL; s->rq = NULL;
if (strlen(ps = (char *)drive_get_serial(s->bs))) if (strlen(ps))
strncpy(s->serial_str, ps, sizeof(s->serial_str)); strncpy(s->serial_str, ps, sizeof(s->serial_str));
else else
snprintf(s->serial_str, sizeof(s->serial_str), "0"); snprintf(s->serial_str, sizeof(s->serial_str), "0");