From patchwork Wed Nov 17 16:43:58 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gleb Natapov X-Patchwork-Id: 71597 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 90FA3B7198 for ; Thu, 18 Nov 2010 03:56:36 +1100 (EST) Received: from localhost ([127.0.0.1]:43820 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PIlJB-0004RP-Ok for incoming@patchwork.ozlabs.org; Wed, 17 Nov 2010 11:56:33 -0500 Received: from [140.186.70.92] (port=41979 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PIl7I-0006bo-LE for qemu-devel@nongnu.org; Wed, 17 Nov 2010 11:44:22 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PIl7E-0004KX-97 for qemu-devel@nongnu.org; Wed, 17 Nov 2010 11:44:16 -0500 Received: from mx1.redhat.com ([209.132.183.28]:63233) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PIl7E-0004Jd-20 for qemu-devel@nongnu.org; Wed, 17 Nov 2010 11:44:12 -0500 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id oAHGi6AP010007 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Wed, 17 Nov 2010 11:44:07 -0500 Received: from dhcp-1-237.tlv.redhat.com (dhcp-1-237.tlv.redhat.com [10.35.1.237]) by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id oAHGi6ZJ019784; Wed, 17 Nov 2010 11:44:06 -0500 Received: by dhcp-1-237.tlv.redhat.com (Postfix, from userid 13519) id 73BEC133F81; Wed, 17 Nov 2010 18:44:04 +0200 (IST) From: Gleb Natapov To: qemu-devel@nongnu.org Date: Wed, 17 Nov 2010 18:43:58 +0200 Message-Id: <1290012243-6087-12-git-send-email-gleb@redhat.com> In-Reply-To: <1290012243-6087-1-git-send-email-gleb@redhat.com> References: <1290012243-6087-1-git-send-email-gleb@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.22 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. Cc: kvm@vger.kernel.org, mst@redhat.com, armbru@redhat.com, blauwirbel@gmail.com, alex.williamson@redhat.com, kevin@koconnor.net Subject: [Qemu-devel] [PATCHv6 11/16] Add get_dev_path callback to scsi bus. X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.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 5a3fd4b..db7482a 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(), @@ -528,3 +531,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); +}