[Qemu-commits] [qemu/qemu] 7c7623: Avoid crashing on multiple -incoming

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: 7c76235a3e6e24f596ab4b157157bd62f44b80f5
      
https://github.com/qemu/qemu/commit/7c76235a3e6e24f596ab4b157157bd62f44b80f5
  Author: Dr. David Alan Gilbert <address@hidden>
  Date:   2015-03-26 (Thu, 26 Mar 2015)

  Changed paths:
    M vl.c

  Log Message:
  -----------
  Avoid crashing on multiple -incoming

Passing multiple -incoming options used to crash qemu (due to
an invalid state transition incoming->incoming).  Instead we now
take the last -incoming option, e.g.:

qemu-system-x86_64 -nographic -incoming tcp::4444 -incoming defer

ends up doing the defer.

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


  Commit: 80b262e1439a22708e1c535b75363d4b90c3b41d
      
https://github.com/qemu/qemu/commit/80b262e1439a22708e1c535b75363d4b90c3b41d
  Author: Padmanabh Ratnakar <address@hidden>
  Date:   2015-03-26 (Thu, 26 Mar 2015)

  Changed paths:
    M migration/rdma.c

  Log Message:
  -----------
  rdma: Fix cleanup in error paths

As part of commit e325b49a320b493cc5d69e263751ff716dc458fe,
order in which resources are destroyed was changed for fixing
a seg fault. Due to this change, CQ will never get destroyed as
CQ should be destroyed after QP destruction. Seg fault is caused
improper cleanup when connection fails. Fixing cleanup after
connection failure and order in which resources are destroyed
in qemu_rdma_cleanup() routine.

Signed-off-by: Meghana Cheripady <address@hidden>
Signed-off-by: Padmanabh Ratnakar <address@hidden>
Signed-off-by: Juan Quintela <address@hidden>


  Commit: 43edc0ed11a4d25f2fe67bb9d89a8a6a0a43b1e0
      
https://github.com/qemu/qemu/commit/43edc0ed11a4d25f2fe67bb9d89a8a6a0a43b1e0
  Author: Juan Quintela <address@hidden>
  Date:   2015-03-26 (Thu, 26 Mar 2015)

  Changed paths:
    M arch_init.c

  Log Message:
  -----------
  migration:  remove last_sent_block from save_page_header

Compression code (still not on tree) want to call this funtion from
outside the migration thread, so we can't write to last_sent_block.

Instead of reverting full patch:

[PULL 07/11] save_block_hdr: we can recalculate

Just revert the parts that touch last_sent_block.

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


  Commit: 99b7f47c54ae7932715a1f58ed9a128451fb2b85
      
https://github.com/qemu/qemu/commit/99b7f47c54ae7932715a1f58ed9a128451fb2b85
  Author: Peter Maydell <address@hidden>
  Date:   2015-03-26 (Thu, 26 Mar 2015)

  Changed paths:
    M arch_init.c
    M migration/rdma.c
    M vl.c

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

migration/next for 20150326

# gpg: Signature made Thu Mar 26 14:31:55 2015 GMT using RSA key ID 5872D723
# gpg: Can't check signature: public key not found

* remotes/juanquintela/tags/migration/20150326:
  migration:  remove last_sent_block from save_page_header
  rdma: Fix cleanup in error paths
  Avoid crashing on multiple -incoming

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


Compare: https://github.com/qemu/qemu/compare/1ee76e5191e4...99b7f47c54ae