From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56972) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WsNqC-00079r-S5 for qemu-devel@nongnu.org; Wed, 04 Jun 2014 22:55:51 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WsNq6-0000zL-DK for qemu-devel@nongnu.org; Wed, 04 Jun 2014 22:55:44 -0400 Received: from mx1.redhat.com ([209.132.183.28]:2422) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WsNq6-0000zG-4b for qemu-devel@nongnu.org; Wed, 04 Jun 2014 22:55:38 -0400 Received: from int-mx12.intmail.prod.int.phx2.redhat.com (int-mx12.intmail.prod.int.phx2.redhat.com [10.5.11.25]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id s552tbpj006366 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Wed, 4 Jun 2014 22:55:37 -0400 Message-ID: <538FDC26.4030402@redhat.com> Date: Thu, 05 Jun 2014 04:55:34 +0200 From: Paolo Bonzini MIME-Version: 1.0 References: <1401933526-22436-1-git-send-email-famz@redhat.com> <1401933526-22436-9-git-send-email-famz@redhat.com> In-Reply-To: <1401933526-22436-9-git-send-email-famz@redhat.com> Content-Type: text/plain; charset=ISO-8859-15; format=flowed Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH v2 8/8] virtio-blk: Fill in VirtIOBlockReq.out in dataplane code List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Fam Zheng , qemu-devel@nongnu.org Cc: Kevin Wolf , Stefan Hajnoczi Il 05/06/2014 03:58, Fam Zheng ha scritto: > Signed-off-by: Fam Zheng > --- > hw/block/dataplane/virtio-blk.c | 14 +++++++++----- > 1 file changed, 9 insertions(+), 5 deletions(-) > > diff --git a/hw/block/dataplane/virtio-blk.c b/hw/block/dataplane/virtio-blk.c > index 96068cd..323793a 100644 > --- a/hw/block/dataplane/virtio-blk.c > +++ b/hw/block/dataplane/virtio-blk.c > @@ -113,7 +113,8 @@ static void do_get_id_cmd(VirtIOBlockDataPlane *s, > static void do_rdwr_cmd(VirtIOBlockDataPlane *s, bool read, > struct iovec *iov, unsigned iov_cnt, > int64_t sector_num, VirtQueueElement *elem, > - struct virtio_blk_inhdr *inhdr) > + struct virtio_blk_inhdr *inhdr, > + struct virtio_blk_outhdr *outhdr) > { > VirtIOBlock *dev = VIRTIO_BLK(s->vdev); > VirtIOBlockReq *req = g_slice_new0(VirtIOBlockReq); > @@ -124,6 +125,7 @@ static void do_rdwr_cmd(VirtIOBlockDataPlane *s, bool read, > req->elem = elem; > req->dev = dev; > req->in = inhdr; > + req->out = *outhdr; > qemu_iovec_init_external(&req->qiov, iov, iov_cnt); > > qiov = &req->qiov; > @@ -155,13 +157,15 @@ static void complete_flush(void *opaque, int ret) > } > > static void do_flush_cmd(VirtIOBlockDataPlane *s, VirtQueueElement *elem, > - struct virtio_blk_inhdr *inhdr) > + struct virtio_blk_inhdr *inhdr, > + struct virtio_blk_outhdr *outhdr) > { > VirtIOBlock *dev = VIRTIO_BLK(s->vdev); > VirtIOBlockReq *req = g_slice_new0(VirtIOBlockReq); > req->dev = dev; > req->elem = elem; > req->in = inhdr; > + req->out = *outhdr; > > bdrv_aio_flush(s->blk->conf.bs, complete_flush, req); > } > @@ -202,13 +206,13 @@ static int process_request(VirtIOBlockDataPlane *s, VirtQueueElement *elem) > case VIRTIO_BLK_T_IN: > do_rdwr_cmd(s, true, in_iov, in_num, > outhdr.sector * 512 / BDRV_SECTOR_SIZE, > - elem, inhdr); > + elem, inhdr, &outhdr); > return 0; > > case VIRTIO_BLK_T_OUT: > do_rdwr_cmd(s, false, iov, out_num, > outhdr.sector * 512 / BDRV_SECTOR_SIZE, > - elem, inhdr); > + elem, inhdr, &outhdr); > return 0; > > case VIRTIO_BLK_T_SCSI_CMD: > @@ -216,7 +220,7 @@ static int process_request(VirtIOBlockDataPlane *s, VirtQueueElement *elem) > return 0; > > case VIRTIO_BLK_T_FLUSH: > - do_flush_cmd(s, elem, inhdr); > + do_flush_cmd(s, elem, inhdr, &outhdr); > return 0; > > case VIRTIO_BLK_T_GET_ID: > Can you try moving the req allocation and assignments inside process_request instead? Then you can fill in req->out directly without the struct assignment. Paolo