Merge remote-tracking branch 'qmp/queue/qmp' into staging
commit2ad728bd4bf26d8144190ca87d5d36d5f33cfae9
authorAnthony Liguori <aliguori@us.ibm.com>
Fri, 3 Aug 2012 19:28:26 +0000 (3 14:28 -0500)
committerAnthony Liguori <aliguori@us.ibm.com>
Fri, 3 Aug 2012 19:28:26 +0000 (3 14:28 -0500)
tree2a01d7c0e541d92d742fc1f932fb6ff6aa65f929
parent9c936c8667f15cf729ee602ae2a800658580fe47
parent75115d9569164b99a52847450d5133af62f3d370
Merge remote-tracking branch 'qmp/queue/qmp' into staging

* qmp/queue/qmp:
  hmp: show the backing file depth
  block: Use bdrv_get_backing_file_depth()
  block: create bdrv_get_backing_file_depth()
  qapi: qapi.py: allow the "'" character to be escaped
qapi-schema.json