import 15.2.0 Octopus source

[ceph.git] / ceph / src / spdk / test / unit / lib / nvme / nvme_pcie.c / nvme_pcie_ut.c

diff --git a/ceph/src/spdk/test/unit/lib/nvme/nvme_pcie.c/nvme_pcie_ut.c b/ceph/src/spdk/test/unit/lib/nvme/nvme_pcie.c/nvme_pcie_ut.c
index 2bec58659193e6c41a0cf0fbc0ff0c2a10496403..f8cca9d387c886e1c6e838e1b25c5d15ba7a770e 100644 (file)
--- a/ceph/src/spdk/test/unit/lib/nvme/nvme_pcie.c/nvme_pcie_ut.c
+++ b/ceph/src/spdk/test/unit/lib/nvme/nvme_pcie.c/nvme_pcie_ut.c
@@ -41,24 +41,7 @@
 
 pid_t g_spdk_nvme_pid;
 
-DEFINE_STUB(spdk_mem_register, int, (void *vaddr, size_t len), 0);
-DEFINE_STUB(spdk_mem_unregister, int, (void *vaddr, size_t len), 0);
-
-DEFINE_STUB(spdk_nvme_ctrlr_get_process,
-           struct spdk_nvme_ctrlr_process *,
-           (struct spdk_nvme_ctrlr *ctrlr, pid_t pid),
-           NULL);
-
-DEFINE_STUB(spdk_nvme_ctrlr_get_current_process,
-           struct spdk_nvme_ctrlr_process *,
-           (struct spdk_nvme_ctrlr *ctrlr),
-           NULL);
-
-DEFINE_STUB(spdk_nvme_wait_for_completion, int,
-           (struct spdk_nvme_qpair *qpair,
-            struct nvme_completion_poll_status *status), 0);
-
-struct spdk_trace_flag SPDK_LOG_NVME = {
+struct spdk_log_flag SPDK_LOG_NVME = {
        .name = "nvme",
        .enabled = false,
 };
@@ -122,14 +105,14 @@ nvme_qpair_deinit(struct spdk_nvme_qpair *qpair)
 }
 
 int
-spdk_pci_nvme_enumerate(spdk_pci_enum_cb enum_cb, void *enum_ctx)
+spdk_pci_enumerate(struct spdk_pci_driver *driver, spdk_pci_enum_cb enum_cb, void *enum_ctx)
 {
        abort();
 }
 
 int
-spdk_pci_nvme_device_attach(spdk_pci_enum_cb enum_cb, void *enum_ctx,
-                           struct spdk_pci_addr *pci_address)
+spdk_pci_device_attach(struct spdk_pci_driver *driver, spdk_pci_enum_cb enum_cb, void *enum_ctx,
+                      struct spdk_pci_addr *pci_address)
 {
        abort();
 }
@@ -214,8 +197,8 @@ nvme_ctrlr_proc_get_devhandle(struct spdk_nvme_ctrlr *ctrlr)
 }
 
 int
-nvme_ctrlr_probe(const struct spdk_nvme_transport_id *trid, void *devhandle,
-                spdk_nvme_probe_cb probe_cb, void *cb_ctx)
+nvme_ctrlr_probe(const struct spdk_nvme_transport_id *trid,
+                struct spdk_nvme_probe_ctx *probe_ctx, void *devhandle)
 {
        abort();
 }
@@ -590,7 +573,7 @@ test_hw_sgl_req(void)
        nvme_free_request(req);
 }
 
-static void test_nvme_qpair_fail(void)
+static void test_nvme_qpair_abort_reqs(void)
 {
        struct spdk_nvme_qpair          qpair = {};
        struct nvme_request             *req = NULL;
@@ -607,14 +590,14 @@ static void test_nvme_qpair_fail(void)
        tr_temp->req->cmd.cid = tr_temp->cid;
 
        TAILQ_INSERT_HEAD(&qpair.outstanding_tr, tr_temp, tq_list);
-       nvme_qpair_fail(&qpair);
+       nvme_qpair_abort_reqs(&qpair, true);
        CU_ASSERT_TRUE(TAILQ_EMPTY(&qpair.outstanding_tr));
 
        req = nvme_allocate_request_null(expected_failure_callback, NULL);
        SPDK_CU_ASSERT_FATAL(req != NULL);
 
        STAILQ_INSERT_HEAD(&qpair.queued_req, req, stailq);
-       nvme_qpair_fail(&qpair);
+       nvme_qpair_abort_reqs(&qpair, true);
        CU_ASSERT_TRUE(STAILQ_EMPTY(&qpair.queued_req));
 
        cleanup_submit_request_test(&qpair);