cryptospore / rpms / qemu-kvm

Forked from rpms/qemu-kvm 2 years ago
Clone

Blame SOURCES/kvm-iscsi-Remember-to-set-ret-for-iscsi_open-in-error-ca.patch

958e1b
From 20bb4af6d97719f250a0424e55b7342601a2b7ef Mon Sep 17 00:00:00 2001
240766
From: Fam Zheng <famz@redhat.com>
240766
Date: Mon, 14 Apr 2014 02:05:19 +0200
240766
Subject: [PATCH 09/12] iscsi: Remember to set ret for iscsi_open in error case
240766
240766
RH-Author: Fam Zheng <famz@redhat.com>
240766
Message-id: <1397441119-8563-1-git-send-email-famz@redhat.com>
240766
Patchwork-id: 58457
240766
O-Subject: [RHEL-7 0day qemu-kvm PATCH 9/7] iscsi: Remember to set ret for iscsi_open in error case
958e1b
Bugzilla: 1083413
240766
RH-Acked-by: Markus Armbruster <armbru@redhat.com>
240766
RH-Acked-by: Kevin Wolf <kwolf@redhat.com>
240766
RH-Acked-by: Jeffrey Cody <jcody@redhat.com>
240766
240766
Signed-off-by: Fam Zheng <famz@redhat.com>
240766
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
240766
(cherry picked from commit cd82b6fb4daf87f17742f7971ba6cb90d23e6703)
240766
Signed-off-by: Fam Zheng <famz@redhat.com>
240766
---
240766
 block/iscsi.c | 1 +
240766
 1 file changed, 1 insertion(+)
240766
240766
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
240766
---
240766
 block/iscsi.c |    1 +
240766
 1 files changed, 1 insertions(+), 0 deletions(-)
240766
240766
diff --git a/block/iscsi.c b/block/iscsi.c
240766
index ff5ca20..9fe3be8 100644
240766
--- a/block/iscsi.c
240766
+++ b/block/iscsi.c
240766
@@ -1408,6 +1408,7 @@ static int iscsi_open(BlockDriverState *bs, QDict *options, int flags,
240766
     iscsi_readcapacity_sync(iscsilun, &local_err);
240766
     if (local_err != NULL) {
240766
         error_propagate(errp, local_err);
240766
+        ret = -EINVAL;
240766
         goto out;
240766
     }
240766
     bs->total_sectors = sector_lun2qemu(iscsilun->num_blocks, iscsilun);
240766
-- 
240766
1.7.1
240766