[Qemu-devel] [PATCH] vmxnet3: Eliminate __packed redefined warning

[Qemu-devel] [PATCH] vmxnet3: Eliminate __packed redefined warning

[Brad Smith]

This eliminates a warning about __packed being redefined as exposed by the
vmxnet3 code. __packed is not used anywhere in the vmxnet3 code.

  CC    hw/net/vmxnet3.o
In file included from hw/net/vmxnet3.c:29:
hw/net/vmxnet3.h:37:1: warning: "__packed" redefined
In file included from /usr/include/stdlib.h:38,
                 from /buildbot-qemu/default_openbsd_current/build/include/qemu-common.h:26,
                 from /buildbot-qemu/default_openbsd_current/build/include/hw/hw.h:5,
                 from hw/net/vmxnet3.c:18:
/usr/include/sys/cdefs.h:209:1: warning: this is the location of the previous definition

Signed-off-by: Brad Smith <brad@comstyle.com>

diff --git a/hw/net/vmxnet3.h b/hw/net/vmxnet3.h
index 4eae7c7..f987d71 100644
--- a/hw/net/vmxnet3.h
+++ b/hw/net/vmxnet3.h
@@ -34,7 +34,6 @@
 #define __le16  uint16_t
 #define __le32  uint32_t
 #define __le64  uint64_t
-#define __packed QEMU_PACKED
 
 #if defined(HOST_WORDS_BIGENDIAN)
 #define __BIG_ENDIAN_BITFIELD
@@ -749,7 +748,6 @@ struct Vmxnet3_DriverShared {
 #undef __le16
 #undef __le32
 #undef __le64
-#undef __packed
 #if defined(HOST_WORDS_BIGENDIAN)
 #undef __BIG_ENDIAN_BITFIELD
 #endif

-- 
This message has been scanned for viruses and
dangerous content by MailScanner, and is
believed to be clean.

Re: [Qemu-devel] [PATCH] vmxnet3: Eliminate __packed redefined warning

[Andreas Färber]

Am 23.08.2013 18:28, schrieb Brad Smith:
> This eliminates a warning about __packed being redefined as exposed by the
> vmxnet3 code. __packed is not used anywhere in the vmxnet3 code.
> 
>   CC    hw/net/vmxnet3.o
> In file included from hw/net/vmxnet3.c:29:
> hw/net/vmxnet3.h:37:1: warning: "__packed" redefined
> In file included from /usr/include/stdlib.h:38,
>                  from /buildbot-qemu/default_openbsd_current/build/include/qemu-common.h:26,
>                  from /buildbot-qemu/default_openbsd_current/build/include/hw/hw.h:5,
>                  from hw/net/vmxnet3.c:18:
> /usr/include/sys/cdefs.h:209:1: warning: this is the location of the previous definition
> 
> Signed-off-by: Brad Smith <brad@comstyle.com>

Reviewed-by: Andreas Färber <afaerber@suse.de>

CC'ing Stefan as net maintainer.

Andreas

> 
> diff --git a/hw/net/vmxnet3.h b/hw/net/vmxnet3.h
> index 4eae7c7..f987d71 100644
> --- a/hw/net/vmxnet3.h
> +++ b/hw/net/vmxnet3.h
> @@ -34,7 +34,6 @@
>  #define __le16  uint16_t
>  #define __le32  uint32_t
>  #define __le64  uint64_t
> -#define __packed QEMU_PACKED
>  
>  #if defined(HOST_WORDS_BIGENDIAN)
>  #define __BIG_ENDIAN_BITFIELD
> @@ -749,7 +748,6 @@ struct Vmxnet3_DriverShared {
>  #undef __le16
>  #undef __le32
>  #undef __le64
> -#undef __packed
>  #if defined(HOST_WORDS_BIGENDIAN)
>  #undef __BIG_ENDIAN_BITFIELD
>  #endif
> 


-- 
SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 Nürnberg, Germany
GF: Jeff Hawn, Jennifer Guild, Felix Imendörffer; HRB 16746 AG Nürnberg

Re: [Qemu-devel] [PATCH] vmxnet3: Eliminate __packed redefined warning

[Stefan Hajnoczi]

On Fri, Aug 23, 2013 at 12:28:25PM -0400, Brad Smith wrote:
> This eliminates a warning about __packed being redefined as exposed by the
> vmxnet3 code. __packed is not used anywhere in the vmxnet3 code.
> 
>   CC    hw/net/vmxnet3.o
> In file included from hw/net/vmxnet3.c:29:
> hw/net/vmxnet3.h:37:1: warning: "__packed" redefined
> In file included from /usr/include/stdlib.h:38,
>                  from /buildbot-qemu/default_openbsd_current/build/include/qemu-common.h:26,
>                  from /buildbot-qemu/default_openbsd_current/build/include/hw/hw.h:5,
>                  from hw/net/vmxnet3.c:18:
> /usr/include/sys/cdefs.h:209:1: warning: this is the location of the previous definition
> 
> Signed-off-by: Brad Smith <brad@comstyle.com>

Thanks, applied to my net tree:
https://github.com/stefanha/qemu/commits/net

Stefan