From patchwork Mon Dec 6 13:54:35 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gleb Natapov X-Patchwork-Id: 74346 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 26822B70AF for ; Tue, 7 Dec 2010 00:56:16 +1100 (EST) Received: from localhost ([127.0.0.1]:37071 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PPbY5-0002uT-7z for incoming@patchwork.ozlabs.org; Mon, 06 Dec 2010 08:56:13 -0500 Received: from [140.186.70.92] (port=46022 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PPbWp-0002qh-VB for qemu-devel@nongnu.org; Mon, 06 Dec 2010 08:54:58 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PPbWo-00021t-UE for qemu-devel@nongnu.org; Mon, 06 Dec 2010 08:54:55 -0500 Received: from mx1.redhat.com ([209.132.183.28]:15317) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PPbWo-00021Q-Ne for qemu-devel@nongnu.org; Mon, 06 Dec 2010 08:54:54 -0500 Received: from int-mx01.intmail.prod.int.phx2.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id oB6Dsn0r031688 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Mon, 6 Dec 2010 08:54:49 -0500 Received: from dhcp-1-237.tlv.redhat.com (dhcp-1-237.tlv.redhat.com [10.35.1.237]) by int-mx01.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id oB6DsmJ3010259; Mon, 6 Dec 2010 08:54:48 -0500 Received: by dhcp-1-237.tlv.redhat.com (Postfix, from userid 13519) id F23B918D39F; Mon, 6 Dec 2010 15:54:47 +0200 (IST) From: Gleb Natapov To: qemu-devel@nongnu.org Date: Mon, 6 Dec 2010 15:54:35 +0200 Message-Id: <1291643687-32232-5-git-send-email-gleb@redhat.com> In-Reply-To: <1291643687-32232-1-git-send-email-gleb@redhat.com> References: <1291643687-32232-1-git-send-email-gleb@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.11 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. Cc: blauwirbel@gmail.com, kevin@koconnor.net, kvm@vger.kernel.org Subject: [Qemu-devel] [PATCHv7 04/16] 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 | 16 ++++++++++++++++ 1 files changed, 16 insertions(+), 0 deletions(-) diff --git a/hw/isa-bus.c b/hw/isa-bus.c index c0ac7e9..c423c1b 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,18 @@ 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)