From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:49005) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZrNOR-0005Kx-Nr for qemu-devel@nongnu.org; Wed, 28 Oct 2015 05:51:44 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZrNOQ-0003YZ-PH for qemu-devel@nongnu.org; Wed, 28 Oct 2015 05:51:43 -0400 Date: Wed, 28 Oct 2015 10:51:34 +0100 From: Kevin Wolf Message-ID: <20151028095134.GC3836@noname.str.redhat.com> References: <1445840693-3177-1-git-send-email-famz@redhat.com> <1445840693-3177-5-git-send-email-famz@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1445840693-3177-5-git-send-email-famz@redhat.com> Subject: Re: [Qemu-devel] [PATCH 4/9] iscsi: Emulate commands in iscsi_aio_ioctl as iscsi_ioctl List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Fam Zheng Cc: Stefan Hajnoczi , qemu-block@nongnu.org, Peter Lieven , qemu-devel@nongnu.org, Ronnie Sahlberg , Paolo Bonzini Am 26.10.2015 um 07:24 hat Fam Zheng geschrieben: > iscsi_ioctl emulates SG_GET_VERSION_NUM and SG_GET_SCSI_ID. Now that > bdrv_ioctl() will be emulated with .bdrv_aio_ioctl, replicate the logic > into iscsi_aio_ioctl to make them consistent. > > Signed-off-by: Fam Zheng > --- > block/iscsi.c | 39 +++++++++++++++++++++++++++++++++++++-- > 1 file changed, 37 insertions(+), 2 deletions(-) > > diff --git a/block/iscsi.c b/block/iscsi.c > index 93f1ee4..94cbdf2 100644 > --- a/block/iscsi.c > +++ b/block/iscsi.c > @@ -96,6 +96,7 @@ typedef struct IscsiAIOCB { > int status; > int64_t sector_num; > int nb_sectors; > + int ret; > #ifdef __linux__ > sg_io_hdr_t *ioh; > #endif > @@ -726,6 +727,37 @@ iscsi_aio_ioctl_cb(struct iscsi_context *iscsi, int status, > iscsi_schedule_bh(acb); > } > > +static void iscsi_ioctl_bh_completion(void *opaque) > +{ > + IscsiAIOCB *acb = opaque; > + > + qemu_bh_delete(acb->bh); > + acb->common.cb(acb->common.opaque, acb->ret); > +} qemu_aio_unref(acb)? Kevin