qemu-commits
[Top][All Lists]
Advanced
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Qemu-commits] [qemu/qemu] b605c4: migration: fix handling for --only-mi

From: GitHub
Subject: [Qemu-commits] [qemu/qemu] b605c4: migration: fix handling for --only-migratable
Date: Tue, 11 Jul 2017 01:59:44 -0700 
  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: b605c47b57b58e61a901a50a0762dccf43d94783
      
https://github.com/qemu/qemu/commit/b605c47b57b58e61a901a50a0762dccf43d94783
  Author: Peter Xu <address@hidden>
  Date:   2017-07-10 (Mon, 10 Jul 2017)

  Changed paths:
    M include/migration/misc.h
    M migration/migration.c
    M vl.c

  Log Message:
  -----------
  migration: fix handling for --only-migratable

MigrateState object is not ready at that time, so we'll get an
assertion. Use qemu_global_option() instead.

Reported-by: Eduardo Habkost <address@hidden>
Suggested-by: Eduardo Habkost <address@hidden>
Reviewed-by: Eduardo Habkost <address@hidden>
Reviewed-by: Juan Quintela <address@hidden>
Fixes: 3df663e ("migration: move only_migratable to MigrationState")
Signed-off-by: Peter Xu <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Dr. David Alan Gilbert <address@hidden>


  Commit: 00b8ea4e34bf474ae55fc2fcb4ec12c0841d07e0
      
https://github.com/qemu/qemu/commit/00b8ea4e34bf474ae55fc2fcb4ec12c0841d07e0
  Author: Peter Xu <address@hidden>
  Date:   2017-07-10 (Mon, 10 Jul 2017)

  Changed paths:
    M vl.c

  Log Message:
  -----------
  vl: move global property, migrate init earlier

Currently drive_init_func() may call migrate_get_current() while the
migrate object is still not ready yet at that time. Move the migration
object init earlier, along with the global properties, right after
acceleration init.

This fixes a breakage for iotest 055, which caused an assertion failure.

Reported-by: Max Reitz <address@hidden>
Reported-by: Philippe Mathieu-Daudé <address@hidden>
Reviewed-by: Eduardo Habkost <address@hidden>
Tested-by: QingFeng Hao <address@hidden>
Fixes: 3df663 ("migration: move only_migratable to MigrationState")
Signed-off-by: Peter Xu <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Dr. David Alan Gilbert <address@hidden>


  Commit: 16f7244842b5135543ef068a1adafd94c6965953
      
https://github.com/qemu/qemu/commit/16f7244842b5135543ef068a1adafd94c6965953
  Author: Peter Xu <address@hidden>
  Date:   2017-07-10 (Mon, 10 Jul 2017)

  Changed paths:
    M qemu-options.hx

  Log Message:
  -----------
  doc: add item for "-M enforce-config-section"

It's never documented, and now we have one more parameter for it (which
obsoletes this one). Document it properly.

Suggested-by: Eduardo Habkost <address@hidden>
Signed-off-by: Peter Xu <address@hidden>
Message-Id: <address@hidden>
Reviewed-by: Greg Kurz <address@hidden>
Reviewed-by: Eduardo Habkost <address@hidden>
Signed-off-by: Dr. David Alan Gilbert <address@hidden>
  Removed 'Although now' commit message as per Eduardo's review


  Commit: c8d3ff384f14634fde1c3ea6bcdcd7e06c29df29
      
https://github.com/qemu/qemu/commit/c8d3ff384f14634fde1c3ea6bcdcd7e06c29df29
  Author: Peter Xu <address@hidden>
  Date:   2017-07-10 (Mon, 10 Jul 2017)

  Changed paths:
    M migration/migration.c

  Log Message:
  -----------
  doc: update TYPE_MIGRATION documents

[Peter collected Eduardo's patch comment and formatted into patch]

Suggested-by: Eduardo Habkost <address@hidden>
Signed-off-by: Peter Xu <address@hidden>
Message-Id: <address@hidden>
Reviewed-by: Eduardo Habkost <address@hidden>
Signed-off-by: Dr. David Alan Gilbert <address@hidden>


  Commit: 9907e842d70165ae0059fcd8f770342718c0fa0f
      
https://github.com/qemu/qemu/commit/9907e842d70165ae0059fcd8f770342718c0fa0f
  Author: Juan Quintela <address@hidden>
  Date:   2017-07-10 (Mon, 10 Jul 2017)

  Changed paths:
    M hw/ppc/spapr.c
    M include/migration/register.h
    M migration/block.c
    M migration/colo.c
    M migration/migration.c
    M migration/ram.c
    M migration/savevm.c
    M migration/savevm.h
    M migration/trace-events

  Log Message:
  -----------
  migration: Rename save_live_setup() to save_setup()

We are going to use it now for more than save live regions.
Once there rename qemu_savevm_state_begin() to qemu_savevm_state_setup().

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


  Commit: 70f794fcfa7c1b9d7af465d124a0e6175da30e39
      
https://github.com/qemu/qemu/commit/70f794fcfa7c1b9d7af465d124a0e6175da30e39
  Author: Juan Quintela <address@hidden>
  Date:   2017-07-10 (Mon, 10 Jul 2017)

  Changed paths:
    M hw/ppc/spapr.c
    M include/migration/register.h
    M migration/block.c
    M migration/ram.c
    M migration/savevm.c

  Log Message:
  -----------
  migration: Rename cleanup() to save_cleanup()

We need a cleanup for loads, so we rename here to be consistent.

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

--

Rename htab_cleanup to htap_save_cleanup as dave suggestion
Message-Id: <address@hidden>
Signed-off-by: Dr. David Alan Gilbert <address@hidden>


  Commit: acb5ea86971a7f3d0eac30996c4d0eab7b873879
      
https://github.com/qemu/qemu/commit/acb5ea86971a7f3d0eac30996c4d0eab7b873879
  Author: Juan Quintela <address@hidden>
  Date:   2017-07-10 (Mon, 10 Jul 2017)

  Changed paths:
    M include/migration/register.h
    M migration/savevm.c
    M migration/savevm.h
    M migration/trace-events

  Log Message:
  -----------
  migration: Create load_setup()/cleanup() methods

We need to do things at load time and at cleanup time.

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

--

Move the printing of the error message so we can print the device
giving the error.
Add call to postcopy stuff
Message-Id: <address@hidden>
Reviewed-by: Dr. David Alan Gilbert <address@hidden>
Signed-off-by: Dr. David Alan Gilbert <address@hidden>


  Commit: f265e0e437a5d5fd0b48143012e2242b85816f61
      
https://github.com/qemu/qemu/commit/f265e0e437a5d5fd0b48143012e2242b85816f61
  Author: Juan Quintela <address@hidden>
  Date:   2017-07-10 (Mon, 10 Jul 2017)

  Changed paths:
    M migration/migration.c
    M migration/ram.c
    M migration/ram.h

  Log Message:
  -----------
  migration: Convert ram to use new load_setup()/load_cleanup()

Once there, I rename ram_migration_cleanup() to ram_save_cleanup().
Notice that this is the first pass, and I only passed XBZRLE to the
new scheme.  Moved decoded_buf to inside XBZRLE struct.
As a bonus, I don't have to export xbzrle functions from ram.c.

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

--

loaded_data pointer was needed because called can change it (dave)
spell loaded correctly in comment (dave)
Message-Id: <address@hidden>
Signed-off-by: Dr. David Alan Gilbert <address@hidden>


  Commit: f0afa331ce670ba39bde3f5620d75dcd56890cb6
      
https://github.com/qemu/qemu/commit/f0afa331ce670ba39bde3f5620d75dcd56890cb6
  Author: Juan Quintela <address@hidden>
  Date:   2017-07-10 (Mon, 10 Jul 2017)

  Changed paths:
    M migration/migration.c
    M migration/ram.c
    M migration/ram.h

  Log Message:
  -----------
  migration: Make compression_threads use save/load_setup/cleanup()

Once there, be consistent and use
compress_thread_{save,load}_{setup,cleanup}.

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


  Commit: 3d0bf8dfdfebd7f2ae41b6f220444b8047d6b1ee
      
https://github.com/qemu/qemu/commit/3d0bf8dfdfebd7f2ae41b6f220444b8047d6b1ee
  Author: Peter Maydell <address@hidden>
  Date:   2017-07-10 (Mon, 10 Jul 2017)

  Changed paths:
    M hw/ppc/spapr.c
    M include/migration/misc.h
    M include/migration/register.h
    M migration/block.c
    M migration/colo.c
    M migration/migration.c
    M migration/ram.c
    M migration/ram.h
    M migration/savevm.c
    M migration/savevm.h
    M migration/trace-events
    M qemu-options.hx
    M vl.c

  Log Message:
  -----------
  Merge remote-tracking branch 'remotes/dgilbert/tags/pull-migration-20170710a' 
into staging

Migration pull 2017-07-10

# gpg: Signature made Mon 10 Jul 2017 18:04:57 BST
# gpg:                using RSA key 0x0516331EBC5BFDE7
# gpg: Good signature from "Dr. David Alan Gilbert (RH2) <address@hidden>"
# gpg: WARNING: This key is not certified with a trusted signature!
# gpg:          There is no indication that the signature belongs to the owner.
# Primary key fingerprint: 45F5 C71B 4A0C B7FB 977A  9FA9 0516 331E BC5B FDE7

* remotes/dgilbert/tags/pull-migration-20170710a:
  migration: Make compression_threads use save/load_setup/cleanup()
  migration: Convert ram to use new load_setup()/load_cleanup()
  migration: Create load_setup()/cleanup() methods
  migration: Rename cleanup() to save_cleanup()
  migration: Rename save_live_setup() to save_setup()
  doc: update TYPE_MIGRATION documents
  doc: add item for "-M enforce-config-section"
  vl: move global property, migrate init earlier
  migration: fix handling for --only-migratable

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


Compare: https://github.com/qemu/qemu/compare/6b06e3e49eb8...3d0bf8dfdfeb
reply via email to
[Prev in Thread] Current Thread [Next in Thread]