From nobody Tue May 13 20:36:34 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1530630217885549.9051649362968; Tue, 3 Jul 2018 08:03:37 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id AE4D481DFC; Tue, 3 Jul 2018 15:03:36 +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 4946918BAC; Tue, 3 Jul 2018 15:03:36 +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 E41334A464; Tue, 3 Jul 2018 15:03:35 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w63F3YKb030132 for ; Tue, 3 Jul 2018 11:03:34 -0400 Received: by smtp.corp.redhat.com (Postfix) id C16B220180EB; Tue, 3 Jul 2018 15:03:33 +0000 (UTC) Received: from localhost.localdomain (ovpn-204-103.brq.redhat.com [10.40.204.103]) by smtp.corp.redhat.com (Postfix) with ESMTP id 2B93C2026D76; Tue, 3 Jul 2018 15:03:33 +0000 (UTC) From: Michal Privoznik To: libvir-list@redhat.com Date: Tue, 3 Jul 2018 17:03:27 +0200 Message-Id: <650259c6634a71d9186ac2b4e40547e3e4ef0ea0.1530630182.git.mprivozn@redhat.com> In-Reply-To: References: In-Reply-To: References: X-Scanned-By: MIMEDefang 2.78 on 10.11.54.4 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 2/2] esx: De-duplicate @virtualMachine check in esxDomainLookupByName 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: , MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.25]); Tue, 03 Jul 2018 15:03:37 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" The function call esxVI_LookupVirtualMachineByName(occurrence =3D OptionalItem) and then checks if @virtualMachine is NULL. If it is an error is reported. The same result can be achieved by setting occurrence to RequiredItem. Signed-off-by: Michal Privoznik --- src/esx/esx_driver.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/src/esx/esx_driver.c b/src/esx/esx_driver.c index e906d11fa9..01bcc99962 100644 --- a/src/esx/esx_driver.c +++ b/src/esx/esx_driver.c @@ -1577,12 +1577,7 @@ esxDomainLookupByName(virConnectPtr conn, const char= *name) "config.uuid\0") < 0 || esxVI_LookupVirtualMachineByName(priv->primary, name, propertyName= List, &virtualMachine, - esxVI_Occurrence_OptionalItem) < = 0) { - goto cleanup; - } - - if (!virtualMachine) { - virReportError(VIR_ERR_NO_DOMAIN, _("No domain with name '%s'"), n= ame); + esxVI_Occurrence_RequiredItem) < = 0) { goto cleanup; } =20 --=20 2.16.4 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list