- Devel - libvirt List Archives

[libvirt] [PATCH python] Fix misc RPM specfile flaws
by Daniel P. Berrange 27 Nov '13

27 Nov '13

From: "Daniel P. Berrange" <berrange(a)redhat.com> Fix the RPM summary line, add placeholder %changelog tag, make %setup quiet, add Url: tag and filter out bogus provides and add example programs as docs. Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- libvirt-python.spec.in | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/libvirt-python.spec.in b/libvirt-python.spec.in index e6c229f..7c6257e 100644 --- a/libvirt-python.spec.in +++ b/libvirt-python.spec.in @@ -1,14 +1,19 @@ -Summary: The libvirt virtualization API +Summary: The libvirt virtualization API python binding Name: libvirt-python Version: @PY_VERSION@ Release: 1%{?dist}%{?extra_release} Source0: http://libvirt.org/sources/python/%{name}-%{version}.tar.gz +Url: http://libvirt.org License: LGPLv2+ Group: Development/Libraries BuildRequires: libvirt-devel >= @C_VERSION@ BuildRequires: python-devel +# Don't want provides for python shared objects +%{?filter_provides_in: %filter_provides_in %{python_sitearch}/.*\.so} +%{?filter_setup} + %description The libvirt-python package contains a module that permits applications written in the Python programming language to use the interface @@ -16,7 +21,7 @@ supplied by the libvirt library to use the virtualization capabilities of recent versions of Linux (and other OSes). %prep -%setup +%setup -q %build CFLAGS="$RPM_OPT_FLAGS" %{__python} setup.py build @@ -27,8 +32,10 @@ rm -f %{buildroot}%{_libdir}/python*/site-packages/*egg-info %files %defattr(-,root,root) -%doc ChangeLog AUTHORS NEWS README COPYING COPYING.LESSER +%doc ChangeLog AUTHORS NEWS README COPYING COPYING.LESSER examples/ %{_libdir}/python*/site-packages/libvirt.py* %{_libdir}/python*/site-packages/libvirt_qemu.py* %{_libdir}/python*/site-packages/libvirt_lxc.py* %{_libdir}/python*/site-packages/libvirtmod* + +%changelog -- 1.8.3.1

2 1

[libvirt] [PATCH python] Fix code for avoiding overrides of non-existant functions
by Daniel P. Berrange 27 Nov '13

27 Nov '13

From: "Daniel P. Berrange" <berrange(a)redhat.com> When reading/writing a global variable from inside a method it must be declared as a global, otherwise a local variable by the same name will be used. Special case the virConnectListDomainsID method which is bizarrely renamed for no obvious reason. Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- generator.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/generator.py b/generator.py index cd857b4..e8d8ea9 100755 --- a/generator.py +++ b/generator.py @@ -187,16 +187,21 @@ class docParser(xml.sax.handler.ContentHandler): def function(name, desc, ret, args, file, module, cond): + global onlyOverrides if onlyOverrides and name not in functions: return + if name == "virConnectListDomains": + name = "virConnectListDomainsID" functions[name] = (desc, ret, args, file, module, cond) def qemu_function(name, desc, ret, args, file, module, cond): + global onlyOverrides if onlyOverrides and name not in qemu_functions: return qemu_functions[name] = (desc, ret, args, file, module, cond) def lxc_function(name, desc, ret, args, file, module, cond): + global onlyOverrides if onlyOverrides and name not in lxc_functions: return lxc_functions[name] = (desc, ret, args, file, module, cond) @@ -786,6 +791,7 @@ def buildStubs(module, api_xml): global py_types global py_return_types global unknown_types + global onlyOverrides if module not in ["libvirt", "libvirt-qemu", "libvirt-lxc"]: print "ERROR: Unknown module type: %s" % module -- 1.8.3.1

2 1

[libvirt] [PATCH] Make virsh command 'domxml-to-native' copy the MAC addr parsed from XML
by mars＠linux.vnet.ibm.com 27 Nov '13

27 Nov '13

From: Bing Bu Cao <mars(a)linux.vnet.ibm.com> virsh command 'domxml-to-native' did not copy the MAC address which parsed from a domain xml, in the commandline the MAC addr of network device always was 00:00:00:00:00:00. This patch fix it. Signed-off-by: Bing Bu Cao <mars(a)linux.vnet.ibm.com> --- src/qemu/qemu_driver.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 8a1eefd..4693dad 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -5821,6 +5821,7 @@ static char *qemuConnectDomainXMLToNative(virConnectPtr conn, virDomainNetDefPtr net = def->nets[i]; int bootIndex = net->info.bootIndex; char *model = net->model; + virMacAddr mac = net->mac; if (net->type == VIR_DOMAIN_NET_TYPE_NETWORK) { int actualType = virDomainNetGetActualType(net); @@ -5843,6 +5844,7 @@ static char *qemuConnectDomainXMLToNative(virConnectPtr conn, net->script = NULL; net->data.ethernet.dev = brnamecopy; net->data.ethernet.ipaddr = NULL; + net->mac = mac; } else { /* actualType is either NETWORK or DIRECT. In either * case, the best we can do is NULL everything out. @@ -5854,6 +5856,7 @@ static char *qemuConnectDomainXMLToNative(virConnectPtr conn, net->script = NULL; net->data.ethernet.dev = NULL; net->data.ethernet.ipaddr = NULL; + net->mac = mac; } } else if (net->type == VIR_DOMAIN_NET_TYPE_DIRECT) { VIR_FREE(net->data.direct.linkdev); @@ -5864,6 +5867,7 @@ static char *qemuConnectDomainXMLToNative(virConnectPtr conn, net->script = NULL; net->data.ethernet.dev = NULL; net->data.ethernet.ipaddr = NULL; + net->mac = mac; } else if (net->type == VIR_DOMAIN_NET_TYPE_BRIDGE) { char *script = net->script; char *brname = net->data.bridge.brname; @@ -5875,6 +5879,7 @@ static char *qemuConnectDomainXMLToNative(virConnectPtr conn, net->script = script; net->data.ethernet.dev = brname; net->data.ethernet.ipaddr = ipaddr; + net->mac = mac; } VIR_FREE(net->virtPortProfile); -- 1.7.7.6

2 1

[libvirt] [PATCH python] Add missing binding of security model/label APIs
by Daniel P. Berrange 27 Nov '13

27 Nov '13

From: "Daniel P. Berrange" <berrange(a)redhat.com> The virNodeGetSecurityModel, virDomainGetSecurityLabel and virDomainGetSecurityLabelList methods were disabled in the python binding for inexplicable reasons. Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- generator.py | 6 ++-- libvirt-override-api.xml | 15 +++++++++ libvirt-override.c | 82 ++++++++++++++++++++++++++++++++++++++++++++++++ typewrappers.c | 9 ++++++ typewrappers.h | 1 + 5 files changed, 110 insertions(+), 3 deletions(-) diff --git a/generator.py b/generator.py index ab2a97f..273efbd 100755 --- a/generator.py +++ b/generator.py @@ -381,6 +381,9 @@ skip_impl = ( 'virDomainGetJobInfo', 'virDomainGetJobStats', 'virNodeGetInfo', + 'virNodeGetSecurityModel', + 'virDomainGetSecurityLabel', + 'virDomainGetSecurityLabelList', 'virDomainGetUUID', 'virDomainGetUUIDString', 'virDomainLookupByUUID', @@ -476,9 +479,6 @@ skip_function = ( 'virCopyLastError', # Python API is called virGetLastError instead 'virConnectOpenAuth', # Python C code is manually written 'virDefaultErrorFunc', # Python virErrorFuncHandler impl calls this from C - 'virDomainGetSecurityLabel', # Needs investigation... - 'virDomainGetSecurityLabelList', # Needs investigation... - 'virNodeGetSecurityModel', # Needs investigation... 'virConnectDomainEventRegister', # overridden in virConnect.py 'virConnectDomainEventDeregister', # overridden in virConnect.py 'virConnectDomainEventRegisterAny', # overridden in virConnect.py diff --git a/libvirt-override-api.xml b/libvirt-override-api.xml index 337d0a0..d5b25b5 100644 --- a/libvirt-override-api.xml +++ b/libvirt-override-api.xml @@ -104,6 +104,21 @@ <return type='char *' info='the list of information or None in case of error'/> <arg name='conn' type='virConnectPtr' info='pointer to the hypervisor connection'/> </function> + <function name='virNodeGetSecurityModel' file='python'> + <info>Extract information about the host security model</info> + <return type='char *' info='the list of information or None in case of error'/> + <arg name='conn' type='virConnectPtr' info='pointer to the hypervisor connection'/> + </function> + <function name='virDomainGetSecurityLabel' file='python'> + <info>Extract information about the domain security label. Only the first label will be returned.</info> + <return type='char *' info='the list of information or None in case of error'/> + <arg name='domain' type='virDomainPtr' info='a domain object'/> + </function> + <function name='virDomainGetSecurityLabelList' file='python'> + <info>Extract information about the domain security label. A list of all labels will be returned.</info> + <return type='char *' info='the list of information or None in case of error'/> + <arg name='domain' type='virDomainPtr' info='a domain object'/> + </function> <function name='virNodeGetCPUStats' file='python'> <info>Extract node's CPU statistics.</info> <return type='char *' info='dictionary mapping field names to values or None in case of error'/> diff --git a/libvirt-override.c b/libvirt-override.c index d3802de..42e253e 100644 --- a/libvirt-override.c +++ b/libvirt-override.c @@ -2865,6 +2865,83 @@ libvirt_virNodeGetInfo(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) { } static PyObject * +libvirt_virNodeGetSecurityModel(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) { + PyObject *py_retval; + int c_retval; + virConnectPtr conn; + PyObject *pyobj_conn; + virSecurityModel model; + + if (!PyArg_ParseTuple(args, (char *)"O:virDomainGetSecurityModel", &pyobj_conn)) + return NULL; + conn = (virConnectPtr) PyvirConnect_Get(pyobj_conn); + + LIBVIRT_BEGIN_ALLOW_THREADS; + c_retval = virNodeGetSecurityModel(conn, &model); + LIBVIRT_END_ALLOW_THREADS; + if (c_retval < 0) + return VIR_PY_NONE; + py_retval = PyList_New(2); + PyList_SetItem(py_retval, 0, libvirt_constcharPtrWrap(&model.model[0])); + PyList_SetItem(py_retval, 1, libvirt_constcharPtrWrap(&model.doi[0])); + return py_retval; +} + +static PyObject * +libvirt_virDomainGetSecurityLabel(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) { + PyObject *py_retval; + int c_retval; + virDomainPtr dom; + PyObject *pyobj_dom; + virSecurityLabel label; + + if (!PyArg_ParseTuple(args, (char *)"O:virDomainGetSecurityLabel", &pyobj_dom)) + return NULL; + dom = (virDomainPtr) PyvirDomain_Get(pyobj_dom); + + LIBVIRT_BEGIN_ALLOW_THREADS; + c_retval = virDomainGetSecurityLabel(dom, &label); + LIBVIRT_END_ALLOW_THREADS; + if (c_retval < 0) + return VIR_PY_NONE; + py_retval = PyList_New(2); + PyList_SetItem(py_retval, 0, libvirt_constcharPtrWrap(&label.label[0])); + PyList_SetItem(py_retval, 1, libvirt_boolWrap(label.enforcing)); + return py_retval; +} + +#if LIBVIR_CHECK_VERSION(0, 9, 13) +static PyObject * +libvirt_virDomainGetSecurityLabelList(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) { + PyObject *py_retval; + int c_retval; + virDomainPtr dom; + PyObject *pyobj_dom; + virSecurityLabel *labels; + size_t i; + + if (!PyArg_ParseTuple(args, (char *)"O:virDomainGetSecurityLabel", &pyobj_dom)) + return NULL; + dom = (virDomainPtr) PyvirDomain_Get(pyobj_dom); + + LIBVIRT_BEGIN_ALLOW_THREADS; + c_retval = virDomainGetSecurityLabelList(dom, &labels); + LIBVIRT_END_ALLOW_THREADS; + if (c_retval < 0) + return VIR_PY_NONE; + py_retval = PyList_New(0); + for (i = 0 ; i < c_retval ; i++) { + PyObject *entry = PyList_New(2); + PyList_SetItem(entry, 0, libvirt_constcharPtrWrap(&labels[i].label[0])); + PyList_SetItem(entry, 1, libvirt_boolWrap(labels[i].enforcing)); + PyList_Append(py_retval, entry); + } + free(labels); + return py_retval; +} +#endif + +static PyObject * libvirt_virDomainGetUUID(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) { PyObject *py_retval; unsigned char uuid[VIR_UUID_BUFLEN]; @@ -7304,6 +7381,11 @@ static PyMethodDef libvirtMethods[] = { {(char *) "virDomainGetControlInfo", libvirt_virDomainGetControlInfo, METH_VARARGS, NULL}, {(char *) "virDomainGetBlockInfo", libvirt_virDomainGetBlockInfo, METH_VARARGS, NULL}, {(char *) "virNodeGetInfo", libvirt_virNodeGetInfo, METH_VARARGS, NULL}, + {(char *) "virNodeGetSecurityModel", libvirt_virNodeGetSecurityModel, METH_VARARGS, NULL}, + {(char *) "virDomainGetSecurityLabel", libvirt_virDomainGetSecurityLabel, METH_VARARGS, NULL}, +#if LIBVIR_CHECK_VERSION(0, 9, 13) + {(char *) "virDomainGetSecurityLabelList", libvirt_virDomainGetSecurityLabelList, METH_VARARGS, NULL}, +#endif /* LIBVIR_CHECK_VERSION(0, 9, 13) */ {(char *) "virNodeGetCPUStats", libvirt_virNodeGetCPUStats, METH_VARARGS, NULL}, {(char *) "virNodeGetMemoryStats", libvirt_virNodeGetMemoryStats, METH_VARARGS, NULL}, {(char *) "virDomainGetUUID", libvirt_virDomainGetUUID, METH_VARARGS, NULL}, diff --git a/typewrappers.c b/typewrappers.c index d6cbbf1..1622986 100644 --- a/typewrappers.c +++ b/typewrappers.c @@ -116,6 +116,15 @@ libvirt_constcharPtrWrap(const char *str) return ret; } +PyObject * +libvirt_boolWrap(int val) +{ + if (val) + Py_RETURN_TRUE; + else + Py_RETURN_FALSE; +} + int libvirt_intUnwrap(PyObject *obj, int *val) { diff --git a/typewrappers.h b/typewrappers.h index d871d3f..04e364f 100644 --- a/typewrappers.h +++ b/typewrappers.h @@ -164,6 +164,7 @@ PyObject * libvirt_ulonglongWrap(unsigned long long val); PyObject * libvirt_charPtrWrap(char *str); PyObject * libvirt_charPtrSizeWrap(char *str, Py_ssize_t size); PyObject * libvirt_constcharPtrWrap(const char *str); +PyObject * libvirt_boolWrap(int val); int libvirt_intUnwrap(PyObject *obj, int *val); int libvirt_uintUnwrap(PyObject *obj, unsigned int *val); int libvirt_longUnwrap(PyObject *obj, long *val); -- 1.8.3.1

2 2

[libvirt] [PATCH python] Avoid generating the migrate methods in multiple classes
by Daniel P. Berrange 27 Nov '13

27 Nov '13

From: "Daniel P. Berrange" <berrange(a)redhat.com> The python code generator tries to figure out what class a method should be in by looking at the list of arguments for any which are object types. Unfortunately missing break statements meant that methods which have multiple object arguments (eg migrate as a virDomainPtr followed by a virConnectPtr) got added to multiple classes. The migrate methods should only be visible in the virDomain class, and the versions in the virConnect class have fubar arguments. Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- generator.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/generator.py b/generator.py index c769ed0..ab2a97f 100755 --- a/generator.py +++ b/generator.py @@ -1264,12 +1264,14 @@ def buildWrappers(module): func = nameFixup(name, classe, type, file) info = (0, func, name, ret, args, file, mod) function_classes[classe].append(info) + break elif name[0:3] == "vir" and len(args) >= 2 and args[1][1] == type \ and file != "python_accessor" and not name in function_skip_index_one: found = 1 func = nameFixup(name, classe, type, file) info = (1, func, name, ret, args, file, mod) function_classes[classe].append(info) + break if found == 1: continue func = nameFixup(name, "None", file, file) -- 1.8.3.1

2 2

[libvirt] virDomain{Attach, Detach, Update}DeviceFlags filesystem support for qemu driver
by Jesse Cook 27 Nov '13

27 Nov '13

It does not currently appear to be possible to attach/detach a filesystem with kvm through the C API or virsh. Looking at src/qemu/qemu_driver.c:qemuDomain{Attach,Detach,Update}Config, VIR_DOMAIN_DEVICE_FS is not a case within the switch statement for dev->type. Is support for this planned for the near future or in progress? If not, how much would have to be implemented outside these functions to add support for attaching, detaching, and modifying filesystems? I would like to gauge whether I should carve out time to add support, or work around it by using disks in place of filesystems. Thanks! -- Jesse J. Cook Camber Corporation Lead Software Developer

2 1

[libvirt] [libvirt-test-API][PATCH] Fix utils.exec_cmd output problem
by Jincheng Miao 27 Nov '13

27 Nov '13

The 'out' returned from exec_cmds is not 'None' type if stderr occurs, it is because utils pass 'subprocess.PIPE' to stdout to open this subprocess. "Similarly, to get anything other than None in the result tuple, you need to give stdout=PIPE and/or stderr=PIPE too." (see http://docs.python.org/2/library/subprocess.html#module-subprocess) Finally, make out equals to err when stderr happened. --- utils/utils.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/utils/utils.py b/utils/utils.py index 147c1ef..2248ce1 100644 --- a/utils/utils.py +++ b/utils/utils.py @@ -404,14 +404,12 @@ def exec_cmd(command, sudo=False, cwd=None, infile=None, outfile=None, shell=Fal command = ["sudo"] + command if infile == None: infile = subprocess.PIPE - if outfile == None: - outfile = subprocess.PIPE p = subprocess.Popen(command, shell=shell, close_fds=True, cwd=cwd, stdin=infile, stdout=outfile, stderr=subprocess.PIPE) (out, err) = p.communicate(data) if out == None: - # Prevent splitlines() from barfing later on - out = "" + # Because stderr is PIPE, err will not be None, and can be splitlines. + out = err return (p.returncode, out.splitlines()) def remote_exec_pexpect(hostname, username, password, cmd): -- 1.8.3.1

2 8

[libvirt] [PATCH] look for numad in /usr/sbin
by Jim Fehlig 27 Nov '13

27 Nov '13

When looking for numad with AC_PATH_PROG, include /usr/sbin in the search path. --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 4942e07..f494f46 100644 --- a/configure.ac +++ b/configure.ac @@ -1454,7 +1454,7 @@ AC_ARG_WITH([numad], if test "$with_numad" != "no" ; then fail=0 - AC_PATH_PROG([NUMAD], [numad], [], [/bin:/usr/bin]) + AC_PATH_PROG([NUMAD], [numad], [], [/bin:/usr/bin:/usr/sbin]) if test "$with_numad" = "check"; then test "$with_numactl" = "yes" || fail=1 -- 1.8.0.1

2 2

[libvirt] [test-API][PATCH V2] Modify previous test cases by invoking api
by Jincheng Miao 27 Nov '13

27 Nov '13

* repos/domain/blkstats.py * repos/domain/domain_blkinfo.py Function blkstats and domain_blkinfo used virsh commands to test result, that is not fit for testing api, so I replace commands with invoking api. V1->V2: Removed blockdev params for domain_blkinfo, this hard code disk device is not convenient for users. --- repos/domain/blkstats.py | 2 - repos/domain/domain_blkinfo.py | 94 ++++++++++++++++++++++++------------------ 2 files changed, 55 insertions(+), 41 deletions(-) diff --git a/repos/domain/blkstats.py b/repos/domain/blkstats.py index 0254922..27c2a46 100644 --- a/repos/domain/blkstats.py +++ b/repos/domain/blkstats.py @@ -1,8 +1,6 @@ #!/usr/bin/evn python # To test domain block device statistics -import os -import sys import time import libxml2 diff --git a/repos/domain/domain_blkinfo.py b/repos/domain/domain_blkinfo.py index b6051aa..81035ed 100644 --- a/repos/domain/domain_blkinfo.py +++ b/repos/domain/domain_blkinfo.py @@ -1,22 +1,17 @@ #!/usr/bin/env python -# To test "virsh domblkinfo" command +# To test domain's blockkinfo API -import os -import sys -import re import commands - +import libxml2 import libvirt from libvirt import libvirtError from src import sharedmod -GET_DOMBLKINFO_MAC = "virsh domblkinfo %s %s | awk '{print $2}'" GET_CAPACITY = "du -b %s | awk '{print $1}'" GET_PHYSICAL_K = " du -B K %s | awk '{print $1}'" -VIRSH_DOMBLKINFO = "virsh domblkinfo %s %s" -required_params = ('guestname', 'blockdev',) +required_params = ('guestname', ) optional_params = {} def get_output(command, logger): @@ -32,8 +27,8 @@ def check_domain_exists(conn, guestname, logger): """ check if the domain exists, may or may not be active """ guest_names = [] ids = conn.listDomainsID() - for id in ids: - obj = conn.lookupByID(id) + for domain_id in ids: + obj = conn.lookupByID(domain_id) guest_names.append(obj.name()) guest_names += conn.listDefinedDomains() @@ -44,17 +39,27 @@ def check_domain_exists(conn, guestname, logger): else: return True +def check_guest_status(domobj): + """Check guest current status""" + state = domobj.info()[0] + if state == libvirt.VIR_DOMAIN_SHUTOFF or \ + state == libvirt.VIR_DOMAIN_SHUTDOWN: + # add check function + return False + else: + return True + def check_block_data(blockdev, blkdata, logger): """ check data about capacity,allocation,physical """ status, apparent_size = get_output(GET_CAPACITY % blockdev, logger) if not status: - if apparent_size == blkdata[0]: - logger.info("the capacity of '%s' is %s, checking succeeded" % \ - (blockdev, apparent_size)) + if apparent_size == str(blkdata[0]): + logger.info("the capacity of '%s' is %s, checking succeeded" + % (blockdev, apparent_size)) else: - logger.error("apparent-size from 'du' is %s, \n\ - but from 'domblkinfo' is %s, checking failed" % \ - (apparent_size, blkdata[0])) + logger.error("apparent-size from 'du' is %s" % apparent_size) + logger.error("but from 'domain blockinfo' is %d, checking failed" + % blkdata[0]) return 1 else: return 1 @@ -64,14 +69,15 @@ def check_block_data(blockdev, blkdata, logger): block_size_b = int(block_size_k[:-1]) * 1024 # Temporarily, we only test the default case, assuming # Allocation value is equal to Physical value - if str(block_size_b) == blkdata[1] and str(block_size_b) == blkdata[2]: - logger.info("the block size of '%s' is %s, same with \n\ - Allocation and Physical value, checking succeeded" % \ - (blockdev, block_size_b)) + if block_size_b == blkdata[1] and block_size_b == blkdata[2]: + logger.info("the block size of '%s' is %s" + % (blockdev, block_size_b)) + logger.info("Allocation and Physical value's checking succeeded") else: - logger.error("the block size from 'du' is %s, \n\ - the Allocation value is %s, Physical value is %s, \n\ - checking failed" % (block_size_b, blkdata[1], blkdata[2])) + logger.error("the block size from 'du' is %d" % block_size_b) + logger.error("the Allocation value is %d, Physical value is %d" + % (blkdata[1], blkdata[2])) + logger.error("checking failed") return 1 return 0 @@ -79,14 +85,12 @@ def check_block_data(blockdev, blkdata, logger): def domain_blkinfo(params): """ using du command to check the data - in the output of virsh domblkinfo + in the output of API blockinfo """ logger = params['logger'] guestname = params.get('guestname') - blockdev = params.get('blockdev') logger.info("the name of guest is %s" % guestname) - logger.info("the block device is %s" % blockdev) conn = sharedmod.libvirtobj['conn'] @@ -94,23 +98,35 @@ def domain_blkinfo(params): logger.error("need a defined guest") return 1 - logger.info("the output of virsh domblkinfo is:") - status, output = get_output(VIRSH_DOMBLKINFO % (guestname, blockdev), logger) - if not status: - logger.info("\n" + output) - else: + domobj = conn.lookupByName(guestname) + + xml = domobj.XMLDesc(0) + doc = libxml2.parseDoc(xml) + cont = doc.xpathNewContext() + vdevs = cont.xpathEval("/domain/devices/disk/source/@file") + blockdev = vdevs[0].content + logger.info("the block device is %s" % blockdev) + + if not check_guest_status(domobj): + logger.error("guest is not started.") return 1 - status, data_str = get_output(GET_DOMBLKINFO_MAC % (guestname, blockdev), logger) - if not status: - blkdata = data_str.rstrip().split('\n') - logger.info("capacity,allocation,physical list: %s" % blkdata) - else: + try: + logger.info("the output of domain blockinfo is:") + block_info = domobj.blockInfo(blockdev, 0) + logger.info("Capacity : %d " % block_info[0]) + logger.info("Allocation: %d " % block_info[1]) + logger.info("Physical : %d " % block_info[2]) + + except libvirtError, e: + logger.error("API error message: %s, error code is %s" + % (e.message, e.get_error_code())) return 1 - if check_block_data(blockdev, blkdata, logger): - logger.error("checking domblkinfo data FAILED") + if check_block_data(blockdev, block_info, logger): + logger.error("checking domain blockinfo data FAILED") return 1 else: - logger.info("checking domblkinfo data SUCCEEDED") + logger.info("checking domain blockinfo data SUCCEEDED") + return 0 -- 1.8.3.1

1 0

[libvirt] [PATCH] storage: don't read storage volumes in nonblock mode
by Eric Blake 27 Nov '13

27 Nov '13

Commit 348b4e2 introduced a potential problem (thankfully not in any release): we are attempting to use virFileReadHeaderFD() on a file that was opened with O_NONBLOCK. While this shouldn't be a problem in practice (because O_NONBLOCK typically doesn't affect regular or block files, and fifos and sockets cannot be storage volumes), it's better to play it safe to avoid races from opening an unexpected file type while also avoiding problems with having to handle EAGAIN while read()ing. Based on a report by Dan Berrange. * src/storage/storage_backend.c (virStorageBackendVolOpenCheckMode): Fix up fd after avoiding race. Signed-off-by: Eric Blake <eblake(a)redhat.com> --- src/storage/storage_backend.c | 25 +++++++++++++++++++++---- 1 file changed, 21 insertions(+), 4 deletions(-) diff --git a/src/storage/storage_backend.c b/src/storage/storage_backend.c index 57c1728..bde39d6 100644 --- a/src/storage/storage_backend.c +++ b/src/storage/storage_backend.c @@ -1179,6 +1179,12 @@ virStorageBackendVolOpenCheckMode(const char *path, struct stat *sb, return -2; } + /* O_NONBLOCK should only matter during open() for fifos and + * sockets, which we already filtered; but using it prevents a + * TOCTTOU race. However, later on we will want to read() the + * header from this fd, and virFileRead* routines require a + * blocking fd, so fix it up after verifying we avoided a + * race. */ if ((fd = open(path, O_RDONLY|O_NONBLOCK|O_NOCTTY)) < 0) { if ((errno == ENOENT || errno == ELOOP) && S_ISLNK(sb->st_mode)) { @@ -1200,13 +1206,13 @@ virStorageBackendVolOpenCheckMode(const char *path, struct stat *sb, return -1; } - if (S_ISREG(sb->st_mode)) + if (S_ISREG(sb->st_mode)) { mode = VIR_STORAGE_VOL_OPEN_REG; - else if (S_ISCHR(sb->st_mode)) + } else if (S_ISCHR(sb->st_mode)) { mode = VIR_STORAGE_VOL_OPEN_CHAR; - else if (S_ISBLK(sb->st_mode)) + } else if (S_ISBLK(sb->st_mode)) { mode = VIR_STORAGE_VOL_OPEN_BLOCK; - else if (S_ISDIR(sb->st_mode)) { + } else if (S_ISDIR(sb->st_mode)) { mode = VIR_STORAGE_VOL_OPEN_DIR; if (STREQ(base, ".") || @@ -1215,6 +1221,17 @@ virStorageBackendVolOpenCheckMode(const char *path, struct stat *sb, VIR_INFO("Skipping special dir '%s'", base); return -2; } + } else { + VIR_WARN("ignoring unexpected type for file '%s'", path); + VIR_FORCE_CLOSE(fd); + return -2; + } + + if (virSetBlocking(fd, true) < 0) { + virReportSystemError(errno, _("unable to set blocking mode for '%s'"), + path); + VIR_FORCE_CLOSE(fd); + return -2; } if (!(mode & flags)) { -- 1.8.3.1

2 2