From 96015793d204125f4463bfbd1cb57f9604278f35 Mon Sep 17 00:00:00 2001 From: Changpeng Liu Date: Mon, 7 Feb 2022 22:06:12 +0800 Subject: [PATCH] nvmf/vfio-user: eliminate vfio_user_dev_migr_resume_done() function We can call vfio_user_endpoint_resume_done() instead. Change-Id: Ia6d3d1c20edbd83f906045c7fb530a4d882f7a18 Signed-off-by: Changpeng Liu Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/11421 Community-CI: Broadcom CI Community-CI: Mellanox Build Bot Tested-by: SPDK CI Jenkins Reviewed-by: Aleksey Marchuk Reviewed-by: Jim Harris --- lib/nvmf/vfio_user.c | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/lib/nvmf/vfio_user.c b/lib/nvmf/vfio_user.c index 9dbf94fa1..950074a6d 100644 --- a/lib/nvmf/vfio_user.c +++ b/lib/nvmf/vfio_user.c @@ -2199,17 +2199,6 @@ init_pci_config_space(vfu_pci_config_space_t *p) p->hdr.intr.ipin = 0x1; } -static void -vfio_user_dev_migr_resume_done(struct spdk_nvmf_subsystem *subsystem, - void *cb_arg, int status) -{ - struct nvmf_vfio_user_ctrlr *vu_ctrlr = cb_arg; - - SPDK_DEBUGLOG(nvmf_vfio, "%s resumed done with status %d\n", ctrlr_id(vu_ctrlr), status); - - vu_ctrlr->state = VFIO_USER_CTRLR_RUNNING; -} - static void vfio_user_dev_quiesce_done(struct spdk_nvmf_subsystem *subsystem, void *cb_arg, int status); @@ -2821,7 +2810,7 @@ vfio_user_migration_device_state_transition(vfu_ctx_t *vfu_ctx, vfu_migr_state_t /* Rollback source VM */ vu_ctrlr->state = VFIO_USER_CTRLR_RESUMING; ret = spdk_nvmf_subsystem_resume((struct spdk_nvmf_subsystem *)endpoint->subsystem, - vfio_user_dev_migr_resume_done, vu_ctrlr); + vfio_user_endpoint_resume_done, endpoint); if (ret < 0) { /* TODO: fail controller with CFS bit set */ vu_ctrlr->state = VFIO_USER_CTRLR_PAUSED;