[Qemu-devel] [PATCH] iscsi: Remember to set ret for iscsi_open in error case

[Qemu-devel] [PATCH] iscsi: Remember to set ret for iscsi_open in error case

[Fam Zheng]

Signed-off-by: Fam Zheng <famz@redhat.com>
---
 block/iscsi.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/block/iscsi.c b/block/iscsi.c
index 64a509f..f425573 100644
--- a/block/iscsi.c
+++ b/block/iscsi.c
@@ -1233,6 +1233,7 @@ static int iscsi_open(BlockDriverState *bs, QDict *options, int flags,
     iscsi_readcapacity_sync(iscsilun, &local_err);
     if (local_err != NULL) {
         error_propagate(errp, local_err);
+        ret = -EINVAL;
         goto out;
     }
     bs->total_sectors = sector_lun2qemu(iscsilun->num_blocks, iscsilun);
-- 
1.9.1

Re: [Qemu-devel] [PATCH] iscsi: Remember to set ret for iscsi_open in error case

[Kevin Wolf]

Am 10.04.2014 um 03:33 hat Fam Zheng geschrieben:
> Signed-off-by: Fam Zheng <famz@redhat.com>

Thanks, applied to the block branch.

Kevin

Re: [Qemu-devel] [PATCH] iscsi: Remember to set ret for iscsi_open in error case

[Fam Zheng]

On Thu, 04/10 13:11, Kevin Wolf wrote:
> Am 10.04.2014 um 03:33 hat Fam Zheng geschrieben:
> > Signed-off-by: Fam Zheng <famz@redhat.com>
> 
> Thanks, applied to the block branch.
> 

Is this going into 2.0?

Thanks,
Fam

Re: [Qemu-devel] [PATCH] iscsi: Remember to set ret for iscsi_open in error case

[Kevin Wolf]

Am 11.04.2014 um 07:29 hat Fam Zheng geschrieben:
> On Thu, 04/10 13:11, Kevin Wolf wrote:
> > Am 10.04.2014 um 03:33 hat Fam Zheng geschrieben:
> > > Signed-off-by: Fam Zheng <famz@redhat.com>
> > 
> > Thanks, applied to the block branch.
> > 
> 
> Is this going into 2.0?

Looks like we're going to have an -rc3, so yes.

Kevin