openkylin
/
qemu
mirror of https://gitee.com/openkylin/qemu.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Cleanup: virtio-blk.c: Be more consistent using BDRV_SECTOR_SIZE instead 

Clean up virtio-blk.c to be more consistent using BDRV_SECTOR_SIZE
instead of hard coded 512 values.

Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
This commit is contained in:
Jes Sorensen 2010-05-27 16:20:33 +02:00 committed by Kevin Wolf
parent 9040385dcc
commit 1573a35d99
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
hw/virtio-blk.c
View File

@ -277,7 +277,7 @@ static void virtio_blk_handle_write(BlockRequest *blkreq, int *num_writes,
} }
blkreq[*num_writes].sector = req->out->sector; blkreq[*num_writes].sector = req->out->sector;
blkreq[*num_writes].nb_sectors = req->qiov.size / 512; blkreq[*num_writes].nb_sectors = req->qiov.size / BDRV_SECTOR_SIZE;
blkreq[*num_writes].qiov = &req->qiov; blkreq[*num_writes].qiov = &req->qiov;
blkreq[*num_writes].cb = virtio_blk_rw_complete; blkreq[*num_writes].cb = virtio_blk_rw_complete;
blkreq[*num_writes].opaque = req; blkreq[*num_writes].opaque = req;
@ -296,7 +296,8 @@ static void virtio_blk_handle_read(VirtIOBlockReq *req)
} }
acb = bdrv_aio_readv(req->dev->bs, req->out->sector, &req->qiov, acb = bdrv_aio_readv(req->dev->bs, req->out->sector, &req->qiov,
req->qiov.size / 512, virtio_blk_rw_complete, req); req->qiov.size / BDRV_SECTOR_SIZE,
virtio_blk_rw_complete, req);
if (!acb) { if (!acb) {
virtio_blk_rw_complete(req, -EIO); virtio_blk_rw_complete(req, -EIO);
} }
@ -505,7 +506,7 @@ VirtIODevice *virtio_blk_init(DeviceState *dev, BlockConf *conf)
s->bs = conf->dinfo->bdrv; s->bs = conf->dinfo->bdrv;
s->conf = conf; s->conf = conf;
s->rq = NULL; s->rq = NULL;
s->sector_mask = (s->conf->logical_block_size / 512) - 1; s->sector_mask = (s->conf->logical_block_size / BDRV_SECTOR_SIZE) - 1;
bdrv_guess_geometry(s->bs, &cylinders, &heads, &secs); bdrv_guess_geometry(s->bs, &cylinders, &heads, &secs);
s->vq = virtio_add_queue(&s->vdev, 128, virtio_blk_handle_output); s->vq = virtio_add_queue(&s->vdev, 128, virtio_blk_handle_output);