From nobody Sun May 5 14:51:07 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 1553752665655234.4556934224039; Wed, 27 Mar 2019 22:57:45 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 256B946288; Thu, 28 Mar 2019 05:57:44 +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 AA0005D78F; Thu, 28 Mar 2019 05:57: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 14AA81803389; Thu, 28 Mar 2019 05:57:40 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x2S5vcYg018361 for ; Thu, 28 Mar 2019 01:57:38 -0400 Received: by smtp.corp.redhat.com (Postfix) id 6536760CC0; Thu, 28 Mar 2019 05:57:38 +0000 (UTC) Received: from hansolo.pek2.redhat.com (wlc-trust-65.pek2.redhat.com [10.72.3.65]) by smtp.corp.redhat.com (Postfix) with ESMTP id 360A060BE2; Thu, 28 Mar 2019 05:57:36 +0000 (UTC) From: Han Han To: libvir-list@redhat.com Date: Thu, 28 Mar 2019 13:57:27 +0800 Message-Id: <20190328055729.9218-2-hhan@redhat.com> In-Reply-To: <20190328055729.9218-1-hhan@redhat.com> References: <20190328055729.9218-1-hhan@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-loop: libvir-list@redhat.com Cc: Han Han Subject: [libvirt] [PATCH 1/3] vmx: Define macro VMX_CONFIG_FORMAT_ARGV for vmware-vmx 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: , 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.15 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.29]); Thu, 28 Mar 2019 05:57:44 +0000 (UTC) Content-Type: text/plain; charset="utf-8" Signed-off-by: Han Han --- src/vmx/vmx.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/vmx/vmx.h b/src/vmx/vmx.h index cb99e84d18..8c068b4cb2 100644 --- a/src/vmx/vmx.h +++ b/src/vmx/vmx.h @@ -26,6 +26,8 @@ # include "virconf.h" # include "domain_conf.h" =20 +# define VMX_CONFIG_FORMAT_ARGV "vmware-vmx" + typedef struct _virVMXContext virVMXContext; =20 virDomainXMLOptionPtr virVMXDomainXMLConfInit(void); --=20 2.20.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Sun May 5 14:51:07 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 1553752682422862.2011693732057; Wed, 27 Mar 2019 22:58:02 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 5E9F9461D2; Thu, 28 Mar 2019 05:58:01 +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 2971B197FE; Thu, 28 Mar 2019 05:58:01 +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 D6286180338C; Thu, 28 Mar 2019 05:58:00 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x2S5veM4018371 for ; Thu, 28 Mar 2019 01:57:40 -0400 Received: by smtp.corp.redhat.com (Postfix) id 4689160BE2; Thu, 28 Mar 2019 05:57:40 +0000 (UTC) Received: from hansolo.pek2.redhat.com (wlc-trust-65.pek2.redhat.com [10.72.3.65]) by smtp.corp.redhat.com (Postfix) with ESMTP id 00FB360BE0; Thu, 28 Mar 2019 05:57:38 +0000 (UTC) From: Han Han To: libvir-list@redhat.com Date: Thu, 28 Mar 2019 13:57:28 +0800 Message-Id: <20190328055729.9218-3-hhan@redhat.com> In-Reply-To: <20190328055729.9218-1-hhan@redhat.com> References: <20190328055729.9218-1-hhan@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-loop: libvir-list@redhat.com Cc: Han Han Subject: [libvirt] [PATCH 2/3] esx: Use VMX_CONFIG_FORMAT_ARGV for esx naive argv 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: , 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.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.29]); Thu, 28 Mar 2019 05:58:01 +0000 (UTC) Content-Type: text/plain; charset="utf-8" Signed-off-by: Han Han --- src/esx/esx_driver.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/esx/esx_driver.c b/src/esx/esx_driver.c index 08d33b6f3b..d80fef0a58 100644 --- a/src/esx/esx_driver.c +++ b/src/esx/esx_driver.c @@ -2710,7 +2710,7 @@ esxConnectDomainXMLFromNative(virConnectPtr conn, con= st char *nativeFormat, =20 memset(&data, 0, sizeof(data)); =20 - if (STRNEQ(nativeFormat, "vmware-vmx")) { + if (STRNEQ(nativeFormat, VMX_CONFIG_FORMAT_ARGV)) { virReportError(VIR_ERR_INVALID_ARG, _("Unsupported config format '%s'"), nativeFormat); return NULL; @@ -2755,7 +2755,7 @@ esxConnectDomainXMLToNative(virConnectPtr conn, const= char *nativeFormat, =20 memset(&data, 0, sizeof(data)); =20 - if (STRNEQ(nativeFormat, "vmware-vmx")) { + if (STRNEQ(nativeFormat, VMX_CONFIG_FORMAT_ARGV)) { virReportError(VIR_ERR_INVALID_ARG, _("Unsupported config format '%s'"), nativeFormat); return NULL; --=20 2.20.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Sun May 5 14:51:07 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 1553752686319238.13836894694032; Wed, 27 Mar 2019 22:58:06 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 273C28124F; Thu, 28 Mar 2019 05:58:05 +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 EC5765C57A; Thu, 28 Mar 2019 05:58:04 +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 A4648180338D; Thu, 28 Mar 2019 05:58:04 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x2S5vfYt018378 for ; Thu, 28 Mar 2019 01:57:41 -0400 Received: by smtp.corp.redhat.com (Postfix) id E3C7660BE2; Thu, 28 Mar 2019 05:57:41 +0000 (UTC) Received: from hansolo.pek2.redhat.com (wlc-trust-65.pek2.redhat.com [10.72.3.65]) by smtp.corp.redhat.com (Postfix) with ESMTP id D566A60BE0; Thu, 28 Mar 2019 05:57:40 +0000 (UTC) From: Han Han To: libvir-list@redhat.com Date: Thu, 28 Mar 2019 13:57:29 +0800 Message-Id: <20190328055729.9218-4-hhan@redhat.com> In-Reply-To: <20190328055729.9218-1-hhan@redhat.com> References: <20190328055729.9218-1-hhan@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-loop: libvir-list@redhat.com Cc: Han Han Subject: [libvirt] [PATCH 3/3] vmware: Use VMX_CONFIG_FORMAT_ARGV for vmware naive argv 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: , 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.16 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.25]); Thu, 28 Mar 2019 05:58:05 +0000 (UTC) Content-Type: text/plain; charset="utf-8" Signed-off-by: Han Han --- src/vmware/vmware_conf.c | 2 +- src/vmware/vmware_driver.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/vmware/vmware_conf.c b/src/vmware/vmware_conf.c index 0c1b1f9550..76645a2e0d 100644 --- a/src/vmware/vmware_conf.c +++ b/src/vmware/vmware_conf.c @@ -285,7 +285,7 @@ vmwareExtractVersion(struct vmware_driver *driver) break; =20 case VMWARE_DRIVER_FUSION: - if (virAsprintf(&bin, "%s/%s", vmwarePath, "vmware-vmx") < 0) + if (virAsprintf(&bin, "%s/%s", vmwarePath, VMX_CONFIG_FORMAT_A= RGV) < 0) goto cleanup; break; =20 diff --git a/src/vmware/vmware_driver.c b/src/vmware/vmware_driver.c index f4b0989afd..1bc8a06c39 100644 --- a/src/vmware/vmware_driver.c +++ b/src/vmware/vmware_driver.c @@ -956,7 +956,7 @@ vmwareConnectDomainXMLFromNative(virConnectPtr conn, co= nst char *nativeFormat, =20 virCheckFlags(0, NULL); =20 - if (STRNEQ(nativeFormat, "vmware-vmx")) { + if (STRNEQ(nativeFormat, VMX_CONFIG_FORMAT_ARGV)) { virReportError(VIR_ERR_INVALID_ARG, _("Unsupported config format '%s'"), nativeFormat); return NULL; --=20 2.20.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list