tree c08a668dc3ecb2063e729658d0e63afa671778e5
parent 509e9c462d03c4b7edc4a0d277311a7f45c9c046
parent fe235a06e1e008dedd2ac3cc0a3a655169ce9b33
author Anthony Liguori <aliguori@us.ibm.com> 1347895395 -0500
committer Anthony Liguori <aliguori@us.ibm.com> 1347895395 -0500

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