[Qemu-commits] [qemu/qemu] c69ade: migration: Fix global state with Xen.

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: c69adea462a97c02001b2dd1edd2a0692d27f5a2
      
https://github.com/qemu/qemu/commit/c69adea462a97c02001b2dd1edd2a0692d27f5a2
  Author: Anthony PERARD <address@hidden>
  Date:   2015-08-03 (Mon, 03 Aug 2015)

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

  Log Message:
  -----------
  migration: Fix global state with Xen.

When doing migration via the QMP command xen_save_devices_state, the
current runstate is not store into the global state section. Also the
current runstate is not the one we want on the receiver side.

During migration, the Xen toolstack paused QEMU before save the devices
state. Also, the toolstack expect QEMU to autostart when the migration is
finished.
So this patch store "running" as it's current runstate.

Signed-off-by: Anthony PERARD <address@hidden>
Signed-off-by: Stefano Stabellini <address@hidden>


  Commit: 8c6dc68f4cff9eef870497a19a5373dde9dbdcc2
      
https://github.com/qemu/qemu/commit/8c6dc68f4cff9eef870497a19a5373dde9dbdcc2
  Author: Anthony PERARD <address@hidden>
  Date:   2015-08-03 (Mon, 03 Aug 2015)

  Changed paths:
    M xen-common.c

  Log Message:
  -----------
  migration: Fix regression for xenfv and pc,accel=xen machine.

This fix migration from the same QEMU version and from previous QEMU
version.

>From the global state section, we don't need runstate with Xen. Right now,
the way the Xen toolstack knows when QEMU is ready is when QEMU reach
"running" runstate.

The configuration section and the section footers are not going to be
present in previous version of QEMU with xenfv machine, so we skip them.

The Xen toolstack libxenlight does not specify a particular version of the
'pc' machine, so migration from older version of QEMU used by Xen to newer
one would break due to missing "configuration" section and section footers.

Signed-off-by: Anthony PERARD <address@hidden>
Signed-off-by: Stefano Stabellini <address@hidden>


  Commit: e95edefbd0559e1d0aa09549641b5d9af1f96fac
      
https://github.com/qemu/qemu/commit/e95edefbd0559e1d0aa09549641b5d9af1f96fac
  Author: Peter Maydell <address@hidden>
  Date:   2015-08-03 (Mon, 03 Aug 2015)

  Changed paths:
    M include/migration/migration.h
    M migration/migration.c
    M migration/savevm.c
    M xen-common.c

  Log Message:
  -----------
  Merge remote-tracking branch 'remotes/sstabellini/tags/xen-migration-2.4-tag' 
into staging

xen-migration-2.4

# gpg: Signature made Mon 03 Aug 2015 17:18:36 BST using RSA key ID 70E1AE90
# gpg: Good signature from "Stefano Stabellini <address@hidden>"

* remotes/sstabellini/tags/xen-migration-2.4-tag:
  migration: Fix regression for xenfv and pc,accel=xen machine.
  migration: Fix global state with Xen.

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


Compare: https://github.com/qemu/qemu/compare/f60c87154ac7...e95edefbd055