From: Anthony Liguori <aliguori@us.ibm.com>
Date: Fri, 24 Feb 2012 15:45:22 +0000 (-0600)
Subject: Merge remote-tracking branch 'qmp/queue/qmp' into staging
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=7c1daf341f3374a490a03dfcde17021d3369aa48;p=qemu.git

Merge remote-tracking branch 'qmp/queue/qmp' into staging

* qmp/queue/qmp:
  qmp: add DEVICE_TRAY_MOVED event
  ide: drop ide_tray_state_post_load()
  block: Don't call bdrv_eject() if the tray state didn't change
  block: bdrv_eject(): Make eject_flag a real bool
  block: Rename bdrv_mon_event() & BlockMonEventAction
---

7c1daf341f3374a490a03dfcde17021d3369aa48