- Devel - libvirt List Archives

[libvirt] [libvirt-test-api][PATCH] Add a new test case for setUserPassword
by Luyao Huang 24 Sep '15

24 Sep '15

Signed-off-by: Luyao Huang <lhuang(a)redhat.com> --- cases/linux_domain.conf | 22 ++++++++ repos/domain/set_user_passwd.py | 111 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 133 insertions(+) create mode 100644 repos/domain/set_user_passwd.py diff --git a/cases/linux_domain.conf b/cases/linux_domain.conf index 19daded..9a65cf3 100644 --- a/cases/linux_domain.conf +++ b/cases/linux_domain.conf @@ -299,6 +299,28 @@ domain:info_iothread conn qemu:///system +domain:set_user_passwd + guestname + $defaultname + username + $username + userpassword + $password + conn + qemu:///system + +domain:set_user_passwd + guestname + $defaultname + username + $username + userpassword + $password + conn + qemu:///system + flags + encrypted + domain:destroy guestname $defaultname diff --git a/repos/domain/set_user_passwd.py b/repos/domain/set_user_passwd.py new file mode 100644 index 0000000..bf9bd06 --- /dev/null +++ b/repos/domain/set_user_passwd.py @@ -0,0 +1,111 @@ +#!/usr/bin/env python + +import libvirt +from libvirt import libvirtError +import lxml +import lxml.etree +import crypt +from utils import utils + +required_params = ('guestname', 'username', 'userpassword',) +optional_params = {'conn': 'qemu:///system', 'flags': '',} + +def get_guest_mac(vm): + tree = lxml.etree.fromstring(vm.XMLDesc(0)) + set = tree.xpath("/domain/devices/interface/mac") + + for n in set: + return n.attrib['address'] + + return False + + +def check_agent_status(vm): + """ make sure agent is okay to use """ + + tree = lxml.etree.fromstring(vm.XMLDesc(0)) + + set = tree.xpath("//channel[@type='unix']/target[@name='org.qemu.guest_agent.0']") + for n in set: + if n.attrib['state'] == 'connected': + return True + + return False + +def create_new_user(ipaddr, newusername, username, userpasswd, logger): + cmd = "useradd %s" % newusername + ret, retinfo = utils.remote_exec_pexpect(ipaddr, username, userpasswd, cmd) + if ret == 0 or "already exists" in retinfo: + return 0 + else: + logger.error("Fail: cannot create a new user: %s" % retinfo) + return 1 + +def verify_cur_user(ipaddr, username, userpasswd): + cmd = "whoami" + ret, retinfo = utils.remote_exec_pexpect(ipaddr, username, userpasswd, cmd) + + return ret + +def set_user_passwd(params): + """ + test API for setUserPassword in class virDomain + """ + + logger = params['logger'] + guest = params['guestname'] + username = params['username'] + userpasswd = params['userpassword'] + + if 'flags' in params: + if params['flags'] == 'encrypted': + flags = libvirt.VIR_DOMAIN_PASSWORD_ENCRYPTED + else: + flags = 0 + else: + flags = 0 + + try: + if 'conn' in params: + conn = libvirt.open(params['conn']) + else: + conn = libvirt.open(optional_params['conn']) + + logger.info("get connection to libvirtd") + vm = conn.lookupByName(guest) + logger.info("test guest name: %s" % guest) + + if not check_agent_status(vm): + logger.error("guest agent is not connected") + return 1 + + mac = get_guest_mac(vm) + if not mac: + logger.error("cannot get guest interface mac") + return 1 + + ipaddr = utils.mac_to_ip(mac, 180) + if not ipaddr: + logger.error("cannot get guest IP") + return 1 + + if flags > 0: + passwd = crypt.crypt("123456", crypt.mksalt(crypt.METHOD_SHA512)) + else: + passwd = "123456" + + + if create_new_user(ipaddr, "usertestapi", username, userpasswd, logger) != 0: + return 1 + + vm.setUserPassword("usertestapi", passwd, flags) + + if verify_cur_user(ipaddr, "usertestapi", "123456") != 0: + logger.error("cannot login guest via new user") + return 1 + + except libvirtError, e: + logger.error("API error message: %s" % e.message) + return 1 + + return 0 -- 1.8.3.1

2 1

[libvirt] [libvirt-test-api][PATCH 1/2] introduce a new helper to parse mountinfo
by Luyao Huang 24 Sep '15

24 Sep '15

And will return list like this : [{'devminor': '25', 'mountdir': '/sys/fs/cgroup/cpuset', 'devmajor': '0', 'mounttype': 'cgroup'},...] Signed-off-by: Luyao Huang <lhuang(a)redhat.com> --- utils/utils.py | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/utils/utils.py b/utils/utils.py index a6e6965..6909fed 100644 --- a/utils/utils.py +++ b/utils/utils.py @@ -925,3 +925,40 @@ def param_to_tuple_nolength(paramlist): lengh = max(d) return param_to_tuple(paramlist, int(lengh) + 1) + +def parse_mountinfo(string): + """a helper to parse mountinfo in /proc/self/mountinfo + and return a list contains multiple dict + """ + + ret = [] + mount_list = string.split("\n") + for n in mount_list: + mount_dict = {} + if n.find("/") > 0: + tmp = n[:n.find("/")] + if len(tmp.split()) != 3: + continue + + if tmp.split()[2].find(":") < 0: + continue + + mount_dict['devmajor'] = tmp.split()[2].split(":")[0] + mount_dict['devminor'] = tmp.split()[2].split(":")[1] + + tmp = n[n.find("/") + 1:] + + mount_dict['mountdir'] = tmp.split()[0] + + if tmp.find(" - ") < 0: + continue + + tmp = tmp.split(" - ")[1] + + mount_dict['mounttype'] = tmp.split()[0] + if tmp.split()[1].find("/") > 0: + mount_dict['sourcedir'] = tmp.split()[1] + + ret.append(mount_dict) + + return ret -- 1.8.3.1

2 2

[libvirt] [libvirt-sandbox][PATCH] configure: Get static libs for static linking
by Michal Privoznik 24 Sep '15

24 Sep '15

So you wanna build libvirt-sandbox, right? And you think you have everything you need. Dang, you don't! Because we check for libz and liblzma for dynamic linking. However, libvirt-sandbox-init-qemu is linked statically. Therefore, we need to ask pkg-config to fetch us the list of libs for static linking. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- Okay, I admit that this may be not as serious as I made it in the commit message. The only difference after this patch is -pthread added to LZMA libs: configure: Configuration summary configure: ===================== configure: configure: configure: Libraries: configure: configure: LZMA: -llzma -pthread configure: ZLIB: -lz configure: GOBJECT: -I/usr/include/glib-2.0 -I/usr/lib64/glib-2.0/include -lgobject-2.0 -lglib-2.0 configure: LIBVIRT_GOBJECT: -pthread -I/usr/include/libvirt-gobject-1.0 -I/usr/include/libvirt-gconfig-1.0 -I/usr/include/glib-2.0 -I/usr/lib64/glib-2.0/include -I/usr/include/libxml2 -lvirt-gobject-1.0 -lgio-2.0 -lvirt-gconfig-1.0 -lgobject-2.0 -lglib-2.0 -lxml2 -lvir configure.ac | 3 +++ 1 file changed, 3 insertions(+) diff --git a/configure.ac b/configure.ac index 92d65f4..00c2d7e 100644 --- a/configure.ac +++ b/configure.ac @@ -86,6 +86,8 @@ AC_ARG_WITH([zlib], [add ZLIB support @<:@default=yes@:>@])]) m4_divert_text([DEFAULTS], [with_zlib=yes]) +orig_pkg_config="$PKG_CONFIG" +PKG_CONFIG="$PKG_CONFIG --static" if test "$with_zlib" = "yes" ; then PKG_CHECK_MODULES(ZLIB, zlib >= $ZLIB_REQUIRED) AC_DEFINE([WITH_ZLIB], [1], [Whether ZLIB support was enabled]) @@ -100,6 +102,7 @@ if test "$with_lzma" = "yes" ; then PKG_CHECK_MODULES(LZMA, liblzma >= $LZMA_REQUIRED) AC_DEFINE([WITH_LZMA], [1], [Whether LZMA support was enabled]) fi +PKG_CONFIG="$orig_pkg_config" LIBVIRT_SANDBOX_CAPNG LIBVIRT_SANDBOX_GETTEXT -- 2.4.9

2 1

[libvirt] [PATCH v2 0/4] Couple of 'virsh create' fixes
by Michal Privoznik 24 Sep '15

24 Sep '15

And this time 'virsh restore' too. The diff to v1 is that more drivers is fixed. Michal Privoznik (4): virDomainCreateXML: Don't remove persistent domains on error virDomainCreateXML: Make domain definition transient qemu: Move vm->persistent check into qemuDomainRemoveInactive virDomainRestore: Don't keep transient domains around src/bhyve/bhyve_driver.c | 1 + src/libxl/libxl_driver.c | 1 + src/lxc/lxc_driver.c | 7 +++++-- src/openvz/openvz_driver.c | 1 + src/qemu/qemu_domain.c | 9 ++++++++- src/qemu/qemu_driver.c | 39 ++++++++++++++++----------------------- src/qemu/qemu_migration.c | 14 +++++--------- src/qemu/qemu_process.c | 12 ++++-------- src/test/test_driver.c | 15 +++++++++++++-- src/uml/uml_driver.c | 8 +++++--- src/vmware/vmware_driver.c | 7 +++++-- 11 files changed, 64 insertions(+), 50 deletions(-) -- 2.4.9

2 7

[libvirt] [PATCH] Remove redundand assignment
by Martin Kletzander 24 Sep '15

24 Sep '15

I initially added this in order to keep the code more error-prone to following additions, but it seems it's still frowned upon. Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- Pushed as really, really trivial. src/qemu/qemu_domain.c | 1 - 1 file changed, 1 deletion(-) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index b57b9954b33f..12cc447180b5 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -831,7 +831,6 @@ qemuDomainObjPrivateXMLParse(xmlXPathContextPtr ctxt, goto error; } virObjectUnref(caps); - caps = NULL; VIR_FREE(tmp); return 0; -- 2.5.3

1 0

[libvirt] [PATCH] docs: Add yet another libvirt based app
by Michal Privoznik 24 Sep '15

24 Sep '15

As announced on the list [1], Cherrypop is a management application based on libvirt. It's a decentralized cloud software with nice scaling ability. 1: https://www.redhat.com/archives/libvir-list/2015-September/msg00670.html Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- @Gustav: I've used the description from the github repo, if that's okay. docs/apps.html.in | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/docs/apps.html.in b/docs/apps.html.in index fd45189..86b3016 100644 --- a/docs/apps.html.in +++ b/docs/apps.html.in @@ -262,6 +262,16 @@ using a dashboard. Compute part uses libvirt to manage VM life-cycle, monitoring and so on. </dd> + + <dt><a href="https://github.com/gustavfranssonnyvell/cherrypop">Cherrypop</a></dt> + <dd> + A cloud software with no masters or central points. Nodes + autodetect other nodes and autodistribute virtual + machines and autodivide up the workload. Also there is no + minimum limit for hosts, well, one might be nice. It's + perfect for setting up low-end servers in a cloud or a + cloud where you want the most bang for the bucks. + </dd> </dl> <h2><a name="libraries">Libraries</a></h2> -- 2.4.9

2 1

[libvirt] by libvirt api(virStoragePoolRefresh) to refresh pool, discovered the connection is very slow
by 饶俊明 24 Sep '15

24 Sep '15

Hello In ours project,use libvirt(libvirt-0.10.2-46.el6) to manage storage pool(the type of pool is ceph rbd), by libvirt api(virStoragePoolRefresh) to refresh pool, discovered the connection(libvirt to ceph) is very slow libvirt is how to deal with pool refresh. tks!!! Jason rao -----邮件原件----- 发件人: libvir-list-bounces(a)redhat.com [mailto:libvir-list-bounces@redhat.com] 代表 libvir-list-request(a)redhat.com 发送时间: 2015年9月24日 7:19 收件人: libvir-list(a)redhat.com 主题: libvir-list Digest, Vol 118, Issue 146 Send libvir-list mailing list submissions to libvir-list(a)redhat.com To subscribe or unsubscribe via the World Wide Web, visit https://www.redhat.com/mailman/listinfo/libvir-list or, via email, send a message with subject or body 'help' to libvir-list-request(a)redhat.com You can reach the person managing the list at libvir-list-owner(a)redhat.com When replying, please edit your Subject line so it is more specific than "Re: Contents of libvir-list digest..." Today's Topics: 1. [PATCH] domain: Fix migratable XML with graphics/@listen (Jiri Denemark) 2. [PATCH] storage: Fix incorrect format for <disk> <auth> XML (John Ferlan) 3. Re: [PATCH v2] qemuDomainDeviceDefPostParse: Drop useless checks (John Ferlan) 4. Re: [PATCH RFC 4/7] libxl: implement virDomainBlockStats (Jim Fehlig) 5. [PATCH 0/6] Fix some Coverity issues (John Ferlan) ---------------------------------------------------------------------- Message: 1 Date: Wed, 23 Sep 2015 22:48:14 +0200 From: Jiri Denemark <jdenemar(a)redhat.com> To: libvir-list(a)redhat.com Subject: [libvirt] [PATCH] domain: Fix migratable XML with graphics/@listen Message-ID: <1e763711f268f0f5d09f6a70aab87bf13dd459f9.1443041294.git.jdenemar(a)redhat.com> As of commit 6992994, we set graphics/@listen attribute according to the first listen child element even if that element is of type='network'. This was done for backward compatibility with applications which only support the original listen attribute. However, by doing so we broke migration to older libvirt which tried to check that the listen attribute matches one of the listen child elements but which did not take type='network' elements into account. We are not concerned about compatibility with old applications when formatting domain XML for migration for two reasons. The XML is consumed only by libvirtd and the IP address associated with type='network' listen address on the source host is just useless on the destination host. Thus, we can safely avoid propagating the type='network' IP address to graphics/@listen attribute when creating migratable XML. https://bugzilla.redhat.com/show_bug.cgi?id=1265111 Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- src/conf/domain_conf.c | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index c890977..033ae46 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -21020,19 +21020,17 @@ virDomainGraphicsDefFormat(virBufferPtr buf, * <graphics>. This is done to improve backward compatibility. */ for (i = 0; i < def->nListens; i++) { - virDomainGraphicsListenType listenType; - if (flags & VIR_DOMAIN_DEF_FORMAT_MIGRATABLE && def->listens[i].fromConfig) continue; - listenType = virDomainGraphicsListenGetType(def, i); - if (listenType == VIR_DOMAIN_GRAPHICS_LISTEN_TYPE_ADDRESS || - (listenType == VIR_DOMAIN_GRAPHICS_LISTEN_TYPE_NETWORK && - !(flags & VIR_DOMAIN_DEF_FORMAT_INACTIVE))) { - if ((listenAddr = virDomainGraphicsListenGetAddress(def, i))) - break; - } + if (def->listens[i].type == VIR_DOMAIN_GRAPHICS_LISTEN_TYPE_NETWORK && + flags & (VIR_DOMAIN_DEF_FORMAT_INACTIVE | + VIR_DOMAIN_DEF_FORMAT_MIGRATABLE)) + continue; + + if ((listenAddr = virDomainGraphicsListenGetAddress(def, i))) + break; } virBufferAsprintf(buf, "<graphics type='%s'", type); -- 2.5.3 ------------------------------ Message: 2 Date: Wed, 23 Sep 2015 16:54:35 -0400 From: John Ferlan <jferlan(a)redhat.com> To: libvir-list(a)redhat.com Subject: [libvirt] [PATCH] storage: Fix incorrect format for <disk> <auth> XML Message-ID: <1443041675-19738-1-git-send-email-jferlan(a)redhat.com> https://bugzilla.redhat.com/show_bug.cgi?id=1256999 When creating a copy of the 'authdef', need to take into account the slight variation between <disk> and <pool> before blindly copying the 'authType' field. This ensures virStorageAuthDefFormat will properly format the <auth> XML for a <disk>. Signed-off-by: John Ferlan <jferlan(a)redhat.com> --- src/util/virstoragefile.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/util/virstoragefile.c b/src/util/virstoragefile.c index 2aa1d90..0b72cb3 100644 --- a/src/util/virstoragefile.c +++ b/src/util/virstoragefile.c @@ -1522,7 +1522,12 @@ virStorageAuthDefCopy(const virStorageAuthDef *src) /* Not present for storage pool, but used for disk source */ if (VIR_STRDUP(ret->secrettype, src->secrettype) < 0) goto error; - ret->authType = src->authType; + /* A <disk> uses secrettype, while a <pool> uses authType, so + * if we have a secrettype, then don't copy authType; otherwise, + * we will format the authType in <disk> + */ + if (!ret->secrettype) + ret->authType = src->authType; ret->secretType = src->secretType; if (ret->secretType == VIR_STORAGE_SECRET_TYPE_UUID) { memcpy(ret->secret.uuid, src->secret.uuid, sizeof(ret->secret.uuid)); -- 2.1.0 ------------------------------ Message: 3 Date: Wed, 23 Sep 2015 18:03:47 -0400 From: John Ferlan <jferlan(a)redhat.com> To: Michal Privoznik <mprivozn(a)redhat.com>, libvir-list(a)redhat.com Subject: Re: [libvirt] [PATCH v2] qemuDomainDeviceDefPostParse: Drop useless checks Message-ID: <560321C3.1000808(a)redhat.com> Content-Type: text/plain; charset=windows-1252 On 09/23/2015 07:19 AM, Michal Privoznik wrote: > Now that virQEMUDriverCreateXMLConf is never called with NULL > (after 086f37e97aab) we can safely drop useless check in > qemuDomainDeviceDefPostParse as we are guaranteed to be always > called with the driver initialized. Therefore checking if driver > is NULL makes no sense. Moreover, if we mix it with direct driver > dereference. And after that, we are sure that nor @cfg will be > NULL, therefore we can drop checks for that too. > > Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> > --- > > diff to v1: > - drop checks for !cfg too > > src/qemu/qemu_domain.c | 64 ++++++++++++++++++++------------------------------ > 1 file changed, 26 insertions(+), 38 deletions(-) > ACK John Coverity error goes away too. ------------------------------ Message: 4 Date: Wed, 23 Sep 2015 16:24:30 -0600 From: Jim Fehlig <jfehlig(a)suse.com> To: Joao Martins <joao.m.martins(a)oracle.com> Cc: libvir-list(a)redhat.com Subject: Re: [libvirt] [PATCH RFC 4/7] libxl: implement virDomainBlockStats Message-ID: <5603269E.6090101(a)suse.com> Content-Type: text/plain; charset=ISO-8859-1 Joao Martins wrote: > Introduce initial support for domainBlockStats API call that > allow us to query block device statistics. openstack nova > uses this API call to query block statistics, alongside > virDomainMemoryStats and virDomainInterfaceStats. Note that > this patch only introduces it for VBD for starters. QDisk > will come in a separate patch series. > > A new statistics data structure is introduced to fit common > statistics among others specific to the underlying block > backends. For the VBD statistics on linux these are exported > via sysfs on the path: > > "/sys/bus/xen-backend/devices/vbd-<domid>-<devid>/statistics" > > To calculate the block devid two libxl functions were ported > (libxlDiskPathMatches and libxlDiskPathParse) to libvirt to > make sure the devid is calculate in the same way as libxl. > Each backend implements its own function to extract statistics > and let there be handled the different platforms. An alternative > would be to reuse libvirt xen driver function. > > VBD stats are exposed in reqs and number of sectors from > blkback, and it's up to us to convert it to sector sizes. > The sector size is gathered through xenstore in the device > backend entry "physical-sector-size". This adds up an extra > dependency namely of xenstore for doing the xs_read. > > BlockStatsFlags variant is also implemented which has the > added benefit of getting the number of flush requests. > > Signed-off-by: Joao Martins <joao.m.martins(a)oracle.com> > --- > configure.ac | 2 +- > src/libxl/libxl_driver.c | 420 +++++++++++++++++++++++++++++++++++++++++++++++ > 2 files changed, 421 insertions(+), 1 deletion(-) > > diff --git a/configure.ac b/configure.ac > index ef7fbdb..56fb266 100644 > --- a/configure.ac > +++ b/configure.ac > @@ -896,7 +896,7 @@ if test "$with_libxl" != "no" ; then > LIBS="$LIBS $LIBXL_LIBS" > AC_CHECK_LIB([xenlight], [libxl_ctx_alloc], [ > with_libxl=yes > - LIBXL_LIBS="$LIBXL_LIBS -lxenlight -lxenctrl" > + LIBXL_LIBS="$LIBXL_LIBS -lxenlight -lxenctrl -lxenstore" > ],[ > if test "$with_libxl" = "yes"; then > fail=1 > diff --git a/src/libxl/libxl_driver.c b/src/libxl/libxl_driver.c > index dc83083..fd952a3 100644 > --- a/src/libxl/libxl_driver.c > +++ b/src/libxl/libxl_driver.c > @@ -59,6 +59,7 @@ > #include "network/bridge_driver.h" > #include "locking/domain_lock.h" > #include "virstats.h" > +#include <xenstore.h> > > #define VIR_FROM_THIS VIR_FROM_LIBXL > > @@ -75,6 +76,7 @@ VIR_LOG_INIT("libxl.libxl_driver"); > #define LIBXL_CONFIG_FORMAT_SEXPR "xen-sxpr" > > #define LIBXL_NB_TOTAL_CPU_STAT_PARAM 1 > +#define LIBXL_NB_TOTAL_BLK_STAT_PARAM 6 > > #define HYPERVISOR_CAPABILITIES "/proc/xen/capabilities" > #define HYPERVISOR_XENSTORED "/dev/xen/xenstored" > @@ -103,6 +105,25 @@ struct _libxlOSEventHookInfo { > int id; > }; > > +/* Object used to store disk statistics across multiple xen backends */ > +typedef struct _libxlBlockStats libxlBlockStats; > +typedef libxlBlockStats *libxlBlockStatsPtr; > +struct _libxlBlockStats { > + long long rd_req; > + long long rd_bytes; > + long long wr_req; > + long long wr_bytes; > + long long f_req; > + > + char *backend; > + union { > + struct { > + long long ds_req; > + long long oo_req; > + } vbd; > + } u; > +}; > + > /* Function declarations */ > static int > libxlDomainManagedSaveLoad(virDomainObjPtr vm, > @@ -4641,6 +4662,403 @@ libxlDomainIsUpdated(virDomainPtr dom) > } > > static int > +libxlDiskPathMatches(const char *virtpath, const char *devtype, > + int *index_r, int max_index, > + int *partition_r, int max_partition) > +{ > + const char *p; > + char *ep; > + int tl, c; > + long pl; > + > + tl = strlen(devtype); > + if (memcmp(virtpath, devtype, tl)) > + return 0; > + > + /* We decode the drive letter as if it were in base 52 > + * with digits a-zA-Z, more or less */ > + *index_r = -1; > + p = virtpath + tl; > + for (;;) { > + c = *p++; > + if (c >= 'a' && c <= 'z') { > + c -= 'a'; > + } else { > + --p; > + break; > + } > + (*index_r)++; > + (*index_r) *= 26; > + (*index_r) += c; > + > + if (*index_r > max_index) > + return 0; > + } > + > + if (!*p) { > + *partition_r = 0; > + return 1; > + } > + > + if (*p == '0') > + return 0; /* leading zeroes not permitted in partition number */ > + > + if (virStrToLong_l(p, &ep, 10, &pl) < 0) > + return 0; > + > + if (pl > max_partition || *ep) > + return 0; > + > + *partition_r = pl; > + return 1; > +} > + > +static int > +libxlDiskPathParse(const char *virtpath, int *pdisk, int *ppartition) > +{ > + int disk, partition; > + char *ep; > + unsigned long ul; > + int chrused; > + > + chrused = -1; > + if ((sscanf(virtpath, "d%ip%i%n", &disk, &partition, &chrused) >= 2 > + && chrused == strlen(virtpath) && disk < (1<<20) && partition < 256) > + || > + libxlDiskPathMatches(virtpath, "xvd", > + &disk, (1<<20)-1, > + &partition, 255)) { > + if (pdisk) *pdisk = disk; > + if (ppartition) *ppartition = partition; > + if (disk <= 15 && partition <= 15) > + return (202 << 8) | (disk << 4) | partition; > + else > + return (1 << 28) | (disk << 8) | partition; > + } > + > + errno = virStrToLong_ul(virtpath, &ep, 0, &ul); > + if (!errno && !*ep && ul <= INT_MAX) { > + /* FIXME: should parse ul to determine these. */ > + if (pdisk || ppartition) > + return -1; > + return ul; > + } > + > + if (libxlDiskPathMatches(virtpath, "hd", > + &disk, 3, > + &partition, 63)) { > + if (pdisk) *pdisk = disk; > + if (ppartition) *ppartition = partition; > + return ((disk<2 ? 3 : 22) << 8) | ((disk & 1) << 6) | partition; > + } > + if (libxlDiskPathMatches(virtpath, "sd", > + &disk, 15, > + &partition, 15)) { > + if (pdisk) *pdisk = disk; > + if (ppartition) *ppartition = partition; > + return (8 << 8) | (disk << 4) | partition; > + } > + return -1; > +} > + > +#define LIBXL_VBD_SECTOR_SIZE 512 > + > +static int > +libxlDiskSectorSize(int domid, int devno) > +{ > + char *path, *val; > + struct xs_handle *handle; > + int ret = LIBXL_VBD_SECTOR_SIZE; > + unsigned int len; > + > + handle = xs_daemon_open_readonly(); > + if (!handle) { > + virReportError(VIR_ERR_INTERNAL_ERROR, > + "%s", _("cannot read sector size")); > + return ret; > + } > + > + if (virAsprintf(&path, "/local/domain/%d/device/vbd/%d/backend", > + domid, devno) < 0) > Indentation looks off. > + goto close; > + > + if ((val = xs_read(handle, XBT_NULL, path, &len)) == NULL) > + goto cleanup; > + > + VIR_FREE(path); > + if (virAsprintf(&path, "%s/physical-sector-size", val) < 0) { > + VIR_FREE(val); > + goto close; > + } > + > + VIR_FREE(val); > + if ((val = xs_read(handle, XBT_NULL, path, &len)) == NULL) > + goto cleanup; > + > + if (sscanf(val, "%d", &ret) != 1) > + ret = -1; > Should ret be set back to LIBXL_VBD_SECTOR_SIZE? '-1' wouldn't be a good value for the calling function. > + > + VIR_FREE(val); > + > + cleanup: > + VIR_FREE(path); > + close: > + xs_daemon_close(handle); > + return ret; > +} > + > +static int > +libxlDomainBlockStatsVBD(virDomainObjPtr vm, > + const char *dev, > + libxlBlockStatsPtr stats) > +{ > + int ret = -1; > + int devno = libxlDiskPathParse(dev, NULL, NULL); > + int size = libxlDiskSectorSize(vm->def->id, devno); > +#ifdef __linux__ > + char *path, *name, *val; > + unsigned long long stat; > + > + if (VIR_STRDUP(stats->backend, "vbd") < 0) { > + virReportError(VIR_ERR_OPERATION_INVALID, > + "%s", _("cannot set backend")); > VIR_STRDUP() already reports OOM error, which is about the only one it can encounter. > + return -1; > + } > + > + ret = virAsprintf(&path, "/sys/bus/xen-backend/devices/vbd-%d-%d/statistics", > + vm->def->id, devno); > The usual pattern is 'if (virAsprintf(...) < 0)'. > + > + if (!virFileExists(path)) { > + virReportError(VIR_ERR_OPERATION_INVALID, > + "%s", _("cannot open bus path")); > I think the error should be VIR_ERR_OPERATION_FAILED. > + goto cleanup; > + } > + > +#define LIBXL_SET_VBDSTAT(FIELD, VAR, MUL) \ > Indentation is off here. Fails 'make syntax-check' with cppi installed. > + if ((virAsprintf(&name, "%s/"FIELD, path) < 0) || \ > + (virFileReadAll(name, 256, &val) < 0) || \ > + (sscanf(val, "%llu", &stat) != 1)) { \ > + virReportError(VIR_ERR_OPERATION_INVALID, \ > + _("cannot read %s"), name); \ > VIR_ERR_OPERATION_FAILED? > + goto cleanup; \ > + } \ > + VAR += (stat * MUL); \ > + VIR_FREE(name); \ > + VIR_FREE(val); > + > + LIBXL_SET_VBDSTAT("f_req", stats->f_req, 1) > + LIBXL_SET_VBDSTAT("wr_req", stats->wr_req, 1) > + LIBXL_SET_VBDSTAT("rd_req", stats->rd_req, 1) > + LIBXL_SET_VBDSTAT("wr_sect", stats->wr_bytes, size) > + LIBXL_SET_VBDSTAT("rd_sect", stats->rd_bytes, size) > + > + LIBXL_SET_VBDSTAT("ds_req", stats->u.vbd.ds_req, size) > + LIBXL_SET_VBDSTAT("oo_req", stats->u.vbd.oo_req, 1) > + ret = 0; > + > + cleanup: > + VIR_FREE(name); > + VIR_FREE(path); > + VIR_FREE(val); > This will only cleanup 'name' and 'val' from the last invocation of the LIBXL_SET_VBDSTAT macro. 'name' and 'val' from the prior invocations will be leaked. > + > +#undef LIBXL_SET_VBDSTAT > Another case of failing 'make syntax-check' with cppi installed. Regards, Jim > + > +#else > + virReportError(VIR_ERR_OPERATION_UNSUPPORTED, > + "%s", _("platform unsupported")); > +#endif > + return ret; > +} > + > +static int > +libxlDomainBlockStatsGatherSingle(virDomainObjPtr vm, > + const char *path, > + libxlBlockStatsPtr stats) > +{ > + virDomainDiskDefPtr disk; > + const char *disk_drv; > + int ret = -1, disk_fmt; > + > + if (!(disk = virDomainDiskByName(vm->def, path, false))) { > + virReportError(VIR_ERR_OPERATION_INVALID, > + _("invalid path: %s"), path); > + return ret; > + } > + > + disk_fmt = virDomainDiskGetFormat(disk); > + if (!(disk_drv = virDomainDiskGetDriver(disk))) > + disk_drv = "qemu"; > + > + if (STREQ(disk_drv, "phy")) { > + if (disk_fmt != VIR_STORAGE_FILE_RAW && > + disk_fmt != VIR_STORAGE_FILE_NONE) { > + virReportError(VIR_ERR_OPERATION_UNSUPPORTED, > + _("unsupported format %s"), > + virStorageFileFormatTypeToString(disk_fmt)); > + return ret; > + } > + > + ret = libxlDomainBlockStatsVBD(vm, path, stats); > + } else { > + virReportError(VIR_ERR_OPERATION_UNSUPPORTED, > + _("unsupported disk driver %s"), > + disk_drv); > + return ret; > + } > + return ret; > +} > + > +static int > +libxlDomainBlockStatsGather(virDomainObjPtr vm, > + const char *path, > + libxlBlockStatsPtr stats) > +{ > + int ret = -1; > + if (*path) { > + if (libxlDomainBlockStatsGatherSingle(vm, path, stats) < 0) > + return ret; > + } else { > + size_t i; > + for (i = 0; i < vm->def->ndisks; ++i) { > + if (libxlDomainBlockStatsGatherSingle(vm, vm->def->disks[i]->dst, > + stats) < 0) > + return ret; > + } > + } > + return 0; > +} > + > +static int > +libxlDomainBlockStats(virDomainPtr dom, > + const char *path, > + virDomainBlockStatsPtr stats) > +{ > + libxlDriverPrivatePtr driver = dom->conn->privateData; > + virDomainObjPtr vm; > + libxlBlockStats blkstats; > + int ret = -1; > + > + if (!(vm = libxlDomObjFromDomain(dom))) > + goto cleanup; > + > + if (virDomainBlockStatsEnsureACL(dom->conn, vm->def) < 0) > + goto cleanup; > + > + if (libxlDomainObjBeginJob(driver, vm, LIBXL_JOB_QUERY) < 0) > + goto cleanup; > + > + if (!virDomainObjIsActive(vm)) { > + virReportError(VIR_ERR_OPERATION_INVALID, > + "%s", _("domain is not running")); > + goto endjob; > + } > + > + memset(&blkstats, 0, sizeof(libxlBlockStats)); > + if ((ret = libxlDomainBlockStatsGather(vm, path, &blkstats)) < 0) > + goto endjob; > + > + stats->rd_req = blkstats.rd_req; > + stats->rd_bytes = blkstats.rd_bytes; > + stats->wr_req = blkstats.wr_req; > + stats->wr_bytes = blkstats.wr_bytes; > + if (STREQ_NULLABLE(blkstats.backend, "vbd")) > + stats->errs = blkstats.u.vbd.oo_req; > + else > + stats->errs = -1; > + > + endjob: > + if (!libxlDomainObjEndJob(driver, vm)) { > + virObjectUnlock(vm); > + vm = NULL; > + } > + > + cleanup: > + if (vm) > + virObjectUnlock(vm); > + return ret; > +} > + > +static int > +libxlDomainBlockStatsFlags(virDomainPtr dom, > + const char *path, > + virTypedParameterPtr params, > + int *nparams, > + unsigned int flags) > +{ > + libxlDriverPrivatePtr driver = dom->conn->privateData; > + virDomainObjPtr vm; > + libxlBlockStats blkstats; > + int nstats; > + int ret = -1; > + > + virCheckFlags(VIR_TYPED_PARAM_STRING_OKAY, -1); > + > + flags &= ~VIR_TYPED_PARAM_STRING_OKAY; > + > + if (!(vm = libxlDomObjFromDomain(dom))) > + goto cleanup; > + > + if (virDomainBlockStatsFlagsEnsureACL(dom->conn, vm->def) < 0) > + goto cleanup; > + > + if (libxlDomainObjBeginJob(driver, vm, LIBXL_JOB_QUERY) < 0) > + goto cleanup; > + > + if (!virDomainObjIsActive(vm)) { > + virReportError(VIR_ERR_OPERATION_INVALID, > + "%s", _("domain is not running")); > + goto endjob; > + } > + > + /* return count of supported stats */ > + if (*nparams == 0) { > + *nparams = LIBXL_NB_TOTAL_BLK_STAT_PARAM; > + ret = 0; > + goto endjob; > + } > + > + memset(&blkstats, 0, sizeof(libxlBlockStats)); > + if ((ret = libxlDomainBlockStatsGather(vm, path, &blkstats)) < 0) > + goto endjob; > + > + nstats = 0; > + > +#define LIBXL_BLKSTAT_ASSIGN_PARAM(VAR, NAME) \ > + if (nstats < *nparams && (blkstats.VAR) != -1) { \ > + if (virTypedParameterAssign(params + nstats, NAME, \ > + VIR_TYPED_PARAM_LLONG, (blkstats.VAR)) < 0) \ > + goto endjob; \ > + nstats++; \ > + } > + > + LIBXL_BLKSTAT_ASSIGN_PARAM(wr_bytes, VIR_DOMAIN_BLOCK_STATS_WRITE_BYTES); > + LIBXL_BLKSTAT_ASSIGN_PARAM(wr_req, VIR_DOMAIN_BLOCK_STATS_WRITE_REQ); > + > + LIBXL_BLKSTAT_ASSIGN_PARAM(rd_bytes, VIR_DOMAIN_BLOCK_STATS_READ_BYTES); > + LIBXL_BLKSTAT_ASSIGN_PARAM(rd_req, VIR_DOMAIN_BLOCK_STATS_READ_REQ); > + > + LIBXL_BLKSTAT_ASSIGN_PARAM(f_req, VIR_DOMAIN_BLOCK_STATS_FLUSH_REQ); > + > + if (STREQ_NULLABLE(blkstats.backend, "vbd")) > + LIBXL_BLKSTAT_ASSIGN_PARAM(u.vbd.oo_req, VIR_DOMAIN_BLOCK_STATS_ERRS); > + > + *nparams = nstats; > + > +#undef LIBXL_BLKSTAT_ASSIGN_PARAM > + > + endjob: > + if (!libxlDomainObjEndJob(driver, vm)) { > + virObjectUnlock(vm); > + vm = NULL; > + } > + > + cleanup: > + if (vm) > + virObjectUnlock(vm); > + return ret; > +} > + > +static int > libxlDomainInterfaceStats(virDomainPtr dom, > const char *path, > virDomainInterfaceStatsPtr stats) > @@ -5459,6 +5877,8 @@ static virHypervisorDriver libxlHypervisorDriver = { > #endif > .nodeGetFreeMemory = libxlNodeGetFreeMemory, /* 0.9.0 */ > .nodeGetCellsFreeMemory = libxlNodeGetCellsFreeMemory, /* 1.1.1 */ > + .domainBlockStats = libxlDomainBlockStats, /* 1.2.20 */ > + .domainBlockStatsFlags = libxlDomainBlockStatsFlags, /* 1.2.20 */ > .domainInterfaceStats = libxlDomainInterfaceStats, /* 1.2.20 */ > .domainMemoryStats = libxlDomainMemoryStats, /* 1.2.20 */ > .domainGetCPUStats = libxlDomainGetCPUStats, /* 1.2.20 */ > ------------------------------ Message: 5 Date: Wed, 23 Sep 2015 19:18:27 -0400 From: John Ferlan <jferlan(a)redhat.com> To: libvir-list(a)redhat.com Subject: [libvirt] [PATCH 0/6] Fix some Coverity issues Message-ID: <1443050313-15412-1-git-send-email-jferlan(a)redhat.com> Newer Coverity (7.7.0) found a couple real issues and a few more false positives. There's still a few more to be resolved, but still trying to figure them out... libxlDomainMigrationPrepare - claim is args is leaked. Although it seems to be handled in libxlMigrateReceive or libxlDoMigrateReceive. Don't know the code well enough to do proper triage. qemuProcessStop - claim is usage of net->ifname in the condition (vport->virtPortType == VIR_NETDEV_VPORT_PROFILE_OPENVSWITCH) is using a NULL net->ifname that would have been VIR_FREE()'d when case VIR_DOMAIN_NET_TYPE_DIRECT a few lines above. qemuDomainBlockRebase - claim is overwriting 'dest' after call to qemuDomainBlockCopyCommon causes resource leak. Although reading code says otherwise, except of course if CopyCommon goes to cleanup rather than endjob. Even changing the location doesn't resolve the issue. Fix the Coverity tag for the DEADCODE... It's always a coin-flip either dead_error_begin or dead_error_condition - I gave Jiri bad advice as to which one to use it seems. John Ferlan (6): Avoid Coverity FORWARD_NULL prior to strtok_r calls tests: Resolve Coverity RESOURCE_LEAK tests: Resolve Coverity RESOURCE_LEAK virsh: Resolve Coverity DEADCODE qemu: Resolve Coverity CHECKED_RETURN qemu: Resolve Coverity RESOURCE_LEAK src/esx/esx_vi.c | 1 + src/libxl/libxl_conf.c | 1 + src/openvz/openvz_conf.c | 2 ++ src/qemu/qemu_driver.c | 24 +++++++++++------------- src/qemu/qemu_process.c | 6 +++--- src/xenapi/xenapi_utils.c | 1 + tests/qemucaps2xmltest.c | 1 + tests/virnetdaemontest.c | 2 ++ tools/virsh.c | 2 +- 9 files changed, 23 insertions(+), 17 deletions(-) -- 2.1.0 ------------------------------ -- libvir-list mailing list libvir-list(a)redhat.com https://www.redhat.com/mailman/listinfo/libvir-list End of libvir-list Digest, Vol 118, Issue 146 ********************************************* ******************************************************************************************************************************** The information in this email is confidential and may be legally privileged. If you have received this email in error or are not the intended recipient, please immediately notify the sender and delete this message from your computer. Any use, distribution, or copying of this email other than by the intended recipient is strictly prohibited. All messages sent to and from us may be monitored to ensure compliance with internal policies and to protect our business. Emails are not secure and cannot be guaranteed to be error free as they can be intercepted, amended, lost or destroyed, or contain viruses. Anyone who communicates with us by email is taken to accept these risks. �跺��欢��娉ㄦ�锛��浠跺�淇��淇℃�锛��璇��浠讹�璇峰�蹇��ュ��汉骞剁��ュ��伙�涓��浣跨��澶��浠躲� 杩��欢��版��浠跺��藉��淇��涪澶便�琚��璁＄��虹�姣��涓��ㄦ��点� ********************************************************************************************************************************

1 0

[libvirt] [PATCH v2] qemuDomainDeviceDefPostParse: Drop useless checks
by Michal Privoznik 24 Sep '15

24 Sep '15

Now that virQEMUDriverCreateXMLConf is never called with NULL (after 086f37e97aab) we can safely drop useless check in qemuDomainDeviceDefPostParse as we are guaranteed to be always called with the driver initialized. Therefore checking if driver is NULL makes no sense. Moreover, if we mix it with direct driver dereference. And after that, we are sure that nor @cfg will be NULL, therefore we can drop checks for that too. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- diff to v1: - drop checks for !cfg too src/qemu/qemu_domain.c | 64 ++++++++++++++++++++------------------------------ 1 file changed, 26 insertions(+), 38 deletions(-) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 7d92f3a..78f305f 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -1233,12 +1233,9 @@ qemuDomainDeviceDefPostParse(virDomainDeviceDefPtr dev, { virQEMUDriverPtr driver = opaque; virQEMUCapsPtr qemuCaps = NULL; - virQEMUDriverConfigPtr cfg = NULL; + virQEMUDriverConfigPtr cfg = virQEMUDriverGetConfig(driver); int ret = -1; - if (driver) - cfg = virQEMUDriverGetConfig(driver); - qemuCaps = virQEMUCapsCacheLookup(driver->qemuCapsCache, def->emulator); if (dev->type == VIR_DOMAIN_DEVICE_NET && @@ -1253,37 +1250,34 @@ qemuDomainDeviceDefPostParse(virDomainDeviceDefPtr dev, if (dev->type == VIR_DOMAIN_DEVICE_DISK) { virDomainDiskDefPtr disk = dev->data.disk; - /* both of these require data from the driver config */ - if (cfg) { - /* assign default storage format and driver according to config */ - if (cfg->allowDiskFormatProbing) { - /* default disk format for drives */ - if (virDomainDiskGetFormat(disk) == VIR_STORAGE_FILE_NONE && - (virDomainDiskGetType(disk) == VIR_STORAGE_TYPE_FILE || - virDomainDiskGetType(disk) == VIR_STORAGE_TYPE_BLOCK)) - virDomainDiskSetFormat(disk, VIR_STORAGE_FILE_AUTO); + /* assign default storage format and driver according to config */ + if (cfg->allowDiskFormatProbing) { + /* default disk format for drives */ + if (virDomainDiskGetFormat(disk) == VIR_STORAGE_FILE_NONE && + (virDomainDiskGetType(disk) == VIR_STORAGE_TYPE_FILE || + virDomainDiskGetType(disk) == VIR_STORAGE_TYPE_BLOCK)) + virDomainDiskSetFormat(disk, VIR_STORAGE_FILE_AUTO); - /* default disk format for mirrored drive */ - if (disk->mirror && - disk->mirror->format == VIR_STORAGE_FILE_NONE) - disk->mirror->format = VIR_STORAGE_FILE_AUTO; - } else { - /* default driver if probing is forbidden */ - if (!virDomainDiskGetDriver(disk) && - virDomainDiskSetDriver(disk, "qemu") < 0) - goto cleanup; + /* default disk format for mirrored drive */ + if (disk->mirror && + disk->mirror->format == VIR_STORAGE_FILE_NONE) + disk->mirror->format = VIR_STORAGE_FILE_AUTO; + } else { + /* default driver if probing is forbidden */ + if (!virDomainDiskGetDriver(disk) && + virDomainDiskSetDriver(disk, "qemu") < 0) + goto cleanup; - /* default disk format for drives */ - if (virDomainDiskGetFormat(disk) == VIR_STORAGE_FILE_NONE && - (virDomainDiskGetType(disk) == VIR_STORAGE_TYPE_FILE || - virDomainDiskGetType(disk) == VIR_STORAGE_TYPE_BLOCK)) - virDomainDiskSetFormat(disk, VIR_STORAGE_FILE_RAW); + /* default disk format for drives */ + if (virDomainDiskGetFormat(disk) == VIR_STORAGE_FILE_NONE && + (virDomainDiskGetType(disk) == VIR_STORAGE_TYPE_FILE || + virDomainDiskGetType(disk) == VIR_STORAGE_TYPE_BLOCK)) + virDomainDiskSetFormat(disk, VIR_STORAGE_FILE_RAW); - /* default disk format for mirrored drive */ - if (disk->mirror && - disk->mirror->format == VIR_STORAGE_FILE_NONE) - disk->mirror->format = VIR_STORAGE_FILE_RAW; - } + /* default disk format for mirrored drive */ + if (disk->mirror && + disk->mirror->format == VIR_STORAGE_FILE_NONE) + disk->mirror->format = VIR_STORAGE_FILE_RAW; } } @@ -1315,12 +1309,6 @@ qemuDomainDeviceDefPostParse(virDomainDeviceDefPtr dev, dev->data.chr->targetType == VIR_DOMAIN_CHR_CHANNEL_TARGET_TYPE_VIRTIO && dev->data.chr->source.type == VIR_DOMAIN_CHR_TYPE_UNIX && !dev->data.chr->source.data.nix.path) { - if (!cfg) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("cannot generate UNIX socket path")); - goto cleanup; - } - if (virAsprintf(&dev->data.chr->source.data.nix.path, "%s/domain-%s/%s", cfg->channelTargetDir, def->name, -- 2.4.9

2 1

[libvirt] [libvirt-glib] gobject: Correct docs for gvir_storage_pool_get_info()
by Zeeshan Ali (Khattak) 23 Sep '15

23 Sep '15

The returned GVirStoragePoolInfo pointer is not a GObject so it must not be unrefed using g_object_unref(). Since gvir_storage_pool_info_free() is private function, callers must either use g_slice_free() or g_boxed_free(). --- Perhaps we should just make gvir_storage_pool_info_free() public instead? libvirt-gobject/libvirt-gobject-storage-pool.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libvirt-gobject/libvirt-gobject-storage-pool.c b/libvirt-gobject/libvirt-gobject-storage-pool.c index 7f26b1b..f015efa 100644 --- a/libvirt-gobject/libvirt-gobject-storage-pool.c +++ b/libvirt-gobject/libvirt-gobject-storage-pool.c @@ -277,8 +277,8 @@ GVirConfigStoragePool *gvir_storage_pool_get_config(GVirStoragePool *pool, * @pool: the storage_pool * @err: Place-holder for possible errors * - * Returns: (transfer full): the info. The returned object should be - * unreffed with g_object_unref() when no longer needed. + * Returns: (transfer full): the info. The returned pointer should be + * freed using either #g_slice_free() or #g_boxed_free() when no longer needed. */ GVirStoragePoolInfo *gvir_storage_pool_get_info(GVirStoragePool *pool, GError **err) -- 2.4.3

2 4

[libvirt] [libvirt-guests] New feature ALWAYS_START
by Marek Lukács 23 Sep '15

23 Sep '15

Hi, It will be nice feature to have configuration option ALWAYS_START="$uri:$name $uri:name ..." in libvirt-guests configuration file. If ON_BOOT is "start" and if ALWAYS_START is not empty, it iterates over the ALWAYS_START and starts guests with same conditions (delays etc.) before it starts guests from LISTFILE. Benefits: - guests are started with delays - guests are started after host failure - guests are started in specific order (for example complex environment, when DB should be started before other guest, etc.) Regards, Marek Lukács

3 7