From patchwork Mon Feb 5 19:28:22 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 869469 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="nAEd/OVd"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3zZySc5dpJz9s8J for ; Tue, 6 Feb 2018 06:33:52 +1100 (AEDT) Received: from localhost ([::1]:54776 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eimWU-0007fl-SB for incoming@patchwork.ozlabs.org; Mon, 05 Feb 2018 14:33:50 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44516) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eimS8-0004KK-78 for qemu-devel@nongnu.org; Mon, 05 Feb 2018 14:29:21 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eimS4-0004to-AJ for qemu-devel@nongnu.org; Mon, 05 Feb 2018 14:29:20 -0500 Received: from mail-wm0-x242.google.com ([2a00:1450:400c:c09::242]:36855) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1eimS4-0004tT-2u for qemu-devel@nongnu.org; Mon, 05 Feb 2018 14:29:16 -0500 Received: by mail-wm0-x242.google.com with SMTP id f3so28128817wmc.1 for ; Mon, 05 Feb 2018 11:29:15 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=TITI2OCRY2Mfon2BC1d9xXnyLOWoGMyhe+5CAN9ypug=; b=nAEd/OVdudDTejj8OhcWjoTaqgHR+/169rGnfjDp7xu032T6ByZLwUFk9FsfTz7nLJ qTqeHyLSOeRh6YPEa1RmfGnKpQOf2044SY0CUsVayFSSrmiQGl8fxAl7vmIqkQEKSXIN 4gd2LinVWZD9FmxDz3/Lb0TdvlSttMTVAAtXqaLwtNZgr4zi5GcYoGus4CH5WKLNdx00 c4Ojf95qBbmBn3LnEMAc6bzd9FIqSvloodF+1WYAo5VEz2rx53BU09P7Lk3vo8zAtTTk RpVjeGybQdOA3TP7L1EyFvDNPioSOdnsr87nBrECj2cxDCFXGnMxYzEToxUM7z81ivMC vQog== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=TITI2OCRY2Mfon2BC1d9xXnyLOWoGMyhe+5CAN9ypug=; b=SYIpDspLkVUBU2EOCdsfzN96T9T/+au0T5wqO6p+UQtMVubt9oj3HWAq3TCGo4zZLc DeeYol22RCiVJ10nvh8OR3nx7hHDN4+5HBf+GPmVRsTs0kz6deqlNRdUsbqUMuVvjuDk SG61PPGM1GcD2NCc/mBmQVv4SxovdbPDil6VDovV9caxVhRn9OJr6p1htPSI/R78nGYo Grjb4IQLkOjppZc9FlHWJCGPQhnDlOk5IlKreYxeBzACk2rqbR2JxhYZEFKxT6tDUW1Z mIk6ozG+uhaUeWma1KR+YcHqmWPjQMTXqgrkUeDCgzEE9MpKdi/mWbyWQP9VieCThvbV NqMg== X-Gm-Message-State: APf1xPBZcw8mLZNgOJiwXZ2Dy2obVKUn1oa70bw2dptvi5YwqeNSajEH hyiXIWwo9oYd0+JfemHFLOMOlDva X-Google-Smtp-Source: AH8x224PIlADzifFXH0Oo6Red8fmhjfpuRQS/4AZXLDt5GdNr8wirAHl4GNH6AYEQc/Cv47pdH8lLQ== X-Received: by 10.28.167.5 with SMTP id q5mr352862wme.90.1517858954607; Mon, 05 Feb 2018 11:29:14 -0800 (PST) Received: from 640k.lan ([82.84.122.246]) by smtp.gmail.com with ESMTPSA id g8sm20029891wra.18.2018.02.05.11.29.13 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 05 Feb 2018 11:29:13 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Mon, 5 Feb 2018 20:28:22 +0100 Message-Id: <1517858941-5538-9-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1517858941-5538-1-git-send-email-pbonzini@redhat.com> References: <1517858941-5538-1-git-send-email-pbonzini@redhat.com> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:400c:c09::242 Subject: [Qemu-devel] [PULL 08/47] scsi-generic: Simplify error handling code X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Fam Zheng Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Fam Zheng 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 Message-Id: <20180118025245.13042-1-famz@redhat.com> Reviewed-by: Philippe Mathieu-Daudé Signed-off-by: Paolo Bonzini --- 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 ba70c0d..7414fe2 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; }