From nobody Fri Dec 19 20:35:48 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1594244041; cv=none; d=zohomail.com; s=zohoarc; b=TRZpkpL7dH8llTr/4nX8O+4CaMUgA6ODMu+thslCJ8hGltwmMOHmleINZQHOR0gOOgSQYAafk0LQdLsXFPM9kLqwj6RWO1GZn8xBnrQ9cXjRdXQbERddyZtV8EDIJfloJOUIVRVssfYua1jnjmFztdDQQg0fk4BZOvpQ9aVk6eg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594244041; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=siaqroSoXD4iVatcAzgrfgY9PNQydaL+orYDJB+Dt1E=; b=jLbtEgKD8e2nktT9qLsECTI0m8Gp4DaltY951j7WhWXAy+R95AN/5lpOiwbCiJK9xl/dHQXEHJSKiTScKFNOn+/eG7q/wcEXnyND1+bzQwVFQRkSWVyIAdHEZ/ASuripwUZWEaxs1TDsFQ9wOyhM2XimDKF2wrVn6frWiPY7EJ8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1594244041299741.7660244052498; Wed, 8 Jul 2020 14:34:01 -0700 (PDT) Received: from localhost ([::1]:42346 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jtHhX-0006pB-6H for importer@patchew.org; Wed, 08 Jul 2020 17:33:59 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33974) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jtHbM-0007kT-CC for qemu-devel@nongnu.org; Wed, 08 Jul 2020 17:27:36 -0400 Received: from us-smtp-1.mimecast.com ([207.211.31.81]:52590 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1jtHbK-00022I-ON for qemu-devel@nongnu.org; Wed, 08 Jul 2020 17:27:36 -0400 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-310-HJVQwMUFNqOfS-8XuSAMlQ-1; Tue, 07 Jul 2020 17:25:20 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 46BC7BFC0; Tue, 7 Jul 2020 21:25:19 +0000 (UTC) Received: from blackfin.pond.sub.org (ovpn-112-143.ams2.redhat.com [10.36.112.143]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 1610160C87; Tue, 7 Jul 2020 21:25:18 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id A5B5B10C4AE2; Tue, 7 Jul 2020 23:25:04 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594243654; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=siaqroSoXD4iVatcAzgrfgY9PNQydaL+orYDJB+Dt1E=; b=indWlFVAYJzUHJJMA1ob47GXEhMJKfJi2o3Tzu6EfiQSPA0qwOqY0/CSVdQB40Ze3wNFRG uyjeLCj67q6FHAju0PpvQhfs/21DjGUp2rXjz/Mj8W83YY5q6dsPRfpfgMtNTv+tl9VmYT ygaaZIUn+asTTKoz0DnyrS9f4sv17is= X-MC-Unique: HJVQwMUFNqOfS-8XuSAMlQ-1 From: Markus Armbruster To: qemu-devel@nongnu.org Subject: [PULL 38/53] block/parallels: Simplify parallels_open() after previous commit Date: Tue, 7 Jul 2020 23:24:48 +0200 Message-Id: <20200707212503.1495927-39-armbru@redhat.com> In-Reply-To: <20200707212503.1495927-1-armbru@redhat.com> References: <20200707212503.1495927-1-armbru@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=armbru@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=207.211.31.81; envelope-from=armbru@redhat.com; helo=us-smtp-delivery-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/07/07 17:25:09 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -30 X-Spam_score: -3.1 X-Spam_bar: --- X-Spam_report: (-3.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Vladimir Sementsov-Ogievskiy Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" Signed-off-by: Markus Armbruster Reviewed-by: Eric Blake Reviewed-by: Vladimir Sementsov-Ogievskiy Message-Id: <20200707160613.848843-39-armbru@redhat.com> --- block/parallels.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/block/parallels.c b/block/parallels.c index 180dd41e2b..cb5259ac44 100644 --- a/block/parallels.c +++ b/block/parallels.c @@ -842,6 +842,7 @@ static int parallels_open(BlockDriverState *bs, QDict *= options, int flags, &local_err); g_free(buf); if (local_err !=3D NULL) { + error_propagate(errp, local_err); goto fail_options; } =20 @@ -872,15 +873,11 @@ static int parallels_open(BlockDriverState *bs, QDict= *options, int flags, =20 fail_format: error_setg(errp, "Image not in Parallels format"); +fail_options: ret =3D -EINVAL; fail: qemu_vfree(s->header); return ret; - -fail_options: - error_propagate(errp, local_err); - ret =3D -EINVAL; - goto fail; } =20 =20 --=20 2.26.2