- Devel - libvirt List Archives

[Libvir] [RFC] 3/3 Driver functions for linux container support
by Dave Leskovec 21 Feb '08

21 Feb '08

This patch contains the new files lxc_driver.c and lxc_driver.h Index: src/lxc_driver.c =================================================================== RCS file: src/lxc_driver.c diff -N src/lxc_driver.c --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ src/lxc_driver.c 19 Feb 2008 18:54:30 -0000 @@ -0,0 +1,472 @@ +/* + * Copyright IBM Corp. 2008 + * + * lxc_driver.c: linux container driver functions + * + * Authors: + * David L. Leskovec <dlesko at linux.vnet.ibm.com> + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#include <config.h> + +#ifdef WITH_LXC + +#include <sched.h> +#include <sys/utsname.h> +#include <string.h> +#include <sys/types.h> +#include <unistd.h> +#include <wait.h> + +#include "lxc_conf.h" +#include "lxc_driver.h" +#include "driver.h" +#include "internal.h" + +/* debug macros */ +#define DEBUG(fmt,...) VIR_DEBUG(__FILE__, fmt, __VA_ARGS__) +#define DEBUG0(msg) VIR_DEBUG(__FILE__, "%s", msg) + +static int lxcStartup(virConnectPtr conn); +static int lxcShutdown(virConnectPtr conn); + +/* Functions */ +static int lxcDummyChild( void *argv ATTRIBUTE_UNUSED ) +{ + exit(0); +} + +static int lxcCheckContainerSupport( void ) +{ + int rc = 0; + int flags = CLONE_NEWPID|CLONE_NEWNS|CLONE_NEWUTS|CLONE_NEWUSER| + CLONE_NEWIPC|SIGCHLD; + int cpid; + char *childStack; + char *stack; + int childStatus; + + stack = malloc(getpagesize() * 4); + if(!stack) { + DEBUG0("Unable to allocate stack"); + rc = -1; + goto check_complete; + } + + childStack = stack + (getpagesize() * 4); + + cpid = clone(lxcDummyChild, childStack, flags, NULL); + if ((0 > cpid) && (EINVAL == errno)) { + DEBUG0("clone call returned EINVAL, container support is not enabled"); + rc = -1; + } else { + waitpid(cpid, &childStatus, 0); + } + + free(stack); + +check_complete: + return rc; +} + +static virDrvOpenStatus lxcOpen(virConnectPtr conn, + xmlURIPtr uri, + virConnectAuthPtr auth ATTRIBUTE_UNUSED, + int flags ATTRIBUTE_UNUSED) +{ + uid_t uid = getuid(); + + /* Check that the user is root */ + if (0 != uid) { + goto declineConnection; + } + + /* Verify uri was specified */ + if ((NULL == uri) || (NULL == uri->scheme)) { + goto declineConnection; + } + + /* Check that the uri scheme is lxc */ + if (STRNEQ(uri->scheme, "lxc")) { + goto declineConnection; + } + + /* Check that this is a container enabled kernel */ + if(0 != lxcCheckContainerSupport()) { + goto declineConnection; + } + + /* initialize driver data */ + if (0 > lxcStartup(conn)) { + goto declineConnection; + } + + return VIR_DRV_OPEN_SUCCESS; + +declineConnection: + return VIR_DRV_OPEN_DECLINED; +} + +static int lxcClose(virConnectPtr conn) +{ + return lxcShutdown(conn); +} + +static virDomainPtr lxcDomainLookupByID(virConnectPtr conn, + int id) +{ + lxc_driver_t *driver = (lxc_driver_t *)conn->privateData; + lxc_vm_t *vm = lxcFindVMByID(driver, id); + virDomainPtr dom; + + if (!vm) { + lxcError(conn, NULL, VIR_ERR_NO_DOMAIN, NULL); + return NULL; + } + + dom = virGetDomain(conn, vm->def->name, vm->def->uuid); + if (dom) { + dom->id = vm->id; + } + + return dom; +} + +static virDomainPtr lxcDomainLookupByUUID(virConnectPtr conn, + const unsigned char *uuid) +{ + lxc_driver_t *driver = (lxc_driver_t *)conn->privateData; + lxc_vm_t *vm = lxcFindVMByUUID(driver, uuid); + virDomainPtr dom; + + if (!vm) { + lxcError(conn, NULL, VIR_ERR_NO_DOMAIN, NULL); + return NULL; + } + + dom = virGetDomain(conn, vm->def->name, vm->def->uuid); + if (dom) { + dom->id = vm->id; + } + + return dom; +} + +static virDomainPtr lxcDomainLookupByName(virConnectPtr conn, + const char *name) +{ + lxc_driver_t *driver = (lxc_driver_t *)conn->privateData; + lxc_vm_t *vm = lxcFindVMByName(driver, name); + virDomainPtr dom; + + if (!vm) { + lxcError(conn, NULL, VIR_ERR_NO_DOMAIN, NULL); + return NULL; + } + + dom = virGetDomain(conn, vm->def->name, vm->def->uuid); + if (dom) { + dom->id = vm->id; + } + + return dom; +} + +static int lxcListDomains(virConnectPtr conn, int *ids, int nids) +{ + lxc_driver_t *driver = (lxc_driver_t *)conn->privateData; + lxc_vm_t *vm; + int numDoms = 0; + + for (vm = driver->vms; vm && (numDoms < nids); vm = vm->next) { + if (lxcIsActiveVM(vm)) { + ids[numDoms] = vm->id; + numDoms++; + } + } + + return numDoms; +} + +static int lxcNumDomains(virConnectPtr conn) +{ + lxc_driver_t *driver = (lxc_driver_t *)conn->privateData; + return driver->nactivevms; +} + +static int lxcListDefinedDomains(virConnectPtr conn, + char **const names, int nnames) +{ + lxc_driver_t *driver = (lxc_driver_t *)conn->privateData; + lxc_vm_t *vm; + int numDoms = 0; + int i; + + for (vm = driver->vms; vm && (numDoms < nnames); numDoms++) { + if (!lxcIsActiveVM(vm)) { + if (!(names[numDoms] = strdup(vm->def->name))) { + lxcError(conn, NULL, VIR_ERR_NO_MEMORY, "names"); + goto cleanup; + } + } + + vm = vm->next; + } + + return numDoms; + + cleanup: + for (i = 0 ; i < numDoms ; i++) { + free(names[i]); + } + + return -1; +} + + +static int lxcNumDefinedDomains(virConnectPtr conn) +{ + lxc_driver_t *driver = (lxc_driver_t *)conn->privateData; + return driver->ninactivevms; +} + +static virDomainPtr lxcDomainDefine(virConnectPtr conn, const char *xml) +{ + lxc_driver_t *driver = (lxc_driver_t *)conn->privateData; + lxc_vm_def_t *def; + lxc_vm_t *vm; + virDomainPtr dom; + + if (!(def = lxcParseVMDef(conn, xml, NULL))) { + return NULL; + } + + if (!(vm = lxcAssignVMDef(conn, driver, def))) { + lxcFreeVMDef(def); + return NULL; + } + + if (lxcSaveVMDef(conn, driver, vm, def) < 0) { + lxcRemoveInactiveVM(driver, vm); + return NULL; + } + + dom = virGetDomain(conn, vm->def->name, vm->def->uuid); + if (dom) { + dom->id = vm->id; + } + + return dom; +} + +static int lxcDomainUndefine(virDomainPtr dom) +{ + lxc_driver_t *driver = (lxc_driver_t *)dom->conn->privateData; + lxc_vm_t *vm = lxcFindVMByUUID(driver, dom->uuid); + + if (!vm) { + lxcError(dom->conn, dom, VIR_ERR_INVALID_DOMAIN, + "no domain with matching uuid"); + return -1; + } + + if (lxcIsActiveVM(vm)) { + lxcError(dom->conn, dom, VIR_ERR_INTERNAL_ERROR, + "cannot delete active domain"); + return -1; + } + + if (lxcDeleteConfig(dom->conn, driver, vm->configFile, vm->def->name) < 0) { + return -1; + } + + vm->configFile[0] = '\0'; + + lxcRemoveInactiveVM(driver, vm); + + return 0; +} + +static int lxcDomainGetInfo(virDomainPtr dom, + virDomainInfoPtr info) +{ + lxc_driver_t *driver = (lxc_driver_t *)dom->conn->privateData; + lxc_vm_t *vm = lxcFindVMByUUID(driver, dom->uuid); + + if (!vm) { + lxcError(dom->conn, dom, VIR_ERR_INVALID_DOMAIN, + "no domain with matching uuid"); + return -1; + } + + info->state = vm->state; + + if (!lxcIsActiveVM(vm)) { + info->cpuTime = 0; + } else { + info->cpuTime = 0; + } + + info->maxMem = vm->def->maxMemory; + info->memory = vm->def->maxMemory; + info->nrVirtCpu = 1; + + return 0; +} + +static char *lxcGetOSType(virDomainPtr dom ATTRIBUTE_UNUSED) +{ + /* Linux containers only run on Linux */ + return strdup("linux"); +} + +static char *lxcDomainDumpXML(virDomainPtr dom, + int flags ATTRIBUTE_UNUSED) +{ + lxc_driver_t *driver = (lxc_driver_t *)dom->conn->privateData; + lxc_vm_t *vm = lxcFindVMByUUID(driver, dom->uuid); + + if (!vm) { + lxcError(dom->conn, dom, VIR_ERR_INVALID_DOMAIN, + "no domain with matching uuid"); + return NULL; + } + + return lxcGenerateXML(dom->conn, driver, vm, vm->def, 1); +} + +static int lxcStartup(virConnectPtr conn) +{ + lxc_driver_t *driver; + + driver = calloc(1, sizeof(lxc_driver_t)); + if (NULL == driver) { + return -1; + } + + conn->privateData = driver; + + /* Call function to load lxc driver configuration information */ + if (lxcLoadDriverConfig(conn) < 0) { + lxcShutdown(conn); + return -1; + } + + /* Call function to load the container configuration files */ + if (lxcLoadContainerInfo(conn) < 0) { + lxcShutdown(conn); + return -1; + } + + return 0; +} + +static void lxcFreeDriver(lxc_driver_t *driver) +{ + free(driver->configDir); + free(driver); +} + +static int lxcShutdown(virConnectPtr conn) +{ + lxc_driver_t *driver = (lxc_driver_t *)conn->privateData; + lxc_vm_t *vms = driver->vms; + + lxcFreeVMs(vms); + driver->vms = NULL; + lxcFreeDriver(driver); + conn->privateData = NULL; + + return 0; +} + +/* Function Tables */ +static virDriver lxcDriver = { + VIR_DRV_LXC, /* the number virDrvNo */ + "LXC", /* the name of the driver */ + LIBVIR_VERSION_NUMBER, /* the version of the backend */ + lxcOpen, /* open */ + lxcClose, /* close */ + NULL, /* supports_feature */ + NULL, /* type */ + NULL, /* version */ + NULL, /* getHostname */ + NULL, /* getURI */ + NULL, /* getMaxVcpus */ + NULL, /* nodeGetInfo */ + NULL, /* getCapabilities */ + lxcListDomains, /* listDomains */ + lxcNumDomains, /* numOfDomains */ + NULL/*lxcDomainCreateLinux*/, /* domainCreateLinux */ + lxcDomainLookupByID, /* domainLookupByID */ + lxcDomainLookupByUUID, /* domainLookupByUUID */ + lxcDomainLookupByName, /* domainLookupByName */ + NULL, /* domainSuspend */ + NULL, /* domainResume */ + NULL, /* domainShutdown */ + NULL, /* domainReboot */ + NULL, /* domainDestroy */ + lxcGetOSType, /* domainGetOSType */ + NULL, /* domainGetMaxMemory */ + NULL, /* domainSetMaxMemory */ + NULL, /* domainSetMemory */ + lxcDomainGetInfo, /* domainGetInfo */ + NULL, /* domainSave */ + NULL, /* domainRestore */ + NULL, /* domainCoreDump */ + NULL, /* domainSetVcpus */ + NULL, /* domainPinVcpu */ + NULL, /* domainGetVcpus */ + NULL, /* domainGetMaxVcpus */ + lxcDomainDumpXML, /* domainDumpXML */ + lxcListDefinedDomains, /* listDefinedDomains */ + lxcNumDefinedDomains, /* numOfDefinedDomains */ + NULL, /* domainCreate */ + lxcDomainDefine, /* domainDefineXML */ + lxcDomainUndefine, /* domainUndefine */ + NULL, /* domainAttachDevice */ + NULL, /* domainDetachDevice */ + NULL, /* domainGetAutostart */ + NULL, /* domainSetAutostart */ + NULL, /* domainGetSchedulerType */ + NULL, /* domainGetSchedulerParameters */ + NULL, /* domainSetSchedulerParameters */ + NULL, /* domainMigratePrepare */ + NULL, /* domainMigratePerform */ + NULL, /* domainMigrateFinish */ + NULL, /* domainBlockStats */ + NULL, /* domainInterfaceStats */ + NULL, /* nodeGetCellsFreeMemory */ + NULL, /* getFreeMemory */ +}; + +int lxcRegister(void) +{ + virRegisterDriver(&lxcDriver); + return 0; +} + +#endif /* WITH_LXC */ + +/* + * Local variables: + * indent-tabs-mode: nil + * c-indent-level: 4 + * c-basic-offset: 4 + * tab-width: 4 + * End: + */ Index: src/lxc_driver.h =================================================================== RCS file: src/lxc_driver.h diff -N src/lxc_driver.h --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ src/lxc_driver.h 19 Feb 2008 18:54:30 -0000 @@ -0,0 +1,45 @@ +/* + * Copyright IBM Corp. 2008 + * + * lxc_driver.h: header file for linux container driver functions + * + * Authors: + * David L. Leskovec <dlesko at linux.vnet.ibm.com> + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#ifndef LXC_DRIVER_H +#define LXC_DRIVER_H + +#include <config.h> + +#ifdef WITH_LXC + +/* Function declarations */ +int lxcRegister(void); + +#endif /* WITH_LXC */ + +#endif /* LXC_DRIVER_H */ + +/* + * Local variables: + * indent-tabs-mode: nil + * c-indent-level: 4 + * c-basic-offset: 4 + * tab-width: 4 + * End: + */ -- Best Regards, Dave Leskovec IBM Linux Technology Center Open Virtualization

3 2

[Libvir] [RFC] 2/3 Config functions for managing linux containers
by Dave Leskovec 21 Feb '08

21 Feb '08

This patch contains the new files lxc_conf.c and lxc_conf.h Index: src/lxc_conf.c =================================================================== RCS file: src/lxc_conf.c diff -N src/lxc_conf.c --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ src/lxc_conf.c 20 Feb 2008 23:02:14 -0000 @@ -0,0 +1,902 @@ +/* + * Copyright IBM Corp. 2008 + * + * lxc_conf.c: config functions for managing linux containers + * + * Authors: + * David L. Leskovec <dlesko at linux.vnet.ibm.com> + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * + */ + +/* includes */ +#include <config.h> + +#ifdef WITH_LXC + +#include <dirent.h> +#include <errno.h> +#include <fcntl.h> +#include <string.h> +#include <unistd.h> + +#include <libxml/parser.h> +#include <libxml/tree.h> +#include <libxml/uri.h> +#include <libxml/xpath.h> + +#include "buf.h" +#include "util.h" +#include "uuid.h" + +#include "lxc_conf.h" + +/* debug macros */ +#define DEBUG(fmt,...) VIR_DEBUG(__FILE__, fmt, __VA_ARGS__) +#define DEBUG0(msg) VIR_DEBUG(__FILE__, "%s", msg) + +/* Functions */ +void lxcError(virConnectPtr conn, virDomainPtr dom, int code, + const char *fmt, ...) +{ + va_list args; + char errorMessage[LXC_MAX_ERROR_LEN]; + const char *codeErrorMessage; + + if (fmt) { + va_start(args, fmt); + vsnprintf(errorMessage, LXC_MAX_ERROR_LEN-1, fmt, args); + va_end(args); + } else { + errorMessage[0] = '\0'; + } + + codeErrorMessage = __virErrorMsg(code, fmt); + __virRaiseError(conn, dom, NULL, VIR_FROM_LXC, code, VIR_ERR_ERROR, + codeErrorMessage, errorMessage, NULL, 0, 0, + codeErrorMessage, errorMessage); +} + +static inline int lxcIsEmptyXPathStringObj(xmlXPathObjectPtr xpathObj) +{ + if ((xpathObj == NULL) || + (xpathObj->type != XPATH_STRING) || + (xpathObj->stringval == NULL) || + (xpathObj->stringval[0] == 0)) { + return 1; + } else { + return 0; + } +} + +static int lxcParseMountXML(virConnectPtr conn, xmlNodePtr nodePtr, + lxc_mount_t *lxcMount) +{ + xmlChar *fsType = NULL; + xmlNodePtr curNode; + xmlChar *mountSource = NULL; + xmlChar *mountTarget = NULL; + int strLen; + int rc = -1; + + if (NULL == (fsType = xmlGetProp(nodePtr, BAD_CAST "type"))) { + lxcError(conn, NULL, VIR_ERR_INTERNAL_ERROR, + "missing filesystem type"); + goto error; + } + + if (xmlStrEqual(fsType, BAD_CAST "mount") == 0) { + lxcError(conn, NULL, VIR_ERR_INTERNAL_ERROR, + "invalid filesystem type"); + goto error; + } + + for (curNode = nodePtr->children; + NULL != curNode; + curNode = curNode->next) { + if (curNode->type != XML_ELEMENT_NODE) { + continue; + } + + if ((mountSource == NULL) && + (xmlStrEqual(curNode->name, BAD_CAST "source"))) { + mountSource = xmlGetProp(curNode, BAD_CAST "dir"); + } else if ((mountTarget == NULL) && + (xmlStrEqual(curNode->name, BAD_CAST "target"))) { + mountTarget = xmlGetProp(curNode, BAD_CAST "dir"); + } + } + + if (mountSource == NULL) { + lxcError(conn, NULL, VIR_ERR_INTERNAL_ERROR, + "missing mount source"); + goto error; + } + + strLen = xmlStrlen(mountSource); + if ((strLen > (PATH_MAX-1)) || (0 == strLen)) { + lxcError(conn, NULL, VIR_ERR_INTERNAL_ERROR, + "empty or invalid mount source"); + goto error; + } + + strncpy(lxcMount->source, (char *)mountSource, strLen); + lxcMount->source[strLen] = '\0'; + + if (mountTarget == NULL) { + lxcError(conn, NULL, VIR_ERR_INTERNAL_ERROR, + "missing mount target"); + goto error; + } + + strLen = xmlStrlen(mountTarget); + if ((strLen > (PATH_MAX-1)) || (0 == strLen)) { + lxcError(conn, NULL, VIR_ERR_INTERNAL_ERROR, + "empty or invalid mount target"); + goto error; + } + + strncpy(lxcMount->target, (char *)mountTarget, strLen); + lxcMount->target[strLen] = '\0'; + + rc = 0; + +error: + xmlFree(mountSource); + xmlFree(mountTarget); + + return rc; +} + +static int lxcParseDomainName(virConnectPtr conn, char **name, + xmlXPathContextPtr contextPtr) +{ + int rc = -1; + xmlXPathObjectPtr xpathObj = NULL; + + xpathObj = xmlXPathEval(BAD_CAST "string(/domain/name[1])", contextPtr); + if (lxcIsEmptyXPathStringObj(xpathObj)) { + lxcError(conn, NULL, VIR_ERR_NO_NAME, NULL); + goto parse_complete; + } + + *name = strdup((const char *)xpathObj->stringval); + + rc = 0; + +parse_complete: + xmlXPathFreeObject(xpathObj); + return rc; +} + +static int lxcParseDomainUUID(virConnectPtr conn, unsigned char *uuid, + xmlXPathContextPtr contextPtr) +{ + int rc = -1; + xmlXPathObjectPtr xpathObj = NULL; + + xpathObj = xmlXPathEval(BAD_CAST "string(/domain/uuid[1])", contextPtr); + if (lxcIsEmptyXPathStringObj(xpathObj)) { + if ((rc = virUUIDGenerate(uuid))) { + lxcError(conn, NULL, VIR_ERR_INTERNAL_ERROR, + "failed to generate uuid: %s", strerror(rc)); + goto parse_complete; + } + } else { + if (virUUIDParse((const char *)xpathObj->stringval, uuid) < 0) { + lxcError(conn, NULL, VIR_ERR_INTERNAL_ERROR, + "invalid uuid element"); + goto parse_complete; + } + } + + rc = 0; + +parse_complete: + xmlXPathFreeObject(xpathObj); + return rc; +} + +static int lxcParseDomainMounts(virConnectPtr conn, + lxc_mount_t **mounts, + xmlXPathContextPtr contextPtr) +{ + int rc = -1; + xmlXPathObjectPtr xpathObj = NULL; + int i; + lxc_mount_t *mountObj; + lxc_mount_t *prevObj = NULL; + int nmounts = 0; + + xpathObj = xmlXPathEval(BAD_CAST "/domain/container/filesystem", + contextPtr); + if ((xpathObj != NULL) && + (xpathObj->type == XPATH_NODESET) && + (xpathObj->nodesetval != NULL) && + (xpathObj->nodesetval->nodeNr >= 0)) { + for (i = 0; i < xpathObj->nodesetval->nodeNr; ++i) { + mountObj = calloc(1, sizeof(lxc_mount_t)); + if (NULL == mountObj) { + lxcError(conn, NULL, VIR_ERR_NO_MEMORY, "mount"); + goto parse_complete; + } + + rc = lxcParseMountXML(conn, xpathObj->nodesetval->nodeTab[i], + mountObj); + if (0 > rc) { + free(mountObj); + goto parse_complete; + } + + /* set the linked list pointers */ + nmounts++; + mountObj->next = NULL; + if (0 == i) { + *mounts = mountObj; + } else { + prevObj->next = mountObj; + } + prevObj = mountObj; + } + } + + rc = nmounts; + +parse_complete: + xmlXPathFreeObject(xpathObj); + + return rc; +} + +static int lxcParseDomainInit(virConnectPtr conn, char* init, xmlXPathContextPtr contextPtr) +{ + int rc = -1; + xmlXPathObjectPtr xpathObj = NULL; + + xpathObj = xmlXPathEval(BAD_CAST "string(/domain/container/init[1])", + contextPtr); + if (lxcIsEmptyXPathStringObj(xpathObj)) { + lxcError(conn, NULL, VIR_ERR_INTERNAL_ERROR, + "invalid or missing init element"); + goto parse_complete; + } + + if (strlen((const char*)xpathObj->stringval) >= PATH_MAX - 1) { + lxcError(conn, NULL, VIR_ERR_INTERNAL_ERROR, + "init string too long"); + goto parse_complete; + } + + strcpy(init, (const char *)xpathObj->stringval); + + rc = 0; + +parse_complete: + xmlXPathFreeObject(xpathObj); + + return rc; +} + + +static int lxcParseDomainTty(virConnectPtr conn, char *tty, xmlXPathContextPtr contextPtr) +{ + int rc = -1; + xmlXPathObjectPtr xpathObj = NULL; + + xpathObj = xmlXPathEval(BAD_CAST "string(/domain/devices/console[1]/@tty)", + contextPtr); + if (lxcIsEmptyXPathStringObj(xpathObj)) { + /* make sure the tty string is empty */ + tty[0] = 0x00; + } else { + /* check the source string length */ + if (strlen((const char*)xpathObj->stringval) >= LXC_MAX_TTY_NAME - 1) { + lxcError(conn, NULL, VIR_ERR_INTERNAL_ERROR, + "tty too long"); + goto parse_complete; + } + strcpy(tty, (const char *)xpathObj->stringval); + } + + rc = 0; + +parse_complete: + xmlXPathFreeObject(xpathObj); + + return rc; +} + +static int lxcParseDomainMemory(virConnectPtr conn, int* memory, xmlXPathContextPtr contextPtr) +{ + int rc = -1; + xmlXPathObjectPtr xpathObj = NULL; + char *endChar = NULL; + + xpathObj = xmlXPathEval(BAD_CAST "string(/domain/memory[1])", contextPtr); + if (lxcIsEmptyXPathStringObj(xpathObj)) { + /* not an error, default to an invalid value so it's not used */ + *memory = -1; + } else { + *memory = strtoll((const char*)xpathObj->stringval, + &endChar, 10); + if ((endChar == (const char*)xpathObj->stringval) || + (*endChar != '\0')) { + lxcError(conn, NULL, VIR_ERR_INTERNAL_ERROR, + "invalid memory value"); + goto parse_complete; + } + } + + rc = 0; + +parse_complete: + xmlXPathFreeObject(xpathObj); + + return rc; +} + +static lxc_vm_def_t * lxcParseXML(virConnectPtr conn, xmlDocPtr docPtr) +{ + xmlNodePtr rootNodePtr = NULL; + xmlXPathContextPtr contextPtr = NULL; + xmlChar *xmlProp = NULL; + lxc_vm_def_t *containerDef; + + if (!(containerDef = calloc(1, sizeof(*containerDef)))) { + lxcError(conn, NULL, VIR_ERR_NO_MEMORY, "containerDef"); + return NULL; + } + + /* Prepare parser / xpath context */ + rootNodePtr = xmlDocGetRootElement(docPtr); + if ((rootNodePtr == NULL) || + (!xmlStrEqual(rootNodePtr->name, BAD_CAST "domain"))) { + lxcError(conn, NULL, VIR_ERR_INTERNAL_ERROR, + "invalid root element"); + goto error; + } + + contextPtr = xmlXPathNewContext(docPtr); + if (contextPtr == NULL) { + lxcError(conn, NULL, VIR_ERR_NO_MEMORY, "context"); + goto error; + } + + /* Verify the domain type is linuxcontainer */ + if (!(xmlProp = xmlGetProp(rootNodePtr, BAD_CAST "type"))) { + lxcError(conn, NULL, VIR_ERR_INTERNAL_ERROR, + "missing domain type"); + goto error; + } + + if (!(xmlStrEqual(xmlProp, BAD_CAST LXC_DOMAIN_TYPE))) { + lxcError(conn, NULL, VIR_ERR_INTERNAL_ERROR, + "invalid domain type"); + goto error; + } + free(xmlProp); + xmlProp = NULL; + + if (lxcParseDomainName(conn, &(containerDef->name), contextPtr) < 0) { + goto error; + } + + + if (lxcParseDomainUUID(conn, containerDef->uuid, contextPtr) < 0) { + goto error; + } + + containerDef->nmounts = lxcParseDomainMounts(conn, &(containerDef->mounts), + contextPtr); + if (0 > containerDef->nmounts) { + goto error; + } + + if (lxcParseDomainInit(conn, containerDef->init, contextPtr) < 0) { + goto error; + } + + if (lxcParseDomainTty(conn, containerDef->tty, contextPtr) < 0) { + goto error; + } + + if (lxcParseDomainMemory(conn, &(containerDef->maxMemory), contextPtr) < 0) { + goto error; + } + + xmlXPathFreeContext(contextPtr); + + return containerDef; + + error: + free(xmlProp); + xmlXPathFreeContext(contextPtr); + lxcFreeVMDef(containerDef); + + return NULL; +} + + +lxc_vm_def_t * lxcParseVMDef(virConnectPtr conn, + const char* xmlString, + const char* fileName) +{ + xmlDocPtr xml; + lxc_vm_def_t *containerDef; + + xml = xmlReadDoc(BAD_CAST xmlString, + fileName ? fileName : "domain.xml", + NULL, XML_PARSE_NOENT | + XML_PARSE_NONET | XML_PARSE_NOERROR | + XML_PARSE_NOWARNING); + if (!xml) { + lxcError(conn, NULL, VIR_ERR_XML_ERROR, NULL); + return NULL; + } + + containerDef = lxcParseXML(conn, xml); + + xmlFreeDoc(xml); + + return containerDef; +} + +lxc_vm_t * lxcAssignVMDef(virConnectPtr conn, + lxc_driver_t *driver, + lxc_vm_def_t *def) +{ + lxc_vm_t *vm = NULL; + + if ((vm = lxcFindVMByName(driver, def->name))) { + if (!lxcIsActiveVM(vm)) { + lxcFreeVMDef(vm->def); + vm->def = def; + } else { + lxcError(conn, NULL, VIR_ERR_INTERNAL_ERROR, + "Can't redefine active VM with name %s", def->name); + return NULL; + } + + return vm; + } + + if (!(vm = calloc(1, sizeof(lxc_vm_t)))) { + lxcError(conn, NULL, VIR_ERR_NO_MEMORY, "vm"); + return NULL; + } + + vm->pid = -1; + vm->id = -1; + vm->state = VIR_DOMAIN_SHUTOFF; + vm->def = def; + vm->next = driver->vms; + + driver->vms = vm; + driver->ninactivevms++; + + return vm; +} + +void lxcRemoveInactiveVM(lxc_driver_t *driver, + lxc_vm_t *vm) +{ + lxc_vm_t *prevVm = NULL; + lxc_vm_t *curVm; + + for (curVm = driver->vms; + (curVm != vm) && (NULL != curVm); + curVm = curVm->next) { + prevVm = curVm; + } + + if (curVm) { + if (prevVm) { + prevVm->next = curVm->next; + } else { + driver->vms = curVm->next; + } + + driver->ninactivevms--; + } + + lxcFreeVM(vm); +} + +/* Save a container's config data into a persistent file */ +static int lxcSaveConfig(virConnectPtr conn, + lxc_driver_t *driver, + lxc_vm_t *vm, + lxc_vm_def_t *def) +{ + int rc = -1; + char *xmlDef; + int fd = -1; + int amtToWrite; + + if (!(xmlDef = lxcGenerateXML(conn, driver, vm, def, 0))) { + return -1; + } + + if ((fd = open(vm->configFile, + O_WRONLY | O_CREAT | O_TRUNC, + S_IRUSR | S_IWUSR )) < 0) { + lxcError(conn, NULL, VIR_ERR_INTERNAL_ERROR, + "cannot create config file %s: %s", + vm->configFile, strerror(errno)); + goto cleanup; + } + + amtToWrite = strlen(xmlDef); + if (safewrite(fd, xmlDef, amtToWrite) < 0) { + lxcError(conn, NULL, VIR_ERR_INTERNAL_ERROR, + "cannot write config file %s: %s", + vm->configFile, strerror(errno)); + goto cleanup; + } + + if (close(fd) < 0) { + lxcError(conn, NULL, VIR_ERR_INTERNAL_ERROR, + "cannot save config file %s: %s", + vm->configFile, strerror(errno)); + goto cleanup; + } + + rc = 0; + + cleanup: + if (fd != -1) { + close(fd); + } + + free(xmlDef); + + return rc; +} + +int lxcSaveVMDef(virConnectPtr conn, + lxc_driver_t *driver, + lxc_vm_t *vm, + lxc_vm_def_t *def) +{ + int rc = -1; + char uuidstr[VIR_UUID_STRING_BUFLEN]; + + if (vm->configFile[0] == '\0') { + if ((rc = virFileMakePath(driver->configDir))) { + lxcError(conn, NULL, VIR_ERR_INTERNAL_ERROR, + "cannot create config directory %s: %s", + driver->configDir, strerror(rc)); + goto save_complete; + } + + virUUIDFormat(def->uuid, uuidstr); + if (virFileBuildPath(driver->configDir, uuidstr, ".xml", + vm->configFile, PATH_MAX) < 0) { + lxcError(conn, NULL, VIR_ERR_INTERNAL_ERROR, + "cannot construct config file path"); + goto save_complete; + } + + } + + rc = lxcSaveConfig(conn, driver, vm, def); + +save_complete: + return rc; +} + + + +static lxc_vm_t * lxcLoadConfig(lxc_driver_t *driver, + const char *file, + const char *fullFilePath, + const char *xmlData) +{ + lxc_vm_def_t *containerDef; + lxc_vm_t * vm; + char uuidstr[VIR_UUID_STRING_BUFLEN]; + + containerDef = lxcParseVMDef(NULL, xmlData, file); + if (NULL == containerDef) { + DEBUG0("Error parsing container config"); + return NULL; + } + + virUUIDFormat(containerDef->uuid, uuidstr); + if (!virFileMatchesNameSuffix(file, uuidstr, ".xml")) { + DEBUG0("Container name does not match config file name"); + lxcFreeVMDef(containerDef); + return NULL; + } + + vm = lxcAssignVMDef(NULL, driver, containerDef); + if (NULL == vm) { + DEBUG0("Failed to load container config"); + lxcFreeVMDef(containerDef); + return NULL; + } + + strncpy(vm->configFile, fullFilePath, PATH_MAX); + vm->configFile[PATH_MAX-1] = '\0'; + + return vm; +} + +int lxcLoadDriverConfig(virConnectPtr conn) +{ + lxc_driver_t *driverPtr = (lxc_driver_t*)conn->privateData; + + /* Set the container configuration directory */ + driverPtr->configDir = strdup("/etc/libvirt/lxc"); + + return 0; +} + +int lxcLoadContainerInfo(virConnectPtr conn) +{ + int rc = -1; + lxc_driver_t *driverPtr = (lxc_driver_t*)conn->privateData; + DIR *dir; + struct dirent *dirEntry; + char tempPath[PATH_MAX]; + char* xmlData; + + if (!(dir = opendir(driverPtr->configDir))) { + if (ENOENT == errno) { + /* no config dir => no containers */ + rc = 0; + } else { + lxcError(conn, NULL, VIR_ERR_INTERNAL_ERROR, + "failed to open config directory: %s", strerror(errno)); + } + + goto load_complete; + } + + while ((dirEntry = readdir(dir))) { + if (dirEntry->d_name[0] == '.') { + continue; + } + + if (!virFileHasSuffix(dirEntry->d_name, ".xml")) { + continue; + } + + rc = virFileBuildPath(driverPtr->configDir, dirEntry->d_name, NULL, + tempPath, PATH_MAX); + if (0 > rc) { + DEBUG0("config file name too long"); + continue; + } + + if (virFileReadAll(tempPath, LXC_MAX_XML_LENGTH, &xmlData) < 0) { + continue; + } + + lxcLoadConfig(driverPtr, dirEntry->d_name, tempPath, xmlData); + + free(xmlData); + } + + closedir(dir); + + rc = 0; + +load_complete: + return rc; +} + +/* Generate an XML document describing the vm's configuration */ +char *lxcGenerateXML(virConnectPtr conn, + lxc_driver_t *driver ATTRIBUTE_UNUSED, + lxc_vm_t *vm, + lxc_vm_def_t *def, + int live) +{ + virBufferPtr buf = 0; + unsigned char *uuid; + char uuidstr[VIR_UUID_STRING_BUFLEN]; + lxc_mount_t *mount; + + buf = virBufferNew(LXC_MAX_XML_LENGTH); + if (!buf) { + goto no_memory; + } + + if (lxcIsActiveVM(vm) && live) { + if (virBufferVSprintf(buf, "<domain type='linuxcontainer' id='%d'>\n", + vm->id) < 0) { + goto no_memory; + } + } else { + if (virBufferVSprintf(buf, "<domain type='linuxcontainer'>\n") < 0) { + goto no_memory; + } + } + + if (virBufferVSprintf(buf, " <name>%s</name>\n", def->name) < 0) { + goto no_memory; + } + + uuid = def->uuid; + virUUIDFormat(uuid, uuidstr); + if (virBufferVSprintf(buf, " <uuid>%s</uuid>\n", uuidstr) < 0) { + goto no_memory; + } + + if (virBufferVSprintf(buf, " <container>\n") < 0) { + goto no_memory; + } + + /* loop adding mounts */ + for (mount = def->mounts; mount; mount = mount->next) { + if (virBufferVSprintf(buf, " <filesystem type='mount'>\n") < 0) { + goto no_memory; + } + + if (virBufferVSprintf(buf, " <source dir='%s'/>\n", + mount->source) < 0) { + goto no_memory; + } + + if (virBufferVSprintf(buf, " <target dir='%s'/>\n", + mount->target) < 0) { + goto no_memory; + } + + if (virBufferVSprintf(buf, " </filesystem>\n") < 0) { + goto no_memory; + } + + } + + if (virBufferVSprintf(buf, " <init>%s</init>\n", def->init) < 0) { + goto no_memory; + } + + if (virBufferVSprintf(buf, " </container>\n") < 0) { + goto no_memory; + } + + + if (virBufferVSprintf(buf, " <memory>%d</memory>\n", def->maxMemory) < 0) { + goto no_memory; + } + + if (virBufferVSprintf(buf, " <devices>\n") < 0) { + goto no_memory; + } + + if (virBufferVSprintf(buf, " <console tty='%s'/>\n", def->tty) < 0) { + goto no_memory; + } + + if (virBufferAddLit(buf, " </devices>\n") < 0) { + goto no_memory; + } + + if (virBufferAddLit(buf, "</domain>\n") < 0) { + goto no_memory; + } + + return virBufferContentAndFree(buf); + +no_memory: + lxcError(conn, NULL, VIR_ERR_NO_MEMORY, "generateXml"); + virBufferFree(buf); + + return NULL; +} + +void lxcFreeVMDef(lxc_vm_def_t *vmdef) +{ + lxc_mount_t *curMount = vmdef->mounts; + lxc_mount_t *nextMount; + + while (curMount) { + nextMount = curMount->next; + free(curMount); + curMount = nextMount; + } + + free(vmdef->name); + vmdef->name = NULL; + +} + +void lxcFreeVMs(lxc_vm_t *vms) +{ + lxc_vm_t *curVm = vms; + lxc_vm_t *nextVm; + + while (curVm) { + lxcFreeVM(curVm); + nextVm = curVm->next; + free(curVm); + curVm = nextVm; + } +} + +void lxcFreeVM(lxc_vm_t *vm) +{ + lxcFreeVMDef(vm->def); + free(vm->def); +} + +lxc_vm_t *lxcFindVMByID(const lxc_driver_t *driver, int id) +{ + lxc_vm_t *vm; + + for (vm = driver->vms; vm; vm = vm->next) { + if (lxcIsActiveVM(vm) && (vm->id == id)) { + return vm; + } + + } + + return NULL; +} + +lxc_vm_t *lxcFindVMByUUID(const lxc_driver_t *driver, + const unsigned char *uuid) +{ + lxc_vm_t *vm; + + for (vm = driver->vms; vm; vm = vm->next) { + if (!memcmp(vm->def->uuid, uuid, VIR_UUID_BUFLEN)) { + return vm; + } + } + + return NULL; +} + +lxc_vm_t *lxcFindVMByName(const lxc_driver_t *driver, + const char *name) +{ + lxc_vm_t *vm; + + for (vm = driver->vms; vm; vm = vm->next) { + if (!strcmp(vm->def->name, name)) { + return vm; + } + } + + return NULL; +} + +int lxcDeleteConfig(virConnectPtr conn, + lxc_driver_t *driver ATTRIBUTE_UNUSED, + const char *configFile, + const char *name) +{ + if (!configFile[0]) { + lxcError(conn, NULL, VIR_ERR_INTERNAL_ERROR, + "no config file for %s", name); + return -1; + } + + if (unlink(configFile) < 0) { + lxcError(conn, NULL, VIR_ERR_INTERNAL_ERROR, + "cannot remove config for %s", name); + return -1; + } + + return 0; +} + +#endif /* WITH_LXC */ + Index: src/lxc_conf.h =================================================================== RCS file: src/lxc_conf.h diff -N src/lxc_conf.h --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ src/lxc_conf.h 20 Feb 2008 23:02:14 -0000 @@ -0,0 +1,134 @@ +/* + * Copyright IBM Corp. 2008 + * + * lxc_conf.h: header file for linux container config functions + * + * Authors: + * David L. Leskovec <dlesko at linux.vnet.ibm.com> + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#ifndef LXC_CONF_H +#define LXC_CONF_H + +#include <config.h> + +#ifdef WITH_LXC + +#include "internal.h" + +/* Defines */ +#define LXC_MAX_TTY_NAME 32 +#define LXC_MAX_XML_LENGTH 4096 +#define LXC_MAX_ERROR_LEN 1024 +#define LXC_DOMAIN_TYPE "linuxcontainer" + +typedef struct __lxc_mount lxc_mount_t; +struct __lxc_mount { + char source[PATH_MAX]; /* user's directory */ + char target[PATH_MAX]; + + lxc_mount_t *next; +}; + +typedef struct __lxc_vm_def lxc_vm_def_t; +struct __lxc_vm_def { + unsigned char uuid[VIR_UUID_BUFLEN]; + char* name; + + /* init command string */ + char init[PATH_MAX]; + + int maxMemory; + + /* mounts - list of mount structs */ + int nmounts; + lxc_mount_t *mounts; + + /* tty device */ + char tty[LXC_MAX_TTY_NAME]; +}; + +typedef struct __lxc_vm lxc_vm_t; +struct __lxc_vm { + int pid; + int id; + int state; + + char configFile[PATH_MAX]; + + lxc_vm_def_t *def; + + lxc_vm_t *next; +}; + +typedef struct __lxc_driver lxc_driver_t; +struct __lxc_driver { + lxc_vm_t *vms; + int nactivevms; + int ninactivevms; + char* configDir; +}; + +/* Types and structs */ + +/* Inline Functions */ +static inline int lxcIsActiveVM(lxc_vm_t *vm) +{ + return vm->id != -1; +} + +/* Function declarations */ +lxc_vm_def_t * lxcParseVMDef(virConnectPtr conn, + const char* xmlString, + const char* fileName); +int lxcSaveVMDef(virConnectPtr conn, + lxc_driver_t *driver, + lxc_vm_t *vm, + lxc_vm_def_t *def); +int lxcLoadDriverConfig(virConnectPtr conn); +int lxcLoadContainerInfo(virConnectPtr conn); +lxc_vm_t * lxcAssignVMDef(virConnectPtr conn, + lxc_driver_t *driver, + lxc_vm_def_t *def); +char *lxcGenerateXML(virConnectPtr conn, + lxc_driver_t *driver, + lxc_vm_t *vm, + lxc_vm_def_t *def, + int live); +lxc_vm_t *lxcFindVMByID(const lxc_driver_t *driver, int id); +lxc_vm_t *lxcFindVMByUUID(const lxc_driver_t *driver, + const unsigned char *uuid); +lxc_vm_t *lxcFindVMByName(const lxc_driver_t *driver, + const char *name); +void lxcRemoveInactiveVM(lxc_driver_t *driver, + lxc_vm_t *vm); +void lxcFreeVMs(lxc_vm_t *vms); +void lxcFreeVM(lxc_vm_t *vm); +void lxcFreeVMDef(lxc_vm_def_t *vmdef); +int lxcDeleteConfig(virConnectPtr conn, + lxc_driver_t *driver, + const char *configFile, + const char *name); + +void lxcError(virConnectPtr conn, + virDomainPtr dom, + int code, const char *fmt, ...) + ATTRIBUTE_FORMAT(printf,4,5); + +#endif /* WITH_LXC */ +#endif /* LXC_CONF_H */ + -- Best Regards, Dave Leskovec IBM Linux Technology Center Open Virtualization

3 2

[Libvir] RFC: Updated async job public API
by Daniel P. Berrange 20 Feb '08

20 Feb '08

A little over a month ago I proposed an API extension for enabling long operations to be done as asynchronous background jobs. http://www.redhat.com/archives/libvir-list/2008-January/msg00040.html While the proof of concept definitely worked, having played around & thought about it a little more I feel we can do better than that initial proposal. Some things I didn't like about it: - Complicated reference counting. This was because jobs may or may not be tied to a virDomainPtr object depending on whether the job was a creation attempt, or an operation on an existing object. - Complicated app code because they now had to track both Job & Domain objects together. - Added too many new APIs - this was a consequence of needing the separate top level virJob object, adding lots of XXXJob variants for APIs. - Complicated internal drivers due to the separate Job object. So to try and address this I've come up with an alternative, simpler design for this. The key idea is to get rid of the top level 'Job' object and make use of the 'flags' field present in (almost) all the APIs which need to have async behaviour. First of all, for the couple of APIs which don't have 'flags' we add new variants taking a 'flags' parameter. For each API needing to allow async operation, we define a flag for this eg, virDomainCreateXML -> VIR_DOMAIN_CREATE_XML_ASYNC virDomainRestore -> VIR_DOMAIN_RESTORE_ASYNC virStoragePoolBuild -> VIR_STORAGE_POOL_BUILD_ASYNC If the flag is omitted, current semantics are unchanged, so existing apps are not impacted. If you pass the appropriate XXX_ASYNC flag, then you cannot assume that the operation is complete upon returning from the call. To check completion status you ask for the virJobInfo data. This can be done with whichever of these APIs matches: virDomainGetJobInfo(virDomainPtr dom, virJobInfoPtr job) virStoragePoolGetJobInfo(virStoragePoolPtr vol, virJobInfoPtr job) virStorageVolGetJobInfo(virStorageVolPtr vol, virJobInfoPtr job) Finally, you can cancel an operation: virDomainCancelJob(virDomainPtr dom); virStoragePoolCancelJob(virStoragePoolPtr pool); virStorageVolCancelJob(virStorageVolPtr vol); If you passed the XXX_ASYNC flag, it is forbidden to call any APIs on the object other than the XXXCancelJob() or XXXGetJobInfo() methods, until the job is complete. This was true of the previous proof of concept I did but I didn't spell it out at the time. I've not done the intenral driver impl of this proposal yet, but it will be easier/clearer than the previous impl, and the virsh changes will be much less intrusive since we're merely passing a flag instead of calling a completely separate API. The patch below illustrates the proposed public API - note how its only adding a handful of new entry points - 3 virDomain methods needed an extra flags parameter - all the storage APIs were written to take flags already Dan. diff -r 3b8d18bc4d3e include/libvirt/libvirt.h.in --- a/include/libvirt/libvirt.h.in Wed Feb 20 12:20:50 2008 -0500 +++ b/include/libvirt/libvirt.h.in Wed Feb 20 14:14:09 2008 -0500 @@ -408,6 +408,62 @@ char * virConnectGetCap unsigned long long virNodeGetFreeMemory (virConnectPtr conn); + + +/* + * Asynchronous background jobs + */ + +/** + * virJobType; + * + * A job may have a finite bounded progress, or may be + * unbounded. + */ +typedef enum { + VIR_JOB_BOUNDED = 0, /* finite, 0-> 100 completion */ + VIR_JOB_UNBOUNDED = 1, /* unknown completion percent */ +} virJobType; + + +/** + * virJobState; + * + * A job may be in one of several states + */ +typedef enum { + VIR_JOB_RUNNING = 0, /* Still active */ + VIR_JOB_COMPLETE = 1, /* Completed successfully */ + VIR_JOB_FAILED = 2, /* Failed to complete see virJobGetError */ + VIR_JOB_CANCELLED = 3, /* User requested cancellation */ +} virJobState; + +/** + * virJobInfoPtr: + * + * a virJobInfo is a structure filled by virJobGetInfo() and extracting + * runtime informations for a given active Job + */ + +typedef struct _virJobInfo virJobInfo; + +struct _virJobInfo { + int type; /* One of virJobType constants */ + int state; /* One of virJobState constants */ + unsigned int runningTime; /* Actual running time in seconds */ + unsigned int remainingTime;/* Estimated remaining time in seconds */ + int percentComplete; /* Completion progress 0 -> 100, if VIR_JOB_BOUNDED */ +}; + +/** + * virJobInfoPtr: + * + * a virJobInfoPtr is a pointer to a virJobInfo structure. + */ + +typedef virJobInfo *virJobInfoPtr; + + /* * Gather list of running domains */ @@ -447,6 +503,11 @@ int virDomainDestroy (virDomainPtr dom int virDomainDestroy (virDomainPtr domain); int virDomainFree (virDomainPtr domain); + +int virDomainGetJobInfo (virDomainPtr dom, + virJobInfoPtr info); +int virDomainCancelJob (virDomainPtr dom); + /* * Domain suspend/resume */ @@ -458,8 +519,14 @@ int virDomainResume (virDomainPtr dom */ int virDomainSave (virDomainPtr domain, const char *to); +int virDomainSaveFlags (virDomainPtr domain, + const char *to, + unsigned int flags); int virDomainRestore (virConnectPtr conn, const char *from); +int virDomainRestoreFlags (virConnectPtr conn, + const char *from, + unsigned int flags); /* * Domain core dump @@ -535,6 +602,8 @@ int virConnectListDefinedDomains (virC char **const names, int maxnames); int virDomainCreate (virDomainPtr domain); +int virDomainCreateFlags (virDomainPtr domain, + unsigned int flags); int virDomainGetAutostart (virDomainPtr domain, int *autostart); @@ -897,6 +966,11 @@ int virStoragePoolRefresh (virStorage int virStoragePoolRefresh (virStoragePoolPtr pool, unsigned int flags); +int virStoragePoolGetJobInfo (virStoragePoolPtr pool, + virJobInfoPtr info); +int virStoragePoolCancelJob (virStoragePoolPtr pool); + + /* * StoragePool information */ @@ -955,6 +1029,10 @@ char * virStorageVolGetXMLDesc (virSt char * virStorageVolGetPath (virStorageVolPtr vol); +int virStorageVolGetJobInfo (virStoragePoolPtr pool, + virJobInfoPtr info); +int virStorageVolCancelJob (virStoragePoolPtr pool); + #ifdef __cplusplus } #endif . -- |=- Red Hat, Engineering, Emerging Technologies, Boston. +1 978 392 2496 -=| |=- Perl modules: http://search.cpan.org/~danberr/ -=| |=- Projects: http://freshmeat.net/~danielpb/ -=| |=- GnuPG: 7D3B9505 F3C9 553F A1DA 4AC2 5648 23C1 B3DF F742 7D3B 9505 -=|

1 0

[Libvir] PATCH: 0/16: Storage management APIs
by Daniel P. Berrange 20 Feb '08

20 Feb '08

The patch series that follows provides storage management APIs for dealing with local directories, local filesystems, remote filesystems, logical volumes (LVM), disk partitioning, and iSCSI. It will also soon support SCSI host adapters (including NPIV). I'll include comments inline with each patch. The final patch in the series also provides a 'storage.html' page for the website giving a fairly friendly overview of the storage pool types and their associated XML examples. Although included here, the one API i really don't like is the one for discovery virConnectDiscoverStoragePools, since its API is not flexible enough in terms of metadata it accepts. I will probably just leave this out next time around, since its not critical for the core functionality and can thus be added later. Also TBD is a way to format a filesystem on a volume, and how to clone an existing volume, and take a snapshot. These things can all be added at a later date. Finally it does not include the async job support. This is also best added once the core code is merged. Dan. -- |=- Red Hat, Engineering, Emerging Technologies, Boston. +1 978 392 2496 -=| |=- Perl modules: http://search.cpan.org/~danberr/ -=| |=- Projects: http://freshmeat.net/~danielpb/ -=| |=- GnuPG: 7D3B9505 F3C9 553F A1DA 4AC2 5648 23C1 B3DF F742 7D3B 9505 -=|

8 98

[Libvir] [PATCH] Avoid "make syntax-check" failure.
by Jim Meyering 20 Feb '08

20 Feb '08

There were a few trailing blanks in a generated Makefile.am file. This patch fixes the python script not to emit the offending spaces: Avoid "make syntax-check" failure. * docs/examples/index.py: Don't emit trailing blanks. * docs/examples/Makefile.am: Regenerate. Signed-off-by: Jim Meyering <meyering(a)redhat.com> --- docs/examples/Makefile.am | 6 +++--- docs/examples/index.py | 10 +++------- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/docs/examples/Makefile.am b/docs/examples/Makefile.am index 6b5963e..9da4e21 100644 --- a/docs/examples/Makefile.am +++ b/docs/examples/Makefile.am @@ -22,9 +22,9 @@ install-data-local: -@INSTALL@ -m 0644 $(srcdir)/*.html $(srcdir)/*.c $(srcdir)/*.xml \ $(srcdir)/*.xsl $(srcdir)/*.res $(DESTDIR)$(HTML_DIR) -EXTRA_DIST=examples.xsl index.py examples.xml +EXTRA_DIST=examples.xsl index.py examples.xml -noinst_PROGRAMS=info1 suspend +noinst_PROGRAMS=info1 suspend info1_SOURCES=info1.c info1_LDFLAGS= @@ -36,7 +36,7 @@ suspend_LDFLAGS= suspend_DEPENDENCIES= $(DEPS) suspend_LDADD= $(LDADDS) -valgrind: +valgrind: $(MAKE) CHECKER='valgrind' tests tests: $(noinst_PROGRAMS) diff --git a/docs/examples/index.py b/docs/examples/index.py index 7ea89e1..8f386ed 100755 --- a/docs/examples/index.py +++ b/docs/examples/index.py @@ -245,18 +245,14 @@ install-data-local: $(srcdir)/*.xsl $(srcdir)/*.res $(DESTDIR)$(HTML_DIR) """ - EXTRA_DIST="" - for extra in extras: - EXTRA_DIST = EXTRA_DIST + extra + " " + EXTRA_DIST= string.join(extras, ' ') Makefile = Makefile + "EXTRA_DIST=%s\n\n" % (EXTRA_DIST) - noinst_PROGRAMS="" - for example in examples: - noinst_PROGRAMS = noinst_PROGRAMS + example + " " + noinst_PROGRAMS= string.join(examples, ' ') Makefile = Makefile + "noinst_PROGRAMS=%s\n\n" % (noinst_PROGRAMS) for example in examples: Makefile = Makefile + "%s_SOURCES=%s.c\n%s_LDFLAGS=\n%s_DEPENDENCIES= $(DEPS)\n%s_LDADD= $(LDADDS)\n\n" % (example, example, example, example, example) - Makefile = Makefile + "valgrind: \n\t$(MAKE) CHECKER='valgrind' tests\n\n" + Makefile = Makefile + "valgrind:\n\t$(MAKE) CHECKER='valgrind' tests\n\n" Makefile = Makefile + "tests: $(noinst_PROGRAMS)\n" Makefile = Makefile + "\t@(echo '## examples regression tests')\n" # Makefile = Makefile + "\t@(echo > .memdump)\n" -- 1.5.4.2.134.g82883

2 1

[Libvir] Deprecated PolicyKit function
by Mark McLoughlin 19 Feb '08

19 Feb '08

Hi, Just a heads-up ... trying to build with -Werror on Fedora rawhide, I see: cc1: warnings being treated as errors remote.c: In function 'remoteDispatchAuthPolkit': remote.c:2661: error: 'polkit_context_can_caller_do_action' is deprecated (declared at /usr/include/PolicyKit/polkit/polkit-context.h:173) Cheers, Mark.

3 3

[Libvir] Dependent Xen and Libvirt patches?
by Ryan Scott 16 Feb '08

16 Feb '08

Hi all, I have a question about compatibility issues when submitting changes to both Xen and libvirt. First, some background: I'm seeing a problem with virsh detach-disk. It'll detach a disk from a running domain, but not update the domain's configuration, so the disk will be back when the domain is rebooted. This seems undesirable; I think the disk should be permanently removed by virsh detach-disk. To fix this, patches are necessary in both Xen and Libvirt. First, the Xen patch: --- old/tools/python/xen/xend/server/SrvDomain.py +++ new/tools/python/xen/xend/server/SrvDomain.py @@ -186,7 +186,9 @@ def op_device_destroy(self, _, req): return self.call(self.dom.destroyDevice, [['type', 'str'], - ['dev', 'str']], + ['dev', 'str'], + ['force', 'int'], + ['rm_cfg', 'int']], req) def op_device_configure(self, _, req): Next, the libvirt patch: diff --git a/src/xend_internal.c b/src/xend_internal.c --- a/src/xend_internal.c +++ b/src/xend_internal.c @@ -3269,7 +3273,7 @@ xenDaemonDetachDevice(virDomainPtr domai if (virDomainXMLDevID(domain, xml, class, ref, sizeof(ref))) return (-1); return(xend_op(domain->conn, domain->name, "op", "device_destroy", - "type", class, "dev", ref, NULL)); + "type", class, "dev", ref, "force", "0", "rm_cfg", "1", NULL)); } Now, on to my question: I want to make sure I can do this without causing too many problems. In my testing, the libvirt change without the xen change won't cause any additional issues, but the xen change without the libvirt change will cause all 'virsh detach-disk' calls to fail. How should a change like this be handled? Submit the libvirt patch now, and sit on the Xen patch for a while? Or submit both and include a note that an upgrade will be necessary? Thanks, Ryan

1 0

[Libvir] Announcing oVirt
by Hugh O. Brock 14 Feb '08

14 Feb '08

Announcing oVirt ================ It is my pleasure to announce oVirt, the next step in open virtual machine management. oVirt is: * A small OS image that runs libvirt and hosts virtual machines * A Web-based virtual machine management console oVirt goals: * Empower virtual machine owners without giving up control of hardware * Automate virtual machine clustering, load balancing, and SLA maintenance * Simplify management of large numbers of machines * Work across platforms and architectures oVirt uses: * A kerberos/LDAP server for authentication and authorization (oVirt ships with FreeIPA) * DNS/DHCP services on the local LAN -- or provides them for oVirt hosts over a private network if desired * Libvirt for virtual machine management, storage management, and secure remote communication * collectd for stats gathering and monitoring * Rails for rapid, flexible development oVirt mailing list: http://www.redhat.com/mailman/listinfo/ovirt-devel oVirt IRC: irc.freenode.net/#ovirt oVirt website: http://ovirt.org We encourage anyone interested to download the source (git clone git://git.et.redhat.com/ovirt) or the prebuilt appliance (http://ovirt.org/download) Let us know what you think! Enjoy, --Hugh Brock hbrock(a)redhat.com

1 0

[Libvir] [PATCH] autobuild.sh: Run "make syntax-check"
by Jim Meyering 14 Feb '08

14 Feb '08

Tiny change. So the autobuilder runs these checks, too. diff --git a/autobuild.sh b/autobuild.sh index 623b33a..9e0c2ca 100755 --- a/autobuild.sh +++ b/autobuild.sh @@ -23,6 +23,7 @@ make install set -o pipefail make check 2>&1 | tee $RESULTS +make syntax-check 2>&1 | tee -a $RESULTS make cov rm -f *.tar.gz

3 3

[Libvir] [PATCH] Pull useless-if-before-free from gnulib, and update.
by Jim Meyering 14 Feb '08

14 Feb '08

I added a slightly improved useless-if-before-free to gnulib, so this patch makes bootstrap pull the script from there. It also pulls in a vasnprintf module improvement: it works around a just-discovered bug in HPUX 10.20's printf(3) implementation: http://thread.gmane.org/gmane.comp.gnu.coreutils.bugs/12505/focus=12547 Here's the patch: Pull useless-if-before-free from gnulib, and update. * bootstrap (gnulib_tool): Add useless-if-before-free to the list of modules. * build-aux/useless-if-before-free: Update from gnulib. * gnulib/lib/vasnprintf.c: Work around a bug in HPUX 10.20. * gnulib/m4/vasnprintf.m4: Likewise. --- bootstrap | 1 + build-aux/useless-if-before-free | 96 +++++++++++++++++++++++++++++-------- gnulib/lib/Makefile.am | 9 +++- gnulib/lib/vasnprintf.c | 37 ++++++++++----- gnulib/m4/gnulib-cache.m4 | 4 +- gnulib/m4/gnulib-comp.m4 | 1 + gnulib/m4/vasnprintf.m4 | 20 +++++++- 7 files changed, 130 insertions(+), 38 deletions(-) diff --git a/bootstrap b/bootstrap index 1627086..d8b79d9 100755 --- a/bootstrap +++ b/bootstrap @@ -78,6 +78,7 @@ $gnulib_tool \ --import physmem getaddrinfo \ sys_stat vasprintf strndup \ strsep poll gettext getpass \ + useless-if-before-free \ vc-list-files rm -f \ diff --git a/build-aux/useless-if-before-free b/build-aux/useless-if-before-free index 57040a3..eb18483 100755 --- a/build-aux/useless-if-before-free +++ b/build-aux/useless-if-before-free @@ -1,24 +1,43 @@ #!/usr/bin/perl -T # Detect instances of "if (p) free (p);". -# Likewise for "if (p != NULL) free (p);". +# Likewise for "if (p != NULL) free (p);". And with braces. -my $VERSION = '2008-02-04 22:25'; # UTC +my $VERSION = '2008-02-11 08:08'; # UTC # The definition above must lie within the first 8 lines in order # for the Emacs time-stamp write hook (at end) to update it. # If you change this file with Emacs, please let the write hook # do its job. Otherwise, update this string manually. -# Exit status is like grep: 0 for no match. 1 for any number. -# Note: giving line numbers isn't practical, since I've reset the -# input record separator. +# Copyright (C) 2008 Free Software Foundation, Inc. + +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. + +# You should have received a copy of the GNU General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. + +# Written by Jim Meyering + use strict; use warnings; use Getopt::Long; (my $ME = $0) =~ s|.*/||; -my $debug = 0; -my $verbose = 0; +# use File::Coda; # http://meyering.net/code/Coda/ +END { + defined fileno STDOUT or return; + close STDOUT and return; + warn "$ME: failed to close standard output: $!\n"; + $? ||= 1; +} sub usage ($) { @@ -33,18 +52,32 @@ sub usage ($) print $STREAM <<EOF; Usage: $ME [OPTIONS] FILE... +Detect any instance in FILE of a useless "if" test before a free call, e.g., +"if (p) free (p);". Any such test may be safely removed without affecting +the semantics of the C code in FILE. Use --name=FOO --name=BAR to also +detect free-like functions named FOO and BAR. + OPTIONS: + --list print only the name of each matching FILE (\0-terminated) --name=N add name N to the list of `free'-like functions to detect; may be repeated --help display this help and exit --version output version information and exit - --verbose generate verbose output + +Exit status: + + 0 no match + 1 one or more matches + 2 an error EXAMPLE: - git ls-files -z |xargs -0 $ME +For example, this command prints all removable "if" tests before "free" +and "kfree" calls in the linux kernel sources: + + git ls-files -z |xargs -0 $ME --name=kfree EOF } @@ -52,32 +85,40 @@ EOF } { + sub EXIT_MATCH {0} + sub EXIT_NO_MATCH {1} + sub EXIT_ERROR {2} + my $err = EXIT_NO_MATCH; + + my $list; my @name = qw(free); GetOptions ( - debug => \$debug, - verbose => \$verbose, help => sub { usage 0 }, version => sub { print "$ME version $VERSION\n"; exit }, + list => \$list, 'name=s@' => \@name, ) or usage 1; # Make sure we have the right number of non-option arguments. # Always tell the user why we fail. @ARGV < 1 - and (warn "$ME: missing FILE argument\n"), usage 1; + and (warn "$ME: missing FILE argument\n"), usage EXIT_ERROR; my $or = join '|', @name; my $regexp = qr/(?:$or)/; # Set the input record separator. + # Note: this makes it impractical to print line numbers. $/ = '"'; my $found_match = 0; + FILE: foreach my $file (@ARGV) { open FH, '<', $file - or die "$ME: can't open `$file' for reading: $!\n"; + or (warn "$ME: can't open `$file' for reading: $!\n"), + $err = EXIT_ERROR, next; while (defined (my $line = <FH>)) { if ($line =~ @@ -85,27 +126,40 @@ EOF (?: \s*$regexp\s*$\s*\2\s*$| \s*\{\s*$regexp\s*$\s*\2\s*$\s*;\s*\}))/sx) { - print "$file: $1\n"; $found_match = 1; + $list + and (print "$file\0"), next FILE; + print "$file: $1\n"; } } + } + continue + { close FH; } - exit !$found_match; + + $found_match && $err == EXIT_NO_MATCH + and $err = EXIT_MATCH; + + exit $err; } my $foo = <<'EOF'; # The above is to *find* them. # This adjusts them, removing the unnecessary "if (p)" part. -# FIXME: do something like this as an option. -git ls-files -z --exclude=$ME |xargs -0 \ -perl -0x3b -pi -e 's/\bif\s*$\s*(\S+?)(?:\s*!=\s*NULL)?\s*$\s+((?:sexpr_)?free\s*$\s*\1\s*$)/$2/s' +# FIXME: do something like this as an option (doesn't do braces): +git ls-files -z |xargs -0 \ +perl -0x3b -pi -e 's/\bif\s*$\s*(\S+?)(?:\s*!=\s*NULL)?\s*$\s+(k?free\s*$\s*\1\s*$)/$2/s' -When modifying files, refuse to process anything other than a regular file. +useless-if-before-free -l $(lid -knone free) | xargs -0 \ + perl -0x3b -pi -e \ + 's/\bif\s*$\s*(\S+?)(?:\s*!=\s*NULL)?\s*$\s+(free\s*$\s*\1\s*$)/$2/s' -# Or this one-liner to detect them: -git ls-files -z |xargs -0 perl -00 -ne '/\b(if\s*$\s*(\S+?)(?:\s*!=\s*NULL)?\s*$(?:\s*(?:sexpr_)?free\s*$\s*\2\s*$|\s*\{\s*(?:sexpr_)?free\s*$\s*\2\s*$\s*;\s*\}))/sx and print "$1\n"' +Be careful that the result of the above transformation is valid. +If the matched string is followed by "else", then obviously, it won't be. + +When modifying files, refuse to process anything other than a regular file. EOF ## Local Variables: diff --git a/gnulib/lib/Makefile.am b/gnulib/lib/Makefile.am index 8f545ca..9495caf 100644 --- a/gnulib/lib/Makefile.am +++ b/gnulib/lib/Makefile.am @@ -9,7 +9,7 @@ # the same distribution terms as the rest of that program. # # Generated by gnulib-tool. -# Reproduce by: gnulib-tool --import --dir=. --lib=libgnu --source-base=gnulib/lib --m4-base=gnulib/m4 --doc-base=doc --aux-dir=build-aux --with-tests --lgpl=2 --libtool --macro-prefix=gl getaddrinfo getpass gettext physmem poll strndup strsep sys_stat vasprintf vc-list-files +# Reproduce by: gnulib-tool --import --dir=. --lib=libgnu --source-base=gnulib/lib --m4-base=gnulib/m4 --doc-base=doc --aux-dir=build-aux --with-tests --lgpl=2 --libtool --macro-prefix=gl getaddrinfo getpass gettext physmem poll strndup strsep sys_stat useless-if-before-free vasprintf vc-list-files AUTOMAKE_OPTIONS = 1.5 gnits @@ -701,6 +701,13 @@ EXTRA_DIST += unistd.in.h ## end gnulib module unistd +## begin gnulib module useless-if-before-free + + +EXTRA_DIST += $(top_srcdir)/build-aux/useless-if-before-free + +## end gnulib module useless-if-before-free + ## begin gnulib module vasnprintf diff --git a/gnulib/lib/vasnprintf.c b/gnulib/lib/vasnprintf.c index 205a9bf..ed579d3 100644 --- a/gnulib/lib/vasnprintf.c +++ b/gnulib/lib/vasnprintf.c @@ -3566,7 +3566,7 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp, { arg_type type = a.arg[dp->arg_index].type; int flags = dp->flags; -#if !USE_SNPRINTF || !DCHAR_IS_TCHAR || ENABLE_UNISTDIO || NEED_PRINTF_FLAG_ZERO || NEED_PRINTF_UNBOUNDED_PRECISION +#if !USE_SNPRINTF || !DCHAR_IS_TCHAR || ENABLE_UNISTDIO || NEED_PRINTF_FLAG_LEFTADJUST || NEED_PRINTF_FLAG_ZERO || NEED_PRINTF_UNBOUNDED_PRECISION int has_width; size_t width; #endif @@ -3579,7 +3579,9 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp, #else # define prec_ourselves 0 #endif -#if !DCHAR_IS_TCHAR || ENABLE_UNISTDIO || NEED_PRINTF_FLAG_ZERO || NEED_PRINTF_UNBOUNDED_PRECISION +#if NEED_PRINTF_FLAG_LEFTADJUST +# define pad_ourselves 1 +#elif !DCHAR_IS_TCHAR || ENABLE_UNISTDIO || NEED_PRINTF_FLAG_ZERO || NEED_PRINTF_UNBOUNDED_PRECISION int pad_ourselves; #else # define pad_ourselves 0 @@ -3593,7 +3595,7 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp, TCHAR_T *tmp; #endif -#if !USE_SNPRINTF || !DCHAR_IS_TCHAR || ENABLE_UNISTDIO || NEED_PRINTF_FLAG_ZERO || NEED_PRINTF_UNBOUNDED_PRECISION +#if !USE_SNPRINTF || !DCHAR_IS_TCHAR || ENABLE_UNISTDIO || NEED_PRINTF_FLAG_LEFTADJUST || NEED_PRINTF_FLAG_ZERO || NEED_PRINTF_UNBOUNDED_PRECISION has_width = 0; width = 0; if (dp->width_start != dp->width_end) @@ -3883,7 +3885,7 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp, #endif /* Decide whether to perform the padding ourselves. */ -#if !DCHAR_IS_TCHAR || ENABLE_UNISTDIO || NEED_PRINTF_FLAG_ZERO || NEED_PRINTF_UNBOUNDED_PRECISION +#if !NEED_PRINTF_FLAG_LEFTADJUST && (!DCHAR_IS_TCHAR || ENABLE_UNISTDIO || NEED_PRINTF_FLAG_ZERO || NEED_PRINTF_UNBOUNDED_PRECISION) switch (dp->conversion) { # if !DCHAR_IS_TCHAR || ENABLE_UNISTDIO @@ -4008,7 +4010,7 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp, #endif *fbp = dp->conversion; #if USE_SNPRINTF -# if !(__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 3)) +# if !(__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 3) || ((defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__)) fbp[1] = '%'; fbp[2] = 'n'; fbp[3] = '\0'; @@ -4021,6 +4023,21 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp, in format strings in writable memory may crash the program (if compiled with _FORTIFY_SOURCE=2), so we should avoid it in this situation. */ + /* On native Win32 systems (such as mingw), we can avoid using + %n because: + - Although the gl_SNPRINTF_TRUNCATION_C99 test fails, + snprintf does not write more than the specified number + of bytes. (snprintf (buf, 3, "%d %d", 4567, 89) writes + '4', '5', '6' into buf, not '4', '5', '\0'.) + - Although the gl_SNPRINTF_RETVAL_C99 test fails, snprintf + allows us to recognize the case of an insufficient + buffer size: it returns -1 in this case. + On native Win32 systems (such as mingw) where the OS is + Windows Vista, the use of %n in format strings by default + crashes the program. See + <http://gcc.gnu.org/ml/gcc/2007-06/msg00122.html> and + <http://msdn2.microsoft.com/en-us/library/ms175782(VS.80).aspx> + So we should avoid %n in this situation. */ fbp[1] = '\0'; # endif #else @@ -4494,7 +4511,7 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp, /* Here count <= allocated - length. */ /* Perform padding. */ -#if !DCHAR_IS_TCHAR || ENABLE_UNISTDIO || NEED_PRINTF_FLAG_ZERO || NEED_PRINTF_UNBOUNDED_PRECISION +#if !DCHAR_IS_TCHAR || ENABLE_UNISTDIO || NEED_PRINTF_FLAG_LEFTADJUST || NEED_PRINTF_FLAG_ZERO || NEED_PRINTF_UNBOUNDED_PRECISION if (pad_ourselves && has_width) { size_t w; @@ -4535,15 +4552,14 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp, # endif DCHAR_T *p = rp + count; DCHAR_T *end = p + pad; -# if NEED_PRINTF_FLAG_ZERO DCHAR_T *pad_ptr; -# if !DCHAR_IS_TCHAR +# if !DCHAR_IS_TCHAR if (dp->conversion == 'c' || dp->conversion == 's') /* No zero-padding for string directives. */ pad_ptr = NULL; else -# endif +# endif { pad_ptr = (*rp == '-' ? rp + 1 : rp); /* No zero-padding of "inf" and "nan". */ @@ -4551,7 +4567,6 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp, || (*pad_ptr >= 'a' && *pad_ptr <= 'z')) pad_ptr = NULL; } -# endif /* The generated string now extends from rp to p, with the zero padding insertion point being at pad_ptr. */ @@ -4564,7 +4579,6 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp, for (; pad > 0; pad--) *p++ = ' '; } -# if NEED_PRINTF_FLAG_ZERO else if ((flags & FLAG_ZERO) && pad_ptr != NULL) { /* Pad with zeroes. */ @@ -4575,7 +4589,6 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp, for (; pad > 0; pad--) *p++ = '0'; } -# endif else { /* Pad with spaces on the left. */ diff --git a/gnulib/m4/gnulib-cache.m4 b/gnulib/m4/gnulib-cache.m4 index 357f170..50f743b 100644 --- a/gnulib/m4/gnulib-cache.m4 +++ b/gnulib/m4/gnulib-cache.m4 @@ -15,11 +15,11 @@ # Specification in the form of a command-line invocation: -# gnulib-tool --import --dir=. --lib=libgnu --source-base=gnulib/lib --m4-base=gnulib/m4 --doc-base=doc --aux-dir=build-aux --with-tests --lgpl=2 --libtool --macro-prefix=gl getaddrinfo getpass gettext physmem poll strndup strsep sys_stat vasprintf vc-list-files +# gnulib-tool --import --dir=. --lib=libgnu --source-base=gnulib/lib --m4-base=gnulib/m4 --doc-base=doc --aux-dir=build-aux --with-tests --lgpl=2 --libtool --macro-prefix=gl getaddrinfo getpass gettext physmem poll strndup strsep sys_stat useless-if-before-free vasprintf vc-list-files # Specification in the form of a few gnulib-tool.m4 macro invocations: gl_LOCAL_DIR([]) -gl_MODULES([getaddrinfo getpass gettext physmem poll strndup strsep sys_stat vasprintf vc-list-files]) +gl_MODULES([getaddrinfo getpass gettext physmem poll strndup strsep sys_stat useless-if-before-free vasprintf vc-list-files]) gl_AVOID([]) gl_SOURCE_BASE([gnulib/lib]) gl_M4_BASE([gnulib/m4]) diff --git a/gnulib/m4/gnulib-comp.m4 b/gnulib/m4/gnulib-comp.m4 index 8896a38..0eeee9c 100644 --- a/gnulib/m4/gnulib-comp.m4 +++ b/gnulib/m4/gnulib-comp.m4 @@ -225,6 +225,7 @@ AC_DEFUN([gltests_LIBSOURCES], [ AC_DEFUN([gl_FILE_LIST], [ build-aux/config.rpath build-aux/link-warning.h + build-aux/useless-if-before-free build-aux/vc-list-files lib/alloca.in.h lib/asnprintf.c diff --git a/gnulib/m4/vasnprintf.m4 b/gnulib/m4/vasnprintf.m4 index 6449a9c..c4d3f4f 100644 --- a/gnulib/m4/vasnprintf.m4 +++ b/gnulib/m4/vasnprintf.m4 @@ -1,5 +1,5 @@ -# vasnprintf.m4 serial 23 -dnl Copyright (C) 2002-2004, 2006-2007 Free Software Foundation, Inc. +# vasnprintf.m4 serial 24 +dnl Copyright (C) 2002-2004, 2006-2008 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -166,6 +166,21 @@ AC_DEFUN([gl_PREREQ_VASNPRINTF_FLAG_GROUPING], esac ]) +# Extra prerequisites of lib/vasnprintf.c for supporting the '-' flag. +AC_DEFUN([gl_PREREQ_VASNPRINTF_FLAG_LEFTADJUST], +[ + AC_REQUIRE([gl_PRINTF_FLAG_LEFTADJUST]) + case "$gl_cv_func_printf_flag_leftadjust" in + *yes) + ;; + *) + AC_DEFINE([NEED_PRINTF_FLAG_LEFTADJUST], 1, + [Define if the vasnprintf implementation needs special code for the + '-' flag.]) + ;; + esac +]) + # Extra prerequisites of lib/vasnprintf.c for supporting the 0 flag. AC_DEFUN([gl_PREREQ_VASNPRINTF_FLAG_ZERO], [ @@ -234,6 +249,7 @@ AC_DEFUN([gl_PREREQ_VASNPRINTF_WITH_EXTRAS], gl_PREREQ_VASNPRINTF_DIRECTIVE_A gl_PREREQ_VASNPRINTF_DIRECTIVE_F gl_PREREQ_VASNPRINTF_FLAG_GROUPING + gl_PREREQ_VASNPRINTF_FLAG_LEFTADJUST gl_PREREQ_VASNPRINTF_FLAG_ZERO gl_PREREQ_VASNPRINTF_PRECISION gl_PREREQ_VASNPRINTF_ENOMEM -- 1.5.4.1.35.g55477

2 1