ivampiresp/Spdk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bdev_virtio: fix setting name for modern pci devices

Browse Source 
It used to be NULL.

Fixes: a85a4452
("bdev_virtio/rpc: add construct_virtio_user_scsi_bdev")

Change-Id: I490b41571e5667cf95b59b2e316006d1ef7381e8
Signed-off-by: Dariusz Stojaczyk <dariuszx.stojaczyk@intel.com>
Reviewed-on: https://review.gerrithub.io/383892
Tested-by: SPDK Automated Test System <sys_sgsw@intel.com>
Reviewed-by: Pawel Wodkowski <pawelx.wodkowski@intel.com>
Reviewed-by: Daniel Verkamp <daniel.verkamp@intel.com>
This commit is contained in:
Dariusz Stojaczyk 2017-10-26 11:06:35 +02:00 committed by Daniel Verkamp
parent d17345183e
commit a17d431612
1 changed files with 20 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
lib/bdev/virtio/rte_virtio/virtio_pci.c
View File

@ -645,13 +645,19 @@ next:
return 0; return 0;
} }
static void static int
virtio_dev_pci_init(struct virtio_dev *vdev) virtio_dev_pci_init(struct virtio_dev *vdev)
{ {
vdev->name = spdk_sprintf_alloc("VirtioScsi%"PRIu32, vdev->id);
if (!vdev->name) {
return -1;
}
vtpci_read_dev_config(vdev, offsetof(struct virtio_scsi_config, num_queues), vtpci_read_dev_config(vdev, offsetof(struct virtio_scsi_config, num_queues),
&vdev->max_queues, sizeof(vdev->max_queues)); &vdev->max_queues, sizeof(vdev->max_queues));
vdev->max_queues += SPDK_VIRTIO_SCSI_QUEUE_NUM_FIXED; vdev->max_queues += SPDK_VIRTIO_SCSI_QUEUE_NUM_FIXED;
TAILQ_INSERT_TAIL(&g_virtio_driver.init_ctrlrs, vdev, tailq); TAILQ_INSERT_TAIL(&g_virtio_driver.init_ctrlrs, vdev, tailq);
return 0;
} }
static int static int
@ -698,7 +704,13 @@ pci_enum_virtio_probe_cb(void *ctx, struct spdk_pci_device *pci_dev)
goto err; goto err;
} }
vdev->modern = 1; vdev->modern = 1;
virtio_dev_pci_init(vdev);
rc = virtio_dev_pci_init(vdev);
if (rc != 0) {
vtpci_deinit(vdev->id);
goto err;
}
return 0; return 0;
} }
@ -718,18 +730,18 @@ pci_enum_virtio_probe_cb(void *ctx, struct spdk_pci_device *pci_dev)
} }
#endif #endif
vdev->name = spdk_sprintf_alloc("VirtioScsi%"PRIu32, vdev->id);
if (!vdev->name) {
goto err;
}
rc = vtpci_init(vdev, &legacy_ops); rc = vtpci_init(vdev, &legacy_ops);
if (rc != 0) { if (rc != 0) {
goto err; goto err;
} }
vdev->modern = 0; vdev->modern = 0;
virtio_dev_pci_init(vdev); rc = virtio_dev_pci_init(vdev);
if (rc != 0) {
vtpci_deinit(vdev->id);
goto err;
}
return 0; return 0;
#endif #endif