[PATCH] extras/mini-os/tpmback.c : fix compilation error.

[PATCH] extras/mini-os/tpmback.c : fix compilation error.

[Dushyant Behl]

This patch is with respect to the following discussion on xen-devel -
http://lists.xenproject.org/archives/html/xen-devel/2014-07/msg01991.html

The file extras/mini-os/tpmback.c was failing compilation on certain compilers
because of size mismatch between enum and int. Earlier the code used to read
value of enum using %d format, which failed compilation on some compilers.
Now the value is read into an actual int variable and then assigned to the enum.

Signed-off-by:- Dushyant Behl <myselfdushyantbehl@gmail.com>
---
 extras/mini-os/tpmback.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/extras/mini-os/tpmback.c b/extras/mini-os/tpmback.c
index 0601eb3..31da8d5 100644
--- a/extras/mini-os/tpmback.c
+++ b/extras/mini-os/tpmback.c
@@ -332,6 +332,7 @@ error_post_irq:
  * returns 0 on success and non-zero on error */
 int tpmif_change_state(tpmif_t* tpmif, enum xenbus_state state)
 {
+   int tempst;
    char path[512];
    char *value;
    char *err;
@@ -347,11 +348,12 @@ int tpmif_change_state(tpmif_t* tpmif, enum xenbus_state state)
       free(err);
       return -1;
    }
-   if(sscanf(value, "%d", &readst) != 1) {
+   if(sscanf(value, "%d", &tempst) != 1) {
       TPMBACK_ERR("Non integer value (%s) in %s ??\n", value, path);
       free(value);
       return -1;
    }
+   readst = (enum xenbus_state) tempst;
    free(value);
 
    /* It's possible that the backend state got updated by hotplug or something else behind our back */
-- 
1.9.1

Re: [PATCH] extras/mini-os/tpmback.c : fix compilation error.

[Samuel Thibault]

Dushyant Behl, le Mon 21 Jul 2014 02:22:59 +0530, a écrit :
> This patch is with respect to the following discussion on xen-devel -
> http://lists.xenproject.org/archives/html/xen-devel/2014-07/msg01991.html
> 
> The file extras/mini-os/tpmback.c was failing compilation on certain compilers
> because of size mismatch between enum and int. Earlier the code used to read
> value of enum using %d format, which failed compilation on some compilers.
> Now the value is read into an actual int variable and then assigned to the enum.
> 
> Signed-off-by:- Dushyant Behl <myselfdushyantbehl@gmail.com>

Ack-by: Samuel Thibault <samuel.thibault@ens-lyon.org>

> ---
>  extras/mini-os/tpmback.c | 4 +++-
>  1 file changed, 3 insertions(+), 1 deletion(-)
> 
> diff --git a/extras/mini-os/tpmback.c b/extras/mini-os/tpmback.c
> index 0601eb3..31da8d5 100644
> --- a/extras/mini-os/tpmback.c
> +++ b/extras/mini-os/tpmback.c
> @@ -332,6 +332,7 @@ error_post_irq:
>   * returns 0 on success and non-zero on error */
>  int tpmif_change_state(tpmif_t* tpmif, enum xenbus_state state)
>  {
> +   int tempst;
>     char path[512];
>     char *value;
>     char *err;
> @@ -347,11 +348,12 @@ int tpmif_change_state(tpmif_t* tpmif, enum xenbus_state state)
>        free(err);
>        return -1;
>     }
> -   if(sscanf(value, "%d", &readst) != 1) {
> +   if(sscanf(value, "%d", &tempst) != 1) {
>        TPMBACK_ERR("Non integer value (%s) in %s ??\n", value, path);
>        free(value);
>        return -1;
>     }
> +   readst = (enum xenbus_state) tempst;
>     free(value);
>  
>     /* It's possible that the backend state got updated by hotplug or something else behind our back */
> -- 
> 1.9.1
> 

-- 
Samuel
 Profitant de cette occasion, vous serait-il possible de rebooter 
 aussi Modérator et son petit copain qui gère les ressources de 
 download ?
 -+- OB in NPC : Apprendre à flasher son personnel -+-

Re: [PATCH] extras/mini-os/tpmback.c : fix compilation error.

[Ian Campbell]

On Sun, 2014-07-20 at 23:02 +0200, Samuel Thibault wrote:
> Dushyant Behl, le Mon 21 Jul 2014 02:22:59 +0530, a écrit :
> > This patch is with respect to the following discussion on xen-devel -
> > http://lists.xenproject.org/archives/html/xen-devel/2014-07/msg01991.html
> > 
> > The file extras/mini-os/tpmback.c was failing compilation on certain compilers
> > because of size mismatch between enum and int. Earlier the code used to read
> > value of enum using %d format, which failed compilation on some compilers.
> > Now the value is read into an actual int variable and then assigned to the enum.
> > 
> > Signed-off-by:- Dushyant Behl <myselfdushyantbehl@gmail.com>
> 
> Ack-by: Samuel Thibault <samuel.thibault@ens-lyon.org>

Applied. I added the actual build error message to the log as I did so.

Ian,
> 
> > ---
> >  extras/mini-os/tpmback.c | 4 +++-
> >  1 file changed, 3 insertions(+), 1 deletion(-)
> > 
> > diff --git a/extras/mini-os/tpmback.c b/extras/mini-os/tpmback.c
> > index 0601eb3..31da8d5 100644
> > --- a/extras/mini-os/tpmback.c
> > +++ b/extras/mini-os/tpmback.c
> > @@ -332,6 +332,7 @@ error_post_irq:
> >   * returns 0 on success and non-zero on error */
> >  int tpmif_change_state(tpmif_t* tpmif, enum xenbus_state state)
> >  {
> > +   int tempst;
> >     char path[512];
> >     char *value;
> >     char *err;
> > @@ -347,11 +348,12 @@ int tpmif_change_state(tpmif_t* tpmif, enum xenbus_state state)
> >        free(err);
> >        return -1;
> >     }
> > -   if(sscanf(value, "%d", &readst) != 1) {
> > +   if(sscanf(value, "%d", &tempst) != 1) {
> >        TPMBACK_ERR("Non integer value (%s) in %s ??\n", value, path);
> >        free(value);
> >        return -1;
> >     }
> > +   readst = (enum xenbus_state) tempst;
> >     free(value);
> >  
> >     /* It's possible that the backend state got updated by hotplug or something else behind our back */
> > -- 
> > 1.9.1
> > 
> 



_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
http://lists.xen.org/xen-devel