From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58230) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XgD8Q-0004kG-GQ for qemu-devel@nongnu.org; Mon, 20 Oct 2014 09:36:39 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XgD8L-0007JW-CV for qemu-devel@nongnu.org; Mon, 20 Oct 2014 09:36:30 -0400 Received: from mx1.redhat.com ([209.132.183.28]:17208) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XgD8L-0007JF-5x for qemu-devel@nongnu.org; Mon, 20 Oct 2014 09:36:25 -0400 Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id s9KDaOPS021853 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL) for ; Mon, 20 Oct 2014 09:36:24 -0400 From: Kevin Wolf Date: Mon, 20 Oct 2014 15:35:44 +0200 Message-Id: <1413812154-11153-19-git-send-email-kwolf@redhat.com> In-Reply-To: <1413812154-11153-1-git-send-email-kwolf@redhat.com> References: <1413812154-11153-1-git-send-email-kwolf@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PULL 18/28] virtio-blk: Drop redundant VirtIOBlock member conf List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: kwolf@redhat.com From: Markus Armbruster Commit 12c5674 turned it into a pointer to member blk.conf. Signed-off-by: Markus Armbruster Reviewed-by: Beno=C3=AEt Canet Reviewed-by: Max Reitz Reviewed-by: Kevin Wolf Signed-off-by: Kevin Wolf --- hw/block/virtio-blk.c | 26 +++++++++++++------------- include/hw/virtio/virtio-blk.h | 1 - 2 files changed, 13 insertions(+), 14 deletions(-) diff --git a/hw/block/virtio-blk.c b/hw/block/virtio-blk.c index 1fa9770..1621826 100644 --- a/hw/block/virtio-blk.c +++ b/hw/block/virtio-blk.c @@ -296,7 +296,7 @@ static bool virtio_blk_sect_range_ok(VirtIOBlock *dev= , if (sector & dev->sector_mask) { return false; } - if (size % dev->conf->logical_block_size) { + if (size % dev->blk.conf.logical_block_size) { return false; } 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= ) { VirtIOBlock *s =3D VIRTIO_BLK(vdev); + BlockConf *conf =3D &s->blk.conf; struct virtio_blk_config blkcfg; uint64_t capacity; - int blk_size =3D s->conf->logical_block_size; + int blk_size =3D conf->logical_block_size; =20 bdrv_get_geometry(s->bs, &capacity); memset(&blkcfg, 0, sizeof(blkcfg)); virtio_stq_p(vdev, &blkcfg.capacity, capacity); 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_stw_p(vdev, &blkcfg.min_io_size, s->conf->min_io_size / blk_s= ize); - virtio_stw_p(vdev, &blkcfg.opt_io_size, s->conf->opt_io_size / blk_s= ize); - blkcfg.heads =3D s->conf->heads; + virtio_stw_p(vdev, &blkcfg.min_io_size, conf->min_io_size / blk_size= ); + virtio_stw_p(vdev, &blkcfg.opt_io_size, conf->opt_io_size / blk_size= ); + blkcfg.heads =3D conf->heads; /* * 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 @@ -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 * per track (cylinder). */ - if (bdrv_getlength(s->bs) / s->conf->heads / s->conf->secs % blk_si= ze) { - blkcfg.sectors =3D s->conf->secs & ~s->sector_mask; + if (bdrv_getlength(s->bs) / conf->heads / conf->secs % blk_size) { + blkcfg.sectors =3D conf->secs & ~s->sector_mask; } else { - blkcfg.sectors =3D s->conf->secs; + blkcfg.sectors =3D conf->secs; } blkcfg.size_max =3D 0; - blkcfg.physical_block_exp =3D get_physical_block_exp(s->conf); + blkcfg.physical_block_exp =3D get_physical_block_exp(conf); blkcfg.alignment_offset =3D 0; blkcfg.wce =3D bdrv_enable_write_cache(s->bs); memcpy(config, &blkcfg, sizeof(struct virtio_blk_config)); @@ -746,9 +747,8 @@ static void virtio_blk_device_realize(DeviceState *de= v, Error **errp) sizeof(struct virtio_blk_config)); =20 s->bs =3D blk->conf.bs; - s->conf =3D &blk->conf; s->rq =3D NULL; - s->sector_mask =3D (s->conf->logical_block_size / BDRV_SECTOR_SIZE) = - 1; + s->sector_mask =3D (s->blk.conf.logical_block_size / BDRV_SECTOR_SIZ= E) - 1; =20 s->vq =3D virtio_add_queue(vdev, 128, virtio_blk_handle_output); s->complete_request =3D virtio_blk_complete_request; @@ -765,7 +765,7 @@ static void virtio_blk_device_realize(DeviceState *de= v, Error **errp) register_savevm(dev, "virtio-blk", virtio_blk_id++, 2, virtio_blk_save, virtio_blk_load, 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); =20 bdrv_iostatus_enable(s->bs); } diff --git a/include/hw/virtio/virtio-blk.h b/include/hw/virtio/virtio-bl= k.h index f3853f2..0f4323d 100644 --- a/include/hw/virtio/virtio-blk.h +++ b/include/hw/virtio/virtio-blk.h @@ -125,7 +125,6 @@ typedef struct VirtIOBlock { VirtQueue *vq; void *rq; QEMUBH *bh; - BlockConf *conf; VirtIOBlkConf blk; unsigned short sector_mask; bool original_wce; --=20 1.8.3.1