On 23/08/13 06:18, nehaljwani wrote: > Define a new API virDomainInterfacesAddresses, which returns > the address information of a running domain's interfaces(s). > If no interface name is specified, it returns the information > of all interfaces, otherwise it only returns the information > of the specificed interface. The address information includes > the MAC and IP addresses. > > The API is going to provide multiple methods by flags, e.g. > > * Query guest agent > * Parse lease file of dnsmasq > * DHCP snooping > > But at this stage, it will only work with guest agent, and flags > won't be supported. > > include/libvirt/libvirt.h.in: > * Define virDomainInterfacesAddresses > * Define structs virDomainInterface, virDomainIPAddress > > python/generator.py: > * Skip the auto-generation for virDomainInterfacesAddresses > > src/driver.h: > * Define domainInterfacesAddresses > > src/libvirt.c: > * Implement virDomainInterfacesAddresses > > src/libvirt_public.syms: > * Export the new symbol You introduced virDomainInterfaceFree in the new series, the commit log should be changed to be consistent. > > --- > include/libvirt/libvirt.h.in | 33 +++++++++++++ > python/generator.py | 3 ++ > src/driver.h | 6 +++ > src/libvirt.c | 110 > +++++++++++++++++++++++++++++++++++++++++++ > src/libvirt_public.syms | 6 +++ > 5 files changed, 158 insertions(+) > > diff --git a/include/libvirt/libvirt.h.in b/include/libvirt/libvirt.h.in > index a47e33c..deb1e1f 100644 > --- a/include/libvirt/libvirt.h.in > +++ b/include/libvirt/libvirt.h.in > @@ -2044,6 +2044,39 @@ int virDomainGetInterfaceParameters > (virDomainPtr dom, > virTypedParameterPtr params, > int > *nparams, unsigned int flags); > +typedef enum { > + VIR_IP_ADDR_TYPE_IPV4, > + VIR_IP_ADDR_TYPE_IPV6, > + > +#ifdef VIR_ENUM_SENTINELS > + VIR_IP_ADDR_TYPE_LAST > +#endif > +} virIPAddrType; > + > + > +typedef struct _virDomainInterfaceIPAddress virDomainIPAddress; > +typedef virDomainIPAddress *virDomainIPAddressPtr; > +struct _virDomainInterfaceIPAddress { > + int type; /* virIPAddrType */ > + char *addr; /* IP address */ > + int prefix; /* IP address prefix */ > +}; > + > +typedef struct _virDomainInterface virDomainInterface; > +typedef virDomainInterface *virDomainInterfacePtr; > +struct _virDomainInterface { > + char *name; /* interface name */ > + char *hwaddr; /* hardware address */ > + unsigned int naddrs; /* number of items in @addrs */ > + virDomainIPAddressPtr addrs; /* array of IP addresses */ > +}; > + > +int virDomainInterfacesAddresses (virDomainPtr dom, > + virDomainInterfacePtr **ifaces, > + unsigned int flags); > + > +void virDomainInterfaceFree (virDomainInterfacePtr iface); > + > /* Management of domain block devices */ > int virDomainBlockPeek (virDomainPtr dom, > diff --git a/python/generator.py b/python/generator.py > index 427cebc..4f3c8ee 100755 > --- a/python/generator.py > +++ b/python/generator.py > @@ -458,6 +458,7 @@ skip_impl = ( > 'virNodeGetMemoryParameters', > 'virNodeSetMemoryParameters', > 'virNodeGetCPUMap', > + 'virDomainInterfacesAddresses', > 'virDomainMigrate3', > 'virDomainMigrateToURI3', > ) > @@ -560,6 +561,8 @@ skip_function = ( > "virTypedParamsGetString", > "virTypedParamsGetUInt", > "virTypedParamsGetULLong", > + > + "virDomainInterfaceFree", #Only for convenience in C Consider changing the comment into "# Only useful in C". > ) > lxc_skip_function = ( > diff --git a/src/driver.h b/src/driver.h > index be64333..8b6182e 100644 > --- a/src/driver.h > +++ b/src/driver.h > @@ -518,6 +518,11 @@ typedef int > unsigned int flags); > typedef int > +(*virDrvDomainInterfacesAddresses)(virDomainPtr dom, > + virDomainInterfacePtr **ifaces, > + unsigned int flags); > + > +typedef int > (*virDrvDomainMemoryStats)(virDomainPtr domain, > struct _virDomainMemoryStat *stats, > unsigned int nr_stats, > @@ -1238,6 +1243,7 @@ struct _virDriver { > virDrvDomainInterfaceStats domainInterfaceStats; > virDrvDomainSetInterfaceParameters domainSetInterfaceParameters; > virDrvDomainGetInterfaceParameters domainGetInterfaceParameters; > + virDrvDomainInterfacesAddresses domainInterfacesAddresses; > virDrvDomainMemoryStats domainMemoryStats; > virDrvDomainBlockPeek domainBlockPeek; > virDrvDomainMemoryPeek domainMemoryPeek; > diff --git a/src/libvirt.c b/src/libvirt.c > index 07a3fd5..2d4b0bf 100644 > --- a/src/libvirt.c > +++ b/src/libvirt.c > @@ -8643,6 +8643,97 @@ error: > return -1; > } > + /** > + * virDomainInterfacesAddresses: > + * @dom: domain object > + * @ifaces: array of @dom interfaces Not correct. Note that you changed the API interface in this series. > + * @flags: extra flags; not used yet, so callers should always pass 0 > + * > + * Return an array of interfaces present in given domain along with Like above, this should be changed too. > + * their IP and MAC addresses. Note that single interface can have > + * multiple or even 0 IP address. > + * > + * This API dynamically allocates the virDomainInterfacePtr struct > + * based on how many interfaces domain @dom has, usually there's > + * 1:1 correlation. The count of elements allocated is stored in > + * @ifaces_count. In this new implementation, there is now @ifaces_count, the count of the interfaces is returned as the return value. > + * > + * Note that for some hypervisors, a configured guest agent is needed > + * for successful return from this API. Moreover, if guest agent is > + * used then the interface name is the one seen by guest OS. To match > + * such interface with the one from @dom XML use MAC address or IP > range. > + * > + * @ifaces->name is never NULL, @ifaces->hwaddr might be NULL. > + * > + * The caller *must* free @ifaces when no longer needed. Usual use > + * case looks like this: > + * > + * virDomainInterfacePtr ifaces = NULL; > + * int ifaces_count = 0; > + * size_t i, j; > + * virDomainPtr dom = ... obtain a domain here ...; > + * > + * if ((ifaces_count = virDomainInterfacesAddresses(dom, &ifaces, > 0)) < 0) The argument type is "virDomainInterfacePtr **" now. So you have an error here. > + * goto cleanup; > + * > + * ... do something with returned values, for example: > + * for (i = 0; i < ifaces_count; i++) { > + * printf("name: %s", ifaces[i].name); And you will want ifaces[i]->name instead. Similiar for other memebers accessing. > + * if (ifaces[i].hwaddr) > + * printf(" hwaddr: %s", ifaces[i].hwaddr); > + * > + * for (j = 0; j < ifaces[i].naddrs; j++) { > + * virDomainIPAddressPtr ip_addr = ifaces[i].addrs + j; > + * printf("[addr: %s prefix: %d type: %d]", > + * ip_addr->addr, ip_addr->prefix, ip_addr->type); > + * } > + * printf("\n"); > + * } > + * > + * cleanup: > + * for (i = 0; i < ifaces_count; i++) { > + * if(ifaces[i]) > + * virDomainInterfaceFree(ifaces[i]); Indention problem. > + * } > + * free(ifaces); > + * > + * Returns 0 on success, -1 in case of error. > + */ > +int > +virDomainInterfacesAddresses(virDomainPtr dom, > + virDomainInterfacePtr **ifaces, > + unsigned int flags) > +{ > + virConnectPtr conn; > + > + VIR_DOMAIN_DEBUG(dom, "ifaces=%p, flags=%x", ifaces, flags); > + > + virResetLastError(); > + > + if (!VIR_IS_CONNECTED_DOMAIN(dom)) { > + virLibDomainError(VIR_ERR_INVALID_DOMAIN, __FUNCTION__); > + goto error; > + } > + > + conn = dom->conn; > + > + virCheckNonNullArgGoto(ifaces, error); > + > + if (conn->driver->domainInterfacesAddresses) { > + int ret; > + ret = conn->driver->domainInterfacesAddresses(dom, ifaces, > flags); > + if (ret < 0) > + goto error; > + return ret; > + } > + > + virLibConnError(VIR_ERR_NO_SUPPORT, __FUNCTION__); > + > +error: > + virDispatchError(dom ? dom->conn : NULL); > + return -1; > +} > + > /** > * virDomainMemoryStats: > * @dom: pointer to the domain object > @@ -21961,3 +22052,22 @@ error: > virDispatchError(dom->conn); > return -1; > } > + > +/** > + * virDomainInterfaceFree: > + * @iface: an interface object > + * > + * Free the interface object. The data structure is > + * freed and should not be used thereafter. > + * > + */ > +void > +virDomainInterfaceFree(virDomainInterfacePtr iface) > +{ > + size_t i; > + VIR_FREE((*iface).name); Why not "iface->name"? also you need to check if "iface" is NULL or not, otherwise it could cause the crash, unless the user checking it himself before calling virDomainInterfaceFree, but that says you introduce a bad api then. > + VIR_FREE((*iface).hwaddr); > + for (i = 0; i < (*iface).naddrs; i++) > + VIR_FREE((*iface).addrs[i].addr); > + VIR_FREE((*iface).addrs);

> +} > diff --git a/src/libvirt_public.syms b/src/libvirt_public.syms > index bbdf78a..df1c166 100644 > --- a/src/libvirt_public.syms > +++ b/src/libvirt_public.syms > @@ -634,4 +634,10 @@ LIBVIRT_1.1.1 { > virDomainSetMemoryStatsPeriod; > } LIBVIRT_1.1.0; > +LIBVIRT_1.1.2 { > + global: > + virDomainInterfacesAddresses; > + virDomainInterfaceFree; > +} LIBVIRT_1.1.1; > + > # .... define new API here using predicted next version number .... -- libvir-list mailing list libvir-list(a)redhat.com https://www.redhat.com/mailman/listinfo/libvir-list

Implement RPC calls for virDomainInterfacesAddresses daemon/remote.c * Define remoteSerializeDomainInterfacePtr, remoteDispatchDomainInterfacesAddresses src/remote/remote_driver.c * Define remoteDomainInterfacesAddresses src/remote/remote_protocol.x * New RPC procedure: REMOTE_PROC_DOMAIN_INTERFACES_ADDRESSES * Define structs remote_domain_ip_addr, remote_domain_interface, remote_domain_interfaces_addresses_args, remote_domain_interfaces_addresses_ret src/remote_protocol-structs * New structs added --- daemon/remote.c | 123 +++++++++++++++++++++++++++++++++++++++++++ src/remote/remote_driver.c | 87 ++++++++++++++++++++++++++++++ src/remote/remote_protocol.x | 41 ++++++++++++++- src/remote_protocol-structs | 24 +++++++++ 4 files changed, 274 insertions(+), 1 deletion(-) diff --git a/daemon/remote.c b/daemon/remote.c index 03d5557..31640c6 100644 --- a/daemon/remote.c +++ b/daemon/remote.c @@ -5025,7 +5025,130 @@ cleanup: return rv; } +static int +remoteSerializeDomainInterfacePtr(virDomainInterfacePtr *ifaces, + unsigned int ifaces_count, + remote_domain_interfaces_addresses_ret *ret) +{ + size_t i, j; + + if (ifaces_count > REMOTE_DOMAIN_INTERFACE_MAX) + return -1; +

+ if (VIR_ALLOC_N(ret->ifaces.ifaces_val, ifaces_count) < 0) + return -1; + + ret->ifaces.ifaces_len = ifaces_count; + + for (i = 0; i < ifaces_count; i++) { + virDomainInterfacePtr iface = ifaces[i]; + remote_domain_interface *iface_ret = &(ret->ifaces.ifaces_val[i]); + + if ((VIR_STRDUP(iface_ret->name, iface->name)) < 0) + goto cleanup; + + if (iface->hwaddr) { + char **hwaddr_p = NULL; + if (VIR_ALLOC(hwaddr_p) < 0) + goto cleanup; + if (VIR_STRDUP(*hwaddr_p, iface->hwaddr) < 0) { + VIR_FREE(hwaddr_p); + goto cleanup; + } + + iface_ret->hwaddr = hwaddr_p; + } + + if (iface->naddrs > REMOTE_DOMAIN_IP_ADDR_MAX)

+ goto cleanup; + + if (VIR_ALLOC_N(iface_ret->addrs.addrs_val, + iface->naddrs) < 0) + goto cleanup; + + iface_ret->addrs.addrs_len = iface->naddrs; + + for (j = 0; j < iface->naddrs; j++) { + virDomainIPAddressPtr ip_addr = &(iface->addrs[j]); + remote_domain_ip_addr *ip_addr_ret = + &(iface_ret->addrs.addrs_val[j]); + + if (VIR_STRDUP(ip_addr_ret->addr, ip_addr->addr) < 0) + goto cleanup; + + ip_addr_ret->prefix = ip_addr->prefix; + ip_addr_ret->type = ip_addr->type; + } + } + + return 0; + +cleanup: + if (ret->ifaces.ifaces_val) { + for (i = 0; i < ifaces_count; i++) { + remote_domain_interface *iface_ret = &(ret->ifaces.ifaces_val[i]); + VIR_FREE(iface_ret->name); + VIR_FREE(iface_ret->hwaddr); + for (j = 0; j < iface_ret->addrs.addrs_len; j++) { + remote_domain_ip_addr *ip_addr = + &(iface_ret->addrs.addrs_val[j]); + VIR_FREE(ip_addr->addr); + } + VIR_FREE(iface_ret); + } + VIR_FREE(ret->ifaces.ifaces_val); + } + + return -1; +} +static int +remoteDispatchDomainInterfacesAddresses( + virNetServerPtr server ATTRIBUTE_UNUSED, + virNetServerClientPtr client, + virNetMessagePtr msg ATTRIBUTE_UNUSED, + virNetMessageErrorPtr rerr, + remote_domain_interfaces_addresses_args *args, + remote_domain_interfaces_addresses_ret *ret) +{ + int rv = -1; + virDomainPtr dom = NULL; + virDomainInterfacePtr *ifaces = NULL; + int ifaces_count = 0; + struct daemonClientPrivate *priv = + virNetServerClientGetPrivateData(client); + + if (!priv->conn) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("connection not open")); + goto cleanup; + } + + if (!(dom = get_nonnull_domain(priv->conn, args->dom))) + goto cleanup; + + if ((ifaces_count = virDomainInterfacesAddresses(dom, &ifaces, args->flags)) < 0) + goto cleanup; + + if (remoteSerializeDomainInterfacePtr(ifaces, ifaces_count, ret) < 0) + goto cleanup; + + rv = 0; + +cleanup: + if (rv < 0) + virNetMessageSaveError(rerr); + if (dom) + virDomainFree(dom); + if (ifaces) { + size_t i; + for (i = 0; i < ifaces_count; i++) { + if (ifaces[i]) + virDomainInterfaceFree(ifaces[i]);

+ } + VIR_FREE(ifaces); + } + return rv; +} /*----- Helpers. -----*/ diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c index 71d0034..919adb4 100644 --- a/src/remote/remote_driver.c +++ b/src/remote/remote_driver.c @@ -6477,6 +6477,92 @@ done: return rv; } +static int +remoteDomainInterfacesAddresses(virDomainPtr dom, + virDomainInterfacePtr **ifaces, + unsigned int flags) +{ + int rv = -1; + size_t i, j; + + virDomainInterfacePtr *ifaces_ret = NULL; + remote_domain_interfaces_addresses_args args; + remote_domain_interfaces_addresses_ret ret; + + struct private_data *priv = dom->conn->privateData; + + args.flags = flags; + make_nonnull_domain(&args.dom, dom); + + remoteDriverLock(priv); + + memset(&ret, 0, sizeof(ret)); + + if (call(dom->conn, priv, 0, REMOTE_PROC_DOMAIN_INTERFACES_ADDRESSES, + (xdrproc_t)xdr_remote_domain_interfaces_addresses_args, + (char *)&args, + (xdrproc_t)xdr_remote_domain_interfaces_addresses_ret, + (char *)&ret) == -1) { + goto done; + } + + if (ret.ifaces.ifaces_len && + VIR_ALLOC_N(ifaces_ret, ret.ifaces.ifaces_len) < 0) + goto cleanup; + + for (i = 0; i < ret.ifaces.ifaces_len; i++) { + if (VIR_ALLOC(ifaces_ret[i]) < 0) + goto cleanup; + + virDomainInterfacePtr iface = ifaces_ret[i]; + remote_domain_interface *iface_ret = &(ret.ifaces.ifaces_val[i]); + + if (VIR_STRDUP(iface->name, iface_ret->name) < 0) + goto cleanup; + + if (iface_ret->hwaddr && + VIR_STRDUP(iface->hwaddr, *iface_ret->hwaddr) < 0) + goto cleanup; + + iface->naddrs = iface_ret->addrs.addrs_len; + + if (iface->naddrs) { + if (VIR_ALLOC_N(iface->addrs, iface->naddrs) < 0) + goto cleanup; + + for (j = 0; j < iface->naddrs; j++) { + virDomainIPAddressPtr ip_addr = &(iface->addrs[j]); + remote_domain_ip_addr *ip_addr_ret = + &(iface_ret->addrs.addrs_val[j]); + + if (VIR_STRDUP(ip_addr->addr, ip_addr_ret->addr) < 0) { + goto cleanup; + } + ip_addr->prefix = ip_addr_ret->prefix; + ip_addr->type = ip_addr_ret->type; + } + } + } + *ifaces = ifaces_ret; + ifaces_ret = NULL; + + rv = ret.ifaces.ifaces_len; + +cleanup: + if (ifaces_ret) { + for (i = 0; i < ret.ifaces.ifaces_len; i++) { + if (ifaces_ret[i]) + virDomainInterfaceFree(ifaces_ret[i]); + } + VIR_FREE(ifaces_ret); + } + xdr_free((xdrproc_t)xdr_remote_domain_interfaces_addresses_ret, + (char *) &ret); +done: + remoteDriverUnlock(priv); + return rv; +} + static void remoteDomainEventQueue(struct private_data *priv, virDomainEventPtr event) { @@ -6811,6 +6897,7 @@ static virDriver remote_driver = { .domainMigratePerform3Params = remoteDomainMigratePerform3Params, /* 1.1.0 */ .domainMigrateFinish3Params = remoteDomainMigrateFinish3Params, /* 1.1.0 */ .domainMigrateConfirm3Params = remoteDomainMigrateConfirm3Params, /* 1.1.0 */ + .domainInterfacesAddresses = remoteDomainInterfacesAddresses, /* 1.1.2 */ }; static virNetworkDriver network_driver = { diff --git a/src/remote/remote_protocol.x b/src/remote/remote_protocol.x index 7cfebdf..1bab644 100644 --- a/src/remote/remote_protocol.x +++ b/src/remote/remote_protocol.x @@ -237,6 +237,17 @@ const REMOTE_NODE_MEMORY_PARAMETERS_MAX = 64; /* UUID. VIR_UUID_BUFLEN definition comes from libvirt.h */ typedef opaque remote_uuid[VIR_UUID_BUFLEN]; +/* + * Upper limit on number of interfaces per domain + */ +const REMOTE_DOMAIN_INTERFACE_MAX = 256;

+ +/* + * Upper limit on number of ip addresses per interface

+ */ +const REMOTE_DOMAIN_IP_ADDR_MAX = 64; + + /* A domain which may not be NULL. */ struct remote_nonnull_domain { remote_nonnull_string name; @@ -2837,6 +2848,27 @@ struct remote_domain_event_device_removed_msg { remote_nonnull_string devAlias; }; +struct remote_domain_ip_addr { + int type; + remote_nonnull_string addr; + int prefix; +}; + +struct remote_domain_interface { + remote_nonnull_string name; + remote_string hwaddr; + remote_domain_ip_addr addrs<REMOTE_DOMAIN_IP_ADDR_MAX>; +}; + +struct remote_domain_interfaces_addresses_args { + remote_nonnull_domain dom; + unsigned int flags; +}; + +struct remote_domain_interfaces_addresses_ret { + remote_domain_interface ifaces<REMOTE_DOMAIN_INTERFACE_MAX>; +}; + /*----- Protocol. -----*/ /* Define the program number, protocol version and procedure numbers here. */ @@ -5000,5 +5032,12 @@ enum remote_procedure { * @generate: both * @acl: none */ - REMOTE_PROC_DOMAIN_EVENT_DEVICE_REMOVED = 311 + REMOTE_PROC_DOMAIN_EVENT_DEVICE_REMOVED = 311, + + /** + * @generate: none + * @acl: domain:read + */ + REMOTE_PROC_DOMAIN_INTERFACES_ADDRESSES = 312 + }; diff --git a/src/remote_protocol-structs b/src/remote_protocol-structs index 4e27aae..e08fe43 100644 --- a/src/remote_protocol-structs +++ b/src/remote_protocol-structs @@ -2316,6 +2316,29 @@ struct remote_domain_event_device_removed_msg { remote_nonnull_domain dom; remote_nonnull_string devAlias; }; +struct remote_domain_ip_addr { + int type; + remote_nonnull_string addr; + int prefix; +}; +struct remote_domain_interface { + remote_nonnull_string name; + remote_string hwaddr; + struct { + u_int addrs_len; + remote_domain_ip_addr * addrs_val; + } addrs; +}; +struct remote_domain_interfaces_addresses_args { + remote_nonnull_domain dom; + u_int flags; +}; +struct remote_domain_interfaces_addresses_ret { + struct { + u_int ifaces_len; + remote_domain_interface * ifaces_val; + } ifaces; +}; enum remote_procedure { REMOTE_PROC_CONNECT_OPEN = 1, REMOTE_PROC_CONNECT_CLOSE = 2, @@ -2628,4 +2651,5 @@ enum remote_procedure { REMOTE_PROC_DOMAIN_CREATE_XML_WITH_FILES = 309, REMOTE_PROC_DOMAIN_CREATE_WITH_FILES = 310, REMOTE_PROC_DOMAIN_EVENT_DEVICE_REMOVED = 311, + REMOTE_PROC_DOMAIN_INTERFACES_ADDRESSES = 312, };

By querying the qemu guest agent with the QMP command "guest-network-get-interfaces" and converting the received JSON output to structured objects. src/qemu/qemu_agent.h: * Define qemuAgentGetInterfaces src/qemu/qemu_agent.c: * Implement qemuAgentGetInterface src/qemu/qemu_driver.c: * New function qemuDomainInterfacesAddresses src/remote_protocol-sructs: * Define new structs --- src/qemu/qemu_agent.c | 157 +++++++++++++++++++++++++++++++++++++++++++++++++ src/qemu/qemu_agent.h | 3 + src/qemu/qemu_driver.c | 55 +++++++++++++++++ tests/qemuagenttest.c | 90 +++++++++++++++++++++++++++- 4 files changed, 304 insertions(+), 1 deletion(-) diff --git a/src/qemu/qemu_agent.c b/src/qemu/qemu_agent.c index 2cd0ccc..015e752 100644 --- a/src/qemu/qemu_agent.c +++ b/src/qemu/qemu_agent.c @@ -844,6 +844,7 @@ static int qemuAgentSend(qemuAgentPtr mon, VIR_DEBUG("Attempt to send command while error is set %s", NULLSTR(mon->lastError.message)); virSetError(&mon->lastError); + printf("Upper\n"); return -1; } @@ -862,6 +863,7 @@ static int qemuAgentSend(qemuAgentPtr mon, while (!mon->msg->finished) { if ((then && virCondWaitUntil(&mon->notify, &mon->parent.lock, then) < 0) || (!then && virCondWait(&mon->notify, &mon->parent.lock) < 0)) { + if (errno == ETIMEDOUT) { virReportError(VIR_ERR_AGENT_UNRESPONSIVE, "%s", _("Guest agent not available for now")); @@ -1319,6 +1321,161 @@ cleanup: return ret; } + +int +qemuAgentGetInterfaces(qemuAgentPtr mon, + virDomainInterfacePtr **ifaces) +{ + int ret = -1; + size_t i, j; + int size = -1; + virJSONValuePtr cmd = NULL; + virJSONValuePtr reply = NULL; + virJSONValuePtr ret_array = NULL; + int ifaces_count = 0; + virDomainInterfacePtr *ifaces_ret = NULL; + + if (!(cmd = qemuAgentMakeCommand("guest-network-get-interfaces", NULL))) + return -1; + + if (qemuAgentCommand(mon, cmd, &reply, VIR_DOMAIN_QEMU_AGENT_COMMAND_BLOCK) < 0 || + qemuAgentCheckError(cmd, reply) < 0) { + goto cleanup; + } + + if (!(ret_array = virJSONValueObjectGet(reply, "return"))) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("qemu agent didn't provide 'return' field")); + goto cleanup; + } + + if ((size = virJSONValueArraySize(ret_array)) < 0) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("qemu agent didn't return an array of interfaces")); + goto cleanup; + } + + ifaces_count = (unsigned int) size; + + if (VIR_ALLOC_N(ifaces_ret, size) < 0) + goto cleanup; + + for (i = 0; i < size; i++) { + virJSONValuePtr tmp_iface = virJSONValueArrayGet(ret_array, i); + virJSONValuePtr ip_addr_arr = NULL; + const char *name, *hwaddr; + int ip_addr_arr_size; + + if (VIR_ALLOC(ifaces_ret[i]) < 0) + goto cleanup; + + /* Shouldn't happen but doesn't hurt to check neither */ + if (!tmp_iface) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("something has went really wrong")); + goto error; + } + + /* interface name is required to be presented */ + name = virJSONValueObjectGetString(tmp_iface, "name"); + if (!name) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("qemu agent didn't provide 'name' field")); + goto error; + } + + if (VIR_STRDUP(ifaces_ret[i]->name, name) < 0) + goto error; + + /* hwaddr might be omitted */ + hwaddr = virJSONValueObjectGetString(tmp_iface, "hardware-address"); + if (hwaddr && VIR_STRDUP(ifaces_ret[i]->hwaddr, hwaddr) < 0) + goto error; + + /* as well as IP address which - moreover - + * can be presented multiple times */ + ip_addr_arr = virJSONValueObjectGet(tmp_iface, "ip-addresses"); + if (!ip_addr_arr) + continue; + + if ((ip_addr_arr_size = virJSONValueArraySize(ip_addr_arr)) < 0) + /* Mmm, empty 'ip-address'? */ + continue; + + (*(ifaces_ret)[i]).naddrs = (unsigned int) ip_addr_arr_size; + + if (VIR_ALLOC_N((*(ifaces_ret)[i]).addrs, ip_addr_arr_size) < 0) + goto error; + + for (j = 0; j < ip_addr_arr_size; j++) { + virJSONValuePtr ip_addr_obj = virJSONValueArrayGet(ip_addr_arr, j); + virDomainIPAddressPtr ip_addr = &ifaces_ret[i]->addrs[j]; + const char *type, *addr; + + /* Shouldn't happen but doesn't hurt to check neither */ + if (!ip_addr_obj) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("something has went really wrong")); + goto error; + } + + type = virJSONValueObjectGetString(ip_addr_obj, "ip-address-type"); + if (!type) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("qemu agent didn't provide 'ip-address-type'" + " field for interface '%s'"), name); + goto error; + } else if (STREQ(type, "ipv4")) { + ip_addr->type = VIR_IP_ADDR_TYPE_IPV4; + } else if (STREQ(type, "ipv6")) { + ip_addr->type = VIR_IP_ADDR_TYPE_IPV6; + } else { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("unknown ip address type '%s'"), + type); + goto error; + } + + addr = virJSONValueObjectGetString(ip_addr_obj, "ip-address"); + if (!addr) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("qemu agent didn't provide 'ip-address'" + " field for interface '%s'"), name); + goto error; + } + if (VIR_STRDUP(ip_addr->addr, addr) < 0) + goto error; + + if (virJSONValueObjectGetNumberInt(ip_addr_obj, "prefix", + &ip_addr->prefix) < 0) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("malformed 'prefix' field")); + goto error; + } + } + } + + *ifaces = ifaces_ret; + ifaces_ret = NULL; + ret = ifaces_count; + +cleanup: + virJSONValueFree(cmd); + virJSONValueFree(reply); + return ret; + +error: + if (ifaces_ret) { + for (i = 0; i < ifaces_count; i++) { + if (ifaces_ret[i]) + virDomainInterfaceFree(ifaces_ret[i]); + } + } + VIR_FREE(ifaces_ret); + goto cleanup; +} + + /* * qemuAgentFSThaw: * @mon: Agent diff --git a/src/qemu/qemu_agent.h b/src/qemu/qemu_agent.h index 5fbacdb..58b56fd 100644 --- a/src/qemu/qemu_agent.h +++ b/src/qemu/qemu_agent.h @@ -76,6 +76,9 @@ int qemuAgentFSThaw(qemuAgentPtr mon); int qemuAgentSuspend(qemuAgentPtr mon, unsigned int target); +int qemuAgentGetInterfaces(qemuAgentPtr mon, + virDomainInterfacePtr **ifaces); + int qemuAgentArbitraryCommand(qemuAgentPtr mon, const char *cmd, char **result, diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 0a8e518..0cd266f 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -16035,6 +16035,60 @@ qemuNodeSuspendForDuration(virConnectPtr conn, return nodeSuspendForDuration(target, duration, flags); } +static int +qemuDomainInterfacesAddresses(virDomainPtr dom, + virDomainInterfacePtr **ifaces, + unsigned int flags) +{ + virQEMUDriverPtr driver = dom->conn->privateData; + qemuDomainObjPrivatePtr priv = NULL; + virDomainObjPtr vm = NULL; + int ret = -1; + + virCheckFlags(0, -1); + + if (!(vm = qemuDomObjFromDomain(dom))) + goto cleanup; + + if (!virDomainObjIsActive(vm)) { + virReportError(VIR_ERR_OPERATION_INVALID, "%s", + _("domain is not running")); + goto cleanup; + } + + priv = vm->privateData; + + if (virDomainInterfacesAddressesEnsureACL(dom->conn, vm->def) < 0) + goto cleanup; + + if (priv->agentError) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("QEMU guest agent is not " + "available due to an error")); + goto cleanup; + } + + if (!priv->agent) { + virReportError(VIR_ERR_ARGUMENT_UNSUPPORTED, "%s", + _("QEMU guest agent is not configured")); + goto cleanup; + } + + if (qemuDomainObjBeginJob(driver, vm, QEMU_JOB_QUERY) < 0) + goto cleanup; + + qemuDomainObjEnterAgent(vm); + ret = qemuAgentGetInterfaces(priv->agent, ifaces); + qemuDomainObjExitAgent(vm); + + if (qemuDomainObjEndJob(driver, vm) == 0) + vm = NULL; + +cleanup: + if (vm) + virObjectUnlock(vm); + return ret; +} static virDriver qemuDriver = { .no = VIR_DRV_QEMU, @@ -16130,6 +16184,7 @@ static virDriver qemuDriver = { .domainMemoryPeek = qemuDomainMemoryPeek, /* 0.4.4 */ .domainGetBlockInfo = qemuDomainGetBlockInfo, /* 0.8.1 */ .nodeGetCPUStats = qemuNodeGetCPUStats, /* 0.9.3 */ + .domainInterfacesAddresses = qemuDomainInterfacesAddresses, /* 1.1.2 */ .nodeGetMemoryStats = qemuNodeGetMemoryStats, /* 0.9.3 */ .nodeGetCellsFreeMemory = qemuNodeGetCellsFreeMemory, /* 0.4.4 */ .nodeGetFreeMemory = qemuNodeGetFreeMemory, /* 0.4.4 */ diff --git a/tests/qemuagenttest.c b/tests/qemuagenttest.c index 4e27981..6b6c47f 100644 --- a/tests/qemuagenttest.c +++ b/tests/qemuagenttest.c @@ -31,6 +31,8 @@ #define VIR_FROM_THIS VIR_FROM_NONE + + static int testQemuAgentFSFreeze(const void *data) { @@ -271,6 +273,7 @@ cleanup: } + static int testQemuAgentShutdown(const void *data) { @@ -496,7 +499,7 @@ testQemuAgentArbitraryCommand(const void *data) goto cleanup; if (qemuAgentArbitraryCommand(qemuMonitorTestGetAgent(test), - "{\"execute\":\"ble\"}", + "{\"execute\":\"ble\"}", &reply, VIR_DOMAIN_QEMU_AGENT_COMMAND_BLOCK) < 0) goto cleanup; @@ -576,6 +579,90 @@ cleanup: return ret; } +static const char testQemuAgentGetInterfacesResponse[] = + "{\"return\": " + " [" + " {\"name\":\"lo\"," + " \"ip-addresses\":" + " [" + " {\"ip-address-type\":\"ipv4\"," + " \"ip-address\":\"127.0.0.1\"," + " \"prefix\":8" + " }," + " {\"ip-address-type\":\"ipv6\"," + " \"ip-address\":\"::1\"," + " \"prefix\":128" + " }" + " ]," + " \"hardware-address\":\"00:00:00:00:00:00\"" + " }," + " {\"name\":\"eth0\"," + " \"ip-addresses\":" + " [" + " {\"ip-address-type\":\"ipv4\"," + " \"ip-address\":\"192.168.102.142\"," + " \"prefix\":24" + " }," + " {\"ip-address-type\":\"ipv6\"," + " \"ip-address\":\"fe80::5054:ff:fe89:ad35\"," + " \"prefix\":64" + " }" + " ]," + " \"hardware-address\":\"52:54:00:89:ad:35\"" + " }," + " {\"name\":\"eth1\"," + " \"ip-addresses\":" + " [" + " {\"ip-address-type\":\"ipv4\"," + " \"ip-address\":\"192.168.103.83\"," + " \"prefix\":24" + " }," + " {\"ip-address-type\":\"ipv6\"," + " \"ip-address\":\"fe80::5054:ff:fed3:39ee\"," + " \"prefix\":64" + " }" + " ]," + " \"hardware-address\":\"52:54:00:d3:39:ee\"" + " }" + " ]" + "}"; + +static int +testQemuAgentGetInterfaces(const void *data) +{ + virDomainXMLOptionPtr xmlopt = (virDomainXMLOptionPtr)data; + qemuMonitorTestPtr test = qemuMonitorTestNewAgent(xmlopt); + int ret = -1; + int ifaces_count = 0; + virDomainInterfacePtr *ifaces; + + if (!test) + return -1; + + if (qemuMonitorTestAddAgentSyncResponse(test) < 0) + goto cleanup; + + if (qemuMonitorTestAddItem(test, "guest-network-get-interfaces", + testQemuAgentGetInterfacesResponse) < 0) + goto cleanup; + + if ((ifaces_count = qemuAgentGetInterfaces(qemuMonitorTestGetAgent(test), + &ifaces)) < 0) { + goto cleanup; + } + + if (ifaces_count != 3) { + virReportError(VIR_ERR_INTERNAL_ERROR, + "expected 3 interfaces, got %d", ret); + goto cleanup; + } + + ret = 0; + +cleanup: + qemuMonitorTestFree(test); + return ret; +} static int mymain(void) @@ -605,6 +692,7 @@ mymain(void) DO_TEST(Shutdown); DO_TEST(CPU); DO_TEST(ArbitraryCommand); + DO_TEST(GetInterfaces); DO_TEST(Timeout); /* Timeout should always be called last */ -- 1.7.11.7

Use virDomainInterfacesAddresses in virsh tools/virsh-domain-monitor.c * Introduce new command : domifaddr virsh # domifaddr f18 Name MAC address IP address --------------------------------------------------- lo 00:00:00:00:00:00 127.0.0.1/8 ::1/128 eth0 52:54:00:89:ad:35 192.168.102.142/24fe80::5054:ff:fe89:ad35/64 eth1 52:54:00:d3:39:ee 192.168.103.183/24fe80::5054:ff:fed3:39ee/64 eth2 52:54:00:fe:4c:4f 192.168.101.197/24fe80::5054:ff:fefe:4c4f/64 eth3 52:54:00:89:4e:97 192.168.101.130/24fe80::5054:ff:fe89:4e97/64

tools/virsh.pod * Document new command --- tools/virsh-domain-monitor.c | 99 ++++++++++++++++++++++++++++++++++++++++++++ tools/virsh.pod | 10 +++++ 2 files changed, 109 insertions(+) diff --git a/tools/virsh-domain-monitor.c b/tools/virsh-domain-monitor.c index b29b82a..91efa71 100644 --- a/tools/virsh-domain-monitor.c +++ b/tools/virsh-domain-monitor.c @@ -1871,6 +1871,99 @@ cleanup: } #undef FILTER +/* "domifaddr" command + */ +static const vshCmdInfo info_domifaddr[] = { + {"help", N_("Get network interfaces' addresses for a running domain")}, + {"desc", N_("Get network interfaces' addresses for a running domain")}, + {NULL, NULL} +}; + +static const vshCmdOptDef opts_domifaddr[] = { + {"domain", VSH_OT_DATA, VSH_OFLAG_REQ, N_("domain name, id or uuid")}, + {"interface", VSH_OT_DATA, VSH_OFLAG_NONE, N_("network interface name")}, + {NULL, 0, 0, NULL} +}; + +static bool +cmdDomIfAddr(vshControl *ctl, const vshCmd *cmd) +{ + virDomainPtr dom = NULL; + const char *interface = NULL; + virDomainInterfacePtr *ifaces = NULL; + size_t i, j; + int ifaces_count = 0; + unsigned int flags = 0; + bool ret = false; + + if (!(dom = vshCommandOptDomain(ctl, cmd, NULL))) + return false; + + if (vshCommandOptString(cmd, "interface", &interface) < 0) { + goto cleanup; + } + + if ((ifaces_count = virDomainInterfacesAddresses(dom, &ifaces, flags)) < 0) { + vshError(ctl, _("Failed to query for interfaces addresses")); + goto cleanup; + } + + vshPrintExtra(ctl, " %-10s %-17s %s\n%s\n", + _("Name"), _("MAC address"), _("IP address"), + "---------------------------------------------------"); + + for (i = 0; i < ifaces_count; i++) { + virDomainInterfacePtr iface = ifaces[i]; + virBuffer buf = VIR_BUFFER_INITIALIZER; + const char *hwaddr = ""; + const char *ip_addr_str = NULL; + + if (interface && STRNEQ(interface, iface->name)) { + virBufferFreeAndReset(&buf); + continue; + } + + if (iface->hwaddr) + hwaddr = iface->hwaddr; + + for (j = 0; j < iface->naddrs; j++) { + if (j) + virBufferAddChar(&buf, ' '); + virBufferAsprintf(&buf, "%s/%d", + iface->addrs[j].addr, + iface->addrs[j].prefix); + } + + if (virBufferError(&buf)) { + virBufferFreeAndReset(&buf); + virReportOOMError(); + return ret; + } + + ip_addr_str = virBufferContentAndReset(&buf); + + if (!ip_addr_str) + ip_addr_str = ""; + + vshPrintExtra(ctl, " %-10s %-17s %s\n", + iface->name, hwaddr, ip_addr_str); + + virBufferFreeAndReset(&buf); + } + + ret = true; + +cleanup: + for (i = 0; i < ifaces_count; i++) { + if (ifaces[i]) + virDomainInterfaceFree(ifaces[i]); + } + VIR_FREE(ifaces); + + virDomainFree(dom); + return ret; +} + const vshCmdDef domMonitoringCmds[] = { {.name = "domblkerror", .handler = cmdDomBlkError, @@ -1944,5 +2037,11 @@ const vshCmdDef domMonitoringCmds[] = { .info = info_list, .flags = 0 }, + {.name = "domifaddr", + .handler = cmdDomIfAddr, + .opts = opts_domifaddr, + .info = info_domifaddr, + .flags = 0 + }, {.name = NULL} }; diff --git a/tools/virsh.pod b/tools/virsh.pod index 0ae5178..008ffea 100644 --- a/tools/virsh.pod +++ b/tools/virsh.pod @@ -636,6 +636,16 @@ B<Explanation of fields> (fields appear in the following order): flush_total_times - total time flush operations took (ns) <-- other fields provided by hypervisor --> + +=item B<domifaddr> I<domain> [I<interface>] + +Get a list of interfaces of a running domain along with their IP and MAC +addresses, or limited output just for one interface if I<interface> is +specified. Note, that I<interface> can be driver dependent, it can be +the name within guest OS or the name you would see in domain XML. +Moreover, the whole command may require a guest agent to be configured +for the queried domain under some drivers, notably qemu. + =item B<domifstat> I<domain> I<interface-device> Get network interface stats for a running domain. -- 1.7.11.7 -- libvir-list mailing list libvir-list(a)redhat.com https://www.redhat.com/mailman/listinfo/libvir-list

On Fri, Aug 23, 2013 at 8:16 PM, Doug Goldstein <cardoe(a)gentoo.org&gt; wrote: > > On Thu, Aug 22, 2013 at 5:18 PM, nehaljwani <nehaljw.kkd1(a)gmail.com&gt; wrote: >> >> Use virDomainInterfacesAddresses in virsh >> >> tools/virsh-domain-monitor.c >> * Introduce new command : domifaddr >> >> virsh # domifaddr f18 >> Name MAC address IP address >> --------------------------------------------------- >> lo 00:00:00:00:00:00 127.0.0.1/8 ::1/128 >> eth0 52:54:00:89:ad:35 192.168.102.142/24fe80::5054:ff:fe89:ad35/64 >> eth1 52:54:00:d3:39:ee 192.168.103.183/24fe80::5054:ff:fed3:39ee/64 >> eth2 52:54:00:fe:4c:4f 192.168.101.197/24fe80::5054:ff:fefe:4c4f/64 >> eth3 52:54:00:89:4e:97 192.168.101.130/24fe80::5054:ff:fe89:4e97/64 >> > > Not a review, but a question. How does this work with IP aliases? Will it show all the aliases 1 per line or just show the primary address? > >> >> tools/virsh.pod >> * Document new command >> >> --- >> tools/virsh-domain-monitor.c | 99 ++++++++++++++++++++++++++++++++++++++++++++ >> tools/virsh.pod | 10 +++++ >> 2 files changed, 109 insertions(+) >> >> diff --git a/tools/virsh-domain-monitor.c b/tools/virsh-domain-monitor.c >> index b29b82a..91efa71 100644 >> --- a/tools/virsh-domain-monitor.c >> +++ b/tools/virsh-domain-monitor.c >> @@ -1871,6 +1871,99 @@ cleanup: >> } >> #undef FILTER >> >> +/* "domifaddr" command >> + */ >> +static const vshCmdInfo info_domifaddr[] = { >> + {"help", N_("Get network interfaces' addresses for a running domain")}, >> + {"desc", N_("Get network interfaces' addresses for a running domain")}, >> + {NULL, NULL} >> +}; >> + >> +static const vshCmdOptDef opts_domifaddr[] = { >> + {"domain", VSH_OT_DATA, VSH_OFLAG_REQ, N_("domain name, id or uuid")}, >> + {"interface", VSH_OT_DATA, VSH_OFLAG_NONE, N_("network interface name")}, >> + {NULL, 0, 0, NULL} >> +}; >> + >> +static bool >> +cmdDomIfAddr(vshControl *ctl, const vshCmd *cmd) >> +{ >> + virDomainPtr dom = NULL; >> + const char *interface = NULL; >> + virDomainInterfacePtr *ifaces = NULL; >> + size_t i, j; >> + int ifaces_count = 0; >> + unsigned int flags = 0; >> + bool ret = false; >> + >> + if (!(dom = vshCommandOptDomain(ctl, cmd, NULL))) >> + return false; >> + >> + if (vshCommandOptString(cmd, "interface", &interface) < 0) { >> + goto cleanup; >> + } >> + >> + if ((ifaces_count = virDomainInterfacesAddresses(dom, &ifaces, flags)) < 0) { >> + vshError(ctl, _("Failed to query for interfaces addresses")); >> + goto cleanup; >> + } >> + >> + vshPrintExtra(ctl, " %-10s %-17s %s\n%s\n", >> + _("Name"), _("MAC address"), _("IP address"), >> + "---------------------------------------------------"); >> + >> + for (i = 0; i < ifaces_count; i++) { >> + virDomainInterfacePtr iface = ifaces[i]; >> + virBuffer buf = VIR_BUFFER_INITIALIZER; >> + const char *hwaddr = ""; >> + const char *ip_addr_str = NULL; >> + >> + if (interface && STRNEQ(interface, iface->name)) { >> + virBufferFreeAndReset(&buf); >> + continue; >> + } >> + >> + if (iface->hwaddr) >> + hwaddr = iface->hwaddr; >> + >> + for (j = 0; j < iface->naddrs; j++) { >> + if (j) >> + virBufferAddChar(&buf, ' '); >> + virBufferAsprintf(&buf, "%s/%d", >> + iface->addrs[j].addr, >> + iface->addrs[j].prefix); >> + } >> + >> + if (virBufferError(&buf)) { >> + virBufferFreeAndReset(&buf); >> + virReportOOMError(); >> + return ret; >> + } >> + >> + ip_addr_str = virBufferContentAndReset(&buf); >> + >> + if (!ip_addr_str) >> + ip_addr_str = ""; >> + >> + vshPrintExtra(ctl, " %-10s %-17s %s\n", >> + iface->name, hwaddr, ip_addr_str); >> + >> + virBufferFreeAndReset(&buf); >> + } >> + >> + ret = true; >> + >> +cleanup: >> + for (i = 0; i < ifaces_count; i++) { >> + if (ifaces[i]) >> + virDomainInterfaceFree(ifaces[i]); >> + } >> + VIR_FREE(ifaces); >> + >> + virDomainFree(dom); >> + return ret; >> +} >> + >> const vshCmdDef domMonitoringCmds[] = { >> {.name = "domblkerror", >> .handler = cmdDomBlkError, >> @@ -1944,5 +2037,11 @@ const vshCmdDef domMonitoringCmds[] = { >> .info = info_list, >> .flags = 0 >> }, >> + {.name = "domifaddr", >> + .handler = cmdDomIfAddr, >> + .opts = opts_domifaddr, >> + .info = info_domifaddr, >> + .flags = 0 >> + }, >> {.name = NULL} >> }; >> diff --git a/tools/virsh.pod b/tools/virsh.pod >> index 0ae5178..008ffea 100644 >> --- a/tools/virsh.pod >> +++ b/tools/virsh.pod >> @@ -636,6 +636,16 @@ B<Explanation of fields> (fields appear in the following order): >> flush_total_times - total time flush operations took (ns) >> <-- other fields provided by hypervisor --> >> >> + >> +=item B<domifaddr> I<domain> [I<interface>] >> + >> +Get a list of interfaces of a running domain along with their IP and MAC >> +addresses, or limited output just for one interface if I<interface> is >> +specified. Note, that I<interface> can be driver dependent, it can be >> +the name within guest OS or the name you would see in domain XML. >> +Moreover, the whole command may require a guest agent to be configured >> +for the queried domain under some drivers, notably qemu. >> + >> =item B<domifstat> I<domain> I<interface-device> >> >> Get network interface stats for a running domain. >> -- >> 1.7.11.7 >> >> -- >> libvir-list mailing list >> libvir-list(a)redhat.com >> https://www.redhat.com/mailman/listinfo/libvir-list > > > > > -- > Doug Goldstein The leases method will be applied to this API when virNetworkGetDHCPLeases() API is accepted, which is the next step after this. Refer: http://www.redhat.com/archives/libvir-list/2013-July/msg01603.html and its followups. The output from the virNetworkGetDHCPLeases will be something of this kind: virsh # net-dhcp-leases default Virtual Network Expiry Time MAC address IP address Hostname ClientId ------------------------------------------------------------ ---------------------------------------- default 16-08-2013 03:53:11 52:54:00:89:4e:97 192.168.101.130 f18 * default 16-08-2013 03:45:20 52:54:00:fe:4c:4f 192.168.101.197 * *