From: Anthony Liguori Date: Fri, 3 Aug 2012 19:28:26 +0000 (-0500) Subject: Merge remote-tracking branch 'qmp/queue/qmp' into staging X-Git-Tag: v1.2.0-rc0~90 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=2ad728bd4bf26d8144190ca87d5d36d5f33cfae9;p=users%2Fdwmw2%2Fqemu.git 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 --- 2ad728bd4bf26d8144190ca87d5d36d5f33cfae9