Merge remote-tracking branch 'qmp/queue/qmp' into staging
commit5c20f4e54a311620861c659dec29d0ee402e8b93
authorAnthony Liguori <aliguori@us.ibm.com>
Mon, 19 Mar 2012 13:51:06 +0000 (19 08:51 -0500)
committerAnthony Liguori <aliguori@us.ibm.com>
Mon, 19 Mar 2012 13:51:06 +0000 (19 08:51 -0500)
tree4e35db5155d8539650df69e629cc1a009ae54579
parent46a5801d0cb5f5ed01a4d31c0e7cc581237ed5ce
parente1c37d0e94048502f9874e6356ce7136d4b05bdb
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