diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2012-08-03 14:28:26 -0500 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2012-08-03 14:28:26 -0500 |
| commit | 2ad728bd4bf26d8144190ca87d5d36d5f33cfae9 (patch) | |
| tree | 2a01d7c0e541d92d742fc1f932fb6ff6aa65f929 /slirp/tcp_subr.c | |
| parent | 9c936c8667f15cf729ee602ae2a800658580fe47 (diff) | |
| parent | 75115d9569164b99a52847450d5133af62f3d370 (diff) | |
| download | focaccia-qemu-2ad728bd4bf26d8144190ca87d5d36d5f33cfae9.tar.gz focaccia-qemu-2ad728bd4bf26d8144190ca87d5d36d5f33cfae9.zip | |
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
Diffstat (limited to 'slirp/tcp_subr.c')
0 files changed, 0 insertions, 0 deletions