From: Anthony Liguori <aliguori@us.ibm.com>
Date: Mon, 19 Mar 2012 13:51:06 +0000 (-0500)
Subject: Merge remote-tracking branch 'qmp/queue/qmp' into staging
X-Git-Tag: v1.1-rc0~223
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5c20f4e54a311620861c659dec29d0ee402e8b93;p=thirdparty%2Fqemu.git

Merge remote-tracking branch 'qmp/queue/qmp' into staging

* qmp/queue/qmp:
  qapi: Convert migrate
  Purge migration of (almost) everything to do with monitors
  Error: Introduce error_copy()
  QError: Introduce new errors for the migration command
---

5c20f4e54a311620861c659dec29d0ee402e8b93