May 2011 - Devel - libvirt List Archives

[libvirt] [PATCH 0/9] Many migration enhancements & bug fixes
by Daniel P. Berrange 26 May '11

26 May '11

This is a series containing all my pending migration related enhancements and bugfixes. It includes these previous patches to change the migration v3 protocol API + ABI http://www.redhat.com/archives/libvir-list/2011-May/msg01243.html Patch 9 also changes the v3 protocol API/ABI to deal with an error reporting problem I discovered in testing.

3 23

[libvirt] [PATCH] esx: Report an error when auth pointer is missing instead of declining
by Matthias Bolte 25 May '11

25 May '11

Otherwise an attempt to use virConnectOpen or virConnectOpenAuth without auth pointer results in the driver declining the URI and libvirt falling back to the remote driver for an esx:// URI. --- src/esx/esx_driver.c | 15 ++++++++++++--- 1 files changed, 12 insertions(+), 3 deletions(-) diff --git a/src/esx/esx_driver.c b/src/esx/esx_driver.c index 7fe5446..845dd4a 100644 --- a/src/esx/esx_driver.c +++ b/src/esx/esx_driver.c @@ -922,9 +922,18 @@ esxOpen(virConnectPtr conn, virConnectAuthPtr auth, int flags ATTRIBUTE_UNUSED) return VIR_DRV_OPEN_DECLINED; } - /* Decline URIs without server part, or missing auth */ - if (conn->uri->server == NULL || auth == NULL || auth->cb == NULL) { - return VIR_DRV_OPEN_DECLINED; + /* Require server part */ + if (conn->uri->server == NULL) { + ESX_ERROR(VIR_ERR_INVALID_ARG, "%s", + _("URI is missing the server part")); + return VIR_DRV_OPEN_ERROR; + } + + /* Require auth */ + if (auth == NULL || auth->cb == NULL) { + ESX_ERROR(VIR_ERR_INVALID_ARG, "%s", + _("Missing or invalid auth pointer")); + return VIR_DRV_OPEN_ERROR; } /* Allocate per-connection private data */ -- 1.7.0.4

2 2

[libvirt] libvirt.so.0: cannot open shared object file: No such file or directory
by YAO 25 May '11

25 May '11

Hi, I cloned the latest libvirt from git and compiled as follows: cd libvirt ./autogen.sh make sudo make install when installing, it reported "*/usr/bin/install: cannot stat `./xxx.html': No such file or directory*", is that normal? after install completed, I typed virsh, it showed: "*virsh: error while loading shared libraries: libvirt.so.0: cannot open shared object file: No such file or directory*", how to fix it? I found libvirt.so.0 in /usr/local/lib, but why virsh can't find it? the same problem happens on /usr/local/sbin/libvirtd, it can't find libvirt-qemu.so.0 which is also located in /usr/local/lib. So, what's the general procedure to make git version work?

2 3

[libvirt] [PATCH v4 0/4] vcpupin: configure inactive domains' CPU affinity setting
by Taku Izumi 25 May '11

25 May '11

Hi all, This patchset enables us to configure inactive domains' CPU affinity setting. v3 -> v4: - Rebase *[PATCHv4 1/4] vcpupin: inroduce a new libvir API (virDomainPinVcpuFlags) *[PATCHv4 2/4] vcpupin: implement the code to address the new API in the qemu driver *[PATCHv4 3/4] vcpupin: implement the remote protocol to address the new API *[PATCHv4 4/4] vcpupin: add the new options to "virsh vcpupin" command Best regards, Taku Izumi

3 11

[libvirt] [PATCH] qemu: don't require is_kvm for vhost-net support
by Laine Stump 25 May '11

25 May '11

This was discussed in: https://www.redhat.com/archives/libvir-list/2011-May/msg01370.html The capabilities code only sets the flag to allow use of vhost-net if kvm is detected (set if the help string contains "(qemu-kvm-" or "(kvm-"), but actually vhost-net is available in some qemu builds that don't have kvm in their name, so just checking for ",vhost=" is enough. --- src/qemu/qemu_capabilities.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index ea55df5..71a54a5 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -982,7 +982,7 @@ qemuCapsComputeCmdFlags(const char *help, if (is_kvm && (version >= 10000 || kvm_version >= 74)) qemuCapsSet(flags, QEMU_CAPS_VNET_HDR); - if (is_kvm && strstr(help, ",vhost=")) { + if (strstr(help, ",vhost=")) { qemuCapsSet(flags, QEMU_CAPS_VNET_HOST); } -- 1.7.3.4

2 2

[libvirt] [Patch V2] Fix initialization of current vcpus in libxl driver
by Jim Fehlig 25 May '11

25 May '11

The cur_vcpus member of struct libxl_domain_build_info was incorrectly initialized to the number of vcpus, when it should have been interpreted as a bitmap, where bit X corresponds to online/offline status of vcpuX. To complicate matters, cur_vcpus is an int, so only 32 vcpus can be set online. Add a check to ensure vcpus does not exceed this limit. V2: Eric Blake noted a compilation pitfal when '1 << 32' on an int. Account for vcpus == 32. --- src/libxl/libxl_conf.c | 17 ++++++++++++++++- 1 files changed, 16 insertions(+), 1 deletions(-) diff --git a/src/libxl/libxl_conf.c b/src/libxl/libxl_conf.c index 3cebf41..649352d 100644 --- a/src/libxl/libxl_conf.c +++ b/src/libxl/libxl_conf.c @@ -379,11 +379,26 @@ libxlMakeDomBuildInfo(virDomainDefPtr def, libxl_domain_config *d_config) int hvm = STREQ(def->os.type, "hvm"); int i; + /* Currently, libxenlight only supports 32 vcpus per domain. + * cur_vcpus member of struct libxl_domain_build_info is defined + * as an int, but its' semantic is a bitmap of online vcpus, so + * only 32 can be represented. + */ + if (def->maxvcpus > 32 || def->vcpus > 32) { + libxlError(VIR_ERR_INTERNAL_ERROR, + _("This version of libxenlight only supports 32 " + "vcpus per domain")); + return -1; + } + libxl_init_build_info(b_info, &d_config->c_info); b_info->hvm = hvm; b_info->max_vcpus = def->maxvcpus; - b_info->cur_vcpus = def->vcpus; + if (def->vcpus == 32) + b_info->cur_vcpus = 1 << 31; + else + b_info->cur_vcpus = (1 << def->vcpus) - 1; if (def->clock.ntimers > 0 && def->clock.timers[0]->name == VIR_DOMAIN_TIMER_NAME_TSC) { switch (def->clock.timers[0]->mode) { -- 1.7.3.1

2 2

[libvirt] [PATCH] build: fix VIR_DEBUG on mingw
by Eric Blake 25 May '11

25 May '11

We don't use the gnulib vsnprintf replacement, which means that on mingw, vsnprintf doesn't support %sn. But as it turns out, VIR_GET_VAR_STR was a rather inefficient reimplementation of virVasprintf. * src/util/logging.c (VIR_GET_VAR_STR): Drop. (virLogMessage): Inline a simpler version here. * src/util/virterror.c (VIR_GET_VAR_STR, virRaiseErrorFull): Likewise. Reported by Matthias Bolte. --- src/util/logging.c | 45 ++++++--------------------------------------- src/util/virterror.c | 44 +++++--------------------------------------- 2 files changed, 11 insertions(+), 78 deletions(-) diff --git a/src/util/logging.c b/src/util/logging.c index 823e506..c86fcda 100644 --- a/src/util/logging.c +++ b/src/util/logging.c @@ -47,43 +47,6 @@ #define VIR_FROM_THIS VIR_FROM_NONE /* - * Macro used to format the message as a string in virLogMessage - * and borrowed from libxml2 (also used in virRaiseError) - */ -#define VIR_GET_VAR_STR(msg, str) { \ - int size, prev_size = -1; \ - int chars; \ - char *larger; \ - va_list ap; \ - \ - str = (char *) malloc(150); \ - if (str != NULL) { \ - \ - size = 150; \ - \ - while (1) { \ - va_start(ap, msg); \ - chars = vsnprintf(str, size, msg, ap); \ - va_end(ap); \ - if ((chars > -1) && (chars < size)) { \ - if (prev_size == chars) { \ - break; \ - } else { \ - prev_size = chars; \ - } \ - } \ - if (chars > -1) \ - size += chars + 1; \ - else \ - size += 100; \ - if ((larger = (char *) realloc(str, size)) == NULL) { \ - break; \ - } \ - str = larger; \ - }} \ -} - -/* * A logging buffer to keep some history over logs */ @@ -729,6 +692,7 @@ void virLogMessage(const char *category, int priority, const char *funcname, int len, fprio, i, ret; int saved_errno = errno; int emit = 1; + va_list ap; if (!virLogInitialized) virLogStartup(); @@ -753,9 +717,12 @@ void virLogMessage(const char *category, int priority, const char *funcname, /* * serialize the error message, add level and timestamp */ - VIR_GET_VAR_STR(fmt, str); - if (str == NULL) + va_start(ap, fmt); + if (virVasprintf(&str, fmt, ap) < 0) { + va_end(ap); goto cleanup; + } + va_end(ap); gettimeofday(&cur_time, NULL); localtime_r(&cur_time.tv_sec, &time_info); diff --git a/src/util/virterror.c b/src/util/virterror.c index 2d7309a..852ff9a 100644 --- a/src/util/virterror.c +++ b/src/util/virterror.c @@ -28,43 +28,6 @@ virErrorFunc virErrorHandler = NULL; /* global error handler */ void *virUserData = NULL; /* associated data */ virErrorLogPriorityFunc virErrorLogPriorityFilter = NULL; -/* - * Macro used to format the message as a string in virRaiseError - * and borrowed from libxml2. - */ -#define VIR_GET_VAR_STR(msg, str) { \ - int size, prev_size = -1; \ - int chars; \ - char *larger; \ - va_list ap; \ - \ - str = (char *) malloc(150); \ - if (str != NULL) { \ - \ - size = 150; \ - \ - while (1) { \ - va_start(ap, msg); \ - chars = vsnprintf(str, size, msg, ap); \ - va_end(ap); \ - if ((chars > -1) && (chars < size)) { \ - if (prev_size == chars) { \ - break; \ - } else { \ - prev_size = chars; \ - } \ - } \ - if (chars > -1) \ - size += chars + 1; \ - else \ - size += 100; \ - if ((larger = (char *) realloc(str, size)) == NULL) { \ - break; \ - } \ - str = larger; \ - }} \ -} - static virLogPriority virErrorLevelPriority(virErrorLevel level) { switch (level) { case VIR_ERR_NONE: @@ -718,12 +681,15 @@ virRaiseErrorFull(const char *filename ATTRIBUTE_UNUSED, } /* - * formats the message + * formats the message; drop message on OOM situations */ if (fmt == NULL) { str = strdup(_("No error message provided")); } else { - VIR_GET_VAR_STR(fmt, str); + va_list ap; + va_start(ap, fmt); + virVasprintf(&str, fmt, ap); + va_end(ap); } /* -- 1.7.4.4

2 2

[libvirt] [PATCH] Fix initialization of current vcpus in libxl driver
by Jim Fehlig 25 May '11

25 May '11

The cur_vcpus member of struct libxl_domain_build_info was incorrectly initialized to the number of vcpus, when it should have been interpreted as a bitmap, where bit X corresponds to online/offline status of vcpuX. To complicate matters, cur_vcpus is an int, so only 32 vcpus can be set online. Add a check to ensure vcpus does not exceed this limit. --- src/libxl/libxl_conf.c | 14 +++++++++++++- 1 files changed, 13 insertions(+), 1 deletions(-) diff --git a/src/libxl/libxl_conf.c b/src/libxl/libxl_conf.c index 3cebf41..2e48356 100644 --- a/src/libxl/libxl_conf.c +++ b/src/libxl/libxl_conf.c @@ -379,11 +379,23 @@ libxlMakeDomBuildInfo(virDomainDefPtr def, libxl_domain_config *d_config) int hvm = STREQ(def->os.type, "hvm"); int i; + /* Currently, libxenlight only supports 32 vcpus per domain. + * cur_vcpus member of struct libxl_domain_build_info is defined + * as an int, but its' semantic is a bitmap of online vcpus, so + * only 32 can be represented. + */ + if (def->maxvcpus > 32 || def->vcpus > 32) { + libxlError(VIR_ERR_INTERNAL_ERROR, + _("This version of libxenlight only supports 32 " + "vcpus per domain")); + return -1; + } + libxl_init_build_info(b_info, &d_config->c_info); b_info->hvm = hvm; b_info->max_vcpus = def->maxvcpus; - b_info->cur_vcpus = def->vcpus; + b_info->cur_vcpus = (1 << def->vcpus) - 1; if (def->clock.ntimers > 0 && def->clock.timers[0]->name == VIR_DOMAIN_TIMER_NAME_TSC) { switch (def->clock.timers[0]->mode) { -- 1.7.3.1

3 6

[libvirt] [PATCH 00/10 v5] New internal infrastructure for RPC
by Daniel P. Berrange 25 May '11

25 May '11

An update of https://www.redhat.com/archives/libvir-list/2011-May/msg00633.html New in this series: - Nothing. Just rebased to latest GIT. Again, I'm not posting the remote client / daemon conversion patches here, since I want to get this core infrastructure merged real soon and the client/daemon conversion would delay review Full series also available at http://gitorious.org/~berrange/libvirt/staging/commits/rpc

1 10

[libvirt] [PATCH] qemu: Don't change ownership of file when appending to it
by Michal Privoznik 25 May '11

25 May '11

Saving domain to previously created file changes also its ownership. This is certainly not what users want if some conditions are met: it is a regular, local file and dynamic_ownership is off. --- src/qemu/qemu_driver.c | 12 +++++++++++- 1 files changed, 11 insertions(+), 1 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index db299a2..4538cf3 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -1963,6 +1963,8 @@ static int qemudDomainSaveFlag(struct qemud_driver *driver, virDomainPtr dom, bool is_reg = false; unsigned long long offset; int fd = -1; + uid_t uid = getuid(); + gid_t gid = getgid(); memset(&header, 0, sizeof(header)); memcpy(header.magic, QEMUD_SAVE_MAGIC, sizeof(header.magic)); @@ -2013,6 +2015,14 @@ static int qemudDomainSaveFlag(struct qemud_driver *driver, virDomainPtr dom, is_reg = true; } else { is_reg = !!S_ISREG(sb.st_mode); + /* If the path is regular local file which exists + * already and dynamic_ownership is off, we don't + * want to change it's ownership, just append the data */ + if (is_reg && !driver->dynamicOwnership && + virStorageFileIsSharedFS(path) == 0) { + uid=sb.st_uid; + gid=sb.st_gid; + } } offset = sizeof(header) + header.xml_len; @@ -2048,7 +2058,7 @@ static int qemudDomainSaveFlag(struct qemud_driver *driver, virDomainPtr dom, } else { if ((fd = virFileOpenAs(path, O_CREAT|O_TRUNC|O_WRONLY, S_IRUSR|S_IWUSR, - getuid(), getgid(), 0)) < 0) { + uid, gid, 0)) < 0) { /* If we failed as root, and the error was permission-denied (EACCES or EPERM), assume it's on a network-connected share where root access is restricted (eg, root-squashed NFS). If the -- 1.7.5.rc3

4 3