[Qemu-commits] [qemu/qemu] 68a4a2: migration: Fix compilation with older compilers

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: 68a4a2fda1e698414fc40d264c387dbce3391915
      
https://github.com/qemu/qemu/commit/68a4a2fda1e698414fc40d264c387dbce3391915
  Author: Juan Quintela <address@hidden>
  Date:   2017-06-14 (Wed, 14 Jun 2017)

  Changed paths:
    M include/migration/register.h
    M include/migration/vmstate.h
    M include/qemu/typedefs.h

  Log Message:
  -----------
  migration: Fix compilation with older compilers

That typedefs are needed on both files.  New compilers (F25 where I
work) don't complain about repeating a typedef.  But older ones
complain.

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


  Commit: 62a02658525165bbe628e2931f8c1005f46f47e5
      
https://github.com/qemu/qemu/commit/62a02658525165bbe628e2931f8c1005f46f47e5
  Author: Peter Xu <address@hidden>
  Date:   2017-06-14 (Wed, 14 Jun 2017)

  Changed paths:
    M migration/migration.c

  Log Message:
  -----------
  migration: fix incorrect enable return path

0425dc9 is actually v1 of that patch, but it was accidentally
merged (while there was a v2). That will cause problem when we try to
migrate to some old QEMUs when return path is not really there. Let's
fix it, then squashing this patch with 0425dc9 will be exactly patch
content of v2.

Fixes: 0425dc9 ("migration: isolate return path on src")
Signed-off-by: Peter Xu <address@hidden>
Reviewed-by: Juan Quintela <address@hidden>
Reviewed-by: Dr. David Alan Gilbert <address@hidden>
Signed-off-by: Juan Quintela <address@hidden>


  Commit: 1adc1ceef76dd85d5d2bac073d6844040f60000e
      
https://github.com/qemu/qemu/commit/1adc1ceef76dd85d5d2bac073d6844040f60000e
  Author: Juan Quintela <address@hidden>
  Date:   2017-06-14 (Wed, 14 Jun 2017)

  Changed paths:
    M include/migration/colo.h
    M include/migration/misc.h
    M migration/block.c
    M migration/colo-failover.c
    M migration/colo.c
    M migration/exec.c
    M migration/fd.c
    M migration/global_state.c
    M migration/migration.c
    M migration/migration.h
    M migration/postcopy-ram.c
    M migration/qemu-file.c
    M migration/ram.c
    M migration/savevm.c

  Log Message:
  -----------
  migration: Remove unneeded includes

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


  Commit: edc60127e4acbcf1a028d16c2ed1b3fd3e6433e4
      
https://github.com/qemu/qemu/commit/edc60127e4acbcf1a028d16c2ed1b3fd3e6433e4
  Author: Juan Quintela <address@hidden>
  Date:   2017-06-14 (Wed, 14 Jun 2017)

  Changed paths:
    M migration/ram.c

  Log Message:
  -----------
  migration: Test for disabled features on reception

Right now, if we receive a compressed page while this features are
disabled, Bad Things (TM) can happen.  Just add a test for them.

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

--

I had XBZRLE here also, but it don't need extra resources on
destination, only on source.  Additionally libvirt don't enable it on
destination, so don't put it here.

- initialize invalid_flags at declaration time.
- remove extra space (peter)


  Commit: 3416ab5bb452f1b6cea58aed8983ffb9a455b7c4
      
https://github.com/qemu/qemu/commit/3416ab5bb452f1b6cea58aed8983ffb9a455b7c4
  Author: Juan Quintela <address@hidden>
  Date:   2017-06-14 (Wed, 14 Jun 2017)

  Changed paths:
    M migration/ram.c

  Log Message:
  -----------
  migration: Don't create decompression threads if not enabled

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

--

I removed the [HACK] part because previous patch just check that
compression pages are not received.


  Commit: 73aa4692ec00d479dd1732b40c068d78d3eb909c
      
https://github.com/qemu/qemu/commit/73aa4692ec00d479dd1732b40c068d78d3eb909c
  Author: Peter Maydell <address@hidden>
  Date:   2017-06-15 (Thu, 15 Jun 2017)

  Changed paths:
    M include/migration/colo.h
    M include/migration/misc.h
    M include/migration/register.h
    M include/migration/vmstate.h
    M include/qemu/typedefs.h
    M migration/block.c
    M migration/colo-failover.c
    M migration/colo.c
    M migration/exec.c
    M migration/fd.c
    M migration/global_state.c
    M migration/migration.c
    M migration/migration.h
    M migration/postcopy-ram.c
    M migration/qemu-file.c
    M migration/ram.c
    M migration/savevm.c

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

migration/next for 20170614

# gpg: Signature made Wed 14 Jun 2017 11:16:21 BST
# gpg:                using RSA key 0xF487EF185872D723
# gpg: Good signature from "Juan Quintela <address@hidden>"
# gpg:                 aka "Juan Quintela <address@hidden>"
# Primary key fingerprint: 1899 FF8E DEBF 58CC EE03  4B82 F487 EF18 5872 D723

* remotes/juanquintela/tags/migration/20170614:
  migration: Don't create decompression threads if not enabled
  migration: Test for disabled features on reception
  migration: Remove unneeded includes
  migration: fix incorrect enable return path
  migration: Fix compilation with older compilers

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


Compare: https://github.com/qemu/qemu/compare/3f0602927b12...73aa4692ec00