[Qemu-devel] [PATCH 1/2] qdev: add user-specified identifier to devices.

[Gerd Hoffmann <kraxel@redhat.com>]

Add id field to DeviceState.  Make qdev_device_add() fill it if supplied
on the command line (i.e. -device foo,id=bar).  Make "info qtree" print it.

This helps users and management apps identifying devices in monitor
output, which is especially useful with otherwise identical devices
such as two virtio disks.

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
 hw/qdev.c |    5 ++++-
 hw/qdev.h |    1 +
 2 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/hw/qdev.c b/hw/qdev.c
index 2b8994a..735fe4e 100644
--- a/hw/qdev.c
+++ b/hw/qdev.c
@@ -145,6 +145,7 @@ DeviceState *qdev_device_add(const char *cmdline)
     qdev = info->bus_info->add(driver, strlen(addr) ? addr : NULL);
 
     if (params) {
+        get_param_value(qdev->id, sizeof(qdev->id), "id", params);
         while (params[0]) {
             if (2 != sscanf(params, "%31[^=]=%255[^,]%n", tag, value, &n)) {
                 fprintf(stderr, "parse error at \"%s\"\n", params);
@@ -153,6 +154,8 @@ DeviceState *qdev_device_add(const char *cmdline)
             params += n;
             if (strcmp(tag, "addr") == 0)
                 continue;
+            if (strcmp(tag, "id") == 0)
+                continue;
             if (-1 == qdev_prop_parse(qdev, tag, value)) {
                 fprintf(stderr, "can't set property \"%s\" to \"%s\" for \"%s\"\n",
                         tag, value, driver);
@@ -308,7 +311,7 @@ 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\n", dev->info->name);
+    qdev_printf("dev: %s, id \"%s\"\n", dev->info->name, dev->id);
     indent += 2;
     if (dev->num_gpio_in) {
         qdev_printf("gpio-in %d\n", dev->num_gpio_in);
diff --git a/hw/qdev.h b/hw/qdev.h
index 8531276..ad3f2a6 100644
--- a/hw/qdev.h
+++ b/hw/qdev.h
@@ -17,6 +17,7 @@ typedef struct BusInfo BusInfo;
 /* This structure should not be accessed directly.  We declare it here
    so that it can be embedded in individual device state structures.  */
 struct DeviceState {
+    char id[32];
     DeviceInfo *info;
     BusState *parent_bus;
     int num_gpio_out;
-- 
1.6.2.5