From patchwork Wed Nov 10 17:14:11 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gleb Natapov X-Patchwork-Id: 70663 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 ED9A6B70ED for ; Thu, 11 Nov 2010 04:39:39 +1100 (EST) Received: from localhost ([127.0.0.1]:38921 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PGEHg-0001CB-9N for incoming@patchwork.ozlabs.org; Wed, 10 Nov 2010 12:16:32 -0500 Received: from [140.186.70.92] (port=42507 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PGEFf-00011p-Kc for qemu-devel@nongnu.org; Wed, 10 Nov 2010 12:14:32 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PGEFe-0005Aq-9r for qemu-devel@nongnu.org; Wed, 10 Nov 2010 12:14:27 -0500 Received: from mx1.redhat.com ([209.132.183.28]:18170) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PGEFe-00059f-1e for qemu-devel@nongnu.org; Wed, 10 Nov 2010 12:14:26 -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 oAAHEN1n022701 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Wed, 10 Nov 2010 12:14:23 -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 oAAHEMf5014598; Wed, 10 Nov 2010 12:14:22 -0500 Received: by dhcp-1-237.tlv.redhat.com (Postfix, from userid 13519) id 06A63133A05; Wed, 10 Nov 2010 19:14:22 +0200 (IST) From: Gleb Natapov To: qemu-devel@nongnu.org Date: Wed, 10 Nov 2010 19:14:11 +0200 Message-Id: <1289409261-5418-5-git-send-email-gleb@redhat.com> In-Reply-To: <1289409261-5418-1-git-send-email-gleb@redhat.com> References: <1289409261-5418-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: blauwirbel@gmail.com, alex.williamson@redhat.com, armbru@redhat.com, kvm@vger.kernel.org, mst@redhat.com Subject: [Qemu-devel] [PATCHv3 04/14] Add get_fw_dev_path callback to ISA bus in qdev. 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 Use device ioports to create unique device path. Signed-off-by: Gleb Natapov --- hw/isa-bus.c | 15 +++++++++++++++ 1 files changed, 15 insertions(+), 0 deletions(-) diff --git a/hw/isa-bus.c b/hw/isa-bus.c index c0ac7e9..741d28e 100644 --- a/hw/isa-bus.c +++ b/hw/isa-bus.c @@ -31,11 +31,13 @@ static ISABus *isabus; target_phys_addr_t isa_mem_base = 0; static void isabus_dev_print(Monitor *mon, DeviceState *dev, int indent); +static char *isabus_get_fw_dev_path(DeviceState *dev); static struct BusInfo isa_bus_info = { .name = "ISA", .size = sizeof(ISABus), .print_dev = isabus_dev_print, + .get_fw_dev_path = isabus_get_fw_dev_path, }; ISABus *isa_bus_new(DeviceState *dev) @@ -188,4 +190,17 @@ static void isabus_register_devices(void) sysbus_register_withprop(&isabus_bridge_info); } +static char *isabus_get_fw_dev_path(DeviceState *dev) +{ + ISADevice *d = (ISADevice*)dev; + char path[40]; + int off; + + off = snprintf(path, sizeof(path), "%s", qdev_fw_name(dev)); + if (d->nioports) + snprintf(path + off, sizeof(path) - off, "@%04x", d->ioports[0]); + + return strdup(path); +} + device_init(isabus_register_devices)