[Xen-devel] [PATCH] Fix misleading indentation warnings

2016-11-10 Thread Cédric Bosdonnat
Gcc6 build reports misleading indentation as warnings. Fix a few
warnings in stubdom.
---
 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 944d3ff..48cfbfe 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, struct 
disk_seal_entry *src)
struct disk_root_sealed_data sealed;
 
 /*TPM 2.0 unbind | TPM 1.x unseal*/
-if (hw_is_tpm2())
-rc = TPM2_disk_unbind(&sealed, &olen, src);
-else
-rc = TPM_disk_unseal(&sealed, sizeof(sealed), src);
+   if (hw_is_tpm2())
+   rc = TPM2_disk_unbind(&sealed, &olen, src);
+   else
+   rc = TPM_disk_unseal(&sealed, sizeof(sealed), src);
 
if (rc)
return rc;
diff --git a/stubdom/vtpmmgr/log.c b/stubdom/vtpmmgr/log.c
index a82c913..c1bc8f3 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 == error_msgs[i].code)
   return error_msgs[i].code_name;
 
-return("Unknown Error Code");
+  return("Unknown Error Code");
 }
-- 
2.10.1


___
Xen-devel mailing list
Xen-devel@lists.xen.org
https://lists.xen.org/xen-devel


[Xen-devel] [PATCH] Fix misleading indentation warnings

2016-11-10 Thread Cédric Bosdonnat
Gcc6 build reports misleading indentation as warnings. Fix a few
warnings in stubdom.

Signed-off-by: Cédric Bosdonnat 
---
 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 944d3ff..48cfbfe 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, struct 
disk_seal_entry *src)
struct disk_root_sealed_data sealed;
 
 /*TPM 2.0 unbind | TPM 1.x unseal*/
-if (hw_is_tpm2())
-rc = TPM2_disk_unbind(&sealed, &olen, src);
-else
-rc = TPM_disk_unseal(&sealed, sizeof(sealed), src);
+   if (hw_is_tpm2())
+   rc = TPM2_disk_unbind(&sealed, &olen, src);
+   else
+   rc = TPM_disk_unseal(&sealed, sizeof(sealed), src);
 
if (rc)
return rc;
diff --git a/stubdom/vtpmmgr/log.c b/stubdom/vtpmmgr/log.c
index a82c913..c1bc8f3 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 == error_msgs[i].code)
   return error_msgs[i].code_name;
 
-return("Unknown Error Code");
+  return("Unknown Error Code");
 }
-- 
2.10.1


___
Xen-devel mailing list
Xen-devel@lists.xen.org
https://lists.xen.org/xen-devel


Re: [Xen-devel] [PATCH] Fix misleading indentation warnings

2016-11-10 Thread Juergen Gross
On 10/11/16 09:37, Cédric Bosdonnat wrote:
> Gcc6 build reports misleading indentation as warnings. Fix a few
> warnings in stubdom.

You should CC: the maintainers. Calling

./scripts/get_maintainer.pl 

will show them. Added them for now.


Juergen

> ---
>  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 944d3ff..48cfbfe 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, 
> struct disk_seal_entry *src)
>   struct disk_root_sealed_data sealed;
>  
>  /*TPM 2.0 unbind | TPM 1.x unseal*/
> -if (hw_is_tpm2())
> -rc = TPM2_disk_unbind(&sealed, &olen, src);
> -else
> -rc = TPM_disk_unseal(&sealed, sizeof(sealed), src);
> + if (hw_is_tpm2())
> + rc = TPM2_disk_unbind(&sealed, &olen, src);
> + else
> + rc = TPM_disk_unseal(&sealed, sizeof(sealed), src);
>  
>   if (rc)
>   return rc;
> diff --git a/stubdom/vtpmmgr/log.c b/stubdom/vtpmmgr/log.c
> index a82c913..c1bc8f3 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 == error_msgs[i].code)
>return error_msgs[i].code_name;
>  
> -return("Unknown Error Code");
> +  return("Unknown Error Code");
>  }
> 


___
Xen-devel mailing list
Xen-devel@lists.xen.org
https://lists.xen.org/xen-devel


Re: [Xen-devel] [PATCH] Fix misleading indentation warnings

2016-11-10 Thread Cedric Bosdonnat
Hi Juergen,

Just resent the patch with the missing Signed-off-By and --cc-cmd 
'./scripts/get_maintainers.pl'

--
Cedric

On Thu, 2016-11-10 at 09:42 +0100, Juergen Gross wrote:
> On 10/11/16 09:37, Cédric Bosdonnat wrote:
> > Gcc6 build reports misleading indentation as warnings. Fix a few
> > warnings in stubdom.
> 
> You should CC: the maintainers. Calling
> 
> ./scripts/get_maintainer.pl 
> 
> will show them. Added them for now.
> 
> 
> Juergen
> 
> > ---
> >  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 944d3ff..48cfbfe 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, 
> > struct disk_seal_entry *src)
> >     struct disk_root_sealed_data sealed;
> >  
> >  /*TPM 2.0 unbind | TPM 1.x unseal*/
> > -if (hw_is_tpm2())
> > -rc = TPM2_disk_unbind(&sealed, &olen, src);
> > -else
> > -rc = TPM_disk_unseal(&sealed, sizeof(sealed), src);
> > +   if (hw_is_tpm2())
> > +   rc = TPM2_disk_unbind(&sealed, &olen, src);
> > +   else
> > +   rc = TPM_disk_unseal(&sealed, sizeof(sealed), src);
> >  
> >     if (rc)
> >     return rc;
> > diff --git a/stubdom/vtpmmgr/log.c b/stubdom/vtpmmgr/log.c
> > index a82c913..c1bc8f3 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 == error_msgs[i].code)
> >    return error_msgs[i].code_name;
> >  
> > -return("Unknown Error Code");
> > +  return("Unknown Error Code");
> >  }
> > 
> 
> 

___
Xen-devel mailing list
Xen-devel@lists.xen.org
https://lists.xen.org/xen-devel


Re: [Xen-devel] [PATCH] Fix misleading indentation warnings

2016-11-10 Thread Daniel De Graaf

On 11/10/2016 04:23 AM, Cédric Bosdonnat wrote:

Gcc6 build reports misleading indentation as warnings. Fix a few
warnings in stubdom.

Signed-off-by: Cédric Bosdonnat 


Acked-by: Daniel De Graaf 


___
Xen-devel mailing list
Xen-devel@lists.xen.org
https://lists.xen.org/xen-devel


Re: [Xen-devel] [PATCH] Fix misleading indentation warnings

2016-11-10 Thread Xuquan (Quan Xu)
On November 10, 2016 11:25 PM, Daniel De Graaf wrote:
>On 11/10/2016 04:23 AM, Cédric Bosdonnat wrote:
>> Gcc6 build reports misleading indentation as warnings. Fix a few
>> warnings in stubdom.
>>
>> Signed-off-by: Cédric Bosdonnat 
>
>Acked-by: Daniel De Graaf 


Acked-by: Quan Xu 


___
Xen-devel mailing list
Xen-devel@lists.xen.org
https://lists.xen.org/xen-devel


Re: [Xen-devel] [PATCH] Fix misleading indentation warnings

2016-11-10 Thread Wei Liu
On Thu, Nov 10, 2016 at 10:23:31AM +0100, Cédric Bosdonnat wrote:
> Gcc6 build reports misleading indentation as warnings. Fix a few
> warnings in stubdom.
> 
> Signed-off-by: Cédric Bosdonnat 

Applied.

___
Xen-devel mailing list
Xen-devel@lists.xen.org
https://lists.xen.org/xen-devel