[Qemu-commits] [qemu/qemu] 172c43: migration: Only change state after migration has f...

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: 172c4356f38fbf91675256447a3bedd08220214f
      
https://github.com/qemu/qemu/commit/172c4356f38fbf91675256447a3bedd08220214f
  Author: Juan Quintela <address@hidden>
  Date:   2015-07-15 (Wed, 15 Jul 2015)

  Changed paths:
    M migration/migration.c

  Log Message:
  -----------
  migration: Only change state after migration has finished

On previous change, we changed state at post load time if it was not
running, special casing the "running" change.  Now, we change any states
at the end of the migration.

Signed-off-by: Juan Quintela <address@hidden>
Tested-by: Christian Borntraeger <address@hidden>


  Commit: 4ba4bc5e9bfab457a96ac56dc470730a330aded8
      
https://github.com/qemu/qemu/commit/4ba4bc5e9bfab457a96ac56dc470730a330aded8
  Author: Juan Quintela <address@hidden>
  Date:   2015-07-15 (Wed, 15 Jul 2015)

  Changed paths:
    M migration/migration.c

  Log Message:
  -----------
  migration: Trace event and migration event are different things

We can want the trace event even without migration events enabled.

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


  Commit: 72e72e1a71e5e67a11204606a5c09f6cc3089a53
      
https://github.com/qemu/qemu/commit/72e72e1a71e5e67a11204606a5c09f6cc3089a53
  Author: Juan Quintela <address@hidden>
  Date:   2015-07-15 (Wed, 15 Jul 2015)

  Changed paths:
    M qmp-commands.hx

  Log Message:
  -----------
  migration: Write documetation for events capabilites

Reported-by: Jiri Denemark <address@hidden>
Signed-off-by: Juan Quintela <address@hidden>


  Commit: 48212d87d6655b029231d830a77983c21552fe49
      
https://github.com/qemu/qemu/commit/48212d87d6655b029231d830a77983c21552fe49
  Author: Juan Quintela <address@hidden>
  Date:   2015-07-15 (Wed, 15 Jul 2015)

  Changed paths:
    M vl.c

  Log Message:
  -----------
  migration: Register global state section before loadvm

Otherwise, it is not found

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


  Commit: 9f5f380b54d6ad80cf35d93c8cd71c8d7a1b52b7
      
https://github.com/qemu/qemu/commit/9f5f380b54d6ad80cf35d93c8cd71c8d7a1b52b7
  Author: Liang Li <address@hidden>
  Date:   2015-07-15 (Wed, 15 Jul 2015)

  Changed paths:
    M migration/ram.c

  Log Message:
  -----------
  migration: reduce the count of strlen call

'strlen' is called three times in 'save_page_header', it's
inefficient.

Signed-off-by: Liang Li <address@hidden>
Reviewed-by: Juan Quintela <address@hidden>
Reviewed-by: Amit Shah <address@hidden>
Signed-off-by: Juan Quintela <address@hidden>


  Commit: 560d027b54067ffa4e79c6f7c0a499abb0d749a3
      
https://github.com/qemu/qemu/commit/560d027b54067ffa4e79c6f7c0a499abb0d749a3
  Author: Juan Quintela <address@hidden>
  Date:   2015-07-15 (Wed, 15 Jul 2015)

  Changed paths:
    M include/migration/migration.h
    M migration/migration.c
    M migration/savevm.c

  Log Message:
  -----------
  migration: We also want to store the global state for savevm

Commit df4b1024526cae3479da3492d6371fd4a7324a03 introduced global_state
section.  But it only filled the state while doing migration.  While
doing a savevm, we stored an empty string as state.  So when we did a
loadvm, it complained that state was invalid.

Fedora 21, 4.1.1, qemu 2.4.0-rc0
> ../../configure --target-list="x86_64-softmmu"

068 2s ... - output mismatch (see 068.out.bad)
--- /home/bos/jhuston/src/qemu/tests/qemu-iotests/068.out       2015-07-08
17:56:18.588164979 -0400
+++ 068.out.bad 2015-07-09 17:39:58.636651317 -0400
@@ -6,6 +6,8 @@
 QEMU X.Y.Z monitor - type 'help' for more information
 (qemu) savevm 0
 (qemu) quit
+qemu-system-x86_64: Unknown savevm section or instance 'globalstate' 0
+qemu-system-x86_64: Error -22 while loading VM state
 QEMU X.Y.Z monitor - type 'help' for more information
 (qemu) quit
 *** done
Failures: 068
Failed 1 of 1 tests

Actually, there were two problems here:
- we registered global_state too late for load_vm (fixed on another
  patch on the list)
- we didn't store a valid state for savevm (fixed by this patch).

Reported-by: John Snow <address@hidden>
Signed-off-by: Juan Quintela <address@hidden>
Reviewed-by: Dr. David Alan Gilbert <address@hidden>
Reviewed-by: Amit Shah <address@hidden>
Tested-by:  Christian Borntraeger <address@hidden>


  Commit: f5dec79ee88034b2da52463145a2056500db9ff2
      
https://github.com/qemu/qemu/commit/f5dec79ee88034b2da52463145a2056500db9ff2
  Author: Peter Maydell <address@hidden>
  Date:   2015-07-15 (Wed, 15 Jul 2015)

  Changed paths:
    M include/migration/migration.h
    M migration/migration.c
    M migration/ram.c
    M migration/savevm.c
    M qmp-commands.hx
    M vl.c

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

migration/next for 20150715

# gpg: Signature made Wed Jul 15 11:23:33 2015 BST using RSA key ID 5872D723
# gpg: Good signature from "Juan Quintela <address@hidden>"
# gpg:                 aka "Juan Quintela <address@hidden>"

* remotes/juanquintela/tags/migration/20150715-1:
  migration: We also want to store the global state for savevm
  migration: reduce the count of strlen call
  migration: Register global state section before loadvm
  migration: Write documetation for events capabilites
  migration: Trace event and migration event are different things
  migration: Only change state after migration has finished

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


Compare: https://github.com/qemu/qemu/compare/661725da09f4...f5dec79ee880