From patchwork Sun Feb 9 09:48:40 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 318559 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id C507A2C00A8 for ; Sun, 9 Feb 2014 20:52:27 +1100 (EST) Received: from localhost ([::1]:50007 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WCR3p-0003xF-Ng for incoming@patchwork.ozlabs.org; Sun, 09 Feb 2014 04:52:25 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:42563) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WCR0u-0008Oa-GK for qemu-devel@nongnu.org; Sun, 09 Feb 2014 04:49:33 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WCR0k-0007i4-FM for qemu-devel@nongnu.org; Sun, 09 Feb 2014 04:49:24 -0500 Received: from mail-ea0-x236.google.com ([2a00:1450:4013:c01::236]:62373) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WCR0k-0007hu-80 for qemu-devel@nongnu.org; Sun, 09 Feb 2014 04:49:14 -0500 Received: by mail-ea0-f182.google.com with SMTP id r15so2384910ead.27 for ; Sun, 09 Feb 2014 01:49:13 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=XCy2zIWBgCrMZjjnNJ87owVco2a8dvZjPCeyRcjHxEU=; b=CUyO0lNHGgoxJo3R4gQdlkc2nq5Md4QRRawhXcTfZGW6C4hVCSejBTaEhd0Vs2Eg4Q LiCiucVJ8sxccjkDdY6qXC0iJ5/1MXBIcaiLE/gqjBuA9Zqee9JD54ba0feQhGyuTykz Ed4ivH4VocGravwmvMGLfEUo8qhBJRU3YzRH/GKT7lHVPgogwjI0yD33OHJvk27lcn9d /cyqaFo44W0zo5RwMbbqPMcC3RWKWjmumdprUWJ1Z1PCO4LtuzJKGA3CeqgA10MpT0bf B5J2ZaQYox0c65TNLy8jT90nTO4WMgK+WFnN2s2gNzp4iyAZVfErRRfHRMaqpr2Fm6UP g4tQ== X-Received: by 10.15.61.7 with SMTP id h7mr2288066eex.49.1391939353293; Sun, 09 Feb 2014 01:49:13 -0800 (PST) Received: from yakj.usersys.redhat.com.cz (auth47-201.fi.muni.cz. [147.251.47.201]) by mx.google.com with ESMTPSA id n41sm9711562eeg.16.2014.02.09.01.49.11 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 09 Feb 2014 01:49:12 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Sun, 9 Feb 2014 10:48:40 +0100 Message-Id: <1391939335-31580-6-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.5.3 In-Reply-To: <1391939335-31580-1-git-send-email-pbonzini@redhat.com> References: <1391939335-31580-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2a00:1450:4013:c01::236 Cc: kwolf@redhat.com, stefanha@redhat.com, mreitz@redhat.com Subject: [Qemu-devel] [PATCH 05/20] iscsi: fix indentation X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Signed-off-by: Paolo Bonzini Reviewed-by: Fam Zheng --- 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; } /*