]> git.proxmox.com Git - qemu.git/commitdiff
Merge remote-tracking branch 'quintela/migration.next' into staging
authorAnthony Liguori <aliguori@us.ibm.com>
Fri, 1 Feb 2013 15:08:14 +0000 (09:08 -0600)
committerAnthony Liguori <aliguori@us.ibm.com>
Fri, 1 Feb 2013 15:08:14 +0000 (09:08 -0600)
# By Orit Wasserman
# Via Juan Quintela
* quintela/migration.next:
  Fix error message in migrate_set_capability HMP command
  Allow XBZRLE decoding without enabling the capability
  Fix example for query-migrate-capabilities
  Add XBZRLE testing
  Move XBZRLE encoding code to a separate file to allow testing


Trivial merge