Fix mfiutil compile with -DDEBUG

John Baldwin jhb at freebsd.org
Fri Oct 8 19:08:48 UTC 2010


On Sunday, October 03, 2010 10:33:17 pm Garrett Cooper wrote:
>     make -DDEBUG is broken in mfiutil:
> 
> $ make -DDEBUG
> cc -O2 -pipe -fno-strict-aliasing -pipe -O2 -march=nocona
> -fno-builtin-strftime -DDEBUG -Wall -Wcast-align -Woverflow
> -Wsign-compare -Wunused -std=gnu99 -fstack-protector -Wsystem-headers
> -Werror -Wall -Wno-format-y2k -W -Wno-unused-parameter
> -Wstrict-prototypes -Wmissing-prototypes -Wpointer-arith
> -Wno-uninitialized -Wno-pointer-sign -c
> /usr/src/usr.sbin/mfiutil/mfi_config.c
> /usr/src/usr.sbin/mfiutil/mfi_config.c: In function 'dump_config':
> /usr/src/usr.sbin/mfiutil/mfi_config.c:1027: error: 'union mfi_pd_ref'
> has no member named 'device_id'
> /usr/src/usr.sbin/mfiutil/mfi_config.c:1083: error: 'union mfi_pd_ref'
> has no member named 'device_id'
> *** Error code 1
> 
> Stop in /usr/src/usr.sbin/mfiutil.
> $
> 
>     device_id is a field in the v field in the mfi_pd_ref union
> (/sys/dev/mfi/mfireg.h):
> 
> union mfi_pd_ref {
>         struct {
>                 uint16_t        device_id;
>                 uint16_t        seq_num;
>         } v;
>         uint32_t        ref;
> } __packed;

Yes, there were different versions of these definitions in mfireg.h at one 
point.  Your patch is fine.

-- 
John Baldwin


More information about the freebsd-hackers mailing list