ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

scsi-generic: Simplify error handling code 

Coverity doesn't like the ignored return value introduced in
9d3b155186 (hw/block: Fix the return type), and other callers are
converted already in ceff3e1f01.

This one was added lately in d9bcd6f7f2 and missed the train. Do it
now.

Signed-off-by: Fam Zheng <famz@redhat.com>
Message-Id: <20180118025245.13042-1-famz@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Fam Zheng 2018-01-18 10:52:45 +08:00 committed by Paolo Bonzini
parent 0b15209571
commit c6caae553c
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
hw/scsi/scsi-generic.c
View File

@ -482,7 +482,6 @@ static void scsi_generic_realize(SCSIDevice *s, Error **errp)
int rc; int rc;
int sg_version; int sg_version;
struct sg_scsi_id scsiid; struct sg_scsi_id scsiid;
Error *local_err = NULL;
if (!s->conf.blk) { if (!s->conf.blk) {
error_setg(errp, "drive property not set"); 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"); error_setg(errp, "SG_GET_SCSI_ID ioctl failed");
return; return;
} }
blkconf_apply_backend_options(&s->conf, if (!blkconf_apply_backend_options(&s->conf,
blk_is_read_only(s->conf.blk), blk_is_read_only(s->conf.blk),
true, &local_err); true, errp)) {
if (local_err) {
error_propagate(errp, local_err);
return; return;
} }