From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:53216) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SyPc1-0001Zs-R1 for qemu-devel@nongnu.org; Mon, 06 Aug 2012 11:53:01 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SyPbv-0007Kj-Qd for qemu-devel@nongnu.org; Mon, 06 Aug 2012 11:52:57 -0400 Received: from mx1.redhat.com ([209.132.183.28]:2104) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SyPbv-0007Kd-IT for qemu-devel@nongnu.org; Mon, 06 Aug 2012 11:52:51 -0400 Message-ID: <501FE830.8040509@redhat.com> Date: Mon, 06 Aug 2012 09:52:16 -0600 From: Eric Blake MIME-Version: 1.0 References: <1344158004-10370-1-git-send-email-owasserm@redhat.com> <1344158004-10370-10-git-send-email-owasserm@redhat.com> In-Reply-To: <1344158004-10370-10-git-send-email-owasserm@redhat.com> Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="------------enig15395CDD8CBB9F54CC3A0919" Subject: Re: [Qemu-devel] [PATCH 09/11] Add migration accounting for normal and duplicate pages List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Orit Wasserman Cc: peter.maydell@linaro.org, aliguori@us.ibm.com, quintela@redhat.com, stefanha@gmail.com, qemu-devel@nongnu.org, mdroth@linux.vnet.ibm.com, blauwirbel@gmail.com, Petter Svard , Benoit Hudzia , avi@redhat.com, Aidan Shribman , pbonzini@redhat.com, lcapitulino@redhat.com, chegu_vinod@hp.com This is an OpenPGP/MIME signed message (RFC 2440 and 3156) --------------enig15395CDD8CBB9F54CC3A0919 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable On 08/05/2012 03:13 AM, Orit Wasserman wrote: > Signed-off-by: Benoit Hudzia > Signed-off-by: Petter Svard > Signed-off-by: Aidan Shribman > Signed-off-by: Orit Wasserman > Signed-off-by: Juan Quintela > --- > +++ b/qapi-schema.json > @@ -264,11 +264,18 @@ > # migration has ended, it returns the total migration > # time. (since 1.2) > # > -# Since: 0.14.0. > +# @duplicate: number of duplicate pages (since 1.2) > +# > +# @normal : number of normal pages (since 1.2) > +# > +# @normal-bytes : number of normal bytes sent (since 1.2) > +# > +# Since: 0.14.0 > ## > { 'type': 'MigrationStats', > 'data': {'transferred': 'int', 'remaining': 'int', 'total': 'int' , > - 'total_time': 'int' } } > + 'total_time': 'int', 'duplicate': 'int', 'normal': 'int', > + 'normal-bytes': 'int' } } Yuck - we're mixing _ and - in the same command. Thankfully, 'total_time' did not exist in 1.1, therefore, I suggest that you enhance this patch (or else add a prereq patch) to rename s/total_time/total-time/ so that the 1.2 release will consistently use '-= '. Oh, and when doing that, s/tota0l/total/ in the context one line before this hunk started. > =20 > ## > # @MigrationInfo > diff --git a/qmp-commands.hx b/qmp-commands.hx > index 274680d..d7ec281 100644 > --- a/qmp-commands.hx > +++ b/qmp-commands.hx > @@ -2120,6 +2120,9 @@ The main json-object contains the following: > - "transferred": amount transferred (json-int) > - "remaining": amount remaining (json-int) > - "total": total (json-int) > + - "duplicate": number of duplicated pages (json-int) > + - "normal" : number of normal pages transferred (json-int) > + - "normal-bytes" : number of normal bytes transferred (json-int) Kill those TABs. Inconsistent spacing before ':'. > 2. Migration is done and has succeeded > =20 > -> { "execute": "query-migrate" } > -<- { "return": { "status": "completed" } } > +<- { "return": { > + "status": "completed", > + "ram":{ > + "transferred":123, > + "remaining":123, > + "total":246, > + "duplicate":123, > + "normal":123, > + "normal-bytes":123456 As long as we're fixing this example, fix it to also show 'total-time'. > + } > + } > + } > =20 > 3. Migration is done and has failed > =20 > @@ -2152,7 +2166,10 @@ Examples: > "ram":{ > "transferred":123, > "remaining":123, > - "total":246 > + "total":246, > + "duplicate":123, > + "normal":123, > + "normal-bytes":123456 Again, need total-time. > } > } > } > @@ -2166,7 +2183,10 @@ Examples: > "ram":{ > "total":1057024, > "remaining":1053304, > - "transferred":3720 > + "transferred":3720, > + "duplicate":123, > + "normal":123, > + "normal-bytes":123456 and again. --=20 Eric Blake eblake@redhat.com +1-919-301-3266 Libvirt virtualization library http://libvirt.org --------------enig15395CDD8CBB9F54CC3A0919 Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.12 (GNU/Linux) Comment: Public key at http://people.redhat.com/eblake/eblake.gpg Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/ iQEcBAEBCAAGBQJQH+gwAAoJEKeha0olJ0NqYE8IAJhrkdXGU2C4V5xTKo0F3TJU N8vVKCTIARhkoqXHjBNiL5UvPKfu4AfsASe0Fcdo8d7dkACs5L0fvO8rlrR5FEJq jW9PP49GWpOUK/5hjP7fOowxUsprnI6nkPKUYiSPCJGIOoxBgwYqtkwk/wb4K9z+ BL6d2raztB5sviMNy8A+FvWDA+ffOlmMT6jRaME2pUgSRmQ9sf2MzhytPkzZ8ZZD X42WoTA7pS8NVzwspymHZM91SxAGxIkLCw8DxjxNebRLnDhLBtgN3YDDY03akMt9 yaa9ED1BBu6iTJLvv6qIWUKufWXRvBhPrYf0u2YtELljLugDGqXClWd8n1GsqJM= =uuW/ -----END PGP SIGNATURE----- --------------enig15395CDD8CBB9F54CC3A0919--