qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Paolo Bonzini <pbonzini@redhat.com>
To: qemu-devel@nongnu.org
Cc: kwolf@redhat.com, famz@redhat.com
Subject: [Qemu-devel] [PATCH v2 05/20] iscsi: fix indentation
Date: Tue, 11 Feb 2014 18:03:38 +0100	[thread overview]
Message-ID: <1392138233-26407-6-git-send-email-pbonzini@redhat.com> (raw)
In-Reply-To: <1392138233-26407-1-git-send-email-pbonzini@redhat.com>

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
 block/iscsi.c | 45 +++++++++++++++++++++++----------------------
 1 file changed, 23 insertions(+), 22 deletions(-)

diff --git a/block/iscsi.c b/block/iscsi.c
index 6f4af72..e654a57 100644
--- a/block/iscsi.c
+++ b/block/iscsi.c
@@ -1065,35 +1065,36 @@ static QemuOptsList runtime_opts = {
     },
 };
 
-static struct scsi_task *iscsi_do_inquiry(struct iscsi_context *iscsi,
-                                          int lun, int evpd, int pc) {
-        int full_size;
-        struct scsi_task *task = NULL;
-        task = iscsi_inquiry_sync(iscsi, lun, evpd, pc, 64);
+static struct scsi_task *iscsi_do_inquiry(struct iscsi_context *iscsi, int lun,
+                                          int evpd, int pc)
+{
+    int full_size;
+    struct scsi_task *task = NULL;
+    task = iscsi_inquiry_sync(iscsi, lun, evpd, pc, 64);
+    if (task == NULL || task->status != SCSI_STATUS_GOOD) {
+        goto fail;
+    }
+    full_size = scsi_datain_getfullsize(task);
+    if (full_size > task->datain.size) {
+        scsi_free_scsi_task(task);
+
+        /* we need more data for the full list */
+        task = iscsi_inquiry_sync(iscsi, lun, evpd, pc, full_size);
         if (task == NULL || task->status != SCSI_STATUS_GOOD) {
             goto fail;
         }
-        full_size = scsi_datain_getfullsize(task);
-        if (full_size > task->datain.size) {
-            scsi_free_scsi_task(task);
-
-            /* we need more data for the full list */
-            task = iscsi_inquiry_sync(iscsi, lun, evpd, pc, full_size);
-            if (task == NULL || task->status != SCSI_STATUS_GOOD) {
-                goto fail;
-            }
-        }
+    }
 
-        return task;
+    return task;
 
 fail:
-        error_report("iSCSI: Inquiry command failed : %s",
-                     iscsi_get_error(iscsi));
-        if (task) {
-            scsi_free_scsi_task(task);
-            return NULL;
-        }
+    error_report("iSCSI: Inquiry command failed : %s",
+                 iscsi_get_error(iscsi));
+    if (task) {
+        scsi_free_scsi_task(task);
         return NULL;
+    }
+    return NULL;
 }
 
 /*
-- 
1.8.5.3

  parent reply	other threads:[~2014-02-11 17:11 UTC|newest]

Thread overview: 43+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-02-11 17:03 [Qemu-devel] [PATCH v2 00/20] Improve bdrv_open error messages Paolo Bonzini
2014-02-11 17:03 ` [Qemu-devel] [PATCH v2 01/20] nbd: produce a better error if neither host nor port is passed Paolo Bonzini
2014-02-14 16:54   ` Jeff Cody
2014-02-14 20:41     ` Jeff Cody
2014-02-16 15:53     ` Paolo Bonzini
2014-02-11 17:03 ` [Qemu-devel] [PATCH v2 02/20] nbd: correctly propagate errors Paolo Bonzini
2014-02-14 20:42   ` Jeff Cody
2014-02-11 17:03 ` [Qemu-devel] [PATCH v2 03/20] nbd: inline tcp_socket_incoming_spec into sole caller Paolo Bonzini
2014-02-11 17:03 ` [Qemu-devel] [PATCH v2 04/20] nbd: move socket wrappers to qemu-nbd Paolo Bonzini
2014-02-11 17:03 ` Paolo Bonzini [this message]
2014-02-11 17:03 ` [Qemu-devel] [PATCH v2 06/20] iscsi: correctly propagate errors in iscsi_open Paolo Bonzini
2014-02-14 16:20   ` Stefan Hajnoczi
2014-02-14 16:47     ` [Qemu-devel] [PATCH v3 " Paolo Bonzini
2014-02-11 17:03 ` [Qemu-devel] [PATCH v2 07/20] gluster: default scheme to gluster:// and host to localhost Paolo Bonzini
2014-02-11 17:03 ` [Qemu-devel] [PATCH v2 08/20] gluster: correctly propagate errors Paolo Bonzini
2014-02-11 17:03 ` [Qemu-devel] [PATCH v2 09/20] cow: " Paolo Bonzini
2014-02-14 16:45   ` Kevin Wolf
2014-02-14 16:59     ` Jeff Cody
2014-02-15 10:01       ` Markus Armbruster
2014-02-17 13:15         ` Fam Zheng
2014-02-17 13:20           ` Paolo Bonzini
2014-02-17 13:23             ` Jeff Cody
2014-02-18  2:51             ` Fam Zheng
2014-02-17 13:45           ` Kevin Wolf
2014-02-17 14:59           ` Markus Armbruster
2014-02-18  3:16             ` Fam Zheng
2014-02-14 17:02     ` Paolo Bonzini
2014-02-14 18:19       ` Kevin Wolf
2014-02-14 20:22         ` Paolo Bonzini
2014-02-11 17:03 ` [Qemu-devel] [PATCH v2 10/20] curl: " Paolo Bonzini
2014-02-11 17:03 ` [Qemu-devel] [PATCH v2 11/20] qcow: " Paolo Bonzini
2014-02-11 17:03 ` [Qemu-devel] [PATCH v2 12/20] qed: " Paolo Bonzini
2014-02-11 17:03 ` [Qemu-devel] [PATCH v2 13/20] vhdx: " Paolo Bonzini
2014-02-11 17:03 ` [Qemu-devel] [PATCH v2 14/20] vvfat: " Paolo Bonzini
2014-02-11 17:03 ` [Qemu-devel] [PATCH v2 15/20] vmdk: extract vmdk_read_desc Paolo Bonzini
2014-02-11 17:03 ` [Qemu-devel] [PATCH v2 16/20] vmdk: push vmdk_read_desc up to caller Paolo Bonzini
2014-02-11 17:03 ` [Qemu-devel] [PATCH v2 17/20] vmdk: do not try opening a file as both image and descriptor Paolo Bonzini
2014-02-11 17:03 ` [Qemu-devel] [PATCH v2 18/20] vmdk: correctly propagate errors Paolo Bonzini
2014-02-11 17:03 ` [Qemu-devel] [PATCH v2 19/20] block: do not abuse EMEDIUMTYPE Paolo Bonzini
2014-02-18  6:27   ` Fam Zheng
2014-02-11 17:03 ` [Qemu-devel] [PATCH v2 20/20] vdi: say why an image is bad Paolo Bonzini
2014-02-14 16:31 ` [Qemu-devel] [PATCH v2 00/20] Improve bdrv_open error messages Stefan Hajnoczi
2014-02-14 16:48   ` Paolo Bonzini

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1392138233-26407-6-git-send-email-pbonzini@redhat.com \
    --to=pbonzini@redhat.com \
    --cc=famz@redhat.com \
    --cc=kwolf@redhat.com \
    --cc=qemu-devel@nongnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).