diff options
| author | KONRAD Frederic <fred.konrad@greensocs.com> | 2013-03-18 17:37:21 +0100 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2013-03-18 13:08:39 -0500 |
| commit | da3dcefa648f92bfef2f99351fb6ec6a86da4695 (patch) | |
| tree | 320dd326271af866823acacf00776bac3bd91699 | |
| parent | 10479a80893fb2666026ce0fea2251be3070b6e2 (diff) | |
| download | qemu-da3dcefa648f92bfef2f99351fb6ec6a86da4695.tar.gz | |
virtio-blk: don't use pointer for configuration.
The configuration field must not be a pointer as it will be used for virtio-blk
properties. So *blk is replaced by blk in VirtIOBlock structure.
Signed-off-by: KONRAD Frederic <fred.konrad@greensocs.com>
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Message-id: 1363624648-16906-5-git-send-email-fred.konrad@greensocs.com
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
| -rw-r--r-- | hw/virtio-blk.c | 8 | ||||
| -rw-r--r-- | hw/virtio-blk.h | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/hw/virtio-blk.c b/hw/virtio-blk.c index 6714b013bd..908c316b1e 100644 --- a/hw/virtio-blk.c +++ b/hw/virtio-blk.c @@ -151,7 +151,7 @@ static void virtio_blk_handle_scsi(VirtIOBlockReq *req) */ req->scsi = (void *)req->elem.in_sg[req->elem.in_num - 2].iov_base; - if (!req->dev->blk->scsi) { + if (!req->dev->blk.scsi) { status = VIRTIO_BLK_S_UNSUPP; goto fail; } @@ -371,7 +371,7 @@ static void virtio_blk_handle_request(VirtIOBlockReq *req, * terminated by '\0' only when shorter than buffer. */ strncpy(req->elem.in_sg[0].iov_base, - s->blk->serial ? s->blk->serial : "", + s->blk.serial ? s->blk.serial : "", MIN(req->elem.in_sg[0].iov_len, VIRTIO_BLK_ID_BYTES)); virtio_blk_req_complete(req, VIRTIO_BLK_S_OK); g_free(req); @@ -534,7 +534,7 @@ static uint32_t virtio_blk_get_features(VirtIODevice *vdev, uint32_t features) features |= (1 << VIRTIO_BLK_F_BLK_SIZE); features |= (1 << VIRTIO_BLK_F_SCSI); - if (s->blk->config_wce) { + if (s->blk.config_wce) { features |= (1 << VIRTIO_BLK_F_CONFIG_WCE); } if (bdrv_enable_write_cache(s->bs)) @@ -650,7 +650,7 @@ VirtIODevice *virtio_blk_init(DeviceState *dev, VirtIOBlkConf *blk) s->vdev.reset = virtio_blk_reset; s->bs = blk->conf.bs; s->conf = &blk->conf; - s->blk = blk; + memcpy(&(s->blk), blk, sizeof(struct VirtIOBlkConf)); s->rq = NULL; s->sector_mask = (s->conf->logical_block_size / BDRV_SECTOR_SIZE) - 1; diff --git a/hw/virtio-blk.h b/hw/virtio-blk.h index 19ec569bdd..b704d5000a 100644 --- a/hw/virtio-blk.h +++ b/hw/virtio-blk.h @@ -118,7 +118,7 @@ typedef struct VirtIOBlock { void *rq; QEMUBH *bh; BlockConf *conf; - VirtIOBlkConf *blk; + VirtIOBlkConf blk; unsigned short sector_mask; DeviceState *qdev; VMChangeStateEntry *change; |