- Devel - libvirt List Archives

[libvirt] [PATCH v2 0/4] RFC: vcpupin: configure inactive domains' CPU affinity setting
by Taku Izumi 27 Apr '11

27 Apr '11

Hi all, This patchset enables us to configure inactive domains' CPU affinity setting. The basic technique is the same as that of "virsh setmem" command. => http://www.redhat.com/archives/libvir-list/2011-March/msg00013.html v1 -> v2: - recreate based on 0.9.0 - add "CURRENT" mode *[PATCH 1/4] vcpupin: inroduce a new libvir API (virDomainPinVcpuFlags) *[PATCH 2/4] vcpupin: implement the code to address the new API in the qemu driver *[PATCH 3/4] vcpupin: implement the remote protocol to address the new API *[PATCH 4/4] vcpupin: add the new options to "virsh vcpupin" command Best regards, Taku Izumi

4 14

[libvirt] [PATCH] esx: Fix dynamic dispatch for CastFromAnyType functions
by Matthias Bolte 27 Apr '11

27 Apr '11

This was broken by the refactoring in ac1e6586ec75. It resulted in a segfault for 'virsh vol-dumpxml' and related volume functions. Before the refactoring all users of the ESX_VI__TEMPLATE__DISPATCH macro dispatched on the item type, as the item is the input to all those functions. Commit ac1e6586ec75 made the dynamically dispatched CastFromAnyType functions use this macro too, but this functions dispatched on the actual type of the AnyType object. The item is the output of the CastFromAnyType functions. This difference was missed in the refactoring, making CastFromAnyType functions dereferencing the item pointer that is NULL at the time of the dispatch. --- src/esx/esx_vi_types.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/esx/esx_vi_types.c b/src/esx/esx_vi_types.c index dd83954..6a2d5cf 100644 --- a/src/esx/esx_vi_types.c +++ b/src/esx/esx_vi_types.c @@ -533,8 +533,8 @@ * Macros to implement dynamic dispatched functions */ -#define ESX_VI__TEMPLATE__DISPATCH(__type, _dispatch, _error_return) \ - switch (item->_type) { \ +#define ESX_VI__TEMPLATE__DISPATCH(_object, __type, _dispatch, _error_return) \ + switch ((_object)->_type) { \ _dispatch \ \ case esxVI_Type_##__type: \ @@ -543,7 +543,7 @@ default: \ ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, \ _("Call to %s for unexpected type '%s'"), __FUNCTION__, \ - esxVI_Type_ToString(item->_type)); \ + esxVI_Type_ToString((_object)->_type)); \ return _error_return; \ } @@ -585,7 +585,7 @@ #define ESX_VI__TEMPLATE__DYNAMIC_FREE(__type, _dispatch, _body) \ ESX_VI__TEMPLATE__FREE(__type, \ - ESX_VI__TEMPLATE__DISPATCH(__type, _dispatch, /* nothing */) \ + ESX_VI__TEMPLATE__DISPATCH(item, __type, _dispatch, /* nothing */) \ _body) @@ -618,14 +618,14 @@ #define ESX_VI__TEMPLATE__DYNAMIC_CAST_FROM_ANY_TYPE(__type, _dispatch) \ ESX_VI__TEMPLATE__CAST_FROM_ANY_TYPE_EXTRA(__type, esxVI_##__type, \ - ESX_VI__TEMPLATE__DISPATCH(__type, _dispatch, -1), \ + ESX_VI__TEMPLATE__DISPATCH(anyType, __type, _dispatch, -1), \ /* nothing */) #define ESX_VI__TEMPLATE__DYNAMIC_SERIALIZE(__type, _dispatch, _serialize) \ ESX_VI__TEMPLATE__SERIALIZE_EXTRA(__type, \ - ESX_VI__TEMPLATE__DISPATCH(__type, _dispatch, -1), \ + ESX_VI__TEMPLATE__DISPATCH(item, __type, _dispatch, -1), \ _serialize) -- 1.7.0.4

2 5

[libvirt] [PATCH] Move call to virReportOOMError into virFileBuildPath
by Matthias Bolte 27 Apr '11

27 Apr '11

Suggested by Daniel P. Berrange --- src/conf/nwfilter_conf.c | 5 +---- src/conf/storage_conf.c | 7 +------ src/util/util.c | 2 ++ src/xen/xen_inotify.c | 1 - src/xen/xm_internal.c | 5 +---- 5 files changed, 5 insertions(+), 15 deletions(-) diff --git a/src/conf/nwfilter_conf.c b/src/conf/nwfilter_conf.c index 327fab3..09dc32b 100644 --- a/src/conf/nwfilter_conf.c +++ b/src/conf/nwfilter_conf.c @@ -2588,10 +2588,8 @@ virNWFilterLoadAllConfigs(virConnectPtr conn, if (!virFileHasSuffix(entry->d_name, ".xml")) continue; - if (!(path = virFileBuildPath(configDir, entry->d_name, NULL))) { - virReportOOMError(); + if (!(path = virFileBuildPath(configDir, entry->d_name, NULL))) continue; - } nwfilter = virNWFilterObjLoad(conn, nwfilters, entry->d_name, path); if (nwfilter) @@ -2627,7 +2625,6 @@ virNWFilterObjSaveDef(virNWFilterDriverStatePtr driver, if (!(nwfilter->configFile = virFileBuildPath(driver->configDir, def->name, ".xml"))) { - virReportOOMError(); return -1; } } diff --git a/src/conf/storage_conf.c b/src/conf/storage_conf.c index 5a069f5..116898d 100644 --- a/src/conf/storage_conf.c +++ b/src/conf/storage_conf.c @@ -1483,14 +1483,11 @@ virStoragePoolLoadAllConfigs(virStoragePoolObjListPtr pools, if (!virFileHasSuffix(entry->d_name, ".xml")) continue; - if (!(path = virFileBuildPath(configDir, entry->d_name, NULL))) { - virReportOOMError(); + if (!(path = virFileBuildPath(configDir, entry->d_name, NULL))) continue; - } if (!(autostartLink = virFileBuildPath(autostartDir, entry->d_name, NULL))) { - virReportOOMError(); VIR_FREE(path); continue; } @@ -1529,13 +1526,11 @@ virStoragePoolObjSaveDef(virStorageDriverStatePtr driver, if (!(pool->configFile = virFileBuildPath(driver->configDir, def->name, ".xml"))) { - virReportOOMError(); return -1; } if (!(pool->autostartLink = virFileBuildPath(driver->autostartDir, def->name, ".xml"))) { - virReportOOMError(); VIR_FREE(pool->configFile); return -1; } diff --git a/src/util/util.c b/src/util/util.c index d4d2610..3948b01 100644 --- a/src/util/util.c +++ b/src/util/util.c @@ -1851,10 +1851,12 @@ virFileBuildPath(const char *dir, const char *name, const char *ext) if (ext == NULL) { if (virAsprintf(&path, "%s/%s", dir, name) < 0) { + virReportOOMError(); return NULL; } } else { if (virAsprintf(&path, "%s/%s%s", dir, name, ext) < 0) { + virReportOOMError(); return NULL; } } diff --git a/src/xen/xen_inotify.c b/src/xen/xen_inotify.c index d809c45..9dde72c 100644 --- a/src/xen/xen_inotify.c +++ b/src/xen/xen_inotify.c @@ -415,7 +415,6 @@ xenInotifyOpen(virConnectPtr conn, /* Build the full file path */ if (!(path = virFileBuildPath(priv->configDir, ent->d_name, NULL))) { - virReportOOMError(); closedir(dh); return -1; } diff --git a/src/xen/xm_internal.c b/src/xen/xm_internal.c index db47a02..f9f52b5 100644 --- a/src/xen/xm_internal.c +++ b/src/xen/xm_internal.c @@ -388,7 +388,6 @@ int xenXMConfigCacheRefresh (virConnectPtr conn) { /* Build the full file path */ if (!(path = virFileBuildPath(priv->configDir, ent->d_name, NULL))) { - virReportOOMError(); closedir(dh); return -1; } @@ -1134,10 +1133,8 @@ virDomainPtr xenXMDomainDefineXML(virConnectPtr conn, const char *xml) entry = NULL; } - if (!(filename = virFileBuildPath(priv->configDir, def->name, NULL))) { - virReportOOMError(); + if (!(filename = virFileBuildPath(priv->configDir, def->name, NULL))) goto error; - } if (xenXMConfigSaveFile(conn, filename, def) < 0) goto error; -- 1.7.0.4

2 2

[libvirt] Entering devel freeze tomorrow
by Daniel Veillard 27 Apr '11

27 Apr '11

Well I initially suggested to enter freeze the last week-end but I had a serious backlog and let a few day pass. What I suggest is enter freeze tomorrow morning (my time, i.e. very early) at which point I will make a first candidate release tarball for testing. Then the target for the actually release might be Wed 4 or Thu 5 depending on how things turns out. If there is patches for new features that people want in but didn't get the ACK, please raise them again quickly today so we can try to review them and push in time for 0.9.1, otherwise, that will be 0.9.2 in a month, thanks ! Daniel -- Daniel Veillard | libxml Gnome XML XSLT toolkit http://xmlsoft.org/ daniel(a)veillard.com | Rpmfind RPM search engine http://rpmfind.net/ http://veillard.com/ | virtualization library http://libvirt.org/

1 0

[libvirt] [PATCH] free buf->content when vsnprintf() failed
by Wen Congyang 27 Apr '11

27 Apr '11

When buf->error is 1, we do not return buf->content in the function virBufferContentAndReset(). So we should free buf->content when vsnprintf() failed. --- src/util/buf.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/src/util/buf.c b/src/util/buf.c index 7557ad1..fdb7660 100644 --- a/src/util/buf.c +++ b/src/util/buf.c @@ -241,6 +241,9 @@ virBufferVSprintf(const virBufferPtr buf, const char *format, ...) size = buf->size - buf->use; if ((count = vsnprintf(&buf->content[buf->use], size, format, argptr)) < 0) { + VIR_FREE(buf->content); + buf->size = 0; + buf->use = 0; buf->error = 1; goto err; } @@ -259,6 +262,9 @@ virBufferVSprintf(const virBufferPtr buf, const char *format, ...) size = buf->size - buf->use; if ((count = vsnprintf(&buf->content[buf->use], size, format, argptr)) < 0) { + VIR_FREE(buf->content); + buf->size = 0; + buf->use = 0; buf->error = 1; goto err; } -- 1.7.1

2 2

[libvirt] [PATCHv2 0/6] Add virNodeGetCpuTime() API
by Minoru Usui 27 Apr '11

27 Apr '11

Hi, This is v2 of virNodeGetCpuTime() API. It returns cpu utilization or cumulative cpu time of the node from /proc/stat since node boots up. This patch only supports linux host. Changes v1->v2 - Change user I/F like virDomainGetMemoryStats() - It can return either cpu utilization or cumulative cpu time of the node depends on each driver. Minoru Usui (6): [v2 1/6] virNodeGetCPUTime: Expose new API [v2 2/6] virNodeGetCPUTime: Define internal driver API [v2 3/6] virNodeGetCPUTime: Implement public API [v2 4/6] virNodeGetCPUTime: Implement remote protocol [v2 5/6] virNodeGetCPUTime: Implement virsh support [v2 6/6] virNodeGetCPUTime: Implement linux support daemon/remote.c | 48 +++++++++++++++++ daemon/remote_dispatch_args.h | 1 + daemon/remote_dispatch_prototypes.h | 8 +++ daemon/remote_dispatch_ret.h | 1 + daemon/remote_dispatch_table.h | 5 ++ include/libvirt/libvirt.h.in | 64 +++++++++++++++++++++++ src/driver.h | 8 +++ src/esx/esx_driver.c | 1 + src/libvirt.c | 70 +++++++++++++++++++++++++ src/libvirt_private.syms | 1 + src/libvirt_public.syms | 5 ++ src/libxl/libxl_driver.c | 1 + src/lxc/lxc_driver.c | 1 + src/nodeinfo.c | 78 ++++++++++++++++++++++++++++ src/nodeinfo.h | 5 ++- src/openvz/openvz_driver.c | 1 + src/phyp/phyp_driver.c | 1 + src/qemu/qemu_driver.c | 1 + src/remote/remote_driver.c | 38 ++++++++++++++ src/remote/remote_protocol.c | 33 ++++++++++++ src/remote/remote_protocol.h | 28 ++++++++++ src/remote/remote_protocol.x | 20 +++++++- src/remote_protocol-structs | 14 +++++ src/test/test_driver.c | 1 + src/uml/uml_driver.c | 1 + src/vbox/vbox_tmpl.c | 1 + src/vmware/vmware_driver.c | 1 + src/xen/xen_driver.c | 1 + src/xenapi/xenapi_driver.c | 1 + tools/virsh.c | 96 +++++++++++++++++++++++++++++++++++ tools/virsh.pod | 4 ++ 31 files changed, 537 insertions(+), 2 deletions(-) -- Minoru Usui <usui(a)mxm.nes.nec.co.jp>

3 18

[libvirt] [PATCH] daemon: Don't try to free an unsigned int in error paths
by Matthias Bolte 26 Apr '11

26 Apr '11

--- daemon/remote.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/daemon/remote.c b/daemon/remote.c index 54fef64..1c98bba 100644 --- a/daemon/remote.c +++ b/daemon/remote.c @@ -3681,7 +3681,7 @@ remoteDispatchListNetworks(struct qemud_server *server ATTRIBUTE_UNUSED, cleanup: if (rv < 0) { remoteDispatchError(rerr); - VIR_FREE(ret->names.names_len); + VIR_FREE(ret->names.names_val); } return rv; } @@ -4200,7 +4200,7 @@ remoteDispatchListInterfaces(struct qemud_server *server ATTRIBUTE_UNUSED, cleanup: if (rv < 0) { remoteDispatchError(rerr); - VIR_FREE(ret->names.names_len); + VIR_FREE(ret->names.names_val); } return rv; } @@ -4275,7 +4275,7 @@ remoteDispatchListDefinedInterfaces(struct qemud_server *server ATTRIBUTE_UNUSED cleanup: if (rv < 0) { remoteDispatchError(rerr); - VIR_FREE(ret->names.names_len); + VIR_FREE(ret->names.names_val); } return rv; } @@ -8544,7 +8544,7 @@ remoteDispatchListNwfilters(struct qemud_server *server ATTRIBUTE_UNUSED, cleanup: if (rv < 0) { remoteDispatchError(rerr); - VIR_FREE(ret->names.names_len); + VIR_FREE(ret->names.names_val); } return rv; } -- 1.7.0.4

3 13

[libvirt] [PATCH] build: use gnulib passfd for simpler SCM_RIGHTS code
by Eric Blake 26 Apr '11

26 Apr '11

* bootstrap.conf (gnulib_modules): Add passfd. * src/util/util.c (virFileOpenAs): Simplify. --- It's always nice to shove the maintenance burden onto gnulib. bootstrap.conf | 1 + src/util/util.c | 38 ++++++++------------------------------ 2 files changed, 9 insertions(+), 30 deletions(-) diff --git a/bootstrap.conf b/bootstrap.conf index 293f86e..3b3a90f 100644 --- a/bootstrap.conf +++ b/bootstrap.conf @@ -52,6 +52,7 @@ mkstemps mktempd netdb nonblocking +passfd perror physmem pipe-posix diff --git a/src/util/util.c b/src/util/util.c index d4d2610..de4e3b3 100644 --- a/src/util/util.c +++ b/src/util/util.c @@ -78,6 +78,7 @@ #include "files.h" #include "command.h" #include "nonblocking.h" +#include "passfd.h" #ifndef NSIG # define NSIG 32 @@ -1480,11 +1481,6 @@ virFileOpenAs(const char *path, int openflags, mode_t mode, int waitret, status, ret = 0; int fd = -1; int pair[2] = { -1, -1 }; - struct msghdr msg; - struct cmsghdr *cmsg; - char buf[CMSG_SPACE(sizeof(fd))]; - char dummy = 0; - struct iovec iov; int forkRet; if ((!(flags & VIR_FILE_OPEN_AS_UID)) @@ -1506,18 +1502,6 @@ virFileOpenAs(const char *path, int openflags, mode_t mode, return ret; } - memset(&msg, 0, sizeof(msg)); - iov.iov_base = &dummy; - iov.iov_len = 1; - msg.msg_iov = &iov; - msg.msg_iovlen = 1; - msg.msg_control = buf; - msg.msg_controllen = sizeof(buf); - cmsg = CMSG_FIRSTHDR(&msg); - cmsg->cmsg_level = SOL_SOCKET; - cmsg->cmsg_type = SCM_RIGHTS; - cmsg->cmsg_len = CMSG_LEN(sizeof(fd)); - forkRet = virFork(&pid); if (pid < 0) { @@ -1529,26 +1513,20 @@ virFileOpenAs(const char *path, int openflags, mode_t mode, VIR_FORCE_CLOSE(pair[1]); do { - ret = recvmsg(pair[0], &msg, 0); + ret = recvfd(pair[0], 0); } while (ret < 0 && errno == EINTR); - if (ret < 0) { + if (ret < 0 && errno != EACCES) { ret = -errno; VIR_FORCE_CLOSE(pair[0]); while ((waitret = waitpid(pid, NULL, 0) == -1) && (errno == EINTR)); goto parenterror; + } else { + fd = ret; } VIR_FORCE_CLOSE(pair[0]); - /* See if fd was transferred. */ - cmsg = CMSG_FIRSTHDR(&msg); - if (cmsg && cmsg->cmsg_len == CMSG_LEN(sizeof(fd)) && - cmsg->cmsg_level == SOL_SOCKET && - cmsg->cmsg_type == SCM_RIGHTS) { - memcpy(&fd, CMSG_DATA(cmsg), sizeof(fd)); - } - /* wait for child to complete, and retrieve its exit code */ while ((waitret = waitpid(pid, &status, 0) == -1) && (errno == EINTR)); @@ -1557,12 +1535,14 @@ virFileOpenAs(const char *path, int openflags, mode_t mode, virReportSystemError(errno, _("failed to wait for child creating '%s'"), path); + VIR_FORCE_CLOSE(fd); goto parenterror; } if (!WIFEXITED(status) || (ret = -WEXITSTATUS(status)) == -EACCES || fd == -1) { /* fall back to the simpler method, which works better in * some cases */ + VIR_FORCE_CLOSE(fd); return virFileOpenAsNoFork(path, openflags, mode, uid, gid, flags); } if (!ret) @@ -1627,10 +1607,9 @@ parenterror: path, mode); goto childerror; } - memcpy(CMSG_DATA(cmsg), &fd, sizeof(fd)); do { - ret = sendmsg(pair[1], &msg, 0); + ret = sendfd(pair[1], fd); } while (ret < 0 && errno == EINTR); if (ret < 0) { @@ -1638,7 +1617,6 @@ parenterror: goto childerror; } - ret = 0; childerror: /* ret tracks -errno on failure, but exit value must be positive. * If the child exits with EACCES, then the parent tries again. */ -- 1.7.1

2 6

[libvirt] libvirt and redis
by B Gordon 26 Apr '11

26 Apr '11

Is there interest in teaching libvirt to store configs in a DB? I'd like to talk out what's desirable in the scope and design with someone who knows libvirt. My eventual goal is to synchronize config between multiple libvirtds using Redis. I've been playing with a prototype that abstracts config writing and reading into handlers that can be selected at run time or from libvirtd.conf. This was to get me some familiarity--please tell me what aspects I should change to suit the rest of libvirt. The high-level, emphasizing the more questionable aspects: * "conf drivers" that cargo-cult the jargon used in "drivers" a bit even though they (currently) aren't quite a fit with the way current ones are used. * One global conf driver, because it needs to be accessed in other state drivers when a connection is not currently present in the API. * conf drivers present a file system-like key/value API to the rest of libvirt to minimize disruption. They receive an XML string to store and must be able to list the keys in a given "directory". Retrieval is done by passing an optional callback to xml.c that it will use instead of xmlCtxtReadFile(). * Keys should probably not include the full sysconfdir path, and many other ways the prototype is too FS-like. * With a relational DB, API calls to store each type of libvirt struct might make more sense than formatted XML strings. I have not tried to do this and vaguely hope that working with XML in a relational DB would be acceptable or that those calls could be added later. Using the DB's native XML handling might better for abstraction, actually. * The conf driver needs a way to receive parameters from libvirtd.conf. URI parsing? Some other key-value format? As a low-level example, here's my (current, expected to change based on feedback!) conversion of domain_conf.c: diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index b6aaf33..0c7bb3c 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -47,6 +47,7 @@ #include "storage_file.h" #include "files.h" #include "bitmap.h" +#include "conf_driver.h" #define VIR_FROM_THIS VIR_FROM_DOMAIN @@ -6158,7 +6159,7 @@ virDomainDefParse(const char *xmlStr, xmlDocPtr xml; virDomainDefPtr def = NULL; - if ((xml = virXMLParse(filename, xmlStr, "domain.xml"))) { + if ((xml = virConfParse(filename, xmlStr, "domain.xml"))) { def = virDomainDefParseNode(caps, xml, xmlDocGetRootElement(xml), flags); xmlFreeDoc(xml); } @@ -6245,7 +6246,7 @@ virDomainObjPtr virDomainObjParseFile(virCapsPtr caps, xmlDocPtr xml; virDomainObjPtr obj = NULL; - if ((xml = virXMLParseFile(filename))) { + if ((xml = virConfParse(filename, NULL, filename))) { obj = virDomainObjParseNode(caps, xml, xmlDocGetRootElement(xml)); xmlFreeDoc(xml); } @@ -8324,46 +8325,26 @@ int virDomainSaveXML(const char *configDir, const char *xml) { char *configFile = NULL; - int fd = -1, ret = -1; - size_t towrite; + int ret = -1; + int err; if ((configFile = virDomainConfigFile(configDir, def->name)) == NULL) goto cleanup; - if (virFileMakePath(configDir)) { - virReportSystemError(errno, + if ((err = virConfMakePath(configDir, 0))) { + virReportSystemError(err, _("cannot create config directory '%s'"), configDir); goto cleanup; } - if ((fd = open(configFile, - O_WRONLY | O_CREAT | O_TRUNC, - S_IRUSR | S_IWUSR )) < 0) { - virReportSystemError(errno, - _("cannot create config file '%s'"), - configFile); - goto cleanup; - } - - towrite = strlen(xml); - if (safewrite(fd, xml, towrite) < 0) { - virReportSystemError(errno, - _("cannot write config file '%s'"), - configFile); - goto cleanup; - } - - if (VIR_CLOSE(fd) < 0) { - virReportSystemError(errno, - _("cannot save config file '%s'"), - configFile); + if (virConfSave(configFile, xml, 0) < 0) { goto cleanup; } ret = 0; + cleanup: - VIR_FORCE_CLOSE(fd); VIR_FREE(configFile); return ret; @@ -8441,7 +8422,7 @@ static virDomainObjPtr virDomainLoadConfig(virCapsPtr caps, if ((autostartLink = virDomainConfigFile(autostartDir, name)) == NULL) goto error; - if ((autostart = virFileLinkPointsTo(autostartLink, configFile)) < 0) + if ((autostart = virConfLinkPointsTo(autostartLink, configFile, 0)) < 0) goto error; if (!(dom = virDomainAssignDef(caps, doms, def, false))) @@ -8514,12 +8495,12 @@ int virDomainLoadAllConfigs(virCapsPtr caps, virDomainLoadConfigNotify notify, void *opaque) { - DIR *dir; - struct dirent *entry; + virConfDirPtr dir; + virConfDirEntryPtr entry; VIR_INFO("Scanning for configs in %s", configDir); - if (!(dir = opendir(configDir))) { + if (!(dir = virConfOpenDir(configDir, 0))) { if (errno == ENOENT) return 0; virReportSystemError(errno, @@ -8528,23 +8509,17 @@ int virDomainLoadAllConfigs(virCapsPtr caps, return -1; } - while ((entry = readdir(dir))) { + while ((entry = virConfReadDir(dir, 0))) { virDomainObjPtr dom; - if (entry->d_name[0] == '.') - continue; - - if (!virFileStripSuffix(entry->d_name, ".xml")) - continue; - /* NB: ignoring errors, so one malformed config doesn't kill the whole process */ - VIR_INFO("Loading config file '%s.xml'", entry->d_name); + VIR_INFO("Loading config file '%s.xml'", entry->name); if (liveStatus) dom = virDomainLoadStatus(caps, doms, configDir, - entry->d_name, + entry->name, notify, opaque); else @@ -8552,7 +8527,7 @@ int virDomainLoadAllConfigs(virCapsPtr caps, doms, configDir, autostartDir, - entry->d_name, + entry->name, notify, opaque); if (dom) { @@ -8562,7 +8537,7 @@ int virDomainLoadAllConfigs(virCapsPtr caps, } } - closedir(dir); + virConfCloseDir(dir, 0); return 0; } @@ -8580,9 +8555,9 @@ int virDomainDeleteConfig(const char *configDir, goto cleanup; /* Not fatal if this doesn't work */ - unlink(autostartLink); + virConfDeletePath(autostartLink, 0); - if (unlink(configFile) < 0 && + if (virConfDeletePath(autostartLink, 0) < 0 && errno != ENOENT) { virReportSystemError(errno, _("cannot remove config %s"), @@ -8863,7 +8838,7 @@ virDomainSnapshotDefPtr virDomainSnapshotDefParseString(const char *xmlStr, char *creation = NULL, *state = NULL; struct timeval tv; - xml = virXMLParse(NULL, xmlStr, "domainsnapshot.xml"); + xml = virXMLParseString(xmlStr, "domainsnapshot.xml"); if (!xml) { virDomainReportError(VIR_ERR_XML_ERROR, "%s",_("failed to parse snapshot xml document")); -- http://www.fastmail.fm - Choose from over 50 domains or use your own

1 0

[libvirt] [PATCH] qemu: Add flags checking in DomainCoreDump
by Jiri Denemark 26 Apr '11

26 Apr '11

--- src/qemu/qemu_driver.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index f6e503a..f35616d 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -2345,7 +2345,8 @@ getCompressionType(struct qemud_driver *driver) static int qemudDomainCoreDump(virDomainPtr dom, const char *path, - int flags ATTRIBUTE_UNUSED) { + int flags) +{ struct qemud_driver *driver = dom->conn->privateData; virDomainObjPtr vm; int resume = 0, paused = 0; @@ -2353,6 +2354,8 @@ static int qemudDomainCoreDump(virDomainPtr dom, virDomainEventPtr event = NULL; qemuDomainObjPrivatePtr priv; + virCheckFlags(VIR_DUMP_LIVE | VIR_DUMP_CRASH, -1); + qemuDriverLock(driver); vm = virDomainFindByUUID(&driver->domains, dom->uuid); -- 1.7.5.rc1

2 2