From: Paolo Bonzini <pbonzini@redhat.com>
To: qemu-devel@nongnu.org
Cc: kwolf@redhat.com, stefanha@redhat.com, mreitz@redhat.com
Subject: [Qemu-devel] [PATCH 05/20] iscsi: fix indentation
Date: Sun, 9 Feb 2014 10:48:40 +0100 [thread overview]
Message-ID: <1391939335-31580-6-git-send-email-pbonzini@redhat.com> (raw)
In-Reply-To: <1391939335-31580-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
next prev parent reply other threads:[~2014-02-09 9:49 UTC|newest]
Thread overview: 48+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-02-09 9:48 [Qemu-devel] [PATCH 00/20] Improve bdrv_open error messages Paolo Bonzini
2014-02-09 9:48 ` [Qemu-devel] [PATCH 01/20] nbd: produce a better error if neither host nor port is passed Paolo Bonzini
2014-02-10 7:27 ` Fam Zheng
2014-02-09 9:48 ` [Qemu-devel] [PATCH 02/20] nbd: correctly propagate errors Paolo Bonzini
2014-02-10 7:38 ` Fam Zheng
2014-02-10 8:24 ` Paolo Bonzini
2014-02-10 9:11 ` Fam Zheng
2014-02-09 9:48 ` [Qemu-devel] [PATCH 03/20] nbd: inline tcp_socket_incoming_spec into sole caller Paolo Bonzini
2014-02-10 7:40 ` Fam Zheng
2014-02-09 9:48 ` [Qemu-devel] [PATCH 04/20] nbd: move socket wrappers to qemu-nbd Paolo Bonzini
2014-02-10 7:44 ` Fam Zheng
2014-02-09 9:48 ` Paolo Bonzini [this message]
2014-02-10 7:48 ` [Qemu-devel] [PATCH 05/20] iscsi: fix indentation Fam Zheng
2014-02-09 9:48 ` [Qemu-devel] [PATCH 06/20] iscsi: correctly propagate errors in iscsi_open Paolo Bonzini
2014-02-10 7:55 ` Fam Zheng
2014-02-09 9:48 ` [Qemu-devel] [PATCH 07/20] gluster: default scheme to gluster:// and host to localhost Paolo Bonzini
2014-02-10 7:57 ` Fam Zheng
2014-02-09 9:48 ` [Qemu-devel] [PATCH 08/20] gluster: correctly propagate errors Paolo Bonzini
2014-02-10 8:02 ` Fam Zheng
2014-02-10 8:27 ` Paolo Bonzini
2014-02-10 9:13 ` Fam Zheng
2014-02-09 9:48 ` [Qemu-devel] [PATCH 09/20] cow: " Paolo Bonzini
2014-02-10 8:04 ` Fam Zheng
2014-02-10 8:28 ` Paolo Bonzini
2014-02-09 9:48 ` [Qemu-devel] [PATCH 10/20] curl: " Paolo Bonzini
2014-02-10 8:07 ` Fam Zheng
2014-02-09 9:48 ` [Qemu-devel] [PATCH 11/20] qcow: " Paolo Bonzini
2014-02-10 8:09 ` Fam Zheng
2014-02-10 8:28 ` Paolo Bonzini
2014-02-09 9:48 ` [Qemu-devel] [PATCH 12/20] qed: " Paolo Bonzini
2014-02-10 8:11 ` Fam Zheng
2014-02-09 9:48 ` [Qemu-devel] [PATCH 13/20] vhdx: " Paolo Bonzini
2014-02-10 8:15 ` Fam Zheng
2014-02-09 9:48 ` [Qemu-devel] [PATCH 14/20] vvfat: " Paolo Bonzini
2014-02-10 8:16 ` Fam Zheng
2014-02-09 9:48 ` [Qemu-devel] [PATCH 15/20] vmdk: extract vmdk_read_desc Paolo Bonzini
2014-02-10 8:28 ` Fam Zheng
2014-02-09 9:48 ` [Qemu-devel] [PATCH 16/20] vmdk: push vmdk_read_desc up to caller Paolo Bonzini
2014-02-10 8:37 ` Fam Zheng
2014-02-09 9:48 ` [Qemu-devel] [PATCH 17/20] vmdk: do not try opening a file as both image and descriptor Paolo Bonzini
2014-02-10 8:40 ` Fam Zheng
2014-02-09 9:48 ` [Qemu-devel] [PATCH 18/20] vmdk: correctly propagate errors Paolo Bonzini
2014-02-10 8:41 ` Fam Zheng
2014-02-09 9:48 ` [Qemu-devel] [PATCH 19/20] block: do not abuse EMEDIUMTYPE Paolo Bonzini
2014-02-10 8:47 ` Fam Zheng
2014-02-10 9:01 ` Paolo Bonzini
2014-02-09 9:48 ` [Qemu-devel] [PATCH 20/20] vdi: say why an image is bad Paolo Bonzini
2014-02-10 8:53 ` Fam Zheng
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=1391939335-31580-6-git-send-email-pbonzini@redhat.com \
--to=pbonzini@redhat.com \
--cc=kwolf@redhat.com \
--cc=mreitz@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=stefanha@redhat.com \
/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).