Commit 96015793 authored by Changpeng Liu's avatar Changpeng Liu
Browse files

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: default avatarChangpeng Liu <changpeng.liu@intel.com>
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/11421


Community-CI: Broadcom CI <spdk-ci.pdl@broadcom.com>
Community-CI: Mellanox Build Bot
Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarAleksey Marchuk <alexeymar@mellanox.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
parent 492d5767

lib/nvmf/vfio_user.c

+1 −12
Original line number Diff line number Diff line
@@ -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;