diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2012-09-17 10:23:15 -0500 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2012-09-17 10:23:15 -0500 |
| commit | 109820df4a3b8b58f234319d015a854df9db8981 (patch) | |
| tree | c08a668dc3ecb2063e729658d0e63afa671778e5 /net/tap-bsd.c | |
| parent | 509e9c462d03c4b7edc4a0d277311a7f45c9c046 (diff) | |
| parent | fe235a06e1e008dedd2ac3cc0a3a655169ce9b33 (diff) | |
Merge remote-tracking branch 'kwolf/for-anthony' into staging
* kwolf/for-anthony:
block: Don't forget to delete temporary file
Don't require encryption password for 'qemu-img info' command
qemu-img: Add json output option to the info command.
qapi: Add SnapshotInfo and ImageInfo.
ahci: properly reset PxCMD on HBA reset
block: fix block tray status
vdi: Fix warning from clang
block/curl: Fix wrong free statement
ide: Fix error messages from static code analysis (no real error)
ATAPI: STARTSTOPUNIT only eject/load media if powercondition is 0
sheepdog: fix savevm and loadvm
Diffstat (limited to 'net/tap-bsd.c')
0 files changed, 0 insertions, 0 deletions