diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2012-08-22 13:31:17 -0500 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2012-08-22 13:31:17 -0500 |
| commit | a9b670b139ed381bd07df08bdfdcb515dff3ca8c (patch) | |
| tree | 59e4e8489ef3dfbb90635b3dc9ed805b8aef973c /hw/pc_piix.c | |
| parent | 7b2f89c435f895431d55b675dc412275c2069314 (diff) | |
| parent | 07a5298c3067ed63f7d82d8c1a6f479146447289 (diff) | |
| download | focaccia-qemu-a9b670b139ed381bd07df08bdfdcb515dff3ca8c.tar.gz focaccia-qemu-a9b670b139ed381bd07df08bdfdcb515dff3ca8c.zip | |
Merge remote-tracking branch 'bonzini/scsi-next' into staging
* 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"
Diffstat (limited to 'hw/pc_piix.c')
| -rw-r--r-- | hw/pc_piix.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/hw/pc_piix.c b/hw/pc_piix.c index d68dbb2320..88ff0411ca 100644 --- a/hw/pc_piix.c +++ b/hw/pc_piix.c @@ -360,6 +360,14 @@ static QEMUMachine pc_machine_v1_2 = { #define PC_COMPAT_1_1 \ {\ + .driver = "virtio-scsi-pci",\ + .property = "hotplug",\ + .value = "off",\ + },{\ + .driver = "virtio-scsi-pci",\ + .property = "param_change",\ + .value = "off",\ + },{\ .driver = "VGA",\ .property = "vgamem_mb",\ .value = stringify(8),\ |