diff --git a/hw/qdev.c b/hw/qdev.c
index ed51ee998bdaaef4bb84bed3479aca902e38cc6c..c1a77790019935120effa48fca46c6498fbc9ef9 100644
--- a/hw/qdev.c
+++ b/hw/qdev.c
@@ -597,7 +597,7 @@ void do_info_qtree(Monitor *mon)
         qbus_print(mon, main_system_bus, 0);
 }
 
-void do_info_qdrv(Monitor *mon)
+void do_info_qdm(Monitor *mon)
 {
     DeviceInfo *info;
     char msg[256];
diff --git a/hw/qdev.h b/hw/qdev.h
index 0400f32ba033d91df7b69e2ea4a540a4efe2979f..5016968e863f16cbe5804947d61683e9a985432b 100644
--- a/hw/qdev.h
+++ b/hw/qdev.h
@@ -148,7 +148,7 @@ BusState *qbus_create(BusInfo *info, DeviceState *parent, const char *name);
 /*** monitor commands ***/
 
 void do_info_qtree(Monitor *mon);
-void do_info_qdrv(Monitor *mon);
+void do_info_qdm(Monitor *mon);
 
 /*** qdev-properties.c ***/
 
@@ -197,6 +197,8 @@ extern PropertyInfo qdev_prop_pci_devfn;
     DEFINE_PROP(_n, _s, _f, qdev_prop_ptr, void*)
 #define DEFINE_PROP_CHR(_n, _s, _f)             \
     DEFINE_PROP(_n, _s, _f, qdev_prop_chr, CharDriverState*)
+#define DEFINE_PROP_DRIVE(_n, _s, _f)             \
+    DEFINE_PROP(_n, _s, _f, qdev_prop_chr, DriveInfo*)
 #define DEFINE_PROP_MACADDR(_n, _s, _f)         \
     DEFINE_PROP(_n, _s, _f, qdev_prop_macaddr, uint8_t[6])
 
diff --git a/monitor.c b/monitor.c
index 4b270d98f67e95cb235346dd54e86398f331fe3c..362322b246c33698280a2ee85c7344dd95f1d4b5 100644
--- a/monitor.c
+++ b/monitor.c
@@ -1882,8 +1882,8 @@ static const mon_cmd_t info_cmds[] = {
       "", "show balloon information" },
     { "qtree", "", do_info_qtree,
       "", "show device tree" },
-    { "qdrv", "", do_info_qdrv,
-      "", "show qdev driver list" },
+    { "qdm", "", do_info_qdm,
+      "", "show qdev device model list" },
     { NULL, NULL, },
 };