From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from [140.186.70.92] (port=55924 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PQIIt-0005ZP-RI for qemu-devel@nongnu.org; Wed, 08 Dec 2010 06:35:28 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PQIIo-0007OK-6H for qemu-devel@nongnu.org; Wed, 08 Dec 2010 06:35:23 -0500 Received: from mx1.redhat.com ([209.132.183.28]:49671) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PQIIn-0007MM-Sx for qemu-devel@nongnu.org; Wed, 08 Dec 2010 06:35:18 -0500 From: Gleb Natapov Date: Wed, 8 Dec 2010 13:35:04 +0200 Message-Id: <1291808109-22563-12-git-send-email-gleb@redhat.com> In-Reply-To: <1291808109-22563-1-git-send-email-gleb@redhat.com> References: <1291808109-22563-1-git-send-email-gleb@redhat.com> Subject: [Qemu-devel] [PATCHv8 11/16] Add get_fw_dev_path callback to scsi bus. List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: blauwirbel@gmail.com, kevin@koconnor.net, kvm@vger.kernel.org Signed-off-by: Gleb Natapov --- hw/scsi-bus.c | 23 +++++++++++++++++++++++ 1 files changed, 23 insertions(+), 0 deletions(-) diff --git a/hw/scsi-bus.c b/hw/scsi-bus.c index 93f0e9a..7febb86 100644 --- a/hw/scsi-bus.c +++ b/hw/scsi-bus.c @@ -5,9 +5,12 @@ #include "qdev.h" #include "blockdev.h" +static char *scsibus_get_fw_dev_path(DeviceState *dev); + static struct BusInfo scsi_bus_info = { .name = "SCSI", .size = sizeof(SCSIBus), + .get_fw_dev_path = scsibus_get_fw_dev_path, .props = (Property[]) { DEFINE_PROP_UINT32("scsi-id", SCSIDevice, id, -1), DEFINE_PROP_END_OF_LIST(), @@ -518,3 +521,23 @@ void scsi_req_complete(SCSIRequest *req) req->tag, req->status); } + +static char *scsibus_get_fw_dev_path(DeviceState *dev) +{ + SCSIDevice *d = (SCSIDevice*)dev; + SCSIBus *bus = scsi_bus_from_device(d); + char path[100]; + int i; + + for (i = 0; i < bus->ndev; i++) { + if (bus->devs[i] == d) { + break; + } + } + + assert(i != bus->ndev); + + snprintf(path, sizeof(path), "%s@%x", qdev_fw_name(dev), i); + + return strdup(path); +} -- 1.7.2.3