diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2012-08-29 08:23:18 -0500 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2012-08-29 08:23:18 -0500 |
| commit | 1e2778d59d110404428627690950405577be5090 (patch) | |
| tree | 0f0e4b2eb9b72d0e85105567940723cbcd35f3ee /hw/scsi-disk.c | |
| parent | 7dd6f4b250772e4859997d2624ac0bbc8d02482b (diff) | |
| parent | 135b9088780d7d8e5eae027b4fba6b33562f7006 (diff) | |
Merge remote-tracking branch 'bonzini/scsi-next' into staging
* bonzini/scsi-next:
iscsi: Set number of blocks to 0 for blank CDROM devices
scsi: more fixes to properties for passthrough devices
esp: support 24-bit DMA
megasas: Add 'hba_serial' property
Diffstat (limited to 'hw/scsi-disk.c')
| -rw-r--r-- | hw/scsi-disk.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/hw/scsi-disk.c b/hw/scsi-disk.c index 409f760ef7..21b862dadb 100644 --- a/hw/scsi-disk.c +++ b/hw/scsi-disk.c @@ -2421,6 +2421,7 @@ static TypeInfo scsi_cd_info = { #ifdef __linux__ static Property scsi_block_properties[] = { DEFINE_PROP_DRIVE("drive", SCSIDiskState, qdev.conf.bs), + DEFINE_PROP_INT32("bootindex", SCSIDiskState, qdev.conf.bootindex, -1), DEFINE_PROP_END_OF_LIST(), }; |