[PATCH v2] qapi/migration: Fix examples document wrong field name for arguments

Fabian Holler posted 1 patch 2 years, 2 months ago
Patches applied successfully (tree, apply log)
git fetch https://github.com/patchew-project/qemu tags/patchew/20220222170116.63105-1-fabian.holler@simplesurance.de
Test checkpatch passed
Maintainers: Eric Blake <eblake@redhat.com>, Markus Armbruster <armbru@redhat.com>, Juan Quintela <quintela@redhat.com>, "Dr. David Alan Gilbert" <dgilbert@redhat.com>
qapi/migration.json | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
[PATCH v2] qapi/migration: Fix examples document wrong field name for arguments
Posted by Fabian Holler 2 years, 2 months ago
The examples for the snapshot-* and calc-dirty-rate commands document
that arguments for the commands are passed in a 'data' field.
This is wrong, passing them in a "data" field results in
the error:
  {"error": {"class": "GenericError", "desc": "QMP input member 'data'
		       is unexpected"}}
Arguments are expected to be passed in an field called "arguments".

Replace "data" with "arguments" in the snapshot-* and calc-dirty-rate
command examples.

Signed-off-by: Fabian Holler <fabian.holler@simplesurance.de>
---
v2:
  - adapted to Markus Armbruster's suggestions:
    - fix same issue in calc-dirty-rate example
    - improve commit message
v1: 
  https://lists.nongnu.org/archive/html/qemu-devel/2022-02/msg04818.html
---
 qapi/migration.json | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/qapi/migration.json b/qapi/migration.json
index 5975a0e104..18e2610e88 100644
--- a/qapi/migration.json
+++ b/qapi/migration.json
@@ -1843,8 +1843,8 @@
 # Since: 5.2
 #
 # Example:
-#   {"command": "calc-dirty-rate", "data": {"calc-time": 1,
-#                                           'sample-pages': 512} }
+#   {"command": "calc-dirty-rate", "arguments": {"calc-time": 1,
+#                                                'sample-pages': 512} }
 #
 ##
 { 'command': 'calc-dirty-rate', 'data': {'calc-time': 'int64',
@@ -1888,7 +1888,7 @@
 # Example:
 #
 # -> { "execute": "snapshot-save",
-#      "data": {
+#      "arguments": {
 #         "job-id": "snapsave0",
 #         "tag": "my-snap",
 #         "vmstate": "disk0",
@@ -1949,7 +1949,7 @@
 # Example:
 #
 # -> { "execute": "snapshot-load",
-#      "data": {
+#      "arguments": {
 #         "job-id": "snapload0",
 #         "tag": "my-snap",
 #         "vmstate": "disk0",
@@ -2002,7 +2002,7 @@
 # Example:
 #
 # -> { "execute": "snapshot-delete",
-#      "data": {
+#      "arguments": {
 #         "job-id": "snapdelete0",
 #         "tag": "my-snap",
 #         "devices": ["disk0", "disk1"]
-- 
2.35.1


Re: [PATCH v2] qapi/migration: Fix examples document wrong field name for arguments
Posted by Markus Armbruster 2 years, 2 months ago
Fabian Holler <fabian.holler@simplesurance.de> writes:

> The examples for the snapshot-* and calc-dirty-rate commands document
> that arguments for the commands are passed in a 'data' field.
> This is wrong, passing them in a "data" field results in
> the error:
>   {"error": {"class": "GenericError", "desc": "QMP input member 'data'
> 		       is unexpected"}}
> Arguments are expected to be passed in an field called "arguments".
>
> Replace "data" with "arguments" in the snapshot-* and calc-dirty-rate
> command examples.
>
> Signed-off-by: Fabian Holler <fabian.holler@simplesurance.de>

Reviewed-by: Markus Armbruster <armbru@redhat.com>

Queued, thanks!