From patchwork Sun Oct 31 11:40:04 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gleb Natapov X-Patchwork-Id: 69706 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 2639A1007D3 for ; Sun, 31 Oct 2010 22:43:35 +1100 (EST) Received: from localhost ([127.0.0.1]:41148 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PCWJv-0000e5-BO for incoming@patchwork.ozlabs.org; Sun, 31 Oct 2010 07:43:31 -0400 Received: from [140.186.70.92] (port=55387 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PCWGn-0007jy-Lu for qemu-devel@nongnu.org; Sun, 31 Oct 2010 07:40:19 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PCWGm-0008Dz-GQ for qemu-devel@nongnu.org; Sun, 31 Oct 2010 07:40:17 -0400 Received: from mx1.redhat.com ([209.132.183.28]:59320) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PCWGm-0008Dp-9q for qemu-devel@nongnu.org; Sun, 31 Oct 2010 07:40:16 -0400 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 o9VBeCrP020010 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Sun, 31 Oct 2010 07:40:12 -0400 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 o9VBeAGS001775; Sun, 31 Oct 2010 07:40:11 -0400 Received: by dhcp-1-237.tlv.redhat.com (Postfix, from userid 13519) id EBEF918D471; Sun, 31 Oct 2010 13:40:09 +0200 (IST) From: Gleb Natapov To: qemu-devel@nongnu.org Date: Sun, 31 Oct 2010 13:40:04 +0200 Message-Id: <1288525209-3303-4-git-send-email-gleb@redhat.com> In-Reply-To: <1288525209-3303-1-git-send-email-gleb@redhat.com> References: <1288525209-3303-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 Subject: [Qemu-devel] [PATCHv2 3/8] Add get_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 c1275e8..c523302 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_dev_path(DeviceState *dev); static struct BusInfo isa_bus_info = { .name = "ISA", .size = sizeof(ISABus), .print_dev = isabus_dev_print, + .get_dev_path = isabus_get_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_dev_path(DeviceState *dev) +{ + ISADevice *d = (ISADevice*)dev; + char path[40]; + int off; + + off = snprintf(path, sizeof(path), "%s", qdev_driver_name(dev)); + if (d->nioports) + snprintf(path + off, sizeof(path) - off, "@%04x", d->ioports[0]); + + return strdup(path); +} + device_init(isabus_register_devices)