* [Qemu-devel] [PATCH v2] qapi/hmp: use 'backend' instead of 'device' with memory backend
@ 2014-06-19 14:14 Igor Mammedov
2014-06-19 19:21 ` Luiz Capitulino
0 siblings, 1 reply; 4+ messages in thread
From: Igor Mammedov @ 2014-06-19 14:14 UTC (permalink / raw)
To: qemu-devel; +Cc: hutao, mst, lcapitulino
fixup documentation comments and HMP message/help text
Signed-off-by: Igor Mammedov <imammedo@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
---
v2:
- add "##" above "# @PCDIMMDeviceInfo:"
PS: based on PCI tree
---
hmp.c | 2 +-
monitor.c | 2 +-
qapi-schema.json | 12 +++++++-----
3 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/hmp.c b/hmp.c
index 41006f5..e183a79 100644
--- a/hmp.c
+++ b/hmp.c
@@ -1692,7 +1692,7 @@ void hmp_info_memdev(Monitor *mon, const QDict *qdict)
ov = string_output_visitor_new(false);
visit_type_uint16List(string_output_get_visitor(ov),
&m->value->host_nodes, NULL, NULL);
- monitor_printf(mon, "memory device %d\n", i);
+ monitor_printf(mon, "memory backend: %d\n", i);
monitor_printf(mon, " size: %" PRId64 "\n", m->value->size);
monitor_printf(mon, " merge: %s\n",
m->value->merge ? "true" : "false");
diff --git a/monitor.c b/monitor.c
index c7f8797..8c17f89 100644
--- a/monitor.c
+++ b/monitor.c
@@ -2968,7 +2968,7 @@ static mon_cmd_t info_cmds[] = {
.name = "memdev",
.args_type = "",
.params = "",
- .help = "show the memory device",
+ .help = "show memory backends",
.mhandler.cmd = hmp_info_memdev,
},
{
diff --git a/qapi-schema.json b/qapi-schema.json
index 9835004..f490403 100644
--- a/qapi-schema.json
+++ b/qapi-schema.json
@@ -3158,19 +3158,19 @@
##
# @Memdev:
#
-# Information of memory device
+# Information about memory backend
#
-# @size: memory device size
+# @size: memory backend size
#
# @merge: enables or disables memory merge support
#
-# @dump: includes memory device's memory in a core dump or not
+# @dump: includes memory backend's memory in a core dump or not
#
# @prealloc: enables or disables memory preallocation
#
# @host-nodes: host nodes for its memory policy
#
-# @policy: memory policy of memory device
+# @policy: memory policy of memory backend
#
# Since: 2.1
##
@@ -3187,13 +3187,15 @@
##
# @query-memdev:
#
-# Returns information for all memory devices.
+# Returns information for all memory backends.
#
# Returns: a list of @Memdev.
#
# Since: 2.1
##
{ 'command': 'query-memdev', 'returns': ['Memdev'] }
+
+##
# @PCDIMMDeviceInfo:
#
# PCDIMMDevice state information
--
1.9.3
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [Qemu-devel] [PATCH v2] qapi/hmp: use 'backend' instead of 'device' with memory backend
2014-06-19 14:14 [Qemu-devel] [PATCH v2] qapi/hmp: use 'backend' instead of 'device' with memory backend Igor Mammedov
@ 2014-06-19 19:21 ` Luiz Capitulino
2014-06-19 19:26 ` Michael S. Tsirkin
0 siblings, 1 reply; 4+ messages in thread
From: Luiz Capitulino @ 2014-06-19 19:21 UTC (permalink / raw)
To: Igor Mammedov; +Cc: hutao, qemu-devel, mst
On Thu, 19 Jun 2014 16:14:43 +0200
Igor Mammedov <imammedo@redhat.com> wrote:
> fixup documentation comments and HMP message/help text
Doesn't apply anymore on top of my branch:
git://repo.or.cz/qemu/qmp-unstable.git queue/qmp
I might be able to include it in the next pull request if you rebase on time.
>
> Signed-off-by: Igor Mammedov <imammedo@redhat.com>
> Reviewed-by: Eric Blake <eblake@redhat.com>
> ---
> v2:
> - add "##" above "# @PCDIMMDeviceInfo:"
>
> PS: based on PCI tree
> ---
> hmp.c | 2 +-
> monitor.c | 2 +-
> qapi-schema.json | 12 +++++++-----
> 3 files changed, 9 insertions(+), 7 deletions(-)
>
> diff --git a/hmp.c b/hmp.c
> index 41006f5..e183a79 100644
> --- a/hmp.c
> +++ b/hmp.c
> @@ -1692,7 +1692,7 @@ void hmp_info_memdev(Monitor *mon, const QDict *qdict)
> ov = string_output_visitor_new(false);
> visit_type_uint16List(string_output_get_visitor(ov),
> &m->value->host_nodes, NULL, NULL);
> - monitor_printf(mon, "memory device %d\n", i);
> + monitor_printf(mon, "memory backend: %d\n", i);
> monitor_printf(mon, " size: %" PRId64 "\n", m->value->size);
> monitor_printf(mon, " merge: %s\n",
> m->value->merge ? "true" : "false");
> diff --git a/monitor.c b/monitor.c
> index c7f8797..8c17f89 100644
> --- a/monitor.c
> +++ b/monitor.c
> @@ -2968,7 +2968,7 @@ static mon_cmd_t info_cmds[] = {
> .name = "memdev",
> .args_type = "",
> .params = "",
> - .help = "show the memory device",
> + .help = "show memory backends",
> .mhandler.cmd = hmp_info_memdev,
> },
> {
> diff --git a/qapi-schema.json b/qapi-schema.json
> index 9835004..f490403 100644
> --- a/qapi-schema.json
> +++ b/qapi-schema.json
> @@ -3158,19 +3158,19 @@
> ##
> # @Memdev:
> #
> -# Information of memory device
> +# Information about memory backend
> #
> -# @size: memory device size
> +# @size: memory backend size
> #
> # @merge: enables or disables memory merge support
> #
> -# @dump: includes memory device's memory in a core dump or not
> +# @dump: includes memory backend's memory in a core dump or not
> #
> # @prealloc: enables or disables memory preallocation
> #
> # @host-nodes: host nodes for its memory policy
> #
> -# @policy: memory policy of memory device
> +# @policy: memory policy of memory backend
> #
> # Since: 2.1
> ##
> @@ -3187,13 +3187,15 @@
> ##
> # @query-memdev:
> #
> -# Returns information for all memory devices.
> +# Returns information for all memory backends.
> #
> # Returns: a list of @Memdev.
> #
> # Since: 2.1
> ##
> { 'command': 'query-memdev', 'returns': ['Memdev'] }
> +
> +##
> # @PCDIMMDeviceInfo:
> #
> # PCDIMMDevice state information
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [Qemu-devel] [PATCH v2] qapi/hmp: use 'backend' instead of 'device' with memory backend
2014-06-19 19:21 ` Luiz Capitulino
@ 2014-06-19 19:26 ` Michael S. Tsirkin
2014-06-19 19:28 ` Luiz Capitulino
0 siblings, 1 reply; 4+ messages in thread
From: Michael S. Tsirkin @ 2014-06-19 19:26 UTC (permalink / raw)
To: Luiz Capitulino; +Cc: Igor Mammedov, qemu-devel, hutao
On Thu, Jun 19, 2014 at 03:21:22PM -0400, Luiz Capitulino wrote:
> On Thu, 19 Jun 2014 16:14:43 +0200
> Igor Mammedov <imammedo@redhat.com> wrote:
>
> > fixup documentation comments and HMP message/help text
>
> Doesn't apply anymore on top of my branch:
>
> git://repo.or.cz/qemu/qmp-unstable.git queue/qmp
>
> I might be able to include it in the next pull request if you rebase on time.
See below, it's for pci tree.
> >
> > Signed-off-by: Igor Mammedov <imammedo@redhat.com>
> > Reviewed-by: Eric Blake <eblake@redhat.com>
> > ---
> > v2:
> > - add "##" above "# @PCDIMMDeviceInfo:"
> >
> > PS: based on PCI tree
> > ---
> > hmp.c | 2 +-
> > monitor.c | 2 +-
> > qapi-schema.json | 12 +++++++-----
> > 3 files changed, 9 insertions(+), 7 deletions(-)
> >
> > diff --git a/hmp.c b/hmp.c
> > index 41006f5..e183a79 100644
> > --- a/hmp.c
> > +++ b/hmp.c
> > @@ -1692,7 +1692,7 @@ void hmp_info_memdev(Monitor *mon, const QDict *qdict)
> > ov = string_output_visitor_new(false);
> > visit_type_uint16List(string_output_get_visitor(ov),
> > &m->value->host_nodes, NULL, NULL);
> > - monitor_printf(mon, "memory device %d\n", i);
> > + monitor_printf(mon, "memory backend: %d\n", i);
> > monitor_printf(mon, " size: %" PRId64 "\n", m->value->size);
> > monitor_printf(mon, " merge: %s\n",
> > m->value->merge ? "true" : "false");
> > diff --git a/monitor.c b/monitor.c
> > index c7f8797..8c17f89 100644
> > --- a/monitor.c
> > +++ b/monitor.c
> > @@ -2968,7 +2968,7 @@ static mon_cmd_t info_cmds[] = {
> > .name = "memdev",
> > .args_type = "",
> > .params = "",
> > - .help = "show the memory device",
> > + .help = "show memory backends",
> > .mhandler.cmd = hmp_info_memdev,
> > },
> > {
> > diff --git a/qapi-schema.json b/qapi-schema.json
> > index 9835004..f490403 100644
> > --- a/qapi-schema.json
> > +++ b/qapi-schema.json
> > @@ -3158,19 +3158,19 @@
> > ##
> > # @Memdev:
> > #
> > -# Information of memory device
> > +# Information about memory backend
> > #
> > -# @size: memory device size
> > +# @size: memory backend size
> > #
> > # @merge: enables or disables memory merge support
> > #
> > -# @dump: includes memory device's memory in a core dump or not
> > +# @dump: includes memory backend's memory in a core dump or not
> > #
> > # @prealloc: enables or disables memory preallocation
> > #
> > # @host-nodes: host nodes for its memory policy
> > #
> > -# @policy: memory policy of memory device
> > +# @policy: memory policy of memory backend
> > #
> > # Since: 2.1
> > ##
> > @@ -3187,13 +3187,15 @@
> > ##
> > # @query-memdev:
> > #
> > -# Returns information for all memory devices.
> > +# Returns information for all memory backends.
> > #
> > # Returns: a list of @Memdev.
> > #
> > # Since: 2.1
> > ##
> > { 'command': 'query-memdev', 'returns': ['Memdev'] }
> > +
> > +##
> > # @PCDIMMDeviceInfo:
> > #
> > # PCDIMMDevice state information
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [Qemu-devel] [PATCH v2] qapi/hmp: use 'backend' instead of 'device' with memory backend
2014-06-19 19:26 ` Michael S. Tsirkin
@ 2014-06-19 19:28 ` Luiz Capitulino
0 siblings, 0 replies; 4+ messages in thread
From: Luiz Capitulino @ 2014-06-19 19:28 UTC (permalink / raw)
To: Michael S. Tsirkin; +Cc: Igor Mammedov, qemu-devel, hutao
On Thu, 19 Jun 2014 22:26:58 +0300
"Michael S. Tsirkin" <mst@redhat.com> wrote:
> On Thu, Jun 19, 2014 at 03:21:22PM -0400, Luiz Capitulino wrote:
> > On Thu, 19 Jun 2014 16:14:43 +0200
> > Igor Mammedov <imammedo@redhat.com> wrote:
> >
> > > fixup documentation comments and HMP message/help text
> >
> > Doesn't apply anymore on top of my branch:
> >
> > git://repo.or.cz/qemu/qmp-unstable.git queue/qmp
> >
> > I might be able to include it in the next pull request if you rebase on time.
>
> See below, it's for pci tree.
OK then.
>
> > >
> > > Signed-off-by: Igor Mammedov <imammedo@redhat.com>
> > > Reviewed-by: Eric Blake <eblake@redhat.com>
> > > ---
> > > v2:
> > > - add "##" above "# @PCDIMMDeviceInfo:"
> > >
> > > PS: based on PCI tree
> > > ---
> > > hmp.c | 2 +-
> > > monitor.c | 2 +-
> > > qapi-schema.json | 12 +++++++-----
> > > 3 files changed, 9 insertions(+), 7 deletions(-)
> > >
> > > diff --git a/hmp.c b/hmp.c
> > > index 41006f5..e183a79 100644
> > > --- a/hmp.c
> > > +++ b/hmp.c
> > > @@ -1692,7 +1692,7 @@ void hmp_info_memdev(Monitor *mon, const QDict *qdict)
> > > ov = string_output_visitor_new(false);
> > > visit_type_uint16List(string_output_get_visitor(ov),
> > > &m->value->host_nodes, NULL, NULL);
> > > - monitor_printf(mon, "memory device %d\n", i);
> > > + monitor_printf(mon, "memory backend: %d\n", i);
> > > monitor_printf(mon, " size: %" PRId64 "\n", m->value->size);
> > > monitor_printf(mon, " merge: %s\n",
> > > m->value->merge ? "true" : "false");
> > > diff --git a/monitor.c b/monitor.c
> > > index c7f8797..8c17f89 100644
> > > --- a/monitor.c
> > > +++ b/monitor.c
> > > @@ -2968,7 +2968,7 @@ static mon_cmd_t info_cmds[] = {
> > > .name = "memdev",
> > > .args_type = "",
> > > .params = "",
> > > - .help = "show the memory device",
> > > + .help = "show memory backends",
> > > .mhandler.cmd = hmp_info_memdev,
> > > },
> > > {
> > > diff --git a/qapi-schema.json b/qapi-schema.json
> > > index 9835004..f490403 100644
> > > --- a/qapi-schema.json
> > > +++ b/qapi-schema.json
> > > @@ -3158,19 +3158,19 @@
> > > ##
> > > # @Memdev:
> > > #
> > > -# Information of memory device
> > > +# Information about memory backend
> > > #
> > > -# @size: memory device size
> > > +# @size: memory backend size
> > > #
> > > # @merge: enables or disables memory merge support
> > > #
> > > -# @dump: includes memory device's memory in a core dump or not
> > > +# @dump: includes memory backend's memory in a core dump or not
> > > #
> > > # @prealloc: enables or disables memory preallocation
> > > #
> > > # @host-nodes: host nodes for its memory policy
> > > #
> > > -# @policy: memory policy of memory device
> > > +# @policy: memory policy of memory backend
> > > #
> > > # Since: 2.1
> > > ##
> > > @@ -3187,13 +3187,15 @@
> > > ##
> > > # @query-memdev:
> > > #
> > > -# Returns information for all memory devices.
> > > +# Returns information for all memory backends.
> > > #
> > > # Returns: a list of @Memdev.
> > > #
> > > # Since: 2.1
> > > ##
> > > { 'command': 'query-memdev', 'returns': ['Memdev'] }
> > > +
> > > +##
> > > # @PCDIMMDeviceInfo:
> > > #
> > > # PCDIMMDevice state information
>
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2014-06-19 20:13 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-06-19 14:14 [Qemu-devel] [PATCH v2] qapi/hmp: use 'backend' instead of 'device' with memory backend Igor Mammedov
2014-06-19 19:21 ` Luiz Capitulino
2014-06-19 19:26 ` Michael S. Tsirkin
2014-06-19 19:28 ` Luiz Capitulino
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).