* [Qemu-devel] [PATCH v2] Fix query-migrate documentation in qmp-commands.hx
@ 2013-08-08 17:05 Orit Wasserman
2013-08-08 18:41 ` Eric Blake
2013-08-12 14:19 ` Luiz Capitulino
0 siblings, 2 replies; 6+ messages in thread
From: Orit Wasserman @ 2013-08-08 17:05 UTC (permalink / raw)
To: qemu-devel; +Cc: Orit Wasserman, lcapitulino, armbru, quintela
"ram" is present also when migration completes.
expected-downtime, total-time and downtime are no longer part of "ram" data.
Signed-off-by: Orit Wasserman <owasserm@redhat.com>
---
qmp-commands.hx | 20 ++++++++++----------
1 file changed, 10 insertions(+), 10 deletions(-)
diff --git a/qmp-commands.hx b/qmp-commands.hx
index 2e59b0d..a22a841 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,12 +2693,12 @@ Examples:
<- {
"return":{
"status":"active",
+ "total-time":12345,
+ "expected-downtime":12345,
"ram":{
"transferred":123,
"remaining":123,
"total":246,
- "total-time":12345,
- "expected-downtime":12345,
"duplicate":123,
"normal":123,
"normal-bytes":123456
@@ -2712,12 +2712,12 @@ Examples:
<- {
"return":{
"status":"active",
+ "total-time":12345,
+ "expected-downtime":12345,
"ram":{
"total":1057024,
"remaining":1053304,
"transferred":3720,
- "total-time":12345,
- "expected-downtime":12345,
"duplicate":123,
"normal":123,
"normal-bytes":123456
@@ -2736,13 +2736,13 @@ Examples:
<- {
"return":{
"status":"active",
+ "total-time":12345,
+ "expected-downtime":12345,
"capabilities" : [ { "capability": "xbzrle", "state" : true } ],
"ram":{
"total":1057024,
"remaining":1053304,
"transferred":3720,
- "total-time":12345,
- "expected-downtime":12345,
"duplicate":10,
"normal":3333,
"normal-bytes":3412992
--
1.8.1.4
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [Qemu-devel] [PATCH v2] Fix query-migrate documentation in qmp-commands.hx
2013-08-08 17:05 [Qemu-devel] [PATCH v2] Fix query-migrate documentation in qmp-commands.hx Orit Wasserman
@ 2013-08-08 18:41 ` Eric Blake
2013-08-08 21:31 ` Michael R. Hines
2013-08-12 14:19 ` Luiz Capitulino
1 sibling, 1 reply; 6+ messages in thread
From: Eric Blake @ 2013-08-08 18:41 UTC (permalink / raw)
To: Orit Wasserman
Cc: armbru, quintela, Michael R. Hines, qemu-devel, lcapitulino
[-- Attachment #1: Type: text/plain, Size: 701 bytes --]
On 08/08/2013 11:05 AM, Orit Wasserman wrote:
> "ram" is present also when migration completes.
> expected-downtime, total-time and downtime are no longer part of "ram" data.
>
> Signed-off-by: Orit Wasserman <owasserm@redhat.com>
> ---
> qmp-commands.hx | 20 ++++++++++----------
> 1 file changed, 10 insertions(+), 10 deletions(-)
Reviewed-by: Eric Blake <eblake@redhat.com>
Although this points out that Michael's patch that added 'setup-time' in
commit ed4fbd1 is missing the corresponding documentation here (my bad
for not catching that while reviewing his patch).
--
Eric Blake eblake redhat com +1-919-301-3266
Libvirt virtualization library http://libvirt.org
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 621 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [Qemu-devel] [PATCH v2] Fix query-migrate documentation in qmp-commands.hx
2013-08-08 18:41 ` Eric Blake
@ 2013-08-08 21:31 ` Michael R. Hines
0 siblings, 0 replies; 6+ messages in thread
From: Michael R. Hines @ 2013-08-08 21:31 UTC (permalink / raw)
To: Eric Blake
Cc: quintela, armbru, qemu-devel, lcapitulino, Orit Wasserman,
Michael R. Hines
On 08/08/2013 02:41 PM, Eric Blake wrote:
> On 08/08/2013 11:05 AM, Orit Wasserman wrote:
>> "ram" is present also when migration completes.
>> expected-downtime, total-time and downtime are no longer part of "ram" data.
>>
>> Signed-off-by: Orit Wasserman <owasserm@redhat.com>
>> ---
>> qmp-commands.hx | 20 ++++++++++----------
>> 1 file changed, 10 insertions(+), 10 deletions(-)
> Reviewed-by: Eric Blake <eblake@redhat.com>
>
> Although this points out that Michael's patch that added 'setup-time' in
> commit ed4fbd1 is missing the corresponding documentation here (my bad
> for not catching that while reviewing his patch).
>
Ooops. Will get a patch for that into my tree and submit it in my next
series.
- Michael
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [Qemu-devel] [PATCH v2] Fix query-migrate documentation in qmp-commands.hx
2013-08-08 17:05 [Qemu-devel] [PATCH v2] Fix query-migrate documentation in qmp-commands.hx Orit Wasserman
2013-08-08 18:41 ` Eric Blake
@ 2013-08-12 14:19 ` Luiz Capitulino
2013-08-19 18:41 ` Luiz Capitulino
1 sibling, 1 reply; 6+ messages in thread
From: Luiz Capitulino @ 2013-08-12 14:19 UTC (permalink / raw)
To: Orit Wasserman; +Cc: armbru, qemu-devel, quintela
On Thu, 8 Aug 2013 20:05:48 +0300
Orit Wasserman <owasserm@redhat.com> wrote:
> "ram" is present also when migration completes.
> expected-downtime, total-time and downtime are no longer part of "ram" data.
>
> Signed-off-by: Orit Wasserman <owasserm@redhat.com>
Applied to the qmp branch, thanks.
> ---
> qmp-commands.hx | 20 ++++++++++----------
> 1 file changed, 10 insertions(+), 10 deletions(-)
>
> diff --git a/qmp-commands.hx b/qmp-commands.hx
> index 2e59b0d..a22a841 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,12 +2693,12 @@ Examples:
> <- {
> "return":{
> "status":"active",
> + "total-time":12345,
> + "expected-downtime":12345,
> "ram":{
> "transferred":123,
> "remaining":123,
> "total":246,
> - "total-time":12345,
> - "expected-downtime":12345,
> "duplicate":123,
> "normal":123,
> "normal-bytes":123456
> @@ -2712,12 +2712,12 @@ Examples:
> <- {
> "return":{
> "status":"active",
> + "total-time":12345,
> + "expected-downtime":12345,
> "ram":{
> "total":1057024,
> "remaining":1053304,
> "transferred":3720,
> - "total-time":12345,
> - "expected-downtime":12345,
> "duplicate":123,
> "normal":123,
> "normal-bytes":123456
> @@ -2736,13 +2736,13 @@ Examples:
> <- {
> "return":{
> "status":"active",
> + "total-time":12345,
> + "expected-downtime":12345,
> "capabilities" : [ { "capability": "xbzrle", "state" : true } ],
> "ram":{
> "total":1057024,
> "remaining":1053304,
> "transferred":3720,
> - "total-time":12345,
> - "expected-downtime":12345,
> "duplicate":10,
> "normal":3333,
> "normal-bytes":3412992
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [Qemu-devel] [PATCH v2] Fix query-migrate documentation in qmp-commands.hx
2013-08-12 14:19 ` Luiz Capitulino
@ 2013-08-19 18:41 ` Luiz Capitulino
2013-08-20 10:33 ` Orit Wasserman
0 siblings, 1 reply; 6+ messages in thread
From: Luiz Capitulino @ 2013-08-19 18:41 UTC (permalink / raw)
To: Orit Wasserman; +Cc: armbru, mrhines, qemu-devel, quintela
On Mon, 12 Aug 2013 10:19:52 -0400
Luiz Capitulino <lcapitulino@redhat.com> wrote:
> On Thu, 8 Aug 2013 20:05:48 +0300
> Orit Wasserman <owasserm@redhat.com> wrote:
>
> > "ram" is present also when migration completes.
> > expected-downtime, total-time and downtime are no longer part of "ram" data.
> >
> > Signed-off-by: Orit Wasserman <owasserm@redhat.com>
>
> Applied to the qmp branch, thanks.
This one missed the deadline for 1.6. I'm my updating my tree for 1.7,
but this patch conflicts with 8f3067, which repeated for the setup-time
key the mistake this patch is fixing for other keys.
We need a respin for this patch, which should also move setup-time
to the main dict. Orit, I can do it myself if you want.
>
> > ---
> > qmp-commands.hx | 20 ++++++++++----------
> > 1 file changed, 10 insertions(+), 10 deletions(-)
> >
> > diff --git a/qmp-commands.hx b/qmp-commands.hx
> > index 2e59b0d..a22a841 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,12 +2693,12 @@ Examples:
> > <- {
> > "return":{
> > "status":"active",
> > + "total-time":12345,
> > + "expected-downtime":12345,
> > "ram":{
> > "transferred":123,
> > "remaining":123,
> > "total":246,
> > - "total-time":12345,
> > - "expected-downtime":12345,
> > "duplicate":123,
> > "normal":123,
> > "normal-bytes":123456
> > @@ -2712,12 +2712,12 @@ Examples:
> > <- {
> > "return":{
> > "status":"active",
> > + "total-time":12345,
> > + "expected-downtime":12345,
> > "ram":{
> > "total":1057024,
> > "remaining":1053304,
> > "transferred":3720,
> > - "total-time":12345,
> > - "expected-downtime":12345,
> > "duplicate":123,
> > "normal":123,
> > "normal-bytes":123456
> > @@ -2736,13 +2736,13 @@ Examples:
> > <- {
> > "return":{
> > "status":"active",
> > + "total-time":12345,
> > + "expected-downtime":12345,
> > "capabilities" : [ { "capability": "xbzrle", "state" : true } ],
> > "ram":{
> > "total":1057024,
> > "remaining":1053304,
> > "transferred":3720,
> > - "total-time":12345,
> > - "expected-downtime":12345,
> > "duplicate":10,
> > "normal":3333,
> > "normal-bytes":3412992
>
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [Qemu-devel] [PATCH v2] Fix query-migrate documentation in qmp-commands.hx
2013-08-19 18:41 ` Luiz Capitulino
@ 2013-08-20 10:33 ` Orit Wasserman
0 siblings, 0 replies; 6+ messages in thread
From: Orit Wasserman @ 2013-08-20 10:33 UTC (permalink / raw)
To: Luiz Capitulino; +Cc: armbru, mrhines, qemu-devel, quintela
On 08/19/2013 09:41 PM, Luiz Capitulino wrote:
> On Mon, 12 Aug 2013 10:19:52 -0400
> Luiz Capitulino <lcapitulino@redhat.com> wrote:
>
>> On Thu, 8 Aug 2013 20:05:48 +0300
>> Orit Wasserman <owasserm@redhat.com> wrote:
>>
>>> "ram" is present also when migration completes.
>>> expected-downtime, total-time and downtime are no longer part of "ram" data.
>>>
>>> Signed-off-by: Orit Wasserman <owasserm@redhat.com>
>>
>> Applied to the qmp branch, thanks.
>
> This one missed the deadline for 1.6. I'm my updating my tree for 1.7,
> but this patch conflicts with 8f3067, which repeated for the setup-time
> key the mistake this patch is fixing for other keys.
>
> We need a respin for this patch, which should also move setup-time
> to the main dict. Orit, I can do it myself if you want.
>
That will be great,
Thanks,
Orit
>>
>>> ---
>>> qmp-commands.hx | 20 ++++++++++----------
>>> 1 file changed, 10 insertions(+), 10 deletions(-)
>>>
>>> diff --git a/qmp-commands.hx b/qmp-commands.hx
>>> index 2e59b0d..a22a841 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,12 +2693,12 @@ Examples:
>>> <- {
>>> "return":{
>>> "status":"active",
>>> + "total-time":12345,
>>> + "expected-downtime":12345,
>>> "ram":{
>>> "transferred":123,
>>> "remaining":123,
>>> "total":246,
>>> - "total-time":12345,
>>> - "expected-downtime":12345,
>>> "duplicate":123,
>>> "normal":123,
>>> "normal-bytes":123456
>>> @@ -2712,12 +2712,12 @@ Examples:
>>> <- {
>>> "return":{
>>> "status":"active",
>>> + "total-time":12345,
>>> + "expected-downtime":12345,
>>> "ram":{
>>> "total":1057024,
>>> "remaining":1053304,
>>> "transferred":3720,
>>> - "total-time":12345,
>>> - "expected-downtime":12345,
>>> "duplicate":123,
>>> "normal":123,
>>> "normal-bytes":123456
>>> @@ -2736,13 +2736,13 @@ Examples:
>>> <- {
>>> "return":{
>>> "status":"active",
>>> + "total-time":12345,
>>> + "expected-downtime":12345,
>>> "capabilities" : [ { "capability": "xbzrle", "state" : true } ],
>>> "ram":{
>>> "total":1057024,
>>> "remaining":1053304,
>>> "transferred":3720,
>>> - "total-time":12345,
>>> - "expected-downtime":12345,
>>> "duplicate":10,
>>> "normal":3333,
>>> "normal-bytes":3412992
>>
>
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2013-08-20 10:33 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2013-08-08 17:05 [Qemu-devel] [PATCH v2] Fix query-migrate documentation in qmp-commands.hx Orit Wasserman
2013-08-08 18:41 ` Eric Blake
2013-08-08 21:31 ` Michael R. Hines
2013-08-12 14:19 ` Luiz Capitulino
2013-08-19 18:41 ` Luiz Capitulino
2013-08-20 10:33 ` Orit Wasserman
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.