diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2010-07-06 10:48:01 -0500 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2010-07-06 10:48:01 -0500 |
| commit | 5efb397f877fc3002c8bc764f4656f4761bd965d (patch) | |
| tree | 4ef1809f16a7f30f237840cdbfc5521afd4e8316 /hw/scsi-disk.c | |
| parent | fb787f81e749fde8c74548f9db1472eb321b9a0c (diff) | |
| parent | 33b1db1c8888b77e06c720ebef0482ed598eb384 (diff) | |
Merge remote branch 'kwolf/for-anthony' into staging
Diffstat (limited to 'hw/scsi-disk.c')
| -rw-r--r-- | hw/scsi-disk.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/hw/scsi-disk.c b/hw/scsi-disk.c index 3e41011ccb..c30709c550 100644 --- a/hw/scsi-disk.c +++ b/hw/scsi-disk.c @@ -1059,6 +1059,11 @@ static int scsi_disk_initfn(SCSIDevice *dev) s->bs = s->qdev.conf.bs; is_cd = bdrv_get_type_hint(s->bs) == BDRV_TYPE_CDROM; + if (bdrv_get_on_error(s->bs, 1) != BLOCK_ERR_REPORT) { + error_report("Device doesn't support drive option rerror"); + return -1; + } + if (!s->serial) { /* try to fall back to value set with legacy -drive serial=... */ dinfo = drive_get_by_blockdev(s->bs); |