@@ -107,8 +107,11 @@ DeviceState *qdev_create(BusState *bus, const char *name)
static int qdev_print_devinfo(DeviceInfo *info, char *dest, int len)
{
+ static const char *capname[] = {
+ };
+ const char *sep;
int pos = 0;
- int ret;
+ int ret,i;
ret = snprintf(dest+pos, len-pos, "name \"%s\", bus %s",
info->name, info->bus_info->name);
@@ -125,6 +128,20 @@ static int qdev_print_devinfo(DeviceInfo *info, char *dest, int len)
ret = snprintf(dest+pos, len-pos, ", no-user");
pos += MIN(len-pos,ret);
}
+ if (info->caps) {
+ ret = snprintf(dest+pos, len-pos, ", caps \"");
+ pos += MIN(len-pos,ret);
+ sep = "";
+ for (i = 0; i < ARRAY_SIZE(capname); i++) {
+ if (!(info->caps & (1 << i)))
+ continue;
+ ret = snprintf(dest+pos, len-pos, "%s%s", sep, capname[i]);
+ pos += MIN(len-pos,ret);
+ sep = ",";
+ }
+ ret = snprintf(dest+pos, len-pos, "\"");
+ pos += MIN(len-pos,ret);
+ }
return pos;
}
@@ -102,6 +102,10 @@ typedef int (*qdev_initfn)(DeviceState *dev, DeviceInfo *info);
typedef void (*SCSIAttachFn)(DeviceState *host, BlockDriverState *bdrv,
int unit);
+enum DeviceCapBits {
+ dummy
+};
+
struct DeviceInfo {
const char *name;
const char *alias;
@@ -109,6 +113,7 @@ struct DeviceInfo {
size_t size;
Property *props;
int no_user;
+ uint32_t caps;
/* Private to qdev / bus. */
qdev_initfn init;
This patch adds device capabilities to qdev devices. This is the core code, following patches will add the individual capabilities and tag drivers. The capabilities will be printed by '-device ?' and 'info qdm", so users and management apps can use it. Future plans: I plan to use them to get rid off some hard-coded lists in qemu by using capabilities instead: pci nic list, watchdog list, maybe more. Signed-off-by: Gerd Hoffmann <kraxel@redhat.com> --- hw/qdev.c | 19 ++++++++++++++++++- hw/qdev.h | 5 +++++ 2 files changed, 23 insertions(+), 1 deletions(-)