]> git.ipfire.org Git - thirdparty/qemu.git/commitdiff
projects / thirdparty / qemu.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (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)
* 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

1  2 
hw/scsi-disk.c patch | diff1 | diff2 | blob | history

diff --cc hw/scsi-disk.c
Simple merge
Mirror of https://git.qemu.org/git/qemu.git