diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2012-03-28 12:46:11 -0500 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2012-03-28 12:46:11 -0500 |
| commit | 49e00ba9698469b5eccec947050216192d9a9e34 (patch) | |
| tree | aff79a28cd2dec276d576f94ea7c299c096fe694 /json-lexer.c | |
| parent | c76d1a9b3f367754966c326d81ff8566798b473a (diff) | |
| parent | 7429f2e1981c6cc77a853e2e88654001bdddd461 (diff) | |
| download | qemu-49e00ba9698469b5eccec947050216192d9a9e34.zip qemu-49e00ba9698469b5eccec947050216192d9a9e34.tar.gz qemu-49e00ba9698469b5eccec947050216192d9a9e34.tar.bz2 | |
Merge remote-tracking branch 'sstabellini/xen-fixes' into staging
* sstabellini/xen-fixes:
xen_disk: detach the blkdev before bdrv_delete
xen_console: ignore console disconnect events from console/0
Diffstat (limited to 'json-lexer.c')
0 files changed, 0 insertions, 0 deletions