1 files changed, 18 insertions, 1 deletions
diff --git a/hw/qdev.c b/hw/qdev.c
index 479eb72b67..6f05232f74 100644
--- a/hw/qdev.c
+++ b/hw/qdev.c
@@ -105,6 +105,21 @@ DeviceState *qdev_create(BusState *bus, const char *name)
     return dev;
 }
 
+static int qdev_print_devinfo(DeviceInfo *info, char *dest, int len)
+{
+    int pos = 0;
+
+    pos += snprintf(dest+pos, len-pos, "name \"%s\", bus %s",
+                    info->name, info->bus_info->name);
+    if (info->alias)
+        pos += snprintf(dest+pos, len-pos, ", alias \"%s\"", info->alias);
+    if (info->desc)
+        pos += snprintf(dest+pos, len-pos, ", desc \"%s\"", info->desc);
+    if (info->no_user)
+        pos += snprintf(dest+pos, len-pos, ", no-user");
+    return pos;
+}
+
 DeviceState *qdev_device_add(const char *cmdline)
 {
     DeviceInfo *info;
@@ -120,8 +135,10 @@ DeviceState *qdev_device_add(const char *cmdline)
         return NULL;
     }
     if (strcmp(driver, "?") == 0) {
+        char msg[256];
         for (info = device_info_list; info != NULL; info = info->next) {
-            fprintf(stderr, "name \"%s\", bus %s\n", info->name, info->bus_info->name);
+            qdev_print_devinfo(info, msg, sizeof(msg));
+            fprintf(stderr, "%s\n", msg);
         }
         return NULL;
     }