mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2025-03-12 04:58:32 +03:00
libxl: add .domainInterfaceAddresses
Add .domainInterfaceAddresses so that user can have a way to get domain interface address by 'virsh domifaddr'. Currently it only supports '--source lease'. Signed-off: Chunyan Liu <cyliu@suse.com>
This commit is contained in:
parent
5da23bbedf
commit
ba56642885
@ -5419,6 +5419,145 @@ static int libxlNodeGetSecurityModel(virConnectPtr conn,
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int
|
||||
libxlGetDHCPInterfaces(virDomainPtr dom,
|
||||
virDomainObjPtr vm,
|
||||
virDomainInterfacePtr **ifaces)
|
||||
{
|
||||
int rv = -1;
|
||||
int n_leases = 0;
|
||||
size_t i, j;
|
||||
size_t ifaces_count = 0;
|
||||
virNetworkPtr network = NULL;
|
||||
char macaddr[VIR_MAC_STRING_BUFLEN];
|
||||
virDomainInterfacePtr iface = NULL;
|
||||
virNetworkDHCPLeasePtr *leases = NULL;
|
||||
virDomainInterfacePtr *ifaces_ret = NULL;
|
||||
|
||||
if (!dom->conn->networkDriver ||
|
||||
!dom->conn->networkDriver->networkGetDHCPLeases) {
|
||||
virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
|
||||
_("Network driver does not support DHCP lease query"));
|
||||
return -1;
|
||||
}
|
||||
|
||||
for (i = 0; i < vm->def->nnets; i++) {
|
||||
if (vm->def->nets[i]->type != VIR_DOMAIN_NET_TYPE_NETWORK)
|
||||
continue;
|
||||
|
||||
virMacAddrFormat(&(vm->def->nets[i]->mac), macaddr);
|
||||
virObjectUnref(network);
|
||||
network = virNetworkLookupByName(dom->conn,
|
||||
vm->def->nets[i]->data.network.name);
|
||||
|
||||
if ((n_leases = virNetworkGetDHCPLeases(network, macaddr,
|
||||
&leases, 0)) < 0)
|
||||
goto error;
|
||||
|
||||
if (n_leases) {
|
||||
if (VIR_EXPAND_N(ifaces_ret, ifaces_count, 1) < 0)
|
||||
goto error;
|
||||
|
||||
if (VIR_ALLOC(ifaces_ret[ifaces_count - 1]) < 0)
|
||||
goto error;
|
||||
|
||||
iface = ifaces_ret[ifaces_count - 1];
|
||||
/* Assuming each lease corresponds to a separate IP */
|
||||
iface->naddrs = n_leases;
|
||||
|
||||
if (VIR_ALLOC_N(iface->addrs, iface->naddrs) < 0)
|
||||
goto error;
|
||||
|
||||
if (VIR_STRDUP(iface->name, vm->def->nets[i]->ifname) < 0)
|
||||
goto cleanup;
|
||||
|
||||
if (VIR_STRDUP(iface->hwaddr, macaddr) < 0)
|
||||
goto cleanup;
|
||||
}
|
||||
|
||||
for (j = 0; j < n_leases; j++) {
|
||||
virNetworkDHCPLeasePtr lease = leases[j];
|
||||
virDomainIPAddressPtr ip_addr = &iface->addrs[j];
|
||||
|
||||
if (VIR_STRDUP(ip_addr->addr, lease->ipaddr) < 0)
|
||||
goto cleanup;
|
||||
|
||||
ip_addr->type = lease->type;
|
||||
ip_addr->prefix = lease->prefix;
|
||||
}
|
||||
|
||||
for (j = 0; j < n_leases; j++)
|
||||
virNetworkDHCPLeaseFree(leases[j]);
|
||||
|
||||
VIR_FREE(leases);
|
||||
}
|
||||
|
||||
*ifaces = ifaces_ret;
|
||||
ifaces_ret = NULL;
|
||||
rv = ifaces_count;
|
||||
|
||||
cleanup:
|
||||
virObjectUnref(network);
|
||||
if (leases) {
|
||||
for (i = 0; i < n_leases; i++)
|
||||
virNetworkDHCPLeaseFree(leases[i]);
|
||||
}
|
||||
VIR_FREE(leases);
|
||||
|
||||
return rv;
|
||||
|
||||
error:
|
||||
if (ifaces_ret) {
|
||||
for (i = 0; i < ifaces_count; i++)
|
||||
virDomainInterfaceFree(ifaces_ret[i]);
|
||||
}
|
||||
VIR_FREE(ifaces_ret);
|
||||
|
||||
goto cleanup;
|
||||
}
|
||||
|
||||
|
||||
static int
|
||||
libxlDomainInterfaceAddresses(virDomainPtr dom,
|
||||
virDomainInterfacePtr **ifaces,
|
||||
unsigned int source,
|
||||
unsigned int flags)
|
||||
{
|
||||
virDomainObjPtr vm = NULL;
|
||||
int ret = -1;
|
||||
|
||||
virCheckFlags(0, -1);
|
||||
|
||||
if (!(vm = libxlDomObjFromDomain(dom)))
|
||||
goto cleanup;
|
||||
|
||||
if (virDomainInterfaceAddressesEnsureACL(dom->conn, vm->def) < 0)
|
||||
goto cleanup;
|
||||
|
||||
if (!virDomainObjIsActive(vm)) {
|
||||
virReportError(VIR_ERR_OPERATION_INVALID, "%s",
|
||||
_("domain is not running"));
|
||||
goto cleanup;
|
||||
}
|
||||
|
||||
switch (source) {
|
||||
case VIR_DOMAIN_INTERFACE_ADDRESSES_SRC_LEASE:
|
||||
ret = libxlGetDHCPInterfaces(dom, vm, ifaces);
|
||||
break;
|
||||
|
||||
default:
|
||||
virReportError(VIR_ERR_ARGUMENT_UNSUPPORTED,
|
||||
_("Unsupported IP address data source %d"),
|
||||
source);
|
||||
break;
|
||||
}
|
||||
|
||||
cleanup:
|
||||
virDomainObjEndAPI(&vm);
|
||||
return ret;
|
||||
}
|
||||
|
||||
|
||||
static virHypervisorDriver libxlHypervisorDriver = {
|
||||
.name = LIBXL_DRIVER_NAME,
|
||||
.connectOpen = libxlConnectOpen, /* 0.9.0 */
|
||||
@ -5519,6 +5658,7 @@ static virHypervisorDriver libxlHypervisorDriver = {
|
||||
.domainMigrateFinish3Params = libxlDomainMigrateFinish3Params, /* 1.2.6 */
|
||||
.domainMigrateConfirm3Params = libxlDomainMigrateConfirm3Params, /* 1.2.6 */
|
||||
.nodeGetSecurityModel = libxlNodeGetSecurityModel, /* 1.2.16 */
|
||||
.domainInterfaceAddresses = libxlDomainInterfaceAddresses, /* 1.3.5 */
|
||||
};
|
||||
|
||||
static virConnectDriver libxlConnectDriver = {
|
||||
|
Loading…
x
Reference in New Issue
Block a user