david.venhoff/QEMU-Nyx-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

scsi: add get_dev_path

Browse Source 
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Paolo Bonzini 2012-03-19 15:30:40 +01:00
parent eb2fa76418
commit baa1bd8992
1 changed files with 18 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
hw/scsi-bus.c
View File

@ -7,6 +7,7 @@
#include "trace.h" #include "trace.h"
#include "dma.h" #include "dma.h"
static char *scsibus_get_dev_path(DeviceState *dev);
static char *scsibus_get_fw_dev_path(DeviceState *dev); static char *scsibus_get_fw_dev_path(DeviceState *dev);
static int scsi_req_parse(SCSICommand *cmd, SCSIDevice *dev, uint8_t *buf); static int scsi_req_parse(SCSICommand *cmd, SCSIDevice *dev, uint8_t *buf);
static void scsi_req_dequeue(SCSIRequest *req); static void scsi_req_dequeue(SCSIRequest *req);
@ -14,6 +15,7 @@ static void scsi_req_dequeue(SCSIRequest *req);
static struct BusInfo scsi_bus_info = { static struct BusInfo scsi_bus_info = {
.name = "SCSI", .name = "SCSI",
.size = sizeof(SCSIBus), .size = sizeof(SCSIBus),
.get_dev_path = scsibus_get_dev_path,
.get_fw_dev_path = scsibus_get_fw_dev_path, .get_fw_dev_path = scsibus_get_fw_dev_path,
.props = (Property[]) { .props = (Property[]) {
DEFINE_PROP_UINT32("channel", SCSIDevice, channel, 0), DEFINE_PROP_UINT32("channel", SCSIDevice, channel, 0),
@ -1423,6 +1425,22 @@ void scsi_device_purge_requests(SCSIDevice *sdev, SCSISense sense)
sdev->unit_attention = sense; sdev->unit_attention = sense;
} }
static char *scsibus_get_dev_path(DeviceState *dev)
{
SCSIDevice *d = DO_UPCAST(SCSIDevice, qdev, dev);
DeviceState *hba = dev->parent_bus->parent;
char *id = NULL;
if (hba && hba->parent_bus && hba->parent_bus->info->get_dev_path) {
id = hba->parent_bus->info->get_dev_path(hba);
}
if (id) {
return g_strdup_printf("%s/%d:%d:%d", id, d->channel, d->id, d->lun);
} else {
return g_strdup_printf("%d:%d:%d", d->channel, d->id, d->lun);
}
}
static char *scsibus_get_fw_dev_path(DeviceState *dev) static char *scsibus_get_fw_dev_path(DeviceState *dev)
{ {
SCSIDevice *d = SCSI_DEVICE(dev); SCSIDevice *d = SCSI_DEVICE(dev);