tree 2a01d7c0e541d92d742fc1f932fb6ff6aa65f929
parent 9c936c8667f15cf729ee602ae2a800658580fe47
parent 75115d9569164b99a52847450d5133af62f3d370
author Anthony Liguori <aliguori@us.ibm.com> 1344022106 -0500
committer Anthony Liguori <aliguori@us.ibm.com> 1344022106 -0500

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