diff --git a/include/spdk/env.h b/include/spdk/env.h index c8fbad1c24..3aaf42e654 100644 --- a/include/spdk/env.h +++ b/include/spdk/env.h @@ -1343,7 +1343,7 @@ struct spdk_pci_event { struct spdk_pci_addr traddr; }; -typedef void (*spdk_pci_error_handler)(siginfo_t *info, void *ctx); +typedef void (*spdk_pci_error_handler)(const void *failure_addr, void *ctx); /** * Begin listening for PCI bus events. This is used to detect hot-insert and diff --git a/lib/env_dpdk/Makefile b/lib/env_dpdk/Makefile index f869a0b486..b732820810 100644 --- a/lib/env_dpdk/Makefile +++ b/lib/env_dpdk/Makefile @@ -34,7 +34,7 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../..) include $(SPDK_ROOT_DIR)/mk/spdk.common.mk -SO_VER := 6 +SO_VER := 7 SO_MINOR := 0 CFLAGS += $(ENV_CFLAGS) diff --git a/lib/env_dpdk/sigbus_handler.c b/lib/env_dpdk/sigbus_handler.c index 098e7647c6..0a1e2eebaa 100644 --- a/lib/env_dpdk/sigbus_handler.c +++ b/lib/env_dpdk/sigbus_handler.c @@ -53,7 +53,7 @@ sigbus_fault_sighandler(int signum, siginfo_t *info, void *ctx) pthread_mutex_lock(&g_sighandler_mutex); TAILQ_FOREACH(sigbus_handler, &g_sigbus_handler, tailq) { - sigbus_handler->func(info, sigbus_handler->ctx); + sigbus_handler->func(info->si_addr, sigbus_handler->ctx); } pthread_mutex_unlock(&g_sighandler_mutex); } diff --git a/lib/nvme/nvme_pcie.c b/lib/nvme/nvme_pcie.c index a9c854ef7a..24d6e889dd 100644 --- a/lib/nvme/nvme_pcie.c +++ b/lib/nvme/nvme_pcie.c @@ -54,7 +54,7 @@ static bool g_sigset = false; static spdk_nvme_pcie_hotplug_filter_cb g_hotplug_filter_cb; static void -nvme_sigbus_fault_sighandler(siginfo_t *info, void *ctx) +nvme_sigbus_fault_sighandler(const void *failure_addr, void *ctx) { void *map_address; uint16_t flag = 0; diff --git a/lib/virtio/virtio_pci.c b/lib/virtio/virtio_pci.c index 8d06172ff7..0d341cd5c5 100644 --- a/lib/virtio/virtio_pci.c +++ b/lib/virtio/virtio_pci.c @@ -89,9 +89,9 @@ static bool g_sigset = false; #define PCI_CAP_ID_MSIX 0x11 static void -virtio_pci_dev_sigbus_handler(siginfo_t *info, void *ctx) +virtio_pci_dev_sigbus_handler(const void *failure_addr, void *ctx) { - void *map_address = NULL;; + void *map_address = NULL; uint16_t flag = 0; int i;