From 8eb128040f9ffa7fa4517b516149474007d07764b6f2119cb6270ac513cdef5c Mon Sep 17 00:00:00 2001 From: James Fehlig Date: Wed, 25 May 2016 17:19:51 +0000 Subject: [PATCH] - libxl: add domainInterfaceAddresses API ba566428-libxl-dom-iface-addrs.patch bsc#979425 OBS-URL: https://build.opensuse.org/package/show/Virtualization/libvirt?expand=0&rev=534 --- ba566428-libxl-dom-iface-addrs.patch | 170 +++++++++++++++++++++++++++ libvirt.changes | 7 ++ libvirt.spec | 2 + 3 files changed, 179 insertions(+) create mode 100644 ba566428-libxl-dom-iface-addrs.patch diff --git a/ba566428-libxl-dom-iface-addrs.patch b/ba566428-libxl-dom-iface-addrs.patch new file mode 100644 index 0000000..906b9f9 --- /dev/null +++ b/ba566428-libxl-dom-iface-addrs.patch @@ -0,0 +1,170 @@ +commit ba5664288553b046018fa84fd3b9a851ee0032e7 +Author: Chunyan Liu +Date: Fri May 13 14:21:23 2016 +0800 + + 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 + +Index: libvirt-1.3.4/src/libxl/libxl_driver.c +=================================================================== +--- libvirt-1.3.4.orig/src/libxl/libxl_driver.c ++++ libvirt-1.3.4/src/libxl/libxl_driver.c +@@ -5425,6 +5425,145 @@ static int libxlNodeGetSecurityModel(vir + 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 */ +@@ -5525,6 +5664,7 @@ static virHypervisorDriver libxlHypervis + .domainMigrateFinish3Params = libxlDomainMigrateFinish3Params, /* 1.2.6 */ + .domainMigrateConfirm3Params = libxlDomainMigrateConfirm3Params, /* 1.2.6 */ + .nodeGetSecurityModel = libxlNodeGetSecurityModel, /* 1.2.16 */ ++ .domainInterfaceAddresses = libxlDomainInterfaceAddresses, /* 1.3.5 */ + }; + + static virConnectDriver libxlConnectDriver = { diff --git a/libvirt.changes b/libvirt.changes index 87d8dd8..014668c 100644 --- a/libvirt.changes +++ b/libvirt.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Wed May 25 16:41:11 UTC 2016 - jfehlig@suse.com + +- libxl: add domainInterfaceAddresses API + ba566428-libxl-dom-iface-addrs.patch + bsc#979425 + ------------------------------------------------------------------- Wed May 25 14:55:16 UTC 2016 - jfehlig@suse.com diff --git a/libvirt.spec b/libvirt.spec index a1a5115..c86a417 100644 --- a/libvirt.spec +++ b/libvirt.spec @@ -468,6 +468,7 @@ Patch6: fccf2725-libxl-API-4.4.patch Patch7: 5325123d-libxl-migv2-save-restore.patch Patch8: f9edcfa4-libxl-migv2-migration.patch Patch9: a1c9a81a-libxl-rbd-fix.patch +Patch10: ba566428-libxl-dom-iface-addrs.patch # Patches pending upstream review # Need to go upstream Patch150: xen-pv-cdrom.patch @@ -1001,6 +1002,7 @@ libvirt plugin for NSS for translating domain names into IP addresses. %patch7 -p1 %patch8 -p1 %patch9 -p1 +%patch10 -p1 %patch150 -p1 %patch151 -p1 %patch152 -p1