[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 5/5] scsi: add get_dev_path
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PATCH 5/5] scsi: add get_dev_path |
Date: |
Mon, 19 Mar 2012 17:19:35 +0100 |
Signed-off-by: Paolo Bonzini <address@hidden>
---
hw/scsi-bus.c | 18 ++++++++++++++++++
1 files changed, 18 insertions(+), 0 deletions(-)
diff --git a/hw/scsi-bus.c b/hw/scsi-bus.c
index 2cb5a18..8e76c5d 100644
--- a/hw/scsi-bus.c
+++ b/hw/scsi-bus.c
@@ -7,6 +7,7 @@
#include "trace.h"
#include "dma.h"
+static char *scsibus_get_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 void scsi_req_dequeue(SCSIRequest *req);
@@ -14,6 +15,7 @@ static void scsi_req_dequeue(SCSIRequest *req);
static struct BusInfo scsi_bus_info = {
.name = "SCSI",
.size = sizeof(SCSIBus),
+ .get_dev_path = scsibus_get_dev_path,
.get_fw_dev_path = scsibus_get_fw_dev_path,
.props = (Property[]) {
DEFINE_PROP_UINT32("channel", SCSIDevice, channel, 0),
@@ -1423,6 +1425,22 @@ void scsi_device_purge_requests(SCSIDevice *sdev,
SCSISense 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)
{
SCSIDevice *d = SCSI_DEVICE(dev);
--
1.7.7.6
- [Qemu-devel] [PULL 0/5] SCSI patches 2012-03-19, Paolo Bonzini, 2012/03/19
- [Qemu-devel] [PATCH 2/5] scsi-cd: check ready condition before processing several commands, Paolo Bonzini, 2012/03/19
- [Qemu-devel] [PATCH 3/5] scsi: copy serial number into VPD page 0x83, Paolo Bonzini, 2012/03/19
- [Qemu-devel] [PATCH 1/5] get rid of CONFIG_VIRTIO_SCSI, Paolo Bonzini, 2012/03/19
- [Qemu-devel] [PATCH 4/5] virtio-scsi: call unregister_savevm properly, Paolo Bonzini, 2012/03/19
- [Qemu-devel] [PATCH 5/5] scsi: add get_dev_path,
Paolo Bonzini <=
- Re: [Qemu-devel] [PULL 0/5] SCSI patches 2012-03-19, Anthony Liguori, 2012/03/19