]> git.proxmox.com Git - qemu.git/commit
projects / qemu.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 5105b6d 6f382ed)
Merge remote-tracking branch 'qmp/queue/qmp' into staging
authorAnthony Liguori <aliguori@us.ibm.com>
Fri, 24 Feb 2012 15:45:22 +0000 (09:45 -0600)
committerAnthony Liguori <aliguori@us.ibm.com>
Fri, 24 Feb 2012 15:45:22 +0000 (09:45 -0600)
commit7c1daf341f3374a490a03dfcde17021d3369aa48
treef45381088a6d7fad7778ffd5cef6602f0aa3d640tree
parent5105b6d88d1958de8c12672fba7e30a0b0f38653commit | diff
parent6f382ed226f3a408825d882e6c4b47499baaa15bcommit | diff
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
hw/scsi-disk.c diff1 | diff2 | blob | history
Qemu copy for testing