From: Anthony Liguori <aliguori@us.ibm.com>
Date: Fri, 1 Feb 2013 15:08:14 +0000 (-0600)
Subject: Merge remote-tracking branch 'quintela/migration.next' into staging
X-Git-Tag: v1.4.0-rc0~49
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5dea9a694ffa6fdd19ba5ce265c619686c14df1b;p=thirdparty%2Fqemu.git

Merge remote-tracking branch 'quintela/migration.next' into staging

# 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
---

5dea9a694ffa6fdd19ba5ce265c619686c14df1b