From nobody Fri May 3 02:40:47 2024 Delivered-To: importer@patchew.org Received-SPF: none (zoho.com: 192.237.175.120 is neither permitted nor denied by domain of lists.xenproject.org) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; spf=none (zoho.com: 192.237.175.120 is neither permitted nor denied by domain of lists.xenproject.org) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org ARC-Seal: i=1; a=rsa-sha256; t=1556719507; cv=none; d=zoho.com; s=zohoarc; b=J849s/e/rsUv1qdVPfjGYV25KzoX1+inZQKAG7adIqrVaymlgXQx8f5EInRsXgqj75gCwZuJ00U4abTWGixcEoRWmDb4xEaBfe7G6BzcUIBSUvonL0vMvPnFL1ikeCTMZEihiT5H555q4mQ9D4WEwtSRKboHl+i6YIkT5TkvtSE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1556719507; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To:ARC-Authentication-Results; bh=zK/BlzF7nXzVNSZ3rmUomtiHXD9X1YzpLw/FjY54Ek4=; b=b8zbZpvhL+3VEaVPqu+CRk0NKAlPE10RwKiqHOs/3/XxwBZi0Zn7YtNHib5eEjK3sU/vMHmoQx/fIUgLzsExOl1D7UXEyqzA1yKlIo1VDi9cbonaHxShaSYw25bptPo0EITylxlrOcl4oG2wAdsMnuArQmQnn++Om3yLKoh8LP8= ARC-Authentication-Results: i=1; mx.zoho.com; spf=none (zoho.com: 192.237.175.120 is neither permitted nor denied by domain of lists.xenproject.org) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1556719507138615.0541803162392; Wed, 1 May 2019 07:05:07 -0700 (PDT) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1hLppt-00014b-Pk; Wed, 01 May 2019 14:03:49 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1hLpps-00014W-Gc for xen-devel@lists.xenproject.org; Wed, 01 May 2019 14:03:48 +0000 Received: from SMTP03.CITRIX.COM (unknown [162.221.156.55]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id ee9e75be-6c19-11e9-8910-3b44ea63ae4d; Wed, 01 May 2019 14:03:45 +0000 (UTC) X-Inumbo-ID: ee9e75be-6c19-11e9-8910-3b44ea63ae4d X-IronPort-AV: E=Sophos;i="5.60,417,1549929600"; d="scan'208";a="84851029" From: Ian Jackson To: Date: Wed, 1 May 2019 15:02:57 +0100 Message-ID: <20190501140257.27564-1-ian.jackson@eu.citrix.com> X-Mailer: git-send-email 2.11.0 MIME-Version: 1.0 Subject: [Xen-devel] [PATCH STABLE BACKPORT for-4.7] Fix misleading indentation warnings X-BeenThere: xen-devel@lists.xenproject.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Cc: =?UTF-8?q?C=C3=A9dric=20Bosdonnat?= , Jan Beulich Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" From: C=C3=A9dric Bosdonnat Gcc6 build reports misleading indentation as warnings. Fix a few warnings in stubdom. Signed-off-by: C=C3=A9dric Bosdonnat Acked-by: Daniel De Graaf Acked-by: Quan Xu Release-acked-by: Wei Liu (cherry picked from commit 9fdffbbab3ada427bac07076f042f0265e5ae05f) --- stubdom/vtpmmgr/disk_read.c | 8 ++++---- stubdom/vtpmmgr/log.c | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/stubdom/vtpmmgr/disk_read.c b/stubdom/vtpmmgr/disk_read.c index 944d3ffda6..48cfbfe6d5 100644 --- a/stubdom/vtpmmgr/disk_read.c +++ b/stubdom/vtpmmgr/disk_read.c @@ -123,10 +123,10 @@ static int parse_root_key(struct mem_tpm_mgr *dst, st= ruct disk_seal_entry *src) struct disk_root_sealed_data sealed; =20 /*TPM 2.0 unbind | TPM 1.x unseal*/ - if (hw_is_tpm2()) - rc =3D TPM2_disk_unbind(&sealed, &olen, src); - else - rc =3D TPM_disk_unseal(&sealed, sizeof(sealed), src); + if (hw_is_tpm2()) + rc =3D TPM2_disk_unbind(&sealed, &olen, src); + else + rc =3D TPM_disk_unseal(&sealed, sizeof(sealed), src); =20 if (rc) return rc; diff --git a/stubdom/vtpmmgr/log.c b/stubdom/vtpmmgr/log.c index a82c9139c3..c1bc8f3e42 100644 --- a/stubdom/vtpmmgr/log.c +++ b/stubdom/vtpmmgr/log.c @@ -147,5 +147,5 @@ const char* tpm_get_error_name (TPM_RESULT code) { if (code =3D=3D error_msgs[i].code) return error_msgs[i].code_name; =20 - return("Unknown Error Code"); + return("Unknown Error Code"); } --=20 2.11.0 _______________________________________________ Xen-devel mailing list Xen-devel@lists.xenproject.org https://lists.xenproject.org/mailman/listinfo/xen-devel