vitalif
/
mirror_qemu
mirror of https://github.com/proxmox/mirror_qemu
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

virtio-blk: Drop redundant VirtIOBlock member conf 

Commit 12c5674 turned it into a pointer to member blk.conf.

Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Benoît Canet <benoit.canet@nodalink.com>
Reviewed-by: Max Reitz <mreitz@redhat.com>
Reviewed-by: Kevin Wolf <kwolf@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
master
Markus Armbruster 2014-10-07 13:59:16 +02:00 committed by Kevin Wolf
parent 097310b53e
commit f75167313c
2 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
hw/block/virtio-blk.c
View File

@ -296,7 +296,7 @@ static bool virtio_blk_sect_range_ok(VirtIOBlock *dev,
if (sector & dev->sector_mask) { if (sector & dev->sector_mask) {
return false; return false;
} }
if (size % dev->conf->logical_block_size) { if (size % dev->blk.conf.logical_block_size) {
return false; return false;
} }
bdrv_get_geometry(dev->bs, &total_sectors); bdrv_get_geometry(dev->bs, &total_sectors);
@ -513,19 +513,20 @@ static void virtio_blk_reset(VirtIODevice *vdev)
static void virtio_blk_update_config(VirtIODevice *vdev, uint8_t *config) static void virtio_blk_update_config(VirtIODevice *vdev, uint8_t *config)
{ {
VirtIOBlock *s = VIRTIO_BLK(vdev); VirtIOBlock *s = VIRTIO_BLK(vdev);
BlockConf *conf = &s->blk.conf;
struct virtio_blk_config blkcfg; struct virtio_blk_config blkcfg;
uint64_t capacity; uint64_t capacity;
int blk_size = s->conf->logical_block_size; int blk_size = conf->logical_block_size;
bdrv_get_geometry(s->bs, &capacity); bdrv_get_geometry(s->bs, &capacity);
memset(&blkcfg, 0, sizeof(blkcfg)); memset(&blkcfg, 0, sizeof(blkcfg));
virtio_stq_p(vdev, &blkcfg.capacity, capacity); virtio_stq_p(vdev, &blkcfg.capacity, capacity);
virtio_stl_p(vdev, &blkcfg.seg_max, 128 - 2); virtio_stl_p(vdev, &blkcfg.seg_max, 128 - 2);
virtio_stw_p(vdev, &blkcfg.cylinders, s->conf->cyls); virtio_stw_p(vdev, &blkcfg.cylinders, conf->cyls);
virtio_stl_p(vdev, &blkcfg.blk_size, blk_size); virtio_stl_p(vdev, &blkcfg.blk_size, blk_size);
virtio_stw_p(vdev, &blkcfg.min_io_size, s->conf->min_io_size / blk_size); virtio_stw_p(vdev, &blkcfg.min_io_size, conf->min_io_size / blk_size);
virtio_stw_p(vdev, &blkcfg.opt_io_size, s->conf->opt_io_size / blk_size); virtio_stw_p(vdev, &blkcfg.opt_io_size, conf->opt_io_size / blk_size);
blkcfg.heads = s->conf->heads; blkcfg.heads = conf->heads;
/* /*
* We must ensure that the block device capacity is a multiple of * We must ensure that the block device capacity is a multiple of
* the logical block size. If that is not the case, let's use * the logical block size. If that is not the case, let's use
@ -537,13 +538,13 @@ static void virtio_blk_update_config(VirtIODevice *vdev, uint8_t *config)
* divided by 512 - instead it is the amount of blk_size blocks * divided by 512 - instead it is the amount of blk_size blocks
* per track (cylinder). * per track (cylinder).
*/ */
if (bdrv_getlength(s->bs) / s->conf->heads / s->conf->secs % blk_size) { if (bdrv_getlength(s->bs) / conf->heads / conf->secs % blk_size) {
blkcfg.sectors = s->conf->secs & ~s->sector_mask; blkcfg.sectors = conf->secs & ~s->sector_mask;
} else { } else {
blkcfg.sectors = s->conf->secs; blkcfg.sectors = conf->secs;
} }
blkcfg.size_max = 0; blkcfg.size_max = 0;
blkcfg.physical_block_exp = get_physical_block_exp(s->conf); blkcfg.physical_block_exp = get_physical_block_exp(conf);
blkcfg.alignment_offset = 0; blkcfg.alignment_offset = 0;
blkcfg.wce = bdrv_enable_write_cache(s->bs); blkcfg.wce = bdrv_enable_write_cache(s->bs);
memcpy(config, &blkcfg, sizeof(struct virtio_blk_config)); memcpy(config, &blkcfg, sizeof(struct virtio_blk_config));
@ -746,9 +747,8 @@ static void virtio_blk_device_realize(DeviceState *dev, Error **errp)
sizeof(struct virtio_blk_config)); sizeof(struct virtio_blk_config));
s->bs = blk->conf.bs; s->bs = blk->conf.bs;
s->conf = &blk->conf;
s->rq = NULL; s->rq = NULL;
s->sector_mask = (s->conf->logical_block_size / BDRV_SECTOR_SIZE) - 1; s->sector_mask = (s->blk.conf.logical_block_size / BDRV_SECTOR_SIZE) - 1;
s->vq = virtio_add_queue(vdev, 128, virtio_blk_handle_output); s->vq = virtio_add_queue(vdev, 128, virtio_blk_handle_output);
s->complete_request = virtio_blk_complete_request; s->complete_request = virtio_blk_complete_request;
@ -765,7 +765,7 @@ static void virtio_blk_device_realize(DeviceState *dev, Error **errp)
register_savevm(dev, "virtio-blk", virtio_blk_id++, 2, register_savevm(dev, "virtio-blk", virtio_blk_id++, 2,
virtio_blk_save, virtio_blk_load, s); virtio_blk_save, virtio_blk_load, s);
bdrv_set_dev_ops(s->bs, &virtio_block_ops, s); bdrv_set_dev_ops(s->bs, &virtio_block_ops, s);
bdrv_set_guest_block_size(s->bs, s->conf->logical_block_size); bdrv_set_guest_block_size(s->bs, s->blk.conf.logical_block_size);
bdrv_iostatus_enable(s->bs); bdrv_iostatus_enable(s->bs);
} }

1
include/hw/virtio/virtio-blk.h
View File

@ -125,7 +125,6 @@ typedef struct VirtIOBlock {
VirtQueue *vq; VirtQueue *vq;
void *rq; void *rq;
QEMUBH *bh; QEMUBH *bh;
BlockConf *conf;
VirtIOBlkConf blk; VirtIOBlkConf blk;
unsigned short sector_mask; unsigned short sector_mask;
bool original_wce; bool original_wce;