Commit 27e88b8d authored by Jim Harris's avatar Jim Harris Committed by Tomasz Zawadzki
Browse files

nvme: add g_ prefix to hotplug_fd 



Signed-off-by: default avatarJim Harris <james.r.harris@intel.com>
Change-Id: I8cc03e1a8b5d2eb28bf945115f3c9b3980b30f1c

Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/475014


Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarChangpeng Liu <changpeng.liu@intel.com>
Reviewed-by: default avatarShuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Reviewed-by: default avatarAlexey Marchuk <alexeymar@mellanox.com>
Reviewed-by: default avatarBen Walker <benjamin.walker@intel.com>
parent 506a90a9

lib/nvme/nvme_pcie.c

+5 −5
Original line number Diff line number Diff line
@@ -212,7 +212,7 @@ static int nvme_pcie_qpair_destroy(struct spdk_nvme_qpair *qpair); 
__thread struct nvme_pcie_ctrlr *g_thread_mmio_ctrlr = NULL;

static uint16_t g_signal_lock;

static bool g_sigset = false;

static int hotplug_fd = -1;

static int g_hotplug_fd = -1;



static void

nvme_sigbus_fault_sighandler(int signum, siginfo_t *info, void *ctx)
@@ -271,7 +271,7 @@ _nvme_pcie_hotplug_monitor(struct spdk_nvme_probe_ctx *probe_ctx) 
	union spdk_nvme_csts_register csts;

	struct spdk_nvme_ctrlr_process *proc;



	while (spdk_get_uevent(hotplug_fd, &event) > 0) {

	while (spdk_get_uevent(g_hotplug_fd, &event) > 0) {

		if (event.subsystem == SPDK_NVME_UEVENT_SUBSYSTEM_UIO ||

		    event.subsystem == SPDK_NVME_UEVENT_SUBSYSTEM_VFIO) {

			if (event.action == SPDK_NVME_UEVENT_ADD) {
@@ -766,9 +766,9 @@ nvme_pcie_ctrlr_scan(struct spdk_nvme_probe_ctx *probe_ctx, 
		enum_ctx.has_pci_addr = true;

	}



	if (hotplug_fd < 0) {

		hotplug_fd = spdk_uevent_connect();

		if (hotplug_fd < 0) {

	if (g_hotplug_fd < 0) {

		g_hotplug_fd = spdk_uevent_connect();

		if (g_hotplug_fd < 0) {

			SPDK_DEBUGLOG(SPDK_LOG_NVME, "Failed to open uevent netlink socket\n");

		}

	} else {