diff --git a/lib/vhost/vhost.c b/lib/vhost/vhost.c index b950eec1c..004fbaec4 100644 --- a/lib/vhost/vhost.c +++ b/lib/vhost/vhost.c @@ -505,8 +505,8 @@ spdk_vhost_dev_mem_register(struct spdk_vhost_dev *vdev) start = FLOOR_2MB(region->mmap_addr); end = CEIL_2MB(region->mmap_addr + region->mmap_size); len = end - start; - SPDK_NOTICELOG("Registering VM memory for vtophys translation - 0x%jx len:0x%jx\n", - start, len); + SPDK_INFOLOG(SPDK_LOG_VHOST, "Registering VM memory for vtophys translation - 0x%jx len:0x%jx\n", + start, len); if (spdk_mem_register((void *)start, len) != 0) { SPDK_WARNLOG("Failed to register memory region %"PRIu32". Future vtophys translation might fail.\n", @@ -710,7 +710,7 @@ spdk_vhost_dev_register(struct spdk_vhost_dev *vdev, const char *name, const cha return -EIO; } - SPDK_NOTICELOG("Controller %s: new controller added\n", vdev->name); + SPDK_INFOLOG(SPDK_LOG_VHOST, "Controller %s: new controller added\n", vdev->name); return 0; out: @@ -733,7 +733,7 @@ spdk_vhost_dev_unregister(struct spdk_vhost_dev *vdev) return -EIO; } - SPDK_NOTICELOG("Controller %s: removed\n", vdev->name); + SPDK_INFOLOG(SPDK_LOG_VHOST, "Controller %s: removed\n", vdev->name); free(vdev->name); free(vdev->path); @@ -1131,7 +1131,7 @@ session_shutdown(void *arg) vdev->registered = false; } - SPDK_NOTICELOG("Exiting\n"); + SPDK_INFOLOG(SPDK_LOG_VHOST, "Exiting\n"); spdk_event_call((struct spdk_event *)arg); return NULL; } @@ -1347,4 +1347,5 @@ spdk_vhost_fini(spdk_vhost_fini_cb fini_cb) pthread_detach(tid); } +SPDK_LOG_REGISTER_COMPONENT("vhost", SPDK_LOG_VHOST) SPDK_LOG_REGISTER_COMPONENT("vhost_ring", SPDK_LOG_VHOST_RING) diff --git a/lib/vhost/vhost_blk.c b/lib/vhost/vhost_blk.c index bebd3d4c7..7ba65ac2a 100644 --- a/lib/vhost/vhost_blk.c +++ b/lib/vhost/vhost_blk.c @@ -520,7 +520,8 @@ spdk_vhost_blk_start(struct spdk_vhost_dev *vdev, void *event_ctx) bvdev->requestq_poller = spdk_poller_register(bvdev->bdev ? vdev_worker : no_bdev_vdev_worker, bvdev, 0); - SPDK_NOTICELOG("Started poller for vhost controller %s on lcore %d\n", vdev->name, vdev->lcore); + SPDK_INFOLOG(SPDK_LOG_VHOST, "Started poller for vhost controller %s on lcore %d\n", + vdev->name, vdev->lcore); out: spdk_vhost_dev_backend_event_done(event_ctx, rc); return rc; @@ -548,7 +549,7 @@ destroy_device_poller_cb(void *arg) spdk_vhost_vq_used_signal(&bvdev->vdev, &bvdev->vdev.virtqueue[i]); } - SPDK_NOTICELOG("Stopping poller for vhost controller %s\n", bvdev->vdev.name); + SPDK_INFOLOG(SPDK_LOG_VHOST, "Stopping poller for vhost controller %s\n", bvdev->vdev.name); if (bvdev->bdev_io_channel) { spdk_put_io_channel(bvdev->bdev_io_channel); @@ -772,7 +773,7 @@ spdk_vhost_blk_construct(const char *name, const char *cpumask, const char *dev_ goto out; } - SPDK_NOTICELOG("Controller %s: using bdev '%s'\n", name, dev_name); + SPDK_INFOLOG(SPDK_LOG_VHOST, "Controller %s: using bdev '%s'\n", name, dev_name); out: if (ret != 0 && bvdev) { spdk_dma_free(bvdev); diff --git a/lib/vhost/vhost_scsi.c b/lib/vhost/vhost_scsi.c index 3adc55f66..38cea852e 100644 --- a/lib/vhost/vhost_scsi.c +++ b/lib/vhost/vhost_scsi.c @@ -154,7 +154,8 @@ process_removed_devs(struct spdk_vhost_scsi_dev *svdev) state->remove_cb(&svdev->vdev, state->remove_ctx); state->remove_cb = NULL; } - SPDK_NOTICELOG("%s: hot-detached device 'Dev %u'.\n", svdev->vdev.name, i); + SPDK_INFOLOG(SPDK_LOG_VHOST, "%s: hot-detached device 'Dev %u'.\n", + svdev->vdev.name, i); } } } @@ -847,8 +848,8 @@ spdk_vhost_scsi_dev_add_tgt(struct spdk_vhost_dev *vdev, unsigned scsi_tgt_num, eventq_enqueue(svdev, scsi_tgt_num, VIRTIO_SCSI_T_TRANSPORT_RESET, VIRTIO_SCSI_EVT_RESET_RESCAN); } - SPDK_NOTICELOG("Controller %s: defined target '%s' using bdev '%s'\n", - vdev->name, target_name, bdev_name); + SPDK_INFOLOG(SPDK_LOG_VHOST, "Controller %s: defined target '%s' using bdev '%s'\n", + vdev->name, target_name, bdev_name); return 0; } @@ -884,7 +885,8 @@ spdk_vhost_scsi_dev_remove_tgt(struct spdk_vhost_dev *vdev, unsigned scsi_tgt_nu if (cb_fn) { rc = cb_fn(vdev, cb_arg); } - SPDK_NOTICELOG("%s: removed target 'Target %u'\n", vdev->name, scsi_tgt_num); + SPDK_INFOLOG(SPDK_LOG_VHOST, "%s: removed target 'Target %u'\n", + vdev->name, scsi_tgt_num); return rc; } @@ -906,7 +908,7 @@ spdk_vhost_scsi_dev_remove_tgt(struct spdk_vhost_dev *vdev, unsigned scsi_tgt_nu scsi_dev_state->removed = true; eventq_enqueue(svdev, scsi_tgt_num, VIRTIO_SCSI_T_TRANSPORT_RESET, VIRTIO_SCSI_EVT_RESET_REMOVED); - SPDK_NOTICELOG("%s: queued 'Target %u' for hot-detach.\n", vdev->name, scsi_tgt_num); + SPDK_INFOLOG(SPDK_LOG_VHOST, "%s: queued 'Target %u' for hot-detach.\n", vdev->name, scsi_tgt_num); return 0; } @@ -1080,7 +1082,8 @@ spdk_vhost_scsi_start(struct spdk_vhost_dev *vdev, void *event_ctx) } spdk_scsi_dev_allocate_io_channels(svdev->scsi_dev[i]); } - SPDK_NOTICELOG("Started poller for vhost controller %s on lcore %d\n", vdev->name, vdev->lcore); + SPDK_INFOLOG(SPDK_LOG_VHOST, "Started poller for vhost controller %s on lcore %d\n", + vdev->name, vdev->lcore); spdk_vhost_dev_mem_register(vdev); @@ -1121,7 +1124,7 @@ destroy_device_poller_cb(void *arg) spdk_scsi_dev_free_io_channels(svdev->scsi_dev[i]); } - SPDK_NOTICELOG("Stopping poller for vhost controller %s\n", svdev->vdev.name); + SPDK_INFOLOG(SPDK_LOG_VHOST, "Stopping poller for vhost controller %s\n", svdev->vdev.name); spdk_vhost_dev_mem_unregister(&svdev->vdev); free_task_pool(svdev); diff --git a/test/unit/lib/vhost/vhost_blk.c/vhost_blk_ut.c b/test/unit/lib/vhost/vhost_blk.c/vhost_blk_ut.c index a5a183f2d..7fac97381 100644 --- a/test/unit/lib/vhost/vhost_blk.c/vhost_blk_ut.c +++ b/test/unit/lib/vhost/vhost_blk.c/vhost_blk_ut.c @@ -61,6 +61,8 @@ DEFINE_STUB_V(spdk_bdev_close, (struct spdk_bdev_desc *desc)); DEFINE_STUB(rte_vhost_driver_enable_features, int, (const char *path, uint64_t features), 0); DEFINE_STUB_P(spdk_bdev_get_io_channel, struct spdk_io_channel, (struct spdk_bdev_desc *desc), {0}); +SPDK_LOG_REGISTER_COMPONENT("vhost", SPDK_LOG_VHOST) + uint32_t spdk_bdev_get_block_size(const struct spdk_bdev *bdev) { diff --git a/test/unit/lib/vhost/vhost_scsi.c/vhost_scsi_ut.c b/test/unit/lib/vhost/vhost_scsi.c/vhost_scsi_ut.c index b09a03883..0865dc2d5 100644 --- a/test/unit/lib/vhost/vhost_scsi.c/vhost_scsi_ut.c +++ b/test/unit/lib/vhost/vhost_scsi.c/vhost_scsi_ut.c @@ -69,6 +69,8 @@ DEFINE_STUB_P(spdk_scsi_dev_construct, struct spdk_scsi_dev, (const char *name, DEFINE_STUB(spdk_scsi_dev_add_port, int, (struct spdk_scsi_dev *dev, uint64_t id, const char *name), 0); +SPDK_LOG_REGISTER_COMPONENT("vhost", SPDK_LOG_VHOST) + char * spdk_conf_section_get_nval(struct spdk_conf_section *sp, const char *key, int idx) {