qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Orit Wasserman <owasserm@redhat.com>
To: qemu-devel@nongnu.org
Cc: Orit Wasserman <owasserm@redhat.com>,
	lcapitulino@redhat.com, armbru@redhat.com, quintela@redhat.com
Subject: [Qemu-devel] [PATCH] Fix query-migrate documentation in qmp-commands.hx
Date: Thu,  8 Aug 2013 11:46:14 +0300	[thread overview]
Message-ID: <1375951574-1014-1-git-send-email-owasserm@redhat.com> (raw)

"ram" is present also when migration completes.
total-time and downtime are no longer part of "ram" data.

Signed-off-by: Orit Wasserman <owasserm@redhat.com>
---
 qmp-commands.hx | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/qmp-commands.hx b/qmp-commands.hx
index 2e59b0d..1d43f4c 100644
--- a/qmp-commands.hx
+++ b/qmp-commands.hx
@@ -2626,8 +2626,8 @@ The main json-object contains the following:
 - "expected-downtime": only present while migration is active
                 total amount in ms for downtime that was calculated on
                 the last bitmap round (json-int)
-- "ram": only present if "status" is "active", it is a json-object with the
-  following RAM information:
+- "ram": only present if "status" is "active" or "complete", it is a
+         json-object with the following RAM information:
          - "transferred": amount transferred in bytes (json-int)
          - "remaining": amount remaining to transfer in bytes (json-int)
          - "total": total amount of memory in bytes (json-int)
@@ -2669,12 +2669,12 @@ Examples:
 -> { "execute": "query-migrate" }
 <- { "return": {
         "status": "completed",
+        "total-time":12345,
+        "downtime":12345,
         "ram":{
           "transferred":123,
           "remaining":123,
           "total":246,
-          "total-time":12345,
-          "downtime":12345,
           "duplicate":123,
           "normal":123,
           "normal-bytes":123456
@@ -2693,11 +2693,11 @@ Examples:
 <- {
       "return":{
          "status":"active",
+         "total-time":12345,
          "ram":{
             "transferred":123,
             "remaining":123,
             "total":246,
-            "total-time":12345,
             "expected-downtime":12345,
             "duplicate":123,
             "normal":123,
@@ -2712,11 +2712,11 @@ Examples:
 <- {
       "return":{
          "status":"active",
+         "total-time":12345,
          "ram":{
             "total":1057024,
             "remaining":1053304,
             "transferred":3720,
-            "total-time":12345,
             "expected-downtime":12345,
             "duplicate":123,
             "normal":123,
@@ -2736,12 +2736,12 @@ Examples:
 <- {
       "return":{
          "status":"active",
+         "total-time":12345,
          "capabilities" : [ { "capability": "xbzrle", "state" : true } ],
          "ram":{
             "total":1057024,
             "remaining":1053304,
             "transferred":3720,
-            "total-time":12345,
             "expected-downtime":12345,
             "duplicate":10,
             "normal":3333,
-- 
1.8.1.4

             reply	other threads:[~2013-08-08  8:46 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-08-08  8:46 Orit Wasserman [this message]
2013-08-08 12:46 ` [Qemu-devel] [PATCH] Fix query-migrate documentation in qmp-commands.hx Eric Blake
2013-08-08 14:50 ` Luiz Capitulino
2013-08-08 16:47   ` Orit Wasserman
2013-08-08 16:53     ` Luiz Capitulino

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1375951574-1014-1-git-send-email-owasserm@redhat.com \
    --to=owasserm@redhat.com \
    --cc=armbru@redhat.com \
    --cc=lcapitulino@redhat.com \
    --cc=qemu-devel@nongnu.org \
    --cc=quintela@redhat.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
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).