From patchwork Sun Oct 24 14:02:13 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gleb Natapov X-Patchwork-Id: 69036 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 323C5B6F11 for ; Mon, 25 Oct 2010 01:03:38 +1100 (EST) Received: from localhost ([127.0.0.1]:33882 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PA1Ad-0007O2-52 for incoming@patchwork.ozlabs.org; Sun, 24 Oct 2010 10:03:35 -0400 Received: from [140.186.70.92] (port=35246 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PA19N-0007M2-Tm for qemu-devel@nongnu.org; Sun, 24 Oct 2010 10:02:19 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PA19L-0005ar-V5 for qemu-devel@nongnu.org; Sun, 24 Oct 2010 10:02:17 -0400 Received: from mx1.redhat.com ([209.132.183.28]:36639) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PA19L-0005ab-NW for qemu-devel@nongnu.org; Sun, 24 Oct 2010 10:02:15 -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 o9OE2EES017616 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Sun, 24 Oct 2010 10:02:14 -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 o9OE2Dpt006452 for ; Sun, 24 Oct 2010 10:02:14 -0400 Received: by dhcp-1-237.tlv.redhat.com (Postfix, from userid 13519) id 2681818D46F; Sun, 24 Oct 2010 16:02:13 +0200 (IST) From: Gleb Natapov To: qemu-devel@nongnu.org Date: Sun, 24 Oct 2010 16:02:13 +0200 Message-Id: <1287928933-11423-3-git-send-email-gleb@redhat.com> In-Reply-To: <1287928933-11423-1-git-send-email-gleb@redhat.com> References: <1287928933-11423-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. Subject: [Qemu-devel] [PATCH 2/2] 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 | 39 +++++++++++++++++++++++++++++++++++++++ 1 files changed, 39 insertions(+), 0 deletions(-) diff --git a/hw/isa-bus.c b/hw/isa-bus.c index c509d56..ed0b665 100644 --- a/hw/isa-bus.c +++ b/hw/isa-bus.c @@ -32,11 +32,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) @@ -193,4 +195,41 @@ static void isabus_register_devices(void) sysbus_register_withprop(&isabus_bridge_info); } +static int find_range_end(ISADevice *d, int i) +{ + uint16_t p = d->ioports[i++]; + + while (i < d->nioports) { + if (d->ioports[i] - p != 1) { + break; + } + p = d->ioports[i++]; + } + return i - 1; +} + +static char *isabus_get_dev_path(DeviceState *dev) +{ + ISADevice *d = (ISADevice*)dev; + char path[100]; + int i = 0, off = 0; + + while (i < d->nioports) { + int e = find_range_end(d, i); + if (off) + path[off++] = ','; + if (i == e) { + off += snprintf(path + off, sizeof(path) - off, "%04x", + d->ioports[i]); + i++; + } else { + off += snprintf(path + off, sizeof(path) - off, "%04x-%04x", + d->ioports[i], d->ioports[e]); + i = e + 1; + } + } + + return strdup(path); +} + device_init(isabus_register_devices)