Hi

Please pull

- Fix missmerge of fwrite patch (armbru)
- FIX XBZRLE crash: Gonglei
- Add more traces for migration (Alexey)

Especial thanks to Amit for getting the patches together.

Later, Juan.


The following changes since commit 6fc0303b95c873d9e384d7fb51e412ac2e53b9c1:

  Merge remote-tracking branch 'remotes/kraxel/tags/pull-input-4' into staging 
(2014-03-07 18:29:33 +0000)

are available in the git repository at:


  git://github.com/juanquintela/qemu.git tags/migration/20140308

for you to fetch changes up to 849defaa967cd9e20f4a3d426c8c23887b0e2305:

  migration: add more traces (2014-03-08 02:05:53 +0100)

----------------------------------------------------------------
migration/next for 20140308

----------------------------------------------------------------
Alexey Kardashevskiy (3):
      vl: add system_wakeup_request tracepoint
      migration: extend section_start/end traces
      migration: add more traces

Gonglei (1):
      XBZRLE: Fix qemu crash when resize the xbzrle cache

Markus Armbruster (1):
      qemu_file: Fix mismerge of "use fwrite() correctly"

 arch_init.c  | 52 +++++++++++++++++++++++++++++++++++++++++++++++++---
 migration.c  | 30 ++++++------------------------
 qemu-file.c  |  4 +++-
 savevm.c     | 22 ++++++++++++++++------
 trace-events | 21 +++++++++++++++++++--
 vl.c         |  2 ++
 vmstate.c    |  2 ++
 7 files changed, 97 insertions(+), 36 deletions(-)

Reply via email to