diff options
| author | Jes Sorensen <Jes.Sorensen@redhat.com> | 2010-05-27 16:20:33 +0200 |
|---|---|---|
| committer | Kevin Wolf <kwolf@redhat.com> | 2010-06-04 11:43:39 +0200 |
| commit | 1573a35d99fe60f98d30f50e9187040586c2b801 (patch) | |
| tree | e2c16c918680e3eba446bda903623cfdad3db5ff | |
| parent | 9040385dcc0a4b32ca8ceeda6dc679aea56e3832 (diff) | |
| download | qemu-1573a35d99fe60f98d30f50e9187040586c2b801.zip qemu-1573a35d99fe60f98d30f50e9187040586c2b801.tar.gz qemu-1573a35d99fe60f98d30f50e9187040586c2b801.tar.bz2 | |
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>
| -rw-r--r-- | hw/virtio-blk.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/hw/virtio-blk.c b/hw/virtio-blk.c index 5d7f1a2..80d51c4 100644 --- a/hw/virtio-blk.c +++ b/hw/virtio-blk.c @@ -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].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].cb = virtio_blk_rw_complete; 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, - req->qiov.size / 512, virtio_blk_rw_complete, req); + req->qiov.size / BDRV_SECTOR_SIZE, + virtio_blk_rw_complete, req); if (!acb) { virtio_blk_rw_complete(req, -EIO); } @@ -505,7 +506,7 @@ VirtIODevice *virtio_blk_init(DeviceState *dev, BlockConf *conf) s->bs = conf->dinfo->bdrv; s->conf = conf; 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); s->vq = virtio_add_queue(&s->vdev, 128, virtio_blk_handle_output); |