On 01/17/2018 11:52 PM, Fam Zheng wrote:
> Coverity doesn't like the ignored return value introduced in
> 9d3b155186c278 (hw/block: Fix the return type), and other callers are
> converted already in ceff3e1f01.
>
> This one was added lately in d9bcd6f7f23a and missed the train. Do it
> now.
>
> Signed-off-by: Fam Zheng <f...@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <f4...@amsat.org>
> ---
> hw/scsi/scsi-generic.c | 9 +++------
> 1 file changed, 3 insertions(+), 6 deletions(-)
>
> diff --git a/hw/scsi/scsi-generic.c b/hw/scsi/scsi-generic.c
> index ba70c0dc19..7414fe2d67 100644
> --- a/hw/scsi/scsi-generic.c
> +++ b/hw/scsi/scsi-generic.c
> @@ -482,7 +482,6 @@ static void scsi_generic_realize(SCSIDevice *s, Error
> **errp)
> int rc;
> int sg_version;
> struct sg_scsi_id scsiid;
> - Error *local_err = NULL;
>
> if (!s->conf.blk) {
> error_setg(errp, "drive property not set");
> @@ -516,11 +515,9 @@ static void scsi_generic_realize(SCSIDevice *s, Error
> **errp)
> error_setg(errp, "SG_GET_SCSI_ID ioctl failed");
> return;
> }
> - blkconf_apply_backend_options(&s->conf,
> - blk_is_read_only(s->conf.blk),
> - true, &local_err);
> - if (local_err) {
> - error_propagate(errp, local_err);
> + if (!blkconf_apply_backend_options(&s->conf,
> + blk_is_read_only(s->conf.blk),
> + true, errp)) {
> return;
> }
>
>
