projects
/
sdk
/
emulator
/
qemu.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
9c936c8
75115d9
)
Merge remote-tracking branch 'qmp/queue/qmp' into staging
author
Anthony Liguori
<aliguori@us.ibm.com>
Fri, 3 Aug 2012 19:28:26 +0000
(14:28 -0500)
committer
Anthony Liguori
<aliguori@us.ibm.com>
Fri, 3 Aug 2012 19:28:26 +0000
(14:28 -0500)
* 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
1
2
qapi-schema.json
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
qapi-schema.json
Simple merge