- Devel - libvirt List Archives

[libvirt] [PATCH] docs: Improve patch submission guidelines
by Michal Privoznik 09 Jul '12

09 Jul '12

We should really advise (new) developers to send rebased patches that apply cleanly and use git-send-email rather than all other obscure ways. --- docs/hacking.html.in | 30 +++++++++++++++++++++++++++--- 1 files changed, 27 insertions(+), 3 deletions(-) diff --git a/docs/hacking.html.in b/docs/hacking.html.in index 89f9980..96859fd 100644 --- a/docs/hacking.html.in +++ b/docs/hacking.html.in @@ -11,19 +11,43 @@ <li>Post patches in unified diff format. A command similar to this should work: -<pre> +<del><pre> diff -urp libvirt.orig/ libvirt.modified/ > libvirt-myfeature.patch -</pre> +</pre></del> or: <pre> git diff > libvirt-myfeature.patch </pre> + However, the usual workflow of libvirt developer is: +<pre> + git checkout master + git pull + git checkout -b workbranch + Hack, committing any changes along the way +</pre> + Then, when you want to post your patches: +<pre> + git checkout master + git pull + git checkout workbranch + git rebase master + (fix any conflicts) + git send-email --compose --to=libvir-list(a)redhat.com master +</pre> + Please follow this as close as you can, especially the rebase and git + send-email part as it makes developer's, who is reviewing your patch + set, life easier. One should avoid sending patches as attachment but + rather send them in email body among with commit message. </li> + <li>Split large changes into a series of smaller patches, self-contained if possible, with an explanation of each patch and an explanation of how - the sequence of patches fits together.</li> + the sequence of patches fits together. Moreover, please keep in mind that + it's required to be able to compile cleanly after each patch. + </li> + <li>Make sure your patches apply against libvirt GIT. Developers only follow GIT and don't care much about released versions.</li> <li>Run the automated tests on your code before submitting any changes. -- 1.7.8.6

2 3

[libvirt] [PATCH 00/15] Major refactor of LXC controller code
by Daniel P. Berrange 09 Jul '12

09 Jul '12

The LXC controller code (libvirt_lxc binary) has grown rather large and complicated over time. One of the particularly bad problems is that there is no single store of global state. The results is that methods are passing around huge lists of parameters and it becomes unclear who is responsible for cleaning up state on failure. Although they are harmless in this context, there are many FDs which are leaked in the normal shutdown path. This series refactors everything so that a virLXCControllerPtr object holds all global state. The final patch also switches over to using the virNetServer APIs for the client/server monitor socket handling. There should be no functional change in this series, but it prepares the way for the next fun bit which is to introduce a full RPC protocol between libvirtd & libvirt_lxc. This will enable us to provide a bunch of interesting new APIs that are desired for LXC. Don't be put off by the large patch series - each change is fairly small & self-contained, with primarily just renaming of variables and funtions daemon/libvirtd.c | 3 daemon/remote.c | 3 daemon/remote.h | 3 src/Makefile.am | 41 - src/libvirt_private.syms | 1 src/lxc/lxc_container.c | 10 src/lxc/lxc_container.h | 2 src/lxc/lxc_controller.c | 1250 +++++++++++++++++++++-------------------------- src/rpc/virnetserver.c | 120 ++-- src/rpc/virnetserver.h | 6 src/util/virfile.c | 138 +++++ src/util/virfile.h | 3 12 files changed, 819 insertions(+), 761 deletions(-)

5 37

[libvirt] [PATCH] ESX: Add routines to interface driver
by Ata Bohra 09 Jul '12

09 Jul '12

From: Ata E Husain <ata.husain(a)hotmail.com> Includes most of the dirver routines except DefineXML, I am working on it and will update patch for it soon. diff --git a/src/esx/esx_interface_driver.c b/src/esx/esx_interface_driver.c index 5713137..4feadc2 100644 --- a/src/esx/esx_interface_driver.c +++ b/src/esx/esx_interface_driver.c @@ -23,6 +23,10 @@ */ #include <config.h> +#include <sys/socket.h> +#include <netinet/in.h> +#include <arpa/inet.h> +#include <libxml/parser.h> #include "internal.h" #include "util.h" @@ -34,10 +38,10 @@ #include "esx_vi.h" #include "esx_vi_methods.h" #include "esx_util.h" +#include "interface_conf.h" #define VIR_FROM_THIS VIR_FROM_ESX - - +#define XML_CAST (const xmlChar*) static virDrvOpenStatus esxInterfaceOpen(virConnectPtr conn, @@ -67,10 +71,565 @@ esxInterfaceClose(virConnectPtr conn) +static int +esxNumOfInterfaces(virConnectPtr conn) +{ + esxPrivate *priv = conn->interfacePrivateData; + esxVI_HostVirtualNic *virtualNicList = NULL; + const esxVI_HostVirtualNic *virtualNic = NULL; + int count = 0; + + if (esxVI_EnsureSession(priv->primary) < 0 || + esxVI_LookupVirtualNicList(priv->primary, &virtualNicList) < 0) { + goto cleanup; + } + + if (virtualNicList == NULL) { + ESX_ERROR(VIR_ERR_INTERNAL_ERROR, "%s", + _("Could not retrieve vNic List")); + + goto cleanup; + } + + for (virtualNic = virtualNicList; + virtualNic != NULL; + virtualNic = virtualNic->_next) { + count++; + } + +cleanup: + esxVI_HostVirtualNic_Free(&virtualNicList); + + return count; +} + + + +static int +esxNumOfDefinedInterfaces(virConnectPtr conn) +{ + conn->interfacePrivateData = NULL; + + // ESX interfaces are always active + return 0; +} + + + +static int +esxListInterfaces(virConnectPtr conn, char **names, int maxnames) +{ + esxPrivate *priv = conn->interfacePrivateData; + esxVI_HostVirtualNic *virtualNicList = NULL; + const esxVI_HostVirtualNic *virtualNic = NULL; + int result = -1; + int i = 0; + + if (esxVI_EnsureSession(priv->primary) < 0 || + esxVI_LookupVirtualNicList(priv->primary, + &virtualNicList) < 0) { + goto cleanup; + } + + if (virtualNicList == NULL) { + ESX_ERROR(VIR_ERR_INTERNAL_ERROR, "%s", + _("Could not retrieve vNIC List")); + goto cleanup; + } + + for (i= 0, virtualNic = virtualNicList; + virtualNic != NULL && i < maxnames; + ++i, virtualNic = virtualNic->_next) { + names[i] = strdup(virtualNic->device); + + if (names[i] == NULL) { + for(;i >=0;--i) { + VIR_FREE(names[i]); + } + virReportOOMError(); + goto cleanup; + } + } + + result = i; + cleanup: + esxVI_HostVirtualNic_Free(&virtualNicList); + + return result; +} + + + +static int +esxListDefinedInterfaces(virConnectPtr conn, char **names, int maxnames) +{ + conn->interfacePrivateData = NULL; + *names = NULL; + + /* keeps compiler happy */ + VIR_DEBUG("Max Interfaces: %d", maxnames); + /* ESX interfaces are always active */ + return 0; +} + + + +static virInterfacePtr +esxInterfaceLookupByName(virConnectPtr conn, const char *name) +{ + esxPrivate *priv = conn->interfacePrivateData; + esxVI_HostVirtualNic *virtualNicList = NULL; + const esxVI_HostVirtualNic *virtualNic = NULL; + virInterfacePtr ret = NULL; + + if (esxVI_EnsureSession(priv->primary) < 0 || + esxVI_LookupVirtualNicList(priv->primary, + &virtualNicList) < 0) { + goto cleanup; + } + + if (virtualNicList == 0) { + ESX_ERROR(VIR_ERR_INTERNAL_ERROR, "%s", + _("Could not retrieve vNIC List")); + goto cleanup; + } + + + for(virtualNic = virtualNicList; + virtualNic != NULL; + virtualNic = virtualNic->_next) { + if (STREQ(virtualNic->device, name)) { + if (virtualNic->spec == NULL || + virtualNic->spec->mac == NULL) { + ESX_ERROR(VIR_ERR_INTERNAL_ERROR, "%s", + _("Malformed HostVirtualNicSpec")); + goto cleanup; + } + + ret = virGetInterface(conn, virtualNic->device, virtualNic->spec->mac); + break; + } + } + + cleanup: + esxVI_HostVirtualNic_Free(&virtualNicList); + + return ret; +} + + + +static virInterfacePtr +esxInterfaceLookupByMACString(virConnectPtr conn, const char *mac) +{ + esxPrivate *priv = conn->interfacePrivateData; + esxVI_HostVirtualNic *virtualNicList = NULL; + const esxVI_HostVirtualNic *virtualNic = NULL; + virInterfacePtr ret = NULL; + + if (esxVI_EnsureSession(priv->primary) < 0 || + esxVI_LookupVirtualNicList(priv->primary, + &virtualNicList) < 0) { + goto cleanup; + } + + if (virtualNicList == 0) { + ESX_ERROR(VIR_ERR_INTERNAL_ERROR, "%s", + _("Could not retrieve vNIC List")); + goto cleanup; + } + + + for(virtualNic = virtualNicList; + virtualNic != NULL; + virtualNic = virtualNic->_next) { + if (virtualNic->spec == NULL || + virtualNic->spec->mac == NULL) { + ESX_ERROR(VIR_ERR_INTERNAL_ERROR, "%s", + _("Malformed HostVirtualNicSpec")); + goto cleanup; + } + + if (STREQ(virtualNic->spec->mac, mac)) { + ret = + virGetInterface(conn, virtualNic->device, virtualNic->spec->mac); + break; + } + } + + cleanup: + esxVI_HostVirtualNic_Free(&virtualNicList); + + return ret; +} + + +/** + * Generates native XML descritpor for a given interface. + * For instance: + * <interface type="bridge" name="%s"> + * <start mode="onboot"/>" + * <mtu size="%d"/>" + * <mac address="%s"/> + * <protocol family="ipv4"> + * <dhcp/> + * <ip address="%s" prefix="%d"/> + * <route gateway="%s"/> + * </protocol> + * <bridge stp="off"> + * <interface type="ethernet" name="%s"> + * <mac address="%s"/> + * </interface> + * </bridge> + * </interface> + */ +static char* +esxGetNativeInterfaceXMLDesc(const esxVI_HostVirtualNic *virtualNic, + const esxVI_HostIpRouteConfig *ipRouteConfig, + const esxVI_PhysicalNic *physicalNicList, + const unsigned int flags) +{ + const esxVI_PhysicalNic *physicalNic = NULL; + xmlDocPtr doc = NULL; + xmlNodePtr root = NULL; + xmlNodePtr startNode = NULL; + xmlNodePtr mtuNode = NULL; + xmlNodePtr protocolNode = NULL; + xmlNodePtr bridgeNode = NULL; + xmlNodePtr dhcpNode = NULL; + xmlChar *xmlbuff = NULL; + int use_static = 0; + struct in_addr addr; + uint32_t host_addr = 0; + int zero_count = 0; + int masklen = 0; + int i = 0; + virBuffer item = VIR_BUFFER_INITIALIZER; + int bufferSize = 0; + char *ret = NULL; + + if (VIR_INTERFACE_XML_INACTIVE & flags) { + use_static = 1; + } + + doc = xmlNewDoc(XML_CAST "1.0"); + root = xmlNewDocNode(doc, NULL, XML_CAST "interface", NULL); + + xmlNewProp(root, XML_CAST "type", XML_CAST "bridge"); + xmlNewProp(root, XML_CAST "name", XML_CAST virtualNic->device); + xmlDocSetRootElement(doc, root); + + /* define boot start mode */ + startNode = xmlNewChild(root, NULL, XML_CAST "start", NULL); + xmlNewProp(startNode, XML_CAST "mode", XML_CAST "onboot"); + + /* append mtu value */ + mtuNode = xmlNewChild(root, NULL, XML_CAST "mtu", NULL); + virBufferAsprintf(&item, "%d",virtualNic->spec->mtu && + virtualNic->spec->mtu->value ? + virtualNic->spec->mtu->value : + 1500); + const char *mtustr = virBufferContentAndReset(&item); + if (mtustr == NULL) { + virReportOOMError(); + goto cleanup; + } + xmlNewProp(mtuNode, XML_CAST "size", XML_CAST mtustr); + + /* append mac address field */ + if (!use_static && virtualNic->spec->mac) { + xmlNodePtr mac_node = xmlNewChild(root, NULL, XML_CAST "mac", NULL); + xmlNewProp(mac_node, XML_CAST "address", + XML_CAST virtualNic->spec->mac); + } + + /* TODO - Handle VLAN (via portgroup?) */ + if (virtualNic->spec->ip->subnetMask && + *virtualNic->spec->ip->subnetMask && + inet_aton(virtualNic->spec->ip->subnetMask, &addr) == 0) { + ESX_ERROR(VIR_ERR_INTERNAL_ERROR, "%s", + _("Error parsing netmask")); + goto cleanup; + } + + host_addr = ntohl(addr.s_addr); + /* Calculate masklen */ + for (i = 0; i < 32; ++i) { + if (host_addr & 0x01) { + break; + } + zero_count++; + host_addr >>= 1; + } + masklen = 32 - zero_count; + + /* append protocol field */ + /* TODO - Add IPv6 Support */ + protocolNode = xmlNewChild(root, NULL, XML_CAST "protocol", NULL); + xmlNewProp(protocolNode, XML_CAST "family", XML_CAST "ipv4"); + if (virtualNic->spec->ip->dhcp == 1) { + dhcpNode = xmlNewChild(protocolNode, NULL, XML_CAST "dhcp", NULL); + /* avoids compiler warning */ + VIR_DEBUG("dhcpNode name: %s", (char *)dhcpNode->name); + } + + if (virtualNic->spec->ip->dhcp != 1 || !use_static) { + if (virtualNic->spec->ip->ipAddress && + *virtualNic->spec->ip->ipAddress) { + xmlNodePtr ipAddrNode = + xmlNewChild(protocolNode, NULL, XML_CAST "ip", NULL); + xmlNewProp(ipAddrNode, XML_CAST "address", XML_CAST + virtualNic->spec->ip->ipAddress); + + virBufferAsprintf(&item, "%d", masklen); + const char *maskstr = virBufferContentAndReset(&item); + if (maskstr == NULL) { + virReportOOMError(); + goto cleanup; + } + xmlNewProp(ipAddrNode, XML_CAST "prefix", XML_CAST maskstr); + + xmlNodePtr routeNode = + xmlNewChild(protocolNode, NULL, XML_CAST "route", NULL); + xmlNewProp(routeNode, XML_CAST "gateway", + XML_CAST ipRouteConfig->defaultGateway); + } + } + + /* Add bridge information */ + bridgeNode = xmlNewChild(root, NULL, XML_CAST "bridge", NULL); + xmlNewProp(bridgeNode, XML_CAST "stp", XML_CAST "off"); + + for (physicalNic = physicalNicList; + physicalNic != NULL; + physicalNic = physicalNic->_next) { + xmlNodePtr bridgeIfaceNode = + xmlNewChild(bridgeNode, NULL, XML_CAST "interface", NULL); + xmlNewProp(bridgeIfaceNode, XML_CAST "type", XML_CAST "ethernet"); + xmlNewProp(bridgeIfaceNode, XML_CAST "name", + XML_CAST physicalNic->device); + + xmlNodePtr bridgeIfaceMacNode = + xmlNewChild(bridgeIfaceNode, NULL, XML_CAST "mac", NULL); + xmlNewProp(bridgeIfaceMacNode, XML_CAST "address", + XML_CAST physicalNic->mac); + } + + xmlDocDumpFormatMemory(doc, &xmlbuff, &bufferSize, 1); + if (xmlbuff == NULL) { + virReportOOMError(); + goto cleanup; + } + + ret = strdup((char *)xmlbuff); + if (ret == NULL) { + virReportOOMError(); + goto cleanup; + } + + cleanup: + VIR_FREE(mtustr); + if (xmlbuff != NULL) { + xmlFree(xmlbuff); + } + xmlFreeDoc(doc); + + return ret; +} + + + +static char* +esxInterfaceGetXMLDesc(virInterfacePtr iface, unsigned int flags) +{ + esxPrivate *priv = iface->conn->interfacePrivateData; + esxVI_HostVirtualNic *virtualNicList = NULL; + esxVI_HostVirtualNic *virtualNic = NULL; + esxVI_PhysicalNic *physicalNicList = NULL; + esxVI_PhysicalNic *matchingPhysicalNicList = NULL; + esxVI_HostIpRouteConfig *ipRouteConfig = NULL; + esxVI_HostPortGroup *portGroupList = NULL; + esxVI_HostVirtualSwitch *virtualSwitchList = NULL; + esxVI_String *propertyNameList = NULL; + esxVI_ObjectContent *hostSystem = NULL; + esxVI_DynamicProperty *dynamicProperty = NULL; + virInterfaceDefPtr def = NULL; + char *xmlstr = NULL; + char *ret = NULL; + + if (esxVI_EnsureSession(priv->primary) < 0 || + esxVI_String_AppendValueListToList(&propertyNameList, + "config.network.vnic\0" + "config.network.ipRouteConfig\0" + "config.network.vswitch\0" + "config.network.pnic\0" + "config.network.portgroup\0") < 0 || + esxVI_LookupHostSystemProperties(priv->primary, propertyNameList, + &hostSystem) < 0) { + goto cleanup; + } + + for (dynamicProperty = hostSystem->propSet; dynamicProperty != NULL; + dynamicProperty = dynamicProperty->_next) { + if (STREQ(dynamicProperty->name, "config.network.vnic")) { + if (esxVI_HostVirtualNic_CastListFromAnyType(dynamicProperty->val, + &virtualNicList) + < 0) { + goto cleanup; + } + } else if (STREQ(dynamicProperty->name, "config.network.ipRouteConfig")) { + if (esxVI_HostIpRouteConfig_CastFromAnyType(dynamicProperty->val, + &ipRouteConfig)) { + goto cleanup; + } + } else if (STREQ(dynamicProperty->name, "config.network.vswitch")) { + if (esxVI_HostVirtualSwitch_CastListFromAnyType + (dynamicProperty->val, &virtualSwitchList) < 0) { + goto cleanup; + } + } else if (STREQ(dynamicProperty->name, "config.network.pnic")) { + if (esxVI_PhysicalNic_CastListFromAnyType(dynamicProperty->val, + &physicalNicList) + < 0) { + goto cleanup; + } + } else if (STREQ(dynamicProperty->name, "config.network.portgroup")) { + if (esxVI_HostPortGroup_CastListFromAnyType(dynamicProperty->val, + &portGroupList) + < 0) { + goto cleanup; + } + } else { + VIR_WARN("Unexpected '%s' property", dynamicProperty->name); + } + } + + if (!virtualNicList || + !ipRouteConfig || + !virtualSwitchList || + !portGroupList) { + ESX_ERROR(VIR_ERR_INTERNAL_ERROR, "%s", + _("Unable to retrieve network parameters")); + + goto cleanup; + } + + for (virtualNic = virtualNicList; + virtualNic != NULL; + virtualNic = virtualNic->_next) { + if (STREQ(virtualNic->device, iface->name)) { + break; + } + } + + if (virtualNic == NULL) { + ESX_ERROR(VIR_ERR_INTERNAL_ERROR, "%s", + _("Could not find Interface")); + goto cleanup; + } + + if (esxVI_LookupPhysicalNicFromPortGroup(virtualNic->portgroup, + portGroupList, + virtualSwitchList, + physicalNicList, + &matchingPhysicalNicList) < 0) { + ESX_ERROR(VIR_ERR_INTERNAL_ERROR, "%s", + _("No Physical NIC found matching Virtual NIC's portgroup")); + goto cleanup; + } + + /* create a xml descriptor and parse it using virInterfaceDefParseString */ + xmlstr = esxGetNativeInterfaceXMLDesc(virtualNic, + ipRouteConfig, + matchingPhysicalNicList, + flags); + if (xmlstr == NULL) { + goto cleanup; + } + + def = virInterfaceDefParseString(xmlstr); + if (!def) { + goto cleanup; + } + + ret = virInterfaceDefFormat(def); + if (!ret) { + goto cleanup; + } + + cleanup: + esxVI_HostVirtualNic_Free(&virtualNicList); + esxVI_PhysicalNic_Free(&physicalNicList); + esxVI_PhysicalNic_Free(&matchingPhysicalNicList); + esxVI_HostPortGroup_Free(&portGroupList); + esxVI_HostVirtualSwitch_Free(&virtualSwitchList); + esxVI_HostIpRouteConfig_Free(&ipRouteConfig); + esxVI_ObjectContent_Free(&hostSystem); + esxVI_String_Free(&propertyNameList); + virInterfaceDefFree(def); + VIR_FREE(xmlstr); + + return ret; +} + + + +static int +esxInterfaceUndefine(virInterfacePtr iface) +{ + esxPrivate *priv = iface->conn->interfacePrivateData; + + if (esxVI_RemoveVirtualNic( + priv->primary, + priv->primary->hostSystem->configManager->networkSystem, + iface->name) < 0) { + ESX_ERROR(VIR_ERR_INTERNAL_ERROR, "%s", + _("Error deleting interface")); + return -1; + } + + return 0; +} + + + +static int +esxInterfaceCreate(virInterfacePtr iface, unsigned int flags) +{ + iface->conn->interfacePrivateData = NULL; + + virCheckFlags(0, -1); + + /* ESX interfaces are always active */ + return 0; +} + + +static int +esxInterfaceDestroy(virInterfacePtr iface, unsigned int flags) +{ + iface->conn->privateData = NULL; + + virCheckFlags(0, -1); + + /* ESX does not support deactivating interfaces */ + return 1; +} + static virInterfaceDriver esxInterfaceDriver = { .name = "ESX", - .open = esxInterfaceOpen, /* 0.7.6 */ - .close = esxInterfaceClose, /* 0.7.6 */ + .open = esxInterfaceOpen, /* 0.7.6 */ + .close = esxInterfaceClose, /* 0.7.6 */ + .numOfInterfaces = esxNumOfInterfaces, /* 0.9.x */ + .numOfDefinedInterfaces = esxNumOfDefinedInterfaces, /* 0.9.x */ + .listInterfaces = esxListInterfaces, /* 0.9.x */ + .listDefinedInterfaces = esxListDefinedInterfaces, /* 0.9.x */ + .interfaceLookupByName = esxInterfaceLookupByName, /* 0.9.x */ + .interfaceLookupByMACString = esxInterfaceLookupByMACString, /* 0.9.x */ + .interfaceGetXMLDesc = esxInterfaceGetXMLDesc, /* 0.9.x */ + .interfaceUndefine = esxInterfaceUndefine, /* 0.9.x */ + .interfaceCreate = esxInterfaceCreate, /* 0.9.x */ + .interfaceDestroy = esxInterfaceDestroy, /* 0.9.x */ }; diff --git a/src/esx/esx_vi.c b/src/esx/esx_vi.c index 5b5ab69..df9f8df 100644 --- a/src/esx/esx_vi.c +++ b/src/esx/esx_vi.c @@ -4414,4 +4414,134 @@ esxVI_LookupManagedObjectHelper(esxVI_Context *ctx, +int +esxVI_LookupVirtualNicList(esxVI_Context* ctx, + esxVI_HostVirtualNic** virtualNicList) +{ + int result = -1; + esxVI_String *propertyNameList = NULL; + esxVI_DynamicProperty *dynamicProperty = NULL; + esxVI_ObjectContent* hostSystem = NULL; + + if (esxVI_String_AppendValueListToList( + &propertyNameList, "config.network.vnic\0") < 0 || + esxVI_LookupHostSystemProperties(ctx, propertyNameList, &hostSystem) < 0) { + goto cleanup; + } + + if (hostSystem == NULL) { + ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, "%s", + _("Could not retrieve the HostSystem object")); + + goto cleanup; + } + + for (dynamicProperty = hostSystem->propSet; + dynamicProperty != NULL; + dynamicProperty = dynamicProperty->_next) { + if (STREQ(dynamicProperty->name, "config.network.vnic")) { + if (esxVI_HostVirtualNic_CastListFromAnyType(dynamicProperty->val, + virtualNicList) < 0) { + goto cleanup; + } + break; + } else { + VIR_WARN("Unexpected '%s' property", dynamicProperty->name); + } + } + + result = 0; + +cleanup: + esxVI_String_Free(&propertyNameList); + esxVI_ObjectContent_Free(&hostSystem); + + return result; +} + + + +int +esxVI_LookupPhysicalNicFromPortGroup( + const char *portgroup, + const esxVI_HostPortGroup *portGroupList, + const esxVI_HostVirtualSwitch *virtualSwitchList, + const esxVI_PhysicalNic *physicalNicList, + esxVI_PhysicalNic **ret_physicalNicList) +{ + int result = -1; + const esxVI_HostPortGroup *portGroup = NULL; + const esxVI_HostVirtualSwitch *virtualSwitch = NULL; + esxVI_PhysicalNic *matchingPhysicalNicList = NULL; + const esxVI_PhysicalNic *physicalNic = NULL; + esxVI_PhysicalNic *tempPhysicalNic = NULL; + const esxVI_String *pnicKey = NULL; + + if (portgroup == NULL) { + ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, "%s", + _("No Portgroup found!")); + goto cleanup; + } + + /* Go through all the port groups to find the one that matches. */ + for (portGroup = portGroupList; + portGroup != NULL; + portGroup = portGroup->_next) { + if (STREQ(portGroup->spec->name, portgroup)) { + break; + } + } + + if (portGroup == NULL) { + ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, "%s", + _("Could not find Host port group")); + goto cleanup; + } + + /* Go through all the virtual switches to find the one that matches */ + for (virtualSwitch = virtualSwitchList; + virtualSwitch != NULL; + virtualSwitch = virtualSwitch->_next) { + if (STREQ(portGroup->spec->vswitchName, virtualSwitch->name)) { + break; + } + } + + if (virtualSwitch == NULL) { + ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, "%s", + _("Could not find Virtual Switch")); + goto cleanup; + } + + /* Go through all physical nics */ + for (pnicKey = virtualSwitch->pnic; + pnicKey != NULL; + pnicKey = pnicKey->_next) { + /* O(n^2), but probably faster than a hash due to small N */ + for (physicalNic = physicalNicList; + physicalNic != NULL; + physicalNic = physicalNic->_next) { + + if (STREQ(pnicKey->value, physicalNic->key)) { + if (esxVI_PhysicalNic_DeepCopy(&tempPhysicalNic, + (esxVI_PhysicalNic *)physicalNic) < 0 || + esxVI_PhysicalNic_AppendToList(&matchingPhysicalNicList, + tempPhysicalNic) < 0) { + goto cleanup; + } + tempPhysicalNic = NULL; + } + } + } + + *ret_physicalNicList = matchingPhysicalNicList; + matchingPhysicalNicList = NULL; /* no cleanup needed */ + tempPhysicalNic = NULL; /* no cleanup needed */ + result = 0; + cleanup: + esxVI_PhysicalNic_Free(&matchingPhysicalNicList); + esxVI_PhysicalNic_Free(&tempPhysicalNic); + return result; +} + #include "esx_vi.generated.c" diff --git a/src/esx/esx_vi.h b/src/esx/esx_vi.h index 78d3986..11bc52e 100644 --- a/src/esx/esx_vi.h +++ b/src/esx/esx_vi.h @@ -487,6 +487,16 @@ int esxVI_ParseHostCpuIdInfo(esxVI_ParsedHostCpuIdInfo *parsedHostCpuIdInfo, int esxVI_ProductVersionToDefaultVirtualHWVersion(esxVI_ProductVersion productVersion); +int esxVI_LookupVirtualNicList(esxVI_Context* ctx, + esxVI_HostVirtualNic** virtualNicList); + +int esxVI_LookupPhysicalNicFromPortGroup( + const char *portgroup, + const esxVI_HostPortGroup *portGroupList, + const esxVI_HostVirtualSwitch *virtualSwitchList, + const esxVI_PhysicalNic *physicalNicList, + esxVI_PhysicalNic **ret_physicalNicList); + # include "esx_vi.generated.h" #endif /* __ESX_VI_H__ */ diff --git a/src/esx/esx_vi_generator.input b/src/esx/esx_vi_generator.input index 1a67a8c..b99fee6 100644 --- a/src/esx/esx_vi_generator.input +++ b/src/esx/esx_vi_generator.input @@ -57,6 +57,29 @@ enum AutoStartWaitHeartbeatSetting systemDefault end +enum HostConfigChangeOperation + add + edit + remove +end + +enum HostIpConfigIpV6AdressStatus + deprecated + duplicate + inaccessible + invalid + preferred + tentative + unknown +end + +enum HostIpConfigV6AdressConfigType + dhcp + linklayer + manual + other + random +end enum ManagedEntityStatus gray @@ -89,6 +112,12 @@ enum PerfSummaryType none end +enum PortGroupConnecteeType + host + systemManagement + unknown + virtualMachine +end enum PropertyChangeOp add @@ -197,6 +226,12 @@ object DeviceBackedVirtualDiskSpec extends VirtualDiskSpec String device r end +object DistributedVirtualSwitchPortConnection + Int connectionCookie o + String portgroupKey o + String portKey o + String switchUuid r +end object DynamicProperty String name r @@ -316,6 +351,34 @@ object HostFileSystemVolume Long capacity r end +object HostIpConfig + Boolean dhcp r + String ipAddress o + HostIpConfigIpV6AddressConfiguration ipV6Config o + String subnetMask o +end + +object HostIpConfigIpV6Address + String dadState o + String ipAddress r + DateTime lifetime o + String operation o + String origin o + Int prefixLength r +end + +object HostIpConfigIpV6AddressConfiguration + Boolean autoConfigurationEnabled o + Boolean dhcpV6Enabled o + HostIpConfigIpV6Address ipV6Address ol +end + +object HostIpRouteConfig + String defaultGateway o + String gatewayDevice o + String ipV6DefaultGateway o + String ipV6GatewayDevice o +end object HostMountInfo String path o @@ -331,11 +394,134 @@ object HostNasVolume extends HostFileSystemVolume end +object HostNicTeamingPolicy + HostNicFailureCriteria failureCriteria o + HostNicOrderPolicy nicOrder o + Boolean notifySwitches o + String policy o + Boolean reversePolicy o + Boolean rollingOrder o +end + +object HostNetOffloadCapabilities + Boolean csumOffload o + Boolean tcpSegmentation o + Boolean zeroCopyXmit o +end + +object HostNetworkSecurityPolicy + Boolean allowPromiscuous o + Boolean forgedTransmits o + Boolean macChanges o +end + +object HostNetworkPolicy + HostNicTeamingPolicy nicTeaming o + HostNetOffloadCapabilities offloadPolicy o + HostNetworkSecurityPolicy security o + HostNetworkTrafficShapingPolicy shapingPolicy o +end + +object HostNetworkTrafficShapingPolicy + Long averageBandwidth o + Long burstLong o + Boolean enabled o + Long peakBandwidth o +end + +object HostNicFailureCriteria + String checkSpeed o + Int speed o + Boolean checkDuplex o + Boolean fullDuplex o + Boolean checkErrorPercent o + Int percentage o + Boolean checkBeacon o +end + +object HostNicOrderPolicy + String activeNic ol + String standbyNic ol +end + +object HostPortGroup + String key r + HostPortGroupPort port ol + String vswitch r + HostNetworkPolicy computedPolicy r + HostPortGroupSpec spec r +end + +object HostPortGroupPort + String key o + String mac ol + String type r +end + +object HostPortGroupSpec + String name r + HostNetworkPolicy policy r + Int vlanId r + String vswitchName r +end + object HostScsiDiskPartition String diskName r Int partition r end +object HostVirtualNic + String device r + String key r + String port o + String portgroup r + HostVirtualNicSpec spec r +end + +object HostVirtualNicSpec + DistributedVirtualSwitchPortConnection distributedVirtualPort o + HostIpConfig ip o + String mac o + Int mtu o + String portgroup o + Boolean tsoEnabled o +end + + +object HostVirtualSwitch + String key r + Int mtu o + String name r + Int numPorts r + Int numPortsAvailable r + String pnic ol + String portgroup ol + HostVirtualSwitchSpec spec r +end + +object HostVirtualSwitchBridge +end + +object HostVirtualSwitchAutoBridge extends HostVirtualSwitchBridge + String excludedNicDevice ol +end + +object HostVirtualSwitchBeaconBridge extends HostVirtualSwitchBridge + Int interval r +end + +object HostVirtualSwitchBondBridge extends HostVirtualSwitchBridge + HostVirtualSwitchBeaconBridge beacon o + LinkDiscoveryProtocolConfig linkDiscoveryProtocolConfig o + String nicDevice rl +end + +object HostVirtualSwitchSpec + HostVirtualSwitchBridge bridge o + Int mtu o + Int numPorts r + HostNetworkPolicy policy o +end object HostVmfsVolume extends HostFileSystemVolume Int blockSizeMb r @@ -355,6 +541,10 @@ end object IsoImageFileQuery extends FileQuery end +object LinkDiscoveryProtocolConfig + String operation r + String protocol r +end object LocalDatastoreInfo extends DatastoreInfo String path o @@ -398,6 +588,10 @@ object OptionType Boolean valueIsReadonly o end +object OptionValue + String key r + AnyType value r +end object PerfCounterInfo Int key r @@ -454,6 +648,27 @@ object PerfSampleInfo Int interval r end +object PhysicalNic + String device r + String driver o + String key o + PhysicalNicInfo linkSpeed o + String mac r + String pci r + PhysicalNicSpec spec r + PhysicalNicInfo validLinkSpecification ol + Boolean wakeOnLanSupported r +end + +object PhysicalNicInfo + Boolean duplex r + Int speedMb r +end + +object PhysicalNicSpec + HostIpConfig ip o + PhysicalNicInfo linkSpeed o +end object PropertyChange String name r @@ -490,7 +705,6 @@ object ResourceAllocationInfo Long overheadLimit o end - object ResourcePoolResourceUsage Long reservationUsed r Long reservationUsedForVm r @@ -954,6 +1168,10 @@ method RemoveSnapshot_Task returns ManagedObjectReference r Boolean removeChildren r end +method RemoveVirtualNic + ManagedObjectReference _this r + String device r +end method RetrieveProperties returns ObjectContent ol ManagedObjectReference _this:propertyCollector r @@ -1002,6 +1220,16 @@ method UnregisterVM ManagedObjectReference _this r end +method UpdateIpRouteConfig + ManagedObjectReference _this r + HostIpRouteConfig config r +end + +method UpdateVirtualNic + ManagedObjectReference _this r + String device r + HostVirtualNicSpec nic r +end method WaitForUpdates returns UpdateSet r ManagedObjectReference _this:propertyCollector r diff --git a/src/esx/esx_vi_generator.py b/src/esx/esx_vi_generator.py index 8a128df..787a28c 100755 --- a/src/esx/esx_vi_generator.py +++ b/src/esx/esx_vi_generator.py @@ -371,8 +371,12 @@ class Property(Member): % self.name elif self.occurrence in [OCCURRENCE__REQUIRED_LIST, OCCURRENCE__OPTIONAL_LIST]: - return " ESX_VI__TEMPLATE__PROPERTY__DESERIALIZE_LIST(%s, %s)\n" \ - % (self.type, self.name) + if self.type == "String": + return " ESX_VI__TEMPLATE__PROPERTY__DESERIALIZE_STRING_LIST(%s, %s)\n" \ + % (self.type, self.name) + else: + return " ESX_VI__TEMPLATE__PROPERTY__DESERIALIZE_LIST(%s, %s)\n" \ + % (self.type, self.name) elif self.type == "String": return " ESX_VI__TEMPLATE__PROPERTY__DESERIALIZE_VALUE(String, %s)\n" \ % self.name @@ -1505,7 +1509,10 @@ predefined_objects = ["AnyType", additional_enum_features = { "ManagedEntityStatus" : Enum.FEATURE__ANY_TYPE, "TaskInfoState" : Enum.FEATURE__ANY_TYPE, - "VirtualMachinePowerState" : Enum.FEATURE__ANY_TYPE } + "VirtualMachinePowerState" : Enum.FEATURE__ANY_TYPE , + "HostIpConfigIpV6AdressStatus" : Enum.FEATURE__ANY_TYPE, + "HostIpConfigV6AdressConfigType" : Enum.FEATURE__ANY_TYPE, + "PortGroupConnecteeType" : Enum.FEATURE__ANY_TYPE } additional_object_features = { "AutoStartDefaults" : Object.FEATURE__ANY_TYPE, "AutoStartPowerInfo" : Object.FEATURE__ANY_TYPE, @@ -1519,8 +1526,31 @@ additional_object_features = { "AutoStartDefaults" : Object.FEATURE__AN Object.FEATURE__ANY_TYPE, "HostDatastoreBrowserSearchResults" : Object.FEATURE__LIST | Object.FEATURE__ANY_TYPE, + "HostIpConfig" : Object.FEATURE__DEEP_COPY, + "HostIpRouteConfig" : Object.FEATURE__ANY_TYPE, + "HostIpConfigIpV6Address" : Object.FEATURE__LIST | + Object.FEATURE__ANY_TYPE | + Object.FEATURE__DEEP_COPY, + "HostIpConfigIpV6AddressConfiguration" : Object.FEATURE__DEEP_COPY, + "HostPortGroup" : Object.FEATURE__LIST | + Object.FEATURE__ANY_TYPE, + "HostVirtualNic" : Object.FEATURE__ANY_TYPE | + Object.FEATURE__LIST, + "HostVirtualSwitch" : Object.FEATURE__ANY_TYPE | + Object.FEATURE__LIST, + "KeyValue" : Object.FEATURE__ANY_TYPE, "ManagedObjectReference" : Object.FEATURE__ANY_TYPE, + "PhysicalNic" : Object.FEATURE__LIST | + Object.FEATURE__ANY_TYPE | + Object.FEATURE__DEEP_COPY, "ObjectContent" : Object.FEATURE__DEEP_COPY, + "OptionValue" : Object.FEATURE__ANY_TYPE | + Object.FEATURE__LIST, + "PhysicalNic" : Object.FEATURE__LIST | + Object.FEATURE__ANY_TYPE | + Object.FEATURE__DEEP_COPY, + "PhysicalNicSpec" : Object.FEATURE__DEEP_COPY, + "PhysicalNicLinkInfo" : Object.FEATURE__LIST, "ResourcePoolResourceUsage" : Object.FEATURE__ANY_TYPE, "ServiceContent" : Object.FEATURE__DESERIALIZE, "SharesInfo" : Object.FEATURE__ANY_TYPE, diff --git a/src/esx/esx_vi_types.c b/src/esx/esx_vi_types.c index bcc310f..f23af8d 100644 --- a/src/esx/esx_vi_types.c +++ b/src/esx/esx_vi_types.c @@ -475,7 +475,23 @@ continue; \ } - +#define ESX_VI__TEMPLATE__PROPERTY__DESERIALIZE_STRING_LIST(_type, _name) \ + if (xmlStrEqual(childNode->name, BAD_CAST #_name)) { \ + char *value = NULL; \ + \ + if (esxVI_String_DeserializeValue(childNode, &value) < 0 || \ + value == NULL) { \ + goto failure; \ + } \ + \ + if (esxVI_##_type##_AppendValueToList(&(*ptrptr)->_name, \ + value) < 0) { \ + VIR_FREE(value); \ + goto failure; \ + } \ + \ + continue; \ + } /* * A required property must be != 0 (NULL for pointers, "undefined" == 0 for -- 1.7.9.5

4 6

[libvirt] [PATCH] [libvirt-java] Fix typo in Domain.java.
by Claudio Bley 09 Jul '12

09 Jul '12

Hi. I sent a few mails on friday, 6th July, via gmane.org but they haven't made it to the list yet. As I'm a subscriber now, I'm resending them directly. Sorry for any duplicates in advance. Just a small typo fix: --- diff --git a/src/main/java/org/libvirt/Domain.java b/src/main/java/org/libvirt/Domain.java index fe9f3b0..71c6397 100644 --- a/src/main/java/org/libvirt/Domain.java +++ b/src/main/java/org/libvirt/Domain.java @@ -678,7 +678,7 @@ public class Domain { * @return 0 in case of success, and -1 in case of error * @throws LibvirtException */ - public int managedSaveRemote() throws LibvirtException { + public int managedSaveRemove() throws LibvirtException { int returnValue = libvirt.virDomainManagedSaveRemove(VDP, 0); processError(); return returnValue; --- Best regards, Claudio. -- AV-Test GmbH, Henricistraße 20, 04155 Leipzig, Germany Phone: +49 341 265 310 19 Web:<http://www.av-test.org> Eingetragen am / Registered at: Amtsgericht Stendal (HRB 114076) Geschaeftsfuehrer (CEO): Andreas Marx, Guido Habicht, Maik Morgenstern

1 0

[libvirt] Release of libvirt-java 0.4.8
by Daniel Veillard 09 Jul '12

09 Jul '12

I have tagged the git tree and pushed the tarball and rpms at: ftp://libvirt.org/libvirt/java/ This release includes the few improvement and fixes made to the java bindings since the last release last year: Bug fixes: Return a byte[] array with secretGetValue (Wido den Hollander) Fix for the jna parameter passing issue (Daniel Veillard) Improvements: Add flags to StoragePoolRefresh (Wido den Hollander) Allow byte[] arrays to be set as a secretValue (Wido den Hollander) Added domain flags up to libvirt-0.9.12 (Stefan Majer) Added error constants up to libvirt-0.9.12 (Stefan Majer) Add an automated build control script (Daniel P. Berrange) Documentation: Fix most of the javadoc reported problems (Daniel Veillard) Cleanups: Spaces cleanup and reformating of a few comments (Daniel Veillard) Cleanup trailing white space issues (Daniel Veillard) thanks for the help and contributions :-) ! Daniel -- Daniel Veillard | libxml Gnome XML XSLT toolkit http://xmlsoft.org/ daniel(a)veillard.com | Rpmfind RPM search engine http://rpmfind.net/ http://veillard.com/ | virtualization library http://libvirt.org/

2 2

[libvirt] [PATCH 0/3] esx: Storage volume up- and download
by Matthias Bolte 08 Jul '12

08 Jul '12

I started the download part and the stream driver quite a while ago but stopped and put it aside as I realized that the storage volume API up- and download functions assume one file per volume. This is a problem with ESX as a VMDK can consist of two files. To solve this now I added two new flags: METADATA and CONTENT. With this flags the user can specify which part of such a volume to transfer. See patch 3/3 for more details. Matthias

4 14

Re: [libvirt] [fedora-virt] qemu 1.1.0 in Rawhide, and planned backport to F17 (was: Re: Upgrading qemu to 1.1 in rawhide)
by Richard W.M. Jones 06 Jul '12

06 Jul '12

[On the topic of qemu 1.1.0 in Fedora 17] I'm seeing some very peculiar problems with virt-install that might be due to libvirt. Is libvirt in F17 too old for qemu 1.1.0? ------- (1) Just installing qemu-system-x86 isn't enough for libvirt to recognize any hypervisors: ERROR Host does not support any virtualization options virsh capabilities doesn't show any <guest> section at all. Of course qemu-kvm *is* installed and working. Solution: install the qemu meta-package. Unfortunately that means I have to have qemu-system-{cris,sh4,arm,mips} which I didn't want. (2) If I use virt-install --cpu=host, I get: ERROR unsupported configuration: CPU specification not supported by hypervisor Solution was to not use this option. (3) Now virt-install says: ERROR internal error process exited while connecting to monitor: char device redirected to /dev/pts/19 Error: Cirrus VGA not available Solution was to use --graphics=spice. (4) Now virt-install says: ERROR internal error process exited while connecting to monitor: char device redirected to /dev/pts/19 do_spice_init: starting 0.10.1 spice_server_add_interface: SPICE_INTERFACE_MIGRATION spice_server_add_interface: SPICE_INTERFACE_KEYBOARD spice_server_add_interface: SPICE_INTERFACE_MOUSE Kernel image must be specified The error here is "Kernel image must be specified". By this point it was getting very strange, so I decided to look at the libvirt log files for the qemu command line ... LC_ALL=C PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin QEMU_AUDIO_DRV=none /usr/bin/qemu-system-arm -S -M integratorcp -no-kvm -m 1024 -smp 1,sockets=1,cores=1,threads=1 -name OpenSUSE113x64 -uuid 4f959395-9203-7e3d-09e6-e43369286a2c -nodefconfig -nodefaults -chardev socket,id=charmonitor,path=/var/lib/libvirt/qemu/OpenSUSE113x64.monitor,server,nowait -mon chardev=charmonitor,id=monitor,mode=control -rtc base=utc -no-reboot -no-shutdown -device piix3-usb-uhci,id=usb,bus=pci,addr=0x1.0x2 -drive file=/dev/vg_pin/OpenSUSE113x64,if=none,id=drive-ide0-0-0,format=raw -device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=2 -drive file=/mnt/media/installers/OpenSUSE-11.3-x86_64/openSUSE-11.3-NET-x86_64.iso,if=none,media=cdrom,id=drive-ide0-1-0,readonly=on,format=raw -device ide-drive,bus=ide.1,unit=0,drive=drive-ide0-1-0,id=ide0-1-0,bootindex=1 -netdev tap,fd=21,id=hostnet0 -device rtl8139,netdev=hostnet0,id=net0,mac=52:54:00:0d:16:de,bus=pci,addr=0x3 -chardev pty,id=charserial0 -device isa-serial,chardev=charserial0,id=serial0 -vnc 127.0.0.1:0 -k en-gb -vga cirrus -device virtio-balloon-pci,id=balloon0,bus=pci,addr=0x4 Yikes. ???? qemu-system-arm ???? ------- The version of libvirt is libvirt-0.9.11.4-3.fc17.x86_64, and this is a mostly up to date F17 system, except that I've installed qemu-kvm 1.1.0 + ceph from Rawhide. Suggestions welcome. Rich. -- Richard Jones, Virtualization Group, Red Hat http://people.redhat.com/~rjones virt-top is 'top' for virtual machines. Tiny program with many powerful monitoring features, net stats, disk stats, logging, etc. http://et.redhat.com/~rjones/virt-top

2 6

[libvirt] [PATCH] [libvirt-java] Fix javadoc warnings.
by Claudio Bley 06 Jul '12

06 Jul '12

Hi. Here's a patch fixing these javadoc warnings: --- [javadoc] x:\src\libvirt-java\src\main\java\org\libvirt\Connect.java:387: warning - @return tag has no arguments. [javadoc] x:\src\libvirt-java\src\main\java\org\libvirt\Connect.java:644: warning - @return tag has no arguments. [javadoc] x:\src\libvirt-java\src\main\java\org\libvirt\Connect.java:658: warning - @return tag has no arguments. [javadoc] x:\src\libvirt-java\src\main\java\org\libvirt\Domain.java:681: warning - @return tag has no arguments. [javadoc] x:\src\libvirt-java\src\main\java\org\libvirt\Domain.java:795: warning - Tag @see: reference not found: http [javadoc] ://www.libvirt.org/html/libvirt-libvirt.html#virDomainMigrateToURI [javadoc] x:\src\libvirt-java\src\main\java\org\libvirt\DomainSnapshot.java:40: warning - @return tag has no arguments. [javadoc] x:\src\libvirt-java\src\main\java\org\libvirt\StoragePool.java:349: warning - @return tag has no arguments. [javadoc] x:\src\libvirt-java\src\main\java\org\libvirt\Stream.java:130: warning - Tag @see:illegal character: "58" in "http://www.libvirt.org/html/libvi rt-libvirt.html#virStreamRecvAll" [javadoc] x:\src\libvirt-java\src\main\java\org\libvirt\Stream.java:130: warning - Tag @see:illegal character: "47" in "http://www.libvirt.org/html/libvi rt-libvirt.html#virStreamRecvAll" [javadoc] x:\src\libvirt-java\src\main\java\org\libvirt\Stream.java:130: warning - Tag @see:illegal character: "47" in "http://www.libvirt.org/html/libvi rt-libvirt.html#virStreamRecvAll" [javadoc] x:\src\libvirt-java\src\main\java\org\libvirt\Stream.java:130: warning - Tag @see:illegal character: "47" in "http://www.libvirt.org/html/libvi rt-libvirt.html#virStreamRecvAll" [javadoc] x:\src\libvirt-java\src\main\java\org\libvirt\Stream.java:130: warning - Tag @see:illegal character: "47" in "http://www.libvirt.org/html/libvi rt-libvirt.html#virStreamRecvAll" [javadoc] x:\src\libvirt-java\src\main\java\org\libvirt\Stream.java:130: warning - Tag @see:illegal character: "45" in "http://www.libvirt.org/html/libvi rt-libvirt.html#virStreamRecvAll" [javadoc] x:\src\libvirt-java\src\main\java\org\libvirt\Stream.java:130: warning - Tag @see: reference not found: http://www.libvirt.org/html/libvirt-lib virt.html#virStreamRecvAll --- --- diff --git a/src/main/java/org/libvirt/Connect.java b/src/main/java/org/libvirt/Connect.java index 77336f0..de75f20 100644 --- a/src/main/java/org/libvirt/Connect.java +++ b/src/main/java/org/libvirt/Connect.java @@ -381,7 +381,7 @@ public class Connect { * Documentation</a> * @param callbackID * the callback to deregister - * @return + * @return 0 on success, -1 on failure * @throws LibvirtException */ public int domainEventDeregister(int callbackID) throws LibvirtException { @@ -400,7 +400,7 @@ public class Connect { int action); } - private interface GenericCallback { + protected interface GenericCallback { void eventCallback(Connect connect, Domain domain); } public interface RebootCallback extends GenericCallback { @@ -638,7 +638,7 @@ public class Connect { * domain configuration file describing the domain. The format of the native * data is hypervisor dependant. * - * @return + * @return domain XML as String, or {@code null} on error * @throws LibvirtException */ public String domainXMLFromNative(String nativeFormat, String nativeConfig, int flags) throws LibvirtException { @@ -652,7 +652,7 @@ public class Connect { * native configuration file describing the domain. The format of the native * data is hypervisor dependant. * - * @return + * @return domain XML as String, or {@code null} on error * @throws LibvirtException */ public String domainXMLToNative(String nativeFormat, String domainXML, int flags) throws LibvirtException { diff --git a/src/main/java/org/libvirt/Domain.java b/src/main/java/org/libvirt/Domain.java index fd7a03a..fe9f3b0 100644 --- a/src/main/java/org/libvirt/Domain.java +++ b/src/main/java/org/libvirt/Domain.java @@ -675,7 +675,7 @@ public class Domain { * @see <a * href="http://www.libvirt.org/html/libvirt-libvirt.html#virDomainManagedSaveRemove">Libvirt * Documentation</a> - * @return + * @return 0 in case of success, and -1 in case of error * @throws LibvirtException */ public int managedSaveRemote() throws LibvirtException { @@ -778,8 +778,9 @@ public class Domain { * Migrate the domain object from its current host to the destination host * given by duri. * - * @see http - * ://www.libvirt.org/html/libvirt-libvirt.html#virDomainMigrateToURI + * @see <a + * href="http://www.libvirt.org/html/libvirt-libvirt.html#virDomainMigrateToURI"> + * virDomainMigrateToURI</a> * * @param uri * The destination URI diff --git a/src/main/java/org/libvirt/DomainSnapshot.java b/src/main/java/org/libvirt/DomainSnapshot.java index e9a23d6..add6830 100644 --- a/src/main/java/org/libvirt/DomainSnapshot.java +++ b/src/main/java/org/libvirt/DomainSnapshot.java @@ -34,7 +34,7 @@ public class DomainSnapshot { * Documentation</a> * @param flags * controls teh deletion - * @return + * @return 0 if the selected snapshot(s) were successfully deleted, -1 on error. * @throws LibvirtException */ public int delete(int flags) throws LibvirtException { diff --git a/src/main/java/org/libvirt/StoragePool.java b/src/main/java/org/libvirt/StoragePool.java index a3d59a9..0328d8c 100644 --- a/src/main/java/org/libvirt/StoragePool.java +++ b/src/main/java/org/libvirt/StoragePool.java @@ -343,7 +343,7 @@ public class StoragePool { * as input. Information for the new volume (name, perms) are passed via a * typical volume XML description. * - * @return + * @return The storage volume, or {@code null} on error. * @throws LibvirtException */ public StorageVol storageVolCreateXMLFrom(String xmlDesc, StorageVol cloneVolume, int flags) diff --git a/src/main/java/org/libvirt/Stream.java b/src/main/java/org/libvirt/Stream.java index fdef3a4..6374567 100644 --- a/src/main/java/org/libvirt/Stream.java +++ b/src/main/java/org/libvirt/Stream.java @@ -121,7 +121,7 @@ public class Stream { /** * Batch receive method * - * @see http://www.libvirt.org/html/libvirt-libvirt.html#virStreamRecvAll + * @see <a href="http://www.libvirt.org/html/libvirt-libvirt.html#virStreamRecvAll">virStreamRecvAll</a> * @param handler * the callback handler * @return 0 if successfule, -1 otherwise --- Best regards, Claudio -- AV-Test GmbH, Henricistraße 20, 04155 Leipzig, Germany Phone: +49 341 265 310 19 Web:<http://www.av-test.org> Eingetragen am / Registered at: Amtsgericht Stendal (HRB 114076) Geschaeftsfuehrer (CEO): Andreas Marx, Guido Habicht, Maik Morgenstern -- AV-Test GmbH, Henricistraße 20, 04155 Leipzig, Germany Phone: +49 341 265 310 19 Web:<http://www.av-test.org> Eingetragen am / Registered at: Amtsgericht Stendal (HRB 114076) Geschaeftsfuehrer (CEO): Andreas Marx, Guido Habicht, Maik Morgenstern

1 0

[libvirt] libvirt and qemu
by mattias 06 Jul '12

06 Jul '12

when i do virsh connect qemu:///system i can connect but virsh list dosent show anything my qemu vms are not created with virt-manager

3 2

[libvirt] [PATCH] [libvirt-java] Fix Array IndexOutOfBoundsException for unknown error codes
by Claudio Bley 06 Jul '12

06 Jul '12

Hi. I'm using libvirt-java 0.4.7 and libvirt 0.9.8. When libvirt returns an error code which is not mapped in enum ErrorNumber, an IndexOutOfBoundsException is thrown. I realize that the freshly released libvirt-java 0.4.8 supports all error codes up to libvirt 0.9.12. But that doesn't fix the problem. Would it be feasible to add a special UNKNOWN enum value? --- diff --git a/src/main/java/org/libvirt/Error.java b/src/main/java/org/libvirt/Error.java index 0946030..72bc698 100644 --- a/src/main/java/org/libvirt/Error.java +++ b/src/main/java/org/libvirt/Error.java @@ -151,9 +151,12 @@ public class Error implements Serializable { } public Error(virError vError) { - code = ErrorNumber.values()[vError.code]; - domain = ErrorDomain.values()[vError.domain]; - level = ErrorLevel.values()[vError.level]; + if (ErrorNumber.values().length > vError.code) + code = ErrorNumber.values()[vError.code]; + if (ErrorDomain.values().length > vError.domain) + domain = ErrorDomain.values()[vError.domain]; + if (ErrorLevel.values().length > vError.level) + level = ErrorLevel.values()[vError.level]; message = vError.message; str1 = vError.str1; str2 = vError.str2; --- Best regards, Claudio. -- AV-Test GmbH, Henricistraße 20, 04155 Leipzig, Germany Phone: +49 341 265 310 19 Web:<http://www.av-test.org> Eingetragen am / Registered at: Amtsgericht Stendal (HRB 114076) Geschaeftsfuehrer (CEO): Andreas Marx, Guido Habicht, Maik Morgenstern -- AV-Test GmbH, Henricistraße 20, 04155 Leipzig, Germany Phone: +49 341 265 310 19 Web:<http://www.av-test.org> Eingetragen am / Registered at: Amtsgericht Stendal (HRB 114076) Geschaeftsfuehrer (CEO): Andreas Marx, Guido Habicht, Maik Morgenstern

1 0

[libvirt] [PATCH 00/12] Fine grained access control for libvirt APIs
by Daniel P. Berrange 05 Jul '12

05 Jul '12

This is a repost of https://www.redhat.com/archives/libvir-list/2012-January/msg00907.html which got no comments last time out. This series of patch is the minimal required to get a working proof of concept implementation of fine grained access control in libvirt. This demonstrates - Obtaining a client identity from a socket - Ensuring RPC calls are executed with the correct identity sset - A policykit access driver that checks based on access vector alone - A SELinux access driver that checks based on access vector + object - A set of hooks in the QEMU driver to protect virDomainObjPtr access Things that are not done - APIs for changing the real/effective identity post-connect - A simple RBAC access driver for doing (Access vector, object) checks - SELinux policy for the SELinux driver - Access control hooks on all other QEMU driver methods - Access control hooks in LXC, UML, other libvirtd side drivers - Access control hooks in storage, network, interface, etc drivers - Document WTF todo to propagate SELinux contexts across TCP sockets using IPSec. Any hints welcome... - Lots more I can't think of right now I should note that the policykit driver is mostly useless because it is unable to let you do checks on anything other than permission name and UNIX process ID at this time. So what I've implemented with the polkit driver is really little more than a slightly more fine grained version of the VIR_CONNECT_RO flag. In theory it is supposed to be extendable to allow other types of identity information besides the process ID, and to include some kind of object identiers in the permission check, but no one seems to be attacking this. So I expect the simple RBAC driver to be the most used one in the common case usage of libvirt, and of course the SELinux driver.

4 34

[libvirt] [PATCH] Only ummount /proc, /sys, /dev if the root source is '/'
by Daniel P. Berrange 05 Jul '12

05 Jul '12

From: "Daniel P. Berrange" <berrange(a)redhat.com> Previous commits added code to unmount the existing /proc, /sys and /dev hierarchies on the root filesystem of the container. This should only have been done if the container's root filesystem was the same as the host's root. ie if the root source is '/'. As it is, this causes LXC containersr to fail to start if their root source is not '/' Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- src/lxc/lxc_container.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/lxc/lxc_container.c b/src/lxc/lxc_container.c index 4f8703c..145accb 100644 --- a/src/lxc/lxc_container.c +++ b/src/lxc/lxc_container.c @@ -1416,12 +1416,14 @@ static int lxcContainerSetupPivotRoot(virDomainDefPtr vmDef, if (lxcContainerPivotRoot(root) < 0) goto cleanup; - /* Gets rid of any existing stuff under /proc, /sys & /tmp + /* If we have the root source being '/', then we need to + * get rid of any existing stuff under /proc, /sys & /tmp. * We need new namespace aware versions of those. We must * do /proc last otherwise we won't find /proc/mounts :-) */ - if (lxcContainerUnmountSubtree("/sys", false) < 0 || - lxcContainerUnmountSubtree("/dev", false) < 0 || - lxcContainerUnmountSubtree("/proc", false) < 0) + if (STREQ(root->src, "/") && + (lxcContainerUnmountSubtree("/sys", false) < 0 || + lxcContainerUnmountSubtree("/dev", false) < 0 || + lxcContainerUnmountSubtree("/proc", false) < 0)) goto cleanup; /* Mounts the core /proc, /sys, etc filesystems */ -- 1.7.10.4

2 1

[libvirt] [PATCH libvirt-java 1/2] Return a byte[] array with secretGetValue
by Wido den Hollander 05 Jul '12

05 Jul '12

We break the API with this, but Java does not support multiple method signatures with different return types. The old method returned a String, but since a secret can be binary data this type is not suited. Users who now that their secret is in fact a String, can use cast with: Secret secret = conn.secretLookupByUUIDString("uuuuuuuid"); String value = new String(secret.getValue()); Signed-off-by: Wido den Hollander <wido(a)widodh.nl> --- src/main/java/org/libvirt/Secret.java | 13 ++++++++++--- src/main/java/org/libvirt/jna/Libvirt.java | 2 +- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/src/main/java/org/libvirt/Secret.java b/src/main/java/org/libvirt/Secret.java index 48f7895..39d9122 100644 --- a/src/main/java/org/libvirt/Secret.java +++ b/src/main/java/org/libvirt/Secret.java @@ -5,6 +5,9 @@ import org.libvirt.jna.SecretPointer; import com.sun.jna.Native; import com.sun.jna.NativeLong; +import com.sun.jna.ptr.LongByReference; +import com.sun.jna.Pointer; +import java.nio.ByteBuffer; /** * A secret defined by libvirt @@ -106,12 +109,16 @@ public class Secret { /** * Fetches the value of the secret - * + * * @return the value of the secret, or null on failure. */ - public String getValue() throws LibvirtException { - String returnValue = libvirt.virSecretGetValue(VSP, new NativeLong(), 0); + public byte[] getValue() throws LibvirtException { + LongByReference value_size = new LongByReference(); + Pointer value = libvirt.virSecretGetValue(VSP, value_size, 0); processError(); + ByteBuffer bb = value.getByteBuffer(0, value_size.getValue()); + byte[] returnValue = new byte[bb.remaining()]; + bb.get(returnValue); return returnValue; } diff --git a/src/main/java/org/libvirt/jna/Libvirt.java b/src/main/java/org/libvirt/jna/Libvirt.java index b1e53a2..f53199d 100644 --- a/src/main/java/org/libvirt/jna/Libvirt.java +++ b/src/main/java/org/libvirt/jna/Libvirt.java @@ -330,7 +330,7 @@ public interface Libvirt extends Library { public int virSecretGetUUID(SecretPointer virSecretPtr, byte[] uuidString); public int virSecretGetUUIDString(SecretPointer virSecretPtr, byte[] uuidString); public String virSecretGetUsageID(SecretPointer virSecretPtr); - public String virSecretGetValue(SecretPointer virSecretPtr, NativeLong value_size, int flags); + public Pointer virSecretGetValue(SecretPointer virSecretPtr, LongByReference value_size, int flags); public String virSecretGetXMLDesc(SecretPointer virSecretPtr, int flags); public SecretPointer virSecretLookupByUsage(ConnectionPointer virConnectPtr, int usageType, String usageID); public SecretPointer virSecretLookupByUUID(ConnectionPointer virConnectPtr, byte[] uuidBytes); -- 1.7.9.5

2 6

[libvirt] [PATCH] Wire up <loader> to set the QEMU BIOS path
by Daniel P. Berrange 05 Jul '12

05 Jul '12

From: "Daniel P. Berrange" <berrange(a)redhat.com> * src/qemu/qemu_command.c: Wire up -bios with <loader> * tests/qemuxml2argvdata/qemuxml2argv-bios.args, tests/qemuxml2argvdata/qemuxml2argv-bios.xml: Expand existing BIOS test case to cover <loader> --- src/qemu/qemu_command.c | 9 +++++++++ tests/qemuxml2argvdata/qemuxml2argv-bios.args | 3 ++- tests/qemuxml2argvdata/qemuxml2argv-bios.xml | 1 + 3 files changed, 12 insertions(+), 1 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index ea9431f..c82f5bc 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -4052,6 +4052,11 @@ qemuBuildCommandLine(virConnectPtr conn, if (enableKVM) virCommandAddArg(cmd, "-enable-kvm"); + if (def->os.loader) { + virCommandAddArg(cmd, "-bios"); + virCommandAddArg(cmd, def->os.loader); + } + /* Set '-m MB' based on maxmem, because the lower 'memory' limit * is set post-startup using the balloon driver. If balloon driver * is not supported, then they're out of luck anyway. Update the @@ -7581,6 +7586,10 @@ virDomainDefPtr qemuParseCommandLine(virCapsPtr caps, WANT_VALUE(); if (!(def->os.kernel = strdup(val))) goto no_memory; + } else if (STREQ(arg, "-bios")) { + WANT_VALUE(); + if (!(def->os.loader = strdup(val))) + goto no_memory; } else if (STREQ(arg, "-initrd")) { WANT_VALUE(); if (!(def->os.initrd = strdup(val))) diff --git a/tests/qemuxml2argvdata/qemuxml2argv-bios.args b/tests/qemuxml2argvdata/qemuxml2argv-bios.args index f9727c4..ac98000 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-bios.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-bios.args @@ -1,5 +1,6 @@ LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu -S -M pc -m 1024 -smp 1 -nodefaults -device sga \ +/usr/bin/qemu -S -M pc -bios /usr/share/seabios/bios.bin \ +-m 1024 -smp 1 -nodefaults -device sga \ -monitor unix:/tmp/test-monitor,server,nowait -no-acpi -boot c \ -hda /dev/HostVG/QEMUGuest1 -serial pty \ -usb -device usb-tablet,id=input0 -vnc 127.0.0.1:0 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-bios.xml b/tests/qemuxml2argvdata/qemuxml2argv-bios.xml index cfc5587..ac15d45 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-bios.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-bios.xml @@ -6,6 +6,7 @@ <vcpu>1</vcpu> <os> <type arch='i686' machine='pc'>hvm</type> + <loader>/usr/share/seabios/bios.bin</loader> <boot dev='hd'/> <bootmenu enable='yes'/> <bios useserial='yes'/> -- 1.7.7.6

3 3

[libvirt] [PATCH] qemu: Always set auth_supported for Ceph disks.
by Wido den Hollander 05 Jul '12

05 Jul '12

Recently the Ceph project defaulted auth_supported from 'none' to 'cephx'. When no auth information was set for Ceph disks this would lead to librados defaulting to 'cephx', but there would be no additional authorization information. We now explicitly set auth_supported to none when passing down arguments to Qemu. Signed-off-by: Wido den Hollander <wido(a)widodh.nl> --- src/qemu/qemu_command.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 6549f57..1c59695 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -1782,6 +1782,8 @@ qemuBuildRBDString(virConnectPtr conn, disk->auth.username); goto error; } + } else { + virBufferAddLit(opt, ":auth_supported=none"); } if (disk->nhosts > 0) { -- 1.7.9.5

2 2

[libvirt] Tracking VM installations
by Zeeshan Ali (Khattak) 05 Jul '12

05 Jul '12

Hi, We have a requirement in Boxes for showing progress bars on VMs under installation: https://github.com/gnome-design-team/gnome-mockups/raw/master/boxes/boxes-i… https://bugzilla.gnome.org/show_bug.cgi?id=679107 However, we are bit clueless on how that could be achieved. The only idea I have is to know the number of passes (reboots) and typical disk usage in each pass for "every" (we only do this for express installs so we don't need this for all) OS and estimate the progress based on that knowledge. If that idea is worth looking into, we'll need this information in libosinfo and hence me cross-posting this to virt-tools-list. Other ideas welcome! Keep in mind that we don't need to be very accurate, just accurate enough to not annoy the user. -- Regards, Zeeshan Ali (Khattak) FSF member#5124

3 5

[libvirt] [RFC] Allowing promiscuous mode for domains network interfaces
by Jean-Baptiste Rouault 05 Jul '12

05 Jul '12

Hi all, By default, OpenVZ and VirtualBox (> 4.0.x) filter network packets by MAC addresses : only broadcast, multicast and packets directly targeted to VMs are transmitted. This behaviour prevents from using promiscuous mode inside domains. I'd like to write some patches to disable these filters from libvirt. Would it be ok to modify OpenVZ and VirtualBox drivers so that they disable the filters by default ? If this is not acceptable, what about making it configurable through domains' XML ? Regards, Jean-Baptiste -- Jean-Baptiste ROUAULT Ingénieur R&D - diateam : Architectes de l'information Phone : +33 (0)2 98 050 050 Fax : +33 (0)2 98 050 051

2 2

[libvirt] [PATCH v7 0/8] Add basic driver for Parallels Virtuozzo Server
by Dmitry Guryanov 05 Jul '12

05 Jul '12

Parallels Cloud Server is a virtualization solution that allows users to simultaneously run multiple virtual machines and containers on the same physical server. More information can be found here: http://www.parallels.com/products/pcs/ Also beta version of Parallels Cloud Server can be downloaded there. Dmitry Guryanov (8): parallels: add driver skeleton parallels: add functions to list domains and get info parallels: implement functions for domain life cycle management parallels: get info about serial ports parallels: add support of VNC remote display parallels: implement virDomainDefineXML operation for existing domains parallels: add storage driver parallels: implement VM creation cfg.mk | 1 + configure.ac | 23 + docs/drvparallels.html.in | 28 + include/libvirt/virterror.h | 2 +- libvirt.spec.in | 9 +- mingw32-libvirt.spec.in | 6 + po/POTFILES.in | 4 + src/Makefile.am | 15 + src/conf/domain_conf.c | 3 +- src/conf/domain_conf.h | 1 + src/driver.h | 1 + src/libvirt.c | 9 + src/parallels/parallels_driver.c | 1309 +++++++++++++++++++++++++++++++++ src/parallels/parallels_driver.h | 75 ++ src/parallels/parallels_storage.c | 1456 +++++++++++++++++++++++++++++++++++++ src/parallels/parallels_utils.c | 131 ++++ src/util/virterror.c | 3 +- 17 files changed, 3072 insertions(+), 4 deletions(-) create mode 100644 docs/drvparallels.html.in create mode 100644 src/parallels/parallels_driver.c create mode 100644 src/parallels/parallels_driver.h create mode 100644 src/parallels/parallels_storage.c create mode 100644 src/parallels/parallels_utils.c

3 16

[libvirt] can't receive keepalive message during migration
by Hu Tao 05 Jul '12

05 Jul '12

Hi, When testing migration, I found a problem that the server can't receive keepalive reply from client when doing migration. The log shows that virsh did send the keepalive reply, but server didn't reveive it. The strange part is it's OK to migrate from host A to Host B, but always fails to migrate from host B to host A. When disable keepalive, migration will success. Any ideas? -- Thanks, Hu Tao

2 2

[libvirt] [PATCH] virsh: Avoid division by 0 in vshCalloc
by Peter Krempa 04 Jul '12

04 Jul '12

vshCalloc function uses xalloc_oversized macro that can't take 0 as it's second argument. If vshCalloc is called with size 0, virsh ends with a floating point exception. This patch changes vshCalloc to return NULL if no memory is requested. --- tools/virsh.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/tools/virsh.c b/tools/virsh.c index 53d1825..d3d5c6a 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -460,6 +460,9 @@ _vshCalloc(vshControl *ctl, size_t nmemb, size_t size, const char *filename, int { char *x; + if (!size) + return NULL; + if (!xalloc_oversized(nmemb, size) && VIR_ALLOC_N(x, nmemb * size) == 0) return x; -- 1.7.8.6

3 5

[libvirt] [PATCH] Only enforce check for YAJL when starting a VM
by Daniel P. Berrange 04 Jul '12

04 Jul '12

From: "Daniel P. Berrange" <berrange(a)redhat.com> The previous check for YAJL would have many undesirable consequences, the most important being that it caused the capabilities XML to loose all <guest> elements. There is no user visible feedback as to what is wrong in this respect, merely a syslog message. The empty capabilities causes libvirtd to then throw away all guest XML configs that are stored. This changes the code so that the check for YAJL is only performed at the time we attempt to spawn a QEMU process error: Failed to start domain vm-vnc error: unsupported configuration: this qemu binary requires libvirt to be compiled with yajl Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- src/qemu/qemu_capabilities.c | 13 +++++++++---- src/qemu/qemu_capabilities.h | 4 +++- src/qemu/qemu_command.c | 1 + src/qemu/qemu_driver.c | 1 + src/qemu/qemu_process.c | 3 +++ 5 files changed, 17 insertions(+), 5 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 1e12a39..1d6ab2d 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -691,7 +691,8 @@ qemuCapsInitGuest(virCapsPtr caps, return 0; /* Ignore binary if extracting version info fails */ - if (qemuCapsExtractVersionInfo(binary, info->arch, NULL, &qemuCaps) < 0) { + if (qemuCapsExtractVersionInfo(binary, info->arch, + false, NULL, &qemuCaps) < 0) { ret = 0; goto cleanup; } @@ -1472,7 +1473,9 @@ qemuCapsParseDeviceStr(const char *str, virBitmapPtr flags) return 0; } -int qemuCapsExtractVersionInfo(const char *qemu, const char *arch, +int qemuCapsExtractVersionInfo(const char *qemu, + const char *arch, + bool check_yajl, unsigned int *retversion, virBitmapPtr *retflags) { @@ -1505,7 +1508,8 @@ int qemuCapsExtractVersionInfo(const char *qemu, const char *arch, if (!(flags = qemuCapsNew()) || qemuCapsParseHelpStr(qemu, help, flags, - &version, &is_kvm, &kvm_version, true) == -1) + &version, &is_kvm, &kvm_version, + check_yajl) == -1) goto cleanup; /* Currently only x86_64 and i686 support PCI-multibus. */ @@ -1583,7 +1587,8 @@ int qemuCapsExtractVersion(virCapsPtr caps, return -1; } - if (qemuCapsExtractVersionInfo(binary, ut.machine, version, NULL) < 0) { + if (qemuCapsExtractVersionInfo(binary, ut.machine, false, + version, NULL) < 0) { return -1; } diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index 83c135b..c14d53a 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -167,7 +167,9 @@ int qemuCapsProbeCPUModels(const char *qemu, int qemuCapsExtractVersion(virCapsPtr caps, unsigned int *version); -int qemuCapsExtractVersionInfo(const char *qemu, const char *arch, +int qemuCapsExtractVersionInfo(const char *qemu, + const char *arch, + bool check_yajl, unsigned int *version, virBitmapPtr *qemuCaps); diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 528b189..5959352 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -949,6 +949,7 @@ qemuDomainAssignPCIAddresses(virDomainDefPtr def) qemuDomainPCIAddressSetPtr addrs = NULL; if (qemuCapsExtractVersionInfo(def->emulator, def->os.arch, + false, NULL, &qemuCaps) < 0) goto cleanup; diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 2f93404..eb2ed0e 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -4757,6 +4757,7 @@ static char *qemuDomainXMLToNative(virConnectPtr conn, } if (qemuCapsExtractVersionInfo(def->emulator, def->os.arch, + false, NULL, &qemuCaps) < 0) goto cleanup; diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index c5140c3..fd4c9c9 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -3073,6 +3073,7 @@ qemuProcessReconnect(void *opaque) */ if (!priv->qemuCaps && qemuCapsExtractVersionInfo(obj->def->emulator, obj->def->os.arch, + false, NULL, &priv->qemuCaps) < 0) goto error; @@ -3478,6 +3479,7 @@ int qemuProcessStart(virConnectPtr conn, qemuCapsFree(priv->qemuCaps); priv->qemuCaps = NULL; if (qemuCapsExtractVersionInfo(vm->def->emulator, vm->def->os.arch, + true, NULL, &priv->qemuCaps) < 0) goto cleanup; @@ -4237,6 +4239,7 @@ int qemuProcessAttach(virConnectPtr conn ATTRIBUTE_UNUSED, priv->qemuCaps = NULL; if (qemuCapsExtractVersionInfo(vm->def->emulator, vm->def->os.arch, + false, NULL, &priv->qemuCaps) < 0) goto cleanup; -- 1.7.10.4

2 1

[libvirt] [PATCH] virsh: Fix ordering of arguments when calling vshCalloc.
by Peter Krempa 04 Jul '12

04 Jul '12

In vshSnapshotListCollect() vshCalloc was called with swapped nmemb and size argument. This caused division by zero in xalloc_oversized as the macro doesn't expect size to be zero. --- tools/virsh.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/virsh.c b/tools/virsh.c index 53d1825..25ed177 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -17200,8 +17200,8 @@ vshSnapshotListCollect(vshControl *ctl, virDomainPtr dom, if (count >= 0) { /* When mixing --from and --tree, we also want a copy of from * in the list, but with no parent for that one entry. */ - snaplist->snaps = vshCalloc(ctl, sizeof(*snaplist->snaps), - count + (tree && from)); + snaplist->snaps = vshCalloc(ctl, pcount + (tree && from), + sizeof(*snaplist->snaps)); snaplist->nsnaps = count; for (i = 0; i < count; i++) snaplist->snaps[i].snap = snaps[i]; -- 1.7.8.6

2 3

[libvirt] [PATCH] qemu: Mark domains as having managed state image only on managed save
by Peter Krempa 04 Jul '12

04 Jul '12

QEmu domains were marked as having managed save image even if they were saved using the regular save. With this patch, domains are marked so only when using managed save API. --- src/qemu/qemu_driver.c | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 2f93404..3410535 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -2739,7 +2739,6 @@ qemuDomainSaveInternal(struct qemud_driver *driver, virDomainPtr dom, } ret = 0; - vm->hasManagedSave = true; /* Shut it down */ qemuProcessStop(driver, vm, VIR_DOMAIN_SHUTOFF_SAVED, 0); @@ -2916,8 +2915,10 @@ qemuDomainManagedSave(virDomainPtr dom, unsigned int flags) VIR_INFO("Saving state to %s", name); compressed = QEMUD_SAVE_FORMAT_RAW; - ret = qemuDomainSaveInternal(driver, dom, vm, name, compressed, - NULL, flags); + if ((ret = qemuDomainSaveInternal(driver, dom, vm, name, compressed, + NULL, flags)) == 0) + vm->hasManagedSave = true; + vm = NULL; cleanup: -- 1.7.8.6

3 3

[libvirt] question about save/restore domain
by Jovanka Gulicoska 04 Jul '12

04 Jul '12

Hi, my name is Jovanka Gulicoska and I'm SoC student. I'm working on implementing save/load of VM in Gnome-Boxes. Something confused me about snapshots. In the documentation about life cycle, in section about Save/Restore is said that domain saved with virDomainSave/virDomainSaveFlags can be restored only once. But in the documentation about Snapshot XML format there is no information about this in VM state snapshots. So is it better just to use virDomainSnapshotCreateXML instead of virDomainSave/virDomainSaveFlags? I've created bindings for this functions in libvirt-glib but I wanted to be sure before I send them for review. Thanks, Jovanka (gulic)

5 8

[libvirt] libvirt can't get capablities
by Li Zhang 04 Jul '12

04 Jul '12

Hi, I have suffered several times on both x86 machine and power machine. When we want to use libvirt to create on VMs, it reports "unknown OS type hvm". We can't get <guest> capabilities. The log is as the following(log_level=1): 2003-01-02 01:21:39.895+0000: 12214: error : virDomainDefParseXML:8491 : unknown OS type hvm 2003-01-02 01:21:39.896+0000: 12214: error : virDomainDefParseXML:8491 : unknown OS type hvm 2003-01-02 01:22:00.135+0000: 12207: error : qemuCapsComputeCmdFlags:1218 : unsupported configuration: this qemu binary requires libvirt to be compiled with yajl 2003-01-02 01:22:13.342+0000: 12207: error : qemuCapsComputeCmdFlags:1218 : unsupported configuration: this qemu binary requires libvirt to be compiled with yajl 2003-01-02 01:22:13.347+0000: 12204: error : qemuCapsExtractVersion:1576 : internal error Cannot find suitable emulator for ppc64 2003-01-02 01:22:13.351+0000: 12205: error : qemuCapsExtractVersion:1576 : internal error Cannot find suitable emulator for ppc64 2003-01-02 01:22:13.355+0000: 12207: error : qemuCapsExtractVersion:1576 : internal error Cannot find suitable emulator for ppc64 2003-01-02 01:22:13.355+0000: 12208: error : qemuCapsExtractVersion:1576 : internal error Cannot find suitable emulator for ppc64 2003-01-02 01:22:13.357+0000: 12206: error : qemuCapsExtractVersion:1576 : internal error Cannot find suitable emulator for ppc64 I search online and find one similar issue from Redhat bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=509337 Is there any solution to avoid this problem? Any idea? -- Best Regards Li IBM LTC, China System&Technology Lab, Beijing

4 10

[libvirt] [Patch v2] vmware: detect when a domain was shut down from the inside
by Jean-Baptiste Rouault 04 Jul '12

04 Jul '12

This patch adds an internal function vmwareUpdateVMStatus to update the real state of the domain. This function is used in various places in the driver, in particular to detect when the domain has been shut down by the user with the "halt" command. --- v2: - Replace internal function vmwareGetVMStatus by vmwareUpdateVMStatus - Improve vmrun list output parsing - variable initialization and coding-style fixes src/vmware/vmware_driver.c | 95 ++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 95 insertions(+), 0 deletions(-) diff --git a/src/vmware/vmware_driver.c b/src/vmware/vmware_driver.c index 8f9d922..53e28e7 100644 --- a/src/vmware/vmware_driver.c +++ b/src/vmware/vmware_driver.c @@ -28,6 +28,7 @@ #include "datatypes.h" #include "virfile.h" #include "memory.h" +#include "util.h" #include "uuid.h" #include "command.h" #include "vmx.h" @@ -181,6 +182,64 @@ vmwareGetVersion(virConnectPtr conn, unsigned long *version) } static int +vmwareUpdateVMStatus(struct vmware_driver *driver, virDomainObjPtr vm) +{ + virCommandPtr cmd; + char *outbuf = NULL; + char *vmxAbsolutePath = NULL; + char *parsedVmxPath = NULL; + char *str; + char *saveptr = NULL; + bool found = false; + int oldState = virDomainObjGetState(vm, NULL); + int newState; + int ret = -1; + + cmd = virCommandNewArgList(VMRUN, "-T", vmw_types[driver->type], + "list", NULL); + virCommandSetOutputBuffer(cmd, &outbuf); + if (virCommandRun(cmd, NULL) < 0) + goto cleanup; + + if (virFileResolveAllLinks(((vmwareDomainPtr) vm->privateData)->vmxPath, + &vmxAbsolutePath) < 0) + goto cleanup; + + for(str = outbuf ; (parsedVmxPath = strtok_r(str, "\n", &saveptr)) != NULL; + str = NULL) { + + if (parsedVmxPath[0] != '/') + continue; + + if (STREQ(parsedVmxPath, vmxAbsolutePath)) { + found = true; + /* If the vmx path is in the output, the domain is running or + * is paused but we have no way to detect if it is paused or not. */ + if (oldState == VIR_DOMAIN_PAUSED) + newState = oldState; + else + newState = VIR_DOMAIN_RUNNING; + break; + } + } + + if (!found) { + vm->def->id = -1; + newState = VIR_DOMAIN_SHUTOFF; + } + + virDomainObjSetState(vm, newState, 0); + + ret = 0; + +cleanup: + virCommandFree(cmd); + VIR_FREE(outbuf); + VIR_FREE(vmxAbsolutePath); + return ret; +} + +static int vmwareStopVM(struct vmware_driver *driver, virDomainObjPtr vm, virDomainShutoffReason reason) @@ -331,6 +390,9 @@ vmwareDomainShutdownFlags(virDomainPtr dom, goto cleanup; } + if (vmwareUpdateVMStatus(driver, vm) < 0) + goto cleanup; + if (virDomainObjGetState(vm, NULL) != VIR_DOMAIN_RUNNING) { vmwareError(VIR_ERR_INTERNAL_ERROR, "%s", _("domain is not in running state")); @@ -485,6 +547,8 @@ vmwareDomainReboot(virDomainPtr dom, unsigned int flags) vmwareSetSentinal(cmd, vmw_types[driver->type]); vmwareSetSentinal(cmd, vmxPath); + if (vmwareUpdateVMStatus(driver, vm) < 0) + goto cleanup; if (virDomainObjGetState(vm, NULL) != VIR_DOMAIN_RUNNING) { vmwareError(VIR_ERR_INTERNAL_ERROR, "%s", @@ -596,6 +660,9 @@ vmwareDomainCreateWithFlags(virDomainPtr dom, goto cleanup; } + if (vmwareUpdateVMStatus(driver, vm) < 0) + goto cleanup; + if (virDomainObjIsActive(vm)) { vmwareError(VIR_ERR_OPERATION_INVALID, "%s", _("Domain is already running")); @@ -645,6 +712,9 @@ vmwareDomainUndefineFlags(virDomainPtr dom, goto cleanup; } + if (vmwareUpdateVMStatus(driver, vm) < 0) + goto cleanup; + if (virDomainObjIsActive(vm)) { vm->persistent = 0; } else { @@ -874,6 +944,21 @@ vmwareDomainXMLFromNative(virConnectPtr conn, const char *nativeFormat, return xml; } +static void vmwareDomainObjListUpdateDomain(void *payload, const void *name ATTRIBUTE_UNUSED, void *data) +{ + struct vmware_driver *driver = data; + virDomainObjPtr vm = payload; + virDomainObjLock(vm); + vmwareUpdateVMStatus(driver, vm); + virDomainObjUnlock(vm); +} + +static void +vmwareDomainObjListUpdateAll(virDomainObjListPtr doms, struct vmware_driver *driver) +{ + virHashForEach(doms->objs, vmwareDomainObjListUpdateDomain, driver); +} + static int vmwareNumDefinedDomains(virConnectPtr conn) { @@ -881,6 +966,7 @@ vmwareNumDefinedDomains(virConnectPtr conn) int n; vmwareDriverLock(driver); + vmwareDomainObjListUpdateAll(&driver->domains, driver); n = virDomainObjListNumOfDomains(&driver->domains, 0); vmwareDriverUnlock(driver); @@ -894,6 +980,7 @@ vmwareNumDomains(virConnectPtr conn) int n; vmwareDriverLock(driver); + vmwareDomainObjListUpdateAll(&driver->domains, driver); n = virDomainObjListNumOfDomains(&driver->domains, 1); vmwareDriverUnlock(driver); @@ -908,6 +995,7 @@ vmwareListDomains(virConnectPtr conn, int *ids, int nids) int n; vmwareDriverLock(driver); + vmwareDomainObjListUpdateAll(&driver->domains, driver); n = virDomainObjListGetActiveIDs(&driver->domains, ids, nids); vmwareDriverUnlock(driver); @@ -922,6 +1010,7 @@ vmwareListDefinedDomains(virConnectPtr conn, int n; vmwareDriverLock(driver); + vmwareDomainObjListUpdateAll(&driver->domains, driver); n = virDomainObjListGetInactiveNames(&driver->domains, names, nnames); vmwareDriverUnlock(driver); return n; @@ -944,6 +1033,9 @@ vmwareDomainGetInfo(virDomainPtr dom, virDomainInfoPtr info) goto cleanup; } + if (vmwareUpdateVMStatus(driver, vm) < 0) + goto cleanup; + info->state = virDomainObjGetState(vm, NULL); info->cpuTime = 0; info->maxMem = vm->def->mem.max_balloon; @@ -979,6 +1071,9 @@ vmwareDomainGetState(virDomainPtr dom, goto cleanup; } + if (vmwareUpdateVMStatus(driver, vm) < 0) + goto cleanup; + *state = virDomainObjGetState(vm, reason); ret = 0; -- 1.7.9.1

2 2

[libvirt] [PATCH] remote: Fill remote parameters in remoteDomainListAllSnapshots()
by Peter Krempa 04 Jul '12

04 Jul '12

This patch fills the domain argument that is sent to the remote side. This caused a client segfault as the argument was NULL. --- src/remote/remote_driver.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c index 6f53264..eac50e6 100644 --- a/src/remote/remote_driver.c +++ b/src/remote/remote_driver.c @@ -4888,6 +4888,7 @@ remoteDomainListAllSnapshots(virDomainPtr dom, remoteDriverLock(priv); + make_nonnull_domain(&args.dom, dom); args.need_results = !!snapshots; args.flags = flags; -- 1.7.8.6

2 2

[libvirt] Release of libvirt-0.9.13
by Daniel Veillard 03 Jul '12

03 Jul '12

Okay the new release is out and available as uauls at ftp://libvirt.org/libvirt/ along with rpms generated on Fedora16, the git tree is tagged too. As suggested earlier it seems that the rate of commits is slowing down a bit, for example it took one month an a half to accumulate the 300+ commits of this release, considering that there is uauslly a slowdown during the summer months I plan to push the next release at the end of August, well unless there is a lot of activities or something urgent to push in the meantime. This release is rather rich, quite a few features and a lot of improvements: Features: - S390: support for s390(x) (Thang Pham and Viktor Mihajlovski) - snapshot: implement new APIs for esx and vbox (Eric Blake) - list: add virDomainListAllSnapshots API (Eric Blake) - snapshot: new query APIs (Eric Blake) - virsh: Allow users to reedit rejected XML (Michal Privoznik) - nwfilter: add DHCP snooping (Stefan Berger) - Enable driver modules in libvirt RPM (Daniel P. Berrange) - Default to enable driver modules for libvirtd (Daniel P. Berrange) - storage backend: Add RBD (RADOS Block Device) support (Wido den Hollander) - sVirt support for LXC domains (Daniel P. Berrange) Documentation: - virsh: Cleanup virsh -V output (Doug Goldstein) - configure: show correct default argument in help (Marc-André Lureau) - fix typo in virDomainDestroy API doc (Christophe Fergeau) - virsh: fix few typos on desc command (Martin Kletzander) - virsh: Update vol-create-as manpage (Michal Privoznik) - virsh: Tweak attach-* documentation (Michal Privoznik) - small typo in formatdomain.html (Laine Stump) - client rpc: Improve debug messages in virNetClientIO (Jiri Denemark) - minor fixes to domain interface documentation (Laine Stump) - link to FLOSS Weekly podcast, virt blogs (Eric Blake) - examples: add consolecallback example python script (Dave Allan) - Fix typo in comment start (Daniel P. Berrange) - typo in acceleration element (Martin Kletzander) - Improve docs about compiling libvirt from GIT (Daniel P. Berrange) Portability: - Fix compilation on older sanlock (Daniel Veillard) - Fix unused parameters / functions in virsh on Win32 (Daniel P. Berrange) - Update to latest GNULIB to fix compat with Mingw64 toolchain (Daniel P. Berrange) - winsock2.h must always be included before windows.h (Daniel P. Berrange) - Switch automated builds to use Mingw64 toolchain instead of Mingw32 (Daniel P. Berrange) - openvz: Fix wordsize on 64 bit architectures (Guido Günther) - Fixes for check and rpm builds without sanlock (and qemu) (Martin Kletzander) - Fix Win32 build by linking to ole32 (Daniel P. Berrange) - Add impl of APIs to get user directories on Win32 (Daniel P. Berrange) - fix building error on non fedora system (Wen Congyang) - Add stub impl of virNetlinkEventServiceLocalPid for Win32 (Daniel P. Berrange) - Fix build when configuring with polkit0 (Jim Fehlig) - build: fix virnetlink on glibc 2.11 (Eric Blake) - Fix build compat with older libselinux for LXC (Daniel P. Berrange) - build: really silence the 32-bit warning (Eric Blake) Bug Fixes: - build: use correct limit for unsigned long long (Eric Blake) - nwfilter: Fix memory leak (Stefan Berger) - network_conf: Don't free uninitialized pointers while parsing DNS SRV (Peter Krempa) - storage: Error out if the target is already mounted for netfs pool (Osier Yang) - events: Don't fail on registering events for two different domains (Michal Privoznik) - Don't install systemd service files executable (Guido Günther) - fix a bug of ref count in virnetserver.c (Hu Tao) - Fix deadlock on libvirtd shutdown (Jim Fehlig) - openvz: check pointer size instead of int (Guido Günther) - domain_conf: fix possible memory leak (Martin Kletzander) - error: Fix typos in argument checking macros (Peter Krempa) - LXC: fix incorrect DEBUG info (Gao feng) - LXC: fix memory leak in lxcContainerSetupExtraMounts (Gao feng) - LXC: fix memory leak in lxcContainerGetSubtree (Gao feng) - LXC: fix memory leak in lxcContainerMountFSBlockHelper (Gao feng) - qemu_agent: Wait for events instead of agent response (Michal Privoznik) - Fix launch of libvirtd when DHCP snooping support is not available. (Daniel P. Berrange) - qemu: fix potential dead lock (Wen Congyang) - virsh: Null terminated the string memcpy from buffer explicitly (Osier Yang) - qemu: Fix off-by-one error while unescaping monitor strings (Peter Krempa) - virsh: Don't generate invalid XML in attach-disk command (Peter Krempa) - client rpc: Fix error checking after poll() (Daniel P. Berrange) - client rpc: Send keepalive requests from IO event loop (Jiri Denemark) - Fix typo in RPM specfile (Daniel P. Berrange) - python: fix snapshot listing bugs (Eric Blake) - qemu: Don't overwrite security labels (Michal Privoznik) - rpc: Fix memleak in virNetMessageEncodeHeader (Michal Privoznik) - Fix privileges on /var/run/libvirt directory (Daniel P. Berrange) - Only migrate profile in non-privileged libvirtd instance (Daniel P. Berrange) - snapshot: avoid virsh crash with older servers (Eric Blake) - LXC: fix memory leak in lxcContainerMountFSBlockAuto (Gao feng) - LXC: fix incorrect parameter of mount in lxcContainerMountFSBind (Gao feng) - util: Fix deadlock in virLogReset (Jiri Denemark) - Assign correct address type to spapr-vlan and spapr-vty. (Li Zhang) - command: avoid potential deadlock on handshake (Eric Blake) - qemu: better detection of crashed domains (Martin Kletzander) - command: avoid deadlock on EPIPE situation (Eric Blake) - Fix sync issue in virNetClientStreamEventRemoveCallback (Radu Caragea) - qemu: avoid closing fd more than once (Wen Congyang) - command: check for fork error before closing fd (Wen Congyang) - fdstream: avoid double close bug (Eric Blake) - command: avoid double close bugs (Eric Blake) - avoid fd leak (Wen Congyang) - avoid closing uninitialized fd (Wen Congyang) - lxc: return correct number of CPUs (Martin Kletzander) - leak_fix.diff (Stefan Berger) - Fix typos in RPM dependencies (Daniel P. Berrange) - Remove more bogus systemd service dependencies (Daniel P. Berrange) - qemu_hotplug: Don't free the PCI device structure after hot-unplug (Peter Krempa) - Fix potential events deadlock when unref'ing virConnectPtr (Daniel P. Berrange) - qemu: Don't delete USB device on failed qemuPrepareHostdevUSBDevices (Michal Privoznik) - nodeinfo: Get the correct CPU number on AMD Magny Cours platform (Osier Yang) - nodeinfo: avoid probing host filesystem during test (Eric Blake) Improvements: - Remove sub-mounts under /dev when starting an LXC container (Daniel P. Berrange) - Fix vm's outbound traffic control problem (Eiichi Tsukata) - conf: Don't shadow error from virGetDomain() (Peter Krempa) - maint: include ignore-value in internal.h (Peter Krempa) - vbox: Add support for virConnectListAllDomains() (Peter Krempa) - virsh: Add domdisplay cmd for VNC, SPICE and RDP (Doug Goldstein) - AUTHORS: Update (Michal Privoznik) - S390: Added sysinfo for host on s390(x). (Thang Pham) - S390: Fixed core identification for s390 (Viktor Mihajlovski) - S390: Fixed Parser for /proc/cpuinfo needs to be adapted for your architecture (Thang Pham) - S390: Override QEMU_CAPS_NO_ACPI for s390x (Viktor Mihajlovski) - storage backend rbd: Do not prefix rbd: on volume names. (Wido den Hollander) - qemu: Improve error if setmem fails for lacking of balloon support (Osier Yang) - Include the default listen address in the live guest XML (Daniel P. Berrange) - storage: Introduce --inactive for pool-dumpxml (Michal Privoznik) - storage: Switch to new def on pool-destroy (Michal Privoznik) - Support bind mounting host files, as well as directories in LXC (Daniel J Walsh) - Allow NOCONFIGURE=1 to make autogen.sh skip ./configure (Daniel P. Berrange) - virsh: Use virXPath wrappers for vncdisplay cmd (Doug Goldstein) - Add support for shared sanlock leases (Daniel P. Berrange) - Add support for guest bind mounts with LXC (Daniel P. Berrange) - Add support for RAM filesystems for LXC (Daniel P. Berrange) - virsh: Improve error when trying to change vm's cpu count 0 (Peter Krempa) - qemu: Add xhci support (Gerd Hoffmann) - virsh: add support for virConnectListAllDomains and clean up cmdList (Peter Krempa) - virsh: Rename namesorter to vshNameSorter and clean up indentation (Peter Krempa) - Initialize random generator in lxc controller (Jim Fehlig) - storage: Set the perms if the pool target already exists for fs pools (Osier Yang) - snapshot: require existence before returning success (Eric Blake) - drivers: Implement virListAllDomains for drivers using virDomainObj (Peter Krempa) - Fix default USB controller for ppc64 (Dipankar Sarma) - list: add qemu snapshot list support (Eric Blake) - list: new helper function to collect snapshots (Eric Blake) - list: provide RPC call for snapshots (Eric Blake) - list: provide python bindings for snapshots (Eric Blake) - list: use the new snapshot API in virsh when possible (Eric Blake) - snapshot: expose new flags in virsh (Eric Blake) - snapshot: add additional filters when getting lists (Eric Blake) - virsh: make domiftune interface help string consistent (Martin Kletzander) - snapshot: merge count and name collection (Eric Blake) - snapshot: merge domain and snapshot computation (Eric Blake) - snapshot: use metaroot node to simplify management (Eric Blake) - conf: Add helper for listing domains on drivers supporting virDomainObj (Peter Krempa) - conf: Store managed save image existence in virDomainObj (Peter Krempa) - remote: implement remote protocol for virConnectListAllDomains() (Peter Krempa) - python: add API exports for virConnectListAllDomains() (Peter Krempa) - lib: Add public api to enable atomic listing of guest (Peter Krempa) - Add a custom 404 error page for the website (Daniel P. Berrange) - qemu_agent: Add some more debug prints (Michal Privoznik) - snapshot: use new virsh function for snapshot-list (Eric Blake) - snapshot: new virsh function factored from snapshot-list (Eric Blake) - autogen: Always abide --system (Cole Robinson) - Check for errors when parsing bridge interface XML (Jim Fehlig) - Add more debug logging for libvirtd startup (Daniel P. Berrange) - schema: Update domain XML schema (Osier Yang) - virsh: allow the user to specify vmcore's format (Wen Congyang) - qemu: allow the client to choose the vmcore's format (Wen Congyang) - qemu: implement qemu's dump-guest-memory (Wen Congyang) - Always pivot_root event if the new root source is '/' (Daniel P. Berrange) - Improve error message diagnosing incorrect XML CPU mode (Daniel P. Berrange) - qemu: Enable disconnecting SPICE clients without changing password (Peter Krempa) - virsh: Report name from edited object (Michal Privoznik) - virsh: Honor reedit opts printing to a function (Michal Privoznik) - network: fully support/use VIR_NETWORK_XML_INACTIVE flag (Laine Stump) - Add some missing hook functions (Daniel P. Berrange) - server rpc: Remove APIs for manipulating filters on locked client (Jiri Denemark) - rpc: Remove unused parameter in virKeepAliveStopInternal (Jiri Denemark) - rpc: Do not use timer for sending keepalive responses (Jiri Denemark) - client rpc: Separate call creation from running IO loop (Jiri Denemark) - rpc: Add APIs for direct triggering of keepalive timer (Jiri Denemark) - rpc: Refactor keepalive timer code (Jiri Denemark) - client rpc: Drop unused return value of virNetClientSendNonBlock (Jiri Denemark) - client rpc: Just queue non-blocking call if another thread has the buck (Jiri Denemark) - client rpc: Don't drop non-blocking calls (Jiri Denemark) - client rpc: Use event loop for writing (Jiri Denemark) - build: fix 'make dist' on virgin checkout (Eric Blake) - build: silence gettext warning (Eric Blake) - openvz: wire up domainUpdateDeviceFlags (Guido Günther) - openvz: add persist parameter to openvzSetDiskQuota (Guido Günther) - Introduce virDomainFSIndexByName (Guido Günther) - python: use simpler methods (Eric Blake) - qemuProcessStop: Switch to flags (Michal Privoznik) - snapshot: implement new APIs for qemu (Eric Blake) - snapshot: RPC for new query APIs (Eric Blake) - snapshot: add 'virsh snapshot-info' (Eric Blake) - Two RPM conditional fixes for RHEL-7 (Daniel P. Berrange) - snapshot: virsh indentation cleanup (Eric Blake) - virsh: make tree listing more flexible (Eric Blake) - virsh: remove limits on tree listing (Eric Blake) - buf: support peeking at string contents (Eric Blake) - Update AUTHORS (Osier Yang) - LXC: Delete unused variable src in lxcContainerMountBasicFS (Gao feng) - msg_buf_size is unsigned long not size_t (Guido Günther) - Only check for cluster fs if we're using a filesystem (Guido Günther) - snapshot: add virDomainSnapshotRef API (Eric Blake) - Fix missing ) in 2 strings (Cole Robinson) - maint: make it easier to copy FORTIFY_SOURCE snippet (Eric Blake) - build: fix build without i18n (Eric Blake) - spec: Build against systemd for udev (Cole Robinson) - build: fix build of fresh checkout (Eric Blake) - build: ensure storage driver is used (Eric Blake) - rpc: Size up RPC limits (Michal Privoznik) - rpc: Switch to dynamically allocated message buffer (Michal Privoznik) - build: fix 'make distcheck' issues (Eric Blake) - tests: Refresh qemu-1.1.0 data (Jiri Denemark) - virsh: Back out if the argument for vol-create-as is malformed (Osier Yang) - virsh: Accept UUID as an argument for net-info and net-start (Osier Yang) - virsh: Accept UUID as an argument for storage commands (Osier Yang) - Fix for parallel port passthrough for QEMU (Beat Jörg) - util: fix "make rpm" when viratomic.h is used (Laine Stump) - build: allow building with newer glibc-headers and -O0 (Eric Blake) - fix make syntax-check failed (Wen Congyang) - build: fix sc_prohibit_readlink (Eric Blake) - file: Log closing filedescriptors (Jiri Denemark) - command: Fix debug message during handshake (Jiri Denemark) - virsh: Switch from generated cmd*Edit commands to nongenerated (Michal Privoznik) - nwfilter: Add multiple IP address support to DHCP snooping (Stefan Berger) - nwfilter: move code for IP address map into separate file (Stefan Berger) - qemu: move -name arg to be 1st in "ps x" output (Marti Raudsepp) - qemu: fix netdev alias name assignment wrt type='hostdev' (Laine Stump) - tools: make virt-pki-validate work with acls and xattrs (Martin Kletzander) - build: include augeas-gentest.pl into dist file (Wen Congyang) - build: use same perl binary throughout build (Eric Blake) - build: fix testing of augeas files in VPATH builds (Eric Blake) - build: silence warning from autoconf (Eric Blake) - virCommand: Extend debug message for handshake (Michal Privoznik) - build: Fixed generating of libvirt_qemu_probes.h (Martin Kletzander) - build: don't lose probes.o files (Eric Blake) - build: fix missing dependencies for libvirt-qemu.so (Eric Blake) - build: don't clean a file that belongs in the tarball (Eric Blake) - virsh: avoid strncpy (Eric Blake) - build: update to latest gnulib (Eric Blake) - Introduce virMacAddr typedef (Stefan Berger) - Santize the reporting of VIR_ERR_INVALID_ERROR (Daniel P. Berrange) - build: silence libtool during tests (Eric Blake) - Fix linking to DTrace probes file (Daniel P. Berrange) - Autogenerate augeas test case from default config files (Daniel P. Berrange) - Re-order config options in qemu driver augeas lens (Daniel P. Berrange) - Fix mistakes in augeas lens (Daniel P. Berrange) - Standardize whitespace used in example config files (Daniel P. Berrange) - Remove uid param from directory lookup APIs (Daniel P. Berrange) - Fix check for socket existance / daemon spawn (Daniel P. Berrange) - Remove last usage of PATH_MAX and ban its future use (Daniel P. Berrange) - maint: avoid new automake warning about AM_PROG_CC_STDC (Jim Meyering) - build: silence libtool warning on probes.o (Eric Blake) - tests: run valgrind on real executables, not libtool wrappers (Eric Blake) - qemu augeas: Add spice_tls/spice_tls_x509_cert_dir (Douglas Schilling Landgraf) - tests: back to short test names (Eric Blake) - maint: ignore more files from version control (Eric Blake) - Add sentinel for virErrorDomain enum (Daniel P. Berrange) - Add parsing for VIR_ENUM_IMPL & VIR_ENUM_DECL in apibuild.py (Daniel P. Berrange) - security: Switch to C99-style struct initialization (Michal Privoznik) - Add test case for loading driver modules (Daniel P. Berrange) - Override default driver dir when running from GIT (Daniel P. Berrange) - Split QEMU dtrace probes into separate file (Daniel P. Berrange) - Replace RTLD_LOCAL with RTLD_GLOBAL (Daniel P. Berrange) - Ensure LXC driver links against libblkid explicitly. (Daniel P. Berrange) - Remove libvirt_test.la library (Daniel P. Berrange) - Fix broken linkage of libvirt_driver_nodedev.la (Daniel P. Berrange) - Only build server side drivers as modules (Daniel P. Berrange) - Fix dep from libvirt-lock-sanlock RPM (Daniel P. Berrange) - openvz: add quota argument when creating container (Guido Günther) - openvz: support file system quota reporting (Guido Günther) - Introduce filesystem limits to virDomainFSDef (Guido Günther) - Introduce virDomainParseScaledValue (Guido Günther) - util: export virBufferTrim (Laine Stump) - virBuffer: add way to trim back extra text (Eric Blake) - build: fix unused variable after last patch (Eric Blake) - nwfilter: Add support for ipset (Stefan Berger) - Adds support to param 'vcpu_time' in qemu_driver. (Hu Tao) - Add a new param 'vcpu_time' to virDomainGetCPUStats (Hu Tao) - tests: add ich6 codec type test to qemuxml2argv-sound-device (Marc-André Lureau) - qemu: honour sound <codec> sub-elements (Marc-André Lureau) - domain: add <codec> sound sub-element (Marc-André Lureau) - qemu: test CAPS_HDA_MICRO (Marc-André Lureau) - nodeinfo: test more details (Eric Blake) - Add a virLogMessage alternative taking va_list args (Daniel P. Berrange) - build: fix recent syntax-check breakage (Eric Blake) - qemu: Rollback on used USB devices (Michal Privoznik) - Reject any non-option command line arguments (Daniel P. Berrange) - Remount cgroups controllers after setting up new /sys in LXC (Daniel P. Berrange) - Trim /proc & /sys subtrees before mounting new instances (Daniel P. Berrange) - Avoid LXC pivot root in the root source is still / (Daniel P. Berrange) - Mount fresh instance of sysfs/selinux in LXC (Daniel P. Berrange) - Convert the LXC driver to use the security driver API for mount options (Daniel Walsh) - Add security driver APIs for getting mount options (Daniel Walsh) - Add support for LXC specific SELinux configuration (Daniel Walsh) - Use private data struct in SELinux driver (Daniel Walsh) - Don't enable the AppArmour security driver with LXC (Daniel Walsh) - Pass the virt driver name into security drivers (Daniel Walsh) - Remove bogus udev.target dep from libvirtd unit (Daniel P. Berrange) - qemu: Add support for -no-user-config (Jiri Denemark) - Set a sensible default master start port for ehci companion controllers (Daniel P. Berrange) - Fix logic for assigning PCI addresses to USB2 companion controllers (Daniel P. Berrange) - Fix virDomainDeviceInfoIsSet() to check all struct fields (Daniel P. Berrange) - Remove redundant trailing slash in user dir paths (Daniel P. Berrange) - Allow stack traces to be included with log messages (Daniel P. Berrange) - Move user libvirtd socket out of abstract namespace (Daniel P. Berrange) - Add openvz_util.c to POTFILES (Daniel P. Berrange) - Add bundled(gnulib) to RPM specfile (Daniel P. Berrange) - openvz: determine kb/pages only once (Guido Günther) - libvirt-guests: Remove LISTFILE if it's empty when stopping service (Osier Yang) - qemu: Set memory policy using cgroup if placement is auto (Osier Yang) - qemu: Use the CPU index in capabilities to map NUMA node to cpu list. (Osier Yang) - Assign spapr-vio bus address to ibmvscsi controller (Li Zhang) - sanlock: fix locking for readonly devices (David Weber) - nodeinfo: add some more tests (Eric Blake) - nodeinfo: drop static variable (Eric Blake) - maint: fix AUTHORS (Eric Blake) - Use XDG Base Directories instead of storing in home directory (William Jon McCann) Cleanups: - Remove accidentally added Patch: lines from mingw-libvirt.spec.in (Daniel P. Berrange) - Add /tools/libvirt-guests.service to .gitignore (Guido Günther) - sanlock: Properly indent (Michal Privoznik) - Remove stray debug fprintf in XML parser (Daniel P. Berrange) - util: Fix the indention (Osier Yang) - LXC: avoid useless duplicate memory free (Gao feng) - driver: Clean up driver header to space indentation (Peter Krempa) - build: fix whitespace damage (Eric Blake) - build: hoist qemu dependence on yajl to configure (Eric Blake) - maint: command.c whitespace cleanups (Eric Blake) - Revert "rpc: Discard non-blocking calls only when necessary" (Jiri Denemark) thanks everybody for the contributions, be it bug reports, documentation fixes, patches, etc. ! Daniel -- Daniel Veillard | libxml Gnome XML XSLT toolkit http://xmlsoft.org/ daniel(a)veillard.com | Rpmfind RPM search engine http://rpmfind.net/ http://veillard.com/ | virtualization library http://libvirt.org/

3 2

[libvirt] [PATCH] Added the attribute vendor_id to the cpu model
by Hendrik Schwartke 03 Jul '12

03 Jul '12

Introducing the attribute vendor_id to force the CPUID instruction in a kvm guest to return the specified vendor. --- docs/schemas/domaincommon.rng | 7 +++++ src/conf/cpu_conf.c | 61 ++++++++++++++++++++++++++++++++--------- src/conf/cpu_conf.h | 3 ++ src/qemu/qemu_command.c | 6 +++- tests/testutilsqemu.c | 1 + 5 files changed, 64 insertions(+), 14 deletions(-) diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng index 46e539d..a246e8b 100644 --- a/docs/schemas/domaincommon.rng +++ b/docs/schemas/domaincommon.rng @@ -2820,6 +2820,13 @@ </choice> </attribute> </optional> + <optional> + <attribute name="vendor_id"> + <data type="string"> + <param name='pattern'>.{12}</param> + </data> + </attribute> + </optional> <choice> <text/> <empty/> diff --git a/src/conf/cpu_conf.c b/src/conf/cpu_conf.c index b520f7c..b8ca7a5 100644 --- a/src/conf/cpu_conf.c +++ b/src/conf/cpu_conf.c @@ -22,6 +22,7 @@ */ #include <config.h> +#include <ctype.h> #include "virterror_internal.h" #include "memory.h" @@ -68,6 +69,7 @@ virCPUDefFreeModel(virCPUDefPtr def) VIR_FREE(def->model); VIR_FREE(def->vendor); + VIR_FREE(def->vendor_id); for (i = 0; i < def->nfeatures; i++) VIR_FREE(def->features[i].name); @@ -104,6 +106,7 @@ virCPUDefCopyModel(virCPUDefPtr dst, if ((src->model && !(dst->model = strdup(src->model))) || (src->vendor && !(dst->vendor = strdup(src->vendor))) + || (src->vendor_id && !(dst->vendor_id = strdup(src->vendor_id))) || VIR_ALLOC_N(dst->features, src->nfeatures) < 0) goto no_memory; dst->nfeatures_max = dst->nfeatures = src->nfeatures; @@ -288,19 +291,42 @@ virCPUDefParseXML(const xmlNodePtr node, } if (def->type == VIR_CPU_TYPE_GUEST && - def->mode != VIR_CPU_MODE_HOST_PASSTHROUGH && - virXPathBoolean("boolean(./model[1]/@fallback)", ctxt)) { - const char *fallback; - - fallback = virXPathString("string(./model[1]/@fallback)", ctxt); - if (fallback) { - def->fallback = virCPUFallbackTypeFromString(fallback); - VIR_FREE(fallback); - if (def->fallback < 0) { - virCPUReportError(VIR_ERR_XML_ERROR, "%s", - _("Invalid fallback attribute")); - goto error; - } + def->mode != VIR_CPU_MODE_HOST_PASSTHROUGH) { + + if(virXPathBoolean("boolean(./model[1]/@fallback)", ctxt)) { + const char *fallback; + + fallback = virXPathString("string(./model[1]/@fallback)", ctxt); + if (fallback) { + def->fallback = virCPUFallbackTypeFromString(fallback); + VIR_FREE(fallback); + if (def->fallback < 0) { + virCPUReportError(VIR_ERR_XML_ERROR, "%s", + _("Invalid fallback attribute")); + goto error; + } + } + + if(virXPathBoolean("boolean(./model[1]/@vendor_id)", ctxt)) { + char *vendor_id; + + vendor_id = virXPathString("string(./model[1]/@vendor_id)", ctxt); + if(!vendor_id || strlen(vendor_id)!=VIR_CPU_VENDOR_ID_LENGTH) { + virCPUReportError(VIR_ERR_XML_ERROR, "%s", + _("vendor id must be 12 characters long")); + VIR_FREE(vendor_id); + goto error; + } + for(i=0; i<strlen(vendor_id); i++) { + if(!isprint(vendor_id[i]) || isspace(vendor_id[i])) { + virCPUReportError(VIR_ERR_XML_ERROR, "%s", + _("vendor id is invalid")); + VIR_FREE(vendor_id); + goto error; + } + } + def->vendor_id = vendor_id; + } } } @@ -588,6 +614,8 @@ virCPUDefFormatBuf(virBufferPtr buf, return -1; } virBufferAsprintf(buf, " fallback='%s'", fallback); + if(def->vendor_id) + virBufferAsprintf(buf, " vendor_id='%s'", def->vendor_id); } if (formatModel && def->model) { virBufferAsprintf(buf, ">%s</model>\n", def->model); @@ -738,6 +766,13 @@ virCPUDefIsEqual(virCPUDefPtr src, goto cleanup; } + if (STRNEQ_NULLABLE(src->vendor_id, dst->vendor_id)) { + virCPUReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("Target CPU model %s does not match source %s"), + NULLSTR(dst->vendor_id), NULLSTR(src->vendor_id)); + goto cleanup; + } + if (src->sockets != dst->sockets) { virCPUReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("Target CPU sockets %d does not match source %d"), diff --git a/src/conf/cpu_conf.h b/src/conf/cpu_conf.h index f8b7bf9..3daadbd 100644 --- a/src/conf/cpu_conf.h +++ b/src/conf/cpu_conf.h @@ -28,6 +28,8 @@ # include "buf.h" # include "xml.h" +#define VIR_CPU_VENDOR_ID_LENGTH 12 + enum virCPUType { VIR_CPU_TYPE_HOST, VIR_CPU_TYPE_GUEST, @@ -103,6 +105,7 @@ struct _virCPUDef { int match; /* enum virCPUMatch */ char *arch; char *model; + char *vendor_id; /* vendor id returned by CPUID in the guest */ int fallback; /* enum virCPUFallback */ char *vendor; unsigned int sockets; diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index bd4f96a..56ecefb 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -3910,7 +3910,9 @@ qemuBuildCpuArgStr(const struct qemud_driver *driver, } virBufferAddLit(&buf, "host"); } else { - if (VIR_ALLOC(guest) < 0 || !(guest->arch = strdup(host->arch))) + if (VIR_ALLOC(guest) < 0 + || !(guest->arch = strdup(host->arch)) + || (cpu->vendor_id && !(guest->vendor_id = strdup(cpu->vendor_id)))) goto no_memory; if (cpu->match == VIR_CPU_MATCH_MINIMUM) @@ -3924,6 +3926,8 @@ qemuBuildCpuArgStr(const struct qemud_driver *driver, goto cleanup; virBufferAdd(&buf, guest->model, -1); + if(guest->vendor_id) + virBufferAsprintf(&buf, ",vendor=%s", guest->vendor_id); for (i = 0; i < guest->nfeatures; i++) { char sign; if (guest->features[i].policy == VIR_CPU_FEATURE_DISABLE) diff --git a/tests/testutilsqemu.c b/tests/testutilsqemu.c index 8d5a3bf..8b7cb33 100644 --- a/tests/testutilsqemu.c +++ b/tests/testutilsqemu.c @@ -116,6 +116,7 @@ virCapsPtr testQemuCapsInit(void) { 0, /* match */ (char *) "x86_64", /* arch */ (char *) "core2duo", /* model */ + NULL, /* vendor_id */ 0, /* fallback */ (char *) "Intel", /* vendor */ 1, /* sockets */ -- 1.7.9.5

3 9

[libvirt] ANNOUNCE: Perl binding Sys-Virt release 0.9.13
by Daniel P. Berrange 03 Jul '12

03 Jul '12

I am pleased to announce that release 0.9.13 of Sys-Virt, the libvirt Perl API binding is now available for download: http://search.cpan.org/CPAN/authors/id/D/DA/DANBERR/Sys-Virt-0.9.13.tar.gz Changed in this release: - Add all new APIs and constants in libvirt 0.9.13 Further information, including online API documentation & previous release archives, is available from the CPAN home page http://search.cpan.org/dist/Sys-Virt/ Regards, Daniel -- |: http://berrange.com -o- http://www.flickr.com/photos/dberrange/ :| |: http://libvirt.org -o- http://virt-manager.org :| |: http://autobuild.org -o- http://search.cpan.org/~danberr/ :| |: http://entangle-photo.org -o- http://live.gnome.org/gtk-vnc :|

1 0

[libvirt] [PATCH] qemu: add rbd to whitelist of migration-safe formats
by Josh Durgin 02 Jul '12

02 Jul '12

QEMU (and librbd) flush the cache on the source before the destination starts, and the destination does not read any changeable data before that, so live migration with rbd caching is safe. This makes 'virsh migrate' work with rbd and caching without the --unsafe flag. Reported-by: Vladimir Bashkirtsev <vladimir(a)bashkirtsev.com> Signed-off-by: Josh Durgin <josh.durgin(a)inktank.com> --- src/qemu/qemu_migration.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index 48369d6..f51c99a 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -847,6 +847,9 @@ qemuMigrationIsSafe(virDomainDefPtr def) continue; else if (cfs < 0) return false; + } else if (disk->type == VIR_DOMAIN_DISK_TYPE_NETWORK && + disk->protocol == VIR_DOMAIN_DISK_PROTOCOL_RBD) { + continue; } qemuReportError(VIR_ERR_MIGRATE_UNSAFE, "%s", -- 1.7.9.5

2 3

[libvirt] [libvirt-php PATCH] Add ability to managed save libvirt domains
by Y＠billing.fastvps.ru 02 Jul '12

02 Jul '12

From: Pavel Odintsov <pavel.odintsov(a)gmail.com> --- src/libvirt-php.c | 22 ++++++++++++++++++++++ src/libvirt-php.h | 1 + 2 files changed, 23 insertions(+), 0 deletions(-) diff --git a/src/libvirt-php.c b/src/libvirt-php.c index 20e5d27..9cdfd0e 100644 --- a/src/libvirt-php.c +++ b/src/libvirt-php.c @@ -99,6 +99,7 @@ static zend_function_entry libvirt_functions[] = { PHP_FE(libvirt_domain_core_dump, NULL) PHP_FE(libvirt_domain_shutdown, NULL) PHP_FE(libvirt_domain_suspend, NULL) + PHP_FE(libvirt_domain_managedsave, NULL) PHP_FE(libvirt_domain_undefine, NULL) PHP_FE(libvirt_domain_reboot, NULL) PHP_FE(libvirt_domain_define_xml, NULL) @@ -4470,6 +4471,27 @@ PHP_FUNCTION(libvirt_domain_shutdown) } /* + Function name: libvirt_domain_managedsave + Since version: 0.4.1(-1) + Description: Function is used to managed save the domain (domain was unloaded from memory and it state saved to disk) identified by it's resource + Arguments: @res [resource]: libvirt domain resource, e.g. from libvirt_domain_lookup_by_*() + Returns: TRUE for success, FALSE on error +*/ + +PHP_FUNCTION(libvirt_domain_managedsave) +{ + php_libvirt_domain *domain=NULL; + zval *zdomain; + int retval; + + GET_DOMAIN_FROM_ARGS("r",&zdomain); + retval=virDomainManagedSave(domain->domain, 0); + DPRINTF("%s: virDomainManagedSave(%p) returned %d\n", PHPFUNC, domain->domain, retval); + if (retval != 0) RETURN_FALSE; + RETURN_TRUE; +} + +/* Function name: libvirt_domain_suspend Since version: 0.4.1(-1) Description: Function is used to suspend the domain identified by it's resource diff --git a/src/libvirt-php.h b/src/libvirt-php.h index 3c7f254..b06836c 100644 --- a/src/libvirt-php.h +++ b/src/libvirt-php.h @@ -307,6 +307,7 @@ PHP_FUNCTION(libvirt_domain_resume); PHP_FUNCTION(libvirt_domain_core_dump); PHP_FUNCTION(libvirt_domain_shutdown); PHP_FUNCTION(libvirt_domain_suspend); +PHP_FUNCTION(libvirt_domain_managedsave); PHP_FUNCTION(libvirt_domain_undefine); PHP_FUNCTION(libvirt_domain_reboot); PHP_FUNCTION(libvirt_domain_define_xml); -- 1.7.2.5

3 2

[libvirt] [PATCH] fix key error for qemuMonitorGetBlockStatsInfo
by lvroyce＠linux.vnet.ibm.com 02 Jul '12

02 Jul '12

From: lvroyce <lvroyce(a)linux.vnet.ibm.com> virDomainBlockStatsFlags can't collect total_time_ns for read/write/flush because of key typo when retriveing from qemu cmd result Signed-off-by: lvroyce <lvroyce(a)linux.vnet.ibm.com> --- src/qemu/qemu_monitor_json.c | 24 ++++++++++++------------ src/qemu/qemu_monitor_text.c | 18 +++++++++--------- 2 files changed, 21 insertions(+), 21 deletions(-) diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c index 7d2da21..7eb9529 100644 --- a/src/qemu/qemu_monitor_json.c +++ b/src/qemu/qemu_monitor_json.c @@ -1710,12 +1710,12 @@ int qemuMonitorJSONGetBlockStatsInfo(qemuMonitorPtr mon, goto cleanup; } if (rd_total_times && - virJSONValueObjectHasKey(stats, "rd_total_times_ns") && - (virJSONValueObjectGetNumberLong(stats, "rd_total_times_ns", + virJSONValueObjectHasKey(stats, "rd_total_time_ns") && + (virJSONValueObjectGetNumberLong(stats, "rd_total_time_ns", rd_total_times) < 0)) { qemuReportError(VIR_ERR_INTERNAL_ERROR, _("cannot read %s statistic"), - "rd_total_times_ns"); + "rd_total_time_ns"); goto cleanup; } if (virJSONValueObjectGetNumberLong(stats, "wr_bytes", wr_bytes) < 0) { @@ -1731,12 +1731,12 @@ int qemuMonitorJSONGetBlockStatsInfo(qemuMonitorPtr mon, goto cleanup; } if (wr_total_times && - virJSONValueObjectHasKey(stats, "wr_total_times_ns") && - (virJSONValueObjectGetNumberLong(stats, "wr_total_times_ns", + virJSONValueObjectHasKey(stats, "wr_total_time_ns") && + (virJSONValueObjectGetNumberLong(stats, "wr_total_time_ns", wr_total_times) < 0)) { qemuReportError(VIR_ERR_INTERNAL_ERROR, _("cannot read %s statistic"), - "wr_total_times_ns"); + "wr_total_time_ns"); goto cleanup; } if (flush_req && @@ -1749,12 +1749,12 @@ int qemuMonitorJSONGetBlockStatsInfo(qemuMonitorPtr mon, goto cleanup; } if (flush_total_times && - virJSONValueObjectHasKey(stats, "flush_total_times_ns") && - (virJSONValueObjectGetNumberLong(stats, "flush_total_times_ns", + virJSONValueObjectHasKey(stats, "flush_total_time_ns") && + (virJSONValueObjectGetNumberLong(stats, "flush_total_time_ns", flush_total_times) < 0)) { qemuReportError(VIR_ERR_INTERNAL_ERROR, _("cannot read %s statistic"), - "flush_total_times_ns"); + "flush_total_time_ns"); goto cleanup; } } @@ -1822,12 +1822,12 @@ int qemuMonitorJSONGetBlockStatsParamsNumber(qemuMonitorPtr mon, if (STREQ(key, "rd_bytes") || STREQ(key, "rd_operations") || - STREQ(key, "rd_total_times_ns") || + STREQ(key, "rd_total_time_ns") || STREQ(key, "wr_bytes") || STREQ(key, "wr_operations") || - STREQ(key, "wr_total_times_ns") || + STREQ(key, "wr_total_time_ns") || STREQ(key, "flush_operations") || - STREQ(key, "flush_total_times_ns")) { + STREQ(key, "flush_total_time_ns")) { num++; } else { /* wr_highest_offset is parsed by qemuMonitorJSONGetBlockExtent. */ diff --git a/src/qemu/qemu_monitor_text.c b/src/qemu/qemu_monitor_text.c index edb5dfd..086b06b 100644 --- a/src/qemu/qemu_monitor_text.c +++ b/src/qemu/qemu_monitor_text.c @@ -977,13 +977,13 @@ int qemuMonitorTextGetBlockStatsInfo(qemuMonitorPtr mon, if (virStrToLong_ll (p, &dummy, 10, wr_req) == -1) VIR_DEBUG ("error reading wr_req: %s", p); } else if (rd_total_times && - STRPREFIX (p, "rd_total_times_ns=")) { - p += strlen("rd_total_times_ns="); + STRPREFIX (p, "rd_total_time_ns=")) { + p += strlen("rd_total_time_ns="); if (virStrToLong_ll (p, &dummy, 10, rd_total_times) == -1) VIR_DEBUG ("error reading rd_total_times: %s", p); } else if (wr_total_times && - STRPREFIX (p, "wr_total_times_ns=")) { - p += strlen("wr_total_times_ns="); + STRPREFIX (p, "wr_total_time_ns=")) { + p += strlen("wr_total_time_ns="); if (virStrToLong_ll (p, &dummy, 10, wr_total_times) == -1) VIR_DEBUG ("error reading wr_total_times: %s", p); } else if (flush_req && @@ -992,8 +992,8 @@ int qemuMonitorTextGetBlockStatsInfo(qemuMonitorPtr mon, if (virStrToLong_ll (p, &dummy, 10, flush_req) == -1) VIR_DEBUG ("error reading flush_req: %s", p); } else if (flush_total_times && - STRPREFIX (p, "flush_total_times_ns=")) { - p += strlen("flush_total_times_ns="); + STRPREFIX (p, "flush_total_time_ns=")) { + p += strlen("flush_total_time_ns="); if (virStrToLong_ll (p, &dummy, 10, flush_total_times) == -1) VIR_DEBUG ("error reading flush_total_times: %s", p); } else { @@ -1071,10 +1071,10 @@ int qemuMonitorTextGetBlockStatsParamsNumber(qemuMonitorPtr mon, STRPREFIX (p, " wr_bytes=") || STRPREFIX (p, " rd_operations=") || STRPREFIX (p, " wr_operations=") || - STRPREFIX (p, " rd_total_times_ns=") || - STRPREFIX (p, " wr_total_times_ns=") || + STRPREFIX (p, " rd_total_time_ns=") || + STRPREFIX (p, " wr_total_time_ns=") || STRPREFIX (p, " flush_operations=") || - STRPREFIX (p, " flush_total_times_ns=")) { + STRPREFIX (p, " flush_total_time_ns=")) { num++; } else { VIR_DEBUG ("unknown block stat near %s", p); -- 1.7.7.6

2 2

[libvirt] sanlock on F17
by Dave Allan 02 Jul '12

02 Jul '12

I just tried to set up sanlock on F17 using the instructions at http://libvirt.org/locking.html, but libvirtd refuses to start with the sanlock error in the logs: Jun 29 19:56:20 nienna sanlock[8423]: 19846 open error -13 /var/lib/libvirt/sanlock/__LIBVIRT__DISKS__ I confirmed that user sanlock can create, read and write files in /var/lib/libvirt/sanlock The only thing I can think of that's slightly odd about my setup is that I'm only concerned with the local machine, so that directory is not an NFS mount. Anybody have any thoughts on what's going wrong here? TIA, Dave

3 3

[libvirt] compile option: --without-gnutls
by Chris Van Heuveln 02 Jul '12

02 Jul '12

Hi libvirt-list, Full disclosure: this is the first open source project I've tried to contribute to and I'm still learning the process and tools. In any case, Mikhail Gusarov started a thread on this a while back and I've tried to take it to conclusion. I needed to remove tls for 0.8.4 so I coded up a --without-gnutls configure option using Mikhail's partial code as a template. Then I pulled down 0.9.12 and came up with a patch that I'd like to push out to the commununity. I'm not adding any "new" functionality other than the configure option. The tls calls/structs are just #ifdef'd for the most part. In a couple of places I had to flip the logic for "if (!tls_struct) else", and also had to modify a few function calls to pass void * instead of tls pointers. I built --with-gnutls, --without-gnutls, and no option specified (defaults to --with-gnutls). make check is clean except for: TEST: libvirtdconftest .....!!!!!!...!!!!!!!!!!!!!!!!!!!!!!!!! 39 FAIL ...which consists mostly of this sasl failure: 39) Test corruption ... libvir: Config File error : unsupported configuration: remoteReadConfigFile: /home/ubu/git/libvirt/tests/../daemon/libvirtd.conf: auth_tcp: unsupported auth sasl FAILED ...so I'm trying to track that down, and also need to run syntax-check and valgrind tests. Once I get the tests passing what's my next step? Are you okay with this approach? Do you want a preview of my diffs? Do I need to write additional tests for this new option or update any documentation? Thanks, Chris Van Heuveln

2 1

[libvirt] Entering freeze for libvirt-0.9.13
by Daniel Veillard 02 Jul '12

02 Jul '12

I just tagged the git tree and I pushed the tarball for rc1: ftp://libvirt.org/libvirt/libvirt-0.9.13-rc1.tar.gz the rpms I build are coming along soon. Please give it a try, the basic seems okay to me (kvm driver seems to need the qemu one now but otherwise, no surprize so far) Give it a try too, and let's find if there are portability issues too ! I think i would make an rc2 release on wed or thursday, and then if everything is fine the release next week-end or on Monday. thanks ! Daniel -- Daniel Veillard | libxml Gnome XML XSLT toolkit http://xmlsoft.org/ daniel(a)veillard.com | Rpmfind RPM search engine http://rpmfind.net/ http://veillard.com/ | virtualization library http://libvirt.org/

8 13

[libvirt] Intend to add fuse filesystem support for libvirt lxc
by Gao feng 02 Jul '12

02 Jul '12

Hi Everyone, Now I'm working on making the container's system info(such as /proc/meminfo,cpuinfo..) isolate from the host. I made a patch which implement showing the /proc/meminfo base on container's memcg, and sent it to the community.(http://marc.info/?l=linux-mm&m=133826035821338&w=2) but I found it's difficult to be accepted, because this way is ugly, and somebody gave me some suggestions. the first way is making another kernel file(just like memory.limit_in_bytes),and mount it to the container. I don't like this way,because there will be many redundance information between this new kernel file and the existing kernel file,some files such as memory.stat already contains memcg information. the other way is adding fuse filesystem support for libvirt lxc. with this way, we can simply collect information from cgroup in fuse_operations.read function, and mount this file to the container. we can impletment isolate meminfo in userspace without changing kernel codes. I have impletment fuse support for libvrit now, and ready to impletement the meminfo isolated. I want to know if you have any comment or another ideas? please let me know. thanks.

2 2

[libvirt] (no subject)
by Daniele Milani 02 Jul '12

02 Jul '12

http://tidydeck.com/pokpre.html?nq=qaklnkik

1 0

[libvirt] [PATCH] build: define WITH_INTERFACE for the driver
by Eric Blake 02 Jul '12

02 Jul '12

Our code was mistakenly relying on an undefined macro, WITH_INTERFACE, for determining whether to load the interface driver which wraps the netcf library. Clean this situation up by having only one automake conditional for the driver, and having both WITH_NETCF (library detected) and WITH_INTERFACE (driver enabled) in C code, in case a future patch ever adds a network management via means other than the netcf library. While at it, output more information at the conclusion of configure about the various drivers we enabled. * configure.ac: Enhance with_netcf, and add with_interface. Improve output to list final decisions. Replace WITH_NETCF with WITH_INTERFACE. * src/interface/netcf_driver.c: Rename... * src/interface/interface_driver.c: ...to this. * src/interface/interface_driver.h: Likewise. * daemon/Makefile.am (libvirtd_LDADD): Reflect better naming. * src/Makefile.am (libvirt_driver_interface_la_*): Likewise. (INTERFACE_DRIVER_SOURCES): Reflect file moves. * daemon/libvirtd.c (daemonInitialize): Likewise. * tools/virsh.c (vshShowVersion): Show both driver and library decisions. * libvirt.spec.in (with_interface): Tweak to deal with new usage as a real switch. --- I think this addresses the point that Osier raised here: https://www.redhat.com/archives/libvir-list/2012-June/msg01266.html but it is complex enough that I'd appreciate a careful review. configure.ac | 44 ++++++++++++++++---- daemon/Makefile.am | 2 +- daemon/libvirtd.c | 6 +-- libvirt.spec.in | 10 +++-- src/Makefile.am | 4 +- .../{netcf_driver.c => interface_driver.c} | 4 +- .../{netcf_driver.h => interface_driver.h} | 0 tools/virsh.c | 11 +++-- 8 files changed, 59 insertions(+), 22 deletions(-) rename src/interface/{netcf_driver.c => interface_driver.c} (99%) rename src/interface/{netcf_driver.h => interface_driver.h} (100%) diff --git a/configure.ac b/configure.ac index 6436885..a29b3b2 100644 --- a/configure.ac +++ b/configure.ac @@ -1755,6 +1755,7 @@ if test "$with_network" = "yes" ; then fi AM_CONDITIONAL([WITH_NETWORK], [test "$with_network" = "yes"]) +dnl check whether helper code is needed for above selections with_bridge=no if test "$with_qemu:$with_lxc:$with_network" != "no:no:no"; then with_bridge=yes @@ -1762,16 +1763,31 @@ if test "$with_qemu:$with_lxc:$with_network" != "no:no:no"; then fi AM_CONDITIONAL([WITH_BRIDGE], [test "$with_bridge" = "yes"]) -dnl netcf library +dnl check if the interface driver should be compiled + +AC_ARG_WITH([interface], + AC_HELP_STRING([--with-interface], + [with host interface driver @<:@default=check@:>@]),[], + [with_interface=check]) + +dnl there's no use compiling the interface driver without the libvirt daemon +if test "$with_libvirtd" = "no"; then + with_interface=no +fi + +dnl The interface driver depends on the netcf library AC_ARG_WITH([netcf], AC_HELP_STRING([--with-netcf], [libnetcf support to configure physical host network interfaces @<:@default=check@:>@]), [], [with_netcf=check]) NETCF_CFLAGS= NETCF_LIBS= -if test "$with_libvirtd" = "no" ; then +if test "$with_libvirtd" = "no" || test "$with_interface" = "no"; then with_netcf=no fi +if test "$with_interface:$with_netcf" = "yes:check"; then + with_netcf=yes +fi if test "$with_netcf" = "yes" || test "$with_netcf" = "check"; then PKG_CHECK_MODULES(NETCF, netcf >= $NETCF_REQUIRED, [with_netcf=yes], [ @@ -1792,11 +1808,21 @@ if test "$with_netcf" = "yes" || test "$with_netcf" = "check"; then fi fi fi -AM_CONDITIONAL([WITH_NETCF], [test "$with_netcf" = "yes"]) AC_SUBST([NETCF_CFLAGS]) AC_SUBST([NETCF_LIBS]) +dnl Final decision on the interface driver +if test "$with_interface" = "check"; then + with_interface=$with_netcf +fi + +if test "$with_interface" = "yes" ; then + AC_DEFINE_UNQUOTED([WITH_INTERFACE], [1], + [whether interface driver is enabled]) +fi +AM_CONDITIONAL([WITH_INTERFACE], [test "$with_interface" = "yes"]) +dnl Check whether the Secrets driver is needed AC_ARG_WITH([secrets], AC_HELP_STRING([--with-secrets], [with local secrets management driver @<:@default=yes@:>@]),[],[with_secrets=yes]) @@ -2807,11 +2833,12 @@ AC_MSG_NOTICE([ ESX: $with_esx]) AC_MSG_NOTICE([ Hyper-V: $with_hyperv]) AC_MSG_NOTICE([ Test: $with_test]) AC_MSG_NOTICE([ Remote: $with_remote]) -AC_MSG_NOTICE([ Network: $with_network]) AC_MSG_NOTICE([Libvirtd: $with_libvirtd]) -AC_MSG_NOTICE([ netcf: $with_netcf]) -AC_MSG_NOTICE([ macvtap: $with_macvtap]) -AC_MSG_NOTICE([virtport: $with_virtualport]) +AC_MSG_NOTICE([ Network: $with_network]) +AC_MSG_NOTICE([ Iface: $with_interface]) +AC_MSG_NOTICE([ Secrets: $with_secrets]) +AC_MSG_NOTICE([ NodeDev: $with_nodedev]) +AC_MSG_NOTICE([NWfilter: $with_nwfilter]) AC_MSG_NOTICE([]) AC_MSG_NOTICE([Storage Drivers]) AC_MSG_NOTICE([]) @@ -2977,6 +3004,9 @@ AC_MSG_NOTICE([ Readline: $lv_use_readline]) AC_MSG_NOTICE([ Python: $with_python]) AC_MSG_NOTICE([ DTrace: $with_dtrace]) AC_MSG_NOTICE([ numad: $with_numad]) +AC_MSG_NOTICE([ bridge: $with_bridge]) +AC_MSG_NOTICE([ macvtap: $with_macvtap]) +AC_MSG_NOTICE([ virtport: $with_virtualport]) AC_MSG_NOTICE([ XML Catalog: $XML_CATALOG_FILE]) AC_MSG_NOTICE([ Init script: $with_init_script]) AC_MSG_NOTICE([Console locks: $with_console_lock_files]) diff --git a/daemon/Makefile.am b/daemon/Makefile.am index 71e91cd..f0e422e 100644 --- a/daemon/Makefile.am +++ b/daemon/Makefile.am @@ -148,7 +148,7 @@ if WITH_NETWORK libvirtd_LDADD += ../src/libvirt_driver_network.la endif -if WITH_NETCF +if WITH_INTERFACE libvirtd_LDADD += ../src/libvirt_driver_interface.la endif diff --git a/daemon/libvirtd.c b/daemon/libvirtd.c index 9c06344..a4f98cf 100644 --- a/daemon/libvirtd.c +++ b/daemon/libvirtd.c @@ -74,8 +74,8 @@ # ifdef WITH_NETWORK # include "network/bridge_driver.h" # endif -# ifdef WITH_NETCF -# include "interface/netcf_driver.h" +# ifdef WITH_INTERFACE +# include "interface/interface_driver.h" # endif # ifdef WITH_STORAGE # include "storage/storage_driver.h" @@ -400,7 +400,7 @@ static void daemonInitialize(void) # ifdef WITH_NETWORK networkRegister(); # endif -# ifdef WITH_NETCF +# ifdef WITH_INTERFACE interfaceRegister(); # endif # ifdef WITH_STORAGE diff --git a/libvirt.spec.in b/libvirt.spec.in index 896ef51..26ea2d9 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -70,6 +70,7 @@ # Then the secondary host drivers, which run inside libvirtd %define with_network 0%{!?_without_network:%{server_drivers}} +%define with_interface 0%{!?_without_interface:%{server_drivers}} %define with_storage_fs 0%{!?_without_storage_fs:%{server_drivers}} %define with_storage_lvm 0%{!?_without_storage_lvm:%{server_drivers}} %define with_storage_iscsi 0%{!?_without_storage_iscsi:%{server_drivers}} @@ -214,6 +215,7 @@ # The logic is the same as in configure.ac %if ! %{with_libvirtd} %define with_network 0 +%define with_interface 0 %define with_qemu 0 %define with_lxc 0 %define with_uml 0 @@ -267,9 +269,7 @@ %define with_nodedev 0 %endif -%if %{with_netcf} -%define with_interface 1 -%else +%if !%{with_netcf} %define with_interface 0 %endif @@ -1056,6 +1056,9 @@ of recent versions of Linux (and other OSes). %define _without_network --without-network %endif +%if ! %{with_interface} +%define _without_interface --without-interface +%endif %if ! %{with_storage_fs} %define _without_storage_fs --without-storage-fs %endif @@ -1171,6 +1174,7 @@ autoreconf -if %{?_without_hyperv} \ %{?_without_vmware} \ %{?_without_network} \ + %{?_without_interface} \ %{?_with_rhel5_api} \ %{?_without_storage_fs} \ %{?_without_storage_lvm} \ diff --git a/src/Makefile.am b/src/Makefile.am index 2309984..3cfaf01 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -483,7 +483,7 @@ NETWORK_DRIVER_SOURCES = \ network/bridge_driver.h network/bridge_driver.c INTERFACE_DRIVER_SOURCES = \ - interface/netcf_driver.h interface/netcf_driver.c + interface/interface_driver.h interface/interface_driver.c SECRET_DRIVER_SOURCES = \ secret/secret_driver.h secret/secret_driver.c @@ -924,7 +924,7 @@ EXTRA_DIST += network/default.xml -if WITH_NETCF +if WITH_INTERFACE if WITH_DRIVER_MODULES mod_LTLIBRARIES += libvirt_driver_interface.la else diff --git a/src/interface/netcf_driver.c b/src/interface/interface_driver.c similarity index 99% rename from src/interface/netcf_driver.c rename to src/interface/interface_driver.c index 45e6442..4959c72 100644 --- a/src/interface/netcf_driver.c +++ b/src/interface/interface_driver.c @@ -2,7 +2,7 @@ * interface_driver.c: backend driver methods to handle physical * interface configuration using the netcf library. * - * Copyright (C) 2006-2011 Red Hat, Inc. + * Copyright (C) 2006-2012 Red Hat, Inc. * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -27,7 +27,7 @@ #include "virterror_internal.h" #include "datatypes.h" -#include "netcf_driver.h" +#include "interface_driver.h" #include "interface_conf.h" #include "memory.h" diff --git a/src/interface/netcf_driver.h b/src/interface/interface_driver.h similarity index 100% rename from src/interface/netcf_driver.h rename to src/interface/interface_driver.h diff --git a/tools/virsh.c b/tools/virsh.c index 53d1825..c1e7010 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -20832,15 +20832,18 @@ vshShowVersion(vshControl *ctl ATTRIBUTE_UNUSED) #ifdef WITH_NETWORK vshPrint(ctl, " Network"); #endif -#ifdef WITH_BRIDGE - vshPrint(ctl, " Bridging"); -#endif -#ifdef WITH_NETCF +#ifdef WITH_INTERFACE vshPrint(ctl, " Interface"); #endif #ifdef WITH_NWFILTER vshPrint(ctl, " Nwfilter"); #endif +#ifdef WITH_BRIDGE + vshPrint(ctl, " Bridging"); +#endif +#ifdef WITH_NETCF + vshPrint(ctl, " Netcf"); +#endif #ifdef WITH_VIRTUALPORT vshPrint(ctl, " VirtualPort"); #endif -- 1.7.10.4

3 4

[libvirt] [PATCH] esx_storage_driver: Add API to upload volumes (virStorageVolUpload for ESX storage driver)
by Ata Bohra 01 Jul '12

01 Jul '12

Patch to add API to upload Volume contents using ESX driver. As stream driver is not supported for ESX, I have used libcurl to transfer the volume, second, using flags here to pass file descriptor of the source file. diff --git a/src/esx/esx_storage_driver.c b/src/esx/esx_storage_driver.c index 9b64891..0519efc 100644 --- a/src/esx/esx_storage_driver.c +++ b/src/esx/esx_storage_driver.c @@ -1643,6 +1643,94 @@ esxStoragePoolIsPersistent(virStoragePoolPtr pool ATTRIBUTE_UNUSED) return 1; } +/** + * esxStorageVolumeUpload + * + * Upload file contents to a given volume. + * Method uses libcurl to POST the contents to ESX server. + * flags is used to pass file descriptor of the + * source file to be read. + */ +static int +esxStorageVolumeUpload(virStorageVolPtr volume, + virStreamPtr stream, + unsigned long long offset, + unsigned long long length, + unsigned int flags) +{ + esxPrivate *priv = volume->conn->privateData; + int err = -1; + char *escapedDatastoreName = NULL; + char *url = NULL; + virBuffer buffer = VIR_BUFFER_INITIALIZER; + int fd = (int)flags; + + /** + * Use CURL module to transfer the file to ESX. + * Use flags to pass the file handle. + */ + const char *unescapedDatastoreName = virStorageVolGetPoolName(volume); + const char *volumeName = virStorageVolGetName(volume); + + if (!unescapedDatastoreName) { + goto cleanup; + } + + if (volume->conn != stream->conn) { + virReportInvalidArg(conn, + _("conn in %s must match stream connection."), + __FUNCTION__); + goto cleanup; + } + + virBufferAsprintf(&buffer, "%s://%s:%d/folder/", + priv->parsedUri->transport, + volume->conn->uri->server, volume->conn->uri->port); + + escapedDatastoreName = esxUtil_EscapeDatastoreItem(unescapedDatastoreName); + + if (escapedDatastoreName == NULL) { + goto cleanup; + } + + /* Prepare URL to upload file */ + virBufferAdd(&buffer, volumeName, strlen(volumeName)); + virBufferAddLit(&buffer, "?dcPath="); + virBufferURIEncodeString(&buffer, priv->primary->datacenterPath); + virBufferAddLit(&buffer, "&dsName="); + virBufferURIEncodeString(&buffer, escapedDatastoreName); + + if (virBufferError(&buffer)) { + virReportOOMError(); + goto cleanup; + } + + url = virBufferContentAndReset(&buffer); + + if (esxVI_EnsureSession(priv->primary) < 0) { + return -1; + } + + /* Upload file */ + if (esxVI_CURL_UploadFile(priv->primary->curl, url, + fd, offset, length) < 0) { + goto cleanup; + } + + err = 0; + + cleanup: + + if (url == NULL) { + virBufferFreeAndReset(&buffer); + } + + VIR_FREE(escapedDatastoreName); + VIR_FREE(url); + + return err; + +} static virStorageDriver esxStorageDriver = { @@ -1673,6 +1761,7 @@ static virStorageDriver esxStorageDriver = { .volGetInfo = esxStorageVolumeGetInfo, /* 0.8.4 */ .volGetXMLDesc = esxStorageVolumeGetXMLDesc, /* 0.8.4 */ .volGetPath = esxStorageVolumeGetPath, /* 0.8.4 */ + .volUpload = esxStorageVolumeUpload, /* 0.9.x */ .poolIsActive = esxStoragePoolIsActive, /* 0.8.2 */ .poolIsPersistent = esxStoragePoolIsPersistent, /* 0.8.2 */ }; diff --git a/src/esx/esx_vi.c b/src/esx/esx_vi.c index 5b5ab69..831ae36 100644 --- a/src/esx/esx_vi.c +++ b/src/esx/esx_vi.c @@ -425,7 +425,67 @@ esxVI_CURL_Upload(esxVI_CURL *curl, const char *url, const char *content) return 0; } +static size_t +esxVI_CURL_read_callback(void *ptr, size_t size, size_t nmemb, void *stream) +{ + size_t retcode = read((int) stream, ptr, size*nmemb); + + VIR_DEBUG("Read bytes: %d", retcode); + + return retcode; +} + +int +esxVI_CURL_UploadFile(esxVI_CURL *curl, + const char *url, + int fd, + unsigned long long offset, + unsigned long long length) +{ + int error = -1; + int responseCode = 0; + + if (fd < 0) { + ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, "Invalid file descriptor: %d", + fd); + goto cleanup; + } + + if (lseek(fd, (off_t) offset, SEEK_SET) < 0) { + virReportSystemError(errno, "%s", + _("Cannot seek file descriptor ")); + goto cleanup; + } + + virMutexLock(&curl->lock); + + /* set CURL headers */ + curl_easy_setopt(curl->handle, CURLOPT_UPLOAD, 1L); + curl_easy_setopt(curl->handle, CURLOPT_URL, url); + curl_easy_setopt(curl->handle, CURLOPT_READDATA, fd); + curl_easy_setopt(curl->handle, CURLOPT_INFILESIZE_LARGE, + (curl_off_t) length); + curl_easy_setopt(curl->handle, CURLOPT_READFUNCTION, + esxVI_CURL_read_callback); + responseCode = esxVI_CURL_Perform(curl, url); + + virMutexUnlock(&curl->lock); + + if (responseCode < 0) { + goto cleanup; + } else if (responseCode != 200) { + ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, + _("HTTP response code %d for upload to '%s'"), + responseCode, url); + goto cleanup; + } + error = 0; + + cleanup: + + return error; +} /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * SharedCURL diff --git a/src/esx/esx_vi.h b/src/esx/esx_vi.h index 78d3986..f95ad1d 100644 --- a/src/esx/esx_vi.h +++ b/src/esx/esx_vi.h @@ -92,7 +92,6 @@ typedef struct _esxVI_EnumerationValue esxVI_EnumerationValue; typedef struct _esxVI_List esxVI_List; - enum _esxVI_APIVersion { esxVI_APIVersion_Undefined = 0, esxVI_APIVersion_Unknown, @@ -167,6 +166,9 @@ void esxVI_CURL_Free(esxVI_CURL **curl); int esxVI_CURL_Connect(esxVI_CURL *curl, esxUtil_ParsedUri *parsedUri); int esxVI_CURL_Download(esxVI_CURL *curl, const char *url, char **content); int esxVI_CURL_Upload(esxVI_CURL *curl, const char *url, const char *content); +int esxVI_CURL_UploadFile(esxVI_CURL *curl, const char *url, int fd, + unsigned long long offset, + unsigned long long length); diff --git a/src/libvirt.c b/src/libvirt.c index 0aa50cb..508593b 100644 --- a/src/libvirt.c +++ b/src/libvirt.c @@ -12537,6 +12537,28 @@ error: return NULL; } +/** + * virStorageVolGetPoolName: + * @vol: pointer to storage volume + * + * Fetch the storage volume pool name. + * + * Returns the pool name, or NULL on error + */ +const char* +virStorageVolGetPoolName(virStorageVolPtr vol) +{ + VIR_DEBUG("vol=%p", vol); + + virResetLastError(); + + if (!VIR_IS_STORAGE_VOL(vol)) { + virLibStorageVolError(VIR_ERR_INVALID_STORAGE_VOL, __FUNCTION__); + virDispatchError(NULL); + return NULL; + } + return vol->pool; +} /** * virStorageVolGetName: diff --git a/src/libvirt_public.syms b/src/libvirt_public.syms index 2913a81..cdfbf15 100644 --- a/src/libvirt_public.syms +++ b/src/libvirt_public.syms @@ -542,6 +542,7 @@ LIBVIRT_0.9.13 { virDomainSnapshotIsCurrent; virDomainSnapshotListAllChildren; virDomainSnapshotRef; + virStorageVolGetPoolName; } LIBVIRT_0.9.11; # .... define new API here using predicted next version number .... Thanks! Ata Attachment: 1. StorageVolUpload.diff

2 1

[libvirt] Fwd: Re: Intend to add OVA installation API
by Bob Cochran 30 Jun '12

30 Jun '12

Ooops, I should have sent this to the list. I want to support Doug's suggestion, thanks. Bob Cochran -------- Original Message -------- Subject: Re: [libvirt] Intend to add OVA installation API Date: Sun, 24 Jun 2012 22:45:15 -0400 From: Bob Cochran <bcochran13(a)verizon.net> To: Doug Goldstein <cardoe(a)cardoe.com> On 6/24/12 6:27 PM, Doug Goldstein wrote: > On Sun, Jun 24, 2012 at 5:05 PM, Ata Bohra<ata.husain(a)hotmail.com> wrote: >> Thanks Doug for your suggestions. >> >> I believe you are correct about the relation between OVA and OVF. But I am >> not 100 % possitive about your suggestion: "defining an appropriate domain >> in libvirt". To understand better I am sharing more details about my plans: >> >> 1. Enhance libvirt interface code (libvirt.c) to provide a >> domain-independent routine: virDomainCreateOVA, an alternate API to create >> domain. >> To make client code real simple, this routine can take ova path as input >> and internally strip the OVA to extract required details. (planning to >> define a struct to hold all essential >> information). >> 2. Second, to enhance ESX driver to perform ESX specfic calls. >> >> Given OVA is a tar file, the parsing is just another file open/read >> operation; it would be simple to perform it inside domain_conf.c (infact I >> have written a parser to strip information off OVA already). >> >> Hope to get some comments/suggestions on above steps. >> >> Thanks! >> Ata > Right. I'm suggesting you don't go that route and approach the problem > from another angle. I did a little Googling since my last e-mail to at > least make sure I understood the basics. So an OVF looks like the > following: > > virtualappliance/package.ovf > virtualappliance/disk1.vmdk > virtualappliance/disk2.vmdk > virtualappliance/cdrom.iso > virtualappliance/en-US-resources.xml > > An OVA would simply be a tar of the above and named > virtualappliance.ova package.ovf is an XML file containing the > description of the hardware of the virtual machine, much like the XML > that libvirt stores about domains. While en-US-resources.xml would be > the US English descriptions of the machine and its hardware. > > I'm suggesting you write an application that transforms package.ovf > into libvirt's own domain XML format and simply call > virDomainDefineXML() rather than adding API to libvirt itself. You > could then further extend the application to allow you to take a > libvirt domain and export it as a OVA. > > Looking at VMWare and Xen, they both treat OVA/OVF as a foreign format > and require a converter application to import them to their native > internals so it wouldn't be much different than their approach. > > Just my 2 cents. I really like what Doug suggests here. Bob Cochran

3 3

[libvirt] nwfilter: Fix memory leak
by Stefan Berger 29 Jun '12

29 Jun '12

Below patch fixes this coverity report: /libvirt/src/conf/nwfilter_conf.c:382: leaked_storage: Variable "varAccess" going out of scope leaks the storage it points to. --- src/conf/nwfilter_conf.c | 1 + 1 file changed, 1 insertion(+) Index: libvirt-acl/src/conf/nwfilter_conf.c =================================================================== --- libvirt-acl.orig/src/conf/nwfilter_conf.c +++ libvirt-acl/src/conf/nwfilter_conf.c @@ -379,6 +379,7 @@ virNWFilterRuleDefAddVar(virNWFilterRule if (VIR_EXPAND_N(nwf->varAccess, nwf->nVarAccess, 1) < 0) { virReportOOMError(); + virNWFilterVarAccessFree(varAccess); return -1; }

2 2

[libvirt] [PATCH] Remove sub-mounts under /dev when starting an LXC container
by Daniel P. Berrange 29 Jun '12

29 Jun '12

From: "Daniel P. Berrange" <berrange(a)redhat.com> Since we are mounting a new /dev in the container, we must remove any sub-mounts like /dev/shm, /dev/mqueue, etc, otherwise they'll be recorded in /proc/mounts, but not be accessible to applications. --- src/lxc/lxc_container.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/lxc/lxc_container.c b/src/lxc/lxc_container.c index 071d8d1..910e82b 100644 --- a/src/lxc/lxc_container.c +++ b/src/lxc/lxc_container.c @@ -1416,10 +1416,11 @@ static int lxcContainerSetupPivotRoot(virDomainDefPtr vmDef, if (lxcContainerPivotRoot(root) < 0) goto cleanup; - /* Gets rid of any existing stuff under /proc, since we need new - * namespace aware versions of those. We must do /proc second - * otherwise we won't find /proc/mounts :-) */ + /* Gets rid of any existing stuff under /proc, /sys & /tmp + * We need new namespace aware versions of those. We must + * do /proc last otherwise we won't find /proc/mounts :-) */ if (lxcContainerUnmountSubtree("/sys", false) < 0 || + lxcContainerUnmountSubtree("/dev", false) < 0 || lxcContainerUnmountSubtree("/proc", false) < 0) goto cleanup; -- 1.7.10.4

2 1

[libvirt] [PATCH] Fix vm's outbound traffic control problem
by Eiichi Tsukata 29 Jun '12

29 Jun '12

Hello, This is a patch to fix vm's outbound traffic control problem. Currently, vm's outbound traffic control by libvirt doesn't go well. This problem was previously discussed at libvir-list ML, however it seems that there isn't still any answer to the problem. http://www.redhat.com/archives/libvir-list/2011-August/msg00333.html I measured Guest(with virtio-net) to Host TCP throughput with the command "netperf -H". Here are the outbound QoS parameters and the results. outbound average rate[kilobytes/s] : Guest to Host throughput[Mbit/s] ====================================================================== 1024 (8Mbit/s) : 4.56 2048 (16Mbit/s) : 3.29 4096 (32Mbit/s) : 3.35 8192 (64Mbit/s) : 3.95 16384 (128Mbit/s) : 4.08 32768 (256Mbit/s) : 3.94 65536 (512Mbit/s) : 3.23 The outbound traffic goes down unreasonably and is even not controled. The cause of this problem is too large mtu value in "tc filter" command run by libvirt. The command uses burst value to set mtu and the burst is equal to average rate value if it's not set. This value is too large. For example if the average rate is set to 1024 kilobytes/s, the mtu value is set to 1024 kilobytes. That's too large compared to the size of network packets. Here libvirt applies tc ingress filter to Host's vnet(tun) device. Tc ingress filter is implemented with TBF(Token Buckets Filter) algorithm. TBF uses mtu value to calculate the amount of token consumed by each packet. With too large mtu value, the token consumption rate is set too large. This leads to token starvation and deterioration of TCP throughput. Then, should we use the default mtu value 2 kilobytes? The anser is No, because Guest with virtio-net device uses 65536 bytes as mtu to transmit packets to Host, and the tc filter with the default mtu value 2k drops packets whose size is larger than 2k. So, the most packets is droped and again leads to deterioration of TCP throughput. The appropriate mtu value is 65536 bytes which is equal to the maximum value of network interface device defined in <linux/netdevice.h>. The value is not so large that it causes token starvation and not so small that it drops most packets. Therefore this patch set the mtu value to 64kb(== 65535 bytes). Again, here are the outbound QoS parameters and the TCP throughput with the libvirt patched. outbound average rate[kilobytes/s] : Guest to Host throughput[Mbit/s] ====================================================================== 1024 (8Mbit/s) : 8.22 2048 (16Mbit/s) : 16.42 4096 (32Mbit/s) : 32.93 8192 (64Mbit/s) : 66.85 16384 (128Mbit/s) : 133.88 32768 (256Mbit/s) : 271.01 65536 (512Mbit/s) : 547.32 The outbound traffic conforms to the given limit. Thank you, Signed-off-by: Eiichi Tsukata <eiichi.tsukata.xh(a)hitachi.com> --- AUTHORS | 1 + src/util/virnetdevbandwidth.c | 2 +- 2 files changed, 2 insertions(+), 1 deletions(-) diff --git a/AUTHORS b/AUTHORS index b876ee6..375db24 100644 --- a/AUTHORS +++ b/AUTHORS @@ -246,6 +246,7 @@ Patches have also been contributed by: Gerd Hoffmann <kraxel(a)redhat.com> Viktor Mihajlovski <mihajlov(a)linux.vnet.ibm.com> Thang Pham <thang.pham(a)us.ibm.com> + Eiichi Tsukata <eiichi.tsukata.xh(a)hitachi.com> [....send patches to get your name here....] diff --git a/src/util/virnetdevbandwidth.c b/src/util/virnetdevbandwidth.c index b9bd2e3..93df5c1 100644 --- a/src/util/virnetdevbandwidth.c +++ b/src/util/virnetdevbandwidth.c @@ -136,7 +136,7 @@ virNetDevBandwidthSet(const char *ifname, virCommandAddArgList(cmd, "filter", "add", "dev", ifname, "parent", "ffff:", "protocol", "ip", "u32", "match", "ip", "src", "0.0.0.0/0", "police", "rate", average, - "burst", burst, "mtu", burst, "drop", "flowid", + "burst", burst, "mtu", "64kb", "drop", "flowid", ":1", NULL); if (virCommandRun(cmd, NULL) < 0) -- 1.7.4.4 -- Eiichi Tsukata Linux Technology Center Hitachi, Ltd., Yokohama Research Laboratory E-mail: eiichi.tsukata.xh(a)hitachi.com

3 2

[libvirt] [PATCH] network_conf: Don't free uninitialized pointers while parsing DNS SRV
by Peter Krempa 29 Jun '12

29 Jun '12

If the user specified invalid protocol type in a network's SRV record the error path ended up in freeing uninitialized pointers causing a daemon crash. *network_conf.c: virNetworkDNSSrvDefParseXML(): initialize local variables --- src/conf/network_conf.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/conf/network_conf.c b/src/conf/network_conf.c index 60cd888..515bc36 100644 --- a/src/conf/network_conf.c +++ b/src/conf/network_conf.c @@ -574,10 +574,10 @@ virNetworkDNSSrvDefParseXML(virNetworkDNSDefPtr def, xmlNodePtr cur, xmlXPathContextPtr ctxt) { - char *domain; - char *service; - char *protocol; - char *target; + char *domain = NULL; + char *service = NULL; + char *protocol = NULL; + char *target = NULL; int port; int priority; int weight; -- 1.7.8.6

3 3

[libvirt] [PATCH] virsh: Cleanup virsh -V output
by Doug Goldstein 28 Jun '12

28 Jun '12

Fixed up virsh -V output by removing invalid WITH_PROXY & WITH_ONE checks, adding Hyper-V check and fixing the DTrace check. Signed-off-by: Doug Goldstein <cardoe(a)cardoe.com> --- tools/virsh.c | 9 +++------ 1 files changed, 3 insertions(+), 6 deletions(-) diff --git a/tools/virsh.c b/tools/virsh.c index 2b4cb2c..9fccd2d 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -20636,8 +20636,8 @@ vshShowVersion(vshControl *ctl ATTRIBUTE_UNUSED) #ifdef WITH_PHYP vshPrint(ctl, " PHYP"); #endif -#ifdef WITH_ONE - vshPrint(ctl, " ONE"); +#ifdef WITH_HYPERV + vshPrint(ctl, " Hyper-V"); #endif #ifdef WITH_TEST vshPrint(ctl, " Test"); @@ -20648,9 +20648,6 @@ vshShowVersion(vshControl *ctl ATTRIBUTE_UNUSED) #ifdef WITH_REMOTE vshPrint(ctl, " Remote"); #endif -#ifdef WITH_PROXY - vshPrint(ctl, " Proxy"); -#endif #ifdef WITH_LIBVIRTD vshPrint(ctl, " Daemon"); #endif @@ -20711,7 +20708,7 @@ vshShowVersion(vshControl *ctl ATTRIBUTE_UNUSED) #ifdef ENABLE_DEBUG vshPrint(ctl, " Debug"); #endif -#ifdef WITH_DTRACE +#ifdef WITH_DTRACE_PROBES vshPrint(ctl, " DTrace"); #endif #ifdef USE_READLINE -- 1.7.3.4

3 5

[libvirt] [PATCH] conf: Don't shadow error from virGetDomain()
by Peter Krempa 28 Jun '12

28 Jun '12

virGetDomain() does a good job of reporting errors itself. This patch removes shadowing of that error in virDomainListPopulate(). --- src/conf/virdomainlist.c | 11 ++++------- 1 files changed, 4 insertions(+), 7 deletions(-) diff --git a/src/conf/virdomainlist.c b/src/conf/virdomainlist.c index f9fbde8..2b0b878 100644 --- a/src/conf/virdomainlist.c +++ b/src/conf/virdomainlist.c @@ -117,8 +117,10 @@ virDomainListPopulate(void *payload, return; } - if (!(dom = virGetDomain(data->conn, vm->def->name, vm->def->uuid))) - goto no_memory; + if (!(dom = virGetDomain(data->conn, vm->def->name, vm->def->uuid))) { + data->error = true; + goto cleanup; + } dom->id = vm->def->id; @@ -127,11 +129,6 @@ virDomainListPopulate(void *payload, cleanup: virDomainObjUnlock(vm); return; - -no_memory: - virReportOOMError(); - data->error = true; - goto cleanup; } #undef MATCH -- 1.7.8.6

2 2

[libvirt] [PATCHv4 0/6] API for atomic listing of guests (rest of the series)
by Peter Krempa 28 Jun '12

28 Jun '12

This is a respin of patches that have not yet been commited. Peter Krempa (6): virsh: Rename namesorter to vshNameSorter and clean up indentation virsh: add support for virConnectListAllDomains and clean up cmdList vbox: Add support for virConnectListAllDomains() hyperv: Add implementation for virConnectListAllDomains() esx: Add implementation for virConnectListAllDomains() maint: include ignore-value in internal.h src/conf/domain_audit.c | 1 - src/conf/domain_conf.c | 1 - src/conf/virdomainlist.c | 1 - src/esx/esx_driver.c | 194 +++++++++++++ src/hyperv/hyperv_driver.c | 136 +++++++++ src/internal.h | 1 + src/network/bridge_driver.c | 1 - src/node_device/node_device_hal.c | 1 - src/openvz/openvz_conf.c | 1 - src/qemu/qemu_domain.c | 1 - src/qemu/qemu_monitor_json.c | 1 - src/util/command.c | 1 - src/util/event_poll.c | 1 - src/util/logging.c | 1 - src/util/memory.c | 1 - src/util/threadpool.c | 1 - src/util/virfile.h | 1 - src/util/virnetdevbandwidth.c | 1 - src/vbox/vbox_tmpl.c | 170 +++++++++++ src/xenapi/xenapi_driver.c | 1 - tests/shunloadtest.c | 1 - tools/virsh.c | 575 +++++++++++++++++++++++++------------ tools/virsh.pod | 92 +++++-- 23 files changed, 962 insertions(+), 223 deletions(-) -- 1.7.8.6

3 13

[libvirt] Fwd: In Use tracker for network and pci-passthrough devices
by Shradha Shah 28 Jun '12

28 Jun '12

This is a conversation that I started with Laine Stump for the implementation of the in-use tracker for network and pci devices. I want to make this conversation more public in order to receive everyone's view on the topic. I will also post the responses I got from Laine and Osier Yang. Many Thanks, Regards, Shradha Shah -------- Original Message -------- Subject: In Use tracker for network and pci-passthrough devices Date: Tue, 26 Jun 2012 12:23:52 +0100 From: Shradha Shah <sshah(a)solarflare.com> To: Laine Stump <laine(a)laine.org> Laine, I have submitted my v2 patches for forward mode='hostdev' and am planning to work on the in-use tracker for network and pci-passthrough devices. I am unable to wrap my head around how I should be implementing this functionality. I am unable to decide at what level I should be implementing this (network, domain or qemu). May I ask for your guidance in order to implement this functionality? -- Many Thanks, Regards, Shradha Shah

2 6

[libvirt] adding more element to <interface>
by Rashid Zamani 28 Jun '12

28 Jun '12

Hello people, I am considering adding more elements into <interface> name space in order to support more features of different hypervisors (specificly qemu). I have discuss this<https://www.redhat.com/archives/libvirt-users/2012-June/msg00141.html>in user thread, and I have been told to propose an xml syntax for it. What exactly I have in mind is adding elements like <dns>, <hostname> and etc. to set the these variables from within the <interface> instead of having <qemu:commandline> at the end of the file, in case of using qemu. So the final xml file should look something like below: <domain type='qemu' xmlns:qemu='http://libvirt.org/schemas/domain/qemu/1.0'> . . . <interface type='user'> <mac address=/> <model type=/> <bandwidth> </bandwidth> <address=/>* <**hostname=/> <dns=/> * . . . </interface> . . . </domain> I am wondering, firstly if such a thing is plausible. And if so, how I can contribute and where I can start from. Thank you in advance. Zamani

2 1