From patchwork Tue Jun 15 22:38:28 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kiszka X-Patchwork-Id: 55806 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 7D0221007D3 for ; Wed, 16 Jun 2010 08:41:04 +1000 (EST) Received: from localhost ([127.0.0.1]:38600 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OOeoW-00081n-UE for incoming@patchwork.ozlabs.org; Tue, 15 Jun 2010 18:41:01 -0400 Received: from [140.186.70.92] (port=33340 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OOemj-0007qU-Bn for qemu-devel@nongnu.org; Tue, 15 Jun 2010 18:39:13 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1OOemg-0005W2-SN for qemu-devel@nongnu.org; Tue, 15 Jun 2010 18:39:09 -0400 Received: from fmmailgate01.web.de ([217.72.192.221]:54167) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OOemg-0005VH-Ey for qemu-devel@nongnu.org; Tue, 15 Jun 2010 18:39:06 -0400 Received: from smtp04.web.de ( [172.20.0.225]) by fmmailgate01.web.de (Postfix) with ESMTP id C077715FA3EFF; Wed, 16 Jun 2010 00:39:05 +0200 (CEST) Received: from [92.74.52.35] (helo=localhost.localdomain) by smtp04.web.de with asmtp (TLSv1:AES256-SHA:256) (WEB.DE 4.110 #4) id 1OOemf-0003C9-02; Wed, 16 Jun 2010 00:39:05 +0200 From: Jan Kiszka To: qemu-devel@nongnu.org, Anthony Liguori Date: Wed, 16 Jun 2010 00:38:28 +0200 Message-Id: X-Mailer: git-send-email 1.6.0.2 In-Reply-To: References: In-Reply-To: References: X-Sender: jan.kiszka@web.de X-Provags-ID: V01U2FsdGVkX19rEIBqtggT8mmtbL1OrpxfrVwEOZR1JV01TAOH t34GxhGGBWOxiVjJcRk1s7IHJbmbfNlLEvRddgo0RpDbEHnW8j lWuOec32c= X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4-2.6 Cc: Juan Quintela , Jan Kiszka , Markus Armbruster , Luiz Capitulino , Blue Swirl , Avi Kivity Subject: [Qemu-devel] [PATCH v4 04/23] qdev: Allow device addressing via 'driver.instance' 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 From: Jan Kiszka Extend qbus_find_dev to allow addressing of devices without an unique id via an optional per-bus instance number. The new formats are 'driver.instance' and 'alias.instance'. Attach this name extension whenever an instantiated device is printed. Signed-off-by: Jan Kiszka --- docs/qdev-device-use.txt | 13 +++++++++++- hw/qdev.c | 48 +++++++++++++++++++++++++++++++++++++-------- 2 files changed, 51 insertions(+), 10 deletions(-) diff --git a/docs/qdev-device-use.txt b/docs/qdev-device-use.txt index f252c8e..58f2630 100644 --- a/docs/qdev-device-use.txt +++ b/docs/qdev-device-use.txt @@ -1,6 +1,6 @@ = How to convert to -device & friends = -=== Specifying Bus and Address on Bus === +=== Specifying Bus, Address on Bus, and Devices === In qdev, each device has a parent bus. Some devices provide one or more buses for children. You can specify a device's parent bus with @@ -20,6 +20,17 @@ bus named pci.0. To put a FOO device into its slot 4, use -device FOO,bus=/i440FX-pcihost/pci.0,addr=4. The abbreviated form bus=pci.0 also works as long as the bus name is unique. +Existing devices can be addressed either via a unique ID if it was +assigned during creation or via the device tree path: + +/full_bus_address/driver_name[.instance_number] + +The instance number counts devices managed by the same driver on a +specifc bus. It is zero-based. + +Example: /i440FX-pcihost/pci.0/e1000.1 addresses the second e1000 +adapter on the bus 'pci.0'. + Note: the USB device address can't be controlled at this time. === Block Devices === diff --git a/hw/qdev.c b/hw/qdev.c index aa25155..f4ae4a6 100644 --- a/hw/qdev.c +++ b/hw/qdev.c @@ -492,12 +492,29 @@ static DeviceState *qdev_find_recursive(BusState *bus, const char *id) return NULL; } +static int qdev_instance_no(DeviceState *dev) +{ + struct DeviceState *sibling; + int instance = 0; + + QLIST_FOREACH(sibling, &dev->parent_bus->children, sibling) { + if (sibling->info == dev->info) { + if (sibling == dev) { + break; + } + instance++; + } + } + return instance; +} + static void qbus_list_bus(DeviceState *dev) { BusState *child; const char *sep = " "; - error_printf("child busses at \"%s\":", dev->info->name); + error_printf("child busses at \"%s.%d\":", + dev->info->name, qdev_instance_no(dev)); QLIST_FOREACH(child, &dev->child_bus, sibling) { error_printf("%s\"%s\"", sep, child->name); sep = ", "; @@ -512,7 +529,8 @@ static void qbus_list_dev(BusState *bus) error_printf("devices at \"%s\":", bus->name); QLIST_FOREACH(dev, &bus->children, sibling) { - error_printf("%s\"%s\"", sep, dev->info->name); + error_printf("%s\"%s.%d\"", sep, dev->info->name, + qdev_instance_no(dev)); sep = ", "; } error_printf("\n"); @@ -530,23 +548,35 @@ static BusState *qbus_find_bus(DeviceState *dev, char *elem) return NULL; } -static DeviceState *qbus_find_dev(BusState *bus, char *elem) +static DeviceState *qbus_find_dev(BusState *bus, const char *elem) { DeviceState *dev; + int instance, n; + char buf[128]; /* * try to match in order: - * (1) driver name - * (2) driver alias, if present + * (1) driver name [.instance] + * (2) driver alias [.instance], if present */ + if (sscanf(elem, "%127[^.].%u", buf, &instance) == 2) { + elem = buf; + } else { + instance = 0; + } + + n = 0; QLIST_FOREACH(dev, &bus->children, sibling) { - if (strcmp(dev->info->name, elem) == 0) { + if (strcmp(dev->info->name, elem) == 0 && n++ == instance) { return dev; } } + + n = 0; QLIST_FOREACH(dev, &bus->children, sibling) { - if (dev->info->alias && strcmp(dev->info->alias, elem) == 0) { + if (dev->info->alias && strcmp(dev->info->alias, elem) == 0 && + n++ == instance) { return dev; } } @@ -710,8 +740,8 @@ static void qdev_print_props(Monitor *mon, DeviceState *dev, Property *props, static void qdev_print(Monitor *mon, DeviceState *dev, int indent) { BusState *child; - qdev_printf("dev: %s, id \"%s\"\n", dev->info->name, - dev->id ? dev->id : ""); + qdev_printf("dev: %s.%d, id \"%s\"\n", dev->info->name, + qdev_instance_no(dev), dev->id ? dev->id : ""); indent += 2; if (dev->num_gpio_in) { qdev_printf("gpio-in %d\n", dev->num_gpio_in);