Commit 166d7ac4 authored by Daniel Verkamp's avatar Daniel Verkamp
Browse files

bdev: #include VTune file to control warnings 



The VTune ittnotify_static.c code, as currently shipped, triggers
sign-comparison warnings when built with SPDK's CFLAGS.

Wrap the file in a pragma to disable the warnings for just this file and
allow a build with --enable-werror to pass.

Change-Id: I701fb6b88f09564fdadfd17e1d16d80df455940b
Signed-off-by: default avatarDaniel Verkamp <daniel.verkamp@intel.com>
Reviewed-on: https://review.gerrithub.io/364511


Tested-by: default avatarSPDK Automated Test System <sys_sgsw@intel.com>
Reviewed-by: default avatarBen Walker <benjamin.walker@intel.com>
parent ce0b24ca

lib/bdev/Makefile

+2 −2
Original line number Diff line number Diff line
@@ -36,11 +36,11 @@ include $(SPDK_ROOT_DIR)/mk/spdk.common.mk 


CFLAGS += $(ENV_CFLAGS) -I.

ifeq ($(CONFIG_VTUNE),y)

CFLAGS += -I$(VTUNE_SOURCE_DIR)/include

CFLAGS += -I$(VTUNE_SOURCE_DIR)/include -I$(VTUNE_SOURCE_DIR)/sdk/src/ittnotify

endif



C_SRCS = bdev.c scsi_nvme.c

C_SRCS-$(CONFIG_VTUNE) += $(VTUNE_SOURCE_DIR)/sdk/src/ittnotify/ittnotify_static.c

C_SRCS-$(CONFIG_VTUNE) += vtune.c



LIBNAME = bdev

lib/bdev/vtune.c

0 → 100644
+45 −0
Original line number Diff line number Diff line 
/*-

 *   BSD LICENSE

 *

 *   Copyright(c) Intel Corporation. All rights reserved.

 *   All rights reserved.

 *

 *   Redistribution and use in source and binary forms, with or without

 *   modification, are permitted provided that the following conditions

 *   are met:

 *

 *     * Redistributions of source code must retain the above copyright

 *       notice, this list of conditions and the following disclaimer.

 *     * Redistributions in binary form must reproduce the above copyright

 *       notice, this list of conditions and the following disclaimer in

 *       the documentation and/or other materials provided with the

 *       distribution.

 *     * Neither the name of Intel Corporation nor the names of its

 *       contributors may be used to endorse or promote products derived

 *       from this software without specific prior written permission.

 *

 *   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS

 *   "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT

 *   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR

 *   A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT

 *   OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,

 *   SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT

 *   LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,

 *   DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY

 *   THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT

 *   (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE

 *   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

 */



#if SPDK_CONFIG_VTUNE



/* Disable warnings triggered by the VTune code */

#if defined(__GNUC__) && \

	__GNUC__ > 4 || \

	(__GNUC__ == 4 && __GNUC_MINOR__ >= 6)

#pragma GCC diagnostic ignored "-Wsign-compare"

#endif



#include "ittnotify_static.c"



#endif