- Devel - libvirt List Archives

[Libvir] [RFC] 1/3 Base linux container support
by Dave Leskovec 21 Feb '08

21 Feb '08

This patch contains the base linux container support * new switch --with-lxc to enable support (off by default) * Add new source files to Makefile.am * Add define for lxc in driver.h * Add call to lxcRegister() in libvirt.c * Add define for errors from lxc in virterror.h * Add case for errors from lxc in virterror.c Index: configure.in =================================================================== RCS file: /data/cvs/libvirt/configure.in,v retrieving revision 1.124 diff -u -p -r1.124 configure.in --- configure.in 23 Jan 2008 19:37:10 -0000 1.124 +++ configure.in 19 Feb 2008 18:50:55 -0000 @@ -131,6 +131,8 @@ AC_ARG_WITH(qemu, [ --with-qemu add QEMU/KVM support (on)],[],[with_qemu=yes]) AC_ARG_WITH(openvz, [ --with-openvz add OpenVZ support (off)],[],[with_openvz=no]) +AC_ARG_WITH(lxc, +[ --with-lxc add Linux Container support (off)],[],[with_lxc=no]) AC_ARG_WITH(test, [ --with-test add test driver support (on)],[],[with_test=yes]) AC_ARG_WITH(remote, @@ -228,6 +230,9 @@ WITH_XEN=0 if test "$with_openvz" = "yes" ; then LIBVIRT_FEATURES="$LIBVIRT_FEATURES -DWITH_OPENVZ" fi +if test "$with_lxc" = "yes" ; then + LIBVIRT_FEATURES="$LIBVIRT_FEATURES -DWITH_LXC" +fi if test "$with_qemu" = "yes" ; then LIBVIRT_FEATURES="$LIBVIRT_FEATURES -DWITH_QEMU" fi @@ -720,6 +725,7 @@ AC_MSG_NOTICE([ Xen: $with_xen]) AC_MSG_NOTICE([ Proxy: $with_xen_proxy]) AC_MSG_NOTICE([ QEMU: $with_qemu]) AC_MSG_NOTICE([ OpenVZ: $with_openvz]) +AC_MSG_NOTICE([ LXC: $with_lxc]) AC_MSG_NOTICE([ Test: $with_test]) AC_MSG_NOTICE([ Remote: $with_remote]) AC_MSG_NOTICE([Libvirtd: $with_libvirtd]) Index: include/libvirt/virterror.h =================================================================== RCS file: /data/cvs/libvirt/include/libvirt/virterror.h,v retrieving revision 1.31 diff -u -p -r1.31 virterror.h --- include/libvirt/virterror.h 5 Dec 2007 15:24:15 -0000 1.31 +++ include/libvirt/virterror.h 19 Feb 2008 18:50:56 -0000 @@ -54,6 +54,7 @@ typedef enum { VIR_FROM_OPENVZ, /* Error from OpenVZ driver */ VIR_FROM_XENXM, /* Error at Xen XM layer */ VIR_FROM_STATS_LINUX, /* Error in the Linux Stats code */ + VIR_FROM_LXC, /* Error from Linux Container driver */ } virErrorDomain; Index: src/Makefile.am =================================================================== RCS file: /data/cvs/libvirt/src/Makefile.am,v retrieving revision 1.62 diff -u -p -r1.62 Makefile.am --- src/Makefile.am 5 Jan 2008 16:06:36 -0000 1.62 +++ src/Makefile.am 19 Feb 2008 18:50:56 -0000 @@ -57,6 +57,8 @@ CLIENT_SOURCES = \ qemu_conf.c qemu_conf.h \ openvz_conf.c openvz_conf.h \ openvz_driver.c openvz_driver.h \ + lxc_driver.c lxc_driver.h \ + lxc_conf.c lxc_conf.h \ nodeinfo.h nodeinfo.c \ util.c util.h Index: src/driver.h =================================================================== RCS file: /data/cvs/libvirt/src/driver.h,v retrieving revision 1.41 diff -u -p -r1.41 driver.h --- src/driver.h 5 Feb 2008 19:27:37 -0000 1.41 +++ src/driver.h 19 Feb 2008 18:50:56 -0000 @@ -24,6 +24,7 @@ typedef enum { VIR_DRV_QEMU = 3, VIR_DRV_REMOTE = 4, VIR_DRV_OPENVZ = 5, + VIR_DRV_LXC = 6 } virDrvNo; Index: src/libvirt.c =================================================================== RCS file: /data/cvs/libvirt/src/libvirt.c,v retrieving revision 1.120 diff -u -p -r1.120 libvirt.c --- src/libvirt.c 5 Feb 2008 19:27:37 -0000 1.120 +++ src/libvirt.c 19 Feb 2008 18:50:57 -0000 @@ -40,6 +40,9 @@ #ifdef WITH_OPENVZ #include "openvz_driver.h" #endif +#ifdef WITH_LXC +#include "lxc_driver.h" +#endif /* * TODO: @@ -213,6 +216,9 @@ virInitialize(void) #ifdef WITH_OPENVZ if (openvzRegister() == -1) return -1; #endif +#ifdef WITH_LXC + if (lxcRegister() == -1) return -1; +#endif #ifdef WITH_REMOTE if (remoteRegister () == -1) return -1; #endif Index: src/virterror.c =================================================================== RCS file: /data/cvs/libvirt/src/virterror.c,v retrieving revision 1.36 diff -u -p -r1.36 virterror.c --- src/virterror.c 5 Feb 2008 19:27:37 -0000 1.36 +++ src/virterror.c 19 Feb 2008 18:50:57 -0000 @@ -296,6 +296,9 @@ virDefaultErrorFunc(virErrorPtr err) case VIR_FROM_STATS_LINUX: dom = "Linux Stats "; break; + case VIR_FROM_LXC: + dom = "LXC "; + break; } if ((err->dom != NULL) && (err->code != VIR_ERR_INVALID_DOMAIN)) { -- Best Regards, Dave Leskovec IBM Linux Technology Center Open Virtualization

4 5

Fwd: [Libvir] [PATCH] Useless statement in openvzGetVPSInfo
by Anton Protopopov 21 Feb '08

21 Feb '08

Oops, forgot the list... ---------- Forwarded message ---------- From: Anton Protopopov <aspsk2(a)gmail.com> Date: 21.02.2008 21:25 Subject: Re: [Libvir] [PATCH] Useless statement in openvzGetVPSInfo To: veillard(a)redhat.com I think, that if pnext = &vm; and *pnext = calloc(...); then vm = calloc(...); Isn't it? 2008/2/21, Daniel Veillard <veillard(a)redhat.com>: > > On Thu, Feb 21, 2008 at 08:59:01PM +0300, Anton Protopopov wrote: > > > > Hi, > > the patch is now in attachement.. > > I think, that the statement > > if (!vm) > > vm = *pnext; > > will never be executed: in the first pass, we have already check > this > > a few lines before; in next passes, vm remains the same... > > Anton > > > Hum, that doesn't match what I see. vm is initialized to NULL on entry > and no changed before the loop, so on first iteration of the loop vm is > set using that code. > I don't understand the logic of your patch, > > Daniel > > > -- > Red Hat Virtualization group http://redhat.com/virtualization/ > Daniel Veillard | virtualization library http://libvirt.org/ > veillard(a)redhat.com | libxml GNOME XML XSLT toolkit http://xmlsoft.org/ > http://veillard.com/ | Rpmfind RPM search engine http://rpmfind.net/ >

2 1

[Libvir] [PATCH] Handle failed openvzLocateConfDir.
by Jim Meyering 21 Feb '08

21 Feb '08

While looking at misuses of write, I found problems in src/openvz_conf.c Here's the first fix: Handle failed openvzLocateConfDir. * src/openvz_conf.c (openvzLocateConfDir, openvzGetVPSUUID): (openvzSetUUID): Don't dereference NULL upon failure. Signed-off-by: Jim Meyering <meyering(a)redhat.com> --- src/openvz_conf.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/src/openvz_conf.c b/src/openvz_conf.c index 482de82..fb38b43 100644 --- a/src/openvz_conf.c +++ b/src/openvz_conf.c @@ -641,6 +641,8 @@ openvzGetVPSUUID(int vpsid, char *uuidstr) int fd, ret; conf_dir = openvzLocateConfDir(); + if (conf_dir != NULL) + return -1 sprintf(conf_file, "%s/%d.conf", conf_dir, vpsid); free(conf_dir); @@ -681,6 +683,8 @@ openvzSetUUID(int vpsid) int fd, ret; conf_dir = openvzLocateConfDir(); + if (conf_dir != NULL) + return -1; sprintf(conf_file, "%s/%d.conf", conf_dir, vpsid); free(conf_dir); @@ -722,6 +726,8 @@ int openvzAssignUUIDs(void) char ext[8]; conf_dir = openvzLocateConfDir(); + if (conf_dir != NULL) + return -1; dp = opendir(conf_dir); if(dp == NULL) { -- 1.5.4.2.134.g82883

2 6

[Libvir] [PATCH] Useless statement in openvzGetVPSInfo
by Anton Protopopov 21 Feb '08

21 Feb '08

Hi, the patch is now in attachement.. I think, that the statement if (!vm) vm = *pnext; will never be executed: in the first pass, we have already check this a few lines before; in next passes, vm remains the same... Anton

2 1

[libvir] [PATCH] Double free in openvzGetVPSInfo
by Anton Protopopov 21 Feb '08

21 Feb '08

Hi, without this openvzGetVPSInfo() will cause "double free" when parse bad (i.e., really bad or empty) output from vzlist. diff --git a/src/openvz_conf.c b/src/openvz_conf.c index 482de82..0bc7084 100644 --- a/src/openvz_conf.c +++ b/src/openvz_conf.c @@ -536,7 +536,6 @@ openvzGetVPSInfo(virConnectPtr conn) { if (fscanf(fp, "%d %s\n", &veid, status) != 2) { error(conn, VIR_ERR_INTERNAL_ERROR, "Failed to parse vzlist output"); - free(*pnext); goto error; } if(strcmp(status, "stopped")) { @@ -557,7 +556,6 @@ openvzGetVPSInfo(virConnectPtr conn) { vmdef = calloc(1, sizeof(*vmdef)); if(!vmdef) { error(conn, VIR_ERR_INTERNAL_ERROR, "calloc failed"); - free(*pnext); goto error; } @@ -568,7 +566,6 @@ openvzGetVPSInfo(virConnectPtr conn) { if(ret == -1) { error(conn, VIR_ERR_INTERNAL_ERROR, "UUID in config file malformed"); - free(*pnext); free(vmdef); goto error; }

3 2

[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

[Libvir] [PATCH] Enable another syntax-check rule.
by Jim Meyering 14 Feb '08

14 Feb '08

This one makes sure we don't use the "#ifdef HAVE_CONFIG_H" meme: Enable another syntax-check rule. * Makefile.cfg (local-checks-to-skip): Remove sc_no_have_config_h. * qemud/mdns.c: Remove "#ifdef HAVE_CONFIG_H". * Makefile.maint (sc_no_have_config_h): Tighten up regexp, so that the above mention of "HAVE_CONFIG_H" doesn't match. * .x-sc_no_have_config_h: New file, to exempt gnulib/ straggler. Signed-off-by: Jim Meyering <meyering(a)redhat.com> --- .x-sc_no_have_config_h | 1 + Makefile.cfg | 1 - Makefile.maint | 2 +- qemud/mdns.c | 2 -- 4 files changed, 2 insertions(+), 4 deletions(-) create mode 100644 .x-sc_no_have_config_h diff --git a/.x-sc_no_have_config_h b/.x-sc_no_have_config_h new file mode 100644 index 0000000..f106267 --- /dev/null +++ b/.x-sc_no_have_config_h @@ -0,0 +1 @@ +^gnulib/lib/strsep\.c$ diff --git a/Makefile.cfg b/Makefile.cfg index 4543ebd..7e8ddcf 100644 --- a/Makefile.cfg +++ b/Makefile.cfg @@ -28,7 +28,6 @@ url_dir_list = \ local-checks-to-skip = \ makefile_path_separator_check \ makefile-check \ - sc_no_have_config_h \ sc_tight_scope \ sc_GPL_version \ sc_always_defined_macros \ diff --git a/Makefile.maint b/Makefile.maint index 8624328..4b54baf 100644 --- a/Makefile.maint +++ b/Makefile.maint @@ -96,7 +96,7 @@ sc_file_system: exit 1; } || : sc_no_have_config_h: - @grep -n 'HAVE''_CONFIG_H' $$($(CVS_LIST_EXCEPT)) && \ + @grep -n '^# *if.*HAVE''_CONFIG_H' $$($(CVS_LIST_EXCEPT)) && \ { echo '$(ME): found use of HAVE''_CONFIG_H; remove' \ 1>&2; exit 1; } || : diff --git a/qemud/mdns.c b/qemud/mdns.c index deebd07..d47d18e 100644 --- a/qemud/mdns.c +++ b/qemud/mdns.c @@ -22,9 +22,7 @@ * Author: Daniel P. Berrange <berrange(a)redhat.com> */ -#ifdef HAVE_CONFIG_H #include <config.h> -#endif #include <time.h> #include <stdio.h> -- 1.5.4.35.g3cfc

2 2

[Libvir] New XML attributes for virtio
by Soren Hansen 07 Feb '08

07 Feb '08

Hi! I filed https://bugzilla.redhat.com/show_bug.cgi?id=431063 yesterday to track this issue. Quoting the bug report: "To use the new virtio capabilites available in kvm 60, special command line paramaters need to be passed to kvm. There should be a way to specify that a device should use virtio in the libvirt xml. I propose adding a "model" attribute to the interface element in the XML to be able to specify the type of NIC to emulate, e.g. 'virtio'. For the disk virtio I propose adding an 'interface' attribute to target element (inside the disk element). This interface could then be set to 'virtio', 'ide', 'scsi', etc.." Since I wrote the bug report, I noticed there's no way to specify which graphics card, you'd like to emulate. A 'model' attribute could probably be added to the graphics element as well. Comments? -- Soren Hansen Ubuntu Server Team http://www.ubuntu.com/

2 1

[Libvir] dumpxml define not idempotent due to <bootlader/> tag
by Guido Guenther 07 Feb '08

07 Feb '08

Hi, when using "virsh dumpxml <domain> > xmlfile" on a running paravirt xen domain that has no bootloader entry whatsoever I get: ... <bootloader/> <os> <type>linux</type> <kernel>/boot/vmlinuz-vm</kernel> <initrd>/boot/initrd.img-vm</initrd> <cmdline>root=/dev/sda1 ro </cmdline> </os> ... reimporting this via "virsh define xmlfile" and then dumping again gives something like: ... <bootloader/> <os> <type>linux</type> </os> ... since a bootloader tag is found the kernel and initrd entries are being dropped. My hack is to ignore empty bootloader statements for the moment: diff --git a/src/xend_internal.c b/src/xend_internal.c index fd38a61..5428cd7 100644 --- a/src/xend_internal.c +++ b/src/xend_internal.c @@ -1438,9 +1438,6 @@ xend_parse_sexp_desc(virConnectPtr conn, struct sexpr *root, if (tmp != NULL) { bootloader = 1; virBufferVSprintf(&buf, " <bootloader>%s</bootloader>\n", tmp); - } else if (sexpr_has(root, "domain/bootloader")) { - bootloader = 1; - virBufferVSprintf(&buf, " <bootloader/>\n"); } tmp = sexpr_node(root, "domain/bootloader_args"); if (tmp != NULL && bootloader) { Would that be the right place to fix this? Cheers, -- Guido

3 2

[Libvir] [PATCH] Fix the function that remove the element of the hash table.
by Hiroyuki Kaguchi 07 Feb '08

07 Feb '08

There are two logic error and a unnecessary else-statement in virHashRemoveSet function. This patch fix the following. (1/3) The logic error that use released memory area. (2/3) The logic error that doesn't remove elements. (3/3) Unnecessary else-statement. (1/3) The logic error that use released memory area. This bug causes the crash of virt-manager or virsh. If "virsh undefine" command is executed, "Segmentation Fault" is caused. The result of executing "valgrind virsh" command is: virsh # list --all ==3337== Invalid read of size 4 ==3337== at 0x4016A21: virHashRemoveSet (hash.c:562) ==3337== by 0x403ACF4: xenXMConfigCacheRefresh (xm_internal.c:458) ==3337== by 0x4040D58: xenXMNumOfDefinedDomains (xm_internal.c:2518) ==3337== by 0x40245C3: xenUnifiedNumOfDefinedDomains (xen_unified.c:1004) ==3337== by 0x4013730: virConnectNumOfDefinedDomains (libvirt.c:2446) ==3337== by 0x804AE81: cmdList (virsh.c:577) ==3337== by 0x8052E6E: vshCommandRun (virsh.c:4052) ==3337== by 0x8054E2D: main (virsh.c:5036) ==3337== Address 0x4282AB8 is 0 bytes inside a block of size 16 free'd ==3337== at 0x4004FDA: free (vg_replace_malloc.c:233) ==3337== by 0x40169A0: virHashRemoveSet (hash.c:545) ==3337== by 0x403ACF4: xenXMConfigCacheRefresh (xm_internal.c:458) ==3337== by 0x4040D58: xenXMNumOfDefinedDomains (xm_internal.c:2518) ==3337== by 0x40245C3: xenUnifiedNumOfDefinedDomains (xen_unified.c:1004) ==3337== by 0x4013730: virConnectNumOfDefinedDomains (libvirt.c:2446) ==3337== by 0x804AE81: cmdList (virsh.c:577) ==3337== by 0x8052E6E: vshCommandRun (virsh.c:4052) ==3337== by 0x8054E2D: main (virsh.c:5036) The current removing logic is: 1. search for node that be removed in the hash table. The removing cursor(pointer) point to "element-B". +-hash table---+ | +----------+ | +----------+ +----------+ | |element-A |-|-->|element-B |-->|element-C | | +----------+ | +----------+ +----------+ | |element-D | | | +----------+ | | . | | . | +--------------+ 2. free "element-B". The removing cursor point to invalid address +-hash table---+ | +----------+ | +----------+ | |element-A |-|-->|element-C | | +----------+ | +----------+ | |element-D | | | +----------+ | | . | | . | +--------------+ 3. try to move the removing cursor to next node. At this time, the error occurs. (2/3) The logic error that doesn't remove elements. The current removing logic is: 1. search for node that will be removed in the hash table. The removing cursor point to "element-A". +-hash table---+ | +----------+ | +----------+ +----------+ | |element-A |-|-->|element-B |-->|element-C | | +----------+ | +----------+ +----------+ | |element-D | | | +----------+ | | . | | . | +--------------+ 2. copy "element-B" to "element-A". +-hash table---+ | +----------+ | +----------+ +----------+ | |element-B'|-|-->|element-B |-->|element-C | | +----------+ | +----------+ +----------+ | |element-D | | | +----------+ | | . | | . | +--------------+ 3. remove "element-B" The removing cursor point to "element-D". "element-C" is skipped. +-hash table---+ | +----------+ | +----------+ | |element-B'|-|-->|element-C | | +----------+ | +----------+ | |element-D | | | +----------+ | | . | | . | +--------------+ (3/3) Unnecessary else-statement. There is else-statement that set NULL to the NULL pointer. Thanks, Hiroyuki Kaguchi Index: hash.c =================================================================== RCS file: /data/cvs/libvirt/src/hash.c,v retrieving revision 1.27 diff -u -r1.27 hash.c --- hash.c 21 Jan 2008 16:29:10 -0000 1.27 +++ hash.c 28 Jan 2008 06:48:09 -0000 @@ -543,6 +543,7 @@ if (prev) { prev->next = entry->next; free(entry); + entry = prev; } else { if (entry->next == NULL) { entry->valid = 0; @@ -553,6 +554,7 @@ sizeof(virHashEntry)); free(entry); entry = NULL; + i--; } } table->nbElems--; @@ -560,8 +562,6 @@ prev = entry; if (entry) { entry = entry->next; - } else { - entry = NULL; } } }

4 6

Re: [Libvir] [patch 3/3] Do not inline xstrtol functions
by Daniel Veillard 07 Feb '08

07 Feb '08

On Wed, Feb 06, 2008 at 11:07:55PM +0000, Mark McLoughlin wrote: > Our strtol() variants are all marked "static inline" > and with gcc 4.3 we get: > > internal.h:272: error: inlining failed in call to 'xstrtol_i': call is unlikely and code size would grow > > This patch renames them to virStrToLong() and exports > them from the library as private symbols. Hum, I don't like too much adding more exported symbols > Alternative is to not build with -Winline. That sounds a weak way to try to avoid a problem, we should not rely on just compiler options to get the code to compile and link. My preference would be to use the patch to make them real internal APIs without exporting all the functions, I think only xstrtol_i is used by external programs (virsh and qemud), and maybe we can add only that one to the list of exported symbols. Daniel -- Red Hat Virtualization group http://redhat.com/virtualization/ Daniel Veillard | virtualization library http://libvirt.org/ veillard(a)redhat.com | libxml GNOME XML XSLT toolkit http://xmlsoft.org/ http://veillard.com/ | Rpmfind RPM search engine http://rpmfind.net/

3 5

[Libvir] [PATCH] Mark all qemudLog diagnostics for translation.
by Jim Meyering 07 Feb '08

07 Feb '08

Subject: [PATCH] Mark all qemudLog diagnostics for translation. * po/POTFILES.in: Add names of many new files. * Makefile.maint (err_func_re): Add qemudLog. Mark diagnostics with _(...). Split some long lines. * qemud/qemud.c (remoteCheckCertFile, remoteInitializeGnuTLS): (qemudDispatchSignalEvent, qemudSetCloseExec, qemudSetNonBlock): (qemudWritePidFile, qemudListenUnix, remoteMakeSockets): (remoteListenTCP, qemudInitPaths, qemudInitialize): (qemudNetworkInit, remoteInitializeTLSSession, remoteCheckDN): (remoteCheckCertificate, remoteCheckAccess, qemudDispatchServer): (qemudClientReadBuf, qemudDispatchClientRead): (qemudClientWriteBuf, qemudDispatchClientWrite, qemudOneLoop): (remoteConfigGetStringList, checkType, GET_CONF_STR): (remoteConfigGetAuth, remoteReadConfigFile, main): * qemud/remote.c (remoteDispatchAuthSaslInit, remoteSASLCheckSSF): (remoteSASLCheckAccess, remoteDispatchAuthSaslStart): (remoteDispatchAuthSaslStep, remoteDispatchAuthSaslInit): (remoteDispatchAuthSaslStart, remoteDispatchAuthSaslStep): (qemudGetSocketIdentity, remoteDispatchAuthPolkit): * src/iptables.c (notifyRulesUpdated, MAX_FILE_LEN, iptRulesSave): (iptRulesReload): * src/qemu_conf.c (qemudExtractVersionInfo, qemudLoadConfig): (qemudLoadNetworkConfig, qemudScanConfigDir): * src/qemu_driver.c (qemudSetCloseExec, qemudSetNonBlock): (qemudAutostartConfigs, qemudStartup, qemudReload): (qemudWaitForMonitor, qemudStartVMDaemon, qemudVMData): (qemudShutdownVMDaemon, qemudStartNetworkDaemon): (qemudShutdownNetworkDaemon, qemudMonitorCommand): (qemudDomainUndefine, qemudNetworkUndefine): * src/uuid.c (virUUIDGenerate): * src/xm_internal.c (xenXMAttachInterface): --- Makefile.maint | 2 +- po/POTFILES.in | 6 ++ qemud/qemud.c | 176 +++++++++++++++++++++++++++++------------------------ qemud/remote.c | 94 +++++++++++++++++------------ src/iptables.c | 21 ++++--- src/qemu_conf.c | 40 ++++++++---- src/qemu_driver.c | 56 +++++++++-------- src/uuid.c | 7 +- src/xm_internal.c | 10 ++-- 9 files changed, 234 insertions(+), 178 deletions(-) diff --git a/Makefile.maint b/Makefile.maint index 9d41bd2..8624328 100644 --- a/Makefile.maint +++ b/Makefile.maint @@ -289,7 +289,7 @@ sc_two_space_separator_in_usage: 1>&2; exit 1; } || : err_func_re = \ -(DISABLE_fprintf|(xmlRpc|vir(Xend|XML|Hash|Conf|Test|LibConn))Error) +(DISABLE_fprintf|qemudLog|(xmlRpc|vir(Xend|XML|Hash|Conf|Test|LibConn))Error) # Look for diagnostics that aren't marked for translation. # This won't find any for which error's format string is on a separate line. diff --git a/po/POTFILES.in b/po/POTFILES.in index b4b9cd2..a1e78fa 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -1,12 +1,18 @@ gnulib/lib/gai_strerror.c +qemud/remote.c +qemud/qemud.c src/conf.c src/console.c src/hash.c +src/iptables.c src/libvirt.c src/proxy_internal.c +src/qemu_conf.c +src/qemu_driver.c src/remote_internal.c src/sexpr.c src/test.c +src/uuid.c src/virsh.c src/virterror.c src/xen_internal.c diff --git a/qemud/qemud.c b/qemud/qemud.c index e853538..b0e2558 100644 --- a/qemud/qemud.c +++ b/qemud/qemud.c @@ -1,7 +1,7 @@ /* * qemud.c: daemon start of day, guest process & i/o management * - * Copyright (C) 2006, 2007 Red Hat, Inc. + * Copyright (C) 2006, 2007, 2008 Red Hat, Inc. * Copyright (C) 2006 Daniel P. Berrange * * This library is free software; you can redistribute it and/or @@ -137,7 +137,7 @@ remoteCheckCertFile(const char *type, const char *file) { struct stat sb; if (stat(file, &sb) < 0) { - qemudLog (QEMUD_ERR, "Cannot access %s '%s': %s (%d)", + qemudLog (QEMUD_ERR, _("Cannot access %s '%s': %s (%d)"), type, file, strerror(errno), errno); return -1; } @@ -154,7 +154,7 @@ remoteInitializeGnuTLS (void) err = gnutls_certificate_allocate_credentials (&x509_cred); if (err) { - qemudLog (QEMUD_ERR, "gnutls_certificate_allocate_credentials: %s", + qemudLog (QEMUD_ERR, _("gnutls_certificate_allocate_credentials: %s"), gnutls_strerror (err)); return -1; } @@ -167,7 +167,7 @@ remoteInitializeGnuTLS (void) err = gnutls_certificate_set_x509_trust_file (x509_cred, ca_file, GNUTLS_X509_FMT_PEM); if (err < 0) { - qemudLog (QEMUD_ERR, "gnutls_certificate_set_x509_trust_file: %s", + qemudLog (QEMUD_ERR, _("gnutls_certificate_set_x509_trust_file: %s"), gnutls_strerror (err)); return -1; } @@ -181,7 +181,7 @@ remoteInitializeGnuTLS (void) err = gnutls_certificate_set_x509_crl_file (x509_cred, crl_file, GNUTLS_X509_FMT_PEM); if (err < 0) { - qemudLog (QEMUD_ERR, "gnutls_certificate_set_x509_crl_file: %s", + qemudLog (QEMUD_ERR, _("gnutls_certificate_set_x509_crl_file: %s"), gnutls_strerror (err)); return -1; } @@ -199,7 +199,7 @@ remoteInitializeGnuTLS (void) cert_file, key_file, GNUTLS_X509_FMT_PEM); if (err < 0) { - qemudLog (QEMUD_ERR, "gnutls_certificate_set_x509_key_file: %s", + qemudLog (QEMUD_ERR, _("gnutls_certificate_set_x509_key_file: %s"), gnutls_strerror (err)); return -1; } @@ -212,13 +212,13 @@ remoteInitializeGnuTLS (void) */ err = gnutls_dh_params_init (&dh_params); if (err < 0) { - qemudLog (QEMUD_ERR, "gnutls_dh_params_init: %s", + qemudLog (QEMUD_ERR, _("gnutls_dh_params_init: %s"), gnutls_strerror (err)); return -1; } err = gnutls_dh_params_generate2 (dh_params, DH_BITS); if (err < 0) { - qemudLog (QEMUD_ERR, "gnutls_dh_params_generate2: %s", + qemudLog (QEMUD_ERR, _("gnutls_dh_params_generate2: %s"), gnutls_strerror (err)); return -1; } @@ -236,7 +236,7 @@ static void qemudDispatchSignalEvent(int fd ATTRIBUTE_UNUSED, int ret; if (read(server->sigread, &sigc, 1) != 1) { - qemudLog(QEMUD_ERR, "Failed to read from signal pipe: %s", + qemudLog(QEMUD_ERR, _("Failed to read from signal pipe: %s"), strerror(errno)); return; } @@ -245,15 +245,15 @@ static void qemudDispatchSignalEvent(int fd ATTRIBUTE_UNUSED, switch (sigc) { case SIGHUP: - qemudLog(QEMUD_INFO, "Reloading configuration on SIGHUP"); + qemudLog(QEMUD_INFO, _("Reloading configuration on SIGHUP")); if (virStateReload() < 0) - qemudLog(QEMUD_WARN, "Error while reloading drivers"); + qemudLog(QEMUD_WARN, _("Error while reloading drivers")); break; case SIGINT: case SIGQUIT: case SIGTERM: - qemudLog(QEMUD_WARN, "Shutting down on signal %d", sigc); + qemudLog(QEMUD_WARN, _("Shutting down on signal %d"), sigc); server->shutdown = 1; break; @@ -274,7 +274,7 @@ static int qemudSetCloseExec(int fd) { goto error; return 0; error: - qemudLog(QEMUD_ERR, "Failed to set close-on-exec file descriptor flag"); + qemudLog(QEMUD_ERR, _("Failed to set close-on-exec file descriptor flag")); return -1; } @@ -288,7 +288,7 @@ static int qemudSetNonBlock(int fd) { goto error; return 0; error: - qemudLog(QEMUD_ERR, "Failed to set non-blocking file descriptor flag"); + qemudLog(QEMUD_ERR, _("Failed to set non-blocking file descriptor flag")); return -1; } @@ -430,27 +430,27 @@ static int qemudWritePidFile(const char *pidFile) { return 0; if ((fd = open(pidFile, O_WRONLY|O_CREAT|O_EXCL, 0644)) < 0) { - qemudLog(QEMUD_ERR, "Failed to open pid file '%s' : %s", + qemudLog(QEMUD_ERR, _("Failed to open pid file '%s' : %s"), pidFile, strerror(errno)); return -1; } if (!(fh = fdopen(fd, "w"))) { - qemudLog(QEMUD_ERR, "Failed to fdopen pid file '%s' : %s", + qemudLog(QEMUD_ERR, _("Failed to fdopen pid file '%s' : %s"), pidFile, strerror(errno)); close(fd); return -1; } if (fprintf(fh, "%lu\n", (unsigned long)getpid()) < 0) { - qemudLog(QEMUD_ERR, "Failed to write to pid file '%s' : %s", + qemudLog(QEMUD_ERR, _("Failed to write to pid file '%s' : %s"), pidFile, strerror(errno)); close(fd); return -1; } if (fclose(fh) == EOF) { - qemudLog(QEMUD_ERR, "Failed to close pid file '%s' : %s", + qemudLog(QEMUD_ERR, _("Failed to close pid file '%s' : %s"), pidFile, strerror(errno)); return -1; } @@ -466,7 +466,8 @@ static int qemudListenUnix(struct qemud_server *server, gid_t oldgrp; if (!sock) { - qemudLog(QEMUD_ERR, "Failed to allocate memory for struct qemud_socket"); + qemudLog(QEMUD_ERR, + _("Failed to allocate memory for struct qemud_socket")); return -1; } @@ -476,7 +477,7 @@ static int qemudListenUnix(struct qemud_server *server, sock->auth = auth; if ((sock->fd = socket(PF_UNIX, SOCK_STREAM, 0)) < 0) { - qemudLog(QEMUD_ERR, "Failed to create socket: %s", + qemudLog(QEMUD_ERR, _("Failed to create socket: %s"), strerror(errno)); goto cleanup; } @@ -498,7 +499,7 @@ static int qemudListenUnix(struct qemud_server *server, setgid(unix_sock_gid); if (bind(sock->fd, (struct sockaddr *)&addr, sizeof(addr)) < 0) { - qemudLog(QEMUD_ERR, "Failed to bind socket to '%s': %s", + qemudLog(QEMUD_ERR, _("Failed to bind socket to '%s': %s"), path, strerror(errno)); goto cleanup; } @@ -507,7 +508,7 @@ static int qemudListenUnix(struct qemud_server *server, setgid(oldgrp); if (listen(sock->fd, 30) < 0) { - qemudLog(QEMUD_ERR, "Failed to listen for connections on '%s': %s", + qemudLog(QEMUD_ERR, _("Failed to listen for connections on '%s': %s"), path, strerror(errno)); goto cleanup; } @@ -516,7 +517,7 @@ static int qemudListenUnix(struct qemud_server *server, POLLIN| POLLERR | POLLHUP, qemudDispatchServerEvent, server) < 0) { - qemudLog(QEMUD_ERR, "Failed to add server event callback"); + qemudLog(QEMUD_ERR, _("Failed to add server event callback")); goto cleanup; } @@ -545,7 +546,7 @@ remoteMakeSockets (int *fds, int max_fds, int *nfds_r, const char *service) int e = getaddrinfo (NULL, service, &hints, &ai); if (e != 0) { - qemudLog (QEMUD_ERR, "getaddrinfo: %s\n", gai_strerror (e)); + qemudLog (QEMUD_ERR, _("getaddrinfo: %s\n"), gai_strerror (e)); return -1; } @@ -554,7 +555,7 @@ remoteMakeSockets (int *fds, int max_fds, int *nfds_r, const char *service) fds[*nfds_r] = socket (runp->ai_family, runp->ai_socktype, runp->ai_protocol); if (fds[*nfds_r] == -1) { - qemudLog (QEMUD_ERR, "socket: %s", strerror (errno)); + qemudLog (QEMUD_ERR, _("socket: %s"), strerror (errno)); return -1; } @@ -563,14 +564,14 @@ remoteMakeSockets (int *fds, int max_fds, int *nfds_r, const char *service) if (bind (fds[*nfds_r], runp->ai_addr, runp->ai_addrlen) == -1) { if (errno != EADDRINUSE) { - qemudLog (QEMUD_ERR, "bind: %s", strerror (errno)); + qemudLog (QEMUD_ERR, _("bind: %s"), strerror (errno)); return -1; } close (fds[*nfds_r]); } else { if (listen (fds[*nfds_r], SOMAXCONN) == -1) { - qemudLog (QEMUD_ERR, "listen: %s", strerror (errno)); + qemudLog (QEMUD_ERR, _("listen: %s"), strerror (errno)); return -1; } ++*nfds_r; @@ -607,7 +608,7 @@ remoteListenTCP (struct qemud_server *server, if (!sock) { qemudLog (QEMUD_ERR, - "remoteListenTCP: calloc: %s", strerror (errno)); + _("remoteListenTCP: calloc: %s"), strerror (errno)); return -1; } @@ -638,7 +639,7 @@ remoteListenTCP (struct qemud_server *server, if (listen (sock->fd, 30) < 0) { qemudLog (QEMUD_ERR, - "remoteListenTCP: listen: %s", strerror (errno)); + _("remoteListenTCP: listen: %s"), strerror (errno)); return -1; } @@ -646,7 +647,7 @@ remoteListenTCP (struct qemud_server *server, POLLIN| POLLERR | POLLHUP, qemudDispatchServerEvent, server) < 0) { - qemudLog(QEMUD_ERR, "Failed to add server event callback"); + qemudLog(QEMUD_ERR, _("Failed to add server event callback")); return -1; } @@ -680,7 +681,7 @@ static int qemudInitPaths(struct qemud_server *server, struct passwd *pw; if (!(pw = getpwuid(uid))) { - qemudLog(QEMUD_ERR, "Failed to find user record for uid '%d': %s", + qemudLog(QEMUD_ERR, _("Failed to find user record for uid '%d': %s"), uid, strerror(errno)); return -1; } @@ -696,7 +697,8 @@ static int qemudInitPaths(struct qemud_server *server, return 0; snprintf_error: - qemudLog(QEMUD_ERR, "Resulting path to long for buffer in qemudInitPaths()"); + qemudLog(QEMUD_ERR, + _("Resulting path to long for buffer in qemudInitPaths()")); return -1; } @@ -704,7 +706,7 @@ static struct qemud_server *qemudInitialize(int sigread) { struct qemud_server *server; if (!(server = calloc(1, sizeof(*server)))) { - qemudLog(QEMUD_ERR, "Failed to allocate struct qemud_server"); + qemudLog(QEMUD_ERR, _("Failed to allocate struct qemud_server")); return NULL; } @@ -747,7 +749,8 @@ static struct qemud_server *qemudNetworkInit(struct qemud_server *server) { auth_tcp == REMOTE_AUTH_SASL || auth_tls == REMOTE_AUTH_SASL) { if ((err = sasl_server_init(NULL, "libvirt")) != SASL_OK) { - qemudLog(QEMUD_ERR, "Failed to initialize SASL authentication %s", + qemudLog(QEMUD_ERR, + _("Failed to initialize SASL authentication %s"), sasl_errstring(err, NULL, NULL)); goto cleanup; } @@ -761,7 +764,8 @@ static struct qemud_server *qemudNetworkInit(struct qemud_server *server) { dbus_error_init(&derr); server->sysbus = dbus_bus_get(DBUS_BUS_SYSTEM, &derr); if (!(server->sysbus)) { - qemudLog(QEMUD_ERR, "Failed to connect to system bus for PolicyKit auth: %s", + qemudLog(QEMUD_ERR, + _("Failed to connect to system bus for PolicyKit auth: %s"), derr.message); dbus_error_free(&derr); goto cleanup; @@ -872,7 +876,7 @@ remoteInitializeTLSSession (void) return session; failed: - qemudLog (QEMUD_ERR, "remoteInitializeTLSSession: %s", + qemudLog (QEMUD_ERR, _("remoteInitializeTLSSession: %s"), gnutls_strerror (err)); return NULL; } @@ -889,7 +893,7 @@ remoteCheckDN (gnutls_x509_crt_t cert) err = gnutls_x509_crt_get_dn (cert, name, &namesize); if (err != 0) { qemudLog (QEMUD_ERR, - "remoteCheckDN: gnutls_x509_cert_get_dn: %s", + _("remoteCheckDN: gnutls_x509_cert_get_dn: %s"), gnutls_strerror (err)); return 0; } @@ -908,7 +912,7 @@ remoteCheckDN (gnutls_x509_crt_t cert) #ifdef ENABLE_DEBUG /* Print the client's DN. */ qemudLog (QEMUD_DEBUG, - "remoteCheckDN: failed: client DN is %s", name); + _("remoteCheckDN: failed: client DN is %s"), name); #endif return 0; // Not found. @@ -924,36 +928,42 @@ remoteCheckCertificate (gnutls_session_t session) time_t now; if ((ret = gnutls_certificate_verify_peers2 (session, &status)) < 0){ - qemudLog (QEMUD_ERR, "remoteCheckCertificate: verify failed: %s", + qemudLog (QEMUD_ERR, _("remoteCheckCertificate: verify failed: %s"), gnutls_strerror (ret)); return -1; } if (status != 0) { if (status & GNUTLS_CERT_INVALID) - qemudLog (QEMUD_ERR, "remoteCheckCertificate: the client certificate is not trusted."); + qemudLog (QEMUD_ERR, _("remoteCheckCertificate: " + "the client certificate is not trusted.")); if (status & GNUTLS_CERT_SIGNER_NOT_FOUND) - qemudLog (QEMUD_ERR, "remoteCheckCertificate: the client certificate hasn't got a known issuer."); + qemudLog (QEMUD_ERR, _("remoteCheckCertificate: the client " + "certificate has unknown issuer.")); if (status & GNUTLS_CERT_REVOKED) - qemudLog (QEMUD_ERR, "remoteCheckCertificate: the client certificate has been revoked."); + qemudLog (QEMUD_ERR, _("remoteCheckCertificate: " + "the client certificate has been revoked.")); #ifndef GNUTLS_1_0_COMPAT if (status & GNUTLS_CERT_INSECURE_ALGORITHM) - qemudLog (QEMUD_ERR, "remoteCheckCertificate: the client certificate uses an insecure algorithm."); + qemudLog (QEMUD_ERR, + _("remoteCheckCertificate: the client certificate" + " uses an insecure algorithm.")); #endif return -1; } if (gnutls_certificate_type_get (session) != GNUTLS_CRT_X509) { - qemudLog (QEMUD_ERR, "remoteCheckCertificate: certificate is not X.509"); + qemudLog (QEMUD_ERR, _("remoteCheckCertificate: " + "certificate is not X.509")); return -1; } if (!(certs = gnutls_certificate_get_peers(session, &nCerts))) { - qemudLog (QEMUD_ERR, "remoteCheckCertificate: no peers"); + qemudLog (QEMUD_ERR, _("remoteCheckCertificate: no peers")); return -1; } @@ -963,7 +973,8 @@ remoteCheckCertificate (gnutls_session_t session) gnutls_x509_crt_t cert; if (gnutls_x509_crt_init (&cert) < 0) { - qemudLog (QEMUD_ERR, "remoteCheckCertificate: gnutls_x509_crt_init failed"); + qemudLog (QEMUD_ERR, + _("remoteCheckCertificate: gnutls_x509_crt_init failed")); return -1; } @@ -973,13 +984,15 @@ remoteCheckCertificate (gnutls_session_t session) } if (gnutls_x509_crt_get_expiration_time (cert) < now) { - qemudLog (QEMUD_ERR, "remoteCheckCertificate: the client certificate has expired"); + qemudLog (QEMUD_ERR, _("remoteCheckCertificate: " + "the client certificate has expired")); gnutls_x509_crt_deinit (cert); return -1; } if (gnutls_x509_crt_get_activation_time (cert) > now) { - qemudLog (QEMUD_ERR, "remoteCheckCertificate: the client certificate is not yet activated"); + qemudLog (QEMUD_ERR, _("remoteCheckCertificate: the client " + "certificate is not yet activated")); gnutls_x509_crt_deinit (cert); return -1; } @@ -987,7 +1000,7 @@ remoteCheckCertificate (gnutls_session_t session) if (i == 0) { if (!remoteCheckDN (cert)) { /* This is the most common error: make it informative. */ - qemudLog (QEMUD_ERR, "remoteCheckCertificate: client's Distinguished Name is not on the list of allowed clients (tls_allowed_dn_list). Use 'openssl x509 -in clientcert.pem -text' to view the Distinguished Name field in the client certificate, or run this daemon with --verbose option."); + qemudLog (QEMUD_ERR, _("remoteCheckCertificate: client's Distinguished Name is not on the list of allowed clients (tls_allowed_dn_list). Use 'openssl x509 -in clientcert.pem -text' to view the Distinguished Name field in the client certificate, or run this daemon with --verbose option.")); gnutls_x509_crt_deinit (cert); return -1; } @@ -1003,9 +1016,9 @@ remoteCheckAccess (struct qemud_client *client) { /* Verify client certificate. */ if (remoteCheckCertificate (client->tlssession) == -1) { - qemudLog (QEMUD_ERR, "remoteCheckCertificate: failed to verify client's certificate"); + qemudLog (QEMUD_ERR, _("remoteCheckCertificate: failed to verify client's certificate")); if (!tls_no_verify_certificate) return -1; - else qemudLog (QEMUD_INFO, "remoteCheckCertificate: tls_no_verify_certificate is set so the bad certificate is ignored"); + else qemudLog (QEMUD_INFO, _("remoteCheckCertificate: tls_no_verify_certificate is set so the bad certificate is ignored")); } /* Checks have succeeded. Write a '\1' byte back to the client to @@ -1029,7 +1042,7 @@ static int qemudDispatchServer(struct qemud_server *server, struct qemud_socket if ((fd = accept(sock->fd, (struct sockaddr *)&addr, &addrlen)) < 0) { if (errno == EAGAIN) return 0; - qemudLog(QEMUD_ERR, "Failed to accept connection: %s", strerror(errno)); + qemudLog(QEMUD_ERR, _("Failed to accept connection: %s"), strerror(errno)); return -1; } @@ -1087,7 +1100,7 @@ static int qemudDispatchServer(struct qemud_server *server, struct qemud_socket if (qemudRegisterClientEvent (server, client, 0) < 0) goto cleanup; } else { - qemudLog (QEMUD_ERR, "TLS handshake failed: %s", + qemudLog (QEMUD_ERR, _("TLS handshake failed: %s"), gnutls_strerror (ret)); goto cleanup; } @@ -1152,7 +1165,7 @@ static int qemudClientReadBuf(struct qemud_server *server, if ((ret = read (client->fd, data, len)) <= 0) { if (ret == 0 || errno != EAGAIN) { if (ret != 0) - qemudLog (QEMUD_ERR, "read: %s", strerror (errno)); + qemudLog (QEMUD_ERR, _("read: %s"), strerror (errno)); qemudDispatchClientFailure(server, client); } return -1; @@ -1165,7 +1178,7 @@ static int qemudClientReadBuf(struct qemud_server *server, if (ret == 0 || (ret != GNUTLS_E_AGAIN && ret != GNUTLS_E_INTERRUPTED)) { if (ret != 0) - qemudLog (QEMUD_ERR, "gnutls_record_recv: %s", + qemudLog (QEMUD_ERR, _("gnutls_record_recv: %s"), gnutls_strerror (ret)); qemudDispatchClientFailure (server, client); } @@ -1324,7 +1337,7 @@ static void qemudDispatchClientRead(struct qemud_server *server, struct qemud_cl else if (qemudRegisterClientEvent (server, client, 1) < 0) qemudDispatchClientFailure (server, client); } else if (ret != GNUTLS_E_AGAIN && ret != GNUTLS_E_INTERRUPTED) { - qemudLog (QEMUD_ERR, "TLS handshake failed: %s", + qemudLog (QEMUD_ERR, _("TLS handshake failed: %s"), gnutls_strerror (ret)); qemudDispatchClientFailure (server, client); } else { @@ -1349,7 +1362,7 @@ static int qemudClientWriteBuf(struct qemud_server *server, if (!client->tlssession) { if ((ret = write(client->fd, data, len)) == -1) { if (errno != EAGAIN) { - qemudLog (QEMUD_ERR, "write: %s", strerror (errno)); + qemudLog (QEMUD_ERR, _("write: %s"), strerror (errno)); qemudDispatchClientFailure(server, client); } return -1; @@ -1360,7 +1373,7 @@ static int qemudClientWriteBuf(struct qemud_server *server, qemudDispatchClientFailure (server, client); else if (ret < 0) { if (ret != GNUTLS_E_INTERRUPTED && ret != GNUTLS_E_AGAIN) { - qemudLog (QEMUD_ERR, "gnutls_record_send: %s", + qemudLog (QEMUD_ERR, _("gnutls_record_send: %s"), gnutls_strerror (ret)); qemudDispatchClientFailure (server, client); } @@ -1464,7 +1477,7 @@ static void qemudDispatchClientWrite(struct qemud_server *server, struct qemud_c else if (qemudRegisterClientEvent (server, client, 1)) qemudDispatchClientFailure (server, client); } else if (ret != GNUTLS_E_AGAIN && ret != GNUTLS_E_INTERRUPTED) { - qemudLog (QEMUD_ERR, "TLS handshake failed: %s", + qemudLog (QEMUD_ERR, _("TLS handshake failed: %s"), gnutls_strerror (ret)); qemudDispatchClientFailure (server, client); } else { @@ -1572,7 +1585,7 @@ static int qemudOneLoop(void) { if (errors) { sig_errors -= errors; qemudLog (QEMUD_ERR, - "Signal handler reported %d errors: last error: %s", + _("Signal handler reported %d errors: last error: %s"), errors, strerror (sig_lasterrno)); return -1; } @@ -1668,14 +1681,14 @@ remoteConfigGetStringList(virConfPtr conf, const char *key, char ***list_arg, list = malloc (2 * sizeof (*list)); if (list == NULL) { qemudLog (QEMUD_ERR, - "failed to allocate memory for %s config list", key); + _("failed to allocate memory for %s config list"), key); return -1; } list[0] = strdup (p->str); list[1] = NULL; if (list[0] == NULL) { qemudLog (QEMUD_ERR, - "failed to allocate memory for %s config list value", + _("failed to allocate memory for %s config list value"), key); free (list); return -1; @@ -1690,13 +1703,13 @@ remoteConfigGetStringList(virConfPtr conf, const char *key, char ***list_arg, list = calloc (1+len, sizeof (*list)); if (list == NULL) { qemudLog (QEMUD_ERR, - "failed to allocate memory for %s config list", key); + _("failed to allocate memory for %s config list"), key); return -1; } for (i = 0, pp = p->list; pp; ++i, pp = pp->next) { if (pp->type != VIR_CONF_STRING) { - qemudLog (QEMUD_ERR, "remoteReadConfigFile: %s: %s:" - " must be a string or list of strings\n", + qemudLog (QEMUD_ERR, _("remoteReadConfigFile: %s: %s:" + " must be a string or list of strings\n"), filename, key); free (list); return -1; @@ -1707,8 +1720,8 @@ remoteConfigGetStringList(virConfPtr conf, const char *key, char ***list_arg, for (j = 0 ; j < i ; j++) free (list[j]); free (list); - qemudLog (QEMUD_ERR, "failed to allocate memory" - " for %s config list value", key); + qemudLog (QEMUD_ERR, _("failed to allocate memory" + " for %s config list value"), key); return -1; } @@ -1718,8 +1731,8 @@ remoteConfigGetStringList(virConfPtr conf, const char *key, char ***list_arg, } default: - qemudLog (QEMUD_ERR, "remoteReadConfigFile: %s: %s:" - " must be a string or list of strings\n", + qemudLog (QEMUD_ERR, _("remoteReadConfigFile: %s: %s:" + " must be a string or list of strings\n"), filename, key); return -1; } @@ -1735,8 +1748,8 @@ checkType (virConfValuePtr p, const char *filename, { if (p->type != required_type) { qemudLog (QEMUD_ERR, - "remoteReadConfigFile: %s: %s: invalid type:" - " got %s; expected %s\n", filename, key, + _("remoteReadConfigFile: %s: %s: invalid type:" + " got %s; expected %s\n"), filename, key, virConfTypeName (p->type), virConfTypeName (required_type)); return -1; @@ -1756,7 +1769,7 @@ checkType (virConfValuePtr p, const char *filename, goto free_and_fail; \ (var_name) = strdup (p->str); \ if ((var_name) == NULL) { \ - qemudLog (QEMUD_ERR, "remoteReadConfigFile: %s\n", \ + qemudLog (QEMUD_ERR, _("remoteReadConfigFile: %s\n"), \ strerror (errno)); \ goto free_and_fail; \ } \ @@ -1799,7 +1812,9 @@ static int remoteConfigGetAuth(virConfPtr conf, const char *key, int *auth, cons *auth = REMOTE_AUTH_POLKIT; #endif } else { - qemudLog (QEMUD_ERR, "remoteReadConfigFile: %s: %s: unsupported auth %s\n", filename, key, p->str); + qemudLog (QEMUD_ERR, + _("remoteReadConfigFile: %s: %s: unsupported auth %s\n"), + filename, key, p->str); return -1; } @@ -1873,11 +1888,12 @@ remoteReadConfigFile (struct qemud_server *server, const char *filename) GET_CONF_STR (conf, filename, unix_sock_group); if (unix_sock_group) { if (getuid() != 0) { - qemudLog (QEMUD_WARN, "Cannot set group when not running as root"); + qemudLog (QEMUD_WARN, + _("Cannot set group when not running as root")); } else { struct group *grp = getgrnam(unix_sock_group); if (!grp) { - qemudLog (QEMUD_ERR, "Failed to lookup group '%s'", + qemudLog (QEMUD_ERR, _("Failed to lookup group '%s'"), unix_sock_group); goto free_and_fail; } @@ -1890,7 +1906,7 @@ remoteReadConfigFile (struct qemud_server *server, const char *filename) GET_CONF_STR (conf, filename, unix_sock_ro_perms); if (unix_sock_ro_perms) { if (xstrtol_i (unix_sock_ro_perms, NULL, 8, &unix_sock_ro_mask) != 0) { - qemudLog (QEMUD_ERR, "Failed to parse mode '%s'", + qemudLog (QEMUD_ERR, _("Failed to parse mode '%s'"), unix_sock_ro_perms); goto free_and_fail; } @@ -1901,7 +1917,7 @@ remoteReadConfigFile (struct qemud_server *server, const char *filename) GET_CONF_STR (conf, filename, unix_sock_rw_perms); if (unix_sock_rw_perms) { if (xstrtol_i (unix_sock_rw_perms, NULL, 8, &unix_sock_rw_mask) != 0) { - qemudLog (QEMUD_ERR, "Failed to parse mode '%s'", + qemudLog (QEMUD_ERR, _("Failed to parse mode '%s'"), unix_sock_rw_perms); goto free_and_fail; } @@ -2074,7 +2090,7 @@ int main(int argc, char **argv) { if (pipe(sigpipe) < 0 || qemudSetNonBlock(sigpipe[0]) < 0 || qemudSetNonBlock(sigpipe[1]) < 0) { - qemudLog(QEMUD_ERR, "Failed to create pipe: %s", + qemudLog(QEMUD_ERR, _("Failed to create pipe: %s"), strerror(errno)); goto error1; } @@ -2094,7 +2110,7 @@ int main(int argc, char **argv) { openlog("libvirtd", 0, 0); pid = qemudGoDaemon(); if (pid < 0) { - qemudLog(QEMUD_ERR, "Failed to fork as daemon: %s", + qemudLog(QEMUD_ERR, _("Failed to fork as daemon: %s"), strerror(errno)); goto error1; } @@ -2128,7 +2144,7 @@ int main(int argc, char **argv) { POLLIN, qemudDispatchSignalEvent, server) < 0) { - qemudLog(QEMUD_ERR, "Failed to register callback for signal pipe"); + qemudLog(QEMUD_ERR, _("Failed to register callback for signal pipe")); ret = 3; goto error2; } diff --git a/qemud/remote.c b/qemud/remote.c index 57f8f29..f89a490 100644 --- a/qemud/remote.c +++ b/qemud/remote.c @@ -1,7 +1,7 @@ /* * remote.c: code handling remote requests (from remote_internal.c) * - * Copyright (C) 2007 Red Hat, Inc. + * Copyright (C) 2007, 2008 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 @@ -2126,7 +2126,7 @@ remoteDispatchAuthSaslInit (struct qemud_server *server ATTRIBUTE_UNUSED, REMOTE_DEBUG("Initialize SASL auth %d", client->fd); if (client->auth != REMOTE_AUTH_SASL || client->saslconn != NULL) { - qemudLog(QEMUD_ERR, "client tried invalid SASL init request"); + qemudLog(QEMUD_ERR, _("client tried invalid SASL init request")); remoteDispatchFailAuth(client, req); return -2; } @@ -2166,7 +2166,7 @@ remoteDispatchAuthSaslInit (struct qemud_server *server ATTRIBUTE_UNUSED, free(localAddr); free(remoteAddr); if (err != SASL_OK) { - qemudLog(QEMUD_ERR, "sasl context setup failed %d (%s)", + qemudLog(QEMUD_ERR, _("sasl context setup failed %d (%s)"), err, sasl_errstring(err, NULL, NULL)); remoteDispatchFailAuth(client, req); client->saslconn = NULL; @@ -2180,7 +2180,7 @@ remoteDispatchAuthSaslInit (struct qemud_server *server ATTRIBUTE_UNUSED, cipher = gnutls_cipher_get(client->tlssession); if (!(ssf = (sasl_ssf_t)gnutls_cipher_get_key_size(cipher))) { - qemudLog(QEMUD_ERR, "cannot TLS get cipher size"); + qemudLog(QEMUD_ERR, _("cannot TLS get cipher size")); remoteDispatchFailAuth(client, req); sasl_dispose(&client->saslconn); client->saslconn = NULL; @@ -2190,7 +2190,7 @@ remoteDispatchAuthSaslInit (struct qemud_server *server ATTRIBUTE_UNUSED, err = sasl_setprop(client->saslconn, SASL_SSF_EXTERNAL, &ssf); if (err != SASL_OK) { - qemudLog(QEMUD_ERR, "cannot set SASL external SSF %d (%s)", + qemudLog(QEMUD_ERR, _("cannot set SASL external SSF %d (%s)"), err, sasl_errstring(err, NULL, NULL)); remoteDispatchFailAuth(client, req); sasl_dispose(&client->saslconn); @@ -2219,7 +2219,7 @@ remoteDispatchAuthSaslInit (struct qemud_server *server ATTRIBUTE_UNUSED, err = sasl_setprop(client->saslconn, SASL_SEC_PROPS, &secprops); if (err != SASL_OK) { - qemudLog(QEMUD_ERR, "cannot set SASL security props %d (%s)", + qemudLog(QEMUD_ERR, _("cannot set SASL security props %d (%s)"), err, sasl_errstring(err, NULL, NULL)); remoteDispatchFailAuth(client, req); sasl_dispose(&client->saslconn); @@ -2236,7 +2236,7 @@ remoteDispatchAuthSaslInit (struct qemud_server *server ATTRIBUTE_UNUSED, NULL, NULL); if (err != SASL_OK) { - qemudLog(QEMUD_ERR, "cannot list SASL mechanisms %d (%s)", + qemudLog(QEMUD_ERR, _("cannot list SASL mechanisms %d (%s)"), err, sasl_errdetail(client->saslconn)); remoteDispatchFailAuth(client, req); sasl_dispose(&client->saslconn); @@ -2246,7 +2246,7 @@ remoteDispatchAuthSaslInit (struct qemud_server *server ATTRIBUTE_UNUSED, REMOTE_DEBUG("Available mechanisms for client: '%s'", mechlist); ret->mechlist = strdup(mechlist); if (!ret->mechlist) { - qemudLog(QEMUD_ERR, "cannot allocate mechlist"); + qemudLog(QEMUD_ERR, _("cannot allocate mechlist")); remoteDispatchFailAuth(client, req); sasl_dispose(&client->saslconn); client->saslconn = NULL; @@ -2271,7 +2271,7 @@ remoteSASLCheckSSF (struct qemud_client *client, err = sasl_getprop(client->saslconn, SASL_SSF, &val); if (err != SASL_OK) { - qemudLog(QEMUD_ERR, "cannot query SASL ssf on connection %d (%s)", + qemudLog(QEMUD_ERR, _("cannot query SASL ssf on connection %d (%s)"), err, sasl_errstring(err, NULL, NULL)); remoteDispatchFailAuth(client, req); sasl_dispose(&client->saslconn); @@ -2281,7 +2281,7 @@ remoteSASLCheckSSF (struct qemud_client *client, ssf = *(const int *)val; REMOTE_DEBUG("negotiated an SSF of %d", ssf); if (ssf < 56) { /* 56 is good for Kerberos */ - qemudLog(QEMUD_ERR, "negotiated SSF %d was not strong enough", ssf); + qemudLog(QEMUD_ERR, _("negotiated SSF %d was not strong enough"), ssf); remoteDispatchFailAuth(client, req); sasl_dispose(&client->saslconn); client->saslconn = NULL; @@ -2310,7 +2310,8 @@ remoteSASLCheckAccess (struct qemud_server *server, err = sasl_getprop(client->saslconn, SASL_USERNAME, &val); if (err != SASL_OK) { - qemudLog(QEMUD_ERR, "cannot query SASL username on connection %d (%s)", + qemudLog(QEMUD_ERR, + _("cannot query SASL username on connection %d (%s)"), err, sasl_errstring(err, NULL, NULL)); remoteDispatchFailAuth(client, req); sasl_dispose(&client->saslconn); @@ -2318,7 +2319,7 @@ remoteSASLCheckAccess (struct qemud_server *server, return -1; } if (val == NULL) { - qemudLog(QEMUD_ERR, "no client username was found"); + qemudLog(QEMUD_ERR, _("no client username was found")); remoteDispatchFailAuth(client, req); sasl_dispose(&client->saslconn); client->saslconn = NULL; @@ -2328,7 +2329,7 @@ remoteSASLCheckAccess (struct qemud_server *server, client->saslUsername = strdup((const char*)val); if (client->saslUsername == NULL) { - qemudLog(QEMUD_ERR, "out of memory copying username"); + qemudLog(QEMUD_ERR, _("out of memory copying username")); remoteDispatchFailAuth(client, req); sasl_dispose(&client->saslconn); client->saslconn = NULL; @@ -2347,7 +2348,8 @@ remoteSASLCheckAccess (struct qemud_server *server, } /* Denied */ - qemudLog(QEMUD_ERR, "SASL client %s not allowed in whitelist", client->saslUsername); + qemudLog(QEMUD_ERR, _("SASL client %s not allowed in whitelist"), + client->saslUsername); remoteDispatchFailAuth(client, req); sasl_dispose(&client->saslconn); client->saslconn = NULL; @@ -2372,7 +2374,7 @@ remoteDispatchAuthSaslStart (struct qemud_server *server, REMOTE_DEBUG("Start SASL auth %d", client->fd); if (client->auth != REMOTE_AUTH_SASL || client->saslconn == NULL) { - qemudLog(QEMUD_ERR, "client tried invalid SASL start request"); + qemudLog(QEMUD_ERR, _("client tried invalid SASL start request")); remoteDispatchFailAuth(client, req); return -2; } @@ -2388,7 +2390,7 @@ remoteDispatchAuthSaslStart (struct qemud_server *server, &serveroutlen); if (err != SASL_OK && err != SASL_CONTINUE) { - qemudLog(QEMUD_ERR, "sasl start failed %d (%s)", + qemudLog(QEMUD_ERR, _("sasl start failed %d (%s)"), err, sasl_errdetail(client->saslconn)); sasl_dispose(&client->saslconn); client->saslconn = NULL; @@ -2396,7 +2398,8 @@ remoteDispatchAuthSaslStart (struct qemud_server *server, return -2; } if (serveroutlen > REMOTE_AUTH_SASL_DATA_MAX) { - qemudLog(QEMUD_ERR, "sasl start reply data too long %d", serveroutlen); + qemudLog(QEMUD_ERR, _("sasl start reply data too long %d"), + serveroutlen); sasl_dispose(&client->saslconn); client->saslconn = NULL; remoteDispatchFailAuth(client, req); @@ -2451,7 +2454,7 @@ remoteDispatchAuthSaslStep (struct qemud_server *server, REMOTE_DEBUG("Step SASL auth %d", client->fd); if (client->auth != REMOTE_AUTH_SASL || client->saslconn == NULL) { - qemudLog(QEMUD_ERR, "client tried invalid SASL start request"); + qemudLog(QEMUD_ERR, _("client tried invalid SASL start request")); remoteDispatchFailAuth(client, req); return -2; } @@ -2466,7 +2469,7 @@ remoteDispatchAuthSaslStep (struct qemud_server *server, &serveroutlen); if (err != SASL_OK && err != SASL_CONTINUE) { - qemudLog(QEMUD_ERR, "sasl step failed %d (%s)", + qemudLog(QEMUD_ERR, _("sasl step failed %d (%s)"), err, sasl_errdetail(client->saslconn)); sasl_dispose(&client->saslconn); client->saslconn = NULL; @@ -2475,7 +2478,8 @@ remoteDispatchAuthSaslStep (struct qemud_server *server, } if (serveroutlen > REMOTE_AUTH_SASL_DATA_MAX) { - qemudLog(QEMUD_ERR, "sasl step reply data too long %d", serveroutlen); + qemudLog(QEMUD_ERR, _("sasl step reply data too long %d"), + serveroutlen); sasl_dispose(&client->saslconn); client->saslconn = NULL; remoteDispatchFailAuth(client, req); @@ -2524,7 +2528,7 @@ remoteDispatchAuthSaslInit (struct qemud_server *server ATTRIBUTE_UNUSED, void *args ATTRIBUTE_UNUSED, remote_auth_sasl_init_ret *ret ATTRIBUTE_UNUSED) { - qemudLog(QEMUD_ERR, "client tried unsupported SASL init request"); + qemudLog(QEMUD_ERR, _("client tried unsupported SASL init request")); remoteDispatchFailAuth(client, req); return -1; } @@ -2536,7 +2540,7 @@ remoteDispatchAuthSaslStart (struct qemud_server *server ATTRIBUTE_UNUSED, remote_auth_sasl_start_args *args ATTRIBUTE_UNUSED, remote_auth_sasl_start_ret *ret ATTRIBUTE_UNUSED) { - qemudLog(QEMUD_ERR, "client tried unsupported SASL start request"); + qemudLog(QEMUD_ERR, _("client tried unsupported SASL start request")); remoteDispatchFailAuth(client, req); return -1; } @@ -2548,7 +2552,7 @@ remoteDispatchAuthSaslStep (struct qemud_server *server ATTRIBUTE_UNUSED, remote_auth_sasl_step_args *args ATTRIBUTE_UNUSED, remote_auth_sasl_step_ret *ret ATTRIBUTE_UNUSED) { - qemudLog(QEMUD_ERR, "client tried unsupported SASL step request"); + qemudLog(QEMUD_ERR, _("client tried unsupported SASL step request")); remoteDispatchFailAuth(client, req); return -1; } @@ -2562,7 +2566,8 @@ static int qemudGetSocketIdentity(int fd, uid_t *uid, pid_t *pid) { unsigned int cr_len = sizeof (cr); if (getsockopt (fd, SOL_SOCKET, SO_PEERCRED, &cr, &cr_len) < 0) { - qemudLog(QEMUD_ERR, "Failed to verify client credentials: %s", strerror(errno)); + qemudLog(QEMUD_ERR, _("Failed to verify client credentials: %s"), + strerror(errno)); return -1; } @@ -2588,13 +2593,13 @@ remoteDispatchAuthPolkit (struct qemud_server *server ATTRIBUTE_UNUSED, REMOTE_DEBUG("Start PolicyKit auth %d", client->fd); if (client->auth != REMOTE_AUTH_POLKIT) { - qemudLog(QEMUD_ERR, "client tried invalid PolicyKit init request"); + qemudLog(QEMUD_ERR, _("client tried invalid PolicyKit init request")); remoteDispatchFailAuth(client, req); return -2; } if (qemudGetSocketIdentity(client->fd, &callerUid, &callerPid) < 0) { - qemudLog(QEMUD_ERR, "cannot get peer socket identity"); + qemudLog(QEMUD_ERR, _("cannot get peer socket identity")); remoteDispatchFailAuth(client, req); return -2; } @@ -2604,7 +2609,7 @@ remoteDispatchAuthPolkit (struct qemud_server *server ATTRIBUTE_UNUSED, change policykit policy anyway, so its pointless trying to restrict root */ if (callerUid == 0) { - qemudLog(QEMUD_INFO, "Allowing PID %d running as root", callerPid); + qemudLog(QEMUD_INFO, _("Allowing PID %d running as root"), callerPid); ret->complete = 1; client->auth = REMOTE_AUTH_NONE; } else { @@ -2618,17 +2623,21 @@ remoteDispatchAuthPolkit (struct qemud_server *server ATTRIBUTE_UNUSED, "org.libvirt.unix.monitor" : "org.libvirt.unix.manage"; - qemudLog(QEMUD_INFO, "Checking PID %d running as %d", callerPid, callerUid); + qemudLog(QEMUD_INFO, _("Checking PID %d running as %d"), + callerPid, callerUid); dbus_error_init(&err); - if (!(pkcaller = polkit_caller_new_from_pid(server->sysbus, callerPid, &err))) { - qemudLog(QEMUD_ERR, "Failed to lookup policy kit caller: %s", err.message); + if (!(pkcaller = polkit_caller_new_from_pid(server->sysbus, + callerPid, &err))) { + qemudLog(QEMUD_ERR, _("Failed to lookup policy kit caller: %s"), + err.message); dbus_error_free(&err); remoteDispatchFailAuth(client, req); return -2; } if (!(pkaction = polkit_action_new())) { - qemudLog(QEMUD_ERR, "Failed to create polkit action %s\n", strerror(errno)); + qemudLog(QEMUD_ERR, _("Failed to create polkit action %s\n"), + strerror(errno)); polkit_caller_unref(pkcaller); remoteDispatchFailAuth(client, req); return -2; @@ -2637,8 +2646,9 @@ remoteDispatchAuthPolkit (struct qemud_server *server ATTRIBUTE_UNUSED, if (!(pkcontext = polkit_context_new()) || !polkit_context_init(pkcontext, &pkerr)) { - qemudLog(QEMUD_ERR, "Failed to create polkit context %s\n", - pkerr ? polkit_error_get_error_message(pkerr) : strerror(errno)); + qemudLog(QEMUD_ERR, _("Failed to create polkit context %s\n"), + (pkerr ? polkit_error_get_error_message(pkerr) + : strerror(errno)); if (pkerr) polkit_error_free(pkerr); polkit_caller_unref(pkcaller); @@ -2648,18 +2658,24 @@ remoteDispatchAuthPolkit (struct qemud_server *server ATTRIBUTE_UNUSED, return -2; } - pkresult = polkit_context_can_caller_do_action(pkcontext, pkaction, pkcaller); + pkresult = polkit_context_can_caller_do_action(pkcontext, pkaction, + pkcaller); polkit_context_unref(pkcontext); polkit_caller_unref(pkcaller); polkit_action_unref(pkaction); if (pkresult != POLKIT_RESULT_YES) { - qemudLog(QEMUD_ERR, "Policy kit denied action %s from pid %d, uid %d, result: %s\n", - action, callerPid, callerUid, polkit_result_to_string_representation(pkresult)); + qemudLog(QEMUD_ERR, + _("Policy kit denied action %s from pid %d, uid %d," + " result: %s\n"), + action, callerPid, callerUid, + polkit_result_to_string_representation(pkresult)); remoteDispatchFailAuth(client, req); return -2; } - qemudLog(QEMUD_INFO, "Policy allowed action %s from pid %d, uid %d, result %s", - action, callerPid, callerUid, polkit_result_to_string_representation(pkresult)); + qemudLog(QEMUD_INFO, + _("Policy allowed action %s from pid %d, uid %d, result %s"), + action, callerPid, callerUid, + polkit_result_to_string_representation(pkresult)); ret->complete = 1; client->auth = REMOTE_AUTH_NONE; } @@ -2676,7 +2692,7 @@ remoteDispatchAuthPolkit (struct qemud_server *server ATTRIBUTE_UNUSED, void *args ATTRIBUTE_UNUSED, remote_auth_polkit_ret *ret ATTRIBUTE_UNUSED) { - qemudLog(QEMUD_ERR, "client tried unsupported PolicyKit init request"); + qemudLog(QEMUD_ERR, _("client tried unsupported PolicyKit init request")); remoteDispatchFailAuth(client, req); return -1; } diff --git a/src/iptables.c b/src/iptables.c index dc2225a..1d93bcc 100644 --- a/src/iptables.c +++ b/src/iptables.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007 Red Hat, Inc. + * Copyright (C) 2007, 2008 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 @@ -100,8 +100,8 @@ notifyRulesUpdated(const char *table, argv[3] = NULL; if (virRun(NULL, argv, NULL) < 0) - qemudLog(QEMUD_WARN, "Failed to run '" LOKKIT_PATH " %s' : %s", - arg, strerror(errno)); + qemudLog(QEMUD_WARN, _("Failed to run '" LOKKIT_PATH + " %s' : %s"), arg, strerror(errno)); } static int @@ -148,7 +148,8 @@ notifyRulesRemoved(const char *table, len = virFileReadAll(SYSCONF_DIR "/sysconfig/system-config-firewall", MAX_FILE_LEN, &content); if (len < 0) { - qemudLog(QEMUD_WARN, "Failed to read " SYSCONF_DIR "/sysconfig/system-config-firewall"); + qemudLog(QEMUD_WARN, _("Failed to read " SYSCONF_DIR + "/sysconfig/system-config-firewall")); return; } @@ -175,7 +176,8 @@ notifyRulesRemoved(const char *table, return; write_error: - qemudLog(QEMUD_WARN, "Failed to write to " SYSCONF_DIR "/sysconfig/system-config-firewall : %s", + qemudLog(QEMUD_WARN, _("Failed to write to " SYSCONF_DIR + "/sysconfig/system-config-firewall : %s"), strerror(errno)); if (f) fclose(f); @@ -239,7 +241,7 @@ iptRulesSave(iptRules *rules) int err; if ((err = writeRules(rules->path, rules->rules, rules->nrules))) { - qemudLog(QEMUD_WARN, "Failed to saves iptables rules to %s : %s", + qemudLog(QEMUD_WARN, _("Failed to saves iptables rules to %s : %s"), rules->path, strerror(err)); return; } @@ -577,7 +579,9 @@ iptRulesReload(iptRules *rules) rule->argv[rule->command_idx] = (char *) "--delete"; if (virRun(NULL, rule->argv, NULL) < 0) - qemudLog(QEMUD_WARN, "Failed to remove iptables rule '%s' from chain '%s' in table '%s': %s", + qemudLog(QEMUD_WARN, + _("Failed to remove iptables rule '%s'" + " from chain '%s' in table '%s': %s"), rule->rule, rules->chain, rules->table, strerror(errno)); rule->argv[rule->command_idx] = orig; @@ -585,7 +589,8 @@ iptRulesReload(iptRules *rules) for (i = 0; i < rules->nrules; i++) if (virRun(NULL, rules->rules[i].argv, NULL) < 0) - qemudLog(QEMUD_WARN, "Failed to add iptables rule '%s' to chain '%s' in table '%s': %s", + qemudLog(QEMUD_WARN, _("Failed to add iptables rule '%s'" + " to chain '%s' in table '%s': %s"), rules->rules[i].rule, rules->chain, rules->table, strerror(errno)); } diff --git a/src/qemu_conf.c b/src/qemu_conf.c index aba8890..e39c7bc 100644 --- a/src/qemu_conf.c +++ b/src/qemu_conf.c @@ -410,14 +410,18 @@ static int qemudExtractVersionInfo(const char *qemu, int *version, int *flags) { if (errno == EINTR) { goto rewait; } - qemudLog(QEMUD_ERR, "Unexpected exit status from qemu %d pid %lu", got, (unsigned long)child); + qemudLog(QEMUD_ERR, + _("Unexpected exit status from qemu %d pid %lu"), + got, (unsigned long)child); ret = -1; } /* Check & log unexpected exit status, but don't fail, * as there's really no need to throw an error if we did * actually read a valid version number above */ if (WEXITSTATUS(got) != 1) { - qemudLog(QEMUD_WARN, "Unexpected exit status '%d', qemu probably failed", got); + qemudLog(QEMUD_WARN, + _("Unexpected exit status '%d', qemu probably failed"), + got); } return ret; @@ -2510,21 +2514,25 @@ qemudLoadConfig(struct qemud_driver *driver, if (!(def = qemudParseVMDef(NULL, driver, xml, file))) { virErrorPtr err = virGetLastError(); - qemudLog(QEMUD_WARN, "Error parsing QEMU guest config '%s' : %s", - path, err ? err->message : - "BUG: unknown error - please report it\n"); + qemudLog(QEMUD_WARN, _("Error parsing QEMU guest config '%s' : %s"), + path, (err ? err->message : + _("BUG: unknown error - please report it\n"))); return NULL; } if (!virFileMatchesNameSuffix(file, def->name, ".xml")) { - qemudLog(QEMUD_WARN, "QEMU guest config filename '%s' does not match guest name '%s'", + qemudLog(QEMUD_WARN, + _("QEMU guest config filename '%s'" + " does not match guest name '%s'"), path, def->name); qemudFreeVMDef(def); return NULL; } if (!(vm = qemudAssignVMDef(NULL, driver, def))) { - qemudLog(QEMUD_WARN, "Failed to load QEMU guest config '%s': out of memory", path); + qemudLog(QEMUD_WARN, + _("Failed to load QEMU guest config '%s': out of memory"), + path); qemudFreeVMDef(def); return NULL; } @@ -2551,20 +2559,23 @@ qemudLoadNetworkConfig(struct qemud_driver *driver, if (!(def = qemudParseNetworkDef(NULL, driver, xml, file))) { virErrorPtr err = virGetLastError(); - qemudLog(QEMUD_WARN, "Error parsing network config '%s' : %s", + qemudLog(QEMUD_WARN, _("Error parsing network config '%s' : %s"), path, err->message); return NULL; } if (!virFileMatchesNameSuffix(file, def->name, ".xml")) { - qemudLog(QEMUD_WARN, "Network config filename '%s' does not match network name '%s'", + qemudLog(QEMUD_WARN, + _("Network config filename '%s'" + " does not match network name '%s'"), path, def->name); qemudFreeNetworkDef(def); return NULL; } if (!(network = qemudAssignNetworkDef(NULL, driver, def))) { - qemudLog(QEMUD_WARN, "Failed to load network config '%s': out of memory", path); + qemudLog(QEMUD_WARN, + _("Failed to load network config '%s': out of memory"), path); qemudFreeNetworkDef(def); return NULL; } @@ -2591,7 +2602,7 @@ int qemudScanConfigDir(struct qemud_driver *driver, if (!(dir = opendir(configDir))) { if (errno == ENOENT) return 0; - qemudLog(QEMUD_ERR, "Failed to open dir '%s': %s", + qemudLog(QEMUD_ERR, _("Failed to open dir '%s': %s"), configDir, strerror(errno)); return -1; } @@ -2608,13 +2619,14 @@ int qemudScanConfigDir(struct qemud_driver *driver, continue; if (virFileBuildPath(configDir, entry->d_name, NULL, path, PATH_MAX) < 0) { - qemudLog(QEMUD_WARN, "Config filename '%s/%s' is too long", + qemudLog(QEMUD_WARN, _("Config filename '%s/%s' is too long"), configDir, entry->d_name); continue; } - if (virFileBuildPath(autostartDir, entry->d_name, NULL, autostartLink, PATH_MAX) < 0) { - qemudLog(QEMUD_WARN, "Autostart link path '%s/%s' is too long", + if (virFileBuildPath(autostartDir, entry->d_name, NULL, + autostartLink, PATH_MAX) < 0) { + qemudLog(QEMUD_WARN, _("Autostart link path '%s/%s' is too long"), autostartDir, entry->d_name); continue; } diff --git a/src/qemu_driver.c b/src/qemu_driver.c index 9c24f5b..15cd52c 100644 --- a/src/qemu_driver.c +++ b/src/qemu_driver.c @@ -71,7 +71,7 @@ static int qemudSetCloseExec(int fd) { goto error; return 0; error: - qemudLog(QEMUD_ERR, "Failed to set close-on-exec file descriptor flag"); + qemudLog(QEMUD_ERR, _("Failed to set close-on-exec file descriptor flag")); return -1; } @@ -85,7 +85,7 @@ static int qemudSetNonBlock(int fd) { goto error; return 0; error: - qemudLog(QEMUD_ERR, "Failed to set non-blocking file descriptor flag"); + qemudLog(QEMUD_ERR, _("Failed to set non-blocking file descriptor flag")); return -1; } @@ -123,7 +123,7 @@ void qemudAutostartConfigs(struct qemud_driver *driver) { !qemudIsActiveNetwork(network) && qemudStartNetworkDaemon(NULL, driver, network) < 0) { virErrorPtr err = virGetLastError(); - qemudLog(QEMUD_ERR, "Failed to autostart network '%s': %s", + qemudLog(QEMUD_ERR, _("Failed to autostart network '%s': %s"), network->def->name, err->message); } @@ -138,7 +138,7 @@ void qemudAutostartConfigs(struct qemud_driver *driver) { !qemudIsActiveVM(vm) && qemudStartVMDaemon(NULL, driver, vm) < 0) { virErrorPtr err = virGetLastError(); - qemudLog(QEMUD_ERR, "Failed to autostart VM '%s': %s", + qemudLog(QEMUD_ERR, _("Failed to autostart VM '%s': %s"), vm->def->name, err->message); } @@ -173,7 +173,7 @@ qemudStartup(void) { goto out_of_memory; } else { if (!(pw = getpwuid(uid))) { - qemudLog(QEMUD_ERR, "Failed to find user record for uid '%d': %s", + qemudLog(QEMUD_ERR, _("Failed to find user record for uid '%d': %s"), uid, strerror(errno)); goto out_of_memory; } @@ -182,7 +182,7 @@ qemudStartup(void) { goto snprintf_error; if (asprintf (&base, "%s/.libvirt", pw->pw_dir) == -1) { - qemudLog (QEMUD_ERR, "out of memory in asprintf"); + qemudLog (QEMUD_ERR, _("out of memory in asprintf")); goto out_of_memory; } } @@ -223,11 +223,12 @@ qemudStartup(void) { return 0; snprintf_error: - qemudLog(QEMUD_ERR, "Resulting path to long for buffer in qemudInitPaths()"); + qemudLog(QEMUD_ERR, + _("Resulting path to long for buffer in qemudInitPaths()")); return -1; out_of_memory: - qemudLog (QEMUD_ERR, "qemudStartup: out of memory"); + qemudLog (QEMUD_ERR, _("qemudStartup: out of memory")); free (base); free(qemu_driver); qemu_driver = NULL; @@ -245,7 +246,7 @@ qemudReload(void) { qemudScanConfigs(qemu_driver); if (qemu_driver->iptables) { - qemudLog(QEMUD_INFO, "Reloading iptables rules"); + qemudLog(QEMUD_INFO, _("Reloading iptables rules")); iptablesReloadRules(qemu_driver->iptables); } @@ -543,7 +544,7 @@ static int qemudWaitForMonitor(virConnectPtr conn, /* Log, but ignore failures to write logfile for VM */ if (errno == EINTR) goto retry; - qemudLog(QEMUD_WARN, "Unable to log VM console data: %s", + qemudLog(QEMUD_WARN, _("Unable to log VM console data: %s"), strerror(errno)); } return ret; @@ -656,15 +657,15 @@ static int qemudStartVMDaemon(virConnectPtr conn, tmp = argv; while (*tmp) { if (write(vm->logfile, *tmp, strlen(*tmp)) < 0) - qemudLog(QEMUD_WARN, "Unable to write argv to logfile %d: %s", + qemudLog(QEMUD_WARN, _("Unable to write argv to logfile %d: %s"), errno, strerror(errno)); if (write(vm->logfile, " ", 1) < 0) - qemudLog(QEMUD_WARN, "Unable to write argv to logfile %d: %s", + qemudLog(QEMUD_WARN, _("Unable to write argv to logfile %d: %s"), errno, strerror(errno)); tmp++; } if (write(vm->logfile, "\n", 1) < 0) - qemudLog(QEMUD_WARN, "Unable to write argv to logfile %d: %s", + qemudLog(QEMUD_WARN, _("Unable to write argv to logfile %d: %s"), errno, strerror(errno)); if (virExecNonBlock(conn, argv, &vm->pid, @@ -737,7 +738,7 @@ static int qemudVMData(struct qemud_driver *driver ATTRIBUTE_UNUSED, /* Log, but ignore failures to write logfile for VM */ if (errno == EINTR) goto retry; - qemudLog(QEMUD_WARN, "Unable to log VM console data: %s", + qemudLog(QEMUD_WARN, _("Unable to log VM console data: %s"), strerror(errno)); } } @@ -751,7 +752,7 @@ static void qemudShutdownVMDaemon(virConnectPtr conn ATTRIBUTE_UNUSED, if (!qemudIsActiveVM(vm)) return; - qemudLog(QEMUD_INFO, "Shutting down VM '%s'", vm->def->name); + qemudLog(QEMUD_INFO, _("Shutting down VM '%s'"), vm->def->name); kill(vm->pid, SIGTERM); @@ -762,7 +763,8 @@ static void qemudShutdownVMDaemon(virConnectPtr conn ATTRIBUTE_UNUSED, virEventRemoveHandle(vm->stderr); if (close(vm->logfile) < 0) - qemudLog(QEMUD_WARN, "Unable to close logfile %d: %s", errno, strerror(errno)); + qemudLog(QEMUD_WARN, _("Unable to close logfile %d: %s"), + errno, strerror(errno)); close(vm->stdout); close(vm->stderr); if (vm->monitor != -1) @@ -775,7 +777,7 @@ static void qemudShutdownVMDaemon(virConnectPtr conn ATTRIBUTE_UNUSED, if (waitpid(vm->pid, NULL, WNOHANG) != vm->pid) { kill(vm->pid, SIGKILL); if (waitpid(vm->pid, NULL, 0) != vm->pid) { - qemudLog(QEMUD_WARN, "Got unexpected pid, damn"); + qemudLog(QEMUD_WARN, _("Got unexpected pid, damn")); } } @@ -1219,13 +1221,13 @@ static int qemudStartNetworkDaemon(virConnectPtr conn, err_delbr1: if (network->def->ipAddress[0] && (err = brSetInterfaceUp(driver->brctl, network->bridge, 0))) { - qemudLog(QEMUD_WARN, "Failed to bring down bridge '%s' : %s", + qemudLog(QEMUD_WARN, _("Failed to bring down bridge '%s' : %s"), network->bridge, strerror(err)); } err_delbr: if ((err = brDeleteBridge(driver->brctl, network->bridge))) { - qemudLog(QEMUD_WARN, "Failed to delete bridge '%s' : %s\n", + qemudLog(QEMUD_WARN, _("Failed to delete bridge '%s' : %s\n"), network->bridge, strerror(err)); } @@ -1238,7 +1240,7 @@ static int qemudShutdownNetworkDaemon(virConnectPtr conn ATTRIBUTE_UNUSED, struct qemud_network *network) { int err; - qemudLog(QEMUD_INFO, "Shutting down network '%s'", network->def->name); + qemudLog(QEMUD_INFO, _("Shutting down network '%s'"), network->def->name); if (!qemudIsActiveNetwork(network)) return 0; @@ -1250,12 +1252,12 @@ static int qemudShutdownNetworkDaemon(virConnectPtr conn ATTRIBUTE_UNUSED, if (network->def->ipAddress[0] && (err = brSetInterfaceUp(driver->brctl, network->bridge, 0))) { - qemudLog(QEMUD_WARN, "Failed to bring down bridge '%s' : %s\n", + qemudLog(QEMUD_WARN, _("Failed to bring down bridge '%s' : %s\n"), network->bridge, strerror(err)); } if ((err = brDeleteBridge(driver->brctl, network->bridge))) { - qemudLog(QEMUD_WARN, "Failed to delete bridge '%s' : %s\n", + qemudLog(QEMUD_WARN, _("Failed to delete bridge '%s' : %s\n"), network->bridge, strerror(err)); } @@ -1263,7 +1265,7 @@ static int qemudShutdownNetworkDaemon(virConnectPtr conn ATTRIBUTE_UNUSED, waitpid(network->dnsmasqPid, NULL, WNOHANG) != network->dnsmasqPid) { kill(network->dnsmasqPid, SIGKILL); if (waitpid(network->dnsmasqPid, NULL, 0) != network->dnsmasqPid) - qemudLog(QEMUD_WARN, "Got unexpected pid for dnsmasq\n"); + qemudLog(QEMUD_WARN, _("Got unexpected pid for dnsmasq\n")); } network->bridge[0] = '\0'; @@ -1367,7 +1369,7 @@ static int qemudMonitorCommand(struct qemud_driver *driver ATTRIBUTE_UNUSED, /* Log, but ignore failures to write logfile for VM */ if (safewrite(vm->logfile, buf, strlen(buf)) < 0) - qemudLog(QEMUD_WARN, "Unable to log VM console data: %s", + qemudLog(QEMUD_WARN, _("Unable to log VM console data: %s"), strerror(errno)); *reply = buf; @@ -1377,7 +1379,7 @@ static int qemudMonitorCommand(struct qemud_driver *driver ATTRIBUTE_UNUSED, if (buf) { /* Log, but ignore failures to write logfile for VM */ if (safewrite(vm->logfile, buf, strlen(buf)) < 0) - qemudLog(QEMUD_WARN, "Unable to log VM console data: %s", + qemudLog(QEMUD_WARN, _("Unable to log VM console data: %s"), strerror(errno)); free(buf); } @@ -2345,7 +2347,7 @@ static int qemudDomainUndefine(virDomainPtr dom) { return -1; if (unlink(vm->autostartLink) < 0 && errno != ENOENT && errno != ENOTDIR) - qemudLog(QEMUD_WARN, "Failed to delete autostart link '%s': %s", + qemudLog(QEMUD_WARN, _("Failed to delete autostart link '%s': %s"), vm->autostartLink, strerror(errno)); vm->configFile[0] = '\0'; @@ -2721,7 +2723,7 @@ static int qemudNetworkUndefine(virNetworkPtr net) { return -1; if (unlink(network->autostartLink) < 0 && errno != ENOENT && errno != ENOTDIR) - qemudLog(QEMUD_WARN, "Failed to delete autostart link '%s': %s", + qemudLog(QEMUD_WARN, _("Failed to delete autostart link '%s': %s"), network->autostartLink, strerror(errno)); network->configFile[0] = '\0'; diff --git a/src/uuid.c b/src/uuid.c index ae30217..78b90e5 100644 --- a/src/uuid.c +++ b/src/uuid.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007 Red Hat, Inc. + * Copyright (C) 2007, 2008 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 @@ -99,8 +99,8 @@ virUUIDGenerate(unsigned char *uuid) if ((err = virUUIDGenerateRandomBytes(uuid, VIR_UUID_BUFLEN))) qemudLog(QEMUD_WARN, - "Falling back to pseudorandom UUID, " - "failed to generate random bytes: %s", strerror(err)); + _("Falling back to pseudorandom UUID," + " failed to generate random bytes: %s"), strerror(err)); return virUUIDGeneratePseudoRandomBytes(uuid, VIR_UUID_BUFLEN); } @@ -197,4 +197,3 @@ void virUUIDFormat(const unsigned char *uuid, char *uuidstr) * tab-width: 4 * End: */ - diff --git a/src/xm_internal.c b/src/xm_internal.c index fbef462..4a876a4 100644 --- a/src/xm_internal.c +++ b/src/xm_internal.c @@ -2523,10 +2523,10 @@ int xenXMNumOfDefinedDomains(virConnectPtr conn) { * xenXMDomainAttachDevice: * @domain: pointer to domain object * @xml: pointer to XML description of device - * + * * Create a virtual device attachment to backend. * XML description is translated into config file. - * + * * Returns 0 in case of success, -1 in case of failure. */ static int @@ -2879,7 +2879,7 @@ xenXMAttachInterface(virDomainPtr domain, xmlXPathContextPtr ctxt, int hvm, attr_node->children = text_node; attr_node->last = text_node; attr_node->parent = node_tmp; - + node_cur->next = node_tmp; } if (!(dev = xenXMParseXMLVif(domain->conn, node, hvm))) @@ -2925,7 +2925,7 @@ xenXMAttachInterface(virDomainPtr domain, xmlXPathContextPtr ctxt, int hvm, /** * xenXMAutoAssignMac: * @mac: pointer to Mac String - * + * * a mac is assigned automatically. * * Returns 0 in case of success, -1 in case of failure. @@ -2948,7 +2948,7 @@ xenXMAutoAssignMac() { * xenXMDomainDetachDevice: * @domain: pointer to domain object * @xml: pointer to XML description of device - * + * * Destroy a virtual device attachment to backend. * * Returns 0 in case of success, -1 in case of failure. -- 1.5.4.30.g7dbe

1 0

[Libvir] Remove more useless if tests before "free"-like functions.
by Jim Meyering 07 Feb '08

07 Feb '08

A few new uses of already-checked functions were added recently, and I've added xmlXPathFreeObject to the list, so that exposed a bunch more. ----------------------------------------------------------- Remove more useless if tests before "free"-like functions. * build-aux/useless-if-before-free: Rename from ... * build-aux/find-unnecessary-if-before-free: ... this. Remove file. Also changed it so that new names are no longer hard-coded in the script. Instead, they're supplied via options: * Makefile.cfg (useless_free_options): Define. Add xmlXPathFreeObject to the list of free-like functions it detects. * Makefile.maint (sc_avoid_if_before_free): Reflect script renaming. * .x-sc_avoid_if_before_free: Likewise. * src/openvz_conf.c (openvzParseXML): Remove useless "if"-before-free. * src/qemu_conf.c (qemudParseXML, qemudParseNetworkXML): Likewise. * src/virsh.c (cmdVNCDisplay, cmdTTYConsole, cmdDetachInterface): (cmdDetachDisk): Likewise. * src/xm_internal.c (xenXMConfigSetIntFromXPath): Likewise. (xenXMConfigSetStringFromXPath, xenXMParseXMLToConfig): Likewise. (xenXMDomainAttachDevice, xenXMAttachDisk, xenXMAttachInterface): (xenXMDomainDetachDevice): Likewise. * src/xml.c (virXPathString): Likewise. * tests/xmlrpctest.c (checkRequestValue): Likewise. Signed-off-by: Jim Meyering <meyering(a)redhat.com> --- .x-sc_avoid_if_before_free | 2 +- Makefile.cfg | 5 + Makefile.maint | 5 +- build-aux/find-unnecessary-if-before-free | 42 ---------- build-aux/useless-if-before-free | 118 +++++++++++++++++++++++++++++ src/openvz_conf.c | 3 +- src/qemu_conf.c | 44 ++++------- src/virsh.c | 12 +-- src/xm_internal.c | 60 +++++---------- src/xml.c | 3 +- tests/xmlrpctest.c | 5 +- 11 files changed, 170 insertions(+), 129 deletions(-) delete mode 100755 build-aux/find-unnecessary-if-before-free create mode 100755 build-aux/useless-if-before-free diff --git a/.x-sc_avoid_if_before_free b/.x-sc_avoid_if_before_free index f83ae7b..5093ef6 100644 --- a/.x-sc_avoid_if_before_free +++ b/.x-sc_avoid_if_before_free @@ -1,5 +1,5 @@ ^gnulib/lib/getaddrinfo\.c$ ^gnulib/lib/printf-parse\.c$ ^gnulib/lib/vasnprintf\.c$ -^build-aux/find-unnecessary-if-before-free$ +^build-aux/useless-if-before-free$ ^ChangeLog$ diff --git a/Makefile.cfg b/Makefile.cfg index a9578ab..4543ebd 100644 --- a/Makefile.cfg +++ b/Makefile.cfg @@ -52,3 +52,8 @@ local-checks-to-skip = \ patch-check \ check-AUTHORS \ changelog-check + +useless_free_options = \ + --name=sexpr_free \ + --name=xmlXPathFreeContext \ + --name=xmlXPathFreeObject diff --git a/Makefile.maint b/Makefile.maint index 923c422..8624328 100644 --- a/Makefile.maint +++ b/Makefile.maint @@ -40,7 +40,8 @@ syntax-check: $(local-check) ## --------------- ## sc_avoid_if_before_free: - @$(srcdir)/build-aux/find-unnecessary-if-before-free \ + @$(srcdir)/build-aux/useless-if-before-free \ + $(useless_free_options) \ $$($(CVS_LIST_EXCEPT)) && \ { echo '$(ME): found useless "if" before "free" above' 1>&2; \ exit 1; } || : @@ -288,7 +289,7 @@ sc_two_space_separator_in_usage: 1>&2; exit 1; } || : err_func_re = \ -(DISABLE_fprintf|(xmlRpc|vir(Xend|XML|Hash|Conf|Test|LibConn))Error) +(DISABLE_fprintf|qemudLog|(xmlRpc|vir(Xend|XML|Hash|Conf|Test|LibConn))Error) # Look for diagnostics that aren't marked for translation. # This won't find any for which error's format string is on a separate line. diff --git a/build-aux/find-unnecessary-if-before-free b/build-aux/find-unnecessary-if-before-free deleted file mode 100755 index 0cd38eb..0000000 --- a/build-aux/find-unnecessary-if-before-free +++ /dev/null @@ -1,42 +0,0 @@ -#!/usr/bin/perl -# Detect instances of "if (p) free (p);". -# Likewise for "if (p != NULL) free (p);". -# 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. -use strict; -use warnings; -(my $ME = $0) =~ s|.*/||; - -{ - # Use ';' as the input record separator. - $/ = ';'; - - my $found_match = 0; - foreach my $file (@ARGV) - { - open FH, '<', $file - or die "$ME: can't open `$file' for reading: $!\n"; - while (defined (my $line = <FH>)) - { - if ($line =~ - /\b(if\s*$\s*(\S+?)(?:\s*!=\s*NULL)?\s*$ - \s+(?:xmlXPathFreeContext|(?:sexpr_)?free)\s*$\s*\2\s*$)/sx) - { - print "$file: $1\n"; - $found_match = 1; - } - } - close FH; - } - exit !$found_match; -} - -my $foo = <<'EOF'; -# The above is to *find* them. -# This adjusts them, removing the unnecessary "if (p)" part. - -git ls-files -z --exclude=find-unnecessary-if-before-free |xargs -0 \ -perl -0x3b -pi -e 's/\bif\s*$\s*(\S+?)(?:\s*!=\s*NULL)?\s*$\s+((?:xmlXPathFreeContext|(?:sexpr_)?free)\s*$\s*\1\s*$)/$2/s' -EOF diff --git a/build-aux/useless-if-before-free b/build-aux/useless-if-before-free new file mode 100755 index 0000000..57040a3 --- /dev/null +++ b/build-aux/useless-if-before-free @@ -0,0 +1,118 @@ +#!/usr/bin/perl -T +# Detect instances of "if (p) free (p);". +# Likewise for "if (p != NULL) free (p);". + +my $VERSION = '2008-02-04 22:25'; # 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. +use strict; +use warnings; +use Getopt::Long; + +(my $ME = $0) =~ s|.*/||; + +my $debug = 0; +my $verbose = 0; + +sub usage ($) +{ + my ($exit_code) = @_; + my $STREAM = ($exit_code == 0 ? *STDOUT : *STDERR); + if ($exit_code != 0) + { + print $STREAM "Try `$ME --help' for more information.\n"; + } + else + { + print $STREAM <<EOF; +Usage: $ME [OPTIONS] FILE... + +OPTIONS: + + --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 + +EXAMPLE: + + git ls-files -z |xargs -0 $ME + +EOF + } + exit $exit_code; +} + +{ + my @name = qw(free); + GetOptions + ( + debug => \$debug, + verbose => \$verbose, + help => sub { usage 0 }, + version => sub { print "$ME version $VERSION\n"; exit }, + '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; + + my $or = join '|', @name; + my $regexp = qr/(?:$or)/; + + # Set the input record separator. + $/ = '"'; + + my $found_match = 0; + foreach my $file (@ARGV) + { + open FH, '<', $file + or die "$ME: can't open `$file' for reading: $!\n"; + while (defined (my $line = <FH>)) + { + if ($line =~ + /\b(if\s*$\s*(\S+?)(?:\s*!=\s*NULL)?\s*$ + (?: \s*$regexp\s*$\s*\2\s*$| + \s*\{\s*$regexp\s*$\s*\2\s*$\s*;\s*\}))/sx) + { + print "$file: $1\n"; + $found_match = 1; + } + } + close FH; + } + exit !$found_match; +} + +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' + +When modifying files, refuse to process anything other than a regular file. + +# 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"' +EOF + +## Local Variables: +## indent-tabs-mode: nil +## eval: (add-hook 'write-file-hooks 'time-stamp) +## time-stamp-start: "my $VERSION = '" +## time-stamp-format: "%:y-%02m-%02d %02H:%02M" +## time-stamp-time-zone: "UTC" +## time-stamp-end: "'; # UTC" +## End: diff --git a/src/openvz_conf.c b/src/openvz_conf.c index ebed9b2..482de82 100644 --- a/src/openvz_conf.c +++ b/src/openvz_conf.c @@ -495,8 +495,7 @@ static struct openvz_vm_def bail_out: free(prop); - if (obj) - xmlXPathFreeObject(obj); + xmlXPathFreeObject(obj); xmlXPathFreeContext(ctxt); openvzFreeVMDef(def); diff --git a/src/qemu_conf.c b/src/qemu_conf.c index 39cfdc1..aba8890 100644 --- a/src/qemu_conf.c +++ b/src/qemu_conf.c @@ -1,7 +1,7 @@ /* * config.c: VM configuration management * - * Copyright (C) 2006, 2007 Red Hat, Inc. + * Copyright (C) 2006, 2007, 2008 Red Hat, Inc. * Copyright (C) 2006 Daniel P. Berrange * * This library is free software; you can redistribute it and/or @@ -1004,8 +1004,7 @@ static struct qemud_vm_def *qemudParseXML(virConnectPtr conn, goto error; } } - if (obj) - xmlXPathFreeObject(obj); + xmlXPathFreeObject(obj); /* Extract domain memory */ @@ -1023,8 +1022,7 @@ static struct qemud_vm_def *qemudParseXML(virConnectPtr conn, goto error; } } - if (obj) - xmlXPathFreeObject(obj); + xmlXPathFreeObject(obj); /* Extract domain vcpu info */ obj = xmlXPathEval(BAD_CAST "string(/domain/vcpu[1])", ctxt); @@ -1039,8 +1037,7 @@ static struct qemud_vm_def *qemudParseXML(virConnectPtr conn, goto error; } } - if (obj) - xmlXPathFreeObject(obj); + xmlXPathFreeObject(obj); /* See if ACPI feature is requested */ obj = xmlXPathEval(BAD_CAST "/domain/features/acpi", ctxt); @@ -1062,8 +1059,7 @@ static struct qemud_vm_def *qemudParseXML(virConnectPtr conn, else def->noReboot = 0; } - if (obj) - xmlXPathFreeObject(obj); + xmlXPathFreeObject(obj); /* See if we set clock to localtime */ obj = xmlXPathEval(BAD_CAST "string(/domain/clock/@offset)", ctxt); @@ -1076,8 +1072,7 @@ static struct qemud_vm_def *qemudParseXML(virConnectPtr conn, else def->localtime = 0; } - if (obj) - xmlXPathFreeObject(obj); + xmlXPathFreeObject(obj); /* Extract OS type info */ @@ -1111,8 +1106,7 @@ static struct qemud_vm_def *qemudParseXML(virConnectPtr conn, } strcpy(def->os.arch, (const char *)obj->stringval); } - if (obj) - xmlXPathFreeObject(obj); + xmlXPathFreeObject(obj); obj = xmlXPathEval(BAD_CAST "string(/domain/os/type[1]/@machine)", ctxt); if ((obj == NULL) || (obj->type != XPATH_STRING) || @@ -1134,8 +1128,7 @@ static struct qemud_vm_def *qemudParseXML(virConnectPtr conn, } strcpy(def->os.machine, (const char *)obj->stringval); } - if (obj) - xmlXPathFreeObject(obj); + xmlXPathFreeObject(obj); obj = xmlXPathEval(BAD_CAST "string(/domain/os/kernel[1])", ctxt); @@ -1147,8 +1140,7 @@ static struct qemud_vm_def *qemudParseXML(virConnectPtr conn, } strcpy(def->os.kernel, (const char *)obj->stringval); } - if (obj) - xmlXPathFreeObject(obj); + xmlXPathFreeObject(obj); obj = xmlXPathEval(BAD_CAST "string(/domain/os/initrd[1])", ctxt); @@ -1160,8 +1152,7 @@ static struct qemud_vm_def *qemudParseXML(virConnectPtr conn, } strcpy(def->os.initrd, (const char *)obj->stringval); } - if (obj) - xmlXPathFreeObject(obj); + xmlXPathFreeObject(obj); obj = xmlXPathEval(BAD_CAST "string(/domain/os/cmdline[1])", ctxt); @@ -1173,8 +1164,7 @@ static struct qemud_vm_def *qemudParseXML(virConnectPtr conn, } strcpy(def->os.cmdline, (const char *)obj->stringval); } - if (obj) - xmlXPathFreeObject(obj); + xmlXPathFreeObject(obj); /* analysis of the disk devices */ @@ -1224,8 +1214,7 @@ static struct qemud_vm_def *qemudParseXML(virConnectPtr conn, } strcpy(def->os.binary, (const char *)obj->stringval); } - if (obj) - xmlXPathFreeObject(obj); + xmlXPathFreeObject(obj); obj = xmlXPathEval(BAD_CAST "/domain/devices/graphics", ctxt); if ((obj == NULL) || (obj->type != XPATH_NODESET) || @@ -1382,8 +1371,7 @@ static struct qemud_vm_def *qemudParseXML(virConnectPtr conn, error: free(prop); - if (obj) - xmlXPathFreeObject(obj); + xmlXPathFreeObject(obj); xmlXPathFreeContext(ctxt); qemudFreeVMDef(def); return NULL; @@ -2389,10 +2377,8 @@ static struct qemud_network_def *qemudParseNetworkXML(virConnectPtr conn, error: /* XXX free all the stuff in the qemud_network struct, or leave it upto the caller ? */ - if (obj) - xmlXPathFreeObject(obj); - if (tmp) - xmlXPathFreeObject(tmp); + xmlXPathFreeObject(obj); + xmlXPathFreeObject(tmp); xmlXPathFreeContext(ctxt); qemudFreeNetworkDef(def); return NULL; diff --git a/src/virsh.c b/src/virsh.c index 36808ed..9521eff 100644 --- a/src/virsh.c +++ b/src/virsh.c @@ -2931,8 +2931,7 @@ cmdVNCDisplay(vshControl * ctl, vshCmd * cmd) ret = TRUE; cleanup: - if (obj) - xmlXPathFreeObject(obj); + xmlXPathFreeObject(obj); xmlXPathFreeContext(ctxt); if (xml) xmlFreeDoc(xml); @@ -2993,8 +2992,7 @@ cmdTTYConsole(vshControl * ctl, vshCmd * cmd) vshPrint(ctl, "%s\n", (const char *)obj->stringval); cleanup: - if (obj) - xmlXPathFreeObject(obj); + xmlXPathFreeObject(obj); xmlXPathFreeContext(ctxt); if (xml) xmlFreeDoc(xml); @@ -3338,8 +3336,7 @@ cmdDetachInterface(vshControl * ctl, vshCmd * cmd) cleanup: if (dom) virDomainFree(dom); - if (obj) - xmlXPathFreeObject(obj); + xmlXPathFreeObject(obj); xmlXPathFreeContext(ctxt); if (xml) xmlFreeDoc(xml); @@ -3611,8 +3608,7 @@ cmdDetachDisk(vshControl * ctl, vshCmd * cmd) ret = TRUE; cleanup: - if (obj) - xmlXPathFreeObject(obj); + xmlXPathFreeObject(obj); xmlXPathFreeContext(ctxt); if (xml) xmlFreeDoc(xml); diff --git a/src/xm_internal.c b/src/xm_internal.c index b3a9f3a..fbef462 100644 --- a/src/xm_internal.c +++ b/src/xm_internal.c @@ -1556,8 +1556,7 @@ int xenXMConfigSetIntFromXPath(virConnectPtr conn, ret = 0; error: - if (obj) - xmlXPathFreeObject(obj); + xmlXPathFreeObject(obj); return ret; } @@ -1591,8 +1590,7 @@ int xenXMConfigSetStringFromXPath(virConnectPtr conn, ret = 0; error: - if (obj) - xmlXPathFreeObject(obj); + xmlXPathFreeObject(obj); return ret; } @@ -2278,8 +2276,7 @@ virConfPtr xenXMParseXMLToConfig(virConnectPtr conn, const char *xml) { virConfFree(conf); if (prop != NULL) xmlFree(prop); - if (obj != NULL) - xmlXPathFreeObject(obj); + xmlXPathFreeObject(obj); xmlXPathFreeContext(ctxt); if (doc != NULL) xmlFreeDoc(doc); @@ -2578,8 +2575,7 @@ xenXMDomainAttachDevice(virDomainPtr domain, const char *xml) { (obj->stringval) && (STREQ((char *)obj->stringval, "hvm"))) hvm = 1; - if (ctxt) - xmlXPathFreeContext(ctxt); + xmlXPathFreeContext(ctxt); ctxt = NULL; if (doc) xmlFreeDoc(doc); @@ -2617,12 +2613,9 @@ xenXMDomainAttachDevice(virDomainPtr domain, const char *xml) { ret = 0; cleanup: - if (domxml) - free(domxml); - if (obj) - xmlXPathFreeObject(obj); - if (ctxt) - xmlXPathFreeContext(ctxt); + free(domxml); + xmlXPathFreeObject(obj); + xmlXPathFreeContext(ctxt); if (doc) xmlFreeDoc(doc); @@ -2736,8 +2729,7 @@ xenXMAttachDisk(virDomainPtr domain, xmlXPathContextPtr ctxt, int hvm, prev->next = list_val; } else { /* configure */ - if (list_val->str) - free(list_val->str); + free(list_val->str); list_val->str = dev; } @@ -2745,12 +2737,9 @@ xenXMAttachDisk(virDomainPtr domain, xmlXPathContextPtr ctxt, int hvm, goto cleanup; cleanup: - if (type) - free(type); - if (source) - free(source); - if (target) - free(target); + free(type); + free(source); + free(target); return (ret); } @@ -2823,8 +2812,7 @@ xenXMAttachInterface(virDomainPtr domain, xmlXPathContextPtr ctxt, int hvm, if (!(strcmp(dommac, (const char *) mac))) { if (autoassign) { - if (mac) - free(mac); + free(mac); mac = NULL; if (!(mac = (xmlChar *)xenXMAutoAssignMac())) goto cleanup; @@ -2912,8 +2900,7 @@ xenXMAttachInterface(virDomainPtr domain, xmlXPathContextPtr ctxt, int hvm, prev->next = list_val; } else { /* configure */ - if (list_val->str) - free(list_val->str); + free(list_val->str); list_val->str = dev; } @@ -2928,12 +2915,9 @@ xenXMAttachInterface(virDomainPtr domain, xmlXPathContextPtr ctxt, int hvm, if (text_node) xmlFree(text_node); cleanup: - if (type) - free(type); - if (source) - free(source); - if (mac) - free(mac); + free(type); + free(source); + free(mac); return (ret); } @@ -3137,16 +3121,12 @@ xenXMDomainDetachDevice(virDomainPtr domain, const char *xml) { ret = 0; cleanup: - if (ctxt) - xmlXPathFreeContext(ctxt); + xmlXPathFreeContext(ctxt); if (doc) xmlFreeDoc(doc); - if (domdevice) - free(domdevice); - if (key) - free(key); - if (list_val) - free(list_val); + free(domdevice); + free(key); + free(list_val); return (ret); } diff --git a/src/xml.c b/src/xml.c index 614deb0..4ac1765 100644 --- a/src/xml.c +++ b/src/xml.c @@ -479,8 +479,7 @@ virXPathString(const char *xpath, xmlXPathContextPtr ctxt) obj = xmlXPathEval(BAD_CAST xpath, ctxt); if ((obj == NULL) || (obj->type != XPATH_STRING) || (obj->stringval == NULL) || (obj->stringval[0] == 0)) { - if (obj) - xmlXPathFreeObject(obj); + xmlXPathFreeObject(obj); return (NULL); } ret = strdup((char *) obj->stringval); diff --git a/tests/xmlrpctest.c b/tests/xmlrpctest.c index 9297004..5c16b0b 100644 --- a/tests/xmlrpctest.c +++ b/tests/xmlrpctest.c @@ -1,7 +1,7 @@ /* * xmlrpctest.c: simple client for XML-RPC tests * - * Copyright (C) 2005 Red Hat, Inc. + * Copyright (C) 2005, 2008 Red Hat, Inc. * * See COPYING.LIB for the License of this software * @@ -119,8 +119,7 @@ checkRequestValue(const char *xmlstr, const char *xpath, int type, void *expecte ret = 0; error: - if (obj) - xmlXPathFreeObject(obj); + xmlXPathFreeObject(obj); xmlXPathFreeContext(ctxt); if (xml) xmlFreeDoc(xml); -- 1.5.4.30.g7dbe

1 1

Re: [Libvir] [patch 1/2] Create directory for saving iptables rules
by Jim Meyering 07 Feb '08

07 Feb '08

Mark McLoughlin <markmc(a)redhat.com> wrote: > The patch which reworked the iptables rules saving > accidently dropped the call to virFileMakePath() > resulting in: > > Failed to saves iptables rules to /var/lib/libvirt/iptables/filter/INPUT.chain : No such file or directory > > Re-instate the virFileMakePath() call. > > Signed-off-by: Mark McLoughlin <markmc(a)redhat.com> > > Index: libvirt/src/iptables.c > =================================================================== > --- libvirt.orig/src/iptables.c 2008-02-06 23:14:28.000000000 +0000 > +++ libvirt/src/iptables.c 2008-02-06 23:15:33.000000000 +0000 > @@ -238,6 +238,12 @@ > #ifdef ENABLE_IPTABLES_LOKKIT > int err; > > + if ((err = virFileMakePath(rules->dir))) { > + qemudLog(QEMUD_WARN "Failed to create directory %s : %s", > + rules->dir, strerror(err)); > + return; > + } > + > if ((err = writeRules(rules->path, rules->rules, rules->nrules))) { > qemudLog(QEMUD_WARN, "Failed to saves iptables rules to %s : %s", > rules->path, strerror(err)); +1, modulo what looks like a missing comma after QEMUD_WARN

3 2

Re: [Libvir] [patch 2/2] Dont crash if theres no /sys/hypervisor/capabilities
by Daniel Veillard 07 Feb '08

07 Feb '08

On Wed, Feb 06, 2008 at 11:45:59PM +0000, Mark McLoughlin wrote: > xenHypervisorMakeCapabilitiesXML() can be called with either > of it's FILE* paramaters NULL; don't crash when the capabilities > pointer is NULL. > > Signed-off-by: Mark McLoughlin <markmc(a)redhat.com> > Index: libvirt/src/xen_internal.c > =================================================================== > --- libvirt.orig/src/xen_internal.c 2008-02-06 22:38:06.000000000 +0000 > +++ libvirt/src/xen_internal.c 2008-02-06 23:38:54.000000000 +0000 > @@ -2233,7 +2233,7 @@ > */ > > /* Expecting one line in this file - ignore any more. */ > - if (fgets (line, sizeof line, capabilities)) { > + if (capabilities && fgets (line, sizeof line, capabilities)) { > /* Split the line into tokens. strtok_r is OK here because we "own" > * this buffer. Parse out the features from each token. > */ okay, but I still prefer when test expressions are fully parenthetized, so preferabbly with ()() added, thanks :-) +1 Daniel -- Red Hat Virtualization group http://redhat.com/virtualization/ Daniel Veillard | virtualization library http://libvirt.org/ veillard(a)redhat.com | libxml GNOME XML XSLT toolkit http://xmlsoft.org/ http://veillard.com/ | Rpmfind RPM search engine http://rpmfind.net/

1 0

[Libvir] [Patch] Compilation cleanup
by Atsushi SAKAI 07 Feb '08

07 Feb '08

Hi, This patch fixes following message in compilation. =============== xm_internal.h:64: warning: 'xenXMDomainAttachDevice' declared 'static' but never defined xm_internal.h:65: warning: 'xenXMDomainDetachDevice' declared 'static' but never defined =============== Signed-off-by: Atsushi SAKAI <sakaia(a)jp.fujitsu.com> Thanks Atsushi SAKAI

2 4

Re: [Libvir] [patch 2/3] Fix subscript typo when calling hypervisor domainDestroy
by Daniel Veillard 07 Feb '08

07 Feb '08

On Wed, Feb 06, 2008 at 11:07:54PM +0000, Mark McLoughlin wrote: > Fixes: > > xen_unified.c: In function 'xenUnifiedDomainDestroy': > xen_unified.c:697: error: array subscript is above array bounds > > Signed-off-by: Mark McLoughlin <markmc(a)redhat.com> Now commited following Marcus intial report, Daniel -- Red Hat Virtualization group http://redhat.com/virtualization/ Daniel Veillard | virtualization library http://libvirt.org/ veillard(a)redhat.com | libxml GNOME XML XSLT toolkit http://xmlsoft.org/ http://veillard.com/ | Rpmfind RPM search engine http://rpmfind.net/

1 0

[Libvir] [PATCH] Print line numbers in unnecessary-if-before-free check
by Mark McLoughlin 07 Feb '08

07 Feb '08

The unnecessary-if-before-free doesn't currently print line numbers, which is a little annoying. This patch fixes that with some rather hideous perl hacking. I should have known to let well enough alone rather than dredge up my long forgotten perl knowledge :-) Signed-off-by: Mark McLoughlin <markmc(a)redhat.com> Index: libvirt/build-aux/find-unnecessary-if-before-free =================================================================== --- libvirt.orig/build-aux/find-unnecessary-if-before-free 2008-02-07 09:24:08.000000000 +0000 +++ libvirt/build-aux/find-unnecessary-if-before-free 2008-02-07 09:29:16.000000000 +0000 @@ -18,15 +18,20 @@ { open FH, '<', $file or die "$ME: can't open `$file' for reading: $!\n"; + my $i = 1; while (defined (my $line = <FH>)) { - if ($line =~ + my @matches = ($line =~ /\b(if\s*$\s*(\S+?)(?:\s*!=\s*NULL)?\s*$ - \s+(?:xmlXPathFreeContext|(?:sexpr_)?free)\s*$\s*\2\s*$)/sx) + \s+(?:xmlXPathFreeContext|(?:sexpr_)?free)\s*$\s*\2\s*$)/sx); + + if (@matches) { - print "$file: $1\n"; + my $j = $i + (my @a = split(/\n/, substr($line, 0, index($line, $matches[0])))) - 1; + print "$file:$j $1\n"; $found_match = 1; } + $i += (my @a = split(/\n/, $line)) - 1; } close FH; } --

1 0

Re: [Libvir] [patch 1/3] Move static function prototype from header
by Daniel Veillard 07 Feb '08

07 Feb '08

On Wed, Feb 06, 2008 at 11:07:53PM +0000, Mark McLoughlin wrote: > Fixes: > > xm_internal.h:64: error: 'xenXMDomainAttachDevice' declared 'static' but never defined > xm_internal.h:65: error: 'xenXMDomainDetachDevice' declared 'static' but never defined > > Signed-off-by: Mark McLoughlin <markmc(a)redhat.com> > > Index: libvirt/src/xm_internal.c > =================================================================== > --- libvirt.orig/src/xm_internal.c > +++ libvirt/src/xm_internal.c > @@ -77,6 +77,8 @@ static int xenXMAttachDisk(virDomainPtr > xmlNodePtr node, xenXMConfCachePtr entry); > static int xenXMAttachInterface(virDomainPtr domain, xmlXPathContextPtr ctxt, int hvm, > xmlNodePtr node, xenXMConfCachePtr entry); > +static int xenXMDomainAttachDevice(virDomainPtr domain, const char *xml); > +static int xenXMDomainDetachDevice(virDomainPtr domain, const char *xml); > > #define XM_REFRESH_INTERVAL 10 > > Index: libvirt/src/xm_internal.h > =================================================================== > --- libvirt.orig/src/xm_internal.h > +++ libvirt/src/xm_internal.h > @@ -61,9 +61,6 @@ int xenXMDomainUndefine(virDomainPtr dom > virConfPtr xenXMParseXMLToConfig(virConnectPtr conn, const char *xml); > char *xenXMDomainFormatXML(virConnectPtr conn, virConfPtr conf); > > -static int xenXMDomainAttachDevice(virDomainPtr domain, const char *xml); > -static int xenXMDomainDetachDevice(virDomainPtr domain, const char *xml); > - > #ifdef __cplusplus > } > #endif Yup noticed the warning on Tuesday, thanks for chasing it, +1 Daniel -- Red Hat Virtualization group http://redhat.com/virtualization/ Daniel Veillard | virtualization library http://libvirt.org/ veillard(a)redhat.com | libxml GNOME XML XSLT toolkit http://xmlsoft.org/ http://veillard.com/ | Rpmfind RPM search engine http://rpmfind.net/

1 0

[Libvir] python/libvir.c returning wrong value on error?
by Cole Robinson 07 Feb '08

07 Feb '08

Hi all, Looking at python/libvir.c, all the custom functions return VIR_PY_NONE on error. This unfortunately doesn't map well to some of the generated python bindings which expect an error val of -1. So if these commands fail, no exception will be thrown at the python level. (Ex. virDomainGetAutostart, virDomainGetVcpus and their python equiv.) I'm wondering where the fix should be: in python/libvir.c, changing these error return values, or in the generator somewhere? Thanks, Cole

3 3

[Libvir] bug in xen_unified.c
by Marcus Meissner 07 Feb '08

07 Feb '08

Hi, spotted by gcc 4.3, in libvirt 0.4.0, xen_unified.c:xenUnifiedDomainSuspend() if (priv->opened[i] && which should probably be: if (priv->opened[XEN_UNIFIED_HYPERVISOR_OFFSET] && because it is outside of the loop, and the other indices in that if (). --- src/xen_unified.c 2008/01/28 22:20:22 1.1 +++ src/xen_unified.c 2008/01/28 22:20:26 @@ -699,7 +699,7 @@ drivers[i]->domainDestroy (dom) == 0) return 0; - if (priv->opened[i] && + if (priv->opened[XEN_UNIFIED_HYPERVISOR_OFFSET] && drivers[XEN_UNIFIED_HYPERVISOR_OFFSET]->domainDestroy && drivers[XEN_UNIFIED_HYPERVISOR_OFFSET]->domainDestroy (dom) == 0) return 0; Ciao, Marcus -- Working, but not speaking, for the following german company: SUSE LINUX Products GmbH, GF: Markus Rex, HRB 16746 (AG Nuernberg)

3 3

[Libvir] Pthreads error in windows compilation
by Gabriel Kaufmann 07 Feb '08

07 Feb '08

Hi, I received the error In file included from libvirt.c:32: internal.h: At top level: internal.h:177: error: expected specifier-qualifier-list before 'pthread_mutex_t' In order to fix this problem, I installed the 'pthreads' package on my MinGW. Then added include pthread.h in src/internal.h Is this the right action? Best Regards, Gabriel Kaufmann Software Engineer Gabriel.Kaufmann(a)ericom.com<mailto:Gabriel.Kaufmann@ericom.com> Ericom Software Tel (Dir): +972 2 591 1700 Ext 754 Tel (Main): +972 2 591 1700 http://www.ericom.com Access Done Right Empower Enterprise-Wide Access to Microsoft(r) Terminal Server, Virtual Desktops and Legacy Applications

4 6

Re: [Libvir] [patch 0/3] Fix some gcc 4.3.0 warnings
by Jim Meyering 07 Feb '08

07 Feb '08

Mark McLoughlin <markmc(a)redhat.com> wrote: > With gcc-4.3.0 (from Fedora rawhide), some new warnings are > thrown up. > > The following three patches fixes them. The first two are > straightforward, I think, but perhaps people might prefer to remove > -Winline from our warning flags rather than apply the last patch. I have a slight preference to remove -Winline, but either way is ok.

1 0

Re: [Libvir] [patch 2/3] Fix subscript typo when calling hypervisor domainDestroy
by Jim Meyering 07 Feb '08

07 Feb '08

Mark McLoughlin <markmc(a)redhat.com> wrote: > Fixes: > > xen_unified.c: In function 'xenUnifiedDomainDestroy': > xen_unified.c:697: error: array subscript is above array bounds +1

1 0

Re: [Libvir] [patch 1/3] Move static function prototype from header
by Jim Meyering 07 Feb '08

07 Feb '08

Mark McLoughlin <markmc(a)redhat.com> wrote: > Fixes: > > xm_internal.h:64: error: 'xenXMDomainAttachDevice' declared 'static' but never defined > xm_internal.h:65: error: 'xenXMDomainDetachDevice' declared 'static' but never defined +1

1 0

Re: [Libvir] [patch 2/2] Dont crash if theres no /sys/hypervisor/capabilities
by Jim Meyering 07 Feb '08

07 Feb '08

Mark McLoughlin <markmc(a)redhat.com> wrote: > xenHypervisorMakeCapabilitiesXML() can be called with either > of it's FILE* paramaters NULL; don't crash when the capabilities > pointer is NULL. > > Signed-off-by: Mark McLoughlin <markmc(a)redhat.com> > Index: libvirt/src/xen_internal.c > =================================================================== > --- libvirt.orig/src/xen_internal.c 2008-02-06 22:38:06.000000000 +0000 > +++ libvirt/src/xen_internal.c 2008-02-06 23:38:54.000000000 +0000 > @@ -2233,7 +2233,7 @@ > */ > > /* Expecting one line in this file - ignore any more. */ > - if (fgets (line, sizeof line, capabilities)) { > + if (capabilities && fgets (line, sizeof line, capabilities)) { > /* Split the line into tokens. strtok_r is OK here because we "own" > * this buffer. Parse out the features from each token. > */ +1

1 0

[Libvir] [patch 2/2] Dont crash if theres no /sys/hypervisor/capabilities
by Mark McLoughlin 07 Feb '08

07 Feb '08

xenHypervisorMakeCapabilitiesXML() can be called with either of it's FILE* paramaters NULL; don't crash when the capabilities pointer is NULL. Signed-off-by: Mark McLoughlin <markmc(a)redhat.com> Index: libvirt/src/xen_internal.c =================================================================== --- libvirt.orig/src/xen_internal.c 2008-02-06 22:38:06.000000000 +0000 +++ libvirt/src/xen_internal.c 2008-02-06 23:38:54.000000000 +0000 @@ -2233,7 +2233,7 @@ */ /* Expecting one line in this file - ignore any more. */ - if (fgets (line, sizeof line, capabilities)) { + if (capabilities && fgets (line, sizeof line, capabilities)) { /* Split the line into tokens. strtok_r is OK here because we "own" * this buffer. Parse out the features from each token. */ --

1 0

[Libvir] [patch 1/2] Create directory for saving iptables rules
by Mark McLoughlin 07 Feb '08

07 Feb '08

The patch which reworked the iptables rules saving accidently dropped the call to virFileMakePath() resulting in: Failed to saves iptables rules to /var/lib/libvirt/iptables/filter/INPUT.chain : No such file or directory Re-instate the virFileMakePath() call. Signed-off-by: Mark McLoughlin <markmc(a)redhat.com> Index: libvirt/src/iptables.c =================================================================== --- libvirt.orig/src/iptables.c 2008-02-06 23:14:28.000000000 +0000 +++ libvirt/src/iptables.c 2008-02-06 23:15:33.000000000 +0000 @@ -238,6 +238,12 @@ #ifdef ENABLE_IPTABLES_LOKKIT int err; + if ((err = virFileMakePath(rules->dir))) { + qemudLog(QEMUD_WARN "Failed to create directory %s : %s", + rules->dir, strerror(err)); + return; + } + if ((err = writeRules(rules->path, rules->rules, rules->nrules))) { qemudLog(QEMUD_WARN, "Failed to saves iptables rules to %s : %s", rules->path, strerror(err)); --

1 0

[Libvir] [patch 0/2] Fix two misc patches
by Mark McLoughlin 07 Feb '08

07 Feb '08

Hi, Ignore this mail and look at the two following ... I can't figure out how to make "quilt mail" send one of these intro mails, even when sending a single patch :-) Cheers, Mark. --

1 0

[Libvir] [patch 3/3] Do not inline xstrtol functions
by Mark McLoughlin 07 Feb '08

07 Feb '08

Our strtol() variants are all marked "static inline" and with gcc 4.3 we get: internal.h:272: error: inlining failed in call to 'xstrtol_i': call is unlikely and code size would grow This patch renames them to virStrToLong() and exports them from the library as private symbols. Alternative is to not build with -Winline. Signed-off-by: Mark McLoughlin <markmc(a)redhat.com> Index: libvirt/src/internal.h =================================================================== --- libvirt.orig/src/internal.h +++ libvirt/src/internal.h @@ -261,85 +261,6 @@ int __virDomainMigratePrepare (virConnec int __virDomainMigratePerform (virDomainPtr domain, const char *cookie, int cookielen, const char *uri, unsigned long flags, const char *dname, unsigned long bandwidth); virDomainPtr __virDomainMigrateFinish (virConnectPtr dconn, const char *dname, const char *cookie, int cookielen, const char *uri, unsigned long flags); -/* Like strtol, but produce an "int" result, and check more carefully. - Return 0 upon success; return -1 to indicate failure. - When END_PTR is NULL, the byte after the final valid digit must be NUL. - Otherwise, it's like strtol and lets the caller check any suffix for - validity. This function is careful to return -1 when the string S - represents a number that is not representable as an "int". */ -static inline int -xstrtol_i(char const *s, char **end_ptr, int base, int *result) -{ - long int val; - char *p; - int err; - - errno = 0; - val = strtol(s, &p, base); - err = (errno || (!end_ptr && *p) || p == s || (int) val != val); - if (end_ptr) - *end_ptr = p; - if (err) - return -1; - *result = val; - return 0; -} - -/* Just like xstrtol_i, above, but produce an "unsigned int" value. */ -static inline int -xstrtol_ui(char const *s, char **end_ptr, int base, unsigned int *result) -{ - unsigned long int val; - char *p; - int err; - - errno = 0; - val = strtoul(s, &p, base); - err = (errno || (!end_ptr && *p) || p == s || (unsigned int) val != val); - if (end_ptr) - *end_ptr = p; - if (err) - return -1; - *result = val; - return 0; -} - -static inline int -xstrtol_ll(char const *s, char **end_ptr, int base, long long *result) -{ - long long val; - char *p; - int err; - - errno = 0; - val = strtoll(s, &p, base); - err = (errno || (!end_ptr && *p) || p == s || (long long) val != val); - if (end_ptr) - *end_ptr = p; - if (err) - return -1; - *result = val; - return 0; -} - -/* Just like xstrtol_i, above, but produce an "unsigned long long" value. */ -static inline int -xstrtol_ull(char const *s, char **end_ptr, int base, unsigned long long *result) -{ - unsigned long long val; - char *p; - int err; - - errno = 0; - val = strtoull(s, &p, base); - err = (errno || (!end_ptr && *p) || p == s || (unsigned long long) val != val); - if (end_ptr) - *end_ptr = p; - if (err) - return -1; - *result = val; - return 0; -} #ifdef __cplusplus } #endif /* __cplusplus */ Index: libvirt/src/util.c =================================================================== --- libvirt.orig/src/util.c +++ libvirt/src/util.c @@ -549,6 +549,87 @@ int virFileBuildPath(const char *dir, return 0; } +/* Like strtol, but produce an "int" result, and check more carefully. + Return 0 upon success; return -1 to indicate failure. + When END_PTR is NULL, the byte after the final valid digit must be NUL. + Otherwise, it's like strtol and lets the caller check any suffix for + validity. This function is careful to return -1 when the string S + represents a number that is not representable as an "int". */ +int +__virStrToLong_i(char const *s, char **end_ptr, int base, int *result) +{ + long int val; + char *p; + int err; + + errno = 0; + val = strtol(s, &p, base); + err = (errno || (!end_ptr && *p) || p == s || (int) val != val); + if (end_ptr) + *end_ptr = p; + if (err) + return -1; + *result = val; + return 0; +} + +/* Just like virStrToLong_i, above, but produce an "unsigned int" value. */ +int +__virStrToLong_ui(char const *s, char **end_ptr, int base, unsigned int *result) +{ + unsigned long int val; + char *p; + int err; + + errno = 0; + val = strtoul(s, &p, base); + err = (errno || (!end_ptr && *p) || p == s || (unsigned int) val != val); + if (end_ptr) + *end_ptr = p; + if (err) + return -1; + *result = val; + return 0; +} + +/* Just like virStrToLong_i, above, but produce an "long long" value. */ +int +__virStrToLong_ll(char const *s, char **end_ptr, int base, long long *result) +{ + long long val; + char *p; + int err; + + errno = 0; + val = strtoll(s, &p, base); + err = (errno || (!end_ptr && *p) || p == s || (long long) val != val); + if (end_ptr) + *end_ptr = p; + if (err) + return -1; + *result = val; + return 0; +} + +/* Just like virStrToLong_i, above, but produce an "unsigned long long" value. */ +int +__virStrToLong_ull(char const *s, char **end_ptr, int base, unsigned long long *result) +{ + unsigned long long val; + char *p; + int err; + + errno = 0; + val = strtoull(s, &p, base); + err = (errno || (!end_ptr && *p) || p == s || (unsigned long long) val != val); + if (end_ptr) + *end_ptr = p; + if (err) + return -1; + *result = val; + return 0; +} + /* * Local variables: * indent-tabs-mode: nil Index: libvirt/src/util.h =================================================================== --- libvirt.orig/src/util.h +++ libvirt/src/util.h @@ -56,4 +56,28 @@ int virFileBuildPath(const char *dir, unsigned int buflen); +int __virStrToLong_i(char const *s, + char **end_ptr, + int base, + int *result); +#define virStrToLong_i(s,e,b,r) __virStrToLong_i((s),(e),(b),(r)) + +int __virStrToLong_ui(char const *s, + char **end_ptr, + int base, + unsigned int *result); +#define virStrToLong_ui(s,e,b,r) __virStrToLong_ui((s),(e),(b),(r)) + +int __virStrToLong_ll(char const *s, + char **end_ptr, + int base, + long long *result); +#define virStrToLong_ll(s,e,b,r) __virStrToLong_ll((s),(e),(b),(r)) + +int __virStrToLong_ull(char const *s, + char **end_ptr, + int base, + unsigned long long *result); +#define virStrToLong_ull(s,e,b,r) __virStrToLong_ull((s),(e),(b),(r)) + #endif /* __VIR_UTIL_H__ */ Index: libvirt/src/nodeinfo.c =================================================================== --- libvirt.orig/src/nodeinfo.c +++ libvirt/src/nodeinfo.c @@ -35,6 +35,7 @@ #include "nodeinfo.h" #include "physmem.h" +#include "util.h" #ifdef __linux__ #define CPUINFO_PATH "/proc/cpuinfo" @@ -79,7 +80,7 @@ int linuxNodeInfoCPUPopulate(virConnectP "parsing cpuinfo cpu MHz"); return -1; } - if (xstrtol_ui(buf+1, &p, 10, &ui) == 0 + if (virStrToLong_ui(buf+1, &p, 10, &ui) == 0 /* Accept trailing fractional part. */ && (*p == '\0' || *p == '.' || isspace(*p))) nodeinfo->mhz = ui; @@ -95,7 +96,7 @@ int linuxNodeInfoCPUPopulate(virConnectP "parsing cpuinfo cpu cores %c", *buf); return -1; } - if (xstrtol_ui(buf+1, &p, 10, &id) == 0 + if (virStrToLong_ui(buf+1, &p, 10, &id) == 0 && (*p == '\0' || isspace(*p)) && id > nodeinfo->cores) nodeinfo->cores = id; Index: libvirt/src/stats_linux.c =================================================================== --- libvirt.orig/src/stats_linux.c +++ libvirt/src/stats_linux.c @@ -24,7 +24,7 @@ #include <xs.h> #endif -#include "internal.h" +#include "util.h" #include "xen_unified.h" #include "stats_linux.h" @@ -263,7 +263,7 @@ xenLinuxDomainDeviceID(virConnectPtr con if (path[4] != '\0') { if (!isdigit(path[4]) || path[4] == '0' || - xstrtol_i(path+4, NULL, 10, &part) < 0 || + virStrToLong_i(path+4, NULL, 10, &part) < 0 || part < 1 || part > 15) { statsErrorFunc (conn, VIR_ERR_INVALID_ARG, __FUNCTION__, "invalid path, partition numbers for xvdN must be in range 1 - 15", @@ -307,7 +307,7 @@ xenLinuxDomainDeviceID(virConnectPtr con p = path + 3; } if (p && (!isdigit(*p) || *p == '0' || - xstrtol_i(p, NULL, 10, &part) < 0 || + virStrToLong_i(p, NULL, 10, &part) < 0 || part < 1 || part > 15)) { statsErrorFunc (conn, VIR_ERR_INVALID_ARG, __FUNCTION__, "invalid path, partition numbers for sdN must be in range 1 - 15", @@ -333,7 +333,7 @@ xenLinuxDomainDeviceID(virConnectPtr con if (path[3] != '\0') { if (!isdigit(path[3]) || path[3] == '0' || - xstrtol_i(path+3, NULL, 10, &part) < 0 || + virStrToLong_i(path+3, NULL, 10, &part) < 0 || part < 1 || part > 63) { statsErrorFunc (conn, VIR_ERR_INVALID_ARG, __FUNCTION__, "invalid path, partition numbers for hdN must be in range 1 - 63", Index: libvirt/src/virsh.c =================================================================== --- libvirt.orig/src/virsh.c +++ libvirt/src/virsh.c @@ -46,7 +46,6 @@ #include <readline/history.h> #endif -#include "internal.h" #include "console.h" #include "util.h" @@ -2914,7 +2913,7 @@ cmdVNCDisplay(vshControl * ctl, vshCmd * (obj->stringval == NULL) || (obj->stringval[0] == 0)) { goto cleanup; } - if (xstrtol_i((const char *)obj->stringval, NULL, 10, &port) || port < 0) + if (virStrToLong_i((const char *)obj->stringval, NULL, 10, &port) || port < 0) goto cleanup; xmlXPathFreeObject(obj); @@ -3959,7 +3958,7 @@ vshCommandOptDomainBy(vshControl * ctl, /* try it by ID */ if (flag & VSH_BYID) { - if (xstrtol_i(n, NULL, 10, &id) == 0 && id >= 0) { + if (virStrToLong_i(n, NULL, 10, &id) == 0 && id >= 0) { vshDebug(ctl, 5, "%s: <%s> seems like domain ID\n", cmd->def->name, optname); dom = virDomainLookupByID(ctl->conn, id); Index: libvirt/src/xend_internal.c =================================================================== --- libvirt.orig/src/xend_internal.c +++ libvirt/src/xend_internal.c @@ -35,7 +35,7 @@ #include "libvirt/libvirt.h" #include "driver.h" -#include "internal.h" +#include "util.h" #include "sexpr.h" #include "xml.h" #include "buf.h" @@ -3049,7 +3049,7 @@ xenDaemonDomainGetVcpus(virDomainPtr dom (t->u.s.car->u.s.cdr->kind == SEXPR_CONS)) { for (t = t->u.s.car->u.s.cdr->u.s.car; t->kind == SEXPR_CONS; t = t->u.s.cdr) if (t->u.s.car->kind == SEXPR_VALUE - && xstrtol_i(t->u.s.car->u.value, NULL, 10, &cpu) == 0 + && virStrToLong_i(t->u.s.car->u.value, NULL, 10, &cpu) == 0 && cpu >= 0 && (VIR_CPU_MAPLEN(cpu+1) <= maplen)) { VIR_USE_CPU(cpumap, cpu); Index: libvirt/qemud/qemud.c =================================================================== --- libvirt.orig/qemud/qemud.c +++ libvirt/qemud/qemud.c @@ -52,7 +52,7 @@ #include "internal.h" #include "getaddrinfo.h" -#include "../src/internal.h" +#include "../src/util.h" #include "../src/remote_internal.h" #include "../src/conf.h" #include "event.h" @@ -1889,7 +1889,7 @@ remoteReadConfigFile (struct qemud_serve GET_CONF_STR (conf, filename, unix_sock_ro_perms); if (unix_sock_ro_perms) { - if (xstrtol_i (unix_sock_ro_perms, NULL, 8, &unix_sock_ro_mask) != 0) { + if (virStrToLong_i (unix_sock_ro_perms, NULL, 8, &unix_sock_ro_mask) != 0) { qemudLog (QEMUD_ERR, "Failed to parse mode '%s'", unix_sock_ro_perms); goto free_and_fail; @@ -1900,7 +1900,7 @@ remoteReadConfigFile (struct qemud_serve GET_CONF_STR (conf, filename, unix_sock_rw_perms); if (unix_sock_rw_perms) { - if (xstrtol_i (unix_sock_rw_perms, NULL, 8, &unix_sock_rw_mask) != 0) { + if (virStrToLong_i (unix_sock_rw_perms, NULL, 8, &unix_sock_rw_mask) != 0) { qemudLog (QEMUD_ERR, "Failed to parse mode '%s'", unix_sock_rw_perms); goto free_and_fail; @@ -2045,7 +2045,7 @@ int main(int argc, char **argv) { break; case 't': - if (xstrtol_i(optarg, &tmp, 10, &timeout) != 0 + if (virStrToLong_i(optarg, &tmp, 10, &timeout) != 0 || timeout <= 0 /* Ensure that we can multiply by 1000 without overflowing. */ || timeout > INT_MAX / 1000) Index: libvirt/src/libvirt_sym.version =================================================================== --- libvirt.orig/src/libvirt_sym.version +++ libvirt/src/libvirt_sym.version @@ -133,5 +133,10 @@ __virFileReadAll; + __virStrToLong_i; + __virStrToLong_ui; + __virStrToLong_ll; + __virStrToLong_ull; + local: *; }; Index: libvirt/src/nodeinfo.h =================================================================== --- libvirt.orig/src/nodeinfo.h +++ libvirt/src/nodeinfo.h @@ -24,7 +24,7 @@ #ifndef __VIR_NODEINFO_H__ #define __VIR_NODEINFO_H__ -#include "internal.h" +#include "libvirt/libvirt.h" #ifdef __cplusplus extern "C" { --

1 0

[Libvir] [patch 2/3] Fix subscript typo when calling hypervisor domainDestroy
by Mark McLoughlin 07 Feb '08

07 Feb '08

Fixes: xen_unified.c: In function 'xenUnifiedDomainDestroy': xen_unified.c:697: error: array subscript is above array bounds Signed-off-by: Mark McLoughlin <markmc(a)redhat.com> Index: libvirt/src/xen_unified.c =================================================================== --- libvirt.orig/src/xen_unified.c +++ libvirt/src/xen_unified.c @@ -694,7 +694,7 @@ xenUnifiedDomainDestroy (virDomainPtr do drivers[i]->domainDestroy (dom) == 0) return 0; - if (priv->opened[i] && + if (priv->opened[XEN_UNIFIED_HYPERVISOR_OFFSET] && drivers[XEN_UNIFIED_HYPERVISOR_OFFSET]->domainDestroy && drivers[XEN_UNIFIED_HYPERVISOR_OFFSET]->domainDestroy (dom) == 0) return 0; --

1 0

[Libvir] [patch 1/3] Move static function prototype from header
by Mark McLoughlin 07 Feb '08

07 Feb '08

Fixes: xm_internal.h:64: error: 'xenXMDomainAttachDevice' declared 'static' but never defined xm_internal.h:65: error: 'xenXMDomainDetachDevice' declared 'static' but never defined Signed-off-by: Mark McLoughlin <markmc(a)redhat.com> Index: libvirt/src/xm_internal.c =================================================================== --- libvirt.orig/src/xm_internal.c +++ libvirt/src/xm_internal.c @@ -77,6 +77,8 @@ static int xenXMAttachDisk(virDomainPtr xmlNodePtr node, xenXMConfCachePtr entry); static int xenXMAttachInterface(virDomainPtr domain, xmlXPathContextPtr ctxt, int hvm, xmlNodePtr node, xenXMConfCachePtr entry); +static int xenXMDomainAttachDevice(virDomainPtr domain, const char *xml); +static int xenXMDomainDetachDevice(virDomainPtr domain, const char *xml); #define XM_REFRESH_INTERVAL 10 Index: libvirt/src/xm_internal.h =================================================================== --- libvirt.orig/src/xm_internal.h +++ libvirt/src/xm_internal.h @@ -61,9 +61,6 @@ int xenXMDomainUndefine(virDomainPtr dom virConfPtr xenXMParseXMLToConfig(virConnectPtr conn, const char *xml); char *xenXMDomainFormatXML(virConnectPtr conn, virConfPtr conf); -static int xenXMDomainAttachDevice(virDomainPtr domain, const char *xml); -static int xenXMDomainDetachDevice(virDomainPtr domain, const char *xml); - #ifdef __cplusplus } #endif --

1 0

[Libvir] [patch 0/3] Fix some gcc 4.3.0 warnings
by Mark McLoughlin 07 Feb '08

07 Feb '08

Hi, With gcc-4.3.0 (from Fedora rawhide), some new warnings are thrown up. The following three patches fixes them. The first two are straightforward, I think, but perhaps people might prefer to remove -Winline from our warning flags rather than apply the last patch. Cheers, Mark. --

1 0

[Libvir] Re: libvirt on mingw
by Richard W.M. Jones 06 Feb '08

06 Feb '08

Brecht Sanders wrote: > Hello again, > Note that I am using gcc (mingw) 3.4.5, and not 4 as you recommend. > The attached patch got rid of the warnings though. > Maybe there is a compiler switch to fix it in a cleaner way though. > Anyway, with the attached patch it does compile. > Basically it casts to void* before converting to a different type. > Regards Yes thanks, that patch does indeed fix it. I'll apply it and release a new version shortly. Rich. -- Emerging Technologies, Red Hat - http://et.redhat.com/~rjones/ Registered Address: Red Hat UK Ltd, Amberley Place, 107-111 Peascod Street, Windsor, Berkshire, SL4 1TE, United Kingdom. Registered in England and Wales under Company Registration No. 03798903

2 4

[Libvir] [PATCH] change a Disk/Nic of inactive domain
by S.Sakamoto 06 Feb '08

06 Feb '08

Hi The libvirt on Xen-3.03 does not have the function that add/change/delete a Disk/NIC of inactive domain. So, I made a patch which enabled add/change/delete of Disk/NIC of inactive domain. This patch will be able to change "disk" or "vif" parameter in configuration file with "attach-disk","attach-interface", "attach-device", "detach-disk", "detach-interface" and "detach-device" command, like "setmem" or "setvcpus". Thanks, Shigeki Sakamoto.

5 9

[Libvir] [PATCH] add missing qemudReportError
by Guido Guenther 06 Feb '08

06 Feb '08

Hi, without this qemudParseVMDef might return NULL when the boot dev configuration is invalid but virGetLastError returns NULL either since no error has been set, this leads to a segfault in qemudLoadConfig when trying to print the error message. Cheers, -- Guido diff --git a/src/qemu_conf.c b/src/qemu_conf.c index 6dc08e0..48ccc60 100644 --- a/src/qemu_conf.c +++ b/src/qemu_conf.c @@ -1193,6 +1193,7 @@ static struct qemud_vm_def *qemudParseXML(virConnectPtr conn, } else if (!strcmp((char *)prop, "network")) { def->os.bootDevs[def->os.nBootDevs++] = QEMUD_BOOT_NET; } else { + qemudReportError(conn, NULL, NULL, VIR_ERR_INTERNAL_ERROR, "unknown boot dev \'%s\'", (char*)prop); goto error; } xmlFree(prop);

3 4

[Libvir] don't use virBufferAdd with string literals
by Jim Meyering 06 Feb '08

06 Feb '08

I noticed a little glitch here: src/xml.c: virBufferAdd(buf, "(usbdevice tablet)", 13); src/xml.c: virBufferAdd(buf, "(usbdevice tablet)", 18); So I mounted a campaign to remove all such uses of virBufferAdd and make sure no more sneak back in. First, I added this definition: #define virBufferAddLit(buf_, literal_string_) \ virBufferAdd (buf_, "" literal_string_ "", sizeof literal_string_ - 1) The empty double quotes ensure that you get a syntax error if you pass anything other than a string literal in the 2nd parameter. The idea being to change, e.g., the above examples to this: virBufferAddLit(buf, "(usbdevice tablet)"); FYI, I converted almost all of the uses of virBufferAdd like this: git grep -l -w virBufferAdd|xargs perl -pi -e \ 's/virBufferAdd( *$[^,]+, *"[^"]*"), *-?\d+ *$/virBufferAddLit$1)/' About 20 more uses spanned two or more lines. I did them manually. Here's the complete change: Eliminate all uses of virBufferAdd with string literals. * Makefile.maint (sc_prohibit_virBufferAdd_with_string_literal): New rule. * src/buf.h (virBufferAddLit): Define. * src/conf.c (virConfSaveValue): Use virBufferAddLit, in place of virBufferAdd everywhere possible. (virConfSaveEntry): Likewise. * src/qemu_conf.c (qemudGenerateXML, qemudGenerateNetworkXML): Likewise. * src/qemu_driver.c (qemudGetFeatures, qemudGetCapabilities): Likewise. * src/test.c (testDomainDumpXML, testNetworkDumpXML): Likewise. * src/xen_internal.c (xenHypervisorMakeCapabilitiesXML): Likewise. * src/xend_internal.c (xend_parse_sexp_desc_os): Likewise. (xend_parse_sexp_desc, sexpr_to_xend_topology_xml): Likewise. * src/xm_internal.c (xenXMDomainFormatXML, xenXMDomainPinVcpu): Likewise. * src/xml.c (virSaveCpuSet, virParseXenCpuTopology): Likewise. (virDomainParseXMLGraphicsDescImage): Likewise. (virDomainParseXMLGraphicsDescVFB, virDomainParseXMLOSDescHVM): Likewise. (virDomainParseXMLOSDescPV, virDomainParseXMLDiskDesc): Likewise. (virDomainParseXMLIfDesc, virDomainParseXMLDesc): Likewise. Signed-off-by: Jim Meyering <meyering(a)redhat.com> --- Makefile.maint | 5 +++ src/buf.h | 5 ++- src/conf.c | 14 ++++---- src/qemu_conf.c | 50 +++++++++++++++--------------- src/qemu_driver.c | 34 ++++++++++---------- src/test.c | 14 ++++---- src/xen_internal.c | 42 +++++++++++++------------- src/xend_internal.c | 70 +++++++++++++++++++++--------------------- src/xm_internal.c | 64 +++++++++++++++++++------------------- src/xml.c | 84 +++++++++++++++++++++++++------------------------- 10 files changed, 195 insertions(+), 187 deletions(-) diff --git a/Makefile.maint b/Makefile.maint index 356ca73..923c422 100644 --- a/Makefile.maint +++ b/Makefile.maint @@ -304,6 +304,11 @@ sc_unmarked_diagnostics: { echo '$(ME): found unmarked diagnostic(s)' 1>&2; \ exit 1; } || : +sc_prohibit_virBufferAdd_with_string_literal: + @grep -nE '\<virBufferAdd *\([^,]+, *"[^"]' $$($(CVS_LIST_EXCEPT)) && \ + { echo '$(ME): use virBufferAddLit, not virBufferAdd,' \ + 'with a string literal' 1>&2; exit 1; } || : + # Avoid useless parentheses like those in this example: # #if defined (SYMBOL) || defined (SYM2) sc_useless_cpp_parens: diff --git a/src/buf.h b/src/buf.h index 8826617..275cd40 100644 --- a/src/buf.h +++ b/src/buf.h @@ -1,7 +1,7 @@ /* * buf.h: buffers for libvirt * - * Copyright (C) 2005-2007 Red Hat, Inc. + * Copyright (C) 2005-2008 Red Hat, Inc. * * See COPYING.LIB for the License of this software * @@ -37,4 +37,7 @@ int virBufferStrcat(virBufferPtr buf, ...); int virBufferEscapeString(virBufferPtr buf, const char *format, const char *str); int virBufferURIEncodeString (virBufferPtr buf, const char *str); +#define virBufferAddLit(buf_, literal_string_) \ + virBufferAdd (buf_, "" literal_string_ "", sizeof literal_string_ - 1) + #endif /* __VIR_BUFFER_H__ */ diff --git a/src/conf.c b/src/conf.c index d4e5227..67c9c6e 100644 --- a/src/conf.c +++ b/src/conf.c @@ -264,17 +264,17 @@ virConfSaveValue(virBufferPtr buf, virConfValuePtr val) virConfValuePtr cur; cur = val->list; - virBufferAdd(buf, "[ ", 2); + virBufferAddLit(buf, "[ "); if (cur != NULL) { virConfSaveValue(buf, cur); cur = cur->next; while (cur != NULL) { - virBufferAdd(buf, ", ", 2); + virBufferAddLit(buf, ", "); virConfSaveValue(buf, cur); cur = cur->next; } } - virBufferAdd(buf, " ]", 2); + virBufferAddLit(buf, " ]"); break; } default: @@ -297,17 +297,17 @@ virConfSaveEntry(virBufferPtr buf, virConfEntryPtr cur) { if (cur->name != NULL) { virBufferAdd(buf, cur->name, -1); - virBufferAdd(buf, " = ", 3); + virBufferAddLit(buf, " = "); virConfSaveValue(buf, cur->value); if (cur->comment != NULL) { - virBufferAdd(buf, " #", 2); + virBufferAddLit(buf, " #"); virBufferAdd(buf, cur->comment, -1); } } else if (cur->comment != NULL) { - virBufferAdd(buf, "#", 1); + virBufferAddLit(buf, "#"); virBufferAdd(buf, cur->comment, -1); } - virBufferAdd(buf, "\n", 1); + virBufferAddLit(buf, "\n"); return(0); } diff --git a/src/qemu_conf.c b/src/qemu_conf.c index 6dc08e0..d6e3b77 100644 --- a/src/qemu_conf.c +++ b/src/qemu_conf.c @@ -2714,7 +2714,7 @@ char *qemudGenerateXML(virConnectPtr conn, if (virBufferVSprintf(buf, " <vcpu>%d</vcpu>\n", def->vcpus) < 0) goto no_memory; - if (virBufferAdd(buf, " <os>\n", -1) < 0) + if (virBufferAddLit(buf, " <os>\n") < 0) goto no_memory; if (def->virtType == QEMUD_VIRT_QEMU) { @@ -2756,33 +2756,33 @@ char *qemudGenerateXML(virConnectPtr conn, goto no_memory; } - if (virBufferAdd(buf, " </os>\n", -1) < 0) + if (virBufferAddLit(buf, " </os>\n") < 0) goto no_memory; if (def->features & QEMUD_FEATURE_ACPI) { - if (virBufferAdd(buf, " <features>\n", -1) < 0) + if (virBufferAddLit(buf, " <features>\n") < 0) goto no_memory; - if (virBufferAdd(buf, " <acpi/>\n", -1) < 0) + if (virBufferAddLit(buf, " <acpi/>\n") < 0) goto no_memory; - if (virBufferAdd(buf, " </features>\n", -1) < 0) + if (virBufferAddLit(buf, " </features>\n") < 0) goto no_memory; } virBufferVSprintf(buf, " <clock offset='%s'/>\n", def->localtime ? "localtime" : "utc"); - if (virBufferAdd(buf, " <on_poweroff>destroy</on_poweroff>\n", -1) < 0) + if (virBufferAddLit(buf, " <on_poweroff>destroy</on_poweroff>\n") < 0) goto no_memory; if (def->noReboot) { - if (virBufferAdd(buf, " <on_reboot>destroy</on_reboot>\n", -1) < 0) + if (virBufferAddLit(buf, " <on_reboot>destroy</on_reboot>\n") < 0) goto no_memory; } else { - if (virBufferAdd(buf, " <on_reboot>restart</on_reboot>\n", -1) < 0) + if (virBufferAddLit(buf, " <on_reboot>restart</on_reboot>\n") < 0) goto no_memory; } - if (virBufferAdd(buf, " <on_crash>destroy</on_crash>\n", -1) < 0) + if (virBufferAddLit(buf, " <on_crash>destroy</on_crash>\n") < 0) goto no_memory; - if (virBufferAdd(buf, " <devices>\n", -1) < 0) + if (virBufferAddLit(buf, " <devices>\n") < 0) goto no_memory; if (virBufferVSprintf(buf, " <emulator>%s</emulator>\n", def->os.binary) < 0) @@ -2814,7 +2814,7 @@ char *qemudGenerateXML(virConnectPtr conn, goto no_memory; if (disk->readonly) - if (virBufferAdd(buf, " <readonly/>\n", -1) < 0) + if (virBufferAddLit(buf, " <readonly/>\n") < 0) goto no_memory; if (virBufferVSprintf(buf, " </disk>\n") < 0) @@ -2904,12 +2904,12 @@ char *qemudGenerateXML(virConnectPtr conn, } /* If graphics is enable, add implicit mouse */ if (def->graphicsType != QEMUD_GRAPHICS_NONE) - if (virBufferAdd(buf, " <input type='mouse' bus='ps2'/>\n", -1) < 0) + if (virBufferAddLit(buf, " <input type='mouse' bus='ps2'/>\n") < 0) goto no_memory; switch (def->graphicsType) { case QEMUD_GRAPHICS_VNC: - if (virBufferAdd(buf, " <graphics type='vnc'", -1) < 0) + if (virBufferAddLit(buf, " <graphics type='vnc'") < 0) goto no_memory; if (def->vncPort && @@ -2927,12 +2927,12 @@ char *qemudGenerateXML(virConnectPtr conn, def->keymap) < 0) goto no_memory; - if (virBufferAdd(buf, "/>\n", -1) < 0) + if (virBufferAddLit(buf, "/>\n") < 0) goto no_memory; break; case QEMUD_GRAPHICS_SDL: - if (virBufferAdd(buf, " <graphics type='sdl'/>\n", -1) < 0) + if (virBufferAddLit(buf, " <graphics type='sdl'/>\n") < 0) goto no_memory; break; @@ -2944,11 +2944,11 @@ char *qemudGenerateXML(virConnectPtr conn, if (def->graphicsType == QEMUD_GRAPHICS_VNC) { } - if (virBufferAdd(buf, " </devices>\n", -1) < 0) + if (virBufferAddLit(buf, " </devices>\n") < 0) goto no_memory; - if (virBufferAdd(buf, "</domain>\n", -1) < 0) + if (virBufferAddLit(buf, "</domain>\n") < 0) goto no_memory; return virBufferContentAndFree (buf); @@ -2989,11 +2989,11 @@ char *qemudGenerateNetworkXML(virConnectPtr conn, virBufferVSprintf(buf, " <forward dev='%s'/>\n", def->forwardDev); } else { - virBufferAdd(buf, " <forward/>\n", -1); + virBufferAddLit(buf, " <forward/>\n"); } } - virBufferAdd(buf, " <bridge", -1); + virBufferAddLit(buf, " <bridge"); if (qemudIsActiveNetwork(network)) { if (virBufferVSprintf(buf, " name='%s'", network->bridge) < 0) goto no_memory; @@ -3007,7 +3007,7 @@ char *qemudGenerateNetworkXML(virConnectPtr conn, goto no_memory; if (def->ipAddress[0] || def->netmask[0]) { - if (virBufferAdd(buf, " <ip", -1) < 0) + if (virBufferAddLit(buf, " <ip") < 0) goto no_memory; if (def->ipAddress[0] && @@ -3018,12 +3018,12 @@ char *qemudGenerateNetworkXML(virConnectPtr conn, virBufferVSprintf(buf, " netmask='%s'", def->netmask) < 0) goto no_memory; - if (virBufferAdd(buf, ">\n", -1) < 0) + if (virBufferAddLit(buf, ">\n") < 0) goto no_memory; if (def->ranges) { struct qemud_dhcp_range_def *range = def->ranges; - if (virBufferAdd(buf, " <dhcp>\n", -1) < 0) + if (virBufferAddLit(buf, " <dhcp>\n") < 0) goto no_memory; while (range) { if (virBufferVSprintf(buf, " <range start='%s' end='%s' />\n", @@ -3031,15 +3031,15 @@ char *qemudGenerateNetworkXML(virConnectPtr conn, goto no_memory; range = range->next; } - if (virBufferAdd(buf, " </dhcp>\n", -1) < 0) + if (virBufferAddLit(buf, " </dhcp>\n") < 0) goto no_memory; } - if (virBufferAdd(buf, " </ip>\n", -1) < 0) + if (virBufferAddLit(buf, " </ip>\n") < 0) goto no_memory; } - if (virBufferAdd(buf, "</network>\n", -1) < 0) + if (virBufferAddLit(buf, "</network>\n") < 0) goto no_memory; return virBufferContentAndFree (buf); diff --git a/src/qemu_driver.c b/src/qemu_driver.c index f80a121..3151574 100644 --- a/src/qemu_driver.c +++ b/src/qemu_driver.c @@ -1,7 +1,7 @@ /* * driver.c: core driver methods for managing qemu guests * - * Copyright (C) 2006, 2007 Red Hat, Inc. + * Copyright (C) 2006, 2007, 2008 Red Hat, Inc. * Copyright (C) 2006 Daniel P. Berrange * * This library is free software; you can redistribute it and/or @@ -1459,19 +1459,19 @@ static int qemudGetFeatures(virBufferPtr xml, if (flags == NULL) return 0; - r = virBufferAdd(xml, "\ - <features>\n", -1); + r = virBufferAddLit(xml, "\ + <features>\n"); if (r == -1) return r; for (i = 0; flags[i].name; ++i) { if (STREQ(flags[i].name, "pae")) { int pae = flags[i].default_on || flags[i].toggle; int nonpae = flags[i].toggle; if (pae) { - r = virBufferAdd(xml, " <pae/>\n", -1); + r = virBufferAddLit(xml, " <pae/>\n"); if (r == -1) return r; } if (nonpae) { - r = virBufferAdd(xml, " <nonpae/>\n", -1); + r = virBufferAddLit(xml, " <nonpae/>\n"); if (r == -1) return r; } } else { @@ -1482,7 +1482,7 @@ static int qemudGetFeatures(virBufferPtr xml, if (r == -1) return r; } } - r = virBufferAdd(xml, " </features>\n", -1); + r = virBufferAddLit(xml, " </features>\n"); return r; } @@ -1550,26 +1550,26 @@ static char *qemudGetCapabilities(virConnectPtr conn ATTRIBUTE_UNUSED) { } if (have_kqemu) { - r = virBufferAdd (xml, + r = virBufferAddLit (xml, "\ - <domain type=\"kqemu\"/>\n", -1); + <domain type=\"kqemu\"/>\n"); if (r == -1) goto vir_buffer_failed; } if (have_kvm) { - r = virBufferAdd (xml, + r = virBufferAddLit (xml, "\ <domain type=\"kvm\">\n\ <emulator>/usr/bin/qemu-kvm</emulator>\n\ - </domain>\n", -1); + </domain>\n"); if (r == -1) goto vir_buffer_failed; } - r = virBufferAdd (xml, " </arch>\n", -1); + r = virBufferAddLit (xml, " </arch>\n"); if (r == -1) goto vir_buffer_failed; r = qemudGetFeatures(xml, qemudArchs[i].fflags); if (r == -1) goto vir_buffer_failed; - r = virBufferAdd (xml, " </guest>\n", -1); + r = virBufferAddLit (xml, " </guest>\n"); if (r == -1) goto vir_buffer_failed; /* The "other" PC architecture needs emulation. */ @@ -1594,7 +1594,7 @@ static char *qemudGetCapabilities(virConnectPtr conn ATTRIBUTE_UNUSED) { qemudArchs[i].machines[j]); if (r == -1) goto vir_buffer_failed; } - r = virBufferAdd (xml, " </arch>\n </guest>\n", -1); + r = virBufferAddLit (xml, " </arch>\n </guest>\n"); if (r == -1) goto vir_buffer_failed; } @@ -1620,20 +1620,20 @@ static char *qemudGetCapabilities(virConnectPtr conn ATTRIBUTE_UNUSED) { qemudArchs[i].machines[j]); if (r == -1) goto vir_buffer_failed; } - r = virBufferAdd (xml, " </arch>\n", -1); + r = virBufferAddLit (xml, " </arch>\n"); if (r == -1) goto vir_buffer_failed; r = qemudGetFeatures(xml, qemudArchs[i].fflags); if (r == -1) goto vir_buffer_failed; - r = virBufferAdd (xml, " </guest>\n", -1); + r = virBufferAddLit (xml, " </guest>\n"); if (r == -1) goto vir_buffer_failed; } /* Finish off. */ - r = virBufferAdd (xml, + r = virBufferAddLit (xml, "\ -</capabilities>\n", -1); +</capabilities>\n"); if (r == -1) goto vir_buffer_failed; return virBufferContentAndFree(xml); diff --git a/src/test.c b/src/test.c index ab83f65..003d6b7 100644 --- a/src/test.c +++ b/src/test.c @@ -1492,7 +1492,7 @@ static char *testDomainDumpXML(virDomainPtr domain, int flags ATTRIBUTE_UNUSED) virBufferVSprintf(buf, " <on_poweroff>%s</on_poweroff>\n", testRestartFlagToString(privdom->onPoweroff)); virBufferVSprintf(buf, " <on_crash>%s</on_crash>\n", testRestartFlagToString(privdom->onCrash)); - virBufferAdd(buf, "</domain>\n", -1); + virBufferAddLit(buf, "</domain>\n"); xml = buf->content; free(buf); @@ -1863,7 +1863,7 @@ static char *testNetworkDumpXML(virNetworkPtr network, int flags ATTRIBUTE_UNUSE return (NULL); } - virBufferAdd(buf, "<network>\n", -1); + virBufferAddLit(buf, "<network>\n"); virBufferVSprintf(buf, " <name>%s</name>\n", network->name); uuid = network->uuid; virUUIDFormat(uuid, uuidstr); @@ -1873,18 +1873,18 @@ static char *testNetworkDumpXML(virNetworkPtr network, int flags ATTRIBUTE_UNUSE if (privnet->forwardDev[0]) virBufferVSprintf(buf, " <forward dev='%s'/>\n", privnet->forwardDev); else - virBufferAdd(buf, " <forward/>\n", -1); + virBufferAddLit(buf, " <forward/>\n"); } virBufferVSprintf(buf, " <ip address='%s' netmask='%s'>\n", privnet->ipAddress, privnet->ipNetmask); - virBufferAdd(buf, " <dhcp>\n", -1); + virBufferAddLit(buf, " <dhcp>\n"); virBufferVSprintf(buf, " <range start='%s' end='%s'/>\n", privnet->dhcpStart, privnet->dhcpEnd); - virBufferAdd(buf, " </dhcp>\n", -1); - virBufferAdd(buf, " </ip>\n", -1); + virBufferAddLit(buf, " </dhcp>\n"); + virBufferAddLit(buf, " </ip>\n"); - virBufferAdd(buf, "</network>\n", -1); + virBufferAddLit(buf, "</network>\n"); xml = buf->content; free(buf); diff --git a/src/xen_internal.c b/src/xen_internal.c index 1292382..1ddff85 100644 --- a/src/xen_internal.c +++ b/src/xen_internal.c @@ -1,7 +1,7 @@ /* * xen_internal.c: direct access to Xen hypervisor level * - * Copyright (C) 2005, 2006, 2007 Red Hat, Inc. + * Copyright (C) 2005, 2006, 2007, 2008 Red Hat, Inc. * * See COPYING.LIB for the License of this software * @@ -2330,11 +2330,11 @@ xenHypervisorMakeCapabilitiesXML(virConnectPtr conn, if (r == -1) goto vir_buffer_failed; } if (host_pae) { - r = virBufferAdd (xml, "\ - <pae/>\n", -1); + r = virBufferAddLit (xml, "\ + <pae/>\n"); if (r == -1) goto vir_buffer_failed; } - r = virBufferAdd (xml, + r = virBufferAddLit (xml, "\ </features>\n\ </cpu>\n\ @@ -2344,7 +2344,7 @@ xenHypervisorMakeCapabilitiesXML(virConnectPtr conn, <uri_transport>xenmigr</uri_transport>\n\ </uri_transports>\n\ </migration_features>\n\ - </host>\n", -1); + </host>\n"); if (r == -1) goto vir_buffer_failed; if (sys_interface_version >= 4) { @@ -2376,48 +2376,48 @@ xenHypervisorMakeCapabilitiesXML(virConnectPtr conn, guest_archs[i].bits == 64 ? "64" : ""); if (r == -1) goto vir_buffer_failed; } - r = virBufferAdd (xml, + r = virBufferAddLit (xml, "\ </arch>\n\ - <features>\n", -1); + <features>\n"); if (r == -1) goto vir_buffer_failed; if (guest_archs[i].pae) { - r = virBufferAdd (xml, + r = virBufferAddLit (xml, "\ - <pae/>\n", -1); + <pae/>\n"); if (r == -1) goto vir_buffer_failed; } if (guest_archs[i].nonpae) { - r = virBufferAdd (xml, " <nonpae/>\n", -1); + r = virBufferAddLit (xml, " <nonpae/>\n"); if (r == -1) goto vir_buffer_failed; } if (guest_archs[i].ia64_be) { - r = virBufferAdd (xml, " <ia64_be/>\n", -1); + r = virBufferAddLit (xml, " <ia64_be/>\n"); if (r == -1) goto vir_buffer_failed; } if (guest_archs[i].hvm) { - r = virBufferAdd (xml, " <acpi default='on' toggle='yes'/>\n", - -1); + r = virBufferAddLit (xml, + " <acpi default='on' toggle='yes'/>\n"); if (r == -1) goto vir_buffer_failed; // In Xen 3.1.0, APIC is always on and can't be toggled if (hv_major >= 3 && hv_minor > 0) { - r = virBufferAdd (xml, - " <apic default='off' toggle='no'/>\n", -1); + r = virBufferAddLit (xml, + " <apic default='off' toggle='no'/>\n"); } else { - r = virBufferAdd (xml, - " <apic default='on' toggle='yes'/>\n", -1); + r = virBufferAddLit (xml, + " <apic default='on' toggle='yes'/>\n"); } if (r == -1) goto vir_buffer_failed; } - r = virBufferAdd (xml, "\ + r = virBufferAddLit (xml, "\ </features>\n\ - </guest>\n", -1); + </guest>\n"); if (r == -1) goto vir_buffer_failed; } - r = virBufferAdd (xml, + r = virBufferAddLit (xml, "\ -</capabilities>\n", -1); +</capabilities>\n"); if (r == -1) goto vir_buffer_failed; xml_str = strdup (xml->content); if (!xml_str) goto vir_buffer_failed; diff --git a/src/xend_internal.c b/src/xend_internal.c index 78691c9..9a79591 100644 --- a/src/xend_internal.c +++ b/src/xend_internal.c @@ -1286,7 +1286,7 @@ xend_parse_sexp_desc_os(virConnectPtr xend, struct sexpr *node, virBufferPtr buf return(-1); } - virBufferAdd(buf, " <os>\n", 7); + virBufferAddLit(buf, " <os>\n"); if (hvm) { virBufferVSprintf(buf, " <type>hvm</type>\n"); tmp = sexpr_node(node, "domain/image/hvm/kernel"); @@ -1304,7 +1304,7 @@ xend_parse_sexp_desc_os(virConnectPtr xend, struct sexpr *node, virBufferPtr buf while (*tmp) { if (*tmp == 'a') /* XXX no way to deal with boot from 2nd floppy */ - virBufferAdd(buf, " <boot dev='fd'/>\n", 21 ); + virBufferAddLit(buf, " <boot dev='fd'/>\n"); else if (*tmp == 'c') /* * Don't know what to put here. Say the vm has been given 3 @@ -1312,11 +1312,11 @@ xend_parse_sexp_desc_os(virConnectPtr xend, struct sexpr *node, virBufferPtr buf * We're going to assume that first disk is the boot disk since * this is most common practice */ - virBufferAdd(buf, " <boot dev='hd'/>\n", 21 ); + virBufferAddLit(buf, " <boot dev='hd'/>\n"); else if (*tmp == 'd') - virBufferAdd(buf, " <boot dev='cdrom'/>\n", 24 ); + virBufferAddLit(buf, " <boot dev='cdrom'/>\n"); else if (*tmp == 'n') - virBufferAdd(buf, " <boot dev='network'/>\n", 26 ); + virBufferAddLit(buf, " <boot dev='network'/>\n"); tmp++; } } @@ -1341,7 +1341,7 @@ xend_parse_sexp_desc_os(virConnectPtr xend, struct sexpr *node, virBufferPtr buf virBufferEscapeString(buf, " <cmdline>%s</cmdline>\n", tmp); } - virBufferAdd(buf, " </os>\n", 8); + virBufferAddLit(buf, " </os>\n"); return(0); } @@ -1472,20 +1472,20 @@ xend_parse_sexp_desc(virConnectPtr conn, struct sexpr *root, if (hvm) { int clockLocal; - virBufferAdd(&buf, " <features>\n", 13); + virBufferAddLit(&buf, " <features>\n"); if (sexpr_int(root, "domain/image/hvm/acpi")) - virBufferAdd(&buf, " <acpi/>\n", 12); + virBufferAddLit(&buf, " <acpi/>\n"); if (sexpr_int(root, "domain/image/hvm/apic")) - virBufferAdd(&buf, " <apic/>\n", 12); + virBufferAddLit(&buf, " <apic/>\n"); if (sexpr_int(root, "domain/image/hvm/pae")) - virBufferAdd(&buf, " <pae/>\n", 11); - virBufferAdd(&buf, " </features>\n", 14); + virBufferAddLit(&buf, " <pae/>\n"); + virBufferAddLit(&buf, " </features>\n"); clockLocal = sexpr_int(root, "domain/image/hvm/localtime"); virBufferVSprintf(&buf, " <clock offset='%s'/>\n", clockLocal ? "localtime" : "utc"); } - virBufferAdd(&buf, " <devices>\n", 12); + virBufferAddLit(&buf, " <devices>\n"); /* in case of HVM we have devices emulation */ tmp = sexpr_node(root, "domain/image/hvm/device_model"); @@ -1636,7 +1636,7 @@ xend_parse_sexp_desc(virConnectPtr conn, struct sexpr *root, virBufferVSprintf(&buf, " <readonly/>\n"); else if ((mode != NULL) && (!strcmp(mode, "w!"))) virBufferVSprintf(&buf, " <shareable/>\n"); - virBufferAdd(&buf, " </disk>\n", 12); + virBufferAddLit(&buf, " </disk>\n"); bad_parse: free(drvName); @@ -1673,7 +1673,7 @@ xend_parse_sexp_desc(virConnectPtr conn, struct sexpr *root, virBufferVSprintf(&buf, " <script path='%s'/>\n", tmp2); - virBufferAdd(&buf, " </interface>\n", 17); + virBufferAddLit(&buf, " </interface>\n"); vif_index++; } else if (sexpr_lookup(node, "device/vfb")) { /* New style graphics config for PV guests in >= 3.0.4, @@ -1682,7 +1682,7 @@ xend_parse_sexp_desc(virConnectPtr conn, struct sexpr *root, if (tmp && !strcmp(tmp, "sdl")) { virBufferVSprintf(&buf, " <input type='mouse' bus='%s'/>\n", hvm ? "ps2": "xen"); - virBufferAdd(&buf, " <graphics type='sdl'/>\n", 27); + virBufferAddLit(&buf, " <graphics type='sdl'/>\n"); } else if (tmp && !strcmp(tmp, "vnc")) { int port = xenStoreDomainGetVNCPort(conn, domid); const char *listenAddr = sexpr_node(node, "device/vfb/vnclisten"); @@ -1699,7 +1699,7 @@ xend_parse_sexp_desc(virConnectPtr conn, struct sexpr *root, } if (keymap) virBufferVSprintf(&buf, " keymap='%s'", keymap); - virBufferAdd(&buf, "/>\n", 3); + virBufferAddLit(&buf, "/>\n"); } } } @@ -1707,29 +1707,29 @@ xend_parse_sexp_desc(virConnectPtr conn, struct sexpr *root, if (hvm) { tmp = sexpr_node(root, "domain/image/hvm/fda"); if ((tmp != NULL) && (tmp[0] != 0)) { - virBufferAdd(&buf, " <disk type='file' device='floppy'>\n", 39); + virBufferAddLit(&buf, " <disk type='file' device='floppy'>\n"); virBufferVSprintf(&buf, " <source file='%s'/>\n", tmp); - virBufferAdd(&buf, " <target dev='fda'/>\n", 26); - virBufferAdd(&buf, " </disk>\n", 12); + virBufferAddLit(&buf, " <target dev='fda'/>\n"); + virBufferAddLit(&buf, " </disk>\n"); } tmp = sexpr_node(root, "domain/image/hvm/fdb"); if ((tmp != NULL) && (tmp[0] != 0)) { - virBufferAdd(&buf, " <disk type='file' device='floppy'>\n", 39); + virBufferAddLit(&buf, " <disk type='file' device='floppy'>\n"); virBufferVSprintf(&buf, " <source file='%s'/>\n", tmp); - virBufferAdd(&buf, " <target dev='fdb'/>\n", 26); - virBufferAdd(&buf, " </disk>\n", 12); + virBufferAddLit(&buf, " <target dev='fdb'/>\n"); + virBufferAddLit(&buf, " </disk>\n"); } /* Old style cdrom config from Xen <= 3.0.2 */ if (xendConfigVersion == 1) { tmp = sexpr_node(root, "domain/image/hvm/cdrom"); if ((tmp != NULL) && (tmp[0] != 0)) { - virBufferAdd(&buf, " <disk type='file' device='cdrom'>\n", 38); - virBufferAdd(&buf, " <driver name='file'/>\n", 28); + virBufferAddLit(&buf, " <disk type='file' device='cdrom'>\n"); + virBufferAddLit(&buf, " <driver name='file'/>\n"); virBufferVSprintf(&buf, " <source file='%s'/>\n", tmp); - virBufferAdd(&buf, " <target dev='hdc'/>\n", 26); - virBufferAdd(&buf, " <readonly/>\n", 18); - virBufferAdd(&buf, " </disk>\n", 12); + virBufferAddLit(&buf, " <target dev='hdc'/>\n"); + virBufferAddLit(&buf, " <readonly/>\n"); + virBufferAddLit(&buf, " </disk>\n"); } } } @@ -1742,9 +1742,9 @@ xend_parse_sexp_desc(virConnectPtr conn, struct sexpr *root, tmp = sexpr_node(node, "usbdevice"); if (tmp && *tmp) { if (!strcmp(tmp, "tablet")) - virBufferAdd(&buf, " <input type='tablet' bus='usb'/>\n", 37); + virBufferAddLit(&buf, " <input type='tablet' bus='usb'/>\n"); else if (!strcmp(tmp, "mouse")) - virBufferAdd(&buf, " <input type='mouse' bus='usb'/>\n", 36); + virBufferAddLit(&buf, " <input type='mouse' bus='usb'/>\n"); } } } @@ -1779,7 +1779,7 @@ xend_parse_sexp_desc(virConnectPtr conn, struct sexpr *root, } if (keymap) virBufferVSprintf(&buf, " keymap='%s'", keymap); - virBufferAdd(&buf, "/>\n", 3); + virBufferAddLit(&buf, "/>\n"); } } @@ -1788,7 +1788,7 @@ xend_parse_sexp_desc(virConnectPtr conn, struct sexpr *root, if (tmp != NULL) { if (tmp[0] == '1') { virBufferVSprintf(&buf, " <input type='mouse' bus='%s'/>\n", hvm ? "ps2" : "xen"); - virBufferAdd(&buf, " <graphics type='sdl'/>\n", 27 ); + virBufferAddLit(&buf, " <graphics type='sdl'/>\n"); } } } @@ -1799,8 +1799,8 @@ xend_parse_sexp_desc(virConnectPtr conn, struct sexpr *root, free(tty); } - virBufferAdd(&buf, " </devices>\n", 13); - virBufferAdd(&buf, "</domain>\n", 10); + virBufferAddLit(&buf, " </devices>\n"); + virBufferAddLit(&buf, "</domain>\n"); buf.content[buf.use] = 0; return (buf.content); @@ -1969,9 +1969,9 @@ sexpr_to_xend_topology_xml(virConnectPtr conn, const struct sexpr *root, r = virParseXenCpuTopology(conn, xml, nodeToCpu, numCpus); if (r < 0) goto error; - r = virBufferAdd (xml, "\ + r = virBufferAddLit (xml, "\ </cells>\n\ - </topology>\n", -1); + </topology>\n"); if (r < 0) goto vir_buffer_failed; return (0); diff --git a/src/xm_internal.c b/src/xm_internal.c index f452819..2dc126a 100644 --- a/src/xm_internal.c +++ b/src/xm_internal.c @@ -592,7 +592,7 @@ char *xenXMDomainFormatXML(virConnectPtr conn, virConfPtr conf) { buf = virBufferNew(4096); - virBufferAdd(buf, "<domain type='xen'>\n", -1); + virBufferAddLit(buf, "<domain type='xen'>\n"); virBufferVSprintf(buf, " <name>%s</name>\n", name); virUUIDFormat(uuid, uuidstr); virBufferVSprintf(buf, " <uuid>%s</uuid>\n", uuidstr); @@ -603,8 +603,8 @@ char *xenXMDomainFormatXML(virConnectPtr conn, virConfPtr conf) { if (hvm) { const char *boot; - virBufferAdd(buf, " <os>\n", -1); - virBufferAdd(buf, " <type>hvm</type>\n", -1); + virBufferAddLit(buf, " <os>\n"); + virBufferAddLit(buf, " <type>hvm</type>\n"); if (xenXMConfigGetString(conf, "kernel", &str) == 0) virBufferVSprintf(buf, " <loader>%s</loader>\n", str); @@ -629,7 +629,7 @@ char *xenXMDomainFormatXML(virConnectPtr conn, virConfPtr conf) { boot++; } - virBufferAdd(buf, " </os>\n", -1); + virBufferAddLit(buf, " </os>\n"); } else { if (xenXMConfigGetString(conf, "bootloader", &str) == 0) @@ -637,14 +637,14 @@ char *xenXMDomainFormatXML(virConnectPtr conn, virConfPtr conf) { if (xenXMConfigGetString(conf, "bootargs", &str) == 0) virBufferEscapeString(buf, " <bootloader_args>%s</bootloader_args>\n", str); if (xenXMConfigGetString(conf, "kernel", &str) == 0) { - virBufferAdd(buf, " <os>\n", -1); - virBufferAdd(buf, " <type>linux</type>\n", -1); + virBufferAddLit(buf, " <os>\n"); + virBufferAddLit(buf, " <type>linux</type>\n"); virBufferVSprintf(buf, " <kernel>%s</kernel>\n", str); if (xenXMConfigGetString(conf, "ramdisk", &str) == 0) virBufferVSprintf(buf, " <initrd>%s</initrd>\n", str); if (xenXMConfigGetString(conf, "extra", &str) == 0) virBufferEscapeString(buf, " <cmdline>%s</cmdline>\n", str); - virBufferAdd(buf, " </os>\n", -1); + virBufferAddLit(buf, " </os>\n"); } } @@ -687,24 +687,24 @@ char *xenXMDomainFormatXML(virConnectPtr conn, virConfPtr conf) { if (hvm) { - virBufferAdd(buf, " <features>\n", -1); + virBufferAddLit(buf, " <features>\n"); if (xenXMConfigGetInt(conf, "pae", &val) == 0 && val) - virBufferAdd(buf, " <pae/>\n", -1); + virBufferAddLit(buf, " <pae/>\n"); if (xenXMConfigGetInt(conf, "acpi", &val) == 0 && val) - virBufferAdd(buf, " <acpi/>\n", -1); + virBufferAddLit(buf, " <acpi/>\n"); if (xenXMConfigGetInt(conf, "apic", &val) == 0 && val) - virBufferAdd(buf, " <apic/>\n", -1); - virBufferAdd(buf, " </features>\n", -1); + virBufferAddLit(buf, " <apic/>\n"); + virBufferAddLit(buf, " </features>\n"); if (xenXMConfigGetInt(conf, "localtime", &val) < 0) val = 0; virBufferVSprintf(buf, " <clock offset='%s'/>\n", val ? "localtime" : "utc"); } - virBufferAdd(buf, " <devices>\n", -1); + virBufferAddLit(buf, " <devices>\n"); if (hvm) { if (xenXMConfigGetString(conf, "device_model", &str) == 0) @@ -808,11 +808,11 @@ char *xenXMDomainFormatXML(virConnectPtr conn, virConfPtr conf) { virBufferVSprintf(buf, " <target dev='%s'/>\n", dev); if (!strcmp(head, "r") || !strcmp(head, "ro")) - virBufferAdd(buf, " <readonly/>\n", -1); + virBufferAddLit(buf, " <readonly/>\n"); else if ((!strcmp(head, "w!")) || (!strcmp(head, "!"))) - virBufferAdd(buf, " <shareable/>\n", -1); - virBufferAdd(buf, " </disk>\n", -1); + virBufferAddLit(buf, " <shareable/>\n"); + virBufferAddLit(buf, " </disk>\n"); skipdisk: list = list->next; @@ -821,12 +821,12 @@ char *xenXMDomainFormatXML(virConnectPtr conn, virConfPtr conf) { if (hvm && priv->xendConfigVersion == 1) { if (xenXMConfigGetString(conf, "cdrom", &str) == 0) { - virBufferAdd(buf, " <disk type='file' device='cdrom'>\n", -1); - virBufferAdd(buf, " <driver name='file'/>\n", -1); + virBufferAddLit(buf, " <disk type='file' device='cdrom'>\n"); + virBufferAddLit(buf, " <driver name='file'/>\n"); virBufferVSprintf(buf, " <source file='%s'/>\n", str); - virBufferAdd(buf, " <target dev='hdc'/>\n", -1); - virBufferAdd(buf, " <readonly/>\n", -1); - virBufferAdd(buf, " </disk>\n", -1); + virBufferAddLit(buf, " <target dev='hdc'/>\n"); + virBufferAddLit(buf, " <readonly/>\n"); + virBufferAddLit(buf, " </disk>\n"); } } @@ -897,7 +897,7 @@ char *xenXMDomainFormatXML(virConnectPtr conn, virConfPtr conf) { type = 1; } - virBufferAdd(buf, " <interface type='bridge'>\n", -1); + virBufferAddLit(buf, " <interface type='bridge'>\n"); if (mac[0]) virBufferVSprintf(buf, " <mac address='%s'/>\n", mac); if (type == 1 && bridge[0]) @@ -906,7 +906,7 @@ char *xenXMDomainFormatXML(virConnectPtr conn, virConfPtr conf) { virBufferVSprintf(buf, " <script path='%s'/>\n", script); if (ip[0]) virBufferVSprintf(buf, " <ip address='%s'/>\n", ip); - virBufferAdd(buf, " </interface>\n", -1); + virBufferAddLit(buf, " </interface>\n"); skipnic: list = list->next; @@ -916,9 +916,9 @@ char *xenXMDomainFormatXML(virConnectPtr conn, virConfPtr conf) { if (hvm) { if (xenXMConfigGetString(conf, "usbdevice", &str) == 0 && str) { if (!strcmp(str, "tablet")) - virBufferAdd(buf, " <input type='tablet' bus='usb'/>\n", 37); + virBufferAddLit(buf, " <input type='tablet' bus='usb'/>\n"); else if (!strcmp(str, "mouse")) - virBufferAdd(buf, " <input type='mouse' bus='usb'/>\n", 36); + virBufferAddLit(buf, " <input type='mouse' bus='usb'/>\n"); /* Ignore else branch - probably some other non-input device we don't support in libvirt yet */ } @@ -1006,23 +1006,23 @@ char *xenXMDomainFormatXML(virConnectPtr conn, virConfPtr conf) { if (keymap) { virBufferVSprintf(buf, " keymap='%s'", keymap); } - virBufferAdd(buf, "/>\n", 3); + virBufferAddLit(buf, "/>\n"); } if (sdl) { - virBufferAdd(buf, " <graphics type='sdl'/>\n", -1); + virBufferAddLit(buf, " <graphics type='sdl'/>\n"); } if (hvm) { if (xenXMConfigGetString(conf, "serial", &str) == 0 && !strcmp(str, "pty")) { - virBufferAdd(buf, " <console/>\n", -1); + virBufferAddLit(buf, " <console/>\n"); } } else { /* Paravirt implicitly always has a console */ - virBufferAdd(buf, " <console/>\n", -1); + virBufferAddLit(buf, " <console/>\n"); } - virBufferAdd(buf, " </devices>\n", -1); + virBufferAddLit(buf, " </devices>\n"); - virBufferAdd(buf, "</domain>\n", -1); + virBufferAddLit(buf, "</domain>\n"); xml = buf->content; buf->content = NULL; @@ -1274,7 +1274,7 @@ int xenXMDomainPinVcpu(virDomainPtr domain, n = i*8 + j; if (comma) { - if (virBufferAdd (mapbuf, ",", 1) == -1) { + if (virBufferAddLit (mapbuf, ",") == -1) { xenXMError (domain->conn, VIR_ERR_NO_MEMORY, __FUNCTION__); virBufferFree (mapbuf); return -1; diff --git a/src/xml.c b/src/xml.c index b7ffe2a..3052148 100644 --- a/src/xml.c +++ b/src/xml.c @@ -172,7 +172,7 @@ virSaveCpuSet(virConnectPtr conn, char *cpuset, int maxcpu) start = cur; } else if (start != -1) { if (!first) - virBufferAdd(buf, ",", -1); + virBufferAddLit(buf, ","); else first = 0; if (cur == start + 1) @@ -185,7 +185,7 @@ virSaveCpuSet(virConnectPtr conn, char *cpuset, int maxcpu) } if (start != -1) { if (!first) - virBufferAdd(buf, ",", -1); + virBufferAddLit(buf, ","); if (maxcpu == start + 1) virBufferVSprintf(buf, "%d", start); else @@ -384,9 +384,9 @@ virParseXenCpuTopology(virConnectPtr conn, virBufferPtr xml, goto memory_error; } } - ret = virBufferAdd(xml, "\ + ret = virBufferAddLit(xml, "\ </cpus>\n\ - </cell>\n", -1); + </cell>\n"); if (ret < 0) goto memory_error; @@ -718,15 +718,15 @@ virDomainParseXMLGraphicsDescImage(virConnectPtr conn ATTRIBUTE_UNUSED, graphics_type = xmlGetProp(node, BAD_CAST "type"); if (graphics_type != NULL) { if (xmlStrEqual(graphics_type, BAD_CAST "sdl")) { - virBufferAdd(buf, "(sdl 1)", 7); + virBufferAddLit(buf, "(sdl 1)", 7); /* TODO: * Need to understand sdl options * - *virBufferAdd(buf, "(display localhost:10.0)", 24); - *virBufferAdd(buf, "(xauthority /root/.Xauthority)", 30); + *virBufferAddLit(buf, "(display localhost:10.0)"); + *virBufferAddLit(buf, "(xauthority /root/.Xauthority)"); */ } else if (xmlStrEqual(graphics_type, BAD_CAST "vnc")) { - virBufferAdd(buf, "(vnc 1)", 7); + virBufferAddLit(buf, "(vnc 1)"); if (xendConfigVersion >= 2) { xmlChar *vncport = xmlGetProp(node, BAD_CAST "port"); xmlChar *vnclisten = xmlGetProp(node, BAD_CAST "listen"); @@ -737,7 +737,7 @@ virDomainParseXMLGraphicsDescImage(virConnectPtr conn ATTRIBUTE_UNUSED, long port = strtol((const char *) vncport, NULL, 10); if (port == -1) - virBufferAdd(buf, "(vncunused 1)", 13); + virBufferAddLit(buf, "(vncunused 1)"); else if (port >= 5900) virBufferVSprintf(buf, "(vncdisplay %ld)", port - 5900); @@ -784,18 +784,18 @@ virDomainParseXMLGraphicsDescVFB(virConnectPtr conn ATTRIBUTE_UNUSED, graphics_type = xmlGetProp(node, BAD_CAST "type"); if (graphics_type != NULL) { - virBufferAdd(buf, "(device (vkbd))", 15); - virBufferAdd(buf, "(device (vfb ", 13); + virBufferAddLit(buf, "(device (vkbd))"); + virBufferAddLit(buf, "(device (vfb "); if (xmlStrEqual(graphics_type, BAD_CAST "sdl")) { - virBufferAdd(buf, "(type sdl)", 10); + virBufferAddLit(buf, "(type sdl)"); /* TODO: * Need to understand sdl options * - *virBufferAdd(buf, "(display localhost:10.0)", 24); - *virBufferAdd(buf, "(xauthority /root/.Xauthority)", 30); + *virBufferAddLit(buf, "(display localhost:10.0)"); + *virBufferAddLit(buf, "(xauthority /root/.Xauthority)"); */ } else if (xmlStrEqual(graphics_type, BAD_CAST "vnc")) { - virBufferAdd(buf, "(type vnc)", 10); + virBufferAddLit(buf, "(type vnc)"); xmlChar *vncport = xmlGetProp(node, BAD_CAST "port"); xmlChar *vnclisten = xmlGetProp(node, BAD_CAST "listen"); xmlChar *vncpasswd = xmlGetProp(node, BAD_CAST "passwd"); @@ -805,7 +805,7 @@ virDomainParseXMLGraphicsDescVFB(virConnectPtr conn ATTRIBUTE_UNUSED, long port = strtol((const char *) vncport, NULL, 10); if (port == -1) - virBufferAdd(buf, "(vncunused 1)", 13); + virBufferAddLit(buf, "(vncunused 1)"); else if (port >= 5900) virBufferVSprintf(buf, "(vncdisplay %ld)", port - 5900); @@ -824,7 +824,7 @@ virDomainParseXMLGraphicsDescVFB(virConnectPtr conn ATTRIBUTE_UNUSED, xmlFree(keymap); } } - virBufferAdd(buf, "))", 2); + virBufferAddLit(buf, "))"); xmlFree(graphics_type); } return 0; @@ -910,7 +910,7 @@ virDomainParseXMLOSDescHVM(virConnectPtr conn, xmlNodePtr node, virXMLError(conn, VIR_ERR_OS_TYPE, (const char *) type, 0); return (-1); } - virBufferAdd(buf, "(image (hvm ", 12); + virBufferAddLit(buf, "(image (hvm "); if (loader == NULL) { virXMLError(conn, VIR_ERR_NO_KERNEL, NULL, 0); goto error; @@ -980,13 +980,13 @@ virDomainParseXMLOSDescHVM(virConnectPtr conn, xmlNodePtr node, } if (virXPathNode("/domain/features/acpi", ctxt) != NULL) - virBufferAdd(buf, "(acpi 1)", 8); + virBufferAddLit(buf, "(acpi 1)"); if (virXPathNode("/domain/features/apic", ctxt) != NULL) - virBufferAdd(buf, "(apic 1)", 8); + virBufferAddLit(buf, "(apic 1)"); if (virXPathNode("/domain/features/pae", ctxt) != NULL) - virBufferAdd(buf, "(pae 1)", 7); + virBufferAddLit(buf, "(pae 1)"); - virBufferAdd(buf, "(usb 1)", 7); + virBufferAddLit(buf, "(usb 1)"); nb_nodes = virXPathNodeSet("/domain/devices/input", ctxt, &nodes); if (nb_nodes > 0) { int i; @@ -1015,7 +1015,7 @@ virDomainParseXMLOSDescHVM(virConnectPtr conn, xmlNodePtr node, if (!isMouse) { /* Nothing - implicit ps2 */ } else { - virBufferAdd(buf, "(usbdevice tablet)", 13); + virBufferAddLit(buf, "(usbdevice tablet)"); } } else { if (!strcmp((const char *) bus, "ps2")) { @@ -1028,9 +1028,9 @@ virDomainParseXMLOSDescHVM(virConnectPtr conn, xmlNodePtr node, /* Nothing - implicit ps2 */ } else if (!strcmp((const char *) bus, "usb")) { if (isMouse) - virBufferAdd(buf, "(usbdevice mouse)", 17); + virBufferAddLit(buf, "(usbdevice mouse)"); else - virBufferAdd(buf, "(usbdevice tablet)", 18); + virBufferAddLit(buf, "(usbdevice tablet)"); } } xmlFree(bus); @@ -1046,7 +1046,7 @@ virDomainParseXMLOSDescHVM(virConnectPtr conn, xmlNodePtr node, goto error; } if (res) { - virBufferAdd(buf, "(serial pty)", 12); + virBufferAddLit(buf, "(serial pty)"); } /* HVM graphics for xen <= 3.0.5 */ @@ -1064,11 +1064,11 @@ virDomainParseXMLOSDescHVM(virConnectPtr conn, xmlNodePtr node, str = virXPathString("string(/domain/clock/@offset)", ctxt); if (str != NULL && !strcmp(str, "localtime")) { - virBufferAdd(buf, "(localtime 1)", 13); + virBufferAddLit(buf, "(localtime 1)"); } free(str); - virBufferAdd(buf, "))", 2); + virBufferAddLit(buf, "))"); return (0); @@ -1147,7 +1147,7 @@ virDomainParseXMLOSDescPV(virConnectPtr conn, xmlNodePtr node, virXMLError(conn, VIR_ERR_OS_TYPE, (const char *) type, 0); return (-1); } - virBufferAdd(buf, "(image (linux ", 14); + virBufferAddLit(buf, "(image (linux "); if (kernel == NULL) { virXMLError(conn, VIR_ERR_NO_KERNEL, NULL, 0); return (-1); @@ -1174,7 +1174,7 @@ virDomainParseXMLOSDescPV(virConnectPtr conn, xmlNodePtr node, } error: - virBufferAdd(buf, "))", 2); + virBufferAddLit(buf, "))"); return (0); } @@ -1304,14 +1304,14 @@ virDomainParseXMLDiskDesc(virConnectPtr conn, xmlNodePtr node, } - virBufferAdd(buf, "(device ", 8); + virBufferAddLit(buf, "(device "); /* Normally disks are in a (device (vbd ...)) block * but blktap disks ended up in a differently named * (device (tap ....)) block.... */ if (drvName && !strcmp((const char *) drvName, "tap")) { - virBufferAdd(buf, "(tap ", 5); + virBufferAddLit(buf, "(tap "); } else { - virBufferAdd(buf, "(vbd ", 5); + virBufferAddLit(buf, "(vbd "); } if (hvm) { @@ -1358,8 +1358,8 @@ virDomainParseXMLDiskDesc(virConnectPtr conn, xmlNodePtr node, else virBufferVSprintf(buf, "(mode 'w')"); - virBufferAdd(buf, ")", 1); - virBufferAdd(buf, ")", 1); + virBufferAddLit(buf, ")"); + virBufferAddLit(buf, ")"); cleanup: if (drvType) @@ -1442,7 +1442,7 @@ virDomainParseXMLIfDesc(virConnectPtr conn ATTRIBUTE_UNUSED, cur = cur->next; } - virBufferAdd(buf, "(vif ", 5); + virBufferAddLit(buf, "(vif "); if (mac != NULL) { unsigned int addr[12]; int tmp = sscanf((const char *) mac, @@ -1496,9 +1496,9 @@ virDomainParseXMLIfDesc(virConnectPtr conn ATTRIBUTE_UNUSED, * from Xen 3.1.0 */ if ((hvm) && (xendConfigVersion < 4)) - virBufferAdd(buf, "(type ioemu)", 12); + virBufferAddLit(buf, "(type ioemu)"); - virBufferAdd(buf, ")", 1); + virBufferAddLit(buf, ")"); ret = 0; error: if (mac != NULL) @@ -1583,7 +1583,7 @@ virDomainParseXMLDesc(virConnectPtr conn, const char *xmldesc, char **name, } xmlFree(prop); } - virBufferAdd(&buf, "(vm ", 4); + virBufferAddLit(&buf, "(vm "); ctxt = xmlXPathNewContext(xml); if (ctxt == NULL) { goto error; @@ -1748,7 +1748,7 @@ virDomainParseXMLDesc(virConnectPtr conn, const char *xmldesc, char **name, nb_nodes = virXPathNodeSet("/domain/devices/interface", ctxt, &nodes); if (nb_nodes > 0) { for (i = 0; i < nb_nodes; i++) { - virBufferAdd(&buf, "(device ", 8); + virBufferAddLit(&buf, "(device "); res = virDomainParseXMLIfDesc(conn, nodes[i], &buf, hvm, xendConfigVersion); @@ -1756,7 +1756,7 @@ virDomainParseXMLDesc(virConnectPtr conn, const char *xmldesc, char **name, free(nodes); goto error; } - virBufferAdd(&buf, ")", 1); + virBufferAddLit(&buf, ")"); } free(nodes); } @@ -1779,7 +1779,7 @@ virDomainParseXMLDesc(virConnectPtr conn, const char *xmldesc, char **name, } - virBufferAdd(&buf, ")", 1); /* closes (vm */ + virBufferAddLit(&buf, ")"); /* closes (vm */ buf.content[buf.use] = 0; xmlXPathFreeContext(ctxt); -- 1.5.4.19.gd3dfd

4 4

[Libvir] FYI: [PATCH] Fix new "make distcheck" failures.
by Jim Meyering 05 Feb '08

05 Feb '08

I've just checked this in: * src/xml.c (virDomainParseXMLOSDescHVM): Mark a diagnostic. diff --git a/src/xml.c b/src/xml.c index c3e25d5..614deb0 100644 --- a/src/xml.c +++ b/src/xml.c @@ -907,7 +907,7 @@ virDomainParseXMLOSDescHVM(virConnectPtr conn, xmlNodePtr node, bootorder[nbootorder] = '\0'; if (loader == NULL) { - virXMLError(conn, VIR_ERR_INTERNAL_ERROR, "no HVM domain loader", 0); + virXMLError(conn, VIR_ERR_INTERNAL_ERROR, _("no HVM domain loader"), 0); return -1; } -- 1.5.4.19.gd3dfd

1 0

[Libvir] removing trailing blanks (and keeping them away)
by Jim Meyering 05 Feb '08

05 Feb '08

Any objection to a mass removal of trailing blanks? [ If you haven't yet been adversely affected by e.g., pointless conflicts due solely to differences in white space, count yourself lucky, and chalk it up to not having to deal with many branches. The sooner we do this the better, IME. ] I'm proposing two things: - remove all trailing blanks - add a "make syntax-check" check to ensure that no new ones are added There aren't that many, but the change would affect many files. IMHO, such a change should wait until after big patches like Dan's StorageAPI changes are in. Obviously, one would not change .png and .gif files, and they would be exempted from the mechanical check. Here's the full list: tests/xmlrpctest.c:44 src/openvz_driver.c:41 src/openvz_conf.c:38 NEWS:33 src/libvirt.c:30 docs/virsh.pod:29 docs/libvir.html:24 virsh.1:21 src/xend_internal.c:19 docs/news.html:19 docs/index.py:19 docs/apibuild.py:18 src/xmlrpc.c:16 src/remote_internal.c:14 docs/devhelp/style.css:11 src/xen_internal.c:10 src/proxy_internal.c:9 src/xen_unified.c:8 proxy/libvirt_proxy.c:8 src/xs_internal.c:6 src/util.c:6 src/iptables.c:6 src/qemu_driver.c:5 src/qemu_conf.c:5 include/libvirt/libvirt.h:5 include/libvirt/libvirt.h.in:5 docs/library.xen:5 src/conf.c:4 python/generator.py:4 tests/virshtest.c:3 src/xml.c:3 src/xend_internal.h:3 src/openvz_conf.h:3 src/bridge.c:3 python/libvir.c:3 po/sv.po:3 libvirt.spec.in:3 docs/search.php:3 docs/libvirt.rng:3 docs/libvirLogo.png:3 docs/format.html:3 docs/examples/Makefile.am:3 docs/ChangeLog.xsl:3 docs/ChangeLog.awk:3 src/virterror.c:2 src/qemu.conf:2 src/driver.h:2 qemud/mdns.c:2 docs/site.xsl:2 docs/libvirHeader.png:2 docs/examples/suspend.c:2 docs/examples/python/README:2 docs/examples/examples.xsl:2 docs/Libxml2-Logo-90x34.gif:2 autogen.sh:2 TODO:2 tests/xml2sexprtest.c:1 tests/testutils.h:1 tests/test_conf.sh:1 tests/reconnect.c:1 src/xm_internal.c:1 src/virsh.c:1 src/sexpr.c:1 src/proxy_internal.h:1 src/openvz_driver.h:1 src/hash.c:1 src/buf.c:1 qemud/mdns.h:1 qemud/libvirtd.sasl:1 python/types.c:1 python/tests/uuid.py:1 python/tests/create.py:1 python/Makefile.am:1 po/ru.po:1 docs/windows.html:1 docs/windows-cygwin-3.png:1 docs/uri.html:1 docs/testnode.xml:1 docs/structures.fig:1 docs/node.fig:1 docs/news.xsl:1 docs/newapi.xsl:1 docs/libvirtLogo.png:1 docs/html/libvirt-libvirt.html:1 docs/examples/python/domstart.py:1 docs/examples/python/domsave.py:1 docs/examples/python/dominfo.py:1 docs/devhelp/Makefile.am:1 docs/architecture.fig:1 docs/Makefile.am:1 autobuild.sh:1

3 6

[Libvir] Re: libvirt adding new methods to the xenUnifiedDriver
by Richard W.M. Jones 05 Feb '08

05 Feb '08

Roman Divacky wrote: > hi > > I am messing with libvirt and I need to add some methods to the > xenUnifiedDriver structure. I do it this way: > (currently #ifdef-ed out) > > struct xenUnifiedDriver { > virDrvOpen open; > virDrvClose close; > virDrvGetVersion version; > virDrvGetHostname getHostname; > virDrvGetURI getURI; > virDrvNodeGetInfo nodeGetInfo; > virDrvGetCapabilities getCapabilities; > virDrvListDomains listDomains; > #if 0 > virDrvListDatastores listDatastores; > virDrvListSyspreps listSyspreps; > #endif > .... > > with the #if switched to off I am seeing some problems in > xenUnifiedDomainGetInfo(). it basically iterates through > array of driver structures to find out suitable domainGetInfo() > method. When I flip the #if to 1 the driver structures get redefined > causing xenUnifiedDomainGetInfo() to not find any suitable driver. Don't add things to xenUnifiedDriver structure -- this structure should go away eventually. (See the comment in src/xen_unified.h). Instead, just do whatever you need directly from src/xen_unified.c, be that direct code or calling something lower level. > code stuffed with debugging printfs: > > #if 0 case: > > priv->opened[i]: 0 > drivers[i]->domainGetInfo: 0x2aaaaaae0c10 > priv->opened[i]: 1 > drivers[i]->domainGetInfo: 0x2aaaaaaec2c0 > Domains 0: 2 CPUs > > #if 1 case: > > priv->opened[i]: 0 > drivers[i]->domainGetInfo: (nil) > priv->opened[i]: 1 > drivers[i]->domainGetInfo: (nil) > priv->opened[i]: 0 > drivers[i]->domainGetInfo: 0x2aaaaaae7400 > priv->opened[i]: 0 > drivers[i]->domainGetInfo: (nil) > priv->opened[i]: 1 > drivers[i]->domainGetInfo: (nil) > Failed to get informations for Domain 0 > > as you can see the "drivers" (xenHypervisorDriver etc.) got > redefined... > > any idea why? or whats going on? > > thnx for any possible help, if you cannot help me could you please > forward this mail to the appropriete place? You should send any questions to libvirt-list: http://www.redhat.com/mailman/listinfo/libvir-list Rich. -- Emerging Technologies, Red Hat - http://et.redhat.com/~rjones/ Registered Address: Red Hat UK Ltd, Amberley Place, 107-111 Peascod Street, Windsor, Berkshire, SL4 1TE, United Kingdom. Registered in England and Wales under Company Registration No. 03798903

1 0

[Libvir] libvirt & vde_switch
by Loic Dachary 05 Feb '08

05 Feb '08

In reply to http://www.redhat.com/archives/libvir-list/2007-April/msg00177.html an area where vde_switch support is usefull is an unprivileged user running tests. A test suite involving the creation of qemu instances thru libvirt should not be forced to create a bridge or alter the iptables configuration. With vde_switch and slirpvde multiple qemu instances can be run without altering the network configuration of the host. I hope it helps. Cheers

3 2