From f6c64e0eea46f4083afd6f7c281cb24a3c1e2021 Mon Sep 17 00:00:00 2001 From: Gerd Hoffmann Date: Mon, 3 Aug 2009 15:03:09 +0200 Subject: [PATCH] rename "info qdrv" to "info qdm" As requested by avi: driver != device model. Signed-off-by: Gerd Hoffmann Signed-off-by: Anthony Liguori Message-Id: --- hw/qdev.c | 2 +- hw/qdev.h | 4 +++- monitor.c | 4 ++-- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/hw/qdev.c b/hw/qdev.c index ed51ee998b..c1a7779001 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 0400f32ba0..5016968e86 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 4b270d98f6..362322b246 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, }, };