]> xenbits.xensource.com Git - qemu-upstream-4.4-testing.git/commitdiff
Merge remote-tracking branch 'bonzini/scsi-next' into staging
authorAnthony Liguori <aliguori@us.ibm.com>
Wed, 22 Aug 2012 18:31:17 +0000 (13:31 -0500)
committerAnthony Liguori <aliguori@us.ibm.com>
Wed, 22 Aug 2012 18:31:17 +0000 (13:31 -0500)
* bonzini/scsi-next:
  virtio-scsi: add backwards-compatibility properties for 1.1 and earlier machines
  iscsi: fix races between task completion and abort
  iscsi: simplify iscsi_schedule_bh
  iscsi: move iscsi_schedule_bh and iscsi_readv_writev_bh_cb
  Revert "iscsi: Fix NULL dereferences / races between task completion and abort"

1  2 
hw/pc_piix.c

diff --cc hw/pc_piix.c
Simple merge