From nobody Fri Dec 19 17:51:36 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=1593018450; cv=none; d=zohomail.com; s=zohoarc; b=RcySKVi7sWlPpnNk+XqZVvE0LnwYtH4pwNQ2QUjCiYHc3BZ+ij4tXLPCkOZkc5Sp3Om0Mb72Fv0lP+mOPipoefNcOH/5MPw4N0F1Rujh3QIodErA7G4MwoOuXinO8TqRar2UNdf+bmk+c5+yJkLfDqa1LTLSNCiwzjLQQdGme18= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1593018450; 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=O+ptEAkpNUOkRf8tvAkjLnW2zglOQ056ea63xd5HRvg=; b=k7f85bXk0o0XKgu/rkLdugF/m5AnLLISOHqxBo+FtEYg9cVfwQNAVMR4gaHt+dMaMDSPCxad1BCbNqnDcakE+0FMdNgX6uUNDE43jaOj6GNsAoHtUTY3D3CzTTsh6T3Ns0lc3K/upBSuOVdJfD4jr5s3EZOjpkoiUTtVKYZDdVg= 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 1593018450111972.8706795087835; Wed, 24 Jun 2020 10:07:30 -0700 (PDT) Received: from localhost ([::1]:44630 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jo8rw-0001M7-Ln for importer@patchew.org; Wed, 24 Jun 2020 13:07:28 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:52048) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jo8Vf-0004IL-JU for qemu-devel@nongnu.org; Wed, 24 Jun 2020 12:44:27 -0400 Received: from us-smtp-2.mimecast.com ([205.139.110.61]:23275 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 1jo8VD-00058H-9u for qemu-devel@nongnu.org; Wed, 24 Jun 2020 12:44:27 -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-40--7g_EpuhPTykAZJUnkWvAA-1; Wed, 24 Jun 2020 12:43:51 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 9F78B108BD10; Wed, 24 Jun 2020 16:43:50 +0000 (UTC) Received: from blackfin.pond.sub.org (ovpn-112-121.ams2.redhat.com [10.36.112.121]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 6DE28891E8; Wed, 24 Jun 2020 16:43:50 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 4A36B1138489; Wed, 24 Jun 2020 18:43:45 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1593017036; 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=O+ptEAkpNUOkRf8tvAkjLnW2zglOQ056ea63xd5HRvg=; b=cj4viWfWQbI2BMue3+QqkAedh7q0Q1H0n5Oir04bhVcUU4HLP6LbmHCXTKecRL5G2pVFyz 6WRelnracD7yxRLoL6TAr3ZV0wIX0Q2VEG1tFEZJuvVRkAUUn+B8W7qL+2kwlrLLQA6BWz rbx4KuxFqY+d3L0lSN4jONplRe9t2Ow= X-MC-Unique: -7g_EpuhPTykAZJUnkWvAA-1 From: Markus Armbruster To: qemu-devel@nongnu.org Subject: [PATCH 28/46] block/parallels: Simplify parallels_open() after previous commit Date: Wed, 24 Jun 2020 18:43:26 +0200 Message-Id: <20200624164344.3778251-29-armbru@redhat.com> In-Reply-To: <20200624164344.3778251-1-armbru@redhat.com> References: <20200624164344.3778251-1-armbru@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 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=205.139.110.61; envelope-from=armbru@redhat.com; helo=us-smtp-delivery-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/06/24 00:34:35 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=_AUTOLEARN 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: peter.maydell@linaro.org, vsementsov@virtuozzo.com, berrange@redhat.com, ehabkost@redhat.com, qemu-block@nongnu.org, pbonzini@redhat.com 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 --- block/parallels.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/block/parallels.c b/block/parallels.c index 9e85ab995e..3c22dfdc9d 100644 --- a/block/parallels.c +++ b/block/parallels.c @@ -839,6 +839,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 @@ -868,15 +869,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