diff mbox

vdi: wrapped uuid_unparse() in #ifdef

Message ID 1414742525-18639-1-git-send-email-syeon.hwang@samsung.com
State New
Headers show

Commit Message

SeokYeon Hwang Oct. 31, 2014, 8:02 a.m. UTC
Wrapped uuid_unparse() in #ifdef to avoid "-Wunused-function" on clang 3.4 or later.

Signed-off-by: SeokYeon Hwang <syeon.hwang@samsung.com>
---
 block/vdi.c | 2 ++
 1 file changed, 2 insertions(+)

Comments

Stefan Weil Oct. 31, 2014, 6:15 p.m. UTC | #1
Am 31.10.2014 um 09:02 schrieb SeokYeon Hwang:
> Wrapped uuid_unparse() in #ifdef to avoid "-Wunused-function" on clang 3.4 or later.
>
> Signed-off-by: SeokYeon Hwang <syeon.hwang@samsung.com>
> ---
>   block/vdi.c | 2 ++
>   1 file changed, 2 insertions(+)
>
> diff --git a/block/vdi.c b/block/vdi.c
> index 19701ee..e1d211c 100644
> --- a/block/vdi.c
> +++ b/block/vdi.c
> @@ -137,12 +137,14 @@ static inline int uuid_is_null(const uuid_t uu)
>       return memcmp(uu, null_uuid, sizeof(uuid_t)) == 0;
>   }
>   
> +# if defined(CONFIG_VDI_DEBUG)
>   static inline void uuid_unparse(const uuid_t uu, char *out)
>   {
>       snprintf(out, 37, UUID_FMT,
>               uu[0], uu[1], uu[2], uu[3], uu[4], uu[5], uu[6], uu[7],
>               uu[8], uu[9], uu[10], uu[11], uu[12], uu[13], uu[14], uu[15]);
>   }
> +# endif
>   #endif
>   
>   typedef struct {

This code is only used on build hosts without libuuid development header 
files, so the warning can be avoided by installing that header files. 
Nevertheless, I think it is fine for qemu-trivial.

Reviewed-by: Stefan Weil <sw@weilnetz.de>
Michael Tokarev Nov. 2, 2014, 5:14 a.m. UTC | #2
31.10.2014 11:02, SeokYeon Hwang wrote:
> Wrapped uuid_unparse() in #ifdef to avoid "-Wunused-function" on clang 3.4 or later.

Applied to -trivial, after adding a newline into the commit message :)
Thanks,

/mjt
Paolo Bonzini Nov. 3, 2014, 4:13 p.m. UTC | #3
On 31/10/2014 09:02, SeokYeon Hwang wrote:
> Wrapped uuid_unparse() in #ifdef to avoid "-Wunused-function" on clang 3.4 or later.
> 
> Signed-off-by: SeokYeon Hwang <syeon.hwang@samsung.com>
> ---
>  block/vdi.c | 2 ++
>  1 file changed, 2 insertions(+)
> 
> diff --git a/block/vdi.c b/block/vdi.c
> index 19701ee..e1d211c 100644
> --- a/block/vdi.c
> +++ b/block/vdi.c
> @@ -137,12 +137,14 @@ static inline int uuid_is_null(const uuid_t uu)
>      return memcmp(uu, null_uuid, sizeof(uuid_t)) == 0;
>  }
>  
> +# if defined(CONFIG_VDI_DEBUG)
>  static inline void uuid_unparse(const uuid_t uu, char *out)
>  {
>      snprintf(out, 37, UUID_FMT,
>              uu[0], uu[1], uu[2], uu[3], uu[4], uu[5], uu[6], uu[7],
>              uu[8], uu[9], uu[10], uu[11], uu[12], uu[13], uu[14], uu[15]);
>  }
> +# endif
>  #endif
>  
>  typedef struct {
> 

Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
diff mbox

Patch

diff --git a/block/vdi.c b/block/vdi.c
index 19701ee..e1d211c 100644
--- a/block/vdi.c
+++ b/block/vdi.c
@@ -137,12 +137,14 @@  static inline int uuid_is_null(const uuid_t uu)
     return memcmp(uu, null_uuid, sizeof(uuid_t)) == 0;
 }
 
+# if defined(CONFIG_VDI_DEBUG)
 static inline void uuid_unparse(const uuid_t uu, char *out)
 {
     snprintf(out, 37, UUID_FMT,
             uu[0], uu[1], uu[2], uu[3], uu[4], uu[5], uu[6], uu[7],
             uu[8], uu[9], uu[10], uu[11], uu[12], uu[13], uu[14], uu[15]);
 }
+# endif
 #endif
 
 typedef struct {