From: Anthony Liguori <aliguori@us.ibm.com>
Date: Mon, 17 Sep 2012 15:23:15 +0000 (-0500)
Subject: Merge remote-tracking branch 'kwolf/for-anthony' into staging
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=109820df4a3b8b58f234319d015a854df9db8981;p=qemu.git

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
---

109820df4a3b8b58f234319d015a854df9db8981