From nobody Wed May 15 22:32:01 2024 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 1530630219549455.3109852110449; Tue, 3 Jul 2018 08:03:39 -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 33F728762C; Tue, 3 Jul 2018 15:03:38 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id ECE3675524; Tue, 3 Jul 2018 15:03:37 +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 8C13818037F0; Tue, 3 Jul 2018 15:03:37 +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 w63F3WrW030121 for ; Tue, 3 Jul 2018 11:03:33 -0400 Received: by smtp.corp.redhat.com (Postfix) id D6A1620180EB; Tue, 3 Jul 2018 15:03:32 +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 43F732026D76; Tue, 3 Jul 2018 15:03:32 +0000 (UTC) From: Michal Privoznik To: libvir-list@redhat.com Date: Tue, 3 Jul 2018 17:03:26 +0200 Message-Id: <3f4f5d26ec91c183496148e21ea2d091d010fdfc.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 1/2] esx: Report error in esxVI_LookupVirtualMachineByName 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.26]); Tue, 03 Jul 2018 15:03:38 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" When reviewing 00d9edfe2f39f60b40 I've changed proposed patch and made it to not report error if no domain is found. This is wrong and the original patch was okay. Thing is, both callers pass occurrence =3D OptionalItem so no error message overwriting is done as I thought initially. Signed-off-by: Michal Privoznik --- src/esx/esx_vi.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/esx/esx_vi.c b/src/esx/esx_vi.c index 0bdfc5a8be..25fbdc7e44 100644 --- a/src/esx/esx_vi.c +++ b/src/esx/esx_vi.c @@ -3014,8 +3014,11 @@ esxVI_LookupVirtualMachineByName(esxVI_Context *ctx,= const char *name, break; } =20 - if (!(*virtualMachine) && occurrence !=3D esxVI_Occurrence_OptionalIte= m) + if (!(*virtualMachine) && occurrence !=3D esxVI_Occurrence_OptionalIte= m) { + virReportError(VIR_ERR_NO_DOMAIN, + _("Could not find domain with name '%s'"), name); goto cleanup; + } =20 result =3D 0; =20 --=20 2.16.4 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Wed May 15 22:32:01 2024 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