diff options
| author | Fam Zheng | 2014-08-12 04:12:54 +0200 |
|---|---|---|
| committer | Paolo Bonzini | 2014-08-26 13:20:44 +0200 |
| commit | 5ff5efb46c4526f111e14c2247609f1c56f0f8f3 (patch) | |
| tree | 9c3a6652abe1500ea0f79818241c6a806ad508d7 /hw/scsi/scsi-disk.c | |
| parent | Merge remote-tracking branch 'remotes/pmaydell/tags/pull-target-arm-20140819'... (diff) | |
| download | qemu-5ff5efb46c4526f111e14c2247609f1c56f0f8f3.tar.gz qemu-5ff5efb46c4526f111e14c2247609f1c56f0f8f3.tar.xz qemu-5ff5efb46c4526f111e14c2247609f1c56f0f8f3.zip | |
block: Pass errp in blkconf_geometry
This allows us to pass error information to caller.
Reviewed-by: Andreas Färber <afaerber@suse.de>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Signed-off-by: Fam Zheng <famz@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'hw/scsi/scsi-disk.c')
| -rw-r--r-- | hw/scsi/scsi-disk.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/hw/scsi/scsi-disk.c b/hw/scsi/scsi-disk.c index d55521dcf6..b7ebdd766a 100644 --- a/hw/scsi/scsi-disk.c +++ b/hw/scsi/scsi-disk.c @@ -2237,6 +2237,7 @@ static void scsi_disk_unit_attention_reported(SCSIDevice *dev) static int scsi_initfn(SCSIDevice *dev) { SCSIDiskState *s = DO_UPCAST(SCSIDiskState, qdev, dev); + Error *err = NULL; if (!s->qdev.conf.bs) { error_report("drive property not set"); @@ -2250,9 +2251,13 @@ static int scsi_initfn(SCSIDevice *dev) } blkconf_serial(&s->qdev.conf, &s->serial); - if (dev->type == TYPE_DISK - && blkconf_geometry(&dev->conf, NULL, 65535, 255, 255) < 0) { - return -1; + if (dev->type == TYPE_DISK) { + blkconf_geometry(&dev->conf, NULL, 65535, 255, 255, &err); + if (err) { + error_report("%s", error_get_pretty(err)); + error_free(err); + return -1; + } } if (s->qdev.conf.discard_granularity == -1) { |