April 2012 - Devel - libvirt List Archives

[libvirt] [PATCH] util: only register callbacks for CREATE operations in virnetdevmacvlan.c
by D. Herrendoerfer 18 Apr '12

18 Apr '12

From: "D. Herrendoerfer" <d.herrendoerfer(a)herrendoerfer.name> currently upon a migration a callback is created when a 802.1qbg link is set to PREASSOCIATE, this should not happen because this is a no-op on most switches, and does not lead to an ASSOCIATE state. This patch only creates callbacks when CREATE is requested. Migration and libvirtd restart scenarios are already handeled elsewhere. Signed-off-by: D. Herrendoerfer <d.herrendoerfer(a)herrendoerfer.name> --- src/util/virnetdevmacvlan.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/util/virnetdevmacvlan.c b/src/util/virnetdevmacvlan.c index 17ea883..73f41ff 100644 --- a/src/util/virnetdevmacvlan.c +++ b/src/util/virnetdevmacvlan.c @@ -945,9 +945,12 @@ create_name: goto disassociate_exit; } - if (virNetDevMacVLanVPortProfileRegisterCallback(cr_ifname, macaddress, - linkdev, vmuuid, virtPortProfile, vmOp) < 0 ) + if (vmOp == VIR_NETDEV_VPORT_PROFILE_OP_CREATE) { + /*Only directly register upon a create - migration and restart are handled elsewhere*/ + if (virNetDevMacVLanVPortProfileRegisterCallback(cr_ifname, macaddress, + linkdev, vmuuid, virtPortProfile, vmOp) < 0 ) goto disassociate_exit; + } return rc; -- 1.7.7.6

3 6

[libvirt] [test-API 00/10] Reorgnize/refactoring round 2
by Osier Yang 18 Apr '12

18 Apr '12

This should be the second round to reorgnize/refactor the codes. What this round does: * New directory "conf"; Move $root/*.cfg into it * New directory "src"; Move $root/*.{py,css,xls} into it (except the main program libvirt-test-api.py) * Rename libvirt-test-api.py to libvirt-test-api * Move install-autotest-server into "scripts" * Rename BUGSKIP to SKIP, and modify the skipping syntax so that it skips whole test case, but not test step(s). See the explaination in the patch to get why to do it. * Destroy the codes to skip test steps. * Other small fixes. TODO in next round: * Support run all cases in a bundle * Support to skip test case with the new skipping syntax * A new config property for the scratch directory, (now it always use $(pwd)/$guest_name to download the files, we should have something like '/var/cache/libvirt-test-API' instead). * Other cleaning up. Osier Yang (10): Create new dir 'conf' and move conf files into it Fix the typo in usage string Remove the suffix .py for libvirt-test-api.py New directory 'src' and move *.{py,css,xls} files into it Fix the typo which mispells 'shutil' as 'shutils' Move install-autotest-server into 'scripts' Update logging stuffs so that it works after source tree reorgnizing Add document to tell the default log output file Rename and modify the syntax of BUGSKIP Destroy the codes to skip case steps. BUGSKIP | 4 - SKIP | 26 ++++++++ env.cfg => conf/env.cfg | 0 kickstart.cfg => conf/kickstart.cfg | 0 dist/redhat/env_inspect.py | 2 +- libvirt-test-api.py => libvirt-test-api | 50 ++++++++-------- repos/domain/attach_disk.py | 2 +- repos/domain/attach_interface.py | 2 +- repos/domain/autostart.py | 2 +- repos/domain/balloon_memory.py | 2 +- repos/domain/blkstats.py | 2 +- repos/domain/console_io.py | 2 +- repos/domain/console_mutex.py | 2 +- repos/domain/cpu_affinity.py | 2 +- repos/domain/cpu_topology.py | 2 +- repos/domain/create.py | 2 +- repos/domain/define.py | 2 +- repos/domain/destroy.py | 2 +- repos/domain/detach_disk.py | 2 +- repos/domain/detach_interface.py | 2 +- repos/domain/domain_blkinfo.py | 2 +- repos/domain/domain_id.py | 2 +- repos/domain/domblkinfo.py | 2 +- repos/domain/dump.py | 2 +- repos/domain/eventhandler.py | 2 +- repos/domain/ifstats.py | 2 +- repos/domain/install_image.py | 4 +- repos/domain/install_linux_cdrom.py | 10 ++-- repos/domain/install_linux_check.py | 4 +- repos/domain/install_linux_net.py | 12 ++-- repos/domain/install_windows_cdrom.py | 12 ++-- repos/domain/migrate.py | 2 +- repos/domain/ownership_test.py | 2 +- repos/domain/reboot.py | 2 +- repos/domain/restore.py | 2 +- repos/domain/resume.py | 2 +- repos/domain/save.py | 2 +- repos/domain/sched_params.py | 2 +- repos/domain/shutdown.py | 2 +- repos/domain/start.py | 2 +- repos/domain/suspend.py | 2 +- repos/domain/undefine.py | 2 +- repos/domain/update_devflag.py | 2 +- repos/interface/create.py | 2 +- repos/interface/define.py | 2 +- repos/interface/destroy.py | 2 +- repos/interface/undefine.py | 2 +- repos/libvirtd/qemu_hang.py | 2 +- repos/libvirtd/restart.py | 2 +- repos/network/autostart.py | 2 +- repos/network/create.py | 2 +- repos/network/define.py | 2 +- repos/network/destroy.py | 2 +- repos/network/network_list.py | 2 +- repos/network/network_name.py | 2 +- repos/network/network_uuid.py | 2 +- repos/network/start.py | 2 +- repos/network/undefine.py | 2 +- repos/nodedevice/detach.py | 2 +- repos/nodedevice/reattach.py | 2 +- repos/nodedevice/reset.py | 2 +- repos/npiv/create_virtual_hba.py | 2 +- .../multiple_thread_block_on_domain_create.py | 4 +- repos/remoteAccess/tcp_setup.py | 2 +- repos/remoteAccess/tls_setup.py | 8 +- repos/sVirt/domain_nfs_start.py | 2 +- repos/snapshot/delete.py | 2 +- repos/snapshot/file_flag.py | 2 +- repos/snapshot/flag_check.py | 2 +- repos/snapshot/internal_create.py | 2 +- repos/snapshot/revert.py | 2 +- repos/storage/activate_pool.py | 2 +- repos/storage/build_dir_pool.py | 2 +- repos/storage/build_disk_pool.py | 2 +- repos/storage/build_logical_pool.py | 2 +- repos/storage/build_netfs_pool.py | 2 +- repos/storage/create_dir_pool.py | 2 +- repos/storage/create_dir_volume.py | 2 +- repos/storage/create_fs_pool.py | 2 +- repos/storage/create_iscsi_pool.py | 2 +- repos/storage/create_logical_volume.py | 2 +- repos/storage/create_netfs_pool.py | 2 +- repos/storage/create_netfs_volume.py | 2 +- repos/storage/create_partition_volume.py | 2 +- repos/storage/define_dir_pool.py | 2 +- repos/storage/define_disk_pool.py | 2 +- repos/storage/define_iscsi_pool.py | 2 +- repos/storage/define_logical_pool.py | 2 +- repos/storage/define_mpath_pool.py | 2 +- repos/storage/define_netfs_pool.py | 2 +- repos/storage/define_scsi_pool.py | 2 +- repos/storage/delete_dir_volume.py | 2 +- repos/storage/delete_logical_pool.py | 2 +- repos/storage/delete_logical_volume.py | 2 +- repos/storage/delete_netfs_volume.py | 2 +- repos/storage/delete_partition_volume.py | 2 +- repos/storage/destroy_pool.py | 2 +- repos/storage/pool_name.py | 2 +- repos/storage/pool_uuid.py | 2 +- repos/storage/undefine_pool.py | 2 +- .../install-autotest-server | 0 activityfilter.py => src/activityfilter.py | 0 casecfgcheck.py => src/casecfgcheck.py | 2 +- env_clear.py => src/env_clear.py | 2 +- exception.py => src/exception.py | 2 +- generator.py => src/generator.py | 61 ++++---------------- log.css => src/log.css | 0 log.xsl => src/log.xsl | 2 +- logxmlparser.py => src/logxmlparser.py | 4 +- mapper.py => src/mapper.py | 0 parser.py => src/parser.py | 6 +- process.py => src/process.py | 0 proxy.py => src/proxy.py | 2 +- sharedmod.py => src/sharedmod.py | 0 utils/env_parser.py | 2 +- 115 files changed, 188 insertions(+), 205 deletions(-) delete mode 100644 BUGSKIP create mode 100644 SKIP rename env.cfg => conf/env.cfg (100%) rename kickstart.cfg => conf/kickstart.cfg (100%) rename libvirt-test-api.py => libvirt-test-api (91%) rename install-autotest-server => scripts/install-autotest-server (100%) create mode 100644 src/__init__.py rename activityfilter.py => src/activityfilter.py (100%) rename casecfgcheck.py => src/casecfgcheck.py (99%) rename env_clear.py => src/env_clear.py (99%) rename exception.py => src/exception.py (97%) rename generator.py => src/generator.py (78%) rename log.css => src/log.css (100%) rename log.xsl => src/log.xsl (98%) rename logxmlparser.py => src/logxmlparser.py (99%) rename mapper.py => src/mapper.py (100%) rename parser.py => src/parser.py (99%) rename process.py => src/process.py (100%) rename proxy.py => src/proxy.py (99%) rename sharedmod.py => src/sharedmod.py (100%) Regards, Osier -- 1.7.7.3

2 22

[libvirt] VN-Link vNIC memory state copying on VM Migration
by Jagath Weerasinghe 18 Apr '12

18 Apr '12

Hi All, I am new to libvirt. And want to know how the VM migration occurs in VN-Link (IEEE802.1Qbh). As far as I know, the memory state of vNICs in M81KR VIC has to be copied and moved to the destination vNIC on VM migration. Is that correct? If so, could you please tell me how this has been implemented in libvirt? Thanks Jagath

2 8

[libvirt] Incomplete stdout returned by qemu -help cause kvm disabled
by 杨镭 18 Apr '12

18 Apr '12

Hi: In our setup(libvirt 0.9.9 with Arch Linux with kernel 3.2+), when libvirt are accessed simultaneously, say 8 createDomain requests, there is a large chance that `qemu -help` return incomplete stdout which cause kvm to be disabled. Another user have the same situation like us[1] and he suspected this being the result of some race conditions. 1: https://www.redhat.com/archives/libvir-list/2012-April/msg00380.html -- lei yang

2 1

[libvirt] [PATCH] Remove the useless scripts directory and script under it
by Osier Yang 18 Apr '12

18 Apr '12

The script is useful only if all the scripts have good document comments. Unfortunately, it's not true, and it's burden for developers to write those documents in specific format somehow, on the other hand, because we introduced required_opts, optional_opts for each cases to generate the usage strings, and new option "-t" to print template for cases, it's no need to write documents in specific format for scripts now. --- scripts/gen_case_doc.sh | 21 --------------------- 1 files changed, 0 insertions(+), 21 deletions(-) delete mode 100644 scripts/gen_case_doc.sh diff --git a/scripts/gen_case_doc.sh b/scripts/gen_case_doc.sh deleted file mode 100644 index e814532..0000000 --- a/scripts/gen_case_doc.sh +++ /dev/null @@ -1,21 +0,0 @@ -#! /bin/sh -# Create documentation of cases in Python - -FILES=`find $PWD/repos/Python -type f -name "*.py"` - -for i in ${FILES}; do - if [ $(basename $i) != '__init__.py' ]; then - DIRNAME=$(dirname $i) - DIRNAME=$(echo $DIRNAME | sed -e 's:repos:doc:g') - fi - - if ! [ -e $DIRNAME ]; then - mkdir -p $DIRNAME - fi - - cd $DIRNAME - pydoc -w $i - cd - -done - -exit $? -- 1.7.7.3

2 5

[libvirt] [test-API] Delete the script to generate the testing coverage statistics
by Osier Yang 18 Apr '12

18 Apr '12

lib/*.py were destroyed. And there is no way to count the API coverage now. --- I tried to write a rough patch to generate the statistics, but failed. There is no way to detect if the API is covered by the cases, because the different class can have same methods name, though I can filter out the APIs for each libvirt object by: libvirt_module="/usr/lib64/python2.7/site-packages/libvirt.py" declare -a arr=($(grep -E "class vir[A-Za-z]+:" $libvirt_module | \ cut -d' ' -f2)) for i in $(seq 0 $((${#arr[@]} - 1))); do j=$(($i + 1)) echo "[ == ${arr[$i]} == ]" if [ $j -lt ${#arr[@]} ]; then sed -n -e "/${arr[$i]}/,/${arr[$j]}/{/${arr[$j]}/!p}" \ $libvirt_module | grep '^ def ' | grep -E -v "__del|__init" | \ sed -e "s/\s*def //g" -e "s/(.*)://g" fi done --- utils/stats.sh | 72 -------------------------------------------------------- 1 files changed, 0 insertions(+), 72 deletions(-) delete mode 100755 utils/stats.sh diff --git a/utils/stats.sh b/utils/stats.sh deleted file mode 100755 index cf2765b..0000000 --- a/utils/stats.sh +++ /dev/null @@ -1,72 +0,0 @@ -#! /bin/bash - -if [ ! -d $(pwd)/coverage ]; then - mkdir -p $(pwd)/coverage -fi - -VIRT_STATS_FILE="$(pwd)/coverage/libvirt_API_statistics.txt" -PYTHON="python$(python -V 2>&1|cut -c 8-10)" -SUMMARY="coverage/coverage.txt" - -if [ $(uname -p) = "x86_64" ]; then - export LIB="lib64" -else - export LIB="lib" -fi - -function delimiter() -{ - local i=1 - local separator=$1 - local line='' - while [ $i -le $2 ] - do - line=${line}${separator} - i=$((i+1)) - done - echo "+$line+" | tee -a $SUMMARY -} - -echo -echo "Generate Libvirt API Statistics Report under the " -echo "$(pwd)/coverage" -echo -delimiter '=' 50 -echo -e "| Libvirt API statistics of coverage\t |" | tee -a $SUMMARY -echo -e "| $(date +'%F %T') ($(whoami))\t\t |" | tee -a $SUMMARY -delimiter '=' 50 - -VIRT_PATH="/usr/$LIB/$PYTHON/site-packages/libvirt.py" -grep 'def ' $VIRT_PATH|grep -v "#"|grep -v "__init__" |grep -v "__del__"|cut -d"(" -f 1 |awk '{print NR, $2}' > $VIRT_STATS_FILE - -TOTAL_API_NUM=$(grep 'def ' $VIRT_PATH|grep -v "#"|grep -v "__init__" |grep -v "__del__"|wc -l) -WRAPPER_API_PATH="$(pwd)/lib/Python" -WRAPPER_API_NUM=0 - -for wrapper in connect domain network storage nodedev interface secret nwfilter -do - export EVERY_API_NUM=$(grep 'def ' $WRAPPER_API_PATH/$wrapper'API.py'|grep -v '#'|grep -v '__init__' |grep -v '__del__r'|wc -l) - API_NUM=${EVERY_API_NUM} - let WRAPPER_API_NUM=$WRAPPER_API_NUM+$API_NUM - echo -e "| cover $wrapper API number\t|\t$API_NUM\t |" | tee -a $SUMMARY - if [ $wrapper != "nwfilter" ]; then - delimiter '-' 50 - else - continue - fi -done - -delimiter '=' 50 -echo -e "| cover libvirt API total number|\t$WRAPPER_API_NUM\t |" | tee -a $SUMMARY -delimiter '-' 50 - -echo -e "| libvirt API real total number\t|\t$TOTAL_API_NUM\t |" | tee -a $SUMMARY -delimiter '=' 50 - -RATE=$(printf "%.0f%%" `echo "scale=2;$WRAPPER_API_NUM/$TOTAL_API_NUM*100"|bc`) -echo -e "| libvirt API coverage rate\t|\t$RATE\t |" | tee -a $SUMMARY -delimiter '=' 50 - -echo | tee -a $SUMMARY - - -- 1.7.7.3

2 2

[libvirt] [test-API 0/3] Destroy class for utils/check.py
by Osier Yang 18 Apr '12

18 Apr '12

Just as what we did for utils/utils.py, we don't benifit from the class use at all. Osier Yang (3): remove importing of unused check module Destroy class of utils/check.py Destroy use of check class repos/domain/balloon_memory.py | 3 +- repos/domain/dump.py | 4 +- repos/domain/install_linux_check.py | 15 +- repos/snapshot/file_flag.py | 7 +- repos/snapshot/flag_check.py | 3 +- utils/check.py | 649 +++++++++++++++++------------------ utils/xmlgenerator.py | 1 - 7 files changed, 335 insertions(+), 347 deletions(-) -- 1.7.7.3

2 6

[libvirt] [test-API] Improve the comments telling what the scripts does for utils/*.py
by Osier Yang 18 Apr '12

18 Apr '12

It's a habit to comment on the top of program to tell what the program does, and actually it's what GNU suggests: <quote> <one line to give the program's name and a brief idea of what it does.> Copyright (C) <year> <name of author> </quote> --- utils/XMLParser.py | 4 ++-- utils/check.py | 7 ++----- utils/env_parser.py | 6 ++---- utils/format.py | 6 ++---- utils/log.py | 6 ++---- utils/xmlbuilder.py | 6 ++---- utils/xmlgenerator.py | 6 ++---- 7 files changed, 14 insertions(+), 27 deletions(-) diff --git a/utils/XMLParser.py b/utils/XMLParser.py index b254023..4d7fc72 100644 --- a/utils/XMLParser.py +++ b/utils/XMLParser.py @@ -1,5 +1,7 @@ #!/usr/bin/env python # +# XMLParser.py: Parse XML document, the result is a python dict. + # Copyright (C) 2010-2012 Red Hat, Inc. # # libvirt-test-API is free software; you can redistribute it and/or @@ -17,8 +19,6 @@ # # Filename: XMLParser.py # Summary: parse and xml document into a python dictionary -# Description: The module is a tool to parses -# and xml document into a python dictionary import os from xml.dom import minidom diff --git a/utils/check.py b/utils/check.py index 1db49e7..7f35418 100644 --- a/utils/check.py +++ b/utils/check.py @@ -1,5 +1,7 @@ #!/usr/bin/env python # +# check.py: Check methods for cases. +# # Copyright (C) 2010-2012 Red Hat, Inc. # # libvirt-test-API is free software; you can redistribute it and/or @@ -14,11 +16,6 @@ # # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -# -# Filename: check.py -# Summary: basic check operation needed by test -# Description: The module is a tool to help conduct basic -# check operation on specified host import os import re diff --git a/utils/env_parser.py b/utils/env_parser.py index 6e49e50..e756a38 100644 --- a/utils/env_parser.py +++ b/utils/env_parser.py @@ -1,5 +1,7 @@ #!/usr/bin/env python # +# env_parser.py: Parser for environment config (env.cfg). +# # Copyright (C) 2010-2012 Red Hat, Inc. # # libvirt-test-API is free software; you can redistribute it and/or @@ -14,10 +16,6 @@ # # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -# -# Filename: env_parser.py -# Summary: parse the env configuration file -# Description: The module is a tool to parse the env configuration file import ConfigParser import os diff --git a/utils/format.py b/utils/format.py index b72c987..2a35664 100644 --- a/utils/format.py +++ b/utils/format.py @@ -1,5 +1,7 @@ #!/usr/bin/env python # +# format.py: Print logging message in specific format. +# # Copyright (C) 2010-2012 Red Hat, Inc. # # libvirt-test-API is free software; you can redistribute it and/or @@ -14,10 +16,6 @@ # # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -# -# Filename: format.py -# Summary: generate specified kind of format string -# Description: The module is a tool to generate specified kind of format string import os from string import Template diff --git a/utils/log.py b/utils/log.py index 3ca8729..4111fd9 100644 --- a/utils/log.py +++ b/utils/log.py @@ -1,5 +1,7 @@ #!/usr/bin/env python # +# log.py: Classes for logging. +# # Copyright (C) 2010-2012 Red Hat, Inc. # # libvirt-test-API is free software; you can redistribute it and/or @@ -14,10 +16,6 @@ # # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -# -# Filename: log.py -# Summary: log file operation -# Description: The module is a tool to provide basic log file operation import time import os diff --git a/utils/xmlbuilder.py b/utils/xmlbuilder.py index a8a9871..d2ce6bb 100644 --- a/utils/xmlbuilder.py +++ b/utils/xmlbuilder.py @@ -1,5 +1,7 @@ #!/usr/bin/env python # +# xmlbuilder.py: Class for building XML for libvirt objects. +# # Copyright (C) 2010-2012 Red Hat, Inc. # # libvirt-test-API is free software; you can redistribute it and/or @@ -14,10 +16,6 @@ # # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -# -# Filename: xmlbuilder.py -# Summary: operation for building domain xml -# Description: The module is to provide operation for building domain xml __DEBUG__ = False diff --git a/utils/xmlgenerator.py b/utils/xmlgenerator.py index 7f5839b..ee019b7 100644 --- a/utils/xmlgenerator.py +++ b/utils/xmlgenerator.py @@ -1,5 +1,7 @@ #!/usr/bin/env python # +# xmlgenerator.py: Generate XML for libvirt objects. +# # Copyright (C) 2010-2012 Red Hat, Inc. # # libvirt-test-API is free software; you can redistribute it and/or @@ -14,10 +16,6 @@ # # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -# -# Filename: xmlgenerator.py -# Summary: generate domain xml -# Description: The module is a tool to generate domain xml import os import sys -- 1.7.7.3

2 1

[libvirt] [PATCH 1/2] python: cleanup vcpu related binding APIs
by Guannan Ren 18 Apr '12

18 Apr '12

*libvirt_virDomainGetVcpus: add error handling, return -1 instead of None *libvirt_virDomainPinVcpu and libvirt_virDomainPinVcpuFlags: make use of libvirt_boolUnwrap set vcpus which are list in tuple pycpumap, trun off the rest in cpumap. The original way ignored the error info from PyTuple_GetItem if pos is out of bounds. "IndexError: tuple index out of range" The error message will only be raised on next command in interactive mode. --- python/libvirt-override.c | 173 +++++++++++++++++++++++++++++--------------- 1 files changed, 114 insertions(+), 59 deletions(-) diff --git a/python/libvirt-override.c b/python/libvirt-override.c index 56f96ba..2788546 100644 --- a/python/libvirt-override.c +++ b/python/libvirt-override.c @@ -1333,9 +1333,11 @@ cleanup: static PyObject * libvirt_virDomainGetVcpus(PyObject *self ATTRIBUTE_UNUSED, - PyObject *args) { + PyObject *args) +{ virDomainPtr domain; PyObject *pyobj_domain, *pyretval = NULL, *pycpuinfo = NULL, *pycpumap = NULL; + PyObject *error = NULL; virNodeInfo nodeinfo; virDomainInfo dominfo; virVcpuInfoPtr cpuinfo = NULL; @@ -1352,29 +1354,33 @@ libvirt_virDomainGetVcpus(PyObject *self ATTRIBUTE_UNUSED, i_retval = virNodeGetInfo(virDomainGetConnect(domain), &nodeinfo); LIBVIRT_END_ALLOW_THREADS; if (i_retval < 0) - return VIR_PY_NONE; + return VIR_PY_INT_FAIL; LIBVIRT_BEGIN_ALLOW_THREADS; i_retval = virDomainGetInfo(domain, &dominfo); LIBVIRT_END_ALLOW_THREADS; if (i_retval < 0) - return VIR_PY_NONE; + return VIR_PY_INT_FAIL; if (VIR_ALLOC_N(cpuinfo, dominfo.nrVirtCpu) < 0) - return VIR_PY_NONE; + return PyErr_NoMemory(); cpumaplen = VIR_CPU_MAPLEN(VIR_NODEINFO_MAXCPUS(nodeinfo)); if (xalloc_oversized(dominfo.nrVirtCpu, cpumaplen) || - VIR_ALLOC_N(cpumap, dominfo.nrVirtCpu * cpumaplen) < 0) + VIR_ALLOC_N(cpumap, dominfo.nrVirtCpu * cpumaplen) < 0) { + error = PyErr_NoMemory(); goto cleanup; + } LIBVIRT_BEGIN_ALLOW_THREADS; i_retval = virDomainGetVcpus(domain, cpuinfo, dominfo.nrVirtCpu, cpumap, cpumaplen); LIBVIRT_END_ALLOW_THREADS; - if (i_retval < 0) + if (i_retval < 0) { + error = VIR_PY_INT_FAIL; goto cleanup; + } /* convert to a Python tuple of long objects */ if ((pyretval = PyTuple_New(2)) == NULL) @@ -1388,54 +1394,80 @@ libvirt_virDomainGetVcpus(PyObject *self ATTRIBUTE_UNUSED, PyObject *info = PyTuple_New(4); if (info == NULL) goto cleanup; - PyTuple_SetItem(info, 0, PyInt_FromLong((long)cpuinfo[i].number)); - PyTuple_SetItem(info, 1, PyInt_FromLong((long)cpuinfo[i].state)); - PyTuple_SetItem(info, 2, PyLong_FromLongLong((long long)cpuinfo[i].cpuTime)); - PyTuple_SetItem(info, 3, PyInt_FromLong((long)cpuinfo[i].cpu)); - PyList_SetItem(pycpuinfo, i, info); + if (PyTuple_SetItem(info, 0, PyInt_FromLong((long)cpuinfo[i].number)) < 0) + { + Py_DECREF(info); + goto cleanup; + } + + if (PyTuple_SetItem(info, 1, PyInt_FromLong((long)cpuinfo[i].state)) < 0) + { + Py_DECREF(info); + goto cleanup; + } + + if (PyTuple_SetItem(info, 2, PyLong_FromLongLong((long long)cpuinfo[i].cpuTime)) < 0) + { + Py_DECREF(info); + goto cleanup; + } + + if (PyTuple_SetItem(info, 3, PyInt_FromLong((long)cpuinfo[i].cpu)) < 0) + { + Py_DECREF(info); + goto cleanup; + } + if (PyList_SetItem(pycpuinfo, i, info) < 0) + goto cleanup; } + for (i = 0 ; i < dominfo.nrVirtCpu ; i++) { PyObject *info = PyTuple_New(VIR_NODEINFO_MAXCPUS(nodeinfo)); - int j; if (info == NULL) goto cleanup; + + int j; for (j = 0 ; j < VIR_NODEINFO_MAXCPUS(nodeinfo) ; j++) { - PyTuple_SetItem(info, j, PyBool_FromLong(VIR_CPU_USABLE(cpumap, cpumaplen, i, j))); + if (PyTuple_SetItem(info, j, PyBool_FromLong(VIR_CPU_USABLE(cpumap, cpumaplen, i, j))) < 0) + { + Py_DECREF(info); + goto cleanup; + } } - PyList_SetItem(pycpumap, i, info); + if (PyList_SetItem(pycpumap, i, info) < 0) + goto cleanup; } - PyTuple_SetItem(pyretval, 0, pycpuinfo); - PyTuple_SetItem(pyretval, 1, pycpumap); + + if (PyTuple_SetItem(pyretval, 0, pycpuinfo) < 0) + goto cleanup; + + if (PyTuple_SetItem(pyretval, 1, pycpumap) < 0) + goto cleanup; VIR_FREE(cpuinfo); VIR_FREE(cpumap); return pyretval; - cleanup: +cleanup: VIR_FREE(cpuinfo); VIR_FREE(cpumap); - /* NB, Py_DECREF is a badly defined macro, so we require - * braces here to avoid 'ambiguous else' warnings from - * the compiler. - * NB. this comment is true at of time of writing wrt to - * at least python2.5. - */ - if (pyretval) { Py_DECREF(pyretval); } - if (pycpuinfo) { Py_DECREF(pycpuinfo); } - if (pycpumap) { Py_DECREF(pycpumap); } - return VIR_PY_NONE; + Py_XDECREF(pyretval); + Py_XDECREF(pycpuinfo); + Py_XDECREF(pycpumap); + return error; } - static PyObject * libvirt_virDomainPinVcpu(PyObject *self ATTRIBUTE_UNUSED, - PyObject *args) { + PyObject *args) +{ virDomainPtr domain; - PyObject *pyobj_domain, *pycpumap, *truth; + PyObject *pyobj_domain, *pycpumap; + PyObject *ret = NULL; virNodeInfo nodeinfo; unsigned char *cpumap; - int cpumaplen, i, vcpu; + int cpumaplen, i, j, vcpu, tuple_size; int i_retval; if (!PyArg_ParseTuple(args, (char *)"OiO:virDomainPinVcpu", @@ -1451,37 +1483,50 @@ libvirt_virDomainPinVcpu(PyObject *self ATTRIBUTE_UNUSED, cpumaplen = VIR_CPU_MAPLEN(VIR_NODEINFO_MAXCPUS(nodeinfo)); if (VIR_ALLOC_N(cpumap, cpumaplen) < 0) - return VIR_PY_INT_FAIL; + return PyErr_NoMemory(); - truth = PyBool_FromLong(1); - for (i = 0 ; i < VIR_NODEINFO_MAXCPUS(nodeinfo) ; i++) { + tuple_size = PyTuple_Size(pycpumap); + if (tuple_size == -1) + goto cleanup; + + for (i = 0; i < tuple_size; i++) { PyObject *flag = PyTuple_GetItem(pycpumap, i); - if (flag == truth) - VIR_USE_CPU(cpumap, i); - else - VIR_UNUSE_CPU(cpumap, i); + bool b; + + if ((!flag) || (libvirt_boolUnwrap(flag, &b) < 0)) + goto cleanup; + + (b) ? VIR_USE_CPU(cpumap, i) : VIR_UNUSE_CPU(cpumap, i); } + for (j = 0; j < VIR_NODEINFO_MAXCPUS(nodeinfo) - i; j++) + VIR_UNUSE_CPU(cpumap, i + j); + LIBVIRT_BEGIN_ALLOW_THREADS; i_retval = virDomainPinVcpu(domain, vcpu, cpumap, cpumaplen); LIBVIRT_END_ALLOW_THREADS; - Py_DECREF(truth); - VIR_FREE(cpumap); - if (i_retval < 0) - return VIR_PY_INT_FAIL; + if (i_retval < 0) { + ret = VIR_PY_INT_FAIL; + goto cleanup; + } + ret = VIR_PY_INT_SUCCESS; - return VIR_PY_INT_SUCCESS; +cleanup: + VIR_FREE(cpumap); + return ret; } static PyObject * libvirt_virDomainPinVcpuFlags(PyObject *self ATTRIBUTE_UNUSED, - PyObject *args) { + PyObject *args) +{ virDomainPtr domain; - PyObject *pyobj_domain, *pycpumap, *truth; + PyObject *pyobj_domain, *pycpumap; + PyObject *ret = NULL; virNodeInfo nodeinfo; unsigned char *cpumap; - int cpumaplen, i, vcpu; + int cpumaplen, i, j, vcpu, tuple_size; unsigned int flags; int i_retval; @@ -1498,27 +1543,37 @@ libvirt_virDomainPinVcpuFlags(PyObject *self ATTRIBUTE_UNUSED, cpumaplen = VIR_CPU_MAPLEN(VIR_NODEINFO_MAXCPUS(nodeinfo)); if (VIR_ALLOC_N(cpumap, cpumaplen) < 0) - return VIR_PY_INT_FAIL; + return PyErr_NoMemory(); + + tuple_size = PyTuple_Size(pycpumap); + if (tuple_size == -1) + goto cleanup; - truth = PyBool_FromLong(1); - for (i = 0 ; i < VIR_NODEINFO_MAXCPUS(nodeinfo) ; i++) { + for (i = 0; i < tuple_size; i++) { PyObject *flag = PyTuple_GetItem(pycpumap, i); - if (flag == truth) - VIR_USE_CPU(cpumap, i); - else - VIR_UNUSE_CPU(cpumap, i); + bool b; + + if ((!flag) || (libvirt_boolUnwrap(flag, &b) < 0)) + goto cleanup; + + (b) ? VIR_USE_CPU(cpumap, i) : VIR_UNUSE_CPU(cpumap, i); } + for (j = 0; j < VIR_NODEINFO_MAXCPUS(nodeinfo) - i; j++) + VIR_UNUSE_CPU(cpumap, i + j); + LIBVIRT_BEGIN_ALLOW_THREADS; i_retval = virDomainPinVcpuFlags(domain, vcpu, cpumap, cpumaplen, flags); LIBVIRT_END_ALLOW_THREADS; - Py_DECREF(truth); - VIR_FREE(cpumap); - - if (i_retval < 0) - return VIR_PY_INT_FAIL; + if (i_retval < 0) { + ret = VIR_PY_INT_FAIL; + goto cleanup; + } + ret = VIR_PY_INT_SUCCESS; - return VIR_PY_INT_SUCCESS; +cleanup: + VIR_FREE(cpumap); + return ret; } static PyObject * -- 1.7.7.5

2 5

[libvirt] [test-API 0/3] Improve the copyright statements in scripts
by Osier Yang 18 Apr '12

18 Apr '12

The new copyright statements is: Copyright (C) 2010-2012 Red Hat, Inc. libvirt-test-API is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 2 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranties of TITLE, NON-INFRINGEMENT, MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. Osier Yang (3): Remove the unseemly copyright statements in scripts Add the better copyright statements in scripts Remove the redundant empty comment line activityfilter.py | 23 ++++++++++++----------- casecfgcheck.py | 22 ++++++++++++---------- dist/redhat/env_inspect.py | 24 +++++++++++++----------- env_clear.py | 24 +++++++++++++----------- exception.py | 23 +++++++++++++---------- generator.py | 24 +++++++++++++----------- libvirt-test-api.py | 22 ++++++++++++---------- logxmlparser.py | 23 +++++++++++++---------- mapper.py | 24 +++++++++++++----------- parser.py | 24 +++++++++++++----------- process.py | 23 +++++++++++++---------- proxy.py | 25 ++++++++++++++----------- utils/XMLParser.py | 23 +++++++++++++---------- utils/check.py | 23 +++++++++++++---------- utils/env_parser.py | 23 +++++++++++++---------- utils/format.py | 23 +++++++++++++---------- utils/log.py | 23 +++++++++++++---------- utils/utils.py | 22 ++++++++++++---------- utils/xmlbuilder.py | 23 +++++++++++++---------- utils/xmlgenerator.py | 23 +++++++++++++---------- 20 files changed, 257 insertions(+), 207 deletions(-) Regards, Osier -- 1.7.7.3

3 19