From nobody Mon Feb 9 16:02:31 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) client-ip=170.10.129.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1632496790; cv=none; d=zohomail.com; s=zohoarc; b=WvRg9gmzV6Wt+WYnm6kaLAn7jVeDKZvzj9SjKtFmHEu1ZgPag90jYIGXZIo5QSRTGU//fkkftiPvJS/LZESWNyWyhAC9BNyG6CJE6xrHqvxqv+VNkuepYA7RUB3z9nbFjyMV2ca82S/HXq7G6ahaCGlWrSy5l2Z42tv4KHl6EoE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1632496790; h=Content-Type:Content-Transfer-Encoding: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=PWbTPeUrpZEROOfhe4b0Wt+rgthx5MAFpYIh5nqdRI8=; b=UTsoJv+mCUakKV6sHBggZOujC4FrpMkQU0I7lu0JqSxbSa0PY29q0L+KftPlmfIrq2VGQk5z+HXEUIxUh6v/qiw3NS/s2oMlZiPmaONtkghimOC3ksFz5UZ3Ojd6d77L2HEtvZgClPg2ju9VDrfwaJI5fJhRV3eDZ71LBSOUL6Y= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mx.zohomail.com with SMTPS id 1632496790271450.3809756500043; Fri, 24 Sep 2021 08:19:50 -0700 (PDT) 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-43-CgDP_QDZOIypGKHOGDlHtA-1; Fri, 24 Sep 2021 11:19:47 -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 8529610144E9; Fri, 24 Sep 2021 15:19:42 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 658F760BF1; Fri, 24 Sep 2021 15:19:42 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 1755A4EA2A; Fri, 24 Sep 2021 15:19:42 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 18OFI3bM026567 for ; Fri, 24 Sep 2021 11:18:03 -0400 Received: by smtp.corp.redhat.com (Postfix) id DDBA91803B; Fri, 24 Sep 2021 15:18:02 +0000 (UTC) Received: from fedora.redhat.com (unknown [10.43.2.78]) by smtp.corp.redhat.com (Postfix) with ESMTP id 1DFAC177C0 for ; Fri, 24 Sep 2021 15:18:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1632496789; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=PWbTPeUrpZEROOfhe4b0Wt+rgthx5MAFpYIh5nqdRI8=; b=Z8lwTSRoGZxqQ1mVNK+Wws5Wz37o5dGIS8EJI7wdEXjdQDAhwb7JuFoQHJD4ri/5JUz8oz BTcHsoiXJS0mvSe6ObViK7LWySUmG/b/sBXohB8Rg4qmcPSdMf9Lt11ytiNq2njInPCvJN xEgPzhvJhLsMY1wTNmNNB/5rc+Cf9SM= X-MC-Unique: CgDP_QDZOIypGKHOGDlHtA-1 From: Kristina Hanicova To: libvir-list@redhat.com Subject: [PATCH v2 1/7] virsh: domain: use early return in virshDomainDefine() Date: Fri, 24 Sep 2021 17:17:44 +0200 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-loop: libvir-list@redhat.com X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1632496791819100001 Content-Type: text/plain; charset="utf-8" Signed-off-by: Kristina Hanicova --- tools/virsh-domain.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index bee3346eb0..edee548d8a 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -245,18 +245,18 @@ static virDomainPtr virshDomainDefine(virConnectPtr conn, const char *xml, unsigned int flags) { virDomainPtr dom; - if (flags) { - dom =3D virDomainDefineXMLFlags(conn, xml, flags); - /* If validate is the only flag, just drop it and - * try again. - */ - if (!dom) { - if ((virGetLastErrorCode() =3D=3D VIR_ERR_NO_SUPPORT) && - (flags =3D=3D VIR_DOMAIN_DEFINE_VALIDATE)) - dom =3D virDomainDefineXML(conn, xml); - } - } else { - dom =3D virDomainDefineXML(conn, xml); + + if (!flags) + return virDomainDefineXML(conn, xml); + + dom =3D virDomainDefineXMLFlags(conn, xml, flags); + /* If validate is the only flag, just drop it and + * try again. + */ + if (!dom) { + if ((virGetLastErrorCode() =3D=3D VIR_ERR_NO_SUPPORT) && + (flags =3D=3D VIR_DOMAIN_DEFINE_VALIDATE)) + dom =3D virDomainDefineXML(conn, xml); } return dom; } --=20 2.31.1