diff --git a/include/spdk_internal/event.h b/include/spdk_internal/event.h index 5d343781a..bcc9cd59d 100644 --- a/include/spdk_internal/event.h +++ b/include/spdk_internal/event.h @@ -91,6 +91,8 @@ void spdk_subsystem_fini(spdk_msg_fn cb_fn, void *cb_arg); void spdk_subsystem_init_next(int rc); void spdk_subsystem_fini_next(void); void spdk_subsystem_config(FILE *fp); +void spdk_app_json_config_load(const char *json_config_file, const char *rpc_addr, + spdk_msg_fn cb_fn, void *cb_arg); /** * Save pointed \c subsystem configuration to the JSON write context \c w. In case of diff --git a/lib/event/app.c b/lib/event/app.c index 36993cb5f..f23ada976 100644 --- a/lib/event/app.c +++ b/lib/event/app.c @@ -44,8 +44,6 @@ #include "spdk/rpc.h" #include "spdk/util.h" -#include "json_config.h" - #define SPDK_APP_DEFAULT_LOG_LEVEL SPDK_LOG_NOTICE #define SPDK_APP_DEFAULT_LOG_PRINT_LEVEL SPDK_LOG_INFO #define SPDK_APP_DEFAULT_BACKTRACE_LOG_LEVEL SPDK_LOG_ERROR diff --git a/lib/event/json_config.c b/lib/event/json_config.c index ca07e1195..cbb7082e3 100644 --- a/lib/event/json_config.c +++ b/lib/event/json_config.c @@ -31,8 +31,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "json_config.h" - #include "spdk/stdinc.h" #include "spdk/util.h" diff --git a/lib/event/json_config.h b/lib/event/json_config.h deleted file mode 100644 index 5a620d028..000000000 --- a/lib/event/json_config.h +++ /dev/null @@ -1,42 +0,0 @@ -/*- - * BSD LICENSE - * - * Copyright (c) Intel Corporation. - * 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. - */ - -#ifndef SPDK_JSON_CONFIG_H -#define SPDK_JSON_CONFIG_H - -#include "spdk/thread.h" - -void spdk_app_json_config_load(const char *json_config_file, const char *rpc_addr, - spdk_msg_fn cb_fn, void *cb_arg); - -#endif /* SPDK_JSON_CONFIG_H */