From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:48967) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WsMxE-0000lr-8i for qemu-devel@nongnu.org; Wed, 04 Jun 2014 21:59:02 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WsMx8-0007wv-1D for qemu-devel@nongnu.org; Wed, 04 Jun 2014 21:58:56 -0400 Received: from mx1.redhat.com ([209.132.183.28]:9392) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WsMx7-0007wp-OS for qemu-devel@nongnu.org; Wed, 04 Jun 2014 21:58:49 -0400 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id s551wn80018499 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Wed, 4 Jun 2014 21:58:49 -0400 From: Fam Zheng Date: Thu, 5 Jun 2014 09:58:46 +0800 Message-Id: <1401933526-22436-9-git-send-email-famz@redhat.com> In-Reply-To: <1401933526-22436-1-git-send-email-famz@redhat.com> References: <1401933526-22436-1-git-send-email-famz@redhat.com> Subject: [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: qemu-devel@nongnu.org Cc: Kevin Wolf , Paolo Bonzini , Stefan Hajnoczi 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: -- 2.0.0