From: ftillier Date: Wed, 6 Jul 2005 18:49:50 +0000 (+0000) Subject: Fixes to suppress warnings related to structure padding. X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=9370433e91cc3d552671184b286d34ade17f7ff2;p=~shefty%2Frdma-win.git Fixes to suppress warnings related to structure padding. git-svn-id: svn://openib.tc.cornell.edu/gen1@21 ad392aa1-c5ef-ae45-8dd8-e69d62a5ef86 --- diff --git a/branches/fab_cm_branch/core/al/al_dm.c b/branches/fab_cm_branch/core/al/al_dm.c index 09b53f24..b823705d 100644 --- a/branches/fab_cm_branch/core/al/al_dm.c +++ b/branches/fab_cm_branch/core/al/al_dm.c @@ -213,7 +213,7 @@ ib_create_ioc( CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl, ("IB_INVALID_CA_HANDLE\n") ); return IB_INVALID_CA_HANDLE; } - if( !p_ioc_profile || ph_ioc ) + if( !p_ioc_profile || !ph_ioc ) { CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl, ("IB_INVALID_PARAMETER\n") ); return IB_INVALID_PARAMETER; diff --git a/branches/fab_cm_branch/core/al/al_dm.h b/branches/fab_cm_branch/core/al/al_dm.h index 1dc97f94..f220dd87 100644 --- a/branches/fab_cm_branch/core/al/al_dm.h +++ b/branches/fab_cm_branch/core/al/al_dm.h @@ -91,6 +91,7 @@ typedef enum _ioc_state /* An IOC represents a slot in an IO unit */ } ioc_state_t; +#pragma warning(disable:4324) typedef struct _al_ioc { al_obj_t obj; /* Child of ib_ca_t */ @@ -104,6 +105,7 @@ typedef struct _al_ioc atomic32_t in_use_cnt; } al_ioc_t; +#pragma warning(default:4324) typedef struct _al_svc_entry diff --git a/branches/fab_cm_branch/core/al/kernel/al_ioc_pnp.c b/branches/fab_cm_branch/core/al/kernel/al_ioc_pnp.c index dce54049..a017b659 100644 --- a/branches/fab_cm_branch/core/al/kernel/al_ioc_pnp.c +++ b/branches/fab_cm_branch/core/al/kernel/al_ioc_pnp.c @@ -257,17 +257,18 @@ typedef struct _iou_node *********/ +#pragma warning(disable:4324) typedef struct _iou_ioc { cl_map_item_t map_item; iou_node_t *p_iou; uint8_t slot; - uint8_t pad[7]; /* Align IOC profile on 64-bit boundary */ ib_ioc_profile_t profile; uint8_t num_valid_entries; ib_svc_entry_t *p_svc_entries; } iou_ioc_t; +#pragma warning(default:4324) typedef enum _sweep_state diff --git a/branches/fab_cm_branch/inc/iba/ib_al.h b/branches/fab_cm_branch/inc/iba/ib_al.h index 02d7675f..0aa34fbb 100644 --- a/branches/fab_cm_branch/inc/iba/ib_al.h +++ b/branches/fab_cm_branch/inc/iba/ib_al.h @@ -3536,6 +3536,7 @@ typedef struct _ib_apr_info * * SYNOPSIS */ +#pragma warning(disable:4324) typedef struct _ib_cm_req_rec { const void* __ptr64 context; @@ -3558,6 +3559,7 @@ typedef struct _ib_cm_req_rec const void* __ptr64 sidr_context; } ib_cm_req_rec_t; +#pragma warning(default:4324) /* * FIELDS * context diff --git a/branches/fab_cm_branch/inc/iba/ib_types.h b/branches/fab_cm_branch/inc/iba/ib_types.h index 493373d0..26f1667a 100644 --- a/branches/fab_cm_branch/inc/iba/ib_types.h +++ b/branches/fab_cm_branch/inc/iba/ib_types.h @@ -6862,6 +6862,7 @@ ib_dm_set_slot_lo_hi( /* * Information describing an I/O controller */ +#pragma warning(disable:4324) typedef struct _ib_ioc_info { net64_t chassis_guid; @@ -6871,6 +6872,8 @@ typedef struct _ib_ioc_info ib_ioc_profile_t profile; } ib_ioc_info_t; +#pragma warning(default:4324) + /* * Defines known Communication management class versions diff --git a/branches/fab_cm_branch/ulp/srp/kernel/srp_hba.h b/branches/fab_cm_branch/ulp/srp/kernel/srp_hba.h index 1a99fa1b..96d9e3dd 100644 --- a/branches/fab_cm_branch/ulp/srp/kernel/srp_hba.h +++ b/branches/fab_cm_branch/ulp/srp/kernel/srp_hba.h @@ -44,12 +44,15 @@ typedef struct _srp_session *p_srp_session_t; +#pragma warning(disable:4324) typedef struct _srp_path_record { cl_list_item_t list_item; ib_path_rec_t path_rec; } srp_path_record_t; +#pragma warning(default:4324) + typedef struct _srp_hba {