From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:40086) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Wskc1-0008PE-CD for qemu-devel@nongnu.org; Thu, 05 Jun 2014 23:14:43 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Wskbu-0005YK-K1 for qemu-devel@nongnu.org; Thu, 05 Jun 2014 23:14:37 -0400 Received: from mx1.redhat.com ([209.132.183.28]:34134) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Wskbu-0005Y8-9e for qemu-devel@nongnu.org; Thu, 05 Jun 2014 23:14:30 -0400 Received: from int-mx02.intmail.prod.int.phx2.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id s563ETTO006480 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Thu, 5 Jun 2014 23:14:29 -0400 Date: Fri, 6 Jun 2014 11:14:41 +0800 From: Fam Zheng Message-ID: <20140606031441.GA11403@T430.nay.redhat.com> References: <1401970536-18019-1-git-send-email-armbru@redhat.com> <1401970536-18019-2-git-send-email-armbru@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1401970536-18019-2-git-send-email-armbru@redhat.com> Subject: Re: [Qemu-devel] [PATCH 1/3] virtio-blk: Factor common checks out of virtio_blk_handle_read/write() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Markus Armbruster Cc: kwolf@redhat.com, qemu-devel@nongnu.org, stefanha@redhat.com, uobergfe@redhat.com On Thu, 06/05 14:15, Markus Armbruster wrote: > Signed-off-by: Markus Armbruster > --- > hw/block/virtio-blk.c | 24 ++++++++++++++---------- > 1 file changed, 14 insertions(+), 10 deletions(-) > > diff --git a/hw/block/virtio-blk.c b/hw/block/virtio-blk.c > index 8a568e5..f2b4dca 100644 > --- a/hw/block/virtio-blk.c > +++ b/hw/block/virtio-blk.c > @@ -281,6 +281,18 @@ static void virtio_blk_handle_flush(VirtIOBlockReq *req, MultiReqBuffer *mrb) > bdrv_aio_flush(req->dev->bs, virtio_blk_flush_complete, req); > } > > +static bool virtio_blk_sect_range_ok(VirtIOBlock *dev, > + uint64_t sector, size_t size) > +{ > + if (sector & dev->sector_mask) { > + return false; > + } > + if (size % dev->conf->logical_block_size) { > + return false; > + } > + return true; > +} > + > static void virtio_blk_handle_write(VirtIOBlockReq *req, MultiReqBuffer *mrb) > { > BlockRequest *blkreq; > @@ -292,11 +304,7 @@ static void virtio_blk_handle_write(VirtIOBlockReq *req, MultiReqBuffer *mrb) > > trace_virtio_blk_handle_write(req, sector, req->qiov.size / 512); > > - if (sector & req->dev->sector_mask) { > - virtio_blk_rw_complete(req, -EIO); > - return; > - } > - if (req->qiov.size % req->dev->conf->logical_block_size) { > + if (!virtio_blk_sect_range_ok(req->dev, sector, req->qiov.size)) { > virtio_blk_rw_complete(req, -EIO); > return; > } > @@ -326,11 +334,7 @@ static void virtio_blk_handle_read(VirtIOBlockReq *req) > > trace_virtio_blk_handle_read(req, sector, req->qiov.size / 512); > > - if (sector & req->dev->sector_mask) { > - virtio_blk_rw_complete(req, -EIO); > - return; > - } > - if (req->qiov.size % req->dev->conf->logical_block_size) { > + if (!virtio_blk_sect_range_ok(req->dev, sector, req->qiov.size)) { > virtio_blk_rw_complete(req, -EIO); > return; > } > -- > 1.9.3 > > Reviewed-by: Fam Zheng