From nobody Sun Feb 8 13:09:33 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 205.139.110.61 as permitted sender) client-ip=205.139.110.61; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.61 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=1576853934; cv=none; d=zohomail.com; s=zohoarc; b=DTNdtgYINOUYrxOqmIQSzPAaKb7l0KRqGTBr6cJsleoza8B511vFyuIg8w8/Tpl+cdWITK/+MYvaPNbriZroYA32TJ4m5rnwIsMMJ2bg+0QD4+Xfjc4/fQQp4Mj1/hXaoOnwd0h6jVCoXS7zRL7Nqqfw/1X46ljY2KXlPyw4BIA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1576853934; 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=DudCZ9VFqjXDWer4AQNnWqVY9sriYXM3NL9YCKlcyJU=; b=nuEC3iB3+rb9QSG5HsutR1/sUcAzcV1UFseug4WoLiQPeassCLWNMbCmTajUZ1CBBPFSOpisPKqclEYP/j3X0p7naJvTVHTew7ba3o8wrBOTJRy8Ce1I8vqgimEGicxJamnH2Ujlbs2GIZG9sI//LE9zw5JZ0eSFfJxa1fZE1/o= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.61 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-delivery-1.mimecast.com (us-smtp-1.mimecast.com [205.139.110.61]) by mx.zohomail.com with SMTPS id 1576853934930829.0410232156598; Fri, 20 Dec 2019 06:58:54 -0800 (PST) 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-424-EpQYxnWyPjKttQx4Z_62rA-1; Fri, 20 Dec 2019 09:58:51 -0500 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 mimecast-mx01.redhat.com (Postfix) with ESMTPS id 34ABF8FD567; Fri, 20 Dec 2019 14:58:46 +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 11EE35DA60; Fri, 20 Dec 2019 14:58:46 +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 C0E12252EF; Fri, 20 Dec 2019 14:58:45 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id xBKEwSYC032564 for ; Fri, 20 Dec 2019 09:58:28 -0500 Received: by smtp.corp.redhat.com (Postfix) id E035C6FEF3; Fri, 20 Dec 2019 14:58:28 +0000 (UTC) Received: from lindworm.usersys.redhat.com (unknown [10.43.2.105]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 69AB16E41E for ; Fri, 20 Dec 2019 14:58:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1576853933; 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=DudCZ9VFqjXDWer4AQNnWqVY9sriYXM3NL9YCKlcyJU=; b=BcFGUrqz6zaqjc7CnGBbEXy+j5REY40zJeIgR8UjfcXQo0Se9BV20fIfDpU4GudG7KUDki BLd94PNB/yOJSbgFcMRQYHlHYR6hCUkEJFxHk+CcT35tuWY114MRAiOUwOJDxlnC96IWmw r21c1fRGgMhItYmRm1tQYMvGwAVBZwY= From: Pino Toscano To: libvir-list@redhat.com Date: Fri, 20 Dec 2019 15:58:12 +0100 Message-Id: <20191220145813.756206-11-ptoscano@redhat.com> In-Reply-To: <20191220145813.756206-1-ptoscano@redhat.com> References: <20191220145813.756206-1-ptoscano@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH v3 10/11] esx: implement domainInterfaceAddresses 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.14 X-MC-Unique: EpQYxnWyPjKttQx4Z_62rA-1 X-Mimecast-Spam-Score: 0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Implement the .domainInterfaceAddresses hypervisor API, although only functional for the VIR_DOMAIN_INTERFACE_ADDRESSES_SRC_AGENT source. Signed-off-by: Pino Toscano --- docs/drvesx.html.in | 4 ++ src/esx/esx_driver.c | 166 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 170 insertions(+) diff --git a/docs/drvesx.html.in b/docs/drvesx.html.in index 465daafc2e..c4a2ae78a8 100644 --- a/docs/drvesx.html.in +++ b/docs/drvesx.html.in @@ -792,6 +792,10 @@ Enter administrator password for example-vcenter.com:
  • virDomainGetHostname
    • +
  • + virDomainInterfaceAddresses (only for the + VIR_DOMAIN_INTERFACE_ADDRESSES_SRC_AGENT source) +
  • virDomainReboot
    • diff --git a/src/esx/esx_driver.c b/src/esx/esx_driver.c index 39e3faeb8f..73b8f32f1b 100644 --- a/src/esx/esx_driver.c +++ b/src/esx/esx_driver.c @@ -5122,6 +5122,171 @@ esxDomainGetHostname(virDomainPtr domain, } =20 =20 +static int +esxParseIPAddress(const char *ipAddress, int prefixLength, + virDomainIPAddress *addr) +{ + virSocketAddr tmp_addr; + virIPAddrType addr_type; + + if (virSocketAddrParseAny(&tmp_addr, ipAddress, AF_UNSPEC, false) <=3D= 0) + return 0; + + switch (VIR_SOCKET_ADDR_FAMILY(&tmp_addr)) { + case AF_INET: + addr_type =3D VIR_IP_ADDR_TYPE_IPV4; + break; + case AF_INET6: + addr_type =3D VIR_IP_ADDR_TYPE_IPV6; + break; + default: + return 0; + } + + addr->type =3D addr_type; + addr->addr =3D g_strdup(ipAddress); + addr->prefix =3D prefixLength; + + return 1; +} + + +static int +esxDomainInterfaceAddresses(virDomainPtr domain, + virDomainInterfacePtr **ifaces, + unsigned int source, + unsigned int flags) +{ + int result =3D -1; + esxPrivate *priv =3D domain->conn->privateData; + esxVI_String *propertyNameList =3D NULL; + esxVI_ObjectContent *virtualMachine =3D NULL; + esxVI_VirtualMachinePowerState powerState; + esxVI_DynamicProperty *dynamicProperty; + esxVI_GuestNicInfo *guestNicInfoList =3D NULL; + esxVI_GuestNicInfo *guestNicInfo =3D NULL; + virDomainInterfacePtr *ifaces_ret =3D NULL; + size_t ifaces_count =3D 0; + size_t i; + int ret; + + virCheckFlags(0, -1); + if (source !=3D VIR_DOMAIN_INTERFACE_ADDRESSES_SRC_AGENT) { + virReportError(VIR_ERR_ARGUMENT_UNSUPPORTED, + _("Unknown IP address data source %d"), + source); + return -1; + } + + if (esxVI_EnsureSession(priv->primary) < 0) + return -1; + + if (esxVI_String_AppendValueListToList(&propertyNameList, + "runtime.powerState\0" + "guest.net") < 0 || + esxVI_LookupVirtualMachineByUuid(priv->primary, domain->uuid, + propertyNameList, &virtualMachine, + esxVI_Occurrence_RequiredItem) || + esxVI_GetVirtualMachinePowerState(virtualMachine, &powerState) < 0= ) { + goto cleanup; + } + + if (powerState !=3D esxVI_VirtualMachinePowerState_PoweredOn) { + virReportError(VIR_ERR_OPERATION_INVALID, "%s", + _("Domain is not powered on")); + goto cleanup; + } + + for (dynamicProperty =3D virtualMachine->propSet; dynamicProperty; + dynamicProperty =3D dynamicProperty->_next) { + if (STREQ(dynamicProperty->name, "guest.net")) { + if (esxVI_GuestNicInfo_CastListFromAnyType + (dynamicProperty->val, &guestNicInfoList) < 0) { + goto cleanup; + } + } + } + + if (!guestNicInfoList) + goto cleanup; + + for (guestNicInfo =3D guestNicInfoList; guestNicInfo; + guestNicInfo =3D guestNicInfo->_next) { + virDomainInterfacePtr iface =3D NULL; + size_t addrs_count =3D 0; + + if (guestNicInfo->connected !=3D esxVI_Boolean_True || + !guestNicInfo->network) { + continue; + } + + if (VIR_EXPAND_N(ifaces_ret, ifaces_count, 1) < 0) + goto cleanup; + + if (VIR_ALLOC(ifaces_ret[ifaces_count - 1]) < 0) + goto cleanup; + + iface =3D ifaces_ret[ifaces_count - 1]; + iface->naddrs =3D 0; + iface->name =3D g_strdup(guestNicInfo->network); + iface->hwaddr =3D g_strdup(guestNicInfo->macAddress); + + if (guestNicInfo->ipConfig) { + esxVI_NetIpConfigInfoIpAddress *ipAddress; + for (ipAddress =3D guestNicInfo->ipConfig->ipAddress; ipAddres= s; + ipAddress =3D ipAddress->_next) { + virDomainIPAddress ip_addr; + + ret =3D esxParseIPAddress(ipAddress->ipAddress, + ipAddress->prefixLength->value, &i= p_addr); + if (ret < 0) + goto cleanup; + else if (ret =3D=3D 0) + continue; + + if (VIR_APPEND_ELEMENT(iface->addrs, addrs_count, ip_addr)= < 0) + goto cleanup; + } + } else { + esxVI_String *str; + for (str =3D guestNicInfo->ipAddress; str; + str =3D str->_next) { + virDomainIPAddress ip_addr; + + /* Not even the netmask seems available... */ + ret =3D esxParseIPAddress(str->value, 0, &ip_addr); + if (ret < 0) + goto cleanup; + else if (ret =3D=3D 0) + continue; + + if (VIR_APPEND_ELEMENT(iface->addrs, addrs_count, ip_addr)= < 0) + goto cleanup; + + } + } + + iface->naddrs =3D addrs_count; + } + + *ifaces =3D ifaces_ret; + result =3D ifaces_count; + + cleanup: + if (result < 0) { + if (ifaces_ret) { + for (i =3D 0; i < ifaces_count; i++) + virDomainInterfaceFree(ifaces_ret[i]); + } + } + esxVI_String_Free(&propertyNameList); + esxVI_ObjectContent_Free(&virtualMachine); + esxVI_GuestNicInfo_Free(&guestNicInfoList); + + return result; +} + + static virHypervisorDriver esxHypervisorDriver =3D { .name =3D "ESX", .connectOpen =3D esxConnectOpen, /* 0.7.0 */ @@ -5203,6 +5368,7 @@ static virHypervisorDriver esxHypervisorDriver =3D { .connectIsAlive =3D esxConnectIsAlive, /* 0.9.8 */ .domainHasManagedSaveImage =3D esxDomainHasManagedSaveImage, /* 1.2.13= */ .domainGetHostname =3D esxDomainGetHostname, /* 6.0.0 */ + .domainInterfaceAddresses =3D esxDomainInterfaceAddresses, /* 6.0.0 */ }; =20 =20 --=20 2.24.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list