[Qemu-commits] [qemu/qemu] 97baf9: migration: Avoid qerror_report_err() outside QMP c...

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: 97baf9d9f768caac57bb98d79a1d878181e8a052
      
https://github.com/qemu/qemu/commit/97baf9d9f768caac57bb98d79a1d878181e8a052
  Author: Markus Armbruster <address@hidden>
  Date:   2015-03-17 (Tue, 17 Mar 2015)

  Changed paths:
    M migration/migration.c

  Log Message:
  -----------
  migration: Avoid qerror_report_err() outside QMP command handlers

qerror_report_err() is a transitional interface to help with
converting existing monitor commands to QMP.  It should not be used
elsewhere.  Replace by error_report_err() in
process_incoming_migration_co().

Signed-off-by: Markus Armbruster <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Signed-off-by: Juan Quintela <address@hidden>


  Commit: 1dbd2fd9cbf29c74131e439ce80fb2efde56ee32
      
https://github.com/qemu/qemu/commit/1dbd2fd9cbf29c74131e439ce80fb2efde56ee32
  Author: Michael Tokarev <address@hidden>
  Date:   2015-03-17 (Tue, 17 Mar 2015)

  Changed paths:
    M migration/rdma.c

  Log Message:
  -----------
  migration/rdma: clean up qemu_rdma_dest_init a bit

Do not check for rdma->host being empty twice.  This removes a large
"if" block, so code indentation is changed.  While at it, remove an
ugly goto from the loop, replacing it with a cleaner if logic.  And
finally, there's no need to initialize `ret' variable since is always
has a value.

Signed-off-by: Michael Tokarev <address@hidden>
Reviewed-by: Dr. David Alan Gilbert <address@hidden>
Tested-by: Dr. David Alan Gilbert <address@hidden>

--

fixed space detected by Dave
Signed-off-by: Juan Quintela <address@hidden>


  Commit: 3ac040c0ef525c4cc5ebf881c15421cfa6b095c7
      
https://github.com/qemu/qemu/commit/3ac040c0ef525c4cc5ebf881c15421cfa6b095c7
  Author: Stefan Weil <address@hidden>
  Date:   2015-03-17 (Tue, 17 Mar 2015)

  Changed paths:
    M migration/rdma.c

  Log Message:
  -----------
  migration: Fix some 32 bit compiler errors

The current code won't compile on 32 bit hosts because there are lots
of type casts between pointers and 64 bit integers.

Fix some of them.

Signed-off-by: Stefan Weil <address@hidden>
Signed-off-by: Juan Quintela <address@hidden>


  Commit: fbce8c25d886b207ebb290d911a7d99abd652676
      
https://github.com/qemu/qemu/commit/fbce8c25d886b207ebb290d911a7d99abd652676
  Author: Stefan Weil <address@hidden>
  Date:   2015-03-17 (Tue, 17 Mar 2015)

  Changed paths:
    M migration/rdma.c

  Log Message:
  -----------
  migration: Fix remaining 32 bit compiler errors

Fix type casts between pointers and 64 bit integers.
Now 32 bit builds are possible again.

Signed-off-by: Stefan Weil <address@hidden>
Signed-off-by: Juan Quintela <address@hidden>


  Commit: 1fa57f5543aaff62a6fff63782e6c7dd54773628
      
https://github.com/qemu/qemu/commit/1fa57f5543aaff62a6fff63782e6c7dd54773628
  Author: Dr. David Alan Gilbert <address@hidden>
  Date:   2015-03-17 (Tue, 17 Mar 2015)

  Changed paths:
    M hmp.c

  Log Message:
  -----------
  migrate_incoming: use hmp_handle_error

Signed-off-by: Dr. David Alan Gilbert <address@hidden>
Reviewed-by: Markus Armbruster <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Reviewed-by: Amit Shah <address@hidden>
Signed-off-by: Juan Quintela <address@hidden>


  Commit: d87605347879b67f156af085d772ab88cde40820
      
https://github.com/qemu/qemu/commit/d87605347879b67f156af085d772ab88cde40820
  Author: Dr. David Alan Gilbert <address@hidden>
  Date:   2015-03-17 (Tue, 17 Mar 2015)

  Changed paths:
    M qapi-schema.json

  Log Message:
  -----------
  Warn against the use of the string as uri parameter to migrate-incoming

Signed-off-by: Dr. David Alan Gilbert <address@hidden>
Reviewed-by: Markus Armbruster <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Reviewed-by: Amit Shah <address@hidden>
Signed-off-by: Juan Quintela <address@hidden>


  Commit: 4debb5f553d816bf1f2d86bb61e833e79010cb3d
      
https://github.com/qemu/qemu/commit/4debb5f553d816bf1f2d86bb61e833e79010cb3d
  Author: Dr. David Alan Gilbert <address@hidden>
  Date:   2015-03-17 (Tue, 17 Mar 2015)

  Changed paths:
    M migration/migration.c

  Log Message:
  -----------
  migrate_incoming: Cleanup/clarify error messages

Create a separate error for the case where migrate_incoming is
used after a succesful migrate_incoming.

Reword the error in the case where '-incoming defer' is missing
to omit the command name so it's right for both hmp and qmp.

Signed-off-by: Dr. David Alan Gilbert <address@hidden>
Reviewed-by: Markus Armbruster <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Reviewed-by: Amit Shah <address@hidden>
Signed-off-by: Juan Quintela <address@hidden>


  Commit: f54a235f9b15ae59d70b40630417d8aaa88bc4ec
      
https://github.com/qemu/qemu/commit/f54a235f9b15ae59d70b40630417d8aaa88bc4ec
  Author: zhanghailiang <address@hidden>
  Date:   2015-03-17 (Tue, 17 Mar 2015)

  Changed paths:
    M arch_init.c

  Log Message:
  -----------
  arch_init: Count the total number of pages by using helper function

There is already a helper function ram_bytes_total(), we can use it to
help counting the total number of pages used by ram blocks.

Signed-off-by: zhanghailiang <address@hidden>
Reviewed-by: Dr. David Alan Gilbert <address@hidden>
Signed-off-by: Juan Quintela <address@hidden>


  Commit: 21cb4924f79579222459c2395f28d1a26d4ef0bd
      
https://github.com/qemu/qemu/commit/21cb4924f79579222459c2395f28d1a26d4ef0bd
  Author: Thomas Huth <address@hidden>
  Date:   2015-03-17 (Tue, 17 Mar 2015)

  Changed paths:
    M include/migration/migration.h
    M include/migration/qemu-file.h
    M migration/migration.c
    M migration/qemu-file-buf.c

  Log Message:
  -----------
  migration: Remove unused functions

migrate_rdma_pin_all() and qsb_clone() are completely unused and thus
can be deleted.

Signed-off-by: Thomas Huth <address@hidden>
Cc: Juan Quintela <address@hidden>
Cc: Amit Shah <address@hidden>
Signed-off-by: Juan Quintela <address@hidden>


  Commit: 3119473166eeac017b249b408b07473aff5a7ca2
      
https://github.com/qemu/qemu/commit/3119473166eeac017b249b408b07473aff5a7ca2
  Author: zhanghailiang <address@hidden>
  Date:   2015-03-17 (Tue, 17 Mar 2015)

  Changed paths:
    M migration/migration.c

  Log Message:
  -----------
  migration: Rename abbreviated macro MIG_STATE_* to MIGRATION_STATUS_*

Rename all macro MIG_STATE_* to  MIGRATION_STATUS_* except "MIG_STATE_ERROR",
we rename it to "MIGRATION_STATUS_FAILED" which will match the migration status
string 'failed'.

Signed-off-by: zhanghailiang <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Signed-off-by: Juan Quintela <address@hidden>


  Commit: e49f35bdb4974d6cfd7e5eb5cb9f8c50eef3f3a9
      
https://github.com/qemu/qemu/commit/e49f35bdb4974d6cfd7e5eb5cb9f8c50eef3f3a9
  Author: zhanghailiang <address@hidden>
  Date:   2015-03-17 (Tue, 17 Mar 2015)

  Changed paths:
    M hmp.c

  Log Message:
  -----------
  hmp: Rename 'MigrationStatus' to 'HMPMigrationStatus'

We will use the typename 'MigrationStatus' for publicly exported typename,
So here we rename the internal-only 'MigrationStatus' to
'HMPMigrationStatus'.

Signed-off-by: zhanghailiang <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Signed-off-by: Juan Quintela <address@hidden>


  Commit: 24b8c39b5c34b05f1ac870c421e2e61574abbdf9
      
https://github.com/qemu/qemu/commit/24b8c39b5c34b05f1ac870c421e2e61574abbdf9
  Author: zhanghailiang <address@hidden>
  Date:   2015-03-17 (Tue, 17 Mar 2015)

  Changed paths:
    M hmp.c
    M migration/migration.c
    M qapi-schema.json

  Log Message:
  -----------
  migration: Convert 'status' of MigrationInfo to use an enum type

The original 'status' is an open-coded 'str' type, convert it to use an
enum type.
This conversion is backwards compatible, better documented and
more convenient for future extensibility.

In addition, Fix a typo for qapi-schema.json (just remove the typo) :
s/'completed'. 'comppleted' (since 1.2)/'completed' (since 1.2)

Signed-off-by: zhanghailiang <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Signed-off-by: Juan Quintela <address@hidden>


  Commit: cde63fbed86e20dda98bf35025faedd994918f00
      
https://github.com/qemu/qemu/commit/cde63fbed86e20dda98bf35025faedd994918f00
  Author: zhanghailiang <address@hidden>
  Date:   2015-03-17 (Tue, 17 Mar 2015)

  Changed paths:
    M migration/migration.c

  Log Message:
  -----------
  migration: Expose 'cancelling' status to user

'cancelling' status was introduced by commit 51cf4c1a, mainly to avoid a
possible start of a new migration process while the previous one still exists.
But we didn't expose this status to user, instead we returned the 'active' 
state.

Here, we expose it to the user (such as libvirt), 'cancelling' status only
occurs for a short window before the migration aborts, so for users,
if they cancel a migration process, it will observe 'cancelling' status
occasionally.

Testing revealed that with older libvirt (anything 1.2.13 or less) will
print an odd error message if the state is seen, but that the migration
is still properly cancelled. Newer libvirt will be patched to recognize
the new state without the odd error message.

Signed-off-by: zhanghailiang <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Cc: address@hidden
Signed-off-by: Juan Quintela <address@hidden>


  Commit: d8e33fc98081b548b25be9458490c40858480344
      
https://github.com/qemu/qemu/commit/d8e33fc98081b548b25be9458490c40858480344
  Author: Peter Maydell <address@hidden>
  Date:   2015-03-17 (Tue, 17 Mar 2015)

  Changed paths:
    M arch_init.c
    M hmp.c
    M include/migration/migration.h
    M include/migration/qemu-file.h
    M migration/migration.c
    M migration/qemu-file-buf.c
    M migration/rdma.c
    M qapi-schema.json

  Log Message:
  -----------
  Merge remote-tracking branch 'remotes/juanquintela/tags/migration/20150317' 
into staging

migration/next for 20150317

# gpg: Signature made Tue Mar 17 14:21:14 2015 GMT using RSA key ID 5872D723
# gpg: Can't check signature: public key not found

* remotes/juanquintela/tags/migration/20150317:
  migration: Expose 'cancelling' status to user
  migration: Convert 'status' of MigrationInfo to use an enum type
  hmp: Rename 'MigrationStatus' to 'HMPMigrationStatus'
  migration: Rename abbreviated macro MIG_STATE_* to MIGRATION_STATUS_*
  migration: Remove unused functions
  arch_init: Count the total number of pages by using helper function
  migrate_incoming: Cleanup/clarify error messages
  Warn against the use of the string as uri parameter to migrate-incoming
  migrate_incoming: use hmp_handle_error
  migration: Fix remaining 32 bit compiler errors
  migration: Fix some 32 bit compiler errors
  migration/rdma: clean up qemu_rdma_dest_init a bit
  migration: Avoid qerror_report_err() outside QMP command handlers

Signed-off-by: Peter Maydell <address@hidden>


  Commit: cd232acfa0d70002fed89e9293f04afda577a513
      
https://github.com/qemu/qemu/commit/cd232acfa0d70002fed89e9293f04afda577a513
  Author: Peter Maydell <address@hidden>
  Date:   2015-03-17 (Tue, 17 Mar 2015)

  Changed paths:
    M VERSION

  Log Message:
  -----------
  Update version for v2.3.0-rc0 release

Signed-off-by: Peter Maydell <address@hidden>


Compare: https://github.com/qemu/qemu/compare/ac738eadc409...cd232acfa0d7