* [Qemu-devel] [RFC PATCH v2] Add HMP command "info memory-devices"
@ 2014-09-10 7:56 Zhu Guihua
2014-09-10 8:38 ` [Qemu-devel] [RESEND RFC " Zhu Guihua
0 siblings, 1 reply; 4+ messages in thread
From: Zhu Guihua @ 2014-09-10 7:56 UTC (permalink / raw)
To: qemu-devel, lcapitulino, imammedo, hani, stefanha, mst
Cc: hutao, isimatu.yasuaki, Zhu Guihua, tangchen
Provides HMP equivalent of QMP query-memory-devices command.
Signed-off-by: Zhu Guihua <zhugh.fnst@cn.fujitsu.com>
---
hmp-commands.hx | 2 ++
hmp.c | 43 +++++++++++++++++++++++++++++++++++++++++++
hmp.h | 1 +
monitor.c | 7 +++++++
4 files changed, 53 insertions(+)
diff --git a/hmp-commands.hx b/hmp-commands.hx
index f859f8d..0b1a4f7 100644
--- a/hmp-commands.hx
+++ b/hmp-commands.hx
@@ -1778,6 +1778,8 @@ show qdev device model list
show roms
@item info tpm
show the TPM device
+@item info memory-devices
+show the memory devices
@end table
ETEXI
diff --git a/hmp.c b/hmp.c
index 40a90da..93c1dfe 100644
--- a/hmp.c
+++ b/hmp.c
@@ -1718,3 +1718,46 @@ void hmp_info_memdev(Monitor *mon, const QDict *qdict)
qapi_free_MemdevList(memdev_list);
}
+
+void hmp_info_memory_devices(Monitor *mon, const QDict *qdict)
+{
+ Error *err = NULL;
+ MemoryDeviceInfoList *list = qmp_query_memory_devices(&err);
+ MemoryDeviceInfoList *elem = list;
+ MemoryDeviceInfo *info;
+ PCDIMMDeviceInfo *di;
+ int i = 0;
+
+ while (elem) {
+ info = elem->value;
+
+ if (info) {
+ switch (info->kind) {
+ case MEMORY_DEVICE_INFO_KIND_DIMM:
+ di = info->dimm;
+
+ monitor_printf(mon, "MemoryDevice %d\n", i);
+ monitor_printf(mon, " %s\n",
+ MemoryDeviceInfoKind_lookup[MEMORY_DEVICE_INFO_KIND_DIMM]);
+ monitor_printf(mon, " id: %s\n", di->id);
+ monitor_printf(mon, " addr: %" PRId64 "\n", di->addr);
+ monitor_printf(mon, " slot: %" PRId64 "\n", di->slot);
+ monitor_printf(mon, " node: %" PRId64 "\n", di->node);
+ monitor_printf(mon, " size: %" PRId64 "\n", di->size);
+ monitor_printf(mon, " memdev: %s\n", di->memdev);
+ monitor_printf(mon, " hotplugged: %s\n",
+ di->hotplugged ? "true" : "false");
+ monitor_printf(mon, " hotpluggable: %s\n",
+ di->hotpluggable ? "true" : "false");
+ break;
+ default:
+ break;
+ }
+ }
+
+ elem = elem->next;
+ i++;
+ }
+
+ qapi_free_MemoryDeviceInfoList(list);
+}
diff --git a/hmp.h b/hmp.h
index 4fd3c4a..4bb5dca 100644
--- a/hmp.h
+++ b/hmp.h
@@ -94,6 +94,7 @@ void hmp_cpu_add(Monitor *mon, const QDict *qdict);
void hmp_object_add(Monitor *mon, const QDict *qdict);
void hmp_object_del(Monitor *mon, const QDict *qdict);
void hmp_info_memdev(Monitor *mon, const QDict *qdict);
+void hmp_info_memory_devices(Monitor *mon, const QDict *qdict);
void object_add_completion(ReadLineState *rs, int nb_args, const char *str);
void object_del_completion(ReadLineState *rs, int nb_args, const char *str);
void device_add_completion(ReadLineState *rs, int nb_args, const char *str);
diff --git a/monitor.c b/monitor.c
index 34cee74..fe88e0d 100644
--- a/monitor.c
+++ b/monitor.c
@@ -2921,6 +2921,13 @@ static mon_cmd_t info_cmds[] = {
.mhandler.cmd = hmp_info_memdev,
},
{
+ .name = "memory-devices",
+ .args_type = "",
+ .params = "",
+ .help = "show memory devices",
+ .mhandler.cmd = hmp_info_memory_devices,
+ },
+ {
.name = NULL,
},
};
--
1.9.3
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [Qemu-devel] [RESEND RFC PATCH v2] Add HMP command "info memory-devices"
2014-09-10 7:56 [Qemu-devel] [RFC PATCH v2] Add HMP command "info memory-devices" Zhu Guihua
@ 2014-09-10 8:38 ` Zhu Guihua
2014-09-11 7:41 ` Markus Armbruster
2014-09-11 10:19 ` Igor Mammedov
0 siblings, 2 replies; 4+ messages in thread
From: Zhu Guihua @ 2014-09-10 8:38 UTC (permalink / raw)
To: qemu-devel, lcapitulino, imammedo, hani, stefanha, mst
Cc: hutao, isimatu.yasuaki, Zhu Guihua, tangchen
This patch provides HMP equivalent of QMP query-memory-devices command. By this command "info memory-devices", user can know all information about hotpluggable memmory device such as id. With id of devices, hot removing hotpluggable memory devices becomes possible by command 'device_del'.
Change log v1 -> v2:
1. fix bug that accessing info->dimm when MemoryDeviceInfo is not PCDIMMDevice.
2. use enum to replace "dimm", and lookup type name in MemoryDeviceInfoKind_lookup[] instead of opencodding it.
Signed-off-by: Zhu Guihua <zhugh.fnst@cn.fujitsu.com>
---
hmp-commands.hx | 2 ++
hmp.c | 43 +++++++++++++++++++++++++++++++++++++++++++
hmp.h | 1 +
monitor.c | 7 +++++++
4 files changed, 53 insertions(+)
diff --git a/hmp-commands.hx b/hmp-commands.hx
index f859f8d..0b1a4f7 100644
--- a/hmp-commands.hx
+++ b/hmp-commands.hx
@@ -1778,6 +1778,8 @@ show qdev device model list
show roms
@item info tpm
show the TPM device
+@item info memory-devices
+show the memory devices
@end table
ETEXI
diff --git a/hmp.c b/hmp.c
index 40a90da..93c1dfe 100644
--- a/hmp.c
+++ b/hmp.c
@@ -1718,3 +1718,46 @@ void hmp_info_memdev(Monitor *mon, const QDict *qdict)
qapi_free_MemdevList(memdev_list);
}
+
+void hmp_info_memory_devices(Monitor *mon, const QDict *qdict)
+{
+ Error *err = NULL;
+ MemoryDeviceInfoList *list = qmp_query_memory_devices(&err);
+ MemoryDeviceInfoList *elem = list;
+ MemoryDeviceInfo *info;
+ PCDIMMDeviceInfo *di;
+ int i = 0;
+
+ while (elem) {
+ info = elem->value;
+
+ if (info) {
+ switch (info->kind) {
+ case MEMORY_DEVICE_INFO_KIND_DIMM:
+ di = info->dimm;
+
+ monitor_printf(mon, "MemoryDevice %d\n", i);
+ monitor_printf(mon, " %s\n",
+ MemoryDeviceInfoKind_lookup[MEMORY_DEVICE_INFO_KIND_DIMM]);
+ monitor_printf(mon, " id: %s\n", di->id);
+ monitor_printf(mon, " addr: %" PRId64 "\n", di->addr);
+ monitor_printf(mon, " slot: %" PRId64 "\n", di->slot);
+ monitor_printf(mon, " node: %" PRId64 "\n", di->node);
+ monitor_printf(mon, " size: %" PRId64 "\n", di->size);
+ monitor_printf(mon, " memdev: %s\n", di->memdev);
+ monitor_printf(mon, " hotplugged: %s\n",
+ di->hotplugged ? "true" : "false");
+ monitor_printf(mon, " hotpluggable: %s\n",
+ di->hotpluggable ? "true" : "false");
+ break;
+ default:
+ break;
+ }
+ }
+
+ elem = elem->next;
+ i++;
+ }
+
+ qapi_free_MemoryDeviceInfoList(list);
+}
diff --git a/hmp.h b/hmp.h
index 4fd3c4a..4bb5dca 100644
--- a/hmp.h
+++ b/hmp.h
@@ -94,6 +94,7 @@ void hmp_cpu_add(Monitor *mon, const QDict *qdict);
void hmp_object_add(Monitor *mon, const QDict *qdict);
void hmp_object_del(Monitor *mon, const QDict *qdict);
void hmp_info_memdev(Monitor *mon, const QDict *qdict);
+void hmp_info_memory_devices(Monitor *mon, const QDict *qdict);
void object_add_completion(ReadLineState *rs, int nb_args, const char *str);
void object_del_completion(ReadLineState *rs, int nb_args, const char *str);
void device_add_completion(ReadLineState *rs, int nb_args, const char *str);
diff --git a/monitor.c b/monitor.c
index 34cee74..fe88e0d 100644
--- a/monitor.c
+++ b/monitor.c
@@ -2921,6 +2921,13 @@ static mon_cmd_t info_cmds[] = {
.mhandler.cmd = hmp_info_memdev,
},
{
+ .name = "memory-devices",
+ .args_type = "",
+ .params = "",
+ .help = "show memory devices",
+ .mhandler.cmd = hmp_info_memory_devices,
+ },
+ {
.name = NULL,
},
};
--
1.9.3
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [Qemu-devel] [RESEND RFC PATCH v2] Add HMP command "info memory-devices"
2014-09-10 8:38 ` [Qemu-devel] [RESEND RFC " Zhu Guihua
@ 2014-09-11 7:41 ` Markus Armbruster
2014-09-11 10:19 ` Igor Mammedov
1 sibling, 0 replies; 4+ messages in thread
From: Markus Armbruster @ 2014-09-11 7:41 UTC (permalink / raw)
To: Zhu Guihua
Cc: mst, hutao, qemu-devel, lcapitulino, isimatu.yasuaki, hani,
stefanha, imammedo, tangchen
Zhu Guihua <zhugh.fnst@cn.fujitsu.com> writes:
> This patch provides HMP equivalent of QMP query-memory-devices command. By this command "info memory-devices", user can know all information about hotpluggable memmory device such as id. With id of devices, hot removing hotpluggable memory devices becomes possible by command 'device_del'.
Please limit commit message line length to around 70 characters.
> Change log v1 -> v2:
> 1. fix bug that accessing info->dimm when MemoryDeviceInfo is not PCDIMMDevice.
> 2. use enum to replace "dimm", and lookup type name in MemoryDeviceInfoKind_lookup[] instead of opencodding it.
Patch versioning information goes...
> Signed-off-by: Zhu Guihua <zhugh.fnst@cn.fujitsu.com>
> ---
... below the --- line.
> hmp-commands.hx | 2 ++
> hmp.c | 43 +++++++++++++++++++++++++++++++++++++++++++
> hmp.h | 1 +
> monitor.c | 7 +++++++
> 4 files changed, 53 insertions(+)
>
> diff --git a/hmp-commands.hx b/hmp-commands.hx
> index f859f8d..0b1a4f7 100644
> --- a/hmp-commands.hx
> +++ b/hmp-commands.hx
> @@ -1778,6 +1778,8 @@ show qdev device model list
> show roms
> @item info tpm
> show the TPM device
> +@item info memory-devices
> +show the memory devices
> @end table
> ETEXI
>
> diff --git a/hmp.c b/hmp.c
> index 40a90da..93c1dfe 100644
> --- a/hmp.c
> +++ b/hmp.c
> @@ -1718,3 +1718,46 @@ void hmp_info_memdev(Monitor *mon, const QDict *qdict)
>
> qapi_free_MemdevList(memdev_list);
> }
> +
> +void hmp_info_memory_devices(Monitor *mon, const QDict *qdict)
> +{
> + Error *err = NULL;
> + MemoryDeviceInfoList *list = qmp_query_memory_devices(&err);
> + MemoryDeviceInfoList *elem = list;
> + MemoryDeviceInfo *info;
> + PCDIMMDeviceInfo *di;
> + int i = 0;
> +
> + while (elem) {
I'd very much prefer
for (elem = list; elem; elem = elem->next) {
because that concentrates the loop control in one place.
Even better, imitate existing code to blend in, like this:
MemoryDeviceInfoList *info_list = qmp_query_memory_devices(&err);
MemoryDeviceInfoList *info;
MemoryDeviceInfo *value;
for (info = info_list; info; info = info->next) {
value = info->value
> + info = elem->value;
> +
> + if (info) {
> + switch (info->kind) {
> + case MEMORY_DEVICE_INFO_KIND_DIMM:
> + di = info->dimm;
> +
> + monitor_printf(mon, "MemoryDevice %d\n", i);
When writing for human readers, please follow the ancient custom to
separate words by space: "Memory device", not "MemoryDevice".
It'sMorePleasingTooReadDon'tYouThink?
> + monitor_printf(mon, " %s\n",
> + MemoryDeviceInfoKind_lookup[MEMORY_DEVICE_INFO_KIND_DIMM]);
The union discriminator info->kind is common to all members. Printing
it should go before the switch, along with the header.
> + monitor_printf(mon, " id: %s\n", di->id);
> + monitor_printf(mon, " addr: %" PRId64 "\n", di->addr);
> + monitor_printf(mon, " slot: %" PRId64 "\n", di->slot);
> + monitor_printf(mon, " node: %" PRId64 "\n", di->node);
> + monitor_printf(mon, " size: %" PRId64 "\n", di->size);
> + monitor_printf(mon, " memdev: %s\n", di->memdev);
> + monitor_printf(mon, " hotplugged: %s\n",
> + di->hotplugged ? "true" : "false");
> + monitor_printf(mon, " hotpluggable: %s\n",
> + di->hotpluggable ? "true" : "false");
> + break;
> + default:
> + break;
> + }
> + }
> +
> + elem = elem->next;
> + i++;
> + }
> +
> + qapi_free_MemoryDeviceInfoList(list);
> +}
> diff --git a/hmp.h b/hmp.h
> index 4fd3c4a..4bb5dca 100644
> --- a/hmp.h
> +++ b/hmp.h
> @@ -94,6 +94,7 @@ void hmp_cpu_add(Monitor *mon, const QDict *qdict);
> void hmp_object_add(Monitor *mon, const QDict *qdict);
> void hmp_object_del(Monitor *mon, const QDict *qdict);
> void hmp_info_memdev(Monitor *mon, const QDict *qdict);
> +void hmp_info_memory_devices(Monitor *mon, const QDict *qdict);
> void object_add_completion(ReadLineState *rs, int nb_args, const char *str);
> void object_del_completion(ReadLineState *rs, int nb_args, const char *str);
> void device_add_completion(ReadLineState *rs, int nb_args, const char *str);
> diff --git a/monitor.c b/monitor.c
> index 34cee74..fe88e0d 100644
> --- a/monitor.c
> +++ b/monitor.c
> @@ -2921,6 +2921,13 @@ static mon_cmd_t info_cmds[] = {
> .mhandler.cmd = hmp_info_memdev,
> },
> {
> + .name = "memory-devices",
> + .args_type = "",
> + .params = "",
> + .help = "show memory devices",
> + .mhandler.cmd = hmp_info_memory_devices,
> + },
> + {
> .name = NULL,
> },
> };
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [Qemu-devel] [RESEND RFC PATCH v2] Add HMP command "info memory-devices"
2014-09-10 8:38 ` [Qemu-devel] [RESEND RFC " Zhu Guihua
2014-09-11 7:41 ` Markus Armbruster
@ 2014-09-11 10:19 ` Igor Mammedov
1 sibling, 0 replies; 4+ messages in thread
From: Igor Mammedov @ 2014-09-11 10:19 UTC (permalink / raw)
To: Zhu Guihua
Cc: mst, hutao, qemu-devel, lcapitulino, isimatu.yasuaki, hani,
stefanha, tangchen
On Wed, 10 Sep 2014 16:38:09 +0800
Zhu Guihua <zhugh.fnst@cn.fujitsu.com> wrote:
> This patch provides HMP equivalent of QMP query-memory-devices command. By this command "info memory-devices", user can know all information about hotpluggable memmory device such as id. With id of devices, hot removing hotpluggable memory devices becomes possible by command 'device_del'.
>
> Change log v1 -> v2:
> 1. fix bug that accessing info->dimm when MemoryDeviceInfo is not PCDIMMDevice.
> 2. use enum to replace "dimm", and lookup type name in MemoryDeviceInfoKind_lookup[] instead of opencodding it.
>
> Signed-off-by: Zhu Guihua <zhugh.fnst@cn.fujitsu.com>
> ---
> hmp-commands.hx | 2 ++
> hmp.c | 43 +++++++++++++++++++++++++++++++++++++++++++
> hmp.h | 1 +
> monitor.c | 7 +++++++
> 4 files changed, 53 insertions(+)
>
> diff --git a/hmp-commands.hx b/hmp-commands.hx
> index f859f8d..0b1a4f7 100644
> --- a/hmp-commands.hx
> +++ b/hmp-commands.hx
> @@ -1778,6 +1778,8 @@ show qdev device model list
> show roms
> @item info tpm
> show the TPM device
> +@item info memory-devices
> +show the memory devices
> @end table
> ETEXI
>
> diff --git a/hmp.c b/hmp.c
> index 40a90da..93c1dfe 100644
> --- a/hmp.c
> +++ b/hmp.c
> @@ -1718,3 +1718,46 @@ void hmp_info_memdev(Monitor *mon, const QDict *qdict)
>
> qapi_free_MemdevList(memdev_list);
> }
> +
> +void hmp_info_memory_devices(Monitor *mon, const QDict *qdict)
> +{
> + Error *err = NULL;
> + MemoryDeviceInfoList *list = qmp_query_memory_devices(&err);
> + MemoryDeviceInfoList *elem = list;
> + MemoryDeviceInfo *info;
> + PCDIMMDeviceInfo *di;
> + int i = 0;
> +
> + while (elem) {
> + info = elem->value;
> +
> + if (info) {
> + switch (info->kind) {
> + case MEMORY_DEVICE_INFO_KIND_DIMM:
> + di = info->dimm;
> +
> + monitor_printf(mon, "MemoryDevice %d\n", i);
> + monitor_printf(mon, " %s\n",
> + MemoryDeviceInfoKind_lookup[MEMORY_DEVICE_INFO_KIND_DIMM]);
> + monitor_printf(mon, " id: %s\n", di->id);
> + monitor_printf(mon, " addr: %" PRId64 "\n", di->addr);
printing address in hex would be better
> + monitor_printf(mon, " slot: %" PRId64 "\n", di->slot);
> + monitor_printf(mon, " node: %" PRId64 "\n", di->node);
> + monitor_printf(mon, " size: %" PRId64 "\n", di->size);
> + monitor_printf(mon, " memdev: %s\n", di->memdev);
> + monitor_printf(mon, " hotplugged: %s\n",
> + di->hotplugged ? "true" : "false");
> + monitor_printf(mon, " hotpluggable: %s\n",
> + di->hotpluggable ? "true" : "false");
> + break;
> + default:
> + break;
> + }
> + }
> +
> + elem = elem->next;
> + i++;
> + }
> +
> + qapi_free_MemoryDeviceInfoList(list);
> +}
> diff --git a/hmp.h b/hmp.h
> index 4fd3c4a..4bb5dca 100644
> --- a/hmp.h
> +++ b/hmp.h
> @@ -94,6 +94,7 @@ void hmp_cpu_add(Monitor *mon, const QDict *qdict);
> void hmp_object_add(Monitor *mon, const QDict *qdict);
> void hmp_object_del(Monitor *mon, const QDict *qdict);
> void hmp_info_memdev(Monitor *mon, const QDict *qdict);
> +void hmp_info_memory_devices(Monitor *mon, const QDict *qdict);
> void object_add_completion(ReadLineState *rs, int nb_args, const char *str);
> void object_del_completion(ReadLineState *rs, int nb_args, const char *str);
> void device_add_completion(ReadLineState *rs, int nb_args, const char *str);
> diff --git a/monitor.c b/monitor.c
> index 34cee74..fe88e0d 100644
> --- a/monitor.c
> +++ b/monitor.c
> @@ -2921,6 +2921,13 @@ static mon_cmd_t info_cmds[] = {
> .mhandler.cmd = hmp_info_memdev,
> },
> {
> + .name = "memory-devices",
> + .args_type = "",
> + .params = "",
> + .help = "show memory devices",
> + .mhandler.cmd = hmp_info_memory_devices,
> + },
> + {
> .name = NULL,
> },
> };
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2014-09-11 10:19 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2014-09-10 7:56 [Qemu-devel] [RFC PATCH v2] Add HMP command "info memory-devices" Zhu Guihua
2014-09-10 8:38 ` [Qemu-devel] [RESEND RFC " Zhu Guihua
2014-09-11 7:41 ` Markus Armbruster
2014-09-11 10:19 ` Igor Mammedov
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.