- Devel - libvirt List Archives

[libvirt] RFC: Changing version number at start of dev cycle instead of end
by Daniel P. Berrange 12 Dec '13

12 Dec '13

Currently throughout the dev cycle we stick on the current release number. The release number in configure.ac is only changed by DV when he is actually cutting the release. With the python bindings now being split out, this is causing us problems. The python code aims to build against any libvirt version that exists, so for example, the new network events APIs in libvirt will be included with version 1.2.1. So the python binding does #if LIBVIR_CHECK_VERSION(1, 2, 1) static void libvirt_virConnectNetworkEventFreeFunc(void *opaque) { PyObject *pyobj_conn = (PyObject*)opaque; LIBVIRT_ENSURE_THREAD_STATE; Py_DECREF(pyobj_conn); LIBVIRT_RELEASE_THREAD_STATE; } ... This works fine if a python release is built against a libvirt release. It does not work if a python git snapshot is built against a libvirt git snapshot. This is bad because it prevents us doing automated builds of GIT. The solution here is fairly simple. We should increase the version number in configure.ac at the *start* of each release cycle. This means that libvirt-python can use the next version number and things will 'just work'. I don't think this is a burden really - we already encode the next version number in our source code when tagging new APIs or driver methods. We're really just bringing autoconf's view of the version number inline with the rest of the code. So if no one objects, we should immediately change configure.ac to be 1.2.1 Regards, Daniel -- |: http://berrange.com -o- http://www.flickr.com/photos/dberrange/ :| |: http://libvirt.org -o- http://virt-manager.org :| |: http://autobuild.org -o- http://search.cpan.org/~danberr/ :| |: http://entangle-photo.org -o- http://live.gnome.org/gtk-vnc :|

4 3

[libvirt] [test-API][PATCH] Add new cases for testing setSchedulerParametersFlags related API
by Xuesong Zhang 12 Dec '13

12 Dec '13

--- cases/sched_params.conf | 120 +++++++++++++++++++++++++++++++ repos/domain/sched_params.py | 136 ++++++++++++++++------------------- repos/domain/sched_params_flag.py | 148 ++++++++++++++++++++++++++++++++++++++ 3 files changed, 330 insertions(+), 74 deletions(-) create mode 100755 cases/sched_params.conf create mode 100644 repos/domain/sched_params_flag.py diff --git a/cases/sched_params.conf b/cases/sched_params.conf new file mode 100755 index 0000000..6f7acce --- /dev/null +++ b/cases/sched_params.conf @@ -0,0 +1,120 @@ +domain:install_linux_cdrom + guestname + $defaultname + guestos + $defaultos + guestarch + $defaultarch + vcpu + $defaultvcpu + memory + $defaultmem + hddriver + $defaulthd + nicdriver + $defaultnic + imageformat + qcow2 + +domain:sched_params + guestname + $defaultname + vcpuquota + 1000 + vcpuperiod + 200000 + emulatorperiod + 300000 + emulatorquota + 4000 + cpushares + 5000 + +domain:sched_params_flag + guestname + $defaultname + vcpuquota + 1001 + vcpuperiod + 200001 + emulatorperiod + 300001 + emulatorquota + 4001 + cpushares + 5001 + flag + current + +domain:sched_params_flag + guestname + $defaultname + vcpuquota + 1002 + vcpuperiod + 200002 + emulatorperiod + 300002 + emulatorquota + 4002 + cpushares + 5002 + flag + live + +domain:sched_params_flag + guestname + $defaultname + vcpuquota + 1003 + vcpuperiod + 200003 + emulatorperiod + 300003 + emulatorquota + 4003 + cpushares + 5003 + flag + config + +domain:destroy + guestname + $defaultname + +domain:sched_params_flag + guestname + $defaultname + vcpuquota + 1004 + vcpuperiod + 200004 + emulatorperiod + 300004 + emulatorquota + 4004 + cpushares + 5004 + flag + current + +domain:sched_params_flag + guestname + $defaultname + vcpuquota + 1005 + vcpuperiod + 200005 + emulatorperiod + 300005 + emulatorquota + 4005 + cpushares + 5005 + flag + config + +domain:undefine + guestname + $defaultname + diff --git a/repos/domain/sched_params.py b/repos/domain/sched_params.py index 786e357..1be5986 100644 --- a/repos/domain/sched_params.py +++ b/repos/domain/sched_params.py @@ -1,95 +1,83 @@ #!/usr/bin/evn python -# To test domain scheduler parameters - -import os -import sys -import time -import commands +# Set and show scheduler parameters import libvirt +from libvirt import libvirtError from src import sharedmod from utils import utils -required_params = ('guestname', 'capshares',) +import os + +required_params = ('guestname', 'vcpuquota', 'vcpuperiod', 'emulatorperiod', \ + 'emulatorquota', 'cpushares',) optional_params = {} -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: - domobj.create() - time.sleep(30) - # Add check function - return True +def check_sched_params(guestname, sched_params_after): + """Check scheduler parameters validity after setting + """ + + if os.path.exists("/cgroup"): + """ Add the judgment method, since the cgroup path is different on + rhel6 and rhel7. + if the folder cgroup is existed, it means the host os is rhel6, + if not existed, it means the the host of is rhel7 + """ + + cgroup_path = "cat /cgroup/cpu/libvirt/qemu/%s/" % guestname else: - return True - -def check_sched_params(*args): - """Check scheduler parameters validity after setting""" - hypervisor, dicts, guestname, domobj = args - sched_dict = {} - if hypervisor == "xen": - sched_dict = eval(commands.getoutput('xm sched-credit -d %s' - % guestname)) - if sched_dict['weight'] == dicts['weight'] and \ - sched_dict['cap'] == dicts['cap']: - return 0 - else: + cgroup_path = "cat /sys/fs/cgroup/cpu\,cpuacct/machine.slice/" \ + "machine-qemu\\\\x2d%s.scope/" % guestname + + sched_dicts = {'vcpu_quota': 'vcpu0/cpu.cfs_quota_us', \ + 'vcpu_period': 'vcpu0/cpu.cfs_period_us', \ + 'emulator_period': 'emulator/cpu.cfs_period_us', \ + 'emulator_quota': 'emulator/cpu.cfs_quota_us', \ + 'cpu_shares': 'cpu.shares'} + + for sched_key in sched_dicts: + cmd = cgroup_path + sched_dicts[sched_key] + status, cmd_value = utils.exec_cmd(cmd, shell=True) + if status: + logger.error("failed to get ***%s*** value" % sched_key) return 1 - if hypervisor == "kvm": - sched_dict = domobj.schedulerParameters() - if sched_dict['cpu_shares'] == dicts['cpu_shares']: - return 0 - else: + sched_dicts[sched_key] = int(cmd_value[0]) + if sched_dicts[sched_key] != sched_params_after[sched_key]: + logger.error("set scheduler parameters failed") return 1 + logger.info("set scheduler parameters success") + return 0 + def sched_params(params): - """Setting scheduler parameters, argument params is a - dictionary data type.which includes 'weight' and 'cap' - keys, by assigning different value to 'weight' and 'cap' - to verify validity of the result + """ Change and get the scheduler parameters """ - hypervisor = utils.get_hypervisor() + global logger logger = params['logger'] guestname = params['guestname'] - conn = sharedmod.libvirtobj['conn'] - - domobj = conn.lookupByName(guestname) - - if check_guest_status(domobj): - sched_params = domobj.schedulerParameters() - logger.info("original scheduler parameters: %s\n" % sched_params) - - if 'xen' in hypervisor: - str_weight = params['weight'] - str_cap = params['cap'] - for wgt in eval(str_weight): - for cap in eval(str_cap): - dicts = {'weight': wgt, 'cap': cap} - logger.info("setting scheduler parameters: %s" % dicts) - domobj.setSchedulerParameters(dicts) - sched_params = domobj.schedulerParameters() - logger.info("current scheduler parameters: %s\n" % sched_params) - - retval = check_sched_params(hypervisor, dicts, - guestname, domobj) - if retval != 0: - return 1 - elif 'kvm' in hypervisor: - cpu_shares = int(params['cpushares']) - dicts = {'cpu_shares': cpu_shares} + dicts = {'vcpu_quota': int(params['vcpuquota']), \ + 'vcpu_period': int(params['vcpuperiod']), \ + 'emulator_period': int(params['emulatorperiod']), \ + 'emulator_quota': int(params['emulatorquota']), \ + 'cpu_shares': int(params['cpushares'])} + + try: + conn = sharedmod.libvirtobj['conn'] + domobj = conn.lookupByName(guestname) + + sched_type = str(domobj.schedulerType()[0]) + logger.info("the scheduler type is: %s" % sched_type) + sched_params_original = domobj.schedulerParameters() + logger.info("original scheduler parameters: %s" % sched_params_original) logger.info("setting scheduler parameters: %s" % dicts) domobj.setSchedulerParameters(dicts) - sched_params = domobj.schedulerParameters() - logger.info("current scheduler parameters: %s\n" % sched_params) - retval = check_sched_params(hypervisor, dicts, - guestname, domobj) - if retval != 0: - return 1 - else: - logger.error("unsupported hypervisor type: %s" % hypervisor) - return 1 + sched_params_after = domobj.schedulerParameters() + logger.info("current scheduler parameters: %s" % sched_params_after) - return 0 + ret = check_sched_params(guestname, sched_params_after) + + return ret + except libvirtError, e: + logger.error("libvirt call failed: " + str(e)) + return 1 diff --git a/repos/domain/sched_params_flag.py b/repos/domain/sched_params_flag.py new file mode 100644 index 0000000..19bcb13 --- /dev/null +++ b/repos/domain/sched_params_flag.py @@ -0,0 +1,148 @@ +#!/usr/bin/evn python +# Set and show scheduler parameters with flag, such as "--current", "--live" +# and "--config" + +import libvirt +from libvirt import libvirtError + +from src import sharedmod +from utils import utils +from xml.dom import minidom +import os + +required_params = ('guestname', 'vcpuquota', 'vcpuperiod', 'emulatorperiod', \ + 'emulatorquota', 'cpushares', 'flag',) +optional_params = {} + +def check_sched_params_flag(guestname, domobj, sched_params_after, domstate, \ + flags_value): + """Check scheduler parameters validity after setting + """ + + if (domstate == 1) and ((flags_value == 0) or (flags_value == 1)): + """While the domain is running and the flag is "--live" or "--current", + the value can be checked with the cgroup value + As for the other condition, the value can be checked with the domain + config xml + """ + + if os.path.exists("/cgroup"): + """ Add the judgment method, since the cgroup path is different on + rhel6 and rhel7. + if the folder cgroup is existed, it means the host os is rhel6, + if not existed, it means the the host of is rhel7 + """ + + cgroup_path = "cat /cgroup/cpu/libvirt/qemu/%s/" % guestname + else: + cgroup_path = "cat /sys/fs/cgroup/cpu\,cpuacct/machine.slice/" \ + "machine-qemu\\\\x2d%s.scope/" % guestname + + sched_dicts = {'vcpu_quota': 'vcpu0/cpu.cfs_quota_us', \ + 'vcpu_period': 'vcpu0/cpu.cfs_period_us', \ + 'emulator_period': 'emulator/cpu.cfs_period_us', \ + 'emulator_quota': 'emulator/cpu.cfs_quota_us', \ + 'cpu_shares': 'cpu.shares'} + + for sched_key in sched_dicts: + cmd = cgroup_path + sched_dicts[sched_key] + status, cmd_value = utils.exec_cmd(cmd, shell=True) + if status: + logger.error("failed to get ***%s*** value" % sched_key) + return 1 + sched_dicts[sched_key] = int(cmd_value[0]) + if sched_dicts[sched_key] != sched_params_after[sched_key]: + logger.error("set scheduler parameters failed") + return 1 + + else: + guestxml = domobj.XMLDesc(libvirt.VIR_DOMAIN_XML_INACTIVE) + logger.debug("domain %s config xml :\n%s" % (domobj.name(), guestxml)) + + xmlrootnode = minidom.parseString(guestxml) + + sched_dicts = {'vcpu_quota': 'quota', 'vcpu_period': 'period', \ + 'emulator_period': 'emulator_period', \ + 'emulator_quota': 'emulator_quota', \ + 'cpu_shares': 'shares'} + + for sched_key in sched_dicts: + node = xmlrootnode.getElementsByTagName(sched_dicts[sched_key])[0] + sched_dicts[sched_key] = int(node.childNodes[0].data) + if sched_dicts[sched_key] != sched_params_after[sched_key]: + logger.error("set scheduler parameters failed") + return 1 + + logger.info("set scheduler parameters success") + return 0 + +def sched_params_flag(params): + """ Change and get the scheduler parameters + """ + + global logger + logger = params['logger'] + guestname = params['guestname'] + dicts = {'vcpu_quota': int(params['vcpuquota']), \ + 'vcpu_period': int(params['vcpuperiod']), \ + 'emulator_period': int(params['emulatorperiod']), \ + 'emulator_quota': int(params['emulatorquota']), \ + 'cpu_shares': int(params['cpushares'])} + flags = params['flag'] + + try: + conn = sharedmod.libvirtobj['conn'] + domobj = conn.lookupByName(guestname) + + domstate = domobj.state(0)[0] + """following is the domain state: + '1' is running status + '5' is shutoff status + please see the following reference link: + http://libvirt.org/html/libvirt-libvirt.html#virDomainState + """ + if domstate == 1: + logger.info("the state of virtual machine is ***running***") + elif domstate == 5: + logger.info("the state of virtual machine is ***shutoff***") + else: + logger.error("the state of virtual machine is not running or " \ + "shutoff now, it is out of the check range of this " \ + "script. Please check the domain status.") + return 1 + + """virDomainModificationImpact + VIR_DOMAIN_AFFECT_CURRENT = 0 + VIR_DOMAIN_AFFECT_LIVE = 1 + VIR_DOMAIN_AFFECT_CONFIG = 2 + """ + + if flags == "current": + flags_value = libvirt.VIR_DOMAIN_AFFECT_CURRENT + elif flags == "live": + flags_value = libvirt.VIR_DOMAIN_AFFECT_LIVE + elif flags == "config": + flags_value = libvirt.VIR_DOMAIN_AFFECT_CONFIG + else: + logger.error("the value of flags is not correct, please check " \ + "the conf file") + return 1 + + sched_type = str(domobj.schedulerType()[0]) + logger.info("the scheduler type is: %s" % sched_type) + sched_params_original = domobj.schedulerParametersFlags(flags_value) + logger.info("original scheduler parameters with flag ***%s***: %s" % \ + (flags, sched_params_original)) + logger.info("setting scheduler parameters: %s" % dicts) + domobj.setSchedulerParametersFlags(dicts, flags_value) + sched_params_after = domobj.schedulerParametersFlags(flags_value) + logger.info("current scheduler parameters with flag ***%s***: %s" % \ + (flags, sched_params_after)) + + ret = check_sched_params_flag(guestname, domobj, sched_params_after, \ + domstate, flags_value) + + return ret + except libvirtError, e: + logger.error("libvirt call failed: " + str(e)) + return 1 -- 1.8.3.1

2 1

[libvirt] [test-API][PATCH] Add new case for listAllVolumes and update releated conf
by codong 12 Dec '13

12 Dec '13

listAllVolumes is a new API in RHEL7, so add a new case for it. And add the case to releated conf to check the volumes list. modified: cases/storage_dir.conf modified: cases/storage_dir_vol_resize_delta.conf modified: cases/storage_logical.conf modified: cases/storage_netfs.conf new file: repos/storage/list_volumes.py --- cases/storage_dir.conf | 16 +++++ cases/storage_dir_vol_resize_delta.conf | 8 +++ cases/storage_logical.conf | 16 +++++ cases/storage_netfs.conf | 16 +++++ repos/storage/list_volumes.py | 97 +++++++++++++++++++++++++++++++ 5 files changed, 153 insertions(+), 0 deletions(-) create mode 100644 repos/storage/list_volumes.py diff --git a/cases/storage_dir.conf b/cases/storage_dir.conf index 38b349d..393d34f 100644 --- a/cases/storage_dir.conf +++ b/cases/storage_dir.conf @@ -20,6 +20,10 @@ storage:create_dir_volume capacity $defaultvolumesize +storage:list_volumes + poolname + $defaultpoolname + storage:vol_clone poolname $defaultpoolname @@ -28,18 +32,30 @@ storage:vol_clone clonevolname $defaultvolclonename +storage:list_volumes + poolname + $defaultpoolname + storage:delete_dir_volume poolname $defaultpoolname volname $defaultvolclonename +storage:list_volumes + poolname + $defaultpoolname + storage:delete_dir_volume poolname $defaultpoolname volname $defaultvolumename +storage:list_volumes + poolname + $defaultpoolname + storage:destroy_pool poolname $defaultpoolname diff --git a/cases/storage_dir_vol_resize_delta.conf b/cases/storage_dir_vol_resize_delta.conf index 58e15bf..22d3b47 100644 --- a/cases/storage_dir_vol_resize_delta.conf +++ b/cases/storage_dir_vol_resize_delta.conf @@ -12,6 +12,10 @@ storage:create_dir_volume capacity $defaultvolumesize +storage:list_volumes + poolname + $defaultpoolname + storage:vol_resize_delta poolname $defaultpoolname @@ -42,6 +46,10 @@ storage:delete_dir_volume volname $defaultvolumename +storage:list_volumes + poolname + $defaultpoolname + storage:destroy_pool poolname $defaultpoolname diff --git a/cases/storage_logical.conf b/cases/storage_logical.conf index d374dfa..a0fdad6 100644 --- a/cases/storage_logical.conf +++ b/cases/storage_logical.conf @@ -22,6 +22,10 @@ storage:create_logical_volume capacity $defaultvolumesize +storage:list_volumes + poolname + $defaultpoolname + storage:vol_clone poolname $defaultpoolname @@ -30,18 +34,30 @@ storage:vol_clone clonevolname $defaultvolclonename +storage:list_volumes + poolname + $defaultpoolname + storage:delete_logical_volume poolname $defaultpoolname volname $defaultvolclonename +storage:list_volumes + poolname + $defaultpoolname + storage:delete_logical_volume poolname $defaultpoolname volname $defaultvolumename +storage:list_volumes + poolname + $defaultpoolname + storage:destroy_pool poolname $defaultpoolname diff --git a/cases/storage_netfs.conf b/cases/storage_netfs.conf index f486ff4..6880763 100644 --- a/cases/storage_netfs.conf +++ b/cases/storage_netfs.conf @@ -24,6 +24,10 @@ storage:create_netfs_volume capacity $defaultvolumesize +storage:list_volumes + poolname + $defaultpoolname + storage:vol_clone poolname $defaultpoolname @@ -32,18 +36,30 @@ storage:vol_clone clonevolname $defaultvolclonename +storage:list_volumes + poolname + $defaultpoolname + storage:delete_netfs_volume poolname $defaultpoolname volname $defaultvolclonename +storage:list_volumes + poolname + $defaultpoolname + storage:delete_netfs_volume poolname $defaultpoolname volname $defaultvolumename +storage:list_volumes + poolname + $defaultpoolname + storage:destroy_pool poolname $defaultpoolname diff --git a/repos/storage/list_volumes.py b/repos/storage/list_volumes.py new file mode 100644 index 0000000..9555720 --- /dev/null +++ b/repos/storage/list_volumes.py @@ -0,0 +1,97 @@ +#!/usr/bin/evn python + +import libvirt +from libvirt import libvirtError +from xml.dom import minidom + +from utils import utils + +from src import sharedmod + +required_params = ('poolname',) +optional_params = {} + + +def get_pool_path(pool_obj): + """ + Get the pool path + """ + poolxml = pool_obj.XMLDesc(0) + logger.debug("the xml description of pool is %s" % poolxml) + + doc = minidom.parseString(poolxml) + path_element = doc.getElementsByTagName('path')[0] + textnode = path_element.childNodes[0] + path_value = textnode.data + + return path_value + + +def check_list_volumes(pool_obj, vol_name_list): + """ + Check the result of listAllVolumes + """ + + vol_poolobj_list = pool_obj.listVolumes() + logger.debug("get volumes from listVolumes is %s" % vol_poolobj_list) + + poolpath = get_pool_path(pool_obj) + logger.info("the pool path is %s" % poolpath) + vol_ls_cmd = "ls -a " + poolpath + + (status, vol_cmd_list) = utils.exec_cmd(vol_ls_cmd, shell=True) + if status: + logger.error("Executing " + vol_ls_cmd + " failed") + logger.error(vol_ls_cmd) + return False + else: + logger.debug("get volumes from poolpath is %s" % vol_cmd_list) + logger.info("compare the volume list under poolpath and list from API") + vol_cmd_list = vol_cmd_list[2:] + vol_name_list.sort() + vol_poolobj_list.sort() + vol_cmd_list.sort() + if (cmp(vol_poolobj_list, vol_name_list) == 0) and \ + (cmp(vol_name_list, vol_cmd_list) == 0): + + return True + else: + return False + + +def list_volumes(params): + """List all the volumes of a storage pool + """ + global logger + logger = params['logger'] + poolname = params['poolname'] + vol_name_list = [] + + logger.info("the poolname is %s" % (poolname)) + conn = sharedmod.libvirtobj['conn'] + storage_pool_list = conn.listStoragePools() + + if poolname not in storage_pool_list: + logger.error("pool %s doesn't exist or not running" % poolname) + return 1 + + pool_obj = conn.storagePoolLookupByName(poolname) + + try: + vol_obj_list = pool_obj.listAllVolumes() + for vol_obj in vol_obj_list: + vol_name_list.append(vol_obj.name()) + logger.info("the volume list is %s" % vol_name_list) + + if check_list_volumes(pool_obj, vol_name_list): + logger.info("get the right volumes list successfully") + else: + logger.error("fail to get the right volumes list") + return 1 + + except libvirtError as e: + logger.error("API error message: %s, error code is %s" + % (e.message, e.get_error_code())) + return 1 + + return 0 -- 1.7.1

3 2

[libvirt] [PATCH] storage: show compile options in virsh --version=long
by Eric Blake 12 Dec '13

12 Dec '13

Adding output to 'virsh --version=long' makes it easier to tell if a distro built with particular libraries (it doesn't tell you what a remote libvirtd is built with, but is still better than nothing). * tools/virsh.c (vshShowVersion): Add gluster witness. Signed-off-by: Eric Blake <eblake(a)redhat.com> --- tools/virsh.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tools/virsh.c b/tools/virsh.c index 5559d71..9d07d3e 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -3069,6 +3069,9 @@ vshShowVersion(vshControl *ctl ATTRIBUTE_UNUSED) #ifdef WITH_STORAGE_SHEEPDOG vshPrint(ctl, " Sheepdog"); #endif +#ifdef WITH_STORAGE_GLUSTER + vshPrint(ctl, " Gluster"); +#endif vshPrint(ctl, "\n"); vshPrint(ctl, "%s", _(" Miscellaneous:")); -- 1.8.4.2

2 2

[libvirt] Glusterfs Libvirt issue
by Umar Draz 11 Dec '13

11 Dec '13

Hi, I am trying to create glusterfs pool with libvirt but its working, and following is the error *libvirt_storagepool_define_xml(): internal error unknown storage pool type gluster* the Qemu has enabled glusterfs backend support. I can create the glusterfs image using this *qemu-img create gluster://localhost/test/umar 5G* Would you please help what should else i need to require? Br. Umar

2 4

[libvirt] [PATCH python 00/14] Finished port to Python3
by Daniel P. Berrange 11 Dec '13

11 Dec '13

From: "Daniel P. Berrange" <berrange(a)redhat.com> This series finishes the initial port to Python3. The code generator works, the C code compiles without warnings, and the sanitytest passes. The APIs using strings have all switched to PyUnicode except for thos which deal with binary data which now use PyBytes in Python 3 builds. Daniel P. Berrange (14): examples: Invoke print("...") instead of print "..." examples: Ensure we write bytes to the self-pipe override: Fix native module registration to work with Python3 sanitytest: Fix libvirtError class handling for Python 2.4 override: Replace PyString_FromString with libvirt_constcharPtrWrap override: Replace PyString_AsString with libvirt_charPtrUnwrap override: Replace Py{Int,Long}_FromLong with helpers override: Replace PyInt_AsLong with helper typewrappers: Replace use of PyString class typewrappers: PyInt/PyLong merge for Python3 override: Conditionalize use of PyString_Check and PyInt_Check override: Switch virStreamSend wrapper to use libvirt_charPtrSizeUnwrap sanitytest: Fix broken comparison between int and string sanitytest: remove use of string.lower() examples/consolecallback.py | 6 +- examples/dominfo.py | 14 +- examples/domrestore.py | 17 +-- examples/domsave.py | 15 +- examples/domstart.py | 19 ++- examples/esxlist.py | 14 +- examples/event-test.py | 70 ++++----- examples/topology.py | 14 +- libvirt-lxc-override.c | 75 +++++++--- libvirt-override.c | 348 ++++++++++++++++++++++++++------------------ libvirt-qemu-override.c | 77 +++++++--- sanitytest.py | 10 +- typewrappers.c | 97 +++++++++++- typewrappers.h | 3 + 14 files changed, 500 insertions(+), 279 deletions(-) -- 1.8.3.1

2 30

[libvirt] [python PATCH v2] Added python binding for the new network events API
by Cédric Bosdonnat 11 Dec '13

11 Dec '13

--- Changes to previous patch: * Fixed Eric's comments * Updated code to latest libvirt patches submitted generator.py | 2 + libvirt-override-virConnect.py | 34 +++++++++ libvirt-override.c | 152 +++++++++++++++++++++++++++++++++++++++++ 3 files changed, 188 insertions(+) diff --git a/generator.py b/generator.py index 84c7678..42f3913 100755 --- a/generator.py +++ b/generator.py @@ -491,6 +491,8 @@ skip_function = ( 'virConnectDomainEventDeregister', # overridden in virConnect.py 'virConnectDomainEventRegisterAny', # overridden in virConnect.py 'virConnectDomainEventDeregisterAny', # overridden in virConnect.py + 'virConnectNetworkEventRegisterAny', # overridden in virConnect.py + 'virConnectNetworkEventDeregisterAny', # overridden in virConnect.py 'virSaveLastError', # We have our own python error wrapper 'virFreeError', # Only needed if we use virSaveLastError 'virConnectListAllDomains', # overridden in virConnect.py diff --git a/libvirt-override-virConnect.py b/libvirt-override-virConnect.py index 0beaf9c..c228eb2 100644 --- a/libvirt-override-virConnect.py +++ b/libvirt-override-virConnect.py @@ -198,6 +198,40 @@ except AttributeError: pass + def _dispatchNetworkEventLifecycleCallback(self, net, event, detail, cbData): + """Dispatches events to python user network lifecycle event callbacks + """ + cb = cbData["cb"] + opaque = cbData["opaque"] + + cb(self, virNetwork(self, _obj=net), event, detail, opaque) + return 0 + + def networkEventDeregisterAny(self, callbackID): + """Removes a Network Event Callback. De-registering for a + network callback will disable delivery of this event type""" + try: + ret = libvirtmod.virConnectNetworkEventDeregisterAny(self._o, callbackID) + if ret == -1: raise libvirtError ('virConnectNetworkEventDeregisterAny() failed', conn=self) + del self.networkEventCallbackID[callbackID] + except AttributeError: + pass + + def networkEventRegisterAny(self, net, eventID, cb, opaque): + """Adds a Network Event Callback. Registering for a network + callback will enable delivery of the events""" + if not hasattr(self, 'networkEventCallbackID'): + self.networkEventCallbackID = {} + cbData = { "cb": cb, "conn": self, "opaque": opaque } + if net is None: + ret = libvirtmod.virConnectNetworkEventRegisterAny(self._o, None, eventID, cbData) + else: + ret = libvirtmod.virConnectNetworkEventRegisterAny(self._o, net._o, eventID, cbData) + if ret == -1: + raise libvirtError ('virConnectNetworkEventRegisterAny() failed', conn=self) + self.networkEventCallbackID[ret] = opaque + return ret + def domainEventRegisterAny(self, dom, eventID, cb, opaque): """Adds a Domain Event Callback. Registering for a domain callback will enable delivery of the events """ diff --git a/libvirt-override.c b/libvirt-override.c index 5deb414..fbcd1c8 100644 --- a/libvirt-override.c +++ b/libvirt-override.c @@ -6515,6 +6515,154 @@ libvirt_virConnectDomainEventDeregisterAny(ATTRIBUTE_UNUSED PyObject * self, return py_retval; } +#if LIBVIR_CHECK_VERSION(1, 2, 1) +static void +libvirt_virConnectNetworkEventFreeFunc(void *opaque) +{ + PyObject *pyobj_conn = (PyObject*)opaque; + LIBVIRT_ENSURE_THREAD_STATE; + Py_DECREF(pyobj_conn); + LIBVIRT_RELEASE_THREAD_STATE; +} + +static int +libvirt_virConnectNetworkEventLifecycleCallback(virConnectPtr conn ATTRIBUTE_UNUSED, + virNetworkPtr net, + int event, + int detail, + void *opaque) +{ + PyObject *pyobj_cbData = (PyObject*)opaque; + PyObject *pyobj_net; + PyObject *pyobj_ret; + PyObject *pyobj_conn; + PyObject *dictKey; + int ret = -1; + + LIBVIRT_ENSURE_THREAD_STATE; + + dictKey = libvirt_constcharPtrWrap("conn"); + if (!dictKey) + return ret; + pyobj_conn = PyDict_GetItem(pyobj_cbData, dictKey); + Py_DECREF(dictKey); + + /* Create a python instance of this virNetworkPtr */ + virNetworkRef(net); + pyobj_net = libvirt_virNetworkPtrWrap(net); + Py_INCREF(pyobj_cbData); + + /* Call the Callback Dispatcher */ + pyobj_ret = PyObject_CallMethod(pyobj_conn, + (char*)"_dispatchNetworkEventLifecycleCallback", + (char*)"OiiO", + pyobj_net, + event, + detail, + pyobj_cbData); + + Py_DECREF(pyobj_cbData); + Py_DECREF(pyobj_net); + + if (!pyobj_ret) { + DEBUG("%s - ret:%p\n", __FUNCTION__, pyobj_ret); + PyErr_Print(); + } else { + Py_DECREF(pyobj_ret); + ret = 0; + } + + LIBVIRT_RELEASE_THREAD_STATE; + return ret; +} + +static PyObject +*libvirt_virConnectNetworkEventRegisterAny(PyObject *self ATTRIBUTE_UNUSED, + PyObject *args) +{ + PyObject *py_retval; /* return value */ + PyObject *pyobj_conn; /* virConnectPtr */ + PyObject *pyobj_net; + PyObject *pyobj_cbData; /* hash of callback data */ + int eventID; + virConnectPtr conn; + int ret = 0; + virConnectNetworkEventGenericCallback cb = NULL; + virNetworkPtr net; + + if (!PyArg_ParseTuple + (args, (char *) "OOiO:virConnectNetworkEventRegisterAny", + &pyobj_conn, &pyobj_net, &eventID, &pyobj_cbData)) { + DEBUG("%s failed parsing tuple\n", __FUNCTION__); + return VIR_PY_INT_FAIL; + } + + DEBUG("libvirt_virConnectNetworkEventRegister(%p %p %d %p) called\n", + pyobj_conn, pyobj_net, eventID, pyobj_cbData); + conn = PyvirConnect_Get(pyobj_conn); + if (pyobj_net == Py_None) + net = NULL; + else + net = PyvirNetwork_Get(pyobj_net); + + switch ((virNetworkEventID) eventID) { + case VIR_NETWORK_EVENT_ID_LIFECYCLE: + cb = VIR_NETWORK_EVENT_CALLBACK(libvirt_virConnectNetworkEventLifecycleCallback); + break; + + case VIR_NETWORK_EVENT_ID_LAST: + break; + } + + if (!cb) { + return VIR_PY_INT_FAIL; + } + + Py_INCREF(pyobj_cbData); + + LIBVIRT_BEGIN_ALLOW_THREADS; + ret = virConnectNetworkEventRegisterAny(conn, net, eventID, + cb, pyobj_cbData, + libvirt_virConnectNetworkEventFreeFunc); + LIBVIRT_END_ALLOW_THREADS; + + if (ret < 0) { + Py_DECREF(pyobj_cbData); + } + + py_retval = libvirt_intWrap(ret); + return py_retval; +} + +static PyObject +*libvirt_virConnectNetworkEventDeregisterAny(PyObject *self ATTRIBUTE_UNUSED, + PyObject *args) +{ + PyObject *py_retval; + PyObject *pyobj_conn; + int callbackID; + virConnectPtr conn; + int ret = 0; + + if (!PyArg_ParseTuple + (args, (char *) "Oi:virConnectNetworkEventDeregister", + &pyobj_conn, &callbackID)) + return NULL; + + DEBUG("libvirt_virConnectNetworkEventDeregister(%p) called\n", pyobj_conn); + + conn = (virConnectPtr) PyvirConnect_Get(pyobj_conn); + + LIBVIRT_BEGIN_ALLOW_THREADS; + + ret = virConnectNetworkEventDeregisterAny(conn, callbackID); + + LIBVIRT_END_ALLOW_THREADS; + py_retval = libvirt_intWrap(ret); + return py_retval; +} +#endif /* LIBVIR_CHECK_VERSION(1, 2, 1)*/ + #if LIBVIR_CHECK_VERSION(0, 10, 0) static void libvirt_virConnectCloseCallbackDispatch(virConnectPtr conn ATTRIBUTE_UNUSED, @@ -7315,6 +7463,10 @@ static PyMethodDef libvirtMethods[] = { {(char *) "virConnectDomainEventDeregister", libvirt_virConnectDomainEventDeregister, METH_VARARGS, NULL}, {(char *) "virConnectDomainEventRegisterAny", libvirt_virConnectDomainEventRegisterAny, METH_VARARGS, NULL}, {(char *) "virConnectDomainEventDeregisterAny", libvirt_virConnectDomainEventDeregisterAny, METH_VARARGS, NULL}, +#if LIBVIR_CHECK_VERSION(1, 2, 1) + {(char *) "virConnectNetworkEventRegisterAny", libvirt_virConnectNetworkEventRegisterAny, METH_VARARGS, NULL}, + {(char *) "virConnectNetworkEventDeregisterAny", libvirt_virConnectNetworkEventDeregisterAny, METH_VARARGS, NULL}, +#endif /* LIBVIR_CHECK_VERSION(1, 2, 1) */ #if LIBVIR_CHECK_VERSION(0, 10, 0) {(char *) "virConnectRegisterCloseCallback", libvirt_virConnectRegisterCloseCallback, METH_VARARGS, NULL}, {(char *) "virConnectUnregisterCloseCallback", libvirt_virConnectUnregisterCloseCallback, METH_VARARGS, NULL}, -- 1.8.4.4

2 1

[libvirt] ANNOUNCE: ruby-libvirt 0.5.0
by Chris Lalancette 11 Dec '13

11 Dec '13

All, I'm pleased to announce the release of ruby-libvirt 0.5.0. ruby-libvirt is a ruby wrapper around the libvirt API. Version 0.5.0 brings new APIs, more documentation, and bugfixes: * Updated Network class, implementing almost all libvirt APIs * Updated Domain class, implementing almost all libvirt APIs * Updated Connection class, implementing almost all libvirt APIs * Updated DomainSnapshot class, implementing almost all libvirt APIs * Updated NodeDevice class, implementing almost all libvirt APIs * Updated Storage class, implementing almost all libvirt APIs * Add constants for almost all libvirt defines * Improved performance in the library by using alloca Version 0.5.0 is available from http://libvirt.org/ruby: Tarball: http://libvirt.org/ruby/download/ruby-libvirt-0.5.0.tgz Gem: http://libvirt.org/ruby/download/ruby-libvirt-0.5.0.gem It is also available from rubygems.org; to get the latest version, run: $ gem install ruby-libvirt As usual, if you run into questions, problems, or bugs, please feel free to mail me (clalancette(a)gmail.com) and/or the libvirt mailing list. Thanks to everyone who contributed patches and submitted bugs. Chris Lalancette

2 5

[libvirt] [PATCH] docs: fix a typo in libvirt.h
by Chen Hanxiao 11 Dec '13

11 Dec '13

From: Chen Hanxiao <chenhanxiao(a)cn.fujitsu.com> s/pausde/paused Signed-off-by: Chen Hanxiao <chenhanxiao(a)cn.fujitsu.com> --- include/libvirt/libvirt.h.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/libvirt/libvirt.h.in b/include/libvirt/libvirt.h.in index 29d4dce..51a02f5 100644 --- a/include/libvirt/libvirt.h.in +++ b/include/libvirt/libvirt.h.in @@ -4576,7 +4576,7 @@ typedef void (*virConnectDomainEventWatchdogCallback)(virConnectPtr conn, */ typedef enum { VIR_DOMAIN_EVENT_IO_ERROR_NONE = 0, /* No action, IO error ignored */ - VIR_DOMAIN_EVENT_IO_ERROR_PAUSE, /* Guest CPUs are pausde */ + VIR_DOMAIN_EVENT_IO_ERROR_PAUSE, /* Guest CPUs are paused */ VIR_DOMAIN_EVENT_IO_ERROR_REPORT, /* IO error reported to guest OS */ #ifdef VIR_ENUM_SENTINELS -- 1.8.2.1

2 1

Re: [libvirt] [Qemu-devel] [PATCH V17 02/11] NUMA: check if the total numa memory size is equal to ram_size
by Eduardo Habkost 11 Dec '13

11 Dec '13

CCing libvir-list. On Wed, Dec 04, 2013 at 03:58:50PM +0800, Wanlong Gao wrote: > If the total number of the assigned numa nodes memory is not > equal to the assigned ram size, it will write the wrong data > to ACPI talb, then the guest will ignore the wrong ACPI table > and recognize all memory to one node. It's buggy, we should > check it to ensure that we write the right data to ACPI table. > > Signed-off-by: Wanlong Gao <gaowanlong(a)cn.fujitsu.com> This will make configurations that could be running for years (except that the guest OS was ignoring the NUMA data) suddenly stop running. I just want to confirm: we really want that, right? Does libvirt allow this kind of broken configuration to be generated, or it already ensures the total NUMA node sizes match RAM size? > --- > numa.c | 10 ++++++++++ > 1 file changed, 10 insertions(+) > > diff --git a/numa.c b/numa.c > index ce7736a..beda80e 100644 > --- a/numa.c > +++ b/numa.c > @@ -150,6 +150,16 @@ void set_numa_nodes(void) > node_mem[i] = ram_size - usedmem; > } > > + uint64_t numa_total = 0; > + for (i = 0; i < nb_numa_nodes; i++) { > + numa_total += node_mem[i]; > + } > + if (numa_total != ram_size) { > + fprintf(stderr, "qemu: numa nodes total memory size " > + "should equal to ram_size\n"); > + exit(1); > + } > + > for (i = 0; i < nb_numa_nodes; i++) { > if (!bitmap_empty(node_cpumask[i], MAX_CPUMASK_BITS)) { > break; > -- > 1.8.5 > > -- Eduardo

3 3

[libvirt] [PATCH] storage_backend_rbd: rename "stat" variable
by Michael Chapman 11 Dec '13

11 Dec '13

This variable shadows the stat(2) function, which only became visible in this scope as of commit 9cac8639. Rename the variable so it doesn't conflict. Signed-off-by: Michael Chapman <mike(a)very.puzzling.org> --- src/storage/storage_backend_rbd.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/storage/storage_backend_rbd.c b/src/storage/storage_backend_rbd.c index b8a553d..4b6f18c 100644 --- a/src/storage/storage_backend_rbd.c +++ b/src/storage/storage_backend_rbd.c @@ -314,8 +314,8 @@ static int virStorageBackendRBDRefreshPool(virConnectPtr conn, goto cleanup; } - struct rados_cluster_stat_t stat; - if (rados_cluster_stat(ptr.cluster, &stat) < 0) { + struct rados_cluster_stat_t clusterstat; + if (rados_cluster_stat(ptr.cluster, &clusterstat) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("failed to stat the RADOS cluster")); goto cleanup; @@ -329,13 +329,13 @@ static int virStorageBackendRBDRefreshPool(virConnectPtr conn, goto cleanup; } - pool->def->capacity = stat.kb * 1024; - pool->def->available = stat.kb_avail * 1024; + pool->def->capacity = clusterstat.kb * 1024; + pool->def->available = clusterstat.kb_avail * 1024; pool->def->allocation = poolstat.num_bytes; VIR_DEBUG("Utilization of RBD pool %s: (kb: %llu kb_avail: %llu num_bytes: %llu)", - pool->def->source.name, (unsigned long long)stat.kb, - (unsigned long long)stat.kb_avail, + pool->def->source.name, (unsigned long long)clusterstat.kb, + (unsigned long long)clusterstat.kb_avail, (unsigned long long)poolstat.num_bytes); while (true) { -- 1.8.4.2

2 1

[libvirt] [PATCH 0/6] Some virtlockd improvements
by Michael Chapman 11 Dec '13

11 Dec '13

Hi, This patch series fixes up a few problems encountered while testing out virtlockd. The biggest problem was that reloading virtlockd through systemd or its initscript would send it a SIGHUP, not a SIGUSR1 (which causes it to re-exec itself). This would simply kill it. Patches 1-3 clean this up by having SIGHUP behave the same as SIGUSR1. The systemd unit and initscript have to use SIGUSR1, though, since they may be called upon to signal an old virtlockd binary. When run from the initscript graceful re-exec didn't work properly anyway, as virtlockd assumed argv[0] was a full path to its binary. The initscript didn't provide a full path. Patches 4-5 make virtlockd use execvp() to re-exec itself, which does a PATH lookup if necessary. Patch 6 isn't really virtlockd-specific. It moves the reloading of virtlockd and libvirtd via initscripts into the libvirt-daemon package's %postun scriptlet (which is already where reloading is done with systemd). The problem with reloading libvirt-daemon in %post is that it restarts *before* all of the libvirt-daemon-driver-* packages have been updated in the same RPM transaction, which means it keeps using the old libraries (or fails to load them due to missing symbols). Michael Chapman (6): virtlockd: improve systemd units virtlockd: improve initscripts virtlockd: treat SIGHUP like SIGUSR1 virtlockd: use common exit path when out-of-memory virtlockd: make re-exec more robust spec: clean up libvirtd and virtlockd service mgmt daemon/libvirtd.init.in | 2 ++ libvirt.spec.in | 43 +++++++++++----------- src/locking/lock_daemon.c | 77 ++++++++++++++++++++++++++++++---------- src/locking/virtlockd.init.in | 11 +++--- src/locking/virtlockd.service.in | 7 ++-- src/locking/virtlockd.socket.in | 2 +- 6 files changed, 95 insertions(+), 47 deletions(-) -- 1.8.4.2

4 17

[libvirt] [PATCH 0/9] Add throttle blkio cgroup support for libvirt
by Gao feng 11 Dec '13

11 Dec '13

Right now, libvirt only supports the cfq based blkio cgorup, this means if the block devices doesn't use cfq scheduler, the blkio cgroup will loss effect. This patchset adds the throttle blkio cgroup support for libvirt, intoduces four elements for domain configuration and extend the virsh command blkiotune. This patchset is a new version of Guan Qiang's patchset ://www.redhat.com/archives/libvir-list/2013-October/msg01066.html Change form Guan Qiang's patchset: 1, split to 8 patches, make logic more clear 2, change the type of read/write iops form unsigned long long to unsigned int, trying to set read/write iops to the value which bigger than max number of unsigned int will fail. 3, fix some logic shortage. Gao feng (9): rename virDomainBlkioDeviceWeightParseXML to virDomainBlkioDeviceParseXML rename virBlkioDeviceWeightArrayClear to virBlkioDeviceArrayClear rename virBlkioDeviceWeightPtr to virBlkioDevicePtr domain: introduce xml elements for throttle blkio cgroup blkio: Setting throttle blkio cgroup for domain qemu: allow to setup throttle blkio cgroup through virsh virsh: add virsh manual for setting throttle blkio cgroup lxc: allow to setup throttle blkio cgroup through virsh qemu: add new throttle blkio cgroup elements to the test xml docs/schemas/domaincommon.rng | 28 +- include/libvirt/libvirt.h.in | 45 ++ src/conf/domain_conf.c | 113 +++- src/conf/domain_conf.h | 16 +- src/libvirt_private.syms | 5 +- src/lxc/lxc_cgroup.c | 12 +- src/lxc/lxc_driver.c | 649 ++++++++++++++++++++- src/qemu/qemu_cgroup.c | 13 +- src/qemu/qemu_driver.c | 432 ++++++++++++-- src/util/vircgroup.c | 170 +++++- src/util/vircgroup.h | 18 + .../qemuxml2argv-blkiotune-device.xml | 8 + tools/virsh-domain.c | 64 ++ tools/virsh.pod | 36 +- 14 files changed, 1485 insertions(+), 124 deletions(-) -- 1.8.3.1

3 23

[libvirt] [PATCH v3 0/6] Support keyboard device
by Li Zhang 11 Dec '13

11 Dec '13

From: Li Zhang <zhlcindy(a)linux.vnet.ibm.com> This patchset is to add keyboard input device. For PPC64, it doesn't support a default keyboard device when the graphic is enabled. Libvirt supports QEMU command line as "-device VGA" which won't create any keyboard device for it. So it requires libvirt to add a default USB keyboard device for it. This patchset is to add keyboard input device and a default USB keyboard for PPC64. The related discussion in QEMU community: http://lists.nongnu.org/archive/html/qemu-devel/2013-11/msg01734.html Li Zhang (6): conf: Add a keyboard input device type conf: Add one interface to add input devices. Remove PS2 mouse device for non-X86 platforms qemu_cap: Add USB keyboard capability qemu: parse qemu command line for USB keyboard. Add a default USB keyboard for PPC64 v3 -> v2: * Handle the KBD device type in xen and QEMU driver. (Daniel.P.Berrange) * Remove PS2 mouse device for non-X86 platforms. * Move virDomainDefMaybeAddInput to a new patch. (Jan Tomko) * Replace VIR_REALLOC_N with VIR_APPEND_ELEMENT. (Jan Tomoko) * Fix several typos. (Jan Tomoko) * Add a virReportError when QEMU_CAPS_DEVICE_USB_KBD can't be gotten. (Jan Tomoko) v2 -> v1: * change ifs to switch clause. * reconstruct the patches docs/schemas/domaincommon.rng | 1 + src/conf/domain_conf.c | 91 ++++++++++++---------- src/conf/domain_conf.h | 5 ++ src/libvirt_private.syms | 1 + src/qemu/qemu_capabilities.c | 2 + src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 41 +++++++--- src/qemu/qemu_domain.c | 29 ++++++- src/util/virarch.h | 2 + src/xenxs/xen_sxpr.c | 27 +++++-- src/xenxs/xen_xm.c | 30 +++++-- tests/qemucapabilitiesdata/caps_1.2.2-1.caps | 1 + tests/qemucapabilitiesdata/caps_1.3.1-1.caps | 1 + tests/qemucapabilitiesdata/caps_1.4.2-1.caps | 1 + tests/qemucapabilitiesdata/caps_1.5.3-1.caps | 1 + tests/qemucapabilitiesdata/caps_1.6.0-1.caps | 2 + tests/qemucapabilitiesdata/caps_1.6.50-1.caps | 1 + tests/qemuhelptest.c | 8 ++ .../qemuxml2argvdata/qemuxml2argv-pseries-disk.xml | 3 +- .../qemuxml2argv-pseries-usb-kbd.args | 9 +++ .../qemuxml2argv-pseries-usb-kbd.xml | 19 +++++ tests/qemuxml2argvtest.c | 3 + 22 files changed, 211 insertions(+), 68 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-pseries-usb-kbd.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-pseries-usb-kbd.xml -- 1.8.2.1

2 8

[libvirt] about libvirt install
by 奇查-老张 11 Dec '13

11 Dec '13

hello: when i configure libvirt-0.9.0 it always show: configure: error: You must install kernel-headers in order to compile libvirt with QEMU or LXC support but i am allready install latest kerne-headers. Please help. Thank you

2 2

[libvirt] [PATCH] storage: fix omitted slash in gluster volume URI
by Eric Blake 10 Dec '13

10 Dec '13

When doing 'virsh vol-dumpxml' on a gluster pool's volume, the resulting URI incorrectly omitted a slash between hostname and path: gluster://192.168.122.206rhsvol1/fedora-19.img This is fallout from me rebasing earlier versions of my patch, I had originally played with always requiring the gluster volume to have a leading slash, but it was easier to use the gluster API if the gluster volume name was guaranteed to have no slash; while I got the URI of the pool correct, I forgot to fix the URI of a libvirt volume. * src/storage/storage_backend_gluster.c (virStorageBackendGlusterRefreshVol): Use correct starting point since uri construction requires leading slash. Signed-off-by: Eric Blake <eblake(a)redhat.com> --- Once approved, I'm also pushing to v1.2.0-maint src/storage/storage_backend_gluster.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/storage/storage_backend_gluster.c b/src/storage/storage_backend_gluster.c index 1be9034..622526b 100644 --- a/src/storage/storage_backend_gluster.c +++ b/src/storage/storage_backend_gluster.c @@ -227,7 +227,10 @@ virStorageBackendGlusterRefreshVol(virStorageBackendGlusterStatePtr state, goto cleanup; tmp = state->uri->path; - state->uri->path = vol->key; + if (virAsprintf(&vol->key, "%s%s", state->uri->path, name) < 0) { + state->uri->path = tmp; + goto cleanup; + } if (!(vol->target.path = virURIFormat(state->uri))) { state->uri->path = tmp; goto cleanup; -- 1.8.4.2

2 2

[libvirt] [PATCH] Revert "virtlockd: treat SIGHUP like SIGUSR1"
by Michal Privoznik 10 Dec '13

10 Dec '13

This reverts commit 8355d42dd3df514c8584e0e5082b945b79671fc5. After some discussion upstream [1] this patch turns out to be spurious. It better gets reverted prior to a release. 1: https://www.redhat.com/archives/libvir-list/2013-December/msg00563.html Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/locking/lock_daemon.c | 2 -- src/locking/virtlockd.pod.in | 6 +++--- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/src/locking/lock_daemon.c b/src/locking/lock_daemon.c index ae09ef8..a6be43c 100644 --- a/src/locking/lock_daemon.c +++ b/src/locking/lock_daemon.c @@ -592,8 +592,6 @@ virLockDaemonSetupSignals(virNetServerPtr srv) return -1; if (virNetServerAddSignalHandler(srv, SIGUSR1, virLockDaemonExecRestartHandler, NULL) < 0) return -1; - if (virNetServerAddSignalHandler(srv, SIGHUP, virLockDaemonExecRestartHandler, NULL) < 0) - return -1; return 0; } diff --git a/src/locking/virtlockd.pod.in b/src/locking/virtlockd.pod.in index 022d67f..99612aa 100644 --- a/src/locking/virtlockd.pod.in +++ b/src/locking/virtlockd.pod.in @@ -54,9 +54,9 @@ Display version information then exit. =head1 SIGNALS -On receipt of B<SIGUSR1> or B<SIGHUP> virtlockd will re-exec() its -binary, while maintaining all current locks and clients. This allows -for live upgrades of the virtlockd service. +On receipt of B<SIGUSR1> virtlockd will re-exec() its binary, while +maintaining all current locks and clients. This allows for live +upgrades of the virtlockd service. =head1 FILES -- 1.8.5.1

3 2

[libvirt] [PATCH]lxc: remove redundant mount operation
by Chen Hanxiao 10 Dec '13

10 Dec '13

From: Chen Hanxiao <chenhanxiao(a)cn.fujitsu.com> If we do not specify a readonly mount, we don't need to re-mount it again. Signed-off-by: Chen Hanxiao <chenhanxiao(a)cn.fujitsu.com> --- src/lxc/lxc_container.c | 7 ------- 1 file changed, 7 deletions(-) diff --git a/src/lxc/lxc_container.c b/src/lxc/lxc_container.c index 255c711..351217a 100644 --- a/src/lxc/lxc_container.c +++ b/src/lxc/lxc_container.c @@ -1126,13 +1126,6 @@ static int lxcContainerMountFSBind(virDomainFSDefPtr fs, _("Failed to make directory %s readonly"), fs->dst); } - } else { - VIR_DEBUG("Binding %s readwrite", fs->dst); - if (mount(src, fs->dst, NULL, MS_BIND|MS_REMOUNT, NULL) < 0) { - virReportSystemError(errno, - _("Failed to make directory %s readwrite"), - fs->dst); - } } ret = 0; -- 1.8.2.1

3 4

[libvirt] Timing proposal for the next couple of releases
by Daniel Veillard 10 Dec '13

10 Dec '13

In general December is a month with low productivity, especially over the end of the month, as a result doing a freeze at that time may not be very efficient. Also I will be rather busy around end of January with travels and FOSDEM it's also the chinese new year, then February is a short month. My suggestion would be to rather plan 2 releases in 3 months, i.e. one around the 15th January with a freeze around Jan 8th, and then a release at the end of February with a freeze around 21st Feb. After that we are back to monthly end of month usual schedule. Does that sounds okay with everybody ? Daniel -- Daniel Veillard | Open Source and Standards, Red Hat veillard(a)redhat.com | libxml Gnome XML XSLT toolkit http://xmlsoft.org/ http://veillard.com/ | virtualization library http://libvirt.org/

2 1

[libvirt] [PATCH] qemu_process: Read errors from child
by Michal Privoznik 10 Dec '13

10 Dec '13

https://bugzilla.redhat.com/show_bug.cgi?id=1035955 There's a window when starting a qemu process between fork() and exec() during which we are doing things that may fail but not tunnelling the error to the daemon. This is basically all within qemuProcessHook(). So whenever we fail in something, e.g. placing a process onto numa node, users ale left with: error: Child quit during startup handshake: Input/output error while the original error is thrown into the domain log: libvirt: error : internal error: NUMA memory tuning in 'preferred' mode only supports single node Hence, we should read the log file and search for the error message and report it to users. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/qemu/qemu_process.c | 66 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 66 insertions(+) diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index a26c079..d0d8b54 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -1563,6 +1563,70 @@ cleanup: /* + * Read domain log and probably overwrite error if there's one in + * the domain log file. This functions exists to cover the small + * window between fork() and exec() during which child may fail + * by libvirt hand, e.g. placing onto a NUMA node failed. + */ +static int +qemuProcessReadChildErrors(virQEMUDriverPtr driver, + virDomainObjPtr vm, + off_t originalOff) +{ + int ret = -1; + int logfd; + off_t off = 0; + ssize_t bytes; + char buf[1024] = {0}; + char *eol, *filter_next = buf; + + if ((logfd = qemuDomainOpenLog(driver, vm, originalOff)) < 0) + goto cleanup; + + while (off < sizeof(buf) - 1) { + bytes = saferead(logfd, buf + off, sizeof(buf) - off - 1); + if (bytes < 0) { + VIR_WARN("unable to read from log file: %s", + virStrerror(errno, buf, sizeof(buf))); + goto cleanup; + } + + off += bytes; + buf[off] = '\0'; + + if (bytes == 0) + break; + + while ((eol = strchr(filter_next, '\n'))) { + *eol = '\0'; + if (STRPREFIX(filter_next, "libvirt: ")) { + filter_next = eol + 1; + *eol = '\n'; + break; + } else { + memmove(filter_next, eol + 1, off - (eol - buf)); + off -= eol + 1 - filter_next; + } + } + } + + if (off > 0) { + /* Found an error in the log. Report it */ + virResetLastError(); + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Process exited prior exec: %s"), + buf); + } + + ret = 0; + +cleanup: + VIR_FORCE_CLOSE(logfd); + return ret; +} + + +/* * Look at a chunk of data from the QEMU stdout logs and try to * find a TTY device, as indicated by a line like * @@ -3888,6 +3952,8 @@ int qemuProcessStart(virConnectPtr conn, VIR_DEBUG("Waiting for handshake from child"); if (virCommandHandshakeWait(cmd) < 0) { + /* Read errors from child that occurred between fork and exec. */ + qemuProcessReadChildErrors(driver, vm, pos); goto cleanup; } -- 1.8.4.4

2 4

[libvirt] [libvirt-glib 0/4] Add symbol files checks to make check
by Christophe Fergeau 10 Dec '13

10 Dec '13

Hey, This series is based of the libosinfo work danpb did recently to reuse libvirt scripts to validate the symbol files. These make sure the exported symbols match what is listed in the sym file, and that these files are alphabetically ordered. This caught 2 minor errors in the sym files we currently ship.

2 8

[libvirt] [PATCH] docs: Enhance memoryBacking/locked documentation
by Jiri Denemark 10 Dec '13

10 Dec '13

Mention the need to set memtune/hard_limit. https://bugzilla.redhat.com/show_bug.cgi?id=1035954 Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- docs/formatdomain.html.in | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index 1850a2b..b4ee9f3 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -638,7 +638,10 @@ <dt><code>locked</code></dt> <dd>When set and supported by the hypervisor, memory pages belonging to the domain will be locked in host's memory and the host will not - be allowed to swap them out. + be allowed to swap them out. For QEMU/KVM this requires + <code>hard_limit</code> <a href="#elementsMemoryTuning">memory tunning</a> + element to be used and set to the maximum memory configured for the + domain plus any memory consumed by the QEMU process itself. <span class="since">Since 1.0.6</span></dd> </dl> -- 1.8.5.1

3 3

[libvirt] [v3 00/32] network events feature
by Cédric Bosdonnat 10 Dec '13

10 Dec '13

Changes with v2: * This patch serie includes fixes for Daniel's comments. * The two commits adding the network events API have been merged into one to get rid of build problems between those two. * Otherwise one commit has been dropped to fix the void* returns of domain events creation functions Cédric Bosdonnat (32): Added domain start/stop/define/undefine event unit tests Rename virDomainEventCallback to virObjectEventCallback Renamed virDomainMeta to virObjectMeta Renamed virDomainEventQueue to virObjectEventQueue Renamed virDomainEventState to virObjectEventState Renamed virDomainEventCallbackList* to virObjectEventCallbackList* Created virObjectEventStateRegisterID virObject-ified virDomainEvent Create virDomainEventLifecycle to start removing the huge union Renamed virDomainEventNew* to virDomainEventLifecycleNew* Renamed virDomainEventNewInternal to virDomainEventNew Create virDomainEventRTCChange to get rid of the huge union Created virDomainEventWatchdog to get rid of the huge union Created virDomainEventIOError Created virDomainEventGraphics Created virDomainEventBlockJob Create virDomainEventDiskChange Created virDomainEventTrayChange Created virDomainEventBalloonChange Created virDomainEventDeviceRemoved and removed the huge union Use virObjectEventPtr instead of virDomainEventPtr Add object event namespaces for the event IDs Renamed virDomainEventTimer to virObjectEventTimer Split the virObjectEvent and virDomainEvent* to separate them after Extracted common parts of domain_event.[ch] to object_event.[ch] Added Network events API and virNetworkEventLifecycle. test driver: renamed testDomainEventQueue into testObjectEventQueue test driver: implemented network events Add network events unit tests daemon/remote.c: renamed remoteDispatchDomainEventSend Add network events to the remote driver Added network events to the bridged network driver .gitignore | 1 + cfg.mk | 6 +- daemon/libvirtd.h | 1 + daemon/remote.c | 176 +++- include/libvirt/libvirt.h.in | 77 ++ src/Makefile.am | 11 + src/conf/domain_event.c | 1904 ++++++++++++++-------------------- src/conf/domain_event.h | 169 ++- src/conf/network_event.c | 152 +++ src/conf/network_event.h | 50 + src/conf/object_event.c | 797 ++++++++++++++ src/conf/object_event.h | 98 ++ src/conf/object_event_private.h | 113 ++ src/driver.h | 14 + src/libvirt.c | 125 +++ src/libvirt_private.syms | 25 +- src/libvirt_public.syms | 7 + src/libxl/libxl_conf.h | 2 +- src/libxl/libxl_driver.c | 46 +- src/lxc/lxc_conf.h | 2 +- src/lxc/lxc_driver.c | 54 +- src/lxc/lxc_process.c | 20 +- src/network/bridge_driver.c | 90 ++ src/network/bridge_driver_platform.h | 3 + src/parallels/parallels_utils.h | 2 +- src/qemu/qemu_conf.h | 2 +- src/qemu/qemu_domain.c | 6 +- src/qemu/qemu_domain.h | 2 +- src/qemu/qemu_driver.c | 116 +-- src/qemu/qemu_hotplug.c | 10 +- src/qemu/qemu_migration.c | 38 +- src/qemu/qemu_process.c | 70 +- src/remote/remote_driver.c | 179 +++- src/remote/remote_protocol.x | 46 +- src/test/test_driver.c | 198 ++-- src/uml/uml_conf.h | 2 +- src/uml/uml_driver.c | 44 +- src/vbox/vbox_tmpl.c | 22 +- src/xen/xen_driver.c | 10 +- src/xen/xen_driver.h | 4 +- src/xen/xen_inotify.c | 10 +- src/xen/xs_internal.c | 20 +- tests/Makefile.am | 7 + tests/objecteventtest.c | 411 ++++++++ tests/qemuhotplugtest.c | 2 +- 45 files changed, 3584 insertions(+), 1560 deletions(-) create mode 100644 src/conf/network_event.c create mode 100644 src/conf/network_event.h create mode 100644 src/conf/object_event.c create mode 100644 src/conf/object_event.h create mode 100644 src/conf/object_event_private.h create mode 100644 tests/objecteventtest.c -- 1.8.4.4

4 71

Re: [libvirt] [PATCH] conf: don't format memtune with unlimited values
by Martin Kletzander 10 Dec '13

10 Dec '13

On Tue, Dec 10, 2013 at 09:12:25AM +0100, Martin Kletzander wrote: > On Tue, Dec 10, 2013 at 09:08:43AM +0100, Michal Privoznik wrote: > > On 10.12.2013 08:43, Martin Kletzander wrote: > > > When changing memtune limits to unlimited with AFFECT_CONFIG, the > > > values in virDomainDef are set to PARAM_UNLIMITED, which causes the > > > whole <memtune> to be formatted. This can be changed in all drivers, > > > but it also makes sense to use the default (0) as another value for > > > "unlimited", since zero memory limit makes no sense. > > > > > > Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> > > > --- > > > > > > Notes: > > > This patch efectively completes my previous patch on PARAM_UNLIMITED > > > [1], but I discovered it just now and found out that the behavior > > > hasn't changed in between. > > > > > > [1] https://www.redhat.com/archives/libvir-list/2013-December/msg00434.html > > > > > > src/conf/domain_conf.c | 44 ++++++++++++---------- > > > .../qemuxml2argv-memtune-unlimited.args | 6 +++ > > > .../qemuxml2argv-memtune-unlimited.xml | 29 ++++++++++++++ > > > tests/qemuxml2argvtest.c | 1 + > > > .../qemuxml2xmlout-memtune-unlimited.xml | 27 +++++++++++++ > > > tests/qemuxml2xmltest.c | 1 + > > > 6 files changed, 88 insertions(+), 20 deletions(-) > > > create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-memtune-unlimited.args > > > create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-memtune-unlimited.xml > > > create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-memtune-unlimited.xml > > > > ACK > > > > Thanks, pushed. > > Martin I just noticed you replied off-list, so I'm replying back on-list. Martin

1 0

[libvirt] Fwd: Re: [PATCH] conf: don't format memtune with unlimited values
by Michal Privoznik 10 Dec '13

10 Dec '13

-------- Original Message -------- Subject: Re: [libvirt] [PATCH] conf: don't format memtune with unlimited values Date: Tue, 10 Dec 2013 09:12:25 +0100 From: Martin Kletzander <mkletzan(a)redhat.com> To: Michal Privoznik <mprivozn(a)redhat.com> On Tue, Dec 10, 2013 at 09:08:43AM +0100, Michal Privoznik wrote: > On 10.12.2013 08:43, Martin Kletzander wrote: > > When changing memtune limits to unlimited with AFFECT_CONFIG, the > > values in virDomainDef are set to PARAM_UNLIMITED, which causes the > > whole <memtune> to be formatted. This can be changed in all drivers, > > but it also makes sense to use the default (0) as another value for > > "unlimited", since zero memory limit makes no sense. > > > > Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> > > --- > > > > Notes: > > This patch efectively completes my previous patch on PARAM_UNLIMITED > > [1], but I discovered it just now and found out that the behavior > > hasn't changed in between. > > > > [1] https://www.redhat.com/archives/libvir-list/2013-December/msg00434.html > > > > src/conf/domain_conf.c | 44 ++++++++++++---------- > > .../qemuxml2argv-memtune-unlimited.args | 6 +++ > > .../qemuxml2argv-memtune-unlimited.xml | 29 ++++++++++++++ > > tests/qemuxml2argvtest.c | 1 + > > .../qemuxml2xmlout-memtune-unlimited.xml | 27 +++++++++++++ > > tests/qemuxml2xmltest.c | 1 + > > 6 files changed, 88 insertions(+), 20 deletions(-) > > create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-memtune-unlimited.args > > create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-memtune-unlimited.xml > > create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-memtune-unlimited.xml > > ACK > Thanks, pushed. Martin [For some reason I didn't hit 'Reply-All' but bare 'Reply' button]

1 0

[libvirt] [PATCH] conf: don't format memtune with unlimited values
by Martin Kletzander 10 Dec '13

10 Dec '13

When changing memtune limits to unlimited with AFFECT_CONFIG, the values in virDomainDef are set to PARAM_UNLIMITED, which causes the whole <memtune> to be formatted. This can be changed in all drivers, but it also makes sense to use the default (0) as another value for "unlimited", since zero memory limit makes no sense. Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- Notes: This patch efectively completes my previous patch on PARAM_UNLIMITED [1], but I discovered it just now and found out that the behavior hasn't changed in between. [1] https://www.redhat.com/archives/libvir-list/2013-December/msg00434.html src/conf/domain_conf.c | 44 ++++++++++++---------- .../qemuxml2argv-memtune-unlimited.args | 6 +++ .../qemuxml2argv-memtune-unlimited.xml | 29 ++++++++++++++ tests/qemuxml2argvtest.c | 1 + .../qemuxml2xmlout-memtune-unlimited.xml | 27 +++++++++++++ tests/qemuxml2xmltest.c | 1 + 6 files changed, 88 insertions(+), 20 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-memtune-unlimited.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-memtune-unlimited.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-memtune-unlimited.xml diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index b76cf26..e0ab4b1 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -16643,28 +16643,32 @@ virDomainDefFormatInternal(virDomainDefPtr def, } /* add memtune only if there are any */ - if (def->mem.hard_limit || def->mem.soft_limit || def->mem.min_guarantee || - def->mem.swap_hard_limit) + if ((def->mem.hard_limit && + def->mem.hard_limit != VIR_DOMAIN_MEMORY_PARAM_UNLIMITED) || + (def->mem.soft_limit && + def->mem.hard_limit != VIR_DOMAIN_MEMORY_PARAM_UNLIMITED) || + (def->mem.swap_hard_limit && + def->mem.hard_limit != VIR_DOMAIN_MEMORY_PARAM_UNLIMITED) || + def->mem.min_guarantee) { virBufferAddLit(buf, " <memtune>\n"); - if (def->mem.hard_limit) { - virBufferAsprintf(buf, " <hard_limit unit='KiB'>" - "%llu</hard_limit>\n", def->mem.hard_limit); - } - if (def->mem.soft_limit) { - virBufferAsprintf(buf, " <soft_limit unit='KiB'>" - "%llu</soft_limit>\n", def->mem.soft_limit); - } - if (def->mem.min_guarantee) { - virBufferAsprintf(buf, " <min_guarantee unit='KiB'>" - "%llu</min_guarantee>\n", def->mem.min_guarantee); - } - if (def->mem.swap_hard_limit) { - virBufferAsprintf(buf, " <swap_hard_limit unit='KiB'>" - "%llu</swap_hard_limit>\n", def->mem.swap_hard_limit); - } - if (def->mem.hard_limit || def->mem.soft_limit || def->mem.min_guarantee || - def->mem.swap_hard_limit) + if (def->mem.hard_limit) { + virBufferAsprintf(buf, " <hard_limit unit='KiB'>" + "%llu</hard_limit>\n", def->mem.hard_limit); + } + if (def->mem.soft_limit) { + virBufferAsprintf(buf, " <soft_limit unit='KiB'>" + "%llu</soft_limit>\n", def->mem.soft_limit); + } + if (def->mem.min_guarantee) { + virBufferAsprintf(buf, " <min_guarantee unit='KiB'>" + "%llu</min_guarantee>\n", def->mem.min_guarantee); + } + if (def->mem.swap_hard_limit) { + virBufferAsprintf(buf, " <swap_hard_limit unit='KiB'>" + "%llu</swap_hard_limit>\n", def->mem.swap_hard_limit); + } virBufferAddLit(buf, " </memtune>\n"); + } if (def->mem.hugepage_backed || def->mem.nosharepages || def->mem.locked) { virBufferAddLit(buf, " <memoryBacking>\n"); diff --git a/tests/qemuxml2argvdata/qemuxml2argv-memtune-unlimited.args b/tests/qemuxml2argvdata/qemuxml2argv-memtune-unlimited.args new file mode 100644 index 0000000..8bef546 --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-memtune-unlimited.args @@ -0,0 +1,6 @@ +LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ +/usr/bin/qemu \ +-name QEMUGuest1 -S -M pc -m 214 -smp 1 -nographic -monitor \ +unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -usb \ +-hda /dev/HostVG/QEMUGuest1 -net none -serial \ +none -parallel none diff --git a/tests/qemuxml2argvdata/qemuxml2argv-memtune-unlimited.xml b/tests/qemuxml2argvdata/qemuxml2argv-memtune-unlimited.xml new file mode 100644 index 0000000..526129b --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-memtune-unlimited.xml @@ -0,0 +1,29 @@ +<domain type='qemu'> + <name>QEMUGuest1</name> + <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> + <memory unit='MiB'>214</memory> + <currentMemory unit='KiB'>219136</currentMemory> + <memtune> + <hard_limit unit='KiB'>9007199254740991</hard_limit> + </memtune> + <vcpu placement='static'>1</vcpu> + <os> + <type arch='i686' machine='pc'>hvm</type> + <boot dev='hd'/> + </os> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <emulator>/usr/bin/qemu</emulator> + <disk type='block' device='disk'> + <source dev='/dev/HostVG/QEMUGuest1'/> + <target dev='hda' bus='ide'/> + <address type='drive' controller='0' bus='0' target='0' unit='0'/> + </disk> + <controller type='usb' index='0'/> + <controller type='ide' index='0'/> + <memballoon model='virtio'/> + </devices> +</domain> diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index f9abf1b..f75e457 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -1126,6 +1126,7 @@ mymain(void) QEMU_CAPS_KVM, QEMU_CAPS_CPU_HOST); DO_TEST("memtune", QEMU_CAPS_NAME); + DO_TEST("memtune-unlimited", QEMU_CAPS_NAME); DO_TEST("blkiotune", QEMU_CAPS_NAME); DO_TEST("blkiotune-device", QEMU_CAPS_NAME); DO_TEST("cputune", QEMU_CAPS_NAME); diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-memtune-unlimited.xml b/tests/qemuxml2xmloutdata/qemuxml2xmlout-memtune-unlimited.xml new file mode 100644 index 0000000..1d29fa7 --- /dev/null +++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-memtune-unlimited.xml @@ -0,0 +1,27 @@ +<domain type='qemu'> + <name>QEMUGuest1</name> + <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> + <memory unit='KiB'>219136</memory> + <currentMemory unit='KiB'>219136</currentMemory> + <vcpu placement='static'>1</vcpu> + <os> + <type arch='i686' machine='pc'>hvm</type> + <boot dev='hd'/> + </os> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <emulator>/usr/bin/qemu</emulator> + <disk type='block' device='disk'> + <source dev='/dev/HostVG/QEMUGuest1'/> + <target dev='hda' bus='ide'/> + <address type='drive' controller='0' bus='0' target='0' unit='0'/> + </disk> + <controller type='usb' index='0'/> + <controller type='ide' index='0'/> + <controller type='pci' index='0' model='pci-root'/> + <memballoon model='virtio'/> + </devices> +</domain> diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c index ceaaf6a..2a9849c 100644 --- a/tests/qemuxml2xmltest.c +++ b/tests/qemuxml2xmltest.c @@ -247,6 +247,7 @@ mymain(void) DO_TEST("encrypted-disk"); DO_TEST_DIFFERENT("memtune"); + DO_TEST_DIFFERENT("memtune-unlimited"); DO_TEST("blkiotune"); DO_TEST("blkiotune-device"); DO_TEST("cputune"); -- 1.8.5.1

1 0

[libvirt] [PATCH 1/3] qemu: hotplug: Only label hostdev after checking device conflicts
by Cole Robinson 09 Dec '13

09 Dec '13

Similar to what Jiri did for cgroup setup/teardown in 05e149f94, push it all into the device handler functions so we can do the necessary prep work before claiming the device. This also fixes hotplugging USB devices by product/vendor (virt-manager's default behavior): https://bugzilla.redhat.com/show_bug.cgi?id=1016511 --- src/qemu/qemu_hotplug.c | 42 ++++++++++++++++++++++++++++++++++-------- 1 file changed, 34 insertions(+), 8 deletions(-) diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index f4fc723..bff9e23 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -1153,6 +1153,7 @@ qemuDomainAttachHostPciDevice(virQEMUDriverPtr driver, char *configfd_name = NULL; bool releaseaddr = false; bool teardowncgroup = false; + bool teardownlabel = false; int backend = hostdev->source.subsys.u.pci.backend; if (VIR_REALLOC_N(vm->def->hostdevs, vm->def->nhostdevs + 1) < 0) @@ -1193,6 +1194,11 @@ qemuDomainAttachHostPciDevice(virQEMUDriverPtr driver, goto error; teardowncgroup = true; + if (virSecurityManagerSetHostdevLabel(driver->securityManager, + vm->def, hostdev, NULL) < 0) + goto error; + teardownlabel = true; + if (virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_DEVICE)) { if (qemuAssignDeviceHostdevAlias(vm->def, hostdev, -1) < 0) goto error; @@ -1250,6 +1256,10 @@ qemuDomainAttachHostPciDevice(virQEMUDriverPtr driver, error: if (teardowncgroup && qemuTeardownHostdevCgroup(vm, hostdev) < 0) VIR_WARN("Unable to remove host device cgroup ACL on hotplug fail"); + if (teardownlabel && + virSecurityManagerRestoreHostdevLabel(driver->securityManager, + vm->def, hostdev, NULL) < 0) + VIR_WARN("Unable to restore host device labelling on hotplug fail"); if (releaseaddr) qemuDomainReleaseDeviceAddress(vm, hostdev->info, NULL); @@ -1445,6 +1455,7 @@ qemuDomainAttachHostUsbDevice(virQEMUDriverPtr driver, char *devstr = NULL; bool added = false; bool teardowncgroup = false; + bool teardownlabel = false; int ret = -1; if (qemuFindHostdevUSBDevice(hostdev, true, &usb) < 0) @@ -1466,6 +1477,11 @@ qemuDomainAttachHostUsbDevice(virQEMUDriverPtr driver, goto cleanup; teardowncgroup = true; + if (virSecurityManagerSetHostdevLabel(driver->securityManager, + vm->def, hostdev, NULL) < 0) + goto cleanup; + teardownlabel = true; + if (virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_DEVICE)) { if (qemuAssignDeviceHostdevAlias(vm->def, hostdev, -1) < 0) goto cleanup; @@ -1492,10 +1508,14 @@ qemuDomainAttachHostUsbDevice(virQEMUDriverPtr driver, ret = 0; cleanup: - if (ret < 0 && - teardowncgroup && - qemuTeardownHostdevCgroup(vm, hostdev) < 0) - VIR_WARN("Unable to remove host device cgroup ACL on hotplug fail"); + if (ret < 0) { + if (teardowncgroup && qemuTeardownHostdevCgroup(vm, hostdev) < 0) + VIR_WARN("Unable to remove host device cgroup ACL on hotplug fail"); + if (teardownlabel && + virSecurityManagerRestoreHostdevLabel(driver->securityManager, + vm->def, hostdev, NULL) < 0) + VIR_WARN("Unable to restore host device labelling on hotplug fail"); + } if (added) virUSBDeviceListSteal(driver->activeUsbHostdevs, usb); virUSBDeviceFree(usb); @@ -1515,6 +1535,7 @@ qemuDomainAttachHostScsiDevice(virQEMUDriverPtr driver, char *devstr = NULL; char *drvstr = NULL; bool teardowncgroup = false; + bool teardownlabel = false; if (!virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_DRIVE) || !virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_DEVICE) || @@ -1543,6 +1564,11 @@ qemuDomainAttachHostScsiDevice(virQEMUDriverPtr driver, goto cleanup; teardowncgroup = true; + if (virSecurityManagerSetHostdevLabel(driver->securityManager, + vm->def, hostdev, NULL) < 0) + goto cleanup; + teardownlabel = true; + if (qemuAssignDeviceHostdevAlias(vm->def, hostdev, -1) < 0) goto cleanup; @@ -1584,6 +1610,10 @@ cleanup: qemuDomainReAttachHostScsiDevices(driver, vm->def->name, &hostdev, 1); if (teardowncgroup && qemuTeardownHostdevCgroup(vm, hostdev) < 0) VIR_WARN("Unable to remove host device cgroup ACL on hotplug fail"); + if (teardownlabel && + virSecurityManagerRestoreHostdevLabel(driver->securityManager, + vm->def, hostdev, NULL) < 0) + VIR_WARN("Unable to restore host device labelling on hotplug fail"); } VIR_FREE(drvstr); VIR_FREE(devstr); @@ -1601,10 +1631,6 @@ int qemuDomainAttachHostDevice(virQEMUDriverPtr driver, return -1; } - if (virSecurityManagerSetHostdevLabel(driver->securityManager, - vm->def, hostdev, NULL) < 0) - return -1; - switch (hostdev->source.subsys.type) { case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_PCI: if (qemuDomainAttachHostPciDevice(driver, vm, -- 1.8.4.2

2 6

[libvirt] [PATCH] Read PCI class from sysfs class file instead of config space.
by Thadeu Lima de Souza Cascardo 09 Dec '13

09 Dec '13

When determining if a device is behind a PCI bridge, the PCI device class is checked by reading the config space. However, there are some devices which have the wrong class on the config space, but the class is initialized by Linux correctly as a PCI BRIDGE. This class can be read by the sysfs file '/sys/bus/pci/devices/xxxx:xx:xx.x/class'. One example of such bridge is IBM PCI Bridge 1014:03b9, which is identified as a Host Bridge when reading the config space. Signed-off-by: Thadeu Lima de Souza Cascardo <cascardo(a)linux.vnet.ibm.com> --- src/util/virpci.c | 38 +++++++++++++++++++++++++++++++++++--- 1 files changed, 35 insertions(+), 3 deletions(-) diff --git a/src/util/virpci.c b/src/util/virpci.c index 8ec642f..8353411 100644 --- a/src/util/virpci.c +++ b/src/util/virpci.c @@ -344,6 +344,34 @@ virPCIDeviceRead32(virPCIDevicePtr dev, int cfgfd, unsigned int pos) } static int +virPCIDeviceReadClass(virPCIDevicePtr dev, uint16_t *device_class) +{ + char *path = NULL; + char *id_str; + int ret = 0; + unsigned int value; + + if (virPCIFile(&path, dev->name, "class") < 0) + return -1; + + /* class string is '0xNNNNNN\n' ... i.e. 9 bytes */ + if (virFileReadAll(path, 9, &id_str) < 0) { + VIR_FREE(path); + return -1; + } + + VIR_FREE(path); + + id_str[8] = '\0'; + ret = virStrToLong_ui(id_str, NULL, 16, &value); + if (ret == 0) + *device_class = (value >> 8) & 0xFFFF; + + VIR_FREE(id_str); + return ret; +} + +static int virPCIDeviceWrite(virPCIDevicePtr dev, int cfgfd, unsigned int pos, @@ -645,8 +673,8 @@ virPCIDeviceIsParent(virPCIDevicePtr dev, virPCIDevicePtr check, void *data) return 0; /* Is it a bridge? */ - device_class = virPCIDeviceRead16(check, fd, PCI_CLASS_DEVICE); - if (device_class != PCI_CLASS_BRIDGE_PCI) + ret = virPCIDeviceReadClass(check, &device_class); + if (ret == -1 || device_class != PCI_CLASS_BRIDGE_PCI) goto cleanup; /* Is it a plane? */ @@ -2110,6 +2138,7 @@ virPCIDeviceDownstreamLacksACS(virPCIDevicePtr dev) unsigned int pos; int fd; int ret = 0; + uint16_t device_class; if ((fd = virPCIDeviceConfigOpen(dev, true)) < 0) return -1; @@ -2119,8 +2148,11 @@ virPCIDeviceDownstreamLacksACS(virPCIDevicePtr dev) goto cleanup; } + if (virPCIDeviceReadClass(dev, &device_class)) + goto cleanup; + pos = dev->pcie_cap_pos; - if (!pos || virPCIDeviceRead16(dev, fd, PCI_CLASS_DEVICE) != PCI_CLASS_BRIDGE_PCI) + if (!pos || device_class != PCI_CLASS_BRIDGE_PCI) goto cleanup; flags = virPCIDeviceRead16(dev, fd, pos + PCI_EXP_FLAGS); -- 1.7.1

1 0

[libvirt] [libvirt-python 1/2] override: Fix exception handling syntax
by Doug Goldstein 09 Dec '13

09 Dec '13

Python 3 no longer accepts 'except Exception, e:' as valid while Python 2.4 does not accept the new syntax 'except Exception as e:' so this uses a fall back method that is compatible with both. --- libvirt-override-virStream.py | 3 ++- libvirt-override.py | 8 ++++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/libvirt-override-virStream.py b/libvirt-override-virStream.py index 53000da..189d062 100644 --- a/libvirt-override-virStream.py +++ b/libvirt-override-virStream.py @@ -50,7 +50,8 @@ ret = handler(self, got, opaque) if type(ret) is int and ret < 0: raise RuntimeError("recvAll handler returned %d" % ret) - except Exception, e: + except Exception: + e = sys.exc_info()[1] try: self.abort() except: diff --git a/libvirt-override.py b/libvirt-override.py index 87996f8..63f8ecb 100644 --- a/libvirt-override.py +++ b/libvirt-override.py @@ -3,12 +3,16 @@ # # On cygwin, the DLL is called cygvirtmod.dll +import sys + try: import libvirtmod -except ImportError, lib_e: +except ImportError: + lib_e = sys.exc_info()[1] try: import cygvirtmod as libvirtmod - except ImportError, cyg_e: + except ImportError: + cyg_e = sys.exc_info()[1] if str(cyg_e).count("No module named"): raise lib_e -- 1.8.3.2

2 3

[libvirt] [libvirt-python 0/3] Python 3 support mixed with Dan's patches
by Doug Goldstein 09 Dec '13

09 Dec '13

Turns out Dan and I both started working on Python 3 support and we talked about some changes to his patchset and these are the result of that conversation. This really belongs in the middle of his patchset but he's pushed the first part already so this is on top of master. Doug Goldstein (3): setup: Drop unused exception variable generator: Support exceptions in Python 2 and 3 Update exception catching in generated code generator.py | 18 ++++++++++++------ setup.py | 2 +- 2 files changed, 13 insertions(+), 7 deletions(-) -- 1.8.3.2

2 6

[libvirt] [PATCH] Workaround startup race condition
by Adam Walters 09 Dec '13

09 Dec '13

This patch works around a race condition on libvirt start. It feels a little hackish to me, but I have a hard time letting go of problems, so I had to at least try and implement something before going to sleep. I'd love some comments on the workaround, and welcome any improvement suggestions, as well. Please note that I implemented this in qemu_conf.c because it is the only place in the codebase I found VIR_DOMAIN_DISK_TYPE_VOLUME used, which tells me that only qemu has storage pool support at this time (not to mention that the qemu code is what I've become familiar with. It also doesn't hurt that I only have qemu configured and ready to go for testing, too). Adam Walters (1): qemu: conf: Work around race condition on libvirt start src/qemu/qemu_conf.c | 11 +++++++++++ 1 file changed, 11 insertions(+) -- 1.8.4.2

3 5

[libvirt] save-image-edit fails to change the memory configuration of the image
by Shivaprasad bhat 09 Dec '13

09 Dec '13

Hi, I see the below error when i change the memory. virsh save-image-edit /MANAS/rhel7VM1-running-save2 --running error: unsupported configuration: Target domain max memory 4194304 does not match source 2097152 Failed. Try again? [y,n,f,?]: n error: unsupported configuration: Target domain max memory 4194304 does not match source 2097152 Any idea why is this disallowed ? Thanks, Shiva

2 2

[libvirt] Libvirt support for KVM/ARM on armv7l hardware
by 林佳緯 09 Dec '13

09 Dec '13

I have found Libvirt supporting for armv7b in http://libvirt.org/news.html. But armv7l is not found there. Does Libvirt support run KVM/ARM for hardware virtualization on armv7l platform? Thanks!

1 0

[libvirt] Libvirt support for KVM/ARM
by 林佳緯 09 Dec '13

09 Dec '13

Does libvirt API support KVM/ARM now? Thanks for any answer. Gavin

1 0

[libvirt] [Ruby] Next release?
by Hiroshi Miura 08 Dec '13

08 Dec '13

Hi Chris, I'm waiting a next release of ruby-libvitrt in 4 month. Recent development git snapshot works well with vagnrant-kvm that I worked. thank you for hard work. Hiroshi

2 1

[libvirt] [PATCHv5 0/4] Implement RBD storage pool support
by Adam Walters 07 Dec '13

07 Dec '13

Here are updated patches that implement RBD storage pool support in libvirt. By and large, my changes are confined to qemu_conf.c, but I did need a couple of changes in domain_conf.c in order to get things working. I've tested these patches on my equipment, and they worked there, but they could probably use testing by others if anyone else has Ceph configured. The last patch in this series isn't needed in order to have RBD volumes work for domains, but it is needed if you don't want to have to kill the domain to get it back under the control of libvirt. Adam Walters (4): qemu: conf: Add qemuAddRBDPoolSourceHost helper function qemu: conf: Implement RBD storage pool support domain: conf: Bypass virDomainDiskDefForeachPath for network volumes domain: conf: Resolve bug related to network volume types src/conf/domain_conf.c | 6 +++-- src/qemu/qemu_conf.c | 62 +++++++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 65 insertions(+), 3 deletions(-) -- 1.8.4.2

1 6

[libvirt] [PATCH 0/6] Various spec file enhancements
by Jim Fehlig 06 Dec '13

06 Dec '13

This series moves some driver-specific files from the main libvirt-daemon package to the respective libvirt-daemon-driver-* package when building with driver modules. This was originally all one patch that I found difficult to review, so I tried to logically break it up in hopes to make it easier to review. Jim Fehlig (6): spec: Conditionally add /etc/libvirt/nwfilter spec: Only add libvirt-daemon pre install script if building with qemu spec: Fix files list when building without driver modules spec: Conditionally specify some hypervisor-specific files spec: Define hypervisor-specific files together spec: move driver-specific files to driver subpackages libvirt.spec.in | 199 +++++++++++++++++++++++++++++++++----------------------- 1 file changed, 117 insertions(+), 82 deletions(-) -- 1.8.0.1

3 12

[libvirt] [PATCHv4 0/2] Implement RBD volumes support
by Peter Krempa 06 Dec '13

06 Dec '13

Version 4 incorporates changes from my review feedback. Re-sending as I don't have the opportunity to test the code. Adam Walters (2): qemu: conf: Add qemuAddRBDPoolSourceHost helper function qemu: conf: Implement RBD storage pool support src/qemu/qemu_conf.c | 60 +++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 59 insertions(+), 1 deletion(-) -- 1.8.4.3

2 3

[libvirt] [PATCH] lxc: return the right value if failed to make path
by Chen Hanxiao 06 Dec '13

06 Dec '13

From: Chen Hanxiao <chenhanxiao(a)cn.fujitsu.com> If we failed to make path for pts, lxcContainerMountFSDevPTS will return the value virAsprintf returned rather than -1. Signed-off-by: Chen Hanxiao <chenhanxiao(a)cn.fujitsu.com> --- src/lxc/lxc_container.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lxc/lxc_container.c b/src/lxc/lxc_container.c index b1b63fb..2835463 100644 --- a/src/lxc/lxc_container.c +++ b/src/lxc/lxc_container.c @@ -952,7 +952,7 @@ static int lxcContainerMountFSDevPTS(virDomainDefPtr def, def->name)) < 0) return ret; - if (virFileMakePath("/dev/pts") < 0) { + if ((ret = virFileMakePath("/dev/pts")) < 0) { virReportSystemError(errno, "%s", _("Cannot create /dev/pts")); goto cleanup; -- 1.8.2.1

2 1

[libvirt] [PATCH] Cgroup: Replace 'newpath' with 'newPath'
by Wangyufei (James) 06 Dec '13

06 Dec '13

>From be1ce1c794b05a27aa85d037500a821b8c514d12 Mon Sep 17 00:00:00 2001 From: Zhou Yimin <zhouyimin(a)huawei.com> Date: Fri, 6 Dec 2013 11:38:14 +0800 Subject: [PATCH] Cgroup: Replace 'newpath' with 'newPath' Unifying codding style, replace 'newpath' with 'newPath'. From: Zhou Yimin <zhouyimin(a)huawei.com> --- src/util/vircgroup.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/util/vircgroup.c b/src/util/vircgroup.c index 5c43e10..9674328 100644 --- a/src/util/vircgroup.c +++ b/src/util/vircgroup.c @@ -1246,7 +1246,7 @@ virCgroupNewPartition(const char *path, int ret = -1; char *parentPath = NULL; virCgroupPtr parent = NULL; - char *newpath = NULL; + char *newPath = NULL; VIR_DEBUG("path=%s create=%d controllers=%x", path, create, controllers); @@ -1257,15 +1257,15 @@ virCgroupNewPartition(const char *path, return -1; } - if (virCgroupSetPartitionSuffix(path, &newpath) < 0) + if (virCgroupSetPartitionSuffix(path, &newPath) < 0) goto cleanup; - if (virCgroupNew(-1, newpath, NULL, controllers, group) < 0) + if (virCgroupNew(-1, newPath, NULL, controllers, group) < 0) goto cleanup; - if (STRNEQ(newpath, "/")) { + if (STRNEQ(newPath, "/")) { char *tmp; - if (VIR_STRDUP(parentPath, newpath) < 0) + if (VIR_STRDUP(parentPath, newPath) < 0) goto cleanup; tmp = strrchr(parentPath, '/'); @@ -1287,7 +1287,7 @@ cleanup: virCgroupFree(group); virCgroupFree(&parent); VIR_FREE(parentPath); - VIR_FREE(newpath); + VIR_FREE(newPath); return ret; } -- 1.7.3.1.msysgit.0 Best Regards, -WangYufei

2 1

[libvirt] [PATCH 0/3] Support more snapshot disk configs
by Peter Krempa 06 Dec '13

06 Dec '13

A newly finished part of the large gluster snapshot series. These patches allow to parse and format definitions of snapshot disks including block, dir and network backing. Peter Krempa (3): snapshot: schema: Split out snapshot disk driver definition snapshot: Add support for specifying snapshot disk backing type snapshots: Test snapshot disk type specification docs/schemas/domainsnapshot.rng | 94 +++++++++++++++++++----- src/conf/snapshot_conf.c | 25 ++++++- src/conf/snapshot_conf.h | 15 ++-- src/qemu/qemu_driver.c | 59 ++++++++++----- tests/domainsnapshotxml2xmlin/disk_snapshot.xml | 18 +++++ tests/domainsnapshotxml2xmlout/disk_snapshot.xml | 18 +++++ 6 files changed, 181 insertions(+), 48 deletions(-) -- 1.8.4.3

1 3

[libvirt] [PATCH] Add qxl ram size to ABI stability check
by Ján Tomko 06 Dec '13

06 Dec '13

55bfd02 added a 'ram' attribute for qxl video devices but didn't update the ABI check. https://bugzilla.redhat.com/show_bug.cgi?id=1035123 --- src/conf/domain_conf.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 0268847..b76cf26 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -13191,6 +13191,13 @@ virDomainVideoDefCheckABIStability(virDomainVideoDefPtr src, return false; } + if (src->ram != dst->ram) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("Target video card ram %u does not match source %u"), + dst->ram, src->ram); + return false; + } + if (src->vram != dst->vram) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("Target video card vram %u does not match source %u"), -- 1.8.3.2

2 2

[libvirt] [PATCH] qemu: Improve error when setting invalid count of vcpus via agent
by Peter Krempa 06 Dec '13

06 Dec '13

https://bugzilla.redhat.com/show_bug.cgi?id=1035108 When attempting to enable more vCPUs in the guest than is currently enabled in the guest but less than the maximum count for the VM we currently reported an unhelpful message: error: internal error: guest agent reports less cpu than requested This patch changes it to: error: invalid argument: requested vcpu count is greater than the count of enabled vcpus in the domain: 3 > 2 --- src/qemu/qemu_driver.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index e2d4e97..66f2a0e 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -4201,6 +4201,14 @@ qemuDomainSetVcpusFlags(virDomainPtr dom, unsigned int nvcpus, goto endjob; } + if (nvcpus > vm->def->vcpus) { + virReportError(VIR_ERR_INVALID_ARG, + _("requested vcpu count is greater than the count " + "of enabled vcpus in the domain: %d > %d"), + nvcpus, vm->def->vcpus); + goto endjob; + } + qemuDomainObjEnterAgent(vm); ncpuinfo = qemuAgentGetVCPUs(priv->agent, &cpuinfo); qemuDomainObjExitAgent(vm); -- 1.8.4.3

2 2

[libvirt] [PATCH] conf: Fix XML formatting of RNG device info
by Peter Krempa 06 Dec '13

06 Dec '13

https://bugzilla.redhat.com/show_bug.cgi?id=1035118 When outputting the XML for the RNG device, the code didn't format the PCI address info. Additionally the schema wasn't expecting the info although it was being parsed and used internally. Fix those mistakes and add test for the PCI info section. --- docs/schemas/domaincommon.rng | 6 ++++++ src/conf/domain_conf.c | 5 +++++ tests/qemuxml2argvdata/qemuxml2argv-virtio-rng-default.args | 2 +- tests/qemuxml2argvdata/qemuxml2argv-virtio-rng-default.xml | 1 + 4 files changed, 13 insertions(+), 1 deletion(-) diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng index 80848d2..38c6801 100644 --- a/docs/schemas/domaincommon.rng +++ b/docs/schemas/domaincommon.rng @@ -3956,6 +3956,12 @@ <optional> <ref name="rng-rate"/> </optional> + <optional> + <ref name="alias"/> + </optional> + <optional> + <ref name="address"/> + </optional> </interleave> </element> </define> diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 65bd9b1..0268847 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -15832,6 +15832,11 @@ virDomainRNGDefFormat(virBufferPtr buf, break; } + if (virDomainDeviceInfoIsSet(&def->info, flags)) { + if (virDomainDeviceInfoFormat(buf, &def->info, flags) < 0) + return -1; + } + virBufferAddLit(buf, " </rng>\n"); return 0; diff --git a/tests/qemuxml2argvdata/qemuxml2argv-virtio-rng-default.args b/tests/qemuxml2argvdata/qemuxml2argv-virtio-rng-default.args index 01e9f89..4ae6257 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-virtio-rng-default.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-virtio-rng-default.args @@ -4,4 +4,4 @@ LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -monitor unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -usb \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 \ -object rng-random,id=rng0 \ --device virtio-rng-pci,rng=rng0,bus=pci.0,addr=0x4 +-device virtio-rng-pci,rng=rng0,bus=pci.0,addr=0x7 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-virtio-rng-default.xml b/tests/qemuxml2argvdata/qemuxml2argv-virtio-rng-default.xml index 0852dea..0a7bf61 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-virtio-rng-default.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-virtio-rng-default.xml @@ -18,6 +18,7 @@ <memballoon model='virtio'/> <rng model='virtio'> <backend model='random'/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x07' function='0x0'/> </rng> </devices> </domain> -- 1.8.4.3

2 2

[libvirt] [PATCH] qemu: snapshot: Fix incorrect disk type for auto-generated disks
by Peter Krempa 06 Dec '13

06 Dec '13

When changing the parsing and formatting functions in commit 43f2ccdc73090bd03f64de4d58d46ffa0134d705 I forgot to update the qemu disk alingnment function for snapshots that automatically adds snapshot configs for disks that were not mentioned in the XML. The function allocated a new disk snapshot definition but did not correctly initialize the snapshot disk source type variable. This resulted into the disks considered as block devices and invalid XML was generated. Reported by John Ferlan. --- Notes: Doing a unit test for this will require yet another addition to the testsuite so I'm sending this patch first. src/conf/snapshot_conf.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/conf/snapshot_conf.c b/src/conf/snapshot_conf.c index 5637975..55abd80 100644 --- a/src/conf/snapshot_conf.c +++ b/src/conf/snapshot_conf.c @@ -532,6 +532,7 @@ virDomainSnapshotAlignDisks(virDomainSnapshotDefPtr def, goto cleanup; disk->index = i; disk->snapshot = def->dom->disks[i]->snapshot; + disk->type = -1; if (!disk->snapshot) disk->snapshot = default_snapshot; } @@ -549,6 +550,15 @@ virDomainSnapshotAlignDisks(virDomainSnapshotDefPtr def, const char *tmp; struct stat sb; + if (disk->type != VIR_DOMAIN_DISK_TYPE_FILE || + disk->type != -1) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("cannot generate external snapshot name " + "for disk '%s' on a '%s' device"), + disk->name, virDomainDiskTypeToString(disk->type)); + goto cleanup; + } + if (!original) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("cannot generate external snapshot name " -- 1.8.4.3

3 4

[libvirt] [PATCH v2 0/5] Support keyboard device
by Li Zhang 06 Dec '13

06 Dec '13

From: Li Zhang <zhlcindy(a)linux.vnet.ibm.com> This patchset is to add keyboard input device. For PPC64, it doesn't support a default keyboard device when the graphic is enabled. Libvirt supports QEMU command line as "-device VGA" which won't create any keyboard device for it. So it requires libvirt to add a default USB keyboard device for it. This patchset is to add keyboard input device and a default USB keyboard for PPC64. The related discussion in QEMU community: http://lists.nongnu.org/archive/html/qemu-devel/2013-11/msg01734.html Li Zhang (5): conf: Add a keyboard input device type qemu_cap: Add USB keyboard capability docs/schemas/domaincommon.rng: add keyboard input device type qemu: parse USB keyboard qemu command line. Add a default USB keyboard for PPC64 v2 -> v1: * change ifs to switch clause. * reconstruct the patches docs/schemas/domaincommon.rng | 1 + src/conf/domain_conf.c | 62 ++++++++++++++++------ src/conf/domain_conf.h | 5 ++ src/libvirt_private.syms | 1 + src/qemu/qemu_capabilities.c | 2 + src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 18 +++++-- src/qemu/qemu_domain.c | 14 ++++- tests/qemucapabilitiesdata/caps_1.2.2-1.caps | 1 + tests/qemucapabilitiesdata/caps_1.3.1-1.caps | 1 + tests/qemucapabilitiesdata/caps_1.4.2-1.caps | 1 + tests/qemucapabilitiesdata/caps_1.5.3-1.caps | 1 + tests/qemucapabilitiesdata/caps_1.6.0-1.caps | 2 + tests/qemucapabilitiesdata/caps_1.6.50-1.caps | 1 + tests/qemuhelptest.c | 8 +++ .../qemuxml2argvdata/qemuxml2argv-pseries-disk.xml | 1 + .../qemuxml2argv-pseries-usb-kbd.args | 9 ++++ .../qemuxml2argv-pseries-usb-kbd.xml | 19 +++++++ tests/qemuxml2argvtest.c | 3 ++ 19 files changed, 130 insertions(+), 21 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-pseries-usb-kbd.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-pseries-usb-kbd.xml -- 1.8.2.1

2 15

[libvirt] [PATCH 1/4] Add USB Keyboard support in libvirt
by Li Zhang 06 Dec '13

06 Dec '13

From: Li Zhang <zhlcindy(a)linux.vnet.ibm.com> PS2 devices are not supported for non-x86 platforms. So it needs one USB keyboard when graphic is enabled. This patch is to add one kbd input device type for users to add one USB keyboard in XML file as the following: <input type='kbd' bus='usb'/> Signed-off-by: Li Zhang <zhlcindy(a)linux.vnet.ibm.com> --- src/conf/domain_conf.c | 3 ++- src/conf/domain_conf.h | 1 + src/qemu/qemu_capabilities.c | 3 +++ src/qemu/qemu_capabilities.h | 2 ++ src/qemu/qemu_command.c | 12 +++++++++--- 5 files changed, 17 insertions(+), 4 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 7b0e3ea..d90f05c 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -504,7 +504,8 @@ VIR_ENUM_IMPL(virDomainVideo, VIR_DOMAIN_VIDEO_TYPE_LAST, VIR_ENUM_IMPL(virDomainInput, VIR_DOMAIN_INPUT_TYPE_LAST, "mouse", - "tablet") + "tablet", + "kbd") VIR_ENUM_IMPL(virDomainInputBus, VIR_DOMAIN_INPUT_BUS_LAST, "ps2", diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index 4561ccc..c8fecaf 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -1222,6 +1222,7 @@ struct _virDomainTPMDef { enum virDomainInputType { VIR_DOMAIN_INPUT_TYPE_MOUSE, VIR_DOMAIN_INPUT_TYPE_TABLET, + VIR_DOMAIN_INPUT_TYPE_KBD, VIR_DOMAIN_INPUT_TYPE_LAST }; diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 548b988..89b11ad 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -243,6 +243,8 @@ VIR_ENUM_IMPL(virQEMUCaps, QEMU_CAPS_LAST, "virtio-mmio", "ich9-intel-hda", "kvm-pit-lost-tick-policy", + + "usb-kbd", /*160*/ ); struct _virQEMUCaps { @@ -1394,6 +1396,7 @@ struct virQEMUCapsStringFlags virQEMUCapsObjectTypes[] = { { "usb-storage", QEMU_CAPS_DEVICE_USB_STORAGE }, { "virtio-mmio", QEMU_CAPS_DEVICE_VIRTIO_MMIO }, { "ich9-intel-hda", QEMU_CAPS_DEVICE_ICH9_INTEL_HDA }, + { "usb-kbd", QEMU_CAPS_DEVICE_USB_KBD }, }; static struct virQEMUCapsStringFlags virQEMUCapsObjectPropsVirtioBlk[] = { diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index 02d47c6..0b7b5e5 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -198,6 +198,8 @@ enum virQEMUCapsFlags { QEMU_CAPS_DEVICE_VIRTIO_MMIO = 157, /* -device virtio-mmio */ QEMU_CAPS_DEVICE_ICH9_INTEL_HDA = 158, /* -device ich9-intel-hda */ QEMU_CAPS_KVM_PIT_TICK_POLICY = 159, /* kvm-pit.lost_tick_policy */ + QEMU_CAPS_DEVICE_USB_KBD = 160, /*-device usb-kbd*/ + QEMU_CAPS_LAST, /* this must always be the last item */ }; diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 763417f..318f7a1 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -5280,9 +5280,15 @@ qemuBuildUSBInputDevStr(virDomainDefPtr def, { virBuffer buf = VIR_BUFFER_INITIALIZER; - virBufferAsprintf(&buf, "%s,id=%s", - dev->type == VIR_DOMAIN_INPUT_TYPE_MOUSE ? - "usb-mouse" : "usb-tablet", dev->info.alias); + if (dev->type == VIR_DOMAIN_INPUT_TYPE_MOUSE) { + virBufferAsprintf(&buf, "usb-mouse,id=%s", dev->info.alias); + } else if (dev->type == VIR_DOMAIN_INPUT_TYPE_TABLET) { + virBufferAsprintf(&buf, "usb-tablet,id=%s", dev->info.alias); + } else if (dev->type == VIR_DOMAIN_INPUT_TYPE_KBD) { + if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE_USB_KBD)) + goto error; + virBufferAsprintf(&buf, "usb-kbd,id=%s", dev->info.alias); + } if (qemuBuildDeviceAddressStr(&buf, def, &dev->info, qemuCaps) < 0) goto error; -- 1.8.2.1

3 11

[libvirt] [PATCH 0/3] add percentage limit support for RAM filesystems in LXC container
by Chen Hanxiao 06 Dec '13

06 Dec '13

From: Chen Hanxiao <chenhanxiao(a)cn.fujitsu.com> Chen Hanxiao (3): add percentage limit parse and define support for RAM filesystems enable percentage limit of RAM filesystem in lxc container docs: add docs for percentage limitation docs/formatdomain.html.in | 4 +++- src/conf/domain_conf.c | 21 +++++++++++++++++---- src/conf/domain_conf.h | 1 + src/lxc/lxc_container.c | 14 +++++++++++--- 4 files changed, 32 insertions(+), 8 deletions(-) -- 1.8.2.1

3 13

[libvirt] Problems preserving lock state across suspend/resume
by Adam Tilghman 06 Dec '13

06 Dec '13

Hi folks, I'm looking into a problem discussed back in January 2013 wherein lock/lease state isn't properly preserved across suspend/resume. (This situation can lead to corruption if the guest's block storage is modified elsewhere while the original guest is paused.) For details see: https://www.redhat.com/archives/libvirt-users/2013-January/msg00109.html https://bugzilla.redhat.com/show_bug.cgi?id=906590 I'm using libvirt-1.2.0 with explicit Sanlock leases defined in the domain XML. It appears the problematic behavior is due to virDomainLockProcessPause() and virDomainLockProcessResume() being called twice during each suspend/resume: once by the RPC worker thread running the suspend/resume command, and once by the main thread in response to the QEMU events triggered by the RPC worker's actions. In libvirt-1.2.0, call paths for suspend are as follows: qemuDomainObjBeginJob(suspend) -> qemuDomainSuspend() -> qemuProcessStopCPUs() -> virDomainLockProcessPause() qemuMonitorJSONIOProcessEvent:143 : handle STOP -> qemuProcessHandleStop -> virDomainLockProcessPause() The first call -- usually out of qemuProcessHandleStop but perhaps there's a race -- properly saves state and releases locks. However the second call queries lock status after locks have been released, so it finds no locks are held. This results in a null/blank lockState saved in the domain object. Before I start working on a solution, are these multiple invocations of virDomainLockProcessPause()/virDomainLockProcessResume() intentional? Thanks, Adam Tilghman UC San Diego

1 0

[libvirt] [PATCH 1/2] qemu: hotplug: Mark 2 private functions as static
by Cole Robinson 05 Dec '13

05 Dec '13

They aren't used outside of qemu_hotplug.c --- src/qemu/qemu_hotplug.c | 14 ++++++++------ src/qemu/qemu_hotplug.h | 6 ------ 2 files changed, 8 insertions(+), 12 deletions(-) diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index c136232..f4fc723 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -1141,9 +1141,10 @@ try_remove: } -int qemuDomainAttachHostPciDevice(virQEMUDriverPtr driver, - virDomainObjPtr vm, - virDomainHostdevDefPtr hostdev) +static int +qemuDomainAttachHostPciDevice(virQEMUDriverPtr driver, + virDomainObjPtr vm, + virDomainHostdevDefPtr hostdev) { qemuDomainObjPrivatePtr priv = vm->privateData; int ret; @@ -1433,9 +1434,10 @@ cleanup: return ret; } -int qemuDomainAttachHostUsbDevice(virQEMUDriverPtr driver, - virDomainObjPtr vm, - virDomainHostdevDefPtr hostdev) +static int +qemuDomainAttachHostUsbDevice(virQEMUDriverPtr driver, + virDomainObjPtr vm, + virDomainHostdevDefPtr hostdev) { qemuDomainObjPrivatePtr priv = vm->privateData; virUSBDeviceList *list = NULL; diff --git a/src/qemu/qemu_hotplug.h b/src/qemu/qemu_hotplug.h index 75789d6..ffc435c 100644 --- a/src/qemu/qemu_hotplug.h +++ b/src/qemu/qemu_hotplug.h @@ -47,12 +47,6 @@ int qemuDomainAttachNetDevice(virConnectPtr conn, virQEMUDriverPtr driver, virDomainObjPtr vm, virDomainNetDefPtr net); -int qemuDomainAttachHostPciDevice(virQEMUDriverPtr driver, - virDomainObjPtr vm, - virDomainHostdevDefPtr hostdev); -int qemuDomainAttachHostUsbDevice(virQEMUDriverPtr driver, - virDomainObjPtr vm, - virDomainHostdevDefPtr hostdev); int qemuDomainAttachRedirdevDevice(virQEMUDriverPtr driver, virDomainObjPtr vm, virDomainRedirdevDefPtr hostdev); -- 1.8.4.2

2 6

[libvirt] [PATCH] docs: fix double articles bug
by Wangyufei (A) 05 Dec '13

05 Dec '13

Delete the extra article 'the'. Signed-off-by: Wang Yufei <james.wangyufei(a)huawei.com> --- src/libvirt.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/libvirt.c b/src/libvirt.c index eff44eb..0eb4c64 100644 --- a/src/libvirt.c +++ b/src/libvirt.c @@ -16525,7 +16525,7 @@ error: * Otherwise, creates a new secret with an automatically chosen UUID, and * initializes its attributes from xml. * - * Returns a the secret on success, NULL on failure. + * Returns a secret on success, NULL on failure. */ virSecretPtr virSecretDefineXML(virConnectPtr conn, const char *xml, unsigned int flags) -- 1.7.3.1.msysgit.0 Best Regards, -WangYufei

2 1

[libvirt] [PATCH python v2] generator: Remove use of 'has_key' function
by Daniel P. Berrange 05 Dec '13

05 Dec '13

From: "Daniel P. Berrange" <berrange(a)redhat.com> The code 'XXX.has_key(YYYY)' must be changed to be of the form 'YYY in XXXX' which works in Python2 and 3 As an added complication, if 'YYY in XXX' is used against an object overriding the '__getitem__' method it does not work in Python 2.4. Instead we must use 'YYY in XXX.keys()' Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- generator.py | 108 +++++++++++++++++++++++++++++------------------------------ 1 file changed, 54 insertions(+), 54 deletions(-) diff --git a/generator.py b/generator.py index 214abed..9053e91 100755 --- a/generator.py +++ b/generator.py @@ -76,11 +76,11 @@ class docParser(xml.sax.handler.ContentHandler): self.function_return = None self.function_file = None self.function_module= None - if attrs.has_key('name'): + if 'name' in attrs.keys(): self.function = attrs['name'] - if attrs.has_key('file'): + if 'file' in attrs.keys(): self.function_file = attrs['file'] - if attrs.has_key('module'): + if 'module' in attrs.keys(): self.function_module= attrs['module'] elif tag == 'cond': self._data = [] @@ -91,24 +91,24 @@ class docParser(xml.sax.handler.ContentHandler): self.function_arg_name = None self.function_arg_type = None self.function_arg_info = None - if attrs.has_key('name'): + if 'name' in attrs.keys(): self.function_arg_name = attrs['name'] if self.function_arg_name == 'from': self.function_arg_name = 'frm' - if attrs.has_key('type'): + if 'type' in attrs.keys(): self.function_arg_type = attrs['type'] - if attrs.has_key('info'): + if 'info' in attrs.keys(): self.function_arg_info = attrs['info'] elif tag == 'return': if self.in_function == 1: self.function_return_type = None self.function_return_info = None self.function_return_field = None - if attrs.has_key('type'): + if 'type' in attrs.keys(): self.function_return_type = attrs['type'] - if attrs.has_key('info'): + if 'info' in attrs.keys(): self.function_return_info = attrs['info'] - if attrs.has_key('field'): + if 'field' in attrs.keys(): self.function_return_field = attrs['field'] elif tag == 'enum': # enums come from header files, hence virterror.h @@ -207,7 +207,7 @@ def lxc_function(name, desc, ret, args, file, module, cond): lxc_functions[name] = (desc, ret, args, file, module, cond) def enum(type, name, value): - if not enums.has_key(type): + if type not in enums: enums[type] = {} if value == 'VIR_TYPED_PARAM_INT': value = 1 @@ -233,14 +233,14 @@ def enum(type, name, value): enums[type][name] = value def lxc_enum(type, name, value): - if not lxc_enums.has_key(type): + if type not in lxc_enums: lxc_enums[type] = {} if onlyOverrides and name not in lxc_enums[type]: return lxc_enums[type][name] = value def qemu_enum(type, name, value): - if not qemu_enums.has_key(type): + if type not in qemu_enums: qemu_enums[type] = {} if onlyOverrides and name not in qemu_enums[type]: return @@ -603,7 +603,7 @@ def print_function_wrapper(module, name, output, export, include): print("failed to get function %s infos" % name) return - if skipped_modules.has_key(module): + if module in skipped_modules: return 0 if module == "libvirt": @@ -637,7 +637,7 @@ def print_function_wrapper(module, name, output, export, include): if arg[1][0:6] == "const ": arg[1] = arg[1][6:] c_args = c_args + " %s %s;\n" % (arg[1], arg[0]) - if py_types.has_key(arg[1]): + if arg[1] in py_types: (f, t, n, c) = py_types[arg[1]] if (f == 'z') and (name in foreign_encoding_args) and (num_bufs == 0): f = 't#' @@ -659,9 +659,9 @@ def print_function_wrapper(module, name, output, export, include): c_call = c_call + ", " c_call = c_call + "%s" % (arg[0]) else: - if skipped_types.has_key(arg[1]): + if arg[1] in skipped_types: return 0 - if unknown_types.has_key(arg[1]): + if arg[1] in unknown_types: lst = unknown_types[arg[1]] lst.append(name) else: @@ -683,7 +683,7 @@ def print_function_wrapper(module, name, output, export, include): else: c_call = "\n %s(%s);\n" % (name, c_call) ret_convert = " Py_INCREF(Py_None);\n return Py_None;\n" - elif py_types.has_key(ret[0]): + elif ret[0] in py_types: (f, t, n, c) = py_types[ret[0]] c_return = " %s c_retval;\n" % (ret[0]) if file == "python_accessor" and ret[2] is not None: @@ -692,16 +692,16 @@ def print_function_wrapper(module, name, output, export, include): c_call = "\n c_retval = %s(%s);\n" % (name, c_call) ret_convert = " py_retval = libvirt_%sWrap((%s) c_retval);\n" % (n,c) ret_convert = ret_convert + " return py_retval;\n" - elif py_return_types.has_key(ret[0]): + elif ret[0] in py_return_types: (f, t, n, c) = py_return_types[ret[0]] c_return = " %s c_retval;\n" % (ret[0]) c_call = "\n c_retval = %s(%s);\n" % (name, c_call) ret_convert = " py_retval = libvirt_%sWrap((%s) c_retval);\n" % (n,c) ret_convert = ret_convert + " return py_retval;\n" else: - if skipped_types.has_key(ret[0]): + if ret[0] in skipped_types: return 0 - if unknown_types.has_key(ret[0]): + if ret[0] in unknown_types: lst = unknown_types[ret[0]] lst.append(name) else: @@ -1254,10 +1254,10 @@ def buildWrappers(module): ctypes.append(type) ctypes_processed[type] = () for type in list(classes_type.keys()): - if ctypes_processed.has_key(type): + if type in ctypes_processed: continue tinfo = classes_type[type] - if not classes_processed.has_key(tinfo[2]): + if tinfo[2] not in classes_processed: classes_list.append(tinfo[2]) classes_processed[tinfo[2]] = () @@ -1319,7 +1319,7 @@ def buildWrappers(module): if extra is not None: extra.close() - if function_classes.has_key("None"): + if "None" in function_classes: flist = function_classes["None"] flist.sort(functionCompare) oldfile = "" @@ -1344,7 +1344,7 @@ def buildWrappers(module): writeDoc(module, name, args, ' ', classes) for arg in args: - if classes_type.has_key(arg[1]): + if arg[1] in classes_type: classes.write(" if %s is None: %s__o = None\n" % (arg[0], arg[0])) classes.write(" else: %s__o = %s%s\n" % @@ -1359,17 +1359,17 @@ def buildWrappers(module): if n != 0: classes.write(", ") classes.write("%s" % arg[0]) - if classes_type.has_key(arg[1]): + if arg[1] in classes_type: classes.write("__o") n = n + 1 classes.write(")\n") if ret[0] != "void": - if classes_type.has_key(ret[0]): + if ret[0] in classes_type: # # Raise an exception # - if functions_noexcept.has_key(name): + if name in functions_noexcept: classes.write(" if ret is None:return None\n") else: classes.write( @@ -1384,8 +1384,8 @@ def buildWrappers(module): # several things that we can do, depending on the # contents of functions_int_*: elif is_integral_type (ret[0]): - if not functions_noexcept.has_key (name): - if functions_int_exception_test.has_key (name): + if name not in functions_noexcept: + if name in functions_int_exception_test: test = functions_int_exception_test[name] else: test = functions_int_default_test @@ -1395,8 +1395,8 @@ def buildWrappers(module): classes.write(" return ret\n") elif is_python_noninteger_type (ret[0]): - if not functions_noexcept.has_key (name): - if functions_list_exception_test.has_key (name): + if name not in functions_noexcept: + if name in functions_list_exception_test: test = functions_list_exception_test[name] else: test = functions_list_default_test @@ -1414,11 +1414,11 @@ def buildWrappers(module): if classname == "None": pass else: - if classes_ancestor.has_key(classname): + if classname in classes_ancestor: classes.write("class %s(%s):\n" % (classname, classes_ancestor[classname])) classes.write(" def __init__(self, _obj=None):\n") - if reference_keepers.has_key(classname): + if classname in reference_keepers: rlist = reference_keepers[classname] for ref in rlist: classes.write(" self.%s = None\n" % ref[1]) @@ -1435,7 +1435,7 @@ def buildWrappers(module): classes.write(" def __init__(self, dom, _obj=None):\n") else: classes.write(" def __init__(self, _obj=None):\n") - if reference_keepers.has_key(classname): + if classname in reference_keepers: rlist = reference_keepers[classname] for ref in rlist: classes.write(" self.%s = None\n" % ref[1]) @@ -1452,7 +1452,7 @@ def buildWrappers(module): classes.write(" self._conn = dom.connect()\n") classes.write(" self._o = _obj\n\n") destruct=None - if classes_destructors.has_key(classname): + if classname in classes_destructors: classes.write(" def __del__(self):\n") classes.write(" if self._o is not None:\n") classes.write(" libvirtmod.%s(self._o)\n" % @@ -1460,12 +1460,12 @@ def buildWrappers(module): classes.write(" self._o = None\n\n") destruct=classes_destructors[classname] - if not class_skip_connect_impl.has_key(classname): + if classname not in class_skip_connect_impl: # Build python safe 'connect' method classes.write(" def connect(self):\n") classes.write(" return self._conn\n\n") - if class_domain_impl.has_key(classname): + if classname in class_domain_impl: classes.write(" def domain(self):\n") classes.write(" return self._dom\n\n") @@ -1504,7 +1504,7 @@ def buildWrappers(module): writeDoc(module, name, args, ' ', classes) n = 0 for arg in args: - if classes_type.has_key(arg[1]): + if arg[1] in classes_type: if n != index: classes.write(" if %s is None: %s__o = None\n" % (arg[0], arg[0])) @@ -1522,11 +1522,11 @@ def buildWrappers(module): classes.write(", ") if n != index: classes.write("%s" % arg[0]) - if classes_type.has_key(arg[1]): + if arg[1] in classes_type: classes.write("__o") else: classes.write("self") - if classes_type.has_key(arg[1]): + if arg[1] in classes_type: classes.write(classes_type[arg[1]][0]) n = n + 1 classes.write(")\n") @@ -1536,11 +1536,11 @@ def buildWrappers(module): # For functions returning object types: if ret[0] != "void": - if classes_type.has_key(ret[0]): + if ret[0] in classes_type: # # Raise an exception # - if functions_noexcept.has_key(name): + if name in functions_noexcept: classes.write( " if ret is None:return None\n") else: @@ -1590,7 +1590,7 @@ def buildWrappers(module): # See reference_keepers for the list # tclass = classes_type[ret[0]][2] - if reference_keepers.has_key(tclass): + if tclass in reference_keepers: rlist = reference_keepers[tclass] for pref in rlist: if pref[0] == classname: @@ -1598,7 +1598,7 @@ def buildWrappers(module): pref[1]) # Post-processing - just before we return. - if function_post.has_key(name): + if name in function_post: classes.write(" %s\n" % (function_post[name])) @@ -1606,16 +1606,16 @@ def buildWrappers(module): # return the class # classes.write(" return __tmp\n") - elif converter_type.has_key(ret[0]): + elif ret[0] in converter_type: # # Raise an exception # - if functions_noexcept.has_key(name): + if name in functions_noexcept: classes.write( " if ret is None:return None") # Post-processing - just before we return. - if function_post.has_key(name): + if name in function_post: classes.write(" %s\n" % (function_post[name])) @@ -1627,8 +1627,8 @@ def buildWrappers(module): # are several things that we can do, depending on # the contents of functions_int_*: elif is_integral_type (ret[0]): - if not functions_noexcept.has_key (name): - if functions_int_exception_test.has_key (name): + if name not in functions_noexcept: + if name in functions_int_exception_test: test = functions_int_exception_test[name] else: test = functions_int_default_test @@ -1662,15 +1662,15 @@ def buildWrappers(module): ("ret", name)) # Post-processing - just before we return. - if function_post.has_key(name): + if name in function_post: classes.write(" %s\n" % (function_post[name])) classes.write (" return ret\n") elif is_python_noninteger_type (ret[0]): - if not functions_noexcept.has_key (name): - if functions_list_exception_test.has_key (name): + if name not in functions_noexcept: + if name in functions_list_exception_test: test = functions_list_exception_test[name] else: test = functions_list_default_test @@ -1704,7 +1704,7 @@ def buildWrappers(module): ("ret", name)) # Post-processing - just before we return. - if function_post.has_key(name): + if name in function_post: classes.write(" %s\n" % (function_post[name])) @@ -1712,7 +1712,7 @@ def buildWrappers(module): else: # Post-processing - just before we return. - if function_post.has_key(name): + if name in function_post: classes.write(" %s\n" % (function_post[name])) -- 1.8.3.1

2 1

[libvirt] [PATCH V2] AArch64: Porting of armv7l conditons to run qemu for aarch64.
by Pranavkumar Sawargaonkar 05 Dec '13

05 Dec '13

AArch64 qemu has similar behavior as armv7l, like use of mmio etc. This patch adds similar bypass checks what we have for armv7l to aarch64. E.g. we are enabling mmio transport for Nicdev. Making addDefaultUSB and addDefaultMemballoon to false etc. This patch also adds testcase to qemuxml2argvtest as suggested during review comments of V1 of same patch. Signed-off-by: Anup Patel <anup.patel(a)linaro.org> Signed-off-by: Pranavkumar Sawargaonkar <pranavkumar(a)linaro.org> --- src/qemu/qemu_capabilities.c | 2 +- src/qemu/qemu_command.c | 8 ++-- src/qemu/qemu_domain.c | 4 ++ .../qemuxml2argv-aarch64-virt-virtio.args | 14 ++++++ .../qemuxml2argv-aarch64-virt-virtio.xml | 45 ++++++++++++++++++++ tests/qemuxml2argvtest.c | 4 ++ 6 files changed, 73 insertions(+), 4 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-aarch64-virt-virtio.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-aarch64-virt-virtio.xml diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index a68e555..9df3292 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -2889,7 +2889,7 @@ virQEMUCapsSupportsChardev(virDomainDefPtr def, !virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE)) return false; - if (def->os.arch != VIR_ARCH_ARMV7L) + if ((def->os.arch != VIR_ARCH_ARMV7L) && (def->os.arch != VIR_ARCH_AARCH64)) return true; /* This may not be true for all ARM machine types, but at least diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 9539be7..62a16a2 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -427,7 +427,8 @@ qemuDomainSupportsNicdev(virDomainDefPtr def, return false; /* non-virtio ARM nics require legacy -net nic */ - if (def->os.arch == VIR_ARCH_ARMV7L && + if (((def->os.arch == VIR_ARCH_ARMV7L) || + (def->os.arch == VIR_ARCH_AARCH64)) && net->info.type != VIR_DOMAIN_DEVICE_ADDRESS_TYPE_VIRTIO_MMIO) return false; @@ -1340,7 +1341,8 @@ static int qemuDomainAssignARMVirtioMMIOAddresses(virDomainDefPtr def, virQEMUCapsPtr qemuCaps) { - if (def->os.arch == VIR_ARCH_ARMV7L && + if (((def->os.arch == VIR_ARCH_ARMV7L) || + (def->os.arch == VIR_ARCH_AARCH64)) && (STRPREFIX(def->os.machine, "vexpress-") || STREQ(def->os.machine, "virt")) && virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE_VIRTIO_MMIO)) { @@ -1872,7 +1874,7 @@ cleanup: static bool qemuDomainSupportsPCI(virDomainDefPtr def) { - if (def->os.arch != VIR_ARCH_ARMV7L) + if ((def->os.arch != VIR_ARCH_ARMV7L) && (def->os.arch != VIR_ARCH_AARCH64)) return true; if (STREQ(def->os.machine, "versatilepb")) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 346fec3..529b367 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -727,6 +727,10 @@ qemuDomainDefPostParse(virDomainDefPtr def, addDefaultUSB = false; addDefaultMemballoon = false; break; + case VIR_ARCH_AARCH64: + addDefaultUSB = false; + addDefaultMemballoon = false; + break; case VIR_ARCH_ALPHA: case VIR_ARCH_PPC: diff --git a/tests/qemuxml2argvdata/qemuxml2argv-aarch64-virt-virtio.args b/tests/qemuxml2argvdata/qemuxml2argv-aarch64-virt-virtio.args new file mode 100644 index 0000000..afd6e41 --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-aarch64-virt-virtio.args @@ -0,0 +1,14 @@ +LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ +/usr/bin/qemu-system-aarch64 -S -M virt -m 1024 -smp 1 -nographic \ +-nodefconfig -nodefaults -monitor unix:/tmp/test-monitor,server,nowait \ +-boot c -kernel /aarch64.kernel -initrd /aarch64.initrd -append \ +'earlyprintk console=ttyAMA0,115200n8 rw root=/dev/vda rootwait' \ +-dtb /aarch64.dtb -device virtio-serial-device,id=virtio-serial0 -usb \ +-drive file=/aarch64.raw,if=none,id=drive-virtio-disk0 \ +-device virtio-blk-device,drive=drive-virtio-disk0,id=virtio-disk0 \ +-device virtio-net-device,vlan=0,id=net0,mac=52:54:00:09:a4:37 \ +-net user,vlan=0,name=hostnet0 -serial pty -chardev pty,id=charconsole1 \ +-device virtconsole,chardev=charconsole1,id=console1 \ +-device virtio-balloon-device,id=balloon0 \ +-object rng-random,id=rng0,filename=/dev/random \ +-device virtio-rng-device,rng=rng0 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-aarch64-virt-virtio.xml b/tests/qemuxml2argvdata/qemuxml2argv-aarch64-virt-virtio.xml new file mode 100644 index 0000000..184b62c --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-aarch64-virt-virtio.xml @@ -0,0 +1,45 @@ +<domain type="qemu"> + <name>aarch64test</name> + <uuid>496d7ea8-9739-544b-4ebd-ef08be936e8b</uuid> + <memory>1048576</memory> + <currentMemory>1048576</currentMemory> + <vcpu placement='static'>1</vcpu> + <os> + <type arch="aarch64" machine="virt">hvm</type> + <kernel>/aarch64.kernel</kernel> + <initrd>/aarch64.initrd</initrd> + <dtb>/aarch64.dtb</dtb> + <cmdline>earlyprintk console=ttyAMA0,115200n8 rw root=/dev/vda rootwait</cmdline> + </os> + <features> + <acpi/> + <apic/> + <pae/> + </features> + <clock offset="utc"/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>restart</on_crash> + <devices> + <emulator>/usr/bin/qemu-system-aarch64</emulator> + <disk type='file' device='disk'> + <source file='/aarch64.raw'/> + <target dev='vda' bus='virtio'/> + </disk> + <interface type='user'> + <mac address='52:54:00:09:a4:37'/> + <model type='virtio'/> + </interface> + <console type='pty'/> + <console type='pty'> + <target type='virtio' port='0'/> + </console> + <memballoon model='virtio'/> +  + <rng model='virtio'> + <backend model='random'>/dev/random</backend> + </rng> + </devices> +</domain> diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index f9abf1b..1aec0c4 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -1299,6 +1299,10 @@ mymain(void) QEMU_CAPS_DEVICE, QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_DTB, QEMU_CAPS_DRIVE, QEMU_CAPS_DEVICE_VIRTIO_MMIO, QEMU_CAPS_DEVICE_VIRTIO_RNG, QEMU_CAPS_OBJECT_RNG_RANDOM); + DO_TEST("aarch64-virt-virtio", + QEMU_CAPS_DEVICE, QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_DTB, + QEMU_CAPS_DRIVE, QEMU_CAPS_DEVICE_VIRTIO_MMIO, + QEMU_CAPS_DEVICE_VIRTIO_RNG, QEMU_CAPS_OBJECT_RNG_RANDOM); DO_TEST("kvm-pit-device", QEMU_CAPS_KVM_PIT_TICK_POLICY); DO_TEST("kvm-pit-delay", QEMU_CAPS_NO_KVM_PIT); -- 1.7.9.5

2 1

[libvirt] [PATCH RFC] spec: move hypvisor-specific files to hypervisor driver subpackages
by Jim Fehlig 05 Dec '13

05 Dec '13

The libvirt-daemon package contains several hypervisor-specific files, directories, and script, which can be problematic when building the package with multiple hypervisor support, e.g. both QEMU and Xen. E.g. installing a QEMU+Xen enabled libvirt-daemon on a Xen-only system will result in the creation of qemu and kvm groups and a qemu user. Move the hypervisor-specific files, directories, and script to the respective hypervisor driver subpackages. --- libvirt.spec.in | 117 ++++++++++++++++++++++---------------------------------- 1 file changed, 46 insertions(+), 71 deletions(-) diff --git a/libvirt.spec.in b/libvirt.spec.in index cfd8890..76c21ec 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -1522,23 +1522,6 @@ then fi %if %{with_libvirtd} -%pre daemon - %if 0%{?fedora} >= 12 || 0%{?rhel} >= 6 -# We want soft static allocation of well-known ids, as disk images -# are commonly shared across NFS mounts by id rather than name; see -# https://fedoraproject.org/wiki/Packaging:UsersAndGroups -getent group kvm >/dev/null || groupadd -f -g 36 -r kvm -getent group qemu >/dev/null || groupadd -f -g 107 -r qemu -if ! getent passwd qemu >/dev/null; then - if ! getent passwd 107 >/dev/null; then - useradd -r -u 107 -g qemu -G kvm -d / -s /sbin/nologin -c "qemu user" qemu - else - useradd -r -g qemu -G kvm -d / -s /sbin/nologin -c "qemu user" qemu - fi -fi -exit 0 - %endif - %post daemon %if %{with_network} @@ -1647,6 +1630,25 @@ fi %endif %endif + %if %{with_qemu} +%pre daemon-driver-qemu + %if 0%{?fedora} >= 12 || 0%{?rhel} >= 6 +# We want soft static allocation of well-known ids, as disk images +# are commonly shared across NFS mounts by id rather than name; see +# https://fedoraproject.org/wiki/Packaging:UsersAndGroups +getent group kvm >/dev/null || groupadd -f -g 36 -r kvm +getent group qemu >/dev/null || groupadd -f -g 107 -r qemu +if ! getent passwd qemu >/dev/null; then + if ! getent passwd 107 >/dev/null; then + useradd -r -u 107 -g qemu -G kvm -d / -s /sbin/nologin -c "qemu user" qemu + else + useradd -r -g qemu -G kvm -d / -s /sbin/nologin -c "qemu user" qemu + fi +fi +exit 0 + %endif + %endif + %if %{with_network} %post daemon-config-network if test $1 -eq 1 && test ! -f %{_sysconfdir}/libvirt/qemu/networks/default.xml ; then @@ -1770,26 +1772,8 @@ exit 0 %if 0%{?fedora} >= 14 || 0%{?rhel} >= 6 %config(noreplace) %{_prefix}/lib/sysctl.d/libvirtd.conf %endif -%dir %attr(0700, root, root) %{_localstatedir}/log/libvirt/qemu/ -%dir %attr(0700, root, root) %{_localstatedir}/log/libvirt/lxc/ -%dir %attr(0700, root, root) %{_localstatedir}/log/libvirt/uml/ - %if %{with_libxl} -%dir %attr(0700, root, root) %{_localstatedir}/log/libvirt/libxl/ - %endif %config(noreplace) %{_sysconfdir}/logrotate.d/libvirtd - %if %{with_qemu} -%config(noreplace) %{_sysconfdir}/libvirt/qemu.conf -%config(noreplace) %{_sysconfdir}/libvirt/qemu-lockd.conf -%config(noreplace) %{_sysconfdir}/logrotate.d/libvirtd.qemu - %endif - %if %{with_lxc} -%config(noreplace) %{_sysconfdir}/libvirt/lxc.conf -%config(noreplace) %{_sysconfdir}/logrotate.d/libvirtd.lxc - %endif - %if %{with_uml} -%config(noreplace) %{_sysconfdir}/logrotate.d/libvirtd.uml - %endif %dir %{_datadir}/libvirt/ @@ -1805,28 +1789,6 @@ exit 0 %dir %attr(0711, root, root) %{_localstatedir}/lib/libvirt/boot/ %dir %attr(0711, root, root) %{_localstatedir}/cache/libvirt/ - %if %{with_qemu} -%ghost %dir %attr(0700, root, root) %{_localstatedir}/run/libvirt/qemu/ -%dir %attr(0750, %{qemu_user}, %{qemu_group}) %{_localstatedir}/lib/libvirt/qemu/ -%dir %attr(0750, %{qemu_user}, %{qemu_group}) %{_localstatedir}/lib/libvirt/qemu/channel/ -%dir %attr(0750, %{qemu_user}, %{qemu_group}) %{_localstatedir}/lib/libvirt/qemu/channel/target/ -%dir %attr(0750, %{qemu_user}, %{qemu_group}) %{_localstatedir}/cache/libvirt/qemu/ - %endif - %if %{with_lxc} -%ghost %dir %{_localstatedir}/run/libvirt/lxc/ -%dir %attr(0700, root, root) %{_localstatedir}/lib/libvirt/lxc/ - %endif - %if %{with_uml} -%ghost %dir %{_localstatedir}/run/libvirt/uml/ -%dir %attr(0700, root, root) %{_localstatedir}/lib/libvirt/uml/ - %endif - %if %{with_libxl} -%ghost %dir %{_localstatedir}/run/libvirt/libxl/ -%dir %attr(0700, root, root) %{_localstatedir}/lib/libvirt/libxl/ - %endif - %if %{with_xen} -%dir %attr(0700, root, root) %{_localstatedir}/lib/libvirt/xen/ - %endif %if %{with_network} %ghost %dir %{_localstatedir}/run/libvirt/network/ %dir %attr(0700, root, root) %{_localstatedir}/lib/libvirt/network/ @@ -1836,16 +1798,6 @@ exit 0 %dir %attr(0755, root, root) %{_libdir}/libvirt/lock-driver %attr(0755, root, root) %{_libdir}/libvirt/lock-driver/lockd.so - %if %{with_qemu} -%{_datadir}/augeas/lenses/libvirtd_qemu.aug -%{_datadir}/augeas/lenses/tests/test_libvirtd_qemu.aug - %endif - - %if %{with_lxc} -%{_datadir}/augeas/lenses/libvirtd_lxc.aug -%{_datadir}/augeas/lenses/tests/test_libvirtd_lxc.aug - %endif - %{_datadir}/augeas/lenses/libvirtd.aug %{_datadir}/augeas/lenses/tests/test_libvirtd.aug %{_datadir}/augeas/lenses/virtlockd.aug @@ -1864,10 +1816,6 @@ exit 0 %dir %attr(0700, root, root) %{_localstatedir}/log/libvirt/ - %if %{with_lxc} -%attr(0755, root, root) %{_libexecdir}/libvirt_lxc - %endif - %if %{with_storage_disk} %attr(0755, root, root) %{_libexecdir}/libvirt_parthelper %endif @@ -1933,30 +1881,57 @@ exit 0 %if %{with_qemu} %files daemon-driver-qemu %defattr(-, root, root) +%dir %attr(0700, root, root) %{_localstatedir}/log/libvirt/qemu/ +%config(noreplace) %{_sysconfdir}/libvirt/qemu.conf +%config(noreplace) %{_sysconfdir}/libvirt/qemu-lockd.conf +%config(noreplace) %{_sysconfdir}/logrotate.d/libvirtd.qemu +%ghost %dir %attr(0700, root, root) %{_localstatedir}/run/libvirt/qemu/ +%dir %attr(0750, %{qemu_user}, %{qemu_group}) %{_localstatedir}/lib/libvirt/qemu/ +%dir %attr(0750, %{qemu_user}, %{qemu_group}) %{_localstatedir}/lib/libvirt/qemu/channel/ +%dir %attr(0750, %{qemu_user}, %{qemu_group}) %{_localstatedir}/lib/libvirt/qemu/channel/target/ +%dir %attr(0750, %{qemu_user}, %{qemu_group}) %{_localstatedir}/cache/libvirt/qemu/ +%{_datadir}/augeas/lenses/libvirtd_qemu.aug +%{_datadir}/augeas/lenses/tests/test_libvirtd_qemu.aug %{_libdir}/%{name}/connection-driver/libvirt_driver_qemu.so %endif %if %{with_lxc} %files daemon-driver-lxc %defattr(-, root, root) +%dir %attr(0700, root, root) %{_localstatedir}/log/libvirt/lxc/ +%config(noreplace) %{_sysconfdir}/libvirt/lxc.conf +%config(noreplace) %{_sysconfdir}/logrotate.d/libvirtd.lxc +%ghost %dir %{_localstatedir}/run/libvirt/lxc/ +%dir %attr(0700, root, root) %{_localstatedir}/lib/libvirt/lxc/ +%{_datadir}/augeas/lenses/libvirtd_lxc.aug +%{_datadir}/augeas/lenses/tests/test_libvirtd_lxc.aug +%attr(0755, root, root) %{_libexecdir}/libvirt_lxc %{_libdir}/%{name}/connection-driver/libvirt_driver_lxc.so %endif %if %{with_uml} %files daemon-driver-uml %defattr(-, root, root) +%dir %attr(0700, root, root) %{_localstatedir}/log/libvirt/uml/ +%config(noreplace) %{_sysconfdir}/logrotate.d/libvirtd.uml +%ghost %dir %{_localstatedir}/run/libvirt/uml/ +%dir %attr(0700, root, root) %{_localstatedir}/lib/libvirt/uml/ %{_libdir}/%{name}/connection-driver/libvirt_driver_uml.so %endif %if %{with_xen} %files daemon-driver-xen %defattr(-, root, root) +%dir %attr(0700, root, root) %{_localstatedir}/lib/libvirt/xen/ %{_libdir}/%{name}/connection-driver/libvirt_driver_xen.so %endif %if %{with_libxl} %files daemon-driver-libxl %defattr(-, root, root) +%dir %attr(0700, root, root) %{_localstatedir}/log/libvirt/libxl/ +%ghost %dir %{_localstatedir}/run/libvirt/libxl/ +%dir %attr(0700, root, root) %{_localstatedir}/lib/libvirt/libxl/ %{_libdir}/%{name}/connection-driver/libvirt_driver_libxl.so %endif -- 1.8.0.1

3 5

[libvirt] [PATCH] virThreadPoolFree: Set n(Prio)Workers after the pool is locked
by Michal Privoznik 05 Dec '13

05 Dec '13

In 78839da I am trying to join the worker threads. However, I can't sipmly reuse pool->nWorkers (same applies for pool->nPrioWorkers), because of the following flow that is currently implemented: 1) the main thread executing virThreadPoolFree sets pool->quit = true, wakes up all the workers and wait on pool->quit_cond. 2) A worker is woken up and see quit request. It immediately jumps of the while() loop and decrements pool->nWorkers (or pool->nPrioWorkers in case of priority worker). The last thread signalizes pool->quit_cond. 3) Main thread is woken up, with both pool->nWorkers and pool->nPrioWorkers being zero. So there's a need to copy the original value of worker thread counts into local variables. However, these need to set *after* the check for pool being NULL (dereferencing a NULL is no no). And for safety they can be set right after the pool is locked. Reported-by: John Ferlan <jferlan(a)redhat.com> Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/util/virthreadpool.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/util/virthreadpool.c b/src/util/virthreadpool.c index 99f36ec..aa442d1 100644 --- a/src/util/virthreadpool.c +++ b/src/util/virthreadpool.c @@ -242,13 +242,15 @@ void virThreadPoolFree(virThreadPoolPtr pool) virThreadPoolJobPtr job; bool priority = false; size_t i; - size_t nWorkers = pool->nWorkers; - size_t nPrioWorkers = pool->nPrioWorkers; + size_t nWorkers; + size_t nPrioWorkers; if (!pool) return; virMutexLock(&pool->mutex); + nWorkers = pool->nWorkers; + nPrioWorkers = pool->nPrioWorkers; pool->quit = true; if (pool->nWorkers > 0) virCondBroadcast(&pool->cond); -- 1.8.4.4

2 1

[libvirt] [PATCH v2 1/2] conf: add xml element devices/pvpanic
by Hu Tao 05 Dec '13

05 Dec '13

This patch adds a new xml element devices/pvpanic to support qemu device pvpanic. It can be used to receive guest panic notification. Signed-off-by: Hu Tao <hutao(a)cn.fujitsu.com> --- docs/formatdomain.html.in | 25 +++++++++++++++++ src/conf/domain_conf.c | 68 +++++++++++++++++++++++++++++++++++++++++++++++ src/conf/domain_conf.h | 9 +++++++ 3 files changed, 102 insertions(+) diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index 1850a2b..0a72baa 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -5080,6 +5080,31 @@ qemu-kvm -net nic,model=? /dev/null </dd> </dl> + <h4><a name="elementsPvpanic">pvpanic device</a></h4> + <p> + pvpanic device enables libvirt to receive panic notification from a QEMU + guest. + <span class="since">Since 1.3.0, QEMU and KVM only</span> + </p> + <p> + Example: usage of pvpanic configuration + </p> +<pre> + ... + <devices> + <pvpanic ioport='0x505'/> + </devices> + ... +</pre> + <dl> + <dt><code>ioport</code></dt> + <dd> + <p> + ioport used by pvpanic. + </p> + </dd> + </dl> + <h3><a name="seclabel">Security label</a></h3> <p> diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 140eb80..1b8f66f 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -1876,6 +1876,11 @@ virDomainResourceDefFree(virDomainResourceDefPtr resource) VIR_FREE(resource); } +void +virDomainPvpanicDefFree(virDomainPvpanicDefPtr pvpanic) +{ + VIR_FREE(pvpanic); +} void virDomainDefFree(virDomainDefPtr def) { @@ -1964,6 +1969,8 @@ void virDomainDefFree(virDomainDefPtr def) virDomainTPMDefFree(def->tpm); + virDomainPvpanicDefFree(def->pvpanic); + VIR_FREE(def->idmap.uidmap); VIR_FREE(def->idmap.gidmap); @@ -10626,6 +10633,31 @@ cleanup: return idmap; } +static virDomainPvpanicDefPtr +virDomainPvpanicDefParseXML(xmlNodePtr node) +{ + char *ioport = NULL; + virDomainPvpanicDefPtr pvpanic; + + if (VIR_ALLOC(pvpanic) < 0) + return NULL; + + ioport = virXMLPropString(node, "ioport"); + if (!ioport) { + pvpanic->ioport = -1; + } else { + if (virStrToLong_i(ioport, NULL, 0, &pvpanic->ioport) < 0) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("Cannot parse <pvpanic> 'ioport' attribute")); + goto error; + } + } + + return pvpanic; +error: + virDomainPvpanicDefFree(pvpanic); + return NULL; +} /* Parse the XML definition for a vcpupin or emulatorpin. * @@ -12453,6 +12485,27 @@ virDomainDefParseXML(xmlDocPtr xml, } VIR_FREE(nodes); + /* analysis of the pvpanic devices */ + def->pvpanic = NULL; + if ((n = virXPathNodeSet("./devices/pvpanic", ctxt, &nodes)) < 0) { + goto error; + } + if (n > 1) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("only a single pvpanic device is supported")); + goto error; + } + if (n > 0) { + virDomainPvpanicDefPtr pvpanic = + virDomainPvpanicDefParseXML(nodes[0]); + if (!pvpanic) + goto error; + + def->pvpanic = pvpanic; + VIR_FREE(nodes); + } + + /* analysis of the user namespace mapping */ if ((n = virXPathNodeSet("./idmap/uid", ctxt, &nodes)) < 0) goto error; @@ -15715,6 +15768,18 @@ virDomainWatchdogDefFormat(virBufferPtr buf, return 0; } +static int virDomainPvpanicDefFormat(virBufferPtr buf, + virDomainPvpanicDefPtr def) +{ + if (def->ioport > 0) { + virBufferAsprintf(buf, " <pvpanic ioport='%#x'/>\n", + def->ioport); + } else { + virBufferAsprintf(buf, " <pvpanic/>\n"); + } + + return 0; +} static int virDomainRNGDefFormat(virBufferPtr buf, @@ -17138,6 +17203,9 @@ virDomainDefFormatInternal(virDomainDefPtr def, if (def->nvram) virDomainNVRAMDefFormat(buf, def->nvram, flags); + if (def->pvpanic) + virDomainPvpanicDefFormat(buf, def->pvpanic); + virBufferAddLit(buf, " </devices>\n"); virBufferAdjustIndent(buf, 2); diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index 4561ccc..9395852 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -126,6 +126,9 @@ typedef virDomainIdMapEntry *virDomainIdMapEntryPtr; typedef struct _virDomainIdMapDef virDomainIdMapDef; typedef virDomainIdMapDef *virDomainIdMapDefPtr; +typedef struct _virDomainPvpanicDef virDomainPvpanicDef; +typedef virDomainPvpanicDef *virDomainPvpanicDefPtr; + /* Flags for the 'type' field in virDomainDeviceDef */ typedef enum { VIR_DOMAIN_DEVICE_NONE = 0, @@ -1910,6 +1913,10 @@ struct _virDomainIdMapDef { }; +struct _virDomainPvpanicDef { + int ioport; +}; + void virBlkioDeviceWeightArrayClear(virBlkioDeviceWeightPtr deviceWeights, int ndevices); @@ -2061,6 +2068,7 @@ struct _virDomainDef { virSysinfoDefPtr sysinfo; virDomainRedirFilterDefPtr redirfilter; virDomainRNGDefPtr rng; + virDomainPvpanicDefPtr pvpanic; void *namespaceData; virDomainXMLNamespace ns; @@ -2204,6 +2212,7 @@ virDomainObjPtr virDomainObjListFindByName(virDomainObjListPtr doms, bool virDomainObjTaint(virDomainObjPtr obj, enum virDomainTaintFlags taint); +void virDomainPvpanicDefFree(virDomainPvpanicDefPtr pvpanic); void virDomainResourceDefFree(virDomainResourceDefPtr resource); void virDomainGraphicsDefFree(virDomainGraphicsDefPtr def); void virDomainInputDefFree(virDomainInputDefPtr def); -- 1.7.11.7

4 19

[libvirt] [PATCH] qemu: Fix indentation in qemuTranslateDiskSourcePool
by Peter Krempa 05 Dec '13

05 Dec '13

Commit e1a4d08baf9a8cc86c8b5ca27da9aeedb34b5908 was pushed with bad indentation the iSCSI pool translation code. --- Notes: Pushing under the trivial rule. src/qemu/qemu_conf.c | 44 ++++++++++++++++++++++---------------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c index 44e4320..4378791 100644 --- a/src/qemu/qemu_conf.c +++ b/src/qemu/qemu_conf.c @@ -1416,28 +1416,28 @@ qemuTranslateDiskSourcePool(virConnectPtr conn, } switch (def->srcpool->mode) { - case VIR_DOMAIN_DISK_SOURCE_POOL_MODE_DEFAULT: - case VIR_DOMAIN_DISK_SOURCE_POOL_MODE_LAST: - def->srcpool->mode = VIR_DOMAIN_DISK_SOURCE_POOL_MODE_HOST; - /* fallthrough */ - case VIR_DOMAIN_DISK_SOURCE_POOL_MODE_HOST: - def->srcpool->actualtype = VIR_DOMAIN_DISK_TYPE_BLOCK; - if (!(def->src = virStorageVolGetPath(vol))) - goto cleanup; - break; - - case VIR_DOMAIN_DISK_SOURCE_POOL_MODE_DIRECT: - def->srcpool->actualtype = VIR_DOMAIN_DISK_TYPE_NETWORK; - def->protocol = VIR_DOMAIN_DISK_PROTOCOL_ISCSI; - - if (qemuTranslateDiskSourcePoolAuth(def, pooldef) < 0) - goto cleanup; - - if (qemuAddISCSIPoolSourceHost(def, pooldef) < 0) - goto cleanup; - break; - } - break; + case VIR_DOMAIN_DISK_SOURCE_POOL_MODE_DEFAULT: + case VIR_DOMAIN_DISK_SOURCE_POOL_MODE_LAST: + def->srcpool->mode = VIR_DOMAIN_DISK_SOURCE_POOL_MODE_HOST; + /* fallthrough */ + case VIR_DOMAIN_DISK_SOURCE_POOL_MODE_HOST: + def->srcpool->actualtype = VIR_DOMAIN_DISK_TYPE_BLOCK; + if (!(def->src = virStorageVolGetPath(vol))) + goto cleanup; + break; + + case VIR_DOMAIN_DISK_SOURCE_POOL_MODE_DIRECT: + def->srcpool->actualtype = VIR_DOMAIN_DISK_TYPE_NETWORK; + def->protocol = VIR_DOMAIN_DISK_PROTOCOL_ISCSI; + + if (qemuTranslateDiskSourcePoolAuth(def, pooldef) < 0) + goto cleanup; + + if (qemuAddISCSIPoolSourceHost(def, pooldef) < 0) + goto cleanup; + break; + } + break; case VIR_STORAGE_POOL_MPATH: case VIR_STORAGE_POOL_RBD: -- 1.8.4.3

1 0

[libvirt] [PATCHv3 0/3] Implement RBD storage pool support
by Adam Walters 05 Dec '13

05 Dec '13

I have re-written the RBD storage pool patch to work properly under the re-organized QEMU disk argument generation structure. The patch is largely the same as last time, just using the new switch statement and not modifying qemu_command.c anymore. Also of note in this set of patches is a fix to a bug in configure.ac introduced in a recent commit. I had to fix it in order to get my Archlinux package to compile on another machine so I could test the code before submission, so I figured that I would go ahead and share it with everyone, too. Adam Walters (3): qemu: conf: Add qemuAddRBDPoolSourceHost helper function qemu: conf: Implement RBD storage pool support configure: Resolve compile issue in configure.ac configure.ac | 1 - src/qemu/qemu_conf.c | 75 +++++++++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 74 insertions(+), 2 deletions(-) -- 1.8.4.2

3 6

[libvirt] [PATCH 0/5] Fix snapshot xml test suite and add new test
by Peter Krempa 05 Dec '13

05 Dec '13

To cover the case fixed in 5a66c667ff5cae61c2ad2e646c8eb3eedc67f925 we need to upgrade the testsuite first. Peter Krempa (5): domainsnapshotxml2xmltest: Clean up labels and use bool instead of int domainsnapshotxml2xmltest: Allow for better testing of snapshots domainsnapshotxml2xml: Move files with conflicting names domainsnapshotxml2xmltest: Add existing files as new tests domainsnapshotxml2xmltest: Add test case for empty driver element .../disk_driver_name_null.xml | 10 ++ tests/domainsnapshotxml2xmlin/external_vm.xml | 1 - tests/domainsnapshotxml2xmlin/noparent.xml | 1 + .../disk_driver_name_null.xml | 9 + tests/domainsnapshotxml2xmlout/disk_snapshot.xml | 67 +------- .../disk_snapshot_redefine.xml | 80 +++++++++ tests/domainsnapshotxml2xmlout/empty.xml | 8 + tests/domainsnapshotxml2xmlout/external_vm.xml | 39 ----- .../external_vm_redefine.xml | 44 +++++ .../name_and_description.xml | 5 + tests/domainsnapshotxml2xmlout/noparent.xml | 2 +- tests/domainsnapshotxml2xmltest.c | 190 ++++++++++++++++----- 12 files changed, 309 insertions(+), 147 deletions(-) create mode 100644 tests/domainsnapshotxml2xmlin/disk_driver_name_null.xml create mode 100644 tests/domainsnapshotxml2xmlout/disk_driver_name_null.xml create mode 100644 tests/domainsnapshotxml2xmlout/disk_snapshot_redefine.xml create mode 100644 tests/domainsnapshotxml2xmlout/empty.xml create mode 100644 tests/domainsnapshotxml2xmlout/external_vm_redefine.xml create mode 100644 tests/domainsnapshotxml2xmlout/name_and_description.xml -- 1.8.4.3

2 11

[libvirt] [PATCH] qemuAgentDispose: Reset lastError
by Wangyufei (James) 05 Dec '13

05 Dec '13

When an error occurred in qemuAgentIO, it will be saved in mon->lastError, but it will not be freed at last. So I add the following code to fix it. ==22219== 54 bytes in 1 blocks are definitely lost in loss record 982 of 1,379 ==22219== at 0x4C26B9B: malloc (vg_replace_malloc.c:263) ==22219== by 0x8520521: strdup (in /lib64/libc-2.11.3.so) ==22219== by 0x52E99CB: virStrdup (virstring.c:554) ==22219== by 0x52B44C4: virCopyError (virerror.c:195) ==22219== by 0x52B5123: virCopyLastError (virerror.c:312) ==22219== by 0x10905877: qemuAgentIO (qemu_agent.c:660) ==22219== by 0x52B6122: virEventPollDispatchHandles (vireventpoll.c:501) ==22219== by 0x52B7AEA: virEventPollRunOnce (vireventpoll.c:647) ==22219== by 0x52B5C1B: virEventRunDefaultImpl (virevent.c:274) ==22219== by 0x54181FD: virNetServerRun (virnetserver.c:1112) ==22219== by 0x11EF4D: main (libvirtd.c:1513) Signed-off-by: Zhou Yimin <zhouyimin(a)huawei.com> --- src/qemu/qemu_agent.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/src/qemu/qemu_agent.c b/src/qemu/qemu_agent.c index 2cd0ccc..4a3820c 100644 --- a/src/qemu/qemu_agent.c +++ b/src/qemu/qemu_agent.c @@ -161,6 +161,7 @@ static void qemuAgentDispose(void *obj) (mon->cb->destroy)(mon, mon->vm); virCondDestroy(&mon->notify); VIR_FREE(mon->buffer); + virResetError(&mon->lastError); } static int -- 1.7.3.1.msysgit.0 Best Regards, -WangYufei

2 3

[libvirt] [PATCH v2] Fix memory leak in qemuBuildDriveStr()
by Nehal J Wani 04 Dec '13

04 Dec '13

This patch fixes memory leaks reported by valgrind on running qemuxml2argvtest Most of them are of the form: ==24777== 15 bytes in 1 blocks are definitely lost in loss record 39 of 129 ==24777== at 0x4A0887C: malloc (vg_replace_malloc.c:270) ==24777== by 0x341F485E21: strdup (strdup.c:42) ==24777== by 0x4CADE5F: virStrdup (virstring.c:554) ==24777== by 0x4362B6: qemuBuildDriveStr (qemu_command.c:3848) ==24777== by 0x43EF73: qemuBuildCommandLine (qemu_command.c:8500) ==24777== by 0x426670: testCompareXMLToArgvHelper (qemuxml2argvtest.c:350) ==24777== by 0x427C01: virtTestRun (testutils.c:138) ==24777== by 0x41DDB5: mymain (qemuxml2argvtest.c:658) ==24777== by 0x4282A2: virtTestMain (testutils.c:593) ==24777== by 0x341F421A04: (below main) (libc-start.c:225) ==24777== --- v2: Modified according to Eric's comments. src/qemu/qemu_command.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 768fdc4..9539be7 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -4063,6 +4063,7 @@ qemuBuildDriveStr(virConnectPtr conn, virBufferEscape(&opt, ',', ",", "%s,", source); } + VIR_FREE(source); if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE)) virBufferAddLit(&opt, "if=none"); @@ -4274,6 +4275,7 @@ qemuBuildDriveStr(virConnectPtr conn, return virBufferContentAndReset(&opt); error: + VIR_FREE(source); virBufferFreeAndReset(&opt); return NULL; } -- 1.8.1.4

2 1

[libvirt] [PATCH] Fix memory leak in qemuBuildDriveStr()
by Nehal J Wani 04 Dec '13

04 Dec '13

This patch fixes memory leaks reported by valgrind on running qemuxml2argvtest Most of them are of the form: ==24777== 15 bytes in 1 blocks are definitely lost in loss record 39 of 129 ==24777== at 0x4A0887C: malloc (vg_replace_malloc.c:270) ==24777== by 0x341F485E21: strdup (strdup.c:42) ==24777== by 0x4CADE5F: virStrdup (virstring.c:554) ==24777== by 0x4362B6: qemuBuildDriveStr (qemu_command.c:3848) ==24777== by 0x43EF73: qemuBuildCommandLine (qemu_command.c:8500) ==24777== by 0x426670: testCompareXMLToArgvHelper (qemuxml2argvtest.c:350) ==24777== by 0x427C01: virtTestRun (testutils.c:138) ==24777== by 0x41DDB5: mymain (qemuxml2argvtest.c:658) ==24777== by 0x4282A2: virtTestMain (testutils.c:593) ==24777== by 0x341F421A04: (below main) (libc-start.c:225) ==24777== --- src/qemu/qemu_command.c | 74 +++++++++++++++++++++++++------------------------ 1 file changed, 38 insertions(+), 36 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 768fdc4..6a30a29 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -4016,52 +4016,54 @@ qemuBuildDriveStr(virConnectPtr conn, if (qemuDomainDiskGetSourceString(conn, disk, &source) < 0) goto error; - if (source && - !((disk->device == VIR_DOMAIN_DISK_DEVICE_FLOPPY || - disk->device == VIR_DOMAIN_DISK_DEVICE_CDROM) && - disk->tray_status == VIR_DOMAIN_DISK_TRAY_OPEN)) { + if (source) { + if(!((disk->device == VIR_DOMAIN_DISK_DEVICE_FLOPPY || + disk->device == VIR_DOMAIN_DISK_DEVICE_CDROM) && + disk->tray_status == VIR_DOMAIN_DISK_TRAY_OPEN)) { - virBufferAddLit(&opt, "file="); + virBufferAddLit(&opt, "file="); - switch (actualType) { - case VIR_DOMAIN_DISK_TYPE_DIR: - /* QEMU only supports magic FAT format for now */ - if (disk->format > 0 && disk->format != VIR_STORAGE_FILE_FAT) { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("unsupported disk driver type for '%s'"), - virStorageFileFormatTypeToString(disk->format)); - goto error; - } + switch (actualType) { + case VIR_DOMAIN_DISK_TYPE_DIR: + /* QEMU only supports magic FAT format for now */ + if (disk->format > 0 && disk->format != VIR_STORAGE_FILE_FAT) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("unsupported disk driver type for '%s'"), + virStorageFileFormatTypeToString(disk->format)); + goto error; + } - if (!disk->readonly) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("cannot create virtual FAT disks in read-write mode")); - goto error; - } + if (!disk->readonly) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("cannot create virtual FAT disks in read-write mode")); + goto error; + } - virBufferAddLit(&opt, "fat:"); + virBufferAddLit(&opt, "fat:"); - if (disk->device == VIR_DOMAIN_DISK_DEVICE_FLOPPY) - virBufferAddLit(&opt, "floppy:"); + if (disk->device == VIR_DOMAIN_DISK_DEVICE_FLOPPY) + virBufferAddLit(&opt, "floppy:"); - break; + break; - case VIR_DOMAIN_DISK_TYPE_BLOCK: - if (disk->tray_status == VIR_DOMAIN_DISK_TRAY_OPEN) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - disk->type == VIR_DOMAIN_DISK_TYPE_VOLUME ? - _("tray status 'open' is invalid for block type volume") : - _("tray status 'open' is invalid for block type disk")); - goto error; - } + case VIR_DOMAIN_DISK_TYPE_BLOCK: + if (disk->tray_status == VIR_DOMAIN_DISK_TRAY_OPEN) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + disk->type == VIR_DOMAIN_DISK_TYPE_VOLUME ? + _("tray status 'open' is invalid for block type volume") : + _("tray status 'open' is invalid for block type disk")); + goto error; + } - break; + break; - default: - break; - } + default: + break; + } - virBufferEscape(&opt, ',', ",", "%s,", source); + virBufferEscape(&opt, ',', ",", "%s,", source); + } + VIR_FREE(source); } if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE)) -- 1.8.1.4

2 2

[libvirt] [PATCH python 00/15] Initial work porting to python3
by Daniel P. Berrange 04 Dec '13

04 Dec '13

From: "Daniel P. Berrange" <berrange(a)redhat.com> This series starts, but does not complete, the work to port over to build with python3. This involves making the code generator able to run under python3, as well as making it generate code which is python3 compatible. And of course the examples are fixed up too Some things still todo - Deal with String vs Unicode problems - Python2 defaulted to C strings, while Python3 defaults to Unicode - Deal with Int vs Long problems - Python2 had two integer types, Int & Long, but Python3 only has one, Long. - Fix examples to not use libxml2 since it isn't compiled for Python3 in Fedora. - Probably more bugs to find... Daniel P. Berrange (15): generator: Don't use 'list' as a variable name generator: Remove string.lower(XXX) with XXX.lower() generator: Invoke print("...") instead of print "..." generator: Cast iterators to a list() explicitly generator: Remove use of 'has_key' function generator: Update to use sort() 'key' param generator: Remove use of string.replace and string.find functions generator: Sort enums and functions when generating code setup: Fix exception catching syntax examples: Invoke print("...") instead of print "..." examples: Fix exception catching syntax examples: Ensure we write bytes to the self-pipe generator: Fix exception catching syntax in generated code override: Fix native module registration to work with Python3 override: Fix exception catching syntax examples/consolecallback.py | 6 +- examples/dominfo.py | 14 +- examples/domrestore.py | 17 ++- examples/domsave.py | 15 +- examples/domstart.py | 19 ++- examples/esxlist.py | 14 +- examples/event-test.py | 74 +++++----- examples/topology.py | 14 +- generator.py | 328 +++++++++++++++++++++--------------------- libvirt-lxc-override.c | 73 +++++++--- libvirt-override-virStream.py | 6 +- libvirt-override.c | 75 +++++++--- libvirt-override.py | 4 +- libvirt-qemu-override.c | 73 +++++++--- setup.py | 2 +- 15 files changed, 417 insertions(+), 317 deletions(-) -- 1.8.3.1

3 30

[libvirt] [PATCH 0/2] Remove a broken example code and kill usage of atoi in libvirt
by Peter Krempa 04 Dec '13

04 Dec '13

Peter Krempa (2): examples: Remove broken bad example maint: Kill usage of atoi() .gitignore | 1 - Makefile.am | 4 +- cfg.mk | 6 ++ examples/domsuspend/Makefile.am | 25 ------- examples/domsuspend/suspend.c | 136 ------------------------------------- libvirt.spec.in | 3 +- src/conf/storage_conf.h | 2 +- src/storage/storage_backend_disk.c | 14 ++-- src/xen/xend_internal.c | 17 +++-- 9 files changed, 32 insertions(+), 176 deletions(-) delete mode 100644 examples/domsuspend/Makefile.am delete mode 100644 examples/domsuspend/suspend.c -- 1.8.4.3

2 4

[libvirt] [PATCH python] Optimize callback lookup in event handlers
by Daniel P. Berrange 04 Dec '13

04 Dec '13

From: "Daniel P. Berrange" <berrange(a)redhat.com> The event handler code currently invokes PyImport_ImportModule which is very heavyweight. This is not in fact required, since we know the libvirt module has already been imported. We can thus use PyImport_ImportModuleNoBlock and do away with the global variables caching the imported module reference. Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- libvirt-override.c | 35 +++++++++++------------------------ 1 file changed, 11 insertions(+), 24 deletions(-) diff --git a/libvirt-override.c b/libvirt-override.c index 03aab89..aaee6b8 100644 --- a/libvirt-override.c +++ b/libvirt-override.c @@ -4929,39 +4929,26 @@ cleanup: * Helper functions to avoid importing modules * for every callback *******************************************/ -static PyObject *libvirt_module = NULL; -static PyObject *libvirt_dict = NULL; static PyObject * -getLibvirtModuleObject(void) { - if (libvirt_module) - return libvirt_module; - - // PyImport_ImportModule returns a new reference - /* Bogus (char *) cast for RHEL-5 python API brokenness */ - libvirt_module = PyImport_ImportModule((char *)"libvirt"); - if (!libvirt_module) { - DEBUG("%s Error importing libvirt module\n", __FUNCTION__); +getLibvirtDictObject(void) { + PyObject *libvirt_mod; + PyObject *libvirt_dict; + + libvirt_mod = PyImport_ImportModuleNoBlock("libvirt"); + if (!libvirt_mod) { + DEBUG("%s Error finding libvirt in imports\n", + __FUNCTION__); PyErr_Print(); return NULL; } - - return libvirt_module; -} - -static PyObject * -getLibvirtDictObject(void) { - if (libvirt_dict) - return libvirt_dict; - - // PyModule_GetDict returns a borrowed reference - libvirt_dict = PyModule_GetDict(getLibvirtModuleObject()); + libvirt_dict = PyModule_GetDict(libvirt_mod); if (!libvirt_dict) { - DEBUG("%s Error importing libvirt dictionary\n", __FUNCTION__); + DEBUG("%s Error finding libvirt dict\n", + __FUNCTION__); PyErr_Print(); return NULL; } - Py_INCREF(libvirt_dict); return libvirt_dict; } -- 1.8.3.1

2 3

[libvirt] [libvirt-sandbox PATCH V2] Add filter support.
by Ian Main 04 Dec '13

04 Dec '13

This patch adds two new classes, filterref and filterref-parameter. Network interfaces can now have an associated filter reference with any number of filterref parameters. Also added filter= option to virt-sandbox tool. V2: - Changed set_filter to set_name and get_filter to get_name. --- libvirt-sandbox/Makefile.am | 4 + .../libvirt-sandbox-builder-container.c | 37 +++- libvirt-sandbox/libvirt-sandbox-builder-machine.c | 36 ++++ ...rt-sandbox-config-network-filterref-parameter.c | 205 ++++++++++++++++++++ ...rt-sandbox-config-network-filterref-parameter.h | 75 ++++++++ .../libvirt-sandbox-config-network-filterref.c | 209 +++++++++++++++++++++ .../libvirt-sandbox-config-network-filterref.h | 75 ++++++++ libvirt-sandbox/libvirt-sandbox-config-network.c | 33 ++++ libvirt-sandbox/libvirt-sandbox-config-network.h | 4 + libvirt-sandbox/libvirt-sandbox-config.c | 39 ++++ libvirt-sandbox/libvirt-sandbox.h | 3 + libvirt-sandbox/libvirt-sandbox.sym | 14 ++ 12 files changed, 733 insertions(+), 1 deletion(-) create mode 100644 libvirt-sandbox/libvirt-sandbox-config-network-filterref-parameter.c create mode 100644 libvirt-sandbox/libvirt-sandbox-config-network-filterref-parameter.h create mode 100644 libvirt-sandbox/libvirt-sandbox-config-network-filterref.c create mode 100644 libvirt-sandbox/libvirt-sandbox-config-network-filterref.h diff --git a/libvirt-sandbox/Makefile.am b/libvirt-sandbox/Makefile.am index 0882490..4de8766 100644 --- a/libvirt-sandbox/Makefile.am +++ b/libvirt-sandbox/Makefile.am @@ -57,6 +57,8 @@ SANDBOX_HEADER_FILES = \ libvirt-sandbox-config.h \ libvirt-sandbox-config-network.h \ libvirt-sandbox-config-network-address.h \ + libvirt-sandbox-config-network-filterref.h \ + libvirt-sandbox-config-network-filterref-parameter.h \ libvirt-sandbox-config-network-route.h \ libvirt-sandbox-config-mount.h \ libvirt-sandbox-config-mount-file.h \ @@ -85,6 +87,8 @@ SANDBOX_SOURCE_FILES = \ libvirt-sandbox-config.c \ libvirt-sandbox-config-network.c \ libvirt-sandbox-config-network-address.c \ + libvirt-sandbox-config-network-filterref.c \ + libvirt-sandbox-config-network-filterref-parameter.c \ libvirt-sandbox-config-network-route.c \ libvirt-sandbox-config-mount.c \ libvirt-sandbox-config-mount-file.c \ diff --git a/libvirt-sandbox/libvirt-sandbox-builder-container.c b/libvirt-sandbox/libvirt-sandbox-builder-container.c index 43ee5ef..db70403 100644 --- a/libvirt-sandbox/libvirt-sandbox-builder-container.c +++ b/libvirt-sandbox/libvirt-sandbox-builder-container.c @@ -319,11 +319,12 @@ static gboolean gvir_sandbox_builder_container_construct_devices(GVirSandboxBuil g_list_foreach(mounts, (GFunc)g_object_unref, NULL); g_list_free(mounts); - tmp = networks = gvir_sandbox_config_get_networks(config); while (tmp) { const gchar *source, *mac; GVirSandboxConfigNetwork *network = GVIR_SANDBOX_CONFIG_NETWORK(tmp->data); + GVirSandboxConfigNetworkFilterref *filterref; + GVirConfigDomainInterfaceFilterref *glib_fref; iface = gvir_config_domain_interface_network_new(); source = gvir_sandbox_config_network_get_source(network); @@ -339,6 +340,40 @@ static gboolean gvir_sandbox_builder_container_construct_devices(GVirSandboxBuil gvir_config_domain_add_device(domain, GVIR_CONFIG_DOMAIN_DEVICE(iface)); + + filterref = gvir_sandbox_config_network_get_filterref(network); + if (filterref) { + GList *param_iter, *parameters; + const gchar *fref_name = gvir_sandbox_config_network_filterref_get_name(filterref); + glib_fref = gvir_config_domain_interface_filterref_new(); + gvir_config_domain_interface_filterref_set_name(glib_fref, fref_name); + param_iter = parameters = gvir_sandbox_config_network_filterref_get_parameters(filterref); + while (param_iter) { + const gchar *name; + const gchar *value; + GVirSandboxConfigNetworkFilterrefParameter *param = GVIR_SANDBOX_CONFIG_NETWORK_FILTERREF_PARAMETER(param_iter->data); + GVirConfigDomainInterfaceFilterrefParameter *glib_param; + + name = gvir_sandbox_config_network_filterref_parameter_get_name(param); + value = gvir_sandbox_config_network_filterref_parameter_get_value(param); + + glib_param = gvir_config_domain_interface_filterref_parameter_new(); + gvir_config_domain_interface_filterref_parameter_set_name(glib_param, name); + gvir_config_domain_interface_filterref_parameter_set_value(glib_param, value); + + gvir_config_domain_interface_filterref_add_parameter(glib_fref, glib_param); + g_object_unref(glib_param); + + param_iter = param_iter->next; + } + + g_list_foreach(parameters, (GFunc)g_object_unref, NULL); + g_list_free(parameters); + + gvir_config_domain_interface_set_filterref(GVIR_CONFIG_DOMAIN_INTERFACE(iface), glib_fref); + g_object_unref(glib_fref); + } + g_object_unref(iface); tmp = tmp->next; diff --git a/libvirt-sandbox/libvirt-sandbox-builder-machine.c b/libvirt-sandbox/libvirt-sandbox-builder-machine.c index a8c5d8c..0cfedc7 100644 --- a/libvirt-sandbox/libvirt-sandbox-builder-machine.c +++ b/libvirt-sandbox/libvirt-sandbox-builder-machine.c @@ -577,6 +577,8 @@ static gboolean gvir_sandbox_builder_machine_construct_devices(GVirSandboxBuilde while (tmp) { const gchar *source, *mac; GVirSandboxConfigNetwork *network = GVIR_SANDBOX_CONFIG_NETWORK(tmp->data); + GVirSandboxConfigNetworkFilterref *filterref; + GVirConfigDomainInterfaceFilterref *glib_fref; source = gvir_sandbox_config_network_get_source(network); if (source) { @@ -596,6 +598,40 @@ static gboolean gvir_sandbox_builder_machine_construct_devices(GVirSandboxBuilde gvir_config_domain_add_device(domain, GVIR_CONFIG_DOMAIN_DEVICE(iface)); + + filterref = gvir_sandbox_config_network_get_filterref(network); + if (filterref) { + GList *param_iter, *parameters; + const gchar *fref_name = gvir_sandbox_config_network_filterref_get_name(filterref); + glib_fref = gvir_config_domain_interface_filterref_new(); + gvir_config_domain_interface_filterref_set_name(glib_fref, fref_name); + param_iter = parameters = gvir_sandbox_config_network_filterref_get_parameters(filterref); + while (param_iter) { + const gchar *name; + const gchar *value; + GVirSandboxConfigNetworkFilterrefParameter *param = GVIR_SANDBOX_CONFIG_NETWORK_FILTERREF_PARAMETER(param_iter->data); + GVirConfigDomainInterfaceFilterrefParameter *glib_param; + + name = gvir_sandbox_config_network_filterref_parameter_get_name(param); + value = gvir_sandbox_config_network_filterref_parameter_get_value(param); + + glib_param = gvir_config_domain_interface_filterref_parameter_new(); + gvir_config_domain_interface_filterref_parameter_set_name(glib_param, name); + gvir_config_domain_interface_filterref_parameter_set_value(glib_param, value); + + gvir_config_domain_interface_filterref_add_parameter(glib_fref, glib_param); + g_object_unref(glib_param); + + param_iter = param_iter->next; + } + + g_list_foreach(parameters, (GFunc)g_object_unref, NULL); + g_list_free(parameters); + + gvir_config_domain_interface_set_filterref(iface, glib_fref); + g_object_unref(glib_fref); + } + g_object_unref(iface); tmp = tmp->next; diff --git a/libvirt-sandbox/libvirt-sandbox-config-network-filterref-parameter.c b/libvirt-sandbox/libvirt-sandbox-config-network-filterref-parameter.c new file mode 100644 index 0000000..c1ed941 --- /dev/null +++ b/libvirt-sandbox/libvirt-sandbox-config-network-filterref-parameter.c @@ -0,0 +1,205 @@ +/* + * libvirt-sandbox-config-network-filterref-parameter.c: libvirt sandbox configuration + * + * Copyright (C) 2013 Red Hat, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + * + * Author: Ian Main <imain(a)redhat.com> + */ + +#include <config.h> +#include <string.h> + +#include "libvirt-sandbox/libvirt-sandbox.h" + +/** + * SECTION: libvirt-sandbox-config-network-filterref-parameter + * @short_description: Set parameters for a filter reference. + * @include: libvirt-sandbox/libvirt-sandbox.h + * + * Provides an object to store filter parameter name and value. + * + * The GVirSandboxConfigNetworkFilterrefParameter object stores a + * name and value required to set a single parameter of a filter reference. + */ + +#define GVIR_SANDBOX_CONFIG_NETWORK_FILTERREF_PARAMETER_GET_PRIVATE(obj) \ + (G_TYPE_INSTANCE_GET_PRIVATE((obj), GVIR_SANDBOX_TYPE_CONFIG_NETWORK_FILTERREF_PARAMETER, GVirSandboxConfigNetworkFilterrefParameterPrivate)) + +struct _GVirSandboxConfigNetworkFilterrefParameterPrivate +{ + gchar *name; + gchar *value; +}; + +G_DEFINE_TYPE(GVirSandboxConfigNetworkFilterrefParameter, gvir_sandbox_config_network_filterref_parameter, G_TYPE_OBJECT); + + +enum { + PROP_0, + PROP_NAME, + PROP_VALUE, +}; + +enum { + LAST_SIGNAL +}; + +//static gint signals[LAST_SIGNAL]; + + +static void gvir_sandbox_config_network_filterref_parameter_get_property(GObject *object, + guint prop_id, + GValue *value, + GParamSpec *pspec) +{ + GVirSandboxConfigNetworkFilterrefParameter *config = GVIR_SANDBOX_CONFIG_NETWORK_FILTERREF_PARAMETER(object); + GVirSandboxConfigNetworkFilterrefParameterPrivate *priv = config->priv; + + switch (prop_id) { + case PROP_NAME: + g_value_set_string(value, priv->name); + break; + + case PROP_VALUE: + g_value_set_string(value, priv->value); + break; + + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID(object, prop_id, pspec); + } +} + + +static void gvir_sandbox_config_network_filterref_parameter_set_property(GObject *object, + guint prop_id, + const GValue *value, + GParamSpec *pspec) +{ + GVirSandboxConfigNetworkFilterrefParameter *config = GVIR_SANDBOX_CONFIG_NETWORK_FILTERREF_PARAMETER(object); + GVirSandboxConfigNetworkFilterrefParameterPrivate *priv = config->priv; + + switch (prop_id) { + case PROP_NAME: + g_free(priv->name); + priv->name = g_value_dup_string(value); + break; + + case PROP_VALUE: + g_free(priv->value); + priv->value = g_value_dup_string(value); + break; + + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID(object, prop_id, pspec); + } +} + + +static void gvir_sandbox_config_network_filterref_parameter_finalize(GObject *object) +{ + GVirSandboxConfigNetworkFilterrefParameter *config = GVIR_SANDBOX_CONFIG_NETWORK_FILTERREF_PARAMETER(object); + GVirSandboxConfigNetworkFilterrefParameterPrivate *priv = config->priv; + + g_free(priv->name); + g_free(priv->value); + + G_OBJECT_CLASS(gvir_sandbox_config_network_filterref_parameter_parent_class)->finalize(object); +} + + +static void gvir_sandbox_config_network_filterref_parameter_class_init(GVirSandboxConfigNetworkFilterrefParameterClass *klass) +{ + GObjectClass *object_class = G_OBJECT_CLASS(klass); + + object_class->finalize = gvir_sandbox_config_network_filterref_parameter_finalize; + object_class->get_property = gvir_sandbox_config_network_filterref_parameter_get_property; + object_class->set_property = gvir_sandbox_config_network_filterref_parameter_set_property; + + g_object_class_install_property(object_class, + PROP_NAME, + g_param_spec_string("name", + "Name", + "Name of parameter", + NULL, + G_PARAM_READABLE | + G_PARAM_WRITABLE | + G_PARAM_STATIC_NAME | + G_PARAM_STATIC_NICK | + G_PARAM_STATIC_BLURB)); + + g_object_class_install_property(object_class, + PROP_VALUE, + g_param_spec_string("value", + "Value", + "Value of parameter", + NULL, + G_PARAM_READABLE | + G_PARAM_WRITABLE | + G_PARAM_STATIC_NAME | + G_PARAM_STATIC_NICK | + G_PARAM_STATIC_BLURB)); + + g_type_class_add_private(klass, sizeof(GVirSandboxConfigNetworkFilterrefParameterPrivate)); +} + + +static void gvir_sandbox_config_network_filterref_parameter_init(GVirSandboxConfigNetworkFilterrefParameter *param) +{ + param->priv = GVIR_SANDBOX_CONFIG_NETWORK_FILTERREF_PARAMETER_GET_PRIVATE(param); +} + + +/** + * gvir_sandbox_config_network_filterref_parameter_new: + * + * Create a new network config with DHCP enabled + * + * Returns: (transfer full): a new sandbox network object + */ +GVirSandboxConfigNetworkFilterrefParameter *gvir_sandbox_config_network_filterref_parameter_new(void) +{ + return GVIR_SANDBOX_CONFIG_NETWORK_FILTERREF_PARAMETER(g_object_new(GVIR_SANDBOX_TYPE_CONFIG_NETWORK_FILTERREF_PARAMETER, + NULL)); +} + +void gvir_sandbox_config_network_filterref_parameter_set_name(GVirSandboxConfigNetworkFilterrefParameter *param, + const gchar *name) +{ + GVirSandboxConfigNetworkFilterrefParameterPrivate *priv = param->priv; + g_free(priv->name); + priv->name = g_strdup(name); +} + +const gchar *gvir_sandbox_config_network_filterref_parameter_get_name(GVirSandboxConfigNetworkFilterrefParameter *param) +{ + GVirSandboxConfigNetworkFilterrefParameterPrivate *priv = param->priv; + return priv->name; +} + +void gvir_sandbox_config_network_filterref_parameter_set_value(GVirSandboxConfigNetworkFilterrefParameter *param, + const gchar *value) +{ + GVirSandboxConfigNetworkFilterrefParameterPrivate *priv = param->priv; + g_free(priv->value); + priv->value = g_strdup(value); +} + +const gchar *gvir_sandbox_config_network_filterref_parameter_get_value(GVirSandboxConfigNetworkFilterrefParameter *param) +{ + GVirSandboxConfigNetworkFilterrefParameterPrivate *priv = param->priv; + return priv->value; +} diff --git a/libvirt-sandbox/libvirt-sandbox-config-network-filterref-parameter.h b/libvirt-sandbox/libvirt-sandbox-config-network-filterref-parameter.h new file mode 100644 index 0000000..f40895f --- /dev/null +++ b/libvirt-sandbox/libvirt-sandbox-config-network-filterref-parameter.h @@ -0,0 +1,75 @@ +/* + * libvirt-sandbox-config-network-filterref-parameter.h: libvirt sandbox configuration + * + * Copyright (C) 2013 Red Hat, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + * + * Author: Ian Main <imain(a)redhat.com> + */ + +#if !defined(__LIBVIRT_SANDBOX_H__) && !defined(LIBVIRT_SANDBOX_BUILD) +#error "Only <libvirt-sandbox/libvirt-sandbox.h> can be included directly." +#endif + +#ifndef __LIBVIRT_SANDBOX_CONFIG_NETWORK_FILTERREF_PARAMETER_H__ +#define __LIBVIRT_SANDBOX_CONFIG_NETWORK_FILTERREF_PARAMETER_H__ + +G_BEGIN_DECLS + +#define GVIR_SANDBOX_TYPE_CONFIG_NETWORK_FILTERREF_PARAMETER (gvir_sandbox_config_network_filterref_parameter_get_type ()) +#define GVIR_SANDBOX_CONFIG_NETWORK_FILTERREF_PARAMETER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GVIR_SANDBOX_TYPE_CONFIG_NETWORK_FILTERREF_PARAMETER, GVirSandboxConfigNetworkFilterrefParameter)) +#define GVIR_SANDBOX_CONFIG_NETWORK_FILTERREF_PARAMETER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GVIR_SANDBOX_TYPE_CONFIG_NETWORK_FILTERREF_PARAMETER, GVirSandboxConfigNetworkFilterrefParameterClass)) +#define GVIR_SANDBOX_IS_CONFIG_NETWORK_FILTERREF_PARAMETER(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GVIR_SANDBOX_TYPE_CONFIG_NETWORK_FILTERREF_PARAMETER)) +#define GVIR_SANDBOX_IS_CONFIG_NETWORK_FILTERREF_PARAMETER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GVIR_SANDBOX_TYPE_CONFIG_NETWORK_FILTERREF_PARAMETER)) +#define GVIR_SANDBOX_CONFIG_NETWORK_FILTERREF_PARAMETER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GVIR_SANDBOX_TYPE_CONFIG_NETWORK_FILTERREF_PARAMETER, GVirSandboxConfigNetworkFilterrefParameterClass)) + +#define GVIR_SANDBOX_TYPE_CONFIG_NETWORK_FILTERREF_PARAMETER_HANDLE (gvir_sandbox_config_network_filterref_parameter_handle_get_type ()) + +typedef struct _GVirSandboxConfigNetworkFilterrefParameter GVirSandboxConfigNetworkFilterrefParameter; +typedef struct _GVirSandboxConfigNetworkFilterrefParameterPrivate GVirSandboxConfigNetworkFilterrefParameterPrivate; +typedef struct _GVirSandboxConfigNetworkFilterrefParameterClass GVirSandboxConfigNetworkFilterrefParameterClass; + +struct _GVirSandboxConfigNetworkFilterrefParameter +{ + GObject parent; + + GVirSandboxConfigNetworkFilterrefParameterPrivate *priv; + + /* Do not add fields to this struct */ +}; + +struct _GVirSandboxConfigNetworkFilterrefParameterClass +{ + GObjectClass parent_class; + + gpointer padding[LIBVIRT_SANDBOX_CLASS_PADDING]; +}; + +GType gvir_sandbox_config_network_filterref_parameter_get_type(void); + +GVirSandboxConfigNetworkFilterrefParameter *gvir_sandbox_config_network_filterref_parameter_new(void); + +void gvir_sandbox_config_network_filterref_parameter_set_name(GVirSandboxConfigNetworkFilterrefParameter *param, + const gchar *name); +const gchar *gvir_sandbox_config_network_filterref_parameter_get_name(GVirSandboxConfigNetworkFilterrefParameter *param); + +void gvir_sandbox_config_network_filterref_parameter_set_value(GVirSandboxConfigNetworkFilterrefParameter *param, + const gchar *value); +const gchar *gvir_sandbox_config_network_filterref_parameter_get_value(GVirSandboxConfigNetworkFilterrefParameter *param); + +G_END_DECLS + +#endif /* __LIBVIRT_SANDBOX_CONFIG_NETWORK_FILTERREF_PARAMETER_H__ */ diff --git a/libvirt-sandbox/libvirt-sandbox-config-network-filterref.c b/libvirt-sandbox/libvirt-sandbox-config-network-filterref.c new file mode 100644 index 0000000..71cec31 --- /dev/null +++ b/libvirt-sandbox/libvirt-sandbox-config-network-filterref.c @@ -0,0 +1,209 @@ +/* + * libvirt-sandbox-config-mount.c: libvirt sandbox configuration + * + * Copyright (C) 2013 Red Hat, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + * + * Author: Ian Main <imain(a)redhat.com> + */ + +#include <config.h> +#include <string.h> + +#include "libvirt-sandbox/libvirt-sandbox.h" + +/** + * SECTION: libvirt-sandbox-config-network-filterref + * @short_description: Add a network filter to a network interface. + * @include: libvirt-sandbox/libvirt-sandbox.h + * @see_aloso: #GVirSandboxConfig + * + * Provides an object to store the name of the filter reference. + * + * The GVirSandboxConfigNetworkFilterref object stores the name of the filter + * references associated with a network interface. + */ + +#define GVIR_SANDBOX_CONFIG_NETWORK_FILTERREF_GET_PRIVATE(obj) \ + (G_TYPE_INSTANCE_GET_PRIVATE((obj), GVIR_SANDBOX_TYPE_CONFIG_NETWORK_FILTERREF, GVirSandboxConfigNetworkFilterrefPrivate)) + +struct _GVirSandboxConfigNetworkFilterrefPrivate +{ + gchar *filter; + GList *parameters; +}; + +G_DEFINE_TYPE(GVirSandboxConfigNetworkFilterref, gvir_sandbox_config_network_filterref, G_TYPE_OBJECT); + + +enum { + PROP_0, + PROP_FILTER +}; + +enum { + LAST_SIGNAL +}; + +//static gint signals[LAST_SIGNAL]; + +static void gvir_sandbox_config_network_filterref_get_property(GObject *object, + guint prop_id, + GValue *value, + GParamSpec *pspec) +{ + GVirSandboxConfigNetworkFilterref *config = GVIR_SANDBOX_CONFIG_NETWORK_FILTERREF(object); + GVirSandboxConfigNetworkFilterrefPrivate *priv = config->priv; + + switch (prop_id) { + case PROP_FILTER: + g_value_set_string(value, priv->filter); + break; + + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID(object, prop_id, pspec); + } +} + + +static void gvir_sandbox_config_network_filterref_set_property(GObject *object, + guint prop_id, + const GValue *value, + GParamSpec *pspec) +{ + GVirSandboxConfigNetworkFilterref *config = GVIR_SANDBOX_CONFIG_NETWORK_FILTERREF(object); + GVirSandboxConfigNetworkFilterrefPrivate *priv = config->priv; + + switch (prop_id) { + case PROP_FILTER: + g_free(priv->filter); + priv->filter = g_value_dup_string(value); + break; + + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID(object, prop_id, pspec); + } +} + + + +static void gvir_sandbox_config_network_filterref_finalize(GObject *object) +{ + GVirSandboxConfigNetworkFilterref *config = GVIR_SANDBOX_CONFIG_NETWORK_FILTERREF(object); + GVirSandboxConfigNetworkFilterrefPrivate *priv = config->priv; + + g_free(priv->filter); + g_list_foreach(priv->parameters, (GFunc)g_object_unref, NULL); + + G_OBJECT_CLASS(gvir_sandbox_config_network_filterref_parent_class)->finalize(object); +} + + +static void gvir_sandbox_config_network_filterref_class_init(GVirSandboxConfigNetworkFilterrefClass *klass) +{ + GObjectClass *object_class = G_OBJECT_CLASS(klass); + + object_class->finalize = gvir_sandbox_config_network_filterref_finalize; + object_class->get_property = gvir_sandbox_config_network_filterref_get_property; + object_class->set_property = gvir_sandbox_config_network_filterref_set_property; + + g_object_class_install_property(object_class, + PROP_FILTER, + g_param_spec_string("filter", + "Filter name", + "The filter reference name", + NULL, + G_PARAM_READABLE | + G_PARAM_WRITABLE | + G_PARAM_CONSTRUCT_ONLY | + G_PARAM_STATIC_NAME | + G_PARAM_STATIC_NICK | + G_PARAM_STATIC_BLURB)); + + g_type_class_add_private(klass, sizeof(GVirSandboxConfigNetworkFilterrefPrivate)); +} + +/** + * gvir_sandbox_config_network_filterref_new: + * + * Create a new network filterref config. + * + * Returns: (transfer full): a new sandbox network_filterref object + */ +GVirSandboxConfigNetworkFilterref *gvir_sandbox_config_network_filterref_new(void) +{ + return GVIR_SANDBOX_CONFIG_NETWORK_FILTERREF(g_object_new(GVIR_SANDBOX_TYPE_CONFIG_NETWORK_FILTERREF, + NULL)); +} + + +static void gvir_sandbox_config_network_filterref_init(GVirSandboxConfigNetworkFilterref *config) +{ + config->priv = GVIR_SANDBOX_CONFIG_NETWORK_FILTERREF_GET_PRIVATE(config); +} + + +/** + * gvir_sandbox_config_network_filterref_get_name: + * @config: (transfer none): the network filter reference name + * + * Retrieves the network filter reference name. + * + * Returns: (transfer none): the network filter reference name. + */ +const gchar *gvir_sandbox_config_network_filterref_get_name(GVirSandboxConfigNetworkFilterref *config) +{ + GVirSandboxConfigNetworkFilterrefPrivate *priv = config->priv; + return priv->filter; +} + +void gvir_sandbox_config_network_filterref_set_name(GVirSandboxConfigNetworkFilterref *config, + const gchar *name) +{ + GVirSandboxConfigNetworkFilterrefPrivate *priv = config->priv; + g_free(priv->filter); + priv->filter = g_strdup(name); +} + +/** + * gvir_sandbox_config_network_filterref_add_parameter: + * @filter: (transfer none): the network filter reference. + * @param: (transfer none): the filter parameter + * + * Add a parameter to a network filter reference. + */ +void gvir_sandbox_config_network_filterref_add_parameter(GVirSandboxConfigNetworkFilterref *filter, + GVirSandboxConfigNetworkFilterrefParameter *param) +{ + GVirSandboxConfigNetworkFilterrefPrivate *priv = filter->priv; + priv->parameters = g_list_append(priv->parameters, g_object_ref(param)); +} + + +/** + * gvir_sandbox_config_network_filterref_get_parameters: + * @filter: (transfer none): the filter reference configuration + * + * Retrieve the list of parameters associated with a network filter reference + * + * Returns: (transfer full)(element-type GVirSandboxConfigNetworkFilterrefParameter): the parameter list + */ +GList *gvir_sandbox_config_network_filterref_get_parameters(GVirSandboxConfigNetworkFilterref *filter) +{ + GVirSandboxConfigNetworkFilterrefPrivate *priv = filter->priv; + g_list_foreach(priv->parameters, (GFunc)g_object_ref, NULL); + return g_list_copy(priv->parameters); +} diff --git a/libvirt-sandbox/libvirt-sandbox-config-network-filterref.h b/libvirt-sandbox/libvirt-sandbox-config-network-filterref.h new file mode 100644 index 0000000..4925530 --- /dev/null +++ b/libvirt-sandbox/libvirt-sandbox-config-network-filterref.h @@ -0,0 +1,75 @@ +/* + * libvirt-sandbox-config-mount.h: libvirt sandbox configuration + * + * Copyright (C) 2013 Red Hat, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + * + * Author: Ian Main <imain(a)redhat.com> + */ + +#if !defined(__LIBVIRT_SANDBOX_H__) && !defined(LIBVIRT_SANDBOX_BUILD) +#error "Only <libvirt-sandbox/libvirt-sandbox.h> can be included directly." +#endif + +#ifndef __LIBVIRT_SANDBOX_CONFIG_NETWORK_FILTERREF_H__ +#define __LIBVIRT_SANDBOX_CONFIG_NETWORK_FILTERREF_H__ + +G_BEGIN_DECLS + +#define GVIR_SANDBOX_TYPE_CONFIG_NETWORK_FILTERREF (gvir_sandbox_config_network_filterref_get_type ()) +#define GVIR_SANDBOX_CONFIG_NETWORK_FILTERREF(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GVIR_SANDBOX_TYPE_CONFIG_NETWORK_FILTERREF, GVirSandboxConfigNetworkFilterref)) +#define GVIR_SANDBOX_CONFIG_NETWORK_FILTERREF_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GVIR_SANDBOX_TYPE_CONFIG_NETWORK_FILTERREF, GVirSandboxConfigNetworkFilterrefClass)) +#define GVIR_SANDBOX_IS_CONFIG_NETWORK_FILTERREF(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GVIR_SANDBOX_TYPE_CONFIG_NETWORK_FILTERREF)) +#define GVIR_SANDBOX_IS_CONFIG_NETWORK_FILTERREF_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GVIR_SANDBOX_TYPE_CONFIG_NETWORK_FILTERREF)) +#define GVIR_SANDBOX_CONFIG_NETWORK_FILTERREF_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GVIR_SANDBOX_TYPE_CONFIG_NETWORK_FILTERREF, GVirSandboxConfigNetworkFilterrefClass)) + +#define GVIR_SANDBOX_TYPE_CONFIG_NETWORK_FILTERREF_HANDLE (gvir_sandbox_config_network_filterref_handle_get_type ()) + +typedef struct _GVirSandboxConfigNetworkFilterref GVirSandboxConfigNetworkFilterref; +typedef struct _GVirSandboxConfigNetworkFilterrefPrivate GVirSandboxConfigNetworkFilterrefPrivate; +typedef struct _GVirSandboxConfigNetworkFilterrefClass GVirSandboxConfigNetworkFilterrefClass; + +struct _GVirSandboxConfigNetworkFilterref +{ + GObject parent; + + GVirSandboxConfigNetworkFilterrefPrivate *priv; + + /* Do not add fields to this struct */ +}; + +struct _GVirSandboxConfigNetworkFilterrefClass +{ + GObjectClass parent_class; + + gpointer padding[LIBVIRT_SANDBOX_CLASS_PADDING]; +}; + +GType gvir_sandbox_config_network_filterref_get_type(void); + +GVirSandboxConfigNetworkFilterref *gvir_sandbox_config_network_filterref_new(void); + +const gchar *gvir_sandbox_config_network_filterref_get_name(GVirSandboxConfigNetworkFilterref *config); +void gvir_sandbox_config_network_filterref_set_name(GVirSandboxConfigNetworkFilterref *filter, const gchar *name); + +void gvir_sandbox_config_network_filterref_add_parameter(GVirSandboxConfigNetworkFilterref *filter, + GVirSandboxConfigNetworkFilterrefParameter *param); +GList *gvir_sandbox_config_network_filterref_get_parameters(GVirSandboxConfigNetworkFilterref *filter); + + +G_END_DECLS + +#endif /* __LIBVIRT_SANDBOX_CONFIG_NETWORK_FILTERREF_H__ */ diff --git a/libvirt-sandbox/libvirt-sandbox-config-network.c b/libvirt-sandbox/libvirt-sandbox-config-network.c index 7e7c015..555a360 100644 --- a/libvirt-sandbox/libvirt-sandbox-config-network.c +++ b/libvirt-sandbox/libvirt-sandbox-config-network.c @@ -47,6 +47,7 @@ struct _GVirSandboxConfigNetworkPrivate gchar *mac; GList *routes; GList *addrs; + GVirSandboxConfigNetworkFilterref *filterref; }; G_DEFINE_TYPE(GVirSandboxConfigNetwork, gvir_sandbox_config_network, G_TYPE_OBJECT); @@ -285,6 +286,38 @@ GList *gvir_sandbox_config_network_get_addresses(GVirSandboxConfigNetwork *confi } /** + * gvir_sandbox_config_network_set_filterref: + * @config: (transfer none): the sandbox network configuration + * @ref: (transfer none): the network filterref + * + * Set a network filterref for the given network. + */ +void gvir_sandbox_config_network_set_filterref(GVirSandboxConfigNetwork *config, + GVirSandboxConfigNetworkFilterref *filterref) +{ + GVirSandboxConfigNetworkPrivate *priv = config->priv; + if (priv->filterref) + g_object_unref(priv->filterref); + priv->filterref = g_object_ref(filterref); +} + + +/** + * gvir_sandbox_config_network_get_filterref: + * @config: (transfer none): the sandbox network configuration + * + * Retrieve the associated filter reference. + * + * Returns: (transfer none): The associated filter reference. + */ +GVirSandboxConfigNetworkFilterref *gvir_sandbox_config_network_get_filterref(GVirSandboxConfigNetwork *config) +{ + GVirSandboxConfigNetworkPrivate *priv = config->priv; + return priv->filterref; +} + + +/** * gvir_sandbox_config_network_add_route: * @config: (transfer none): the sandbox network configuration * @addr: (transfer none): the network route diff --git a/libvirt-sandbox/libvirt-sandbox-config-network.h b/libvirt-sandbox/libvirt-sandbox-config-network.h index d926fd1..4a52221 100644 --- a/libvirt-sandbox/libvirt-sandbox-config-network.h +++ b/libvirt-sandbox/libvirt-sandbox-config-network.h @@ -78,6 +78,10 @@ void gvir_sandbox_config_network_add_address(GVirSandboxConfigNetwork *config, GVirSandboxConfigNetworkAddress *addr); GList *gvir_sandbox_config_network_get_addresses(GVirSandboxConfigNetwork *config); +void gvir_sandbox_config_network_set_filterref(GVirSandboxConfigNetwork *config, + GVirSandboxConfigNetworkFilterref *ref); +GVirSandboxConfigNetworkFilterref *gvir_sandbox_config_network_get_filterref(GVirSandboxConfigNetwork *config); + void gvir_sandbox_config_network_add_route(GVirSandboxConfigNetwork *config, GVirSandboxConfigNetworkRoute *addr); GList *gvir_sandbox_config_network_get_routes(GVirSandboxConfigNetwork *config); diff --git a/libvirt-sandbox/libvirt-sandbox-config.c b/libvirt-sandbox/libvirt-sandbox-config.c index b1525a1..f996ea5 100644 --- a/libvirt-sandbox/libvirt-sandbox-config.c +++ b/libvirt-sandbox/libvirt-sandbox-config.c @@ -911,6 +911,8 @@ gboolean gvir_sandbox_config_add_network_strv(GVirSandboxConfig *config, * source=private,address=192.168.122.1/24%192.168.122.255, * address=192.168.122.1/24%192.168.122.255,address=2001:212::204:2/64 * route=192.168.122.255/24%192.168.1.1 + * filter=clean-traffic + * filter.ip=192.168.122.1 */ gboolean gvir_sandbox_config_add_network_opts(GVirSandboxConfig *config, const gchar *network, @@ -924,8 +926,10 @@ gboolean gvir_sandbox_config_add_network_opts(GVirSandboxConfig *config, gchar **params = g_strsplit(network, ",", 50); gsize j = 0; GVirSandboxConfigNetwork *net; + GVirSandboxConfigNetworkFilterref *filter; net = gvir_sandbox_config_network_new(); + filter = gvir_sandbox_config_network_filterref_new(); gvir_sandbox_config_network_set_dhcp(net, FALSE); while (params && params[j]) { @@ -947,6 +951,40 @@ gboolean gvir_sandbox_config_add_network_opts(GVirSandboxConfig *config, } else if (g_str_has_prefix(param, "mac=")) { gvir_sandbox_config_network_set_mac(net, param + strlen("mac=")); + } else if (g_str_has_prefix(param, "filter.")) { + GVirSandboxConfigNetworkFilterrefParameter *filter_param; + gchar *tail = g_strdup(param + strlen("filter.")); + gchar *equ = g_strrstr(tail, "="); + gchar *name, *name_up, *value; + + if (equ == NULL) { + g_free(tail); + g_set_error(error, GVIR_SANDBOX_CONFIG_ERROR, 0, + _("No assignment in filter parameter configuration")); + g_object_unref(net); + goto cleanup; + } + + name = g_strndup(tail, equ - tail); + value = g_strdup(equ + 1); + /* Convert to upcase for convenience. */ + name_up = g_ascii_strup(name, -1); + g_free(name); + + filter_param = gvir_sandbox_config_network_filterref_parameter_new(); + gvir_sandbox_config_network_filterref_parameter_set_name(filter_param, name_up); + gvir_sandbox_config_network_filterref_parameter_set_value(filter_param, value); + gvir_sandbox_config_network_filterref_add_parameter(filter, filter_param); + + g_free(tail); + g_free(name_up); + g_free(value); + } else if (g_str_has_prefix(param, "filter=")) { + gchar *name = g_strdup(param + strlen("filter=")); + + gvir_sandbox_config_network_filterref_set_name(filter, name); + gvir_sandbox_config_network_set_filterref(net, filter); + g_free(name); } else if (g_str_has_prefix(param, "address=")) { GVirSandboxConfigNetworkAddress *addr; GInetAddress *primaryaddr; @@ -1090,6 +1128,7 @@ gboolean gvir_sandbox_config_add_network_opts(GVirSandboxConfig *config, ret = TRUE; cleanup: + g_object_unref(filter); return ret; } diff --git a/libvirt-sandbox/libvirt-sandbox.h b/libvirt-sandbox/libvirt-sandbox.h index a3f0b2c..adb21a1 100644 --- a/libvirt-sandbox/libvirt-sandbox.h +++ b/libvirt-sandbox/libvirt-sandbox.h @@ -25,6 +25,7 @@ /* External includes */ #include <libvirt-gobject/libvirt-gobject.h> +#include <locale.h> /* Local includes */ #include <libvirt-sandbox/libvirt-sandbox-main.h> @@ -37,6 +38,8 @@ #include <libvirt-sandbox/libvirt-sandbox-config-mount-guest-bind.h> #include <libvirt-sandbox/libvirt-sandbox-config-mount-ram.h> #include <libvirt-sandbox/libvirt-sandbox-config-network-address.h> +#include <libvirt-sandbox/libvirt-sandbox-config-network-filterref-parameter.h> +#include <libvirt-sandbox/libvirt-sandbox-config-network-filterref.h> #include <libvirt-sandbox/libvirt-sandbox-config-network-route.h> #include <libvirt-sandbox/libvirt-sandbox-config-network.h> #include <libvirt-sandbox/libvirt-sandbox-config.h> diff --git a/libvirt-sandbox/libvirt-sandbox.sym b/libvirt-sandbox/libvirt-sandbox.sym index 7b7c8be..c46ccd9 100644 --- a/libvirt-sandbox/libvirt-sandbox.sym +++ b/libvirt-sandbox/libvirt-sandbox.sym @@ -44,6 +44,7 @@ LIBVIRT_SANDBOX_0.2.1 { gvir_sandbox_config_mount_ram_set_usage; gvir_sandbox_config_network_add_address; + gvir_sandbox_config_network_set_filterref; gvir_sandbox_config_network_add_route; gvir_sandbox_config_network_get_type; gvir_sandbox_config_network_get_dhcp; @@ -51,6 +52,7 @@ LIBVIRT_SANDBOX_0.2.1 { gvir_sandbox_config_network_get_source; gvir_sandbox_config_network_get_routes; gvir_sandbox_config_network_get_addresses; + gvir_sandbox_config_network_get_filterref; gvir_sandbox_config_network_new; gvir_sandbox_config_network_set_dhcp; gvir_sandbox_config_network_set_mac; @@ -65,6 +67,18 @@ LIBVIRT_SANDBOX_0.2.1 { gvir_sandbox_config_network_address_set_primary; gvir_sandbox_config_network_address_set_prefix; + gvir_sandbox_config_network_filterref_get_type; + gvir_sandbox_config_network_filterref_new; + gvir_sandbox_config_network_filterref_get_name; + gvir_sandbox_config_network_filterref_set_name; + + gvir_sandbox_config_network_filterref_parameter_get_type; + gvir_sandbox_config_network_filterref_parameter_new; + gvir_sandbox_config_network_filterref_parameter_get_name; + gvir_sandbox_config_network_filterref_parameter_set_name; + gvir_sandbox_config_network_filterref_parameter_get_value; + gvir_sandbox_config_network_filterref_parameter_set_value; + gvir_sandbox_config_network_route_get_type; gvir_sandbox_config_network_route_get_prefix; gvir_sandbox_config_network_route_get_gateway; -- 1.8.1.4

2 9

[libvirt] [PATCH] virThreadPoolFree: Join worker threads
by Michal Privoznik 04 Dec '13

04 Dec '13

Even though currently we are freeing the pool of worker threads at the daemon very end, nothing holds us back in joining the worker threads. Moreover, we avoid leaks like this: ==26697== 1,680 bytes in 5 blocks are possibly lost in loss record 913 of 942 ==26697== at 0x4C2BDE4: calloc (in /usr/lib64/valgrind/vgpreload_memcheck-amd64-linux.so) ==26697== by 0x4011131: allocate_dtv (in /lib64/ld-2.16.so) ==26697== by 0x401176D: _dl_allocate_tls (in /lib64/ld-2.16.so) ==26697== by 0x8499602: pthread_create@@GLIBC_2.2.5 (in /lib64/libpthread-2.16.so) ==26697== by 0x52F53E9: virThreadCreate (virthreadpthread.c:188) ==26697== by 0x52F5D4F: virThreadPoolNew (virthreadpool.c:221) ==26697== by 0x53F30DB: virNetServerNew (virnetserver.c:377) ==26697== by 0x11C6ED: main (libvirtd.c:1366) Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/util/virthreadpool.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/util/virthreadpool.c b/src/util/virthreadpool.c index b1e2c0c..99f36ec 100644 --- a/src/util/virthreadpool.c +++ b/src/util/virthreadpool.c @@ -241,6 +241,9 @@ void virThreadPoolFree(virThreadPoolPtr pool) { virThreadPoolJobPtr job; bool priority = false; + size_t i; + size_t nWorkers = pool->nWorkers; + size_t nPrioWorkers = pool->nPrioWorkers; if (!pool) return; @@ -262,6 +265,12 @@ void virThreadPoolFree(virThreadPoolPtr pool) VIR_FREE(job); } + for (i = 0; i < nWorkers; i++) + virThreadJoin(&pool->workers[i]); + + for (i = 0; i < nPrioWorkers; i++) + virThreadJoin(&pool->prioWorkers[i]); + VIR_FREE(pool->workers); virMutexUnlock(&pool->mutex); virMutexDestroy(&pool->mutex); -- 1.8.4.4

3 2

[libvirt] [PATCH] Don't overwrite errors from virConfReadFile
by Daniel P. Berrange 04 Dec '13

04 Dec '13

From: "Daniel P. Berrange" <berrange(a)redhat.com> The SELinux security driver would overwrite errors from the virConfReadFile function. Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- src/security/security_selinux.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/src/security/security_selinux.c b/src/security/security_selinux.c index ace9cc0..11c0c3b 100644 --- a/src/security/security_selinux.c +++ b/src/security/security_selinux.c @@ -414,13 +414,8 @@ virSecuritySELinuxLXCInitialize(virSecurityManagerPtr mgr) } # endif - selinux_conf = virConfReadFile(selinux_lxc_contexts_path(), 0); - if (!selinux_conf) { - virReportSystemError(errno, - _("cannot open SELinux lxc contexts file '%s'"), - selinux_lxc_contexts_path()); + if (!(selinux_conf = virConfReadFile(selinux_lxc_contexts_path(), 0))) goto error; - } scon = virConfGetValue(selinux_conf, "process"); if (! scon || scon->type != VIR_CONF_STRING || (! scon->str)) { -- 1.8.3.1

2 1

[libvirt] [PATCH] autogen: work around BSD toolchain snafu
by Eric Blake 04 Dec '13

04 Dec '13

With my help on IRC, Roman Bogorodskiy identified a bug where the BSD autoconf wrapper script eats stdin[1], which in turn causes autopoint from gettext 0.18.3 to fail to find AM_GNU_GETTEXT_VERSION within configure.ac[2], with this error: ./bootstrap: autopoint --force autopoint: *** Missing version: please specify in configure.ac through a line 'AM_GNU_GETTEXT_VERSION(x.yy.zz)' the gettext version the package is using [1] http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/184479 [2] http://git.sv.gnu.org/cgit/gettext.git/commit/gettext-tools/misc/autopoint.… We found a workaround - fake the use of an intl subdirectory long enough for autopoint to get what it wants from that fallback. This workaround may eventually move upstream into gnulib's bootstrap; when it does, we can remove the hack from libvirt's autogen.sh. * autogen.sh (bootstrap): Force autopoint to work even if autom4te doesn't. Signed-off-by: Eric Blake <eblake(a)redhat.com> --- I tested that this doesn't fall apart on Fedora 19 when running autogen.sh (autopoint 0.18.2, no autom4te wrapper), but would like feedback from Roman that it works for his broken toolchain setup. I'd also like feedback from gnulib whether we should fold a similar fix into gnulib's bootstrap, instead of applying this patch to libvirt. autogen.sh | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/autogen.sh b/autogen.sh index 5aa1990..31e66c0 100755 --- a/autogen.sh +++ b/autogen.sh @@ -88,9 +88,16 @@ if test -d .git || test -f .git; then echo cleaning up submodules... git submodule foreach 'git clean -dfqx && git reset --hard' fi + # work around broken BSD toolchain, where gettext 0.18.3 triggers + # a bug with the autom4te wrapper script eating stdin unless + # intl/VERSION exists, with contents comparable to configure.ac + mkdir -p intl + echo gettext-0.17 > intl/VERSION echo running bootstrap$no_git... ./bootstrap$no_git --bootstrap-sync && bootstrap_hash > $curr_status \ || { echo "Failed to bootstrap, please investigate."; exit 1; } + rm intl/VERSION + rmdir -p intl fi fi -- 1.8.3.1

2 2

[libvirt] [PATCH] virThreadPool: Don't create joinable threads
by Michal Privoznik 04 Dec '13

04 Dec '13

Otherwise these threads won't clean after themselves, as we are not joining them: ==26697== 1,680 bytes in 5 blocks are possibly lost in loss record 913 of 942 ==26697== at 0x4C2BDE4: calloc (in /usr/lib64/valgrind/vgpreload_memcheck-amd64-linux.so) ==26697== by 0x4011131: allocate_dtv (in /lib64/ld-2.16.so) ==26697== by 0x401176D: _dl_allocate_tls (in /lib64/ld-2.16.so) ==26697== by 0x8499602: pthread_create@@GLIBC_2.2.5 (in /lib64/libpthread-2.16.so) ==26697== by 0x52F53E9: virThreadCreate (virthreadpthread.c:188) ==26697== by 0x52F5D4F: virThreadPoolNew (virthreadpool.c:221) ==26697== by 0x53F30DB: virNetServerNew (virnetserver.c:377) ==26697== by 0x11C6ED: main (libvirtd.c:1366) Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/util/virthreadpool.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/util/virthreadpool.c b/src/util/virthreadpool.c index b1e2c0c..cb9e390 100644 --- a/src/util/virthreadpool.c +++ b/src/util/virthreadpool.c @@ -197,7 +197,7 @@ virThreadPoolPtr virThreadPoolNew(size_t minWorkers, data->cond = &pool->cond; if (virThreadCreate(&pool->workers[i], - true, + false, virThreadPoolWorker, data) < 0) { goto error; @@ -219,7 +219,7 @@ virThreadPoolPtr virThreadPoolNew(size_t minWorkers, data->priority = true; if (virThreadCreate(&pool->prioWorkers[i], - true, + false, virThreadPoolWorker, data) < 0) { goto error; @@ -319,7 +319,7 @@ int virThreadPoolSendJob(virThreadPoolPtr pool, data->cond = &pool->cond; if (virThreadCreate(&pool->workers[pool->nWorkers - 1], - true, + false, virThreadPoolWorker, data) < 0) { VIR_FREE(data); -- 1.8.4.4

2 1

[libvirt] [PATCH v4] Pin guest to memory node on NUMA system
by Shivaprasad G Bhat 04 Dec '13

04 Dec '13

Version 4: cpuset/mems modification moved to a new funtion and removed duplicate code as per the comments on v3. Version 3: Addressed comments on V2. Version 2: Fixed the string formatting errors in v1. The patch contains the fix for defect 1009880 reported at redhat bugzilla. The root cause is, ever since the subcpusets(vcpu,emulator) were introduced, the parent cpuset cannot be modified to remove the nodes that are in use by the subcpusets. The fix is to break the memory node modification into three steps as to assign new nodes into the parent first. Change the nodes in the child nodes. Then remove the old nodes on the parent node. Signed-off-by: Shivaprasad G Bhat <sbhat(a)linux.vnet.ibm.com> --- src/qemu/qemu_driver.c | 102 +++++++++++++++++++++++++++++++++++++----------- 1 file changed, 79 insertions(+), 23 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 67b549c..e2d4e97 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -8134,6 +8134,84 @@ cleanup: } static int +qemuDomainSetNumaParamsLive(virDomainObjPtr vm, + virCapsPtr caps, + virBitmapPtr nodeset) +{ + virCgroupPtr cgroup_temp = NULL; + virBitmapPtr temp_nodeset = NULL; + qemuDomainObjPrivatePtr priv = vm->privateData; + char *nodeset_str = NULL; + size_t i = 0; + int ret = -1; + + if (vm->def->numatune.memory.mode != VIR_DOMAIN_NUMATUNE_MEM_STRICT) { + virReportError(VIR_ERR_OPERATION_INVALID, "%s", + _("change of nodeset for running domain " + "requires strict numa mode")); + goto cleanup; + } + + /*Get Exisitng nodeset values */ + if (virCgroupGetCpusetMems(priv->cgroup, &nodeset_str) < 0 || + virBitmapParse(nodeset_str, 0, &temp_nodeset, + VIR_DOMAIN_CPUMASK_LEN) < 0) + goto cleanup; + VIR_FREE(nodeset_str); + + for (i = 0; i < caps->host.nnumaCell; i++) { + bool result; + if (virBitmapGetBit(nodeset, i, &result) < 0) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("Failed to get cpuset bit values")); + goto cleanup; + } + if (result && (virBitmapSetBit(temp_nodeset, i) < 0)) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("Failed to set temporary cpuset bit values")); + goto cleanup; + } + } + + if (!(nodeset_str = virBitmapFormat(temp_nodeset))) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("Failed to format nodeset")); + goto cleanup; + } + + if (virCgroupSetCpusetMems(priv->cgroup, nodeset_str) < 0) + goto cleanup; + VIR_FREE(nodeset_str); + + /* Ensure the cpuset string is formated before passing to cgroup */ + if (!(nodeset_str = virBitmapFormat(nodeset))) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("Failed to format nodeset")); + goto cleanup; + } + + for (i = 0; i < priv->nvcpupids; i++) { + if (virCgroupNewVcpu(priv->cgroup, i, false, &cgroup_temp) < 0 || + virCgroupSetCpusetMems(cgroup_temp, nodeset_str) < 0) + goto cleanup; + virCgroupFree(&cgroup_temp); + } + + if (virCgroupNewEmulator(priv->cgroup, false, &cgroup_temp) < 0 || + virCgroupSetCpusetMems(cgroup_temp, nodeset_str) < 0 || + virCgroupSetCpusetMems(priv->cgroup, nodeset_str) < 0) + goto cleanup; + + ret = 0; + cleanup: + VIR_FREE(nodeset_str); + virBitmapFree(temp_nodeset); + virCgroupFree(&cgroup_temp); + + return ret; +} + +static int qemuDomainSetNumaParameters(virDomainPtr dom, virTypedParameterPtr params, int nparams, @@ -8200,7 +8278,6 @@ qemuDomainSetNumaParameters(virDomainPtr dom, } } else if (STREQ(param->field, VIR_DOMAIN_NUMA_NODESET)) { virBitmapPtr nodeset = NULL; - char *nodeset_str = NULL; if (virBitmapParse(params[i].value.s, 0, &nodeset, @@ -8210,32 +8287,11 @@ qemuDomainSetNumaParameters(virDomainPtr dom, } if (flags & VIR_DOMAIN_AFFECT_LIVE) { - if (vm->def->numatune.memory.mode != - VIR_DOMAIN_NUMATUNE_MEM_STRICT) { - virReportError(VIR_ERR_OPERATION_INVALID, "%s", - _("change of nodeset for running domain " - "requires strict numa mode")); - virBitmapFree(nodeset); - ret = -1; - continue; - } - - /* Ensure the cpuset string is formated before passing to cgroup */ - if (!(nodeset_str = virBitmapFormat(nodeset))) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("Failed to format nodeset")); - virBitmapFree(nodeset); - ret = -1; - continue; - } - - if (virCgroupSetCpusetMems(priv->cgroup, nodeset_str) < 0) { + if (qemuDomainSetNumaParamsLive(vm, caps, nodeset) < 0) { virBitmapFree(nodeset); - VIR_FREE(nodeset_str); ret = -1; continue; } - VIR_FREE(nodeset_str); /* update vm->def here so that dumpxml can read the new * values from vm->def. */

2 1

[libvirt] [PATCH 0/5] Resolve some Coverity issues
by John Ferlan 04 Dec '13

04 Dec '13

Recent changes to various modules seems to have awoken Coverity and caused perusal through new paths. Hopefully this sends OK as I had to reset my environment after a fairly massive disk failure. Of course restarting from scratch could be a factor in why Coverity found the new issues. John Ferlan (5): nwfilter: Remove Coverity DEADCODE warning virnetserverclient: Remove Coverity DEADCODE warning virnetserverclient: Fix conditional change HAVE_SASL to WITH_SASL bridge_driver: Resolve Coverity CHECKED_RETURN warning storage_driver: Resolve Coverity CHECKED_RETURN warning src/network/bridge_driver.c | 3 ++- src/nwfilter/nwfilter_driver.c | 2 -- src/rpc/virnetserverclient.c | 10 ++++++++-- src/storage/storage_driver.c | 3 ++- 4 files changed, 12 insertions(+), 6 deletions(-) -- 1.8.3.1

2 11

[libvirt] [PATCH] po/zh_CN.po : Fix 2 Chinese typo
by taget＠linux.vnet.ibm.com 04 Dec '13

04 Dec '13

From: Eli Qiao <taget(a)linux.vnet.ibm.com> Signed-off-by: Eli Qiao <taget(a)linux.vnet.ibm.com> --- po/zh_CN.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/zh_CN.po b/po/zh_CN.po index f7c0cb3..e52bda1 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -17598,7 +17598,7 @@ msgstr "读取 %s 日志输出时超出范围：%s" #: src/qemu/qemu_process.c:1542 #, c-format msgid "Process exited while reading %s log output: %s" -msgstr "读取 %s 日志输出时进程推出：%s" +msgstr "读取 %s 日志输出时进程退出：%s" #: src/qemu/qemu_process.c:1557 #, c-format @@ -17613,7 +17613,7 @@ msgstr "没有为设备 %s 分配 pty" #: src/qemu/qemu_process.c:1845 #, c-format msgid "process exited while connecting to monitor: %s" -msgstr "连接到监控程序时进程推出：%s" +msgstr "连接到监控程序时进程退出：%s" #: src/qemu/qemu_process.c:1938 msgid "Failed to convert nodeset to cpuset" -- 1.8.3.1

4 3

[libvirt] Perl binding Sys-Virt release 1.2.0
by Daniel P. Berrange 04 Dec '13

04 Dec '13

I am pleased to announce that release 1.2.0 of Sys-Virt, the libvirt Perl API binding is now available for download: http://search.cpan.org/CPAN/authors/id/D/DA/DANBERR/Sys-Virt-1.2.0.tar.gz Changed in the 1.2.0 release: - Add all new constants in libvirt 1.2.0 - Fix reversed args for virNodeDeviceLookupSCSIHostByWWN Further information, including online API documentation & previous release archives, is available from the CPAN home page http://search.cpan.org/dist/Sys-Virt/ Regards, Daniel -- |: http://berrange.com -o- http://www.flickr.com/photos/dberrange/ :| |: http://libvirt.org -o- http://virt-manager.org :| |: http://autobuild.org -o- http://search.cpan.org/~danberr/ :| |: http://entangle-photo.org -o- http://live.gnome.org/gtk-vnc :|

1 0

[libvirt] [PATCH] doc/Makefile.am: Add checking of XHTML1 DTD.
by taget＠linux.vnet.ibm.com 04 Dec '13

04 Dec '13

From: Eli Qiao <taget(a)linux.vnet.ibm.com> When generating html from html.in, even not install xhtml1-dtds.noarch, make will not return a error. which will lead 'make install' failed. This patch return error when creating html doc when doning make, will give user a correct error message. Signed-off-by: Eli Qiao <taget(a)linux.vnet.ibm.com> --- docs/Makefile.am | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/Makefile.am b/docs/Makefile.am index 9de3406..bc42353 100644 --- a/docs/Makefile.am +++ b/docs/Makefile.am @@ -223,7 +223,7 @@ internals/%.html.tmp: internals/%.html.in subsite.xsl page.xsl sitemap.html.in SGML_CATALOG_FILES='$(XML_CATALOG_FILE)' \ $(XMLLINT) --catalogs --nonet --format --valid $< > $(srcdir)/$@ \ || { rm $(srcdir)/$@ && exit 1; }; \ - else echo "missing XHTML1 DTD" ; fi ; fi + else echo "missing XHTML1 DTD" && exit 1; fi ; fi %.php.tmp: %.php.in site.xsl page.xsl sitemap.html.in @if [ -x $(XSLTPROC) ] ; then \ @@ -249,7 +249,7 @@ html/index.html: libvirt-api.xml newapi.xsl page.xsl sitemap.html.in > /dev/null ; then \ SGML_CATALOG_FILES='$(XML_CATALOG_FILE)' \ $(XMLLINT) --catalogs --nonet --valid --noout $(srcdir)/html/*.html ; \ - else echo "missing XHTML1 DTD" ; fi ; fi + else echo "missing XHTML1 DTD" && exit 1; fi ; fi $(addprefix $(srcdir)/,$(devhelphtml)): $(srcdir)/libvirt-api.xml $(devhelpxsl) $(AM_V_GEN)if [ -x $(XSLTPROC) ] ; then \ -- 1.8.3.1

3 2

[libvirt] question about libvirt.spec
by Jim Fehlig 03 Dec '13

03 Dec '13

While installing a libvirt-daemon package build from a slightly modified upstream spec file (e.g. fedora and rhel replaced with suse_version and sles_version), I noticed warnings such as "warning: user qemu does not exist - using root". %files of libvirt-daemon has several hypervisor-specific files and directories, e.g. %dir %attr(0750, %{qemu_user}, %{qemu_group}) ... but afaict libvirt-daemon has no dependency on a package that creates the qemu user:group (e.g. qemu or qemu-kvm). I thought about moving hypervisor-specific files to the libvirt-daemon-driver-<hypervisor> packages, but have a hunch they are in the libvirt-daemon package for a reason I'm not considering. Should these files and directories be moved to their respective libvirt-daemon-driver-<hypervisor> packages, making libvirt-daemon more hypervisor-neutral? Regards, Jim

2 2

[libvirt] [PATCH] src: Align make output
by Michal Privoznik 03 Dec '13

03 Dec '13

The make inserts six spaces instead of four: GEN access/viraccessapichecklxc.h GEN hyperv/hyperv_wmi.generated.h GEN access/viraccessapichecklxc.c GEN hyperv/hyperv_wmi.generated.c GEN hyperv/hyperv_wmi_classes.generated.typedef GEN hyperv/hyperv_wmi_classes.generated.h GEN hyperv/hyperv_wmi_classes.generated.c GEN libvirt_access_qemu.xml GEN libvirt_access.syms GEN libvirt_access_lxc.xml GEN libvirt_access_qemu.syms GEN libvirt_access_lxc.syms GEN libvirt_qemu.def GEN esx/esx_vi_types.generated.typedef GEN esx/esx_vi_types.generated.typeenum GEN esx/esx_vi_types.generated.typetostring GEN esx/esx_vi_types.generated.typefromstring GEN esx/esx_vi_types.generated.h GEN esx/esx_vi_types.generated.c GEN esx/esx_vi_methods.generated.h GEN esx/esx_vi_methods.generated.c GEN esx/esx_vi_methods.generated.macro GEN esx/esx_vi.generated.h GEN esx/esx_vi.generated.c GEN libvirt_lxc.def Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/esx/esx_vi_generator.py | 4 ++-- src/hyperv/hyperv_wmi_generator.py | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/esx/esx_vi_generator.py b/src/esx/esx_vi_generator.py index 547eef6..0b75f18 100755 --- a/src/esx/esx_vi_generator.py +++ b/src/esx/esx_vi_generator.py @@ -1321,9 +1321,9 @@ def is_known_type(type): def open_and_print(filename): if filename.startswith("./"): - print " GEN " + filename[2:] + print " GEN " + filename[2:] else: - print " GEN " + filename + print " GEN " + filename return open(filename, "wb") diff --git a/src/hyperv/hyperv_wmi_generator.py b/src/hyperv/hyperv_wmi_generator.py index 0c5d496..f767d54 100755 --- a/src/hyperv/hyperv_wmi_generator.py +++ b/src/hyperv/hyperv_wmi_generator.py @@ -193,9 +193,9 @@ class Property: def open_and_print(filename): if filename.startswith("./"): - print " GEN " + filename[2:] + print " GEN " + filename[2:] else: - print " GEN " + filename + print " GEN " + filename return open(filename, "wb") -- 1.8.4.4

2 1

[libvirt] [PATCHv1.5 00/27] Gluster snapshot support (RFC) and refactors
by Peter Krempa 03 Dec '13

03 Dec '13

This version was rebased on top of Eric's gluster pool series and a few small mistakes were fixed. As nobody actually reviewed the original posting I did not bother putting the differences in the patches. Peter Krempa (27): conf: Export virStorageVolType enum helper functions test: Implement fake storage pool driver in qemuxml2argv test qemuxml2argv: Add test to verify correct usage of disk type="volume" qemuxml2argv: Add test for disk type='volume' with iSCSI pools qemu: Split out formatting of network disk source URI qemu: Simplify call pattern of qemuBuildDriveURIString qemu: Use qemuBuildNetworkDriveURI to handle http/ftp and friends qemu: Migrate sheepdog source generation into common function qemu: Split out NBD command generation qemu: Unify formatting of RBD sources qemu: Refactor disk source string formatting conf: Support disk source formatting without needing a virDomainDiskDefPtr conf: Clean up virDomainDiskSourceDefFormatInternal conf: Split out seclabel formating code for disk source conf: Export disk source formatter and parser snapshot: conf: Use common parsing and formatting functions for source snapshot: conf: Fix NULL dereference when <driver> element is empty conf: Add functions to copy and free network disk source definitions qemu: snapshot: Detect internal snapshots also for sheepdog and RBD conf: Add helper do clear disk source authentication struct qemu: Clear old translated pool source qemu: snapshot: Touch up error message qemu: snapshot: Add functions similar to disk source pool translation qemu: snapshots: Declare supported and unsupported snapshot configs RFC: snapshot: Add support for specifying snapshot disk backing type RFC: conf: snapshot: Parse more snapshot information RFC: qemu: snapshot: Add support for external active snapshots on gluster src/conf/domain_conf.c | 261 ++++++--- src/conf/domain_conf.h | 25 + src/conf/snapshot_conf.c | 69 ++- src/conf/snapshot_conf.h | 14 +- src/libvirt_private.syms | 6 + src/qemu/qemu_command.c | 652 +++++++++++---------- src/qemu/qemu_command.h | 15 + src/qemu/qemu_conf.c | 156 +++-- src/qemu/qemu_conf.h | 8 + src/qemu/qemu_driver.c | 429 ++++++++++++-- .../qemuxml2argv-disk-source-pool-mode.args | 10 + .../qemuxml2argv-disk-source-pool-mode.xml | 4 +- .../qemuxml2argv-disk-source-pool.args | 8 + .../qemuxml2argv-disk-source-pool.xml | 2 +- tests/qemuxml2argvtest.c | 166 ++++++ 15 files changed, 1298 insertions(+), 527 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-source-pool-mode.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-source-pool.args -- 1.8.4.3

5 73

[libvirt] [libvirt-python] Use user requested python binary for setup.py
by Doug Goldstein 03 Dec '13

03 Dec '13

When setup.py is kicked off with a python interpreter other than the system 'python', (e.g. python2.7 setup.py build) the build process would switch to 'python' and not use python2.7 as requested by the user. We should always respect the user requested python interpreter and use it. --- setup.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/setup.py b/setup.py index ecbce1f..24d4cf2 100755 --- a/setup.py +++ b/setup.py @@ -122,10 +122,10 @@ class my_build(build): def run(self): apis = get_api_xml_files() - self.spawn(["python", "generator.py", "libvirt", apis[0]]) - self.spawn(["python", "generator.py", "libvirt-qemu", apis[1]]) + self.spawn([sys.executable, "generator.py", "libvirt", apis[0]]) + self.spawn([sys.executable, "generator.py", "libvirt-qemu", apis[1]]) if have_libvirt_lxc: - self.spawn(["python", "generator.py", "libvirt-lxc", apis[2]]) + self.spawn([sys.executable, "generator.py", "libvirt-lxc", apis[2]]) build.run(self) @@ -267,7 +267,7 @@ class my_test(Command): apis = get_api_xml_files() - self.spawn(["python", "sanitytest.py", self.build_platlib, apis[0]]) + self.spawn([sys.executable, "sanitytest.py", self.build_platlib, apis[0]]) class my_clean(clean): -- 1.8.3.2

3 3

[libvirt] [PATCH python] Fix use of virDomainEventRegister in python bindings
by Daniel P. Berrange 03 Dec '13

03 Dec '13

From: "Daniel P. Berrange" <berrange(a)redhat.com> If an app used the virDomainEventRegister binding instead of the virDomainEventRegisterAny binding, it would never have its callback invoked. This is because the code for dispatching from the C libvirt_virConnectDomainEventCallback method was totally fubar. If DEBUG macro was set in the python build the error would become visible "libvirt_virConnectDomainEventCallback dom_class is not a class!" The code in libvirt_virConnectDomainEventCallback was inexplicably complex and has apparently never worked. The fix is to write it the same way as the other callback handlers. Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- libvirt-override-virConnect.py | 2 +- libvirt-override.c | 64 ++++-------------------------------------- 2 files changed, 6 insertions(+), 60 deletions(-) diff --git a/libvirt-override-virConnect.py b/libvirt-override-virConnect.py index 23fadfd..0beaf9c 100644 --- a/libvirt-override-virConnect.py +++ b/libvirt-override-virConnect.py @@ -38,7 +38,7 @@ """ try: for cb,opaque in self.domainEventCallbacks.items(): - cb(self,dom,event,detail,opaque) + cb(self, virDomain(self, _obj=dom), event, detail, opaque) return 0 except AttributeError: pass diff --git a/libvirt-override.c b/libvirt-override.c index 93b9c5f..5deb414 100644 --- a/libvirt-override.c +++ b/libvirt-override.c @@ -4923,7 +4923,6 @@ cleanup: *******************************************/ static PyObject *libvirt_module = NULL; static PyObject *libvirt_dict = NULL; -static PyObject *libvirt_dom_class = NULL; static PyObject * getLibvirtModuleObject(void) { @@ -4959,23 +4958,6 @@ getLibvirtDictObject(void) { return libvirt_dict; } -static PyObject * -getLibvirtDomainClassObject(void) { - if (libvirt_dom_class) - return libvirt_dom_class; - - // PyDict_GetItemString returns a borrowed reference - libvirt_dom_class = PyDict_GetItemString(getLibvirtDictObject(), - "virDomain"); - if (!libvirt_dom_class) { - DEBUG("%s Error importing virDomain class\n", __FUNCTION__); - PyErr_Print(); - return NULL; - } - - Py_INCREF(libvirt_dom_class); - return libvirt_dom_class; -} static PyObject * libvirt_lookupPythonFunc(const char *funcname) @@ -5013,13 +4995,9 @@ libvirt_virConnectDomainEventCallback(virConnectPtr conn ATTRIBUTE_UNUSED, { PyObject *pyobj_ret; - PyObject *pyobj_conn_inst = (PyObject*)opaque; + PyObject *pyobj_conn = (PyObject*)opaque; PyObject *pyobj_dom; - PyObject *pyobj_dom_args; - PyObject *pyobj_dom_inst; - - PyObject *dom_class; int ret = -1; LIBVIRT_ENSURE_THREAD_STATE; @@ -5027,45 +5005,15 @@ libvirt_virConnectDomainEventCallback(virConnectPtr conn ATTRIBUTE_UNUSED, /* Create a python instance of this virDomainPtr */ virDomainRef(dom); pyobj_dom = libvirt_virDomainPtrWrap(dom); - pyobj_dom_args = PyTuple_New(2); - if (PyTuple_SetItem(pyobj_dom_args, 0, pyobj_conn_inst) != 0) { - DEBUG("%s error creating tuple", __FUNCTION__); - goto cleanup; - } - if (PyTuple_SetItem(pyobj_dom_args, 1, pyobj_dom) != 0) { - DEBUG("%s error creating tuple", __FUNCTION__); - goto cleanup; - } - Py_INCREF(pyobj_conn_inst); - - dom_class = getLibvirtDomainClassObject(); - if (!PyClass_Check(dom_class)) { - DEBUG("%s dom_class is not a class!\n", __FUNCTION__); - goto cleanup; - } - - pyobj_dom_inst = PyInstance_New(dom_class, - pyobj_dom_args, - NULL); - - Py_DECREF(pyobj_dom_args); - - if (!pyobj_dom_inst) { - DEBUG("%s Error creating a python instance of virDomain\n", - __FUNCTION__); - PyErr_Print(); - goto cleanup; - } /* Call the Callback Dispatcher */ - pyobj_ret = PyObject_CallMethod(pyobj_conn_inst, + pyobj_ret = PyObject_CallMethod(pyobj_conn, (char*)"_dispatchDomainEventCallbacks", (char*)"Oii", - pyobj_dom_inst, - event, - detail); + pyobj_dom, + event, detail); - Py_DECREF(pyobj_dom_inst); + Py_DECREF(pyobj_dom); if (!pyobj_ret) { DEBUG("%s - ret:%p\n", __FUNCTION__, pyobj_ret); @@ -5075,8 +5023,6 @@ libvirt_virConnectDomainEventCallback(virConnectPtr conn ATTRIBUTE_UNUSED, ret = 0; } - -cleanup: LIBVIRT_RELEASE_THREAD_STATE; return ret; } -- 1.8.3.1

2 1

[libvirt] [PATCH] daemon: Run virStateCleanup conditionally
by Michal Privoznik 03 Dec '13

03 Dec '13

https://bugzilla.redhat.com/show_bug.cgi?id=1033061 Currently, initialization of drivers is done in a separate thread. This is done for several reasons: a driver that is initialized may require running event loop, it may take ages to initialize driver (e.g. due to autostarting domains). While the thread is spawn and run, the main() continues its execution. However, if something goes bad, or the event loop is just exited (e.g. due to a --timeout or SIGINT) we try to cleanup all the drivers. So we have two threads running Initialize() and Cleanup() concurrently. This may result in accessing stale pointers - e.g. netcf driver will free() itself in stateCleanup callback, while the init thread may come, open a dummy connection in order to autostart some domains and voilà: do_open() iterates over interface drivers and accesses stale netcf driver. The fix consists in not running stateCleanup if the init thread is still running. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- daemon/libvirtd.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/daemon/libvirtd.c b/daemon/libvirtd.c index aef1546..49c42ad 100644 --- a/daemon/libvirtd.c +++ b/daemon/libvirtd.c @@ -108,6 +108,8 @@ virNetServerProgramPtr remoteProgram = NULL; virNetServerProgramPtr qemuProgram = NULL; virNetServerProgramPtr lxcProgram = NULL; +volatile bool driversInitialized = false; + enum { VIR_DAEMON_ERR_NONE = 0, VIR_DAEMON_ERR_PIDFILE, @@ -912,6 +914,8 @@ static void daemonRunStateInit(void *opaque) goto cleanup; } + driversInitialized = true; + #ifdef HAVE_DBUS /* Tie the non-priviledged libvirtd to the session/shutdown lifecycle */ if (!virNetServerIsPrivileged(srv)) { @@ -1546,7 +1550,8 @@ cleanup: daemonConfigFree(config); - virStateCleanup(); + if (driversInitialized) + virStateCleanup(); return ret; } -- 1.8.4.4

3 4

[libvirt] [PATCH] qemu: report error on attempt to live change virtio-net queues
by Laine Stump 03 Dec '13

03 Dec '13

This resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1029732 The BZ asked for the capability to change the number of queues used by a virtio-net device while the device is in use. Because the number of queues can only be set at the time the device is created, that isn't possible. However, libvirt also shouldn't be silently reporting success when someone tries to change the number of queues. So this patch flags that as an error (just as attempts to change any of the other virtio-specific parameters already do). --- src/qemu/qemu_hotplug.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index 649c884..c136232 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -1899,7 +1899,8 @@ qemuDomainChangeNet(virQEMUDriverPtr driver, (olddev->driver.virtio.name != newdev->driver.virtio.name || olddev->driver.virtio.txmode != newdev->driver.virtio.txmode || olddev->driver.virtio.ioeventfd != newdev->driver.virtio.ioeventfd || - olddev->driver.virtio.event_idx != newdev->driver.virtio.event_idx)) { + olddev->driver.virtio.event_idx != newdev->driver.virtio.event_idx || + olddev->driver.virtio.queues != newdev->driver.virtio.queues)) { virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s", _("cannot modify virtio network device driver attributes")); goto cleanup; -- 1.8.4.2

2 1

[libvirt] [PATCH v3] Pin guest to memory node on NUMA system
by Shivaprasad G Bhat 03 Dec '13

03 Dec '13

Version 3: Addressed comments on V2. Version 2: Fixed the string formatting errors in v1. The patch contains the fix for defect 1009880 reported at redhat bugzilla. The root cause is, ever since the subcpusets(vcpu,emulator) were introduced, the parent cpuset cannot be modified to remove the nodes that are in use by the subcpusets. The fix is to break the memory node modification into three steps as to assign new nodes into the parent first. Change the nodes in the child nodes. Then remove the old nodes on the parent node. Signed-off-by: Shivaprasad G Bhat <sbhat(a)linux.vnet.ibm.com> --- src/qemu/qemu_driver.c | 115 ++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 110 insertions(+), 5 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 8a1eefd..4bc9d1d 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -8132,6 +8132,47 @@ cleanup: } static int +qemuSetVcpuCpusetMems(virDomainObjPtr vm, + char *nodeset_str) +{ + size_t j = 0; + qemuDomainObjPrivatePtr priv = vm->privateData; + virCgroupPtr cgroup_vcpu = NULL; + + for (j = 0; j < priv->nvcpupids; j++) { + if (virCgroupNewVcpu(priv->cgroup, j, false, &cgroup_vcpu) < 0) { + return -1; + } + if (virCgroupSetCpusetMems(cgroup_vcpu, nodeset_str) < 0) { + virCgroupFree(&cgroup_vcpu); + return -1; + } + virCgroupFree(&cgroup_vcpu); + } + + return 0; +} + +static int +qemuSetEmulatorCpusetMems(virDomainObjPtr vm, + char *nodeset_str) +{ + qemuDomainObjPrivatePtr priv = vm->privateData; + virCgroupPtr cgroup_emulator = NULL; + + if (virCgroupNewEmulator(priv->cgroup, false, &cgroup_emulator) < 0) { + return -1; + } + if (virCgroupSetCpusetMems(cgroup_emulator, nodeset_str) < 0) { + virCgroupFree(&cgroup_emulator); + return -1; + } + virCgroupFree(&cgroup_emulator); + + return 0; +} + +static int qemuDomainSetNumaParameters(virDomainPtr dom, virTypedParameterPtr params, int nparams, @@ -8198,7 +8239,11 @@ qemuDomainSetNumaParameters(virDomainPtr dom, } } else if (STREQ(param->field, VIR_DOMAIN_NUMA_NODESET)) { virBitmapPtr nodeset = NULL; + virBitmapPtr old_nodeset = NULL; + virBitmapPtr temp_nodeset = NULL; char *nodeset_str = NULL; + char *old_nodeset_str = NULL; + char *temp_nodeset_str = NULL; if (virBitmapParse(params[i].value.s, 0, &nodeset, @@ -8208,32 +8253,92 @@ qemuDomainSetNumaParameters(virDomainPtr dom, } if (flags & VIR_DOMAIN_AFFECT_LIVE) { + size_t j; + if (vm->def->numatune.memory.mode != VIR_DOMAIN_NUMATUNE_MEM_STRICT) { virReportError(VIR_ERR_OPERATION_INVALID, "%s", _("change of nodeset for running domain " "requires strict numa mode")); - virBitmapFree(nodeset); ret = -1; - continue; + goto next; } /* Ensure the cpuset string is formated before passing to cgroup */ if (!(nodeset_str = virBitmapFormat(nodeset))) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Failed to format nodeset")); - virBitmapFree(nodeset); ret = -1; - continue; + goto next; + } + + /*Get Exisitng nodeset values */ + if (virCgroupGetCpusetMems(priv->cgroup, &old_nodeset_str) < 0) { + ret = -1; + goto next; + } + if (virBitmapParse(old_nodeset_str, 0, &old_nodeset, + VIR_DOMAIN_CPUMASK_LEN) < 0){ + ret = -1; + goto next; + } + + /* Merge the existing and new nodeset values */ + if ((temp_nodeset = virBitmapNewCopy(old_nodeset)) == NULL) { + ret = -1; + goto next; + } + + for (j = 0; j < caps->host.nnumaCell; j++) { + bool result; + if (virBitmapGetBit(nodeset, j, &result) < 0) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("Failed to get cpuset bit values")); + ret = -1; + goto next; + } + if (result && (virBitmapSetBit(temp_nodeset, j) < 0)) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("Failed to set temporary cpuset bit values")); + ret = -1; + goto next; + } + } + + if (!(temp_nodeset_str = virBitmapFormat(temp_nodeset))) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("Failed to format nodeset")); + ret = -1; + goto next; + } + + if (virCgroupSetCpusetMems(priv->cgroup, temp_nodeset_str) < 0) { + ret = -1; + goto next; + } + + if (qemuSetVcpuCpusetMems(vm, nodeset_str) || + qemuSetEmulatorCpusetMems(vm, nodeset_str)) { + ret = -1; + goto next; } if (virCgroupSetCpusetMems(priv->cgroup, nodeset_str) < 0) { virBitmapFree(nodeset); VIR_FREE(nodeset_str); ret = -1; - continue; + goto next; } +next : VIR_FREE(nodeset_str); + VIR_FREE(old_nodeset_str); + virBitmapFree(old_nodeset); + VIR_FREE(temp_nodeset_str); + virBitmapFree(temp_nodeset); + if (ret) { + virBitmapFree(nodeset); + continue; + } /* update vm->def here so that dumpxml can read the new * values from vm->def. */

3 2

[libvirt] [PATCH] tests: add forgotten boot-strict test files
by Laine Stump 03 Dec '13

03 Dec '13

These *should* have been pushed in commit 96fddee322c7d39a57cfdc5e7be71326d597d30a. --- Pushed under the build-breaker rule :-( .../qemuxml2argvdata/qemuxml2argv-boot-strict.args | 36 ++++++++++++ .../qemuxml2argvdata/qemuxml2argv-boot-strict.xml | 66 ++++++++++++++++++++++ 2 files changed, 102 insertions(+) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-boot-strict.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-boot-strict.xml diff --git a/tests/qemuxml2argvdata/qemuxml2argv-boot-strict.args b/tests/qemuxml2argvdata/qemuxml2argv-boot-strict.args new file mode 100644 index 0000000..19e1217 --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-boot-strict.args @@ -0,0 +1,36 @@ +LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ +/usr/bin/qemu \ +-S \ +-M pc \ +-m 214 \ +-smp 1 \ +-nographic \ +-nodefaults \ +-monitor unix:/tmp/test-monitor,server,nowait \ +-no-acpi \ +-boot strict=on \ +-usb \ +-drive file=/tmp/vda.img,if=none,id=drive-virtio-disk0 \ +-device virtio-blk-pci,scsi=off,bus=pci.0,addr=0x5,drive=drive-virtio-disk0,\ +id=virtio-disk0,bootindex=3 \ +-drive file=/tmp/vdb.img,if=none,id=drive-virtio-disk1 \ +-device virtio-blk-pci,scsi=off,bus=pci.0,addr=0x6,drive=drive-virtio-disk1,\ +id=virtio-disk1 \ +-drive file=/dev/HostVG/hda,if=none,id=drive-ide0-0-0 \ +-device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \ +-drive file=/dev/HostVG/hdb,if=none,id=drive-ide0-0-1 \ +-device ide-drive,bus=ide.0,unit=1,drive=drive-ide0-0-1,id=ide0-0-1 \ +-drive file=/dev/HostVG/hdc,if=none,media=cdrom,id=drive-ide0-1-0 \ +-device ide-drive,bus=ide.1,unit=0,drive=drive-ide0-1-0,id=ide0-1-0,\ +bootindex=1 \ +-drive file=/dev/fd0,if=none,id=drive-fdc0-0-0 \ +-global isa-fdc.driveA=drive-fdc0-0-0 \ +-global isa-fdc.bootindexA=4 \ +-drive file=/dev/fd1,if=none,id=drive-fdc0-0-1 \ +-global isa-fdc.driveB=drive-fdc0-0-1 \ +-device virtio-net-pci,vlan=0,id=net0,mac=00:11:22:33:44:11,bus=pci.0,\ +addr=0x3,bootindex=2 \ +-net user,vlan=0,name=hostnet0 \ +-device virtio-net-pci,vlan=1,id=net1,mac=00:11:22:33:44:22,bus=pci.0,\ +addr=0x4 \ +-net user,vlan=1,name=hostnet1 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-boot-strict.xml b/tests/qemuxml2argvdata/qemuxml2argv-boot-strict.xml new file mode 100644 index 0000000..b20013b --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-boot-strict.xml @@ -0,0 +1,66 @@ +<domain type='qemu'> + <name>QEMUGuest1</name> + <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> + <memory unit='KiB'>219100</memory> + <currentMemory unit='KiB'>219100</currentMemory> + <vcpu placement='static'>1</vcpu> + <os> + <type arch='i686' machine='pc'>hvm</type> + <boot dev='cdrom'/> + <boot dev='network'/> + <boot dev='hd'/> + <boot dev='fd'/> + </os> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <emulator>/usr/bin/qemu</emulator> + <disk type='file' device='disk'> + <source file='/tmp/vdb.img'/> + <target dev='vdb' bus='virtio'/> + </disk> + <disk type='block' device='disk'> + <source dev='/dev/HostVG/hdb'/> + <target dev='hdb' bus='ide'/> + <address type='drive' controller='0' bus='0' target='0' unit='1'/> + </disk> + <disk type='block' device='disk'> + <source dev='/dev/HostVG/hda'/> + <target dev='hda' bus='ide'/> + <address type='drive' controller='0' bus='0' target='0' unit='0'/> + </disk> + <disk type='file' device='disk'> + <source file='/tmp/vda.img'/> + <target dev='vda' bus='virtio'/> + </disk> + <disk type='block' device='cdrom'> + <source dev='/dev/HostVG/hdc'/> + <target dev='hdc' bus='ide'/> + <address type='drive' controller='0' bus='1' target='0' unit='0'/> + </disk> + <disk type='block' device='floppy'> + <source dev='/dev/fd1'/> + <target dev='fdb' bus='fdc'/> + <address type='drive' controller='0' bus='0' target='0' unit='1'/> + </disk> + <disk type='block' device='floppy'> + <source dev='/dev/fd0'/> + <target dev='fda' bus='fdc'/> + <address type='drive' controller='0' bus='0' target='0' unit='0'/> + </disk> + <controller type='usb' index='0'/> + <controller type='fdc' index='0'/> + <controller type='ide' index='0'/> + <interface type='user'> + <mac address='00:11:22:33:44:11'/> + <model type='virtio'/> + </interface> + <interface type='user'> + <mac address='00:11:22:33:44:22'/> + <model type='virtio'/> + </interface> + <memballoon model='none'/> + </devices> +</domain> -- 1.8.4.2

1 0

[libvirt] [PATCHv3] qemu: Refactor qemuTranslateDiskSourcePool
by Peter Krempa 03 Dec '13

03 Dec '13

Before this patch, the translation function still needs a second ugly helper function to actually format the command line for qemu. But if we do the right stuff in the translation function, we don't have to bother with the second function any more. This patch removes the messy qemuBuildVolumeString function and changes qemuTranslateDiskSourcePool to set stuff up correctly so that the regular code paths meant for volumes can be used to format the command line correctly. For this purpose a new helper "qemuDiskGetActualType()" is introduced to return the type of the volume in a pool. As a part of the refactor the qemuTranslateDiskSourcePool function is fixed to do decisions based on the pool type instead of the volume type. This allows to separate pool-type-specific stuff more clearly and will ease addition of other pool types that will require certain other operations to get the correct pool source. The previously fixed tests should make sure that we don't break stuff that was working before. --- Notes: Version 3: - fixed commit message typos - the tray status error message now states if it's a disk or a volume - returned startup policy checking Version 2: - Fixed accidental squash into the previous commit src/conf/domain_conf.h | 1 + src/libvirt_private.syms | 1 + src/qemu/qemu_command.c | 81 ++++------------------------ src/qemu/qemu_conf.c | 136 ++++++++++++++++++++++++++++++++++------------- src/qemu/qemu_conf.h | 2 + 5 files changed, 112 insertions(+), 109 deletions(-) diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index 5afbfa7..4934911 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -686,6 +686,7 @@ struct _virDomainDiskSourcePoolDef { char *volume; /* volume name */ int voltype; /* enum virStorageVolType, internal only */ int pooltype; /* enum virStoragePoolType, internal only */ + int actualtype; /* enum virDomainDiskType, internal only */ int mode; /* enum virDomainDiskSourcePoolMode */ }; typedef virDomainDiskSourcePoolDef *virDomainDiskSourcePoolDefPtr; diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 3a8cbe5..b2c7a8e 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -696,6 +696,7 @@ virStoragePoolSourceFree; virStoragePoolSourceListFormat; virStoragePoolSourceListNewSource; virStoragePoolTypeFromString; +virStoragePoolTypeToString; virStorageVolDefFindByKey; virStorageVolDefFindByName; virStorageVolDefFindByPath; diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 763417f..d5c9c09 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -3775,69 +3775,6 @@ qemuBuildNBDString(virConnectPtr conn, virDomainDiskDefPtr disk, virBufferPtr op return 0; } -static int -qemuBuildVolumeString(virConnectPtr conn, - virDomainDiskDefPtr disk, - virBufferPtr opt) -{ - int ret = -1; - - switch ((virStorageVolType) disk->srcpool->voltype) { - case VIR_STORAGE_VOL_DIR: - if (!disk->readonly) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("cannot create virtual FAT disks in read-write mode")); - goto cleanup; - } - if (disk->device == VIR_DOMAIN_DISK_DEVICE_FLOPPY) - virBufferEscape(opt, ',', ",", "file=fat:floppy:%s,", disk->src); - else - virBufferEscape(opt, ',', ",", "file=fat:%s,", disk->src); - break; - case VIR_STORAGE_VOL_BLOCK: - if (disk->tray_status == VIR_DOMAIN_DISK_TRAY_OPEN) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("tray status 'open' is invalid for " - "block type volume")); - goto cleanup; - } - if (disk->srcpool->pooltype == VIR_STORAGE_POOL_ISCSI) { - if (disk->srcpool->mode == - VIR_DOMAIN_DISK_SOURCE_POOL_MODE_DIRECT) { - if (qemuBuildISCSIString(conn, disk, opt) < 0) - goto cleanup; - virBufferAddChar(opt, ','); - } else if (disk->srcpool->mode == - VIR_DOMAIN_DISK_SOURCE_POOL_MODE_HOST) { - virBufferEscape(opt, ',', ",", "file=%s,", disk->src); - } - } else { - virBufferEscape(opt, ',', ",", "file=%s,", disk->src); - } - break; - case VIR_STORAGE_VOL_FILE: - if (disk->auth.username) { - if (qemuBuildISCSIString(conn, disk, opt) < 0) - goto cleanup; - virBufferAddChar(opt, ','); - } else { - virBufferEscape(opt, ',', ",", "file=%s,", disk->src); - } - break; - case VIR_STORAGE_VOL_NETWORK: - case VIR_STORAGE_VOL_NETDIR: - case VIR_STORAGE_VOL_LAST: - /* Keep the compiler quiet, qemuTranslateDiskSourcePool already - * reported the unsupported error. - */ - goto cleanup; - } - - ret = 0; - -cleanup: - return ret; -} char * qemuBuildDriveStr(virConnectPtr conn ATTRIBUTE_UNUSED, @@ -3851,6 +3788,7 @@ qemuBuildDriveStr(virConnectPtr conn ATTRIBUTE_UNUSED, virDomainDiskGeometryTransTypeToString(disk->geometry.trans); int idx = virDiskNameToIndex(disk->dst); int busid = -1, unitid = -1; + int actualType = qemuDiskGetActualType(disk); if (idx < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, @@ -3934,12 +3872,13 @@ qemuBuildDriveStr(virConnectPtr conn ATTRIBUTE_UNUSED, /* disk->src is NULL when we use nbd disks */ if ((disk->src || - (disk->type == VIR_DOMAIN_DISK_TYPE_NETWORK && + (actualType == VIR_DOMAIN_DISK_TYPE_NETWORK && disk->protocol == VIR_DOMAIN_DISK_PROTOCOL_NBD)) && !((disk->device == VIR_DOMAIN_DISK_DEVICE_FLOPPY || disk->device == VIR_DOMAIN_DISK_DEVICE_CDROM) && disk->tray_status == VIR_DOMAIN_DISK_TRAY_OPEN)) { - if (disk->type == VIR_DOMAIN_DISK_TYPE_DIR) { + + if (actualType == VIR_DOMAIN_DISK_TYPE_DIR) { /* QEMU only supports magic FAT format for now */ if (disk->format > 0 && disk->format != VIR_STORAGE_FILE_FAT) { virReportError(VIR_ERR_INTERNAL_ERROR, @@ -3957,7 +3896,7 @@ qemuBuildDriveStr(virConnectPtr conn ATTRIBUTE_UNUSED, disk->src); else virBufferEscape(&opt, ',', ",", "file=fat:%s,", disk->src); - } else if (disk->type == VIR_DOMAIN_DISK_TYPE_NETWORK) { + } else if (actualType == VIR_DOMAIN_DISK_TYPE_NETWORK) { switch (disk->protocol) { case VIR_DOMAIN_DISK_PROTOCOL_NBD: if (qemuBuildNBDString(conn, disk, &opt) < 0) @@ -4025,15 +3964,13 @@ qemuBuildDriveStr(virConnectPtr conn ATTRIBUTE_UNUSED, virBufferEscape(&opt, ',', ",", "%s,", disk->src); break; } - } else if (disk->type == VIR_DOMAIN_DISK_TYPE_VOLUME) { - if (qemuBuildVolumeString(conn, disk, &opt) < 0) - goto error; } else { - if ((disk->type == VIR_DOMAIN_DISK_TYPE_BLOCK) && + if ((actualType == VIR_DOMAIN_DISK_TYPE_BLOCK) && (disk->tray_status == VIR_DOMAIN_DISK_TRAY_OPEN)) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("tray status 'open' is invalid for " - "block type disk")); + "block type %s"), + disk->type == VIR_DOMAIN_DISK_TYPE_VOLUME ? _("volume") : _("disk")); goto error; } virBufferEscape(&opt, ',', ",", "file=%s,", disk->src); diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c index 557ccc5..36493ba 100644 --- a/src/qemu/qemu_conf.c +++ b/src/qemu/qemu_conf.c @@ -1298,6 +1298,17 @@ cleanup: return ret; } + +int +qemuDiskGetActualType(virDomainDiskDefPtr def) +{ + if (def->type == VIR_DOMAIN_DISK_TYPE_VOLUME) + return def->srcpool->actualtype; + + return def->type; +} + + int qemuTranslateDiskSourcePool(virConnectPtr conn, virDomainDiskDefPtr def) @@ -1319,72 +1330,123 @@ qemuTranslateDiskSourcePool(virConnectPtr conn, if (!(pool = virStoragePoolLookupByName(conn, def->srcpool->pool))) return -1; + if (virStoragePoolIsActive(pool) != 1) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("storage pool '%s' containing volume '%s' " + "is not active"), + def->srcpool->pool, def->srcpool->volume); + goto cleanup; + } + if (!(vol = virStorageVolLookupByName(pool, def->srcpool->volume))) goto cleanup; if (virStorageVolGetInfo(vol, &info) < 0) goto cleanup; - if (def->startupPolicy && - info.type != VIR_STORAGE_VOL_FILE) { + if (!(poolxml = virStoragePoolGetXMLDesc(pool, 0))) + goto cleanup; + + if (!(pooldef = virStoragePoolDefParseString(poolxml))) + goto cleanup; + + def->srcpool->pooltype = pooldef->type; + def->srcpool->voltype = info.type; + + if (def->srcpool->mode && pooldef->type != VIR_STORAGE_POOL_ISCSI) { virReportError(VIR_ERR_XML_ERROR, "%s", - _("'startupPolicy' is only valid for 'file' type volume")); + _("disk source mode is only valid when " + "storage pool is of iscsi type")); goto cleanup; } - switch ((virStorageVolType) info.type) { - case VIR_STORAGE_VOL_FILE: - case VIR_STORAGE_VOL_DIR: + switch ((enum virStoragePoolType) pooldef->type) { + case VIR_STORAGE_POOL_DIR: + case VIR_STORAGE_POOL_FS: + case VIR_STORAGE_POOL_NETFS: + case VIR_STORAGE_POOL_LOGICAL: + case VIR_STORAGE_POOL_DISK: + case VIR_STORAGE_POOL_SCSI: if (!(def->src = virStorageVolGetPath(vol))) goto cleanup; - break; - case VIR_STORAGE_VOL_BLOCK: - if (!(poolxml = virStoragePoolGetXMLDesc(pool, 0))) + + if (def->startupPolicy && info.type != VIR_STORAGE_VOL_FILE) { + virReportError(VIR_ERR_XML_ERROR, "%s", + _("'startupPolicy' is only valid for " + "'file' type volume")); goto cleanup; + } + + + switch (info.type) { + case VIR_STORAGE_VOL_FILE: + def->srcpool->actualtype = VIR_DOMAIN_DISK_TYPE_FILE; + break; + + case VIR_STORAGE_VOL_DIR: + def->srcpool->actualtype = VIR_DOMAIN_DISK_TYPE_DIR; + break; + + case VIR_STORAGE_VOL_BLOCK: + def->srcpool->actualtype = VIR_DOMAIN_DISK_TYPE_BLOCK; + break; - if (!(pooldef = virStoragePoolDefParseString(poolxml))) + case VIR_STORAGE_VOL_NETWORK: + case VIR_STORAGE_VOL_NETDIR: + virReportError(VIR_ERR_INTERNAL_ERROR, + _("unexpected storage volume type '%s' " + "for storage pool type '%s'"), + virStorageVolTypeToString(info.type), + virStoragePoolTypeToString(pooldef->type)); goto cleanup; + } + + break; - if (def->srcpool->mode && pooldef->type != VIR_STORAGE_POOL_ISCSI) { + case VIR_STORAGE_POOL_ISCSI: + if (def->startupPolicy) { virReportError(VIR_ERR_XML_ERROR, "%s", - _("disk source mode is only valid when " - "storage pool is of iscsi type")); + _("'startupPolicy' is only valid for " + "'file' type volume")); goto cleanup; } - def->srcpool->pooltype = pooldef->type; - if (pooldef->type == VIR_STORAGE_POOL_ISCSI) { - /* Default to use the LUN's path on host */ - if (!def->srcpool->mode) - def->srcpool->mode = VIR_DOMAIN_DISK_SOURCE_POOL_MODE_HOST; - - if (def->srcpool->mode == - VIR_DOMAIN_DISK_SOURCE_POOL_MODE_DIRECT) { - if (qemuAddISCSIPoolSourceHost(def, pooldef) < 0) - goto cleanup; - } else if (def->srcpool->mode == - VIR_DOMAIN_DISK_SOURCE_POOL_MODE_HOST) { - if (!(def->src = virStorageVolGetPath(vol))) - goto cleanup; - } + switch (def->srcpool->mode) { + case VIR_DOMAIN_DISK_SOURCE_POOL_MODE_DEFAULT: + case VIR_DOMAIN_DISK_SOURCE_POOL_MODE_LAST: + def->srcpool->mode = VIR_DOMAIN_DISK_SOURCE_POOL_MODE_HOST; + /* fallthrough */ + case VIR_DOMAIN_DISK_SOURCE_POOL_MODE_HOST: + def->srcpool->actualtype = VIR_DOMAIN_DISK_TYPE_BLOCK; + if (!(def->src = virStorageVolGetPath(vol))) + goto cleanup; + break; + + case VIR_DOMAIN_DISK_SOURCE_POOL_MODE_DIRECT: + def->srcpool->actualtype = VIR_DOMAIN_DISK_TYPE_NETWORK; + def->protocol = VIR_DOMAIN_DISK_PROTOCOL_ISCSI; if (qemuTranslateDiskSourcePoolAuth(def, pooldef) < 0) goto cleanup; - } else { - if (!(def->src = virStorageVolGetPath(vol))) + + if (qemuAddISCSIPoolSourceHost(def, pooldef) < 0) goto cleanup; + break; } - break; - case VIR_STORAGE_VOL_NETWORK: - case VIR_STORAGE_VOL_NETDIR: - case VIR_STORAGE_VOL_LAST: - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("Using network volume as disk source is not supported")); + + case VIR_STORAGE_POOL_MPATH: + case VIR_STORAGE_POOL_RBD: + case VIR_STORAGE_POOL_SHEEPDOG: + case VIR_STORAGE_POOL_GLUSTER: + case VIR_STORAGE_POOL_LAST: + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("using '%s' pools for backing 'volume' disks " + "isn't yet supported"), + virStoragePoolTypeToString(pooldef->type)); goto cleanup; } - def->srcpool->voltype = info.type; ret = 0; cleanup: if (ret < 0) diff --git a/src/qemu/qemu_conf.h b/src/qemu/qemu_conf.h index d1ae415..0cb7901 100644 --- a/src/qemu/qemu_conf.h +++ b/src/qemu/qemu_conf.h @@ -305,6 +305,8 @@ int qemuSetUnprivSGIO(virDomainDeviceDefPtr dev); int qemuDriverAllocateID(virQEMUDriverPtr driver); virDomainXMLOptionPtr virQEMUDriverCreateXMLConf(virQEMUDriverPtr driver); +int qemuDiskGetActualType(virDomainDiskDefPtr def); + int qemuTranslateDiskSourcePool(virConnectPtr conn, virDomainDiskDefPtr def); -- 1.8.4.3

2 2

[libvirt] [PATCHv2 0/3] Rebase of patch to add support for RBD storage pools
by Adam Walters 03 Dec '13

03 Dec '13

This series of patches adds support for RBD storage pools to the latest version of libvirt. Included in this is a simple structure to build additional network storage pool support off of (really a couple of if/else blocks, so nothing fancy). This code passes check, check-syntax, and the valgrind tests. Additionally, the code is tested working in my environment. In fact, the machine I am sending this email from is a VM being run under qemu+libvirt with backend storage being an RBD storage pool using this code. Unfortunately, I only have the one RBD pool and libvirt host, so the code could use additional testing. If anyone finds any problems with my code, please let me know. I will fix them and resubmit the patch as needed. Hopefully someone else out there finds this support as useful as I do. While not many libvirt management clients utilize the storage API today, it does look to be the better method to interact with storage, and thus likely to be the best way to go in the future. I figure that additional storage backend support may well help to get others using the API instead of duplicating configuration options across every VM. Adam Walters (3): qemu: config: Add qemuAddRBDPoolSourceHost helper function qemu: conf: Parse RBD storage pool from domain xml qemu: command: Handle RBD storage pools src/qemu/qemu_command.c | 11 +++++++++ src/qemu/qemu_conf.c | 65 +++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 76 insertions(+) -- 1.8.4.2

2 4

[libvirt] [PATCH] Doc: Explicitly declaring that nodedev-destroy only works for vHBA
by Osier Yang 03 Dec '13

03 Dec '13

Though trying to destroy a physical HBA doesn't make sense at all, it's still a bit misleading with saying "only works for HBA". Signed-off-by: Osier Yang <jyang(a)redhat.com> --- src/libvirt.c | 5 +++-- tools/virsh.pod | 6 +++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/libvirt.c b/src/libvirt.c index ae05300..4ebd13f 100644 --- a/src/libvirt.c +++ b/src/libvirt.c @@ -16065,8 +16065,9 @@ error: * virNodeDeviceDestroy: * @dev: a device object * - * Destroy the device object. The virtual device is removed from the host operating system. - * This function may require privileged access + * Destroy the device object. The virtual device (only works for vHBA + * currently) is removed from the host operating system. This function + * may require privileged access. * * Returns 0 in case of success and -1 in case of failure. */ diff --git a/tools/virsh.pod b/tools/virsh.pod index dac9a08..557df9c 100644 --- a/tools/virsh.pod +++ b/tools/virsh.pod @@ -2158,9 +2158,9 @@ contains xml for a top-level <device> description of a node device. =item B<nodedev-destroy> I<device> Destroy (stop) a device on the host. I<device> can be either device -name or wwn pair in "wwnn,wwpn" format (only works for HBA). Note -that this makes libvirt quit managing a host device, and may even make -that device unusable by the rest of the physical host until a reboot. +name or wwn pair in "wwnn,wwpn" format (only works for vHBA currently). +Note that this makes libvirt quit managing a host device, and may even +make that device unusable by the rest of the physical host until a reboot. =item B<nodedev-detach> I<nodedev> [I<--driver backend_driver>] -- 1.8.1.4

2 3

[libvirt] [question] We can create two network of one same linux bridge or local ethernet. It is a bug?
by Sheldon 03 Dec '13

03 Dec '13

> We can create two network of one same linux bridge or local ethernet: This is not harmful. But I wonder should this case is allowed? Why? more detail as follow. > > virsh # net-list --all > Name State Autostart Persistent > ---------------------------------------------------------- > br1 active yes yes > br2 active yes yes > default active yes yes > > virsh # net-dumpxml br1 > <network> > <name>br1</name> > <uuid>d5410814-1bea-b10d-04b8-9fbd3a1cfc65</uuid> > <forward mode='bridge'/> > <bridge name='br0' /> > </network> > > virsh # net-dumpxml br2 > <network> > <name>br2</name> > <uuid>99f20705-57cd-da31-f193-d13af4158792</uuid> > <forward mode='bridge'/> > <bridge name='br0' /> > </network> > > virsh # net-list --all > Name State Autostart Persistent > ---------------------------------------------------------- > br0 active yes yes > br1 active yes yes > default active yes yes > > virsh # net-dumpxml br0 > <network> > <name>br0</name> > <uuid>a35c840a-9bdc-070d-43f5-8e834040aa42</uuid> > <forward dev='eth0' mode='bridge'> > <interface dev='eth0'/> > </forward> > </network> > > virsh # net-dumpxml br1 > <network> > <name>br1</name> > <uuid>f1c87b80-2dfc-2a71-3fb6-56ef83daf29a</uuid> > <forward dev='eth0' mode='bridge'> > <interface dev='eth0'/> > </forward> > </network> -- Sheldon Feng(冯少合)<shaohef(a)linux.vnet.ibm.com> IBM Linux Technology Center

3 3

[libvirt] [PATCH] qemu: fix lastError memory leak
by Wangyufei (James) 02 Dec '13

02 Dec '13

When an error occurred in qemuMonitorIO, it will be saved in mon->lastError, but the memory which mon->lastError.message, mon->lastError.str1, mon->lastError.str2 and mon->lastError.str3 will not be freed at last. The same bug happened in qemuAgentIO. So I add the following code to fix it. Signed-off-by: Zhou Yimin <zhouyimin(a)huawei.com> --- src/qemu/qemu_agent.c | 2 ++ src/qemu/qemu_monitor.c | 2 ++ 2 files changed, 4 insertions(+), 0 deletions(-) diff --git a/src/qemu/qemu_agent.c b/src/qemu/qemu_agent.c index 2cd0ccc..475b43e 100644 --- a/src/qemu/qemu_agent.c +++ b/src/qemu/qemu_agent.c @@ -161,6 +161,8 @@ static void qemuAgentDispose(void *obj) (mon->cb->destroy)(mon, mon->vm); virCondDestroy(&mon->notify); VIR_FREE(mon->buffer); + if (mon->lastError.code != VIR_ERR_OK) + virResetError(&mon->lastError); } static int diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c index 1514715..df72c5d 100644 --- a/src/qemu/qemu_monitor.c +++ b/src/qemu/qemu_monitor.c @@ -263,6 +263,8 @@ static void qemuMonitorDispose(void *obj) virJSONValueFree(mon->options); VIR_FREE(mon->balloonpath); VIR_FORCE_CLOSE(mon->logfd); + if (mon->lastError.code != VIR_ERR_OK) + virResetError(&mon->lastError); } -- 1.7.3.1.msysgit.0 Best Regards, -WangYufei

2 1

[libvirt] [PATCH python] Skip copying manually written python for C APIs which don't exist
by Daniel P. Berrange 02 Dec '13

02 Dec '13

From: "Daniel P. Berrange" <berrange(a)redhat.com> If the libvirt-override-virXXXX.py file has methods which call C APIs that don't exist in the version of libvirt built against we need to skip copying their code. eg for 0.9.13 libvirt we should not copy the 'listAllDomains' method. The way this works is that it breaks the override file into individual methods by looking for ' def '. It then collects the contents until the next method start, whereupon it looks for a libvirtmod.XXXXXX API call. It checks if the XXXXX part is present in the XML description we have, and if not, it discards the entire method. Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- generator.py | 42 +++++++++++++++++++++++++++++++++++++++++- 1 file changed, 41 insertions(+), 1 deletion(-) diff --git a/generator.py b/generator.py index e8d8ea9..a9f98ab 100755 --- a/generator.py +++ b/generator.py @@ -1719,11 +1719,51 @@ def buildWrappers(module): classes.write("\n") # Append "<classname>.py" to class def, iff it exists try: + wantfuncs = [] extra = open("libvirt-override-" + classname + ".py", "r") classes.write (" #\n") classes.write (" # %s methods from %s.py (hand coded)\n" % (classname,classname)) classes.write (" #\n") - classes.writelines(extra.readlines()) + cached = None + + + # Since we compile with older libvirt, we don't want to pull + # in manually written python methods which call C methods + # that don't exist. This code attempts to detect which + # methods to skip by looking at the libvirtmod.XXXX calls + + def shouldSkip(lines): + for line in lines: + offset = line.find("libvirtmod.") + if offset != -1: + func = line[offset + 11:] + offset = func.find("(") + func = func[0:offset] + if func not in functions_skipped: + return True + return False + + for line in extra.readlines(): + offset = line.find(" def ") + if offset != -1: + name = line[offset+5:] + offset = name.find("(") + name = name[0:offset] + if cached is not None: + if not shouldSkip(cached): + classes.writelines(cached) + if name == "__del__": + cached = None + classes.write(line) + else: + cached = [line] + else: + if cached is not None: + cached.append(line) + else: + classes.write(line) + if not shouldSkip(cached): + classes.writelines(cached) classes.write("\n") extra.close() except: -- 1.8.3.1

2 1

Re: [libvirt] [libvirt-users] virsh detach typo
by Eric Blake 02 Dec '13

02 Dec '13

On 12/02/2013 02:28 PM, Mauricio Tavares wrote: > [root@vmhost vms]# virsh detach-disk puppet vdb > error: No found disk whose source path or target is vdb > > [root@vmhost vms]# virsh --version > 0.10.2 > [root@vmhost vms]# > > This probably was solved already but if not, "No found disk" probably > sounds better if it was "No disk found" Sure. I'm pushing this under the trivial rule: From aaa7484097333c8194ee6323f5a479e8121cc18c Mon Sep 17 00:00:00 2001 From: Eric Blake <eblake(a)redhat.com> Date: Mon, 2 Dec 2013 14:40:15 -0700 Subject: [PATCH] virsh: improve grammar in error message Based on a suggestion from Mauricio Tavares. * tools/virsh-domain.c (cmdDetachInterface, vshFindDisk): Improve wording. Signed-off-by: Eric Blake <eblake(a)redhat.com> --- tools/virsh-domain.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index 1fe138c..8b80e1e 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -9802,7 +9802,7 @@ cmdDetachInterface(vshControl *ctl, const vshCmd *cmd) obj = xmlXPathEval(BAD_CAST buf, ctxt); if (obj == NULL || obj->type != XPATH_NODESET || obj->nodesetval == NULL || obj->nodesetval->nodeNr == 0) { - vshError(ctl, _("No found interface whose type is %s"), type); + vshError(ctl, _("No interface found whose type is %s"), type); goto cleanup; } @@ -9960,7 +9960,7 @@ vshFindDisk(const char *doc, } } - vshError(NULL, _("No found disk whose source path or target is %s"), path); + vshError(NULL, _("No disk found whose source path or target is %s"), path); cleanup: xmlXPathFreeObject(obj); -- 1.8.3.1 -- Eric Blake eblake redhat com +1-919-301-3266 Libvirt virtualization library http://libvirt.org

1 0

[libvirt] [PATCH] qemu: add "-boot strict" to commandline whenever possible
by Laine Stump 02 Dec '13

02 Dec '13

This resolves: https://bugzilla.redhat.com/show_bug.cgi?id=888635 (which was already closed as CANTFIX because the qemu "-boot strict" commandline option wasn't available at the time). Problem: you couldn't have a domain that used PXE to boot, but also had an un-bootable disk device *even if that disk wasn't listed in the boot order*, because if PXE timed out (e.g. due to the bridge forwarding delay), the BIOS would move on to the next target, which would be the unbootable disk device (again - even though it wasn't given a boot order), and get stuck at a "BOOT DISK FAILURE, PRESS ANY KEY" message until a user intervened. The solution available since sometime around QEMU 1.5, is to add "-boot strict=on" to *every* qemu command. When this is done, if any devices have a boot order specified, then QEMU will *only* attempt to boot from those devices that have an explicit boot order, ignoring the rest. --- src/qemu/qemu_capabilities.c | 3 +++ src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 6 ++++++ tests/qemucapabilitiesdata/caps_1.5.3-1.caps | 1 + tests/qemucapabilitiesdata/caps_1.6.0-1.caps | 1 + tests/qemucapabilitiesdata/caps_1.6.50-1.caps | 1 + tests/qemuxml2argvtest.c | 4 ++++ 7 files changed, 17 insertions(+) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 548b988..a68e555 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -243,6 +243,8 @@ VIR_ENUM_IMPL(virQEMUCaps, QEMU_CAPS_LAST, "virtio-mmio", "ich9-intel-hda", "kvm-pit-lost-tick-policy", + + "boot-strict", /* 160 */ ); struct _virQEMUCaps { @@ -2279,6 +2281,7 @@ static struct virQEMUCapsCommandLineProps virQEMUCapsCommandLine[] = { { "machine", "mem-merge", QEMU_CAPS_MEM_MERGE }, { "drive", "discard", QEMU_CAPS_DRIVE_DISCARD }, { "realtime", "mlock", QEMU_CAPS_MLOCK }, + { "boot-opts", "strict", QEMU_CAPS_BOOT_STRICT }, }; static int diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index 02d47c6..aea64ea 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -198,6 +198,7 @@ enum virQEMUCapsFlags { QEMU_CAPS_DEVICE_VIRTIO_MMIO = 157, /* -device virtio-mmio */ QEMU_CAPS_DEVICE_ICH9_INTEL_HDA = 158, /* -device ich9-intel-hda */ QEMU_CAPS_KVM_PIT_TICK_POLICY = 159, /* kvm-pit.lost_tick_policy */ + QEMU_CAPS_BOOT_STRICT = 160, /* -boot strict */ QEMU_CAPS_LAST, /* this must always be the last item */ }; diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 763417f..84736d7 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -8204,6 +8204,12 @@ qemuBuildCommandLine(virConnectPtr conn, def->os.bios.rt_delay); } + if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_BOOT_STRICT)) { + if (boot_nparams++) + virBufferAddChar(&boot_buf, ','); + virBufferAddLit(&boot_buf, "strict=on"); + } + if (boot_nparams > 0) { virCommandAddArg(cmd, "-boot"); diff --git a/tests/qemucapabilitiesdata/caps_1.5.3-1.caps b/tests/qemucapabilitiesdata/caps_1.5.3-1.caps index 09cf657..2b00449 100644 --- a/tests/qemucapabilitiesdata/caps_1.5.3-1.caps +++ b/tests/qemucapabilitiesdata/caps_1.5.3-1.caps @@ -131,4 +131,5 @@ <flag name='usb-storage.removable'/> <flag name='ich9-intel-hda'/> <flag name='kvm-pit-lost-tick-policy'/> + <flag name='boot-strict'/> </qemuCaps> diff --git a/tests/qemucapabilitiesdata/caps_1.6.0-1.caps b/tests/qemucapabilitiesdata/caps_1.6.0-1.caps index 33ee73b..7bce4aa 100644 --- a/tests/qemucapabilitiesdata/caps_1.6.0-1.caps +++ b/tests/qemucapabilitiesdata/caps_1.6.0-1.caps @@ -135,4 +135,5 @@ <flag name='virtio-mmio'/> <flag name='ich9-intel-hda'/> <flag name='kvm-pit-lost-tick-policy'/> + <flag name='boot-strict'/> </qemuCaps> diff --git a/tests/qemucapabilitiesdata/caps_1.6.50-1.caps b/tests/qemucapabilitiesdata/caps_1.6.50-1.caps index a66034a..bfaab9d 100644 --- a/tests/qemucapabilitiesdata/caps_1.6.50-1.caps +++ b/tests/qemucapabilitiesdata/caps_1.6.50-1.caps @@ -134,4 +134,5 @@ <flag name='virtio-mmio'/> <flag name='ich9-intel-hda'/> <flag name='kvm-pit-lost-tick-policy'/> + <flag name='boot-strict'/> </qemuCaps> diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index dad5973..631ece7 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -418,6 +418,10 @@ mymain(void) QEMU_CAPS_DEVICE, QEMU_CAPS_DRIVE, QEMU_CAPS_DRIVE_BOOT, QEMU_CAPS_BOOTINDEX, QEMU_CAPS_VIRTIO_BLK_SCSI, QEMU_CAPS_VIRTIO_BLK_SG_IO); + DO_TEST("boot-strict", + QEMU_CAPS_DEVICE, QEMU_CAPS_DRIVE, QEMU_CAPS_DRIVE_BOOT, + QEMU_CAPS_BOOTINDEX, QEMU_CAPS_BOOT_STRICT, + QEMU_CAPS_VIRTIO_BLK_SCSI, QEMU_CAPS_VIRTIO_BLK_SG_IO); DO_TEST("bootloader", QEMU_CAPS_DOMID, QEMU_CAPS_KVM); DO_TEST("reboot-timeout-disabled", QEMU_CAPS_REBOOT_TIMEOUT); -- 1.8.4.2

2 1

[libvirt] [PATCH] Fix VMware support for Fusion 6 / Workstation 10
by Brad Ackerman 02 Dec '13

02 Dec '13

This patch gets VMware Fusion 6 working, but the support for ThinPrint needs work—I’m not sure what a good way would be to represent that in libvirt; none of the existing virDomainChrType values seem to be appropriate. Also, what’s the best way to work this into the test suite? Responds to BZ 1036248. — Brad Ackerman N1MNB PGP: 0x9F49A373 brad(a)facefault.org <*> http://bsa.smugmug.com/

3 2

[libvirt] [PATCH] Added python binding for the new network events API
by Cédric Bosdonnat 02 Dec '13

02 Dec '13

This patch was extracted from the network events feature patch to fit the new libvirt-python repository. --- generator.py | 2 + libvirt-override-virConnect.py | 34 +++++++++ libvirt-override.c | 154 +++++++++++++++++++++++++++++++++++++++++ 3 files changed, 190 insertions(+) diff --git a/generator.py b/generator.py index a9f98ab..02ea821 100755 --- a/generator.py +++ b/generator.py @@ -491,6 +491,8 @@ skip_function = ( 'virConnectDomainEventDeregister', # overridden in virConnect.py 'virConnectDomainEventRegisterAny', # overridden in virConnect.py 'virConnectDomainEventDeregisterAny', # overridden in virConnect.py + 'virConnectNetworkEventRegisterAny', # overridden in virConnect.py + 'virConnectNetworkEventDeregisterAny', # overridden in virConnect.py 'virSaveLastError', # We have our own python error wrapper 'virFreeError', # Only needed if we use virSaveLastError 'virConnectListAllDomains', # overridden in virConnect.py diff --git a/libvirt-override-virConnect.py b/libvirt-override-virConnect.py index 23fadfd..15e9c54 100644 --- a/libvirt-override-virConnect.py +++ b/libvirt-override-virConnect.py @@ -198,6 +198,40 @@ except AttributeError: pass + def _dispatchNetworkEventLifecycleCallback(self, net, event, cbData): + """Dispatches events to python user network lifecycle event callbacks + """ + cb = cbData["cb"] + opaque = cbData["opaque"] + + cb(self, virNetwork(self, _obj=net), event, opaque) + return 0 + + def networkEventDeregisterAny(self, callbackID): + """Removes a Network Event Callback. De-registering for a + network callback will disable delivery of this event type """ + try: + ret = libvirtmod.virConnectNetworkEventDeregisterAny(self._o, callbackID) + if ret == -1: raise libvirtError ('virConnectNetworkEventDeregisterAny() failed', conn=self) + del self.networkEventCallbackID[callbackID] + except AttributeError: + pass + + def networkEventRegisterAny(self, net, eventID, cb, opaque): + """Adds a Network Event Callback. Registering for a network + callback will enable delivery of the events """ + if not hasattr(self, 'networkEventCallbackID'): + self.networkEventCallbackID = {} + cbData = { "cb": cb, "conn": self, "opaque": opaque } + if net is None: + ret = libvirtmod.virConnectNetworkEventRegisterAny(self._o, None, eventID, cbData) + else: + ret = libvirtmod.virConnectNetworkEventRegisterAny(self._o, net._o, eventID, cbData) + if ret == -1: + raise libvirtError ('virConnectNetworkEventRegisterAny() failed', conn=self) + self.networkEventCallbackID[ret] = opaque + return ret + def domainEventRegisterAny(self, dom, eventID, cb, opaque): """Adds a Domain Event Callback. Registering for a domain callback will enable delivery of the events """ diff --git a/libvirt-override.c b/libvirt-override.c index 93b9c5f..d613b0d 100644 --- a/libvirt-override.c +++ b/libvirt-override.c @@ -6569,6 +6569,156 @@ libvirt_virConnectDomainEventDeregisterAny(ATTRIBUTE_UNUSED PyObject * self, return py_retval; } +#if LIBVIR_CHECK_VERSION(1, 2, 1) +static void +libvirt_virConnectNetworkEventFreeFunc(void *opaque) +{ + PyObject *pyobj_conn = (PyObject*)opaque; + LIBVIRT_ENSURE_THREAD_STATE; + Py_DECREF(pyobj_conn); + LIBVIRT_RELEASE_THREAD_STATE; +} + +static int +libvirt_virConnectNetworkEventLifecycleCallback(virConnectPtr conn ATTRIBUTE_UNUSED, + virNetworkPtr net, + int event, + void *opaque) +{ + PyObject *pyobj_cbData = (PyObject*)opaque; + PyObject *pyobj_net; + PyObject *pyobj_ret; + PyObject *pyobj_conn; + PyObject *dictKey; + int ret = -1; + + LIBVIRT_ENSURE_THREAD_STATE; + + /* Create a python instance of this virNetworkPtr */ + virNetworkRef(net); + pyobj_net = libvirt_virNetworkPtrWrap(net); + Py_INCREF(pyobj_cbData); + + dictKey = libvirt_constcharPtrWrap("conn"); + pyobj_conn = PyDict_GetItem(pyobj_cbData, dictKey); + Py_DECREF(dictKey); + + /* Call the Callback Dispatcher */ + pyobj_ret = PyObject_CallMethod(pyobj_conn, + (char*)"_dispatchNetworkEventLifecycleCallback", + (char*)"OiO", + pyobj_net, + event, + pyobj_cbData); + + Py_DECREF(pyobj_cbData); + Py_DECREF(pyobj_net); + + if (!pyobj_ret) { + DEBUG("%s - ret:%p\n", __FUNCTION__, pyobj_ret); + PyErr_Print(); + } else { + Py_DECREF(pyobj_ret); + ret = 0; + } + + LIBVIRT_RELEASE_THREAD_STATE; + return ret; +} + +static PyObject * +libvirt_virConnectNetworkEventRegisterAny(ATTRIBUTE_UNUSED PyObject * self, + PyObject * args) +{ + PyObject *py_retval; /* return value */ + PyObject *pyobj_conn; /* virConnectPtr */ + PyObject *pyobj_net; + PyObject *pyobj_cbData; /* hash of callback data */ + int eventID; + virConnectPtr conn; + int ret = 0; + virConnectNetworkEventGenericCallback cb = NULL; + virNetworkPtr net; + virNetworkEventID eventId = VIR_NETWORK_EVENT_ID_LAST; + + if (!PyArg_ParseTuple + (args, (char *) "OOiO:virConnectNetworkEventRegisterAny", + &pyobj_conn, &pyobj_net, &eventID, &pyobj_cbData)) { + DEBUG("%s failed parsing tuple\n", __FUNCTION__); + return VIR_PY_INT_FAIL; + } + + DEBUG("libvirt_virConnectNetworkEventRegister(%p %p %d %p) called\n", + pyobj_conn, pyobj_net, eventID, pyobj_cbData); + conn = PyvirConnect_Get(pyobj_conn); + if (pyobj_net == Py_None) + net = NULL; + else + net = PyvirNetwork_Get(pyobj_net); + + if ( ((eventID & 0xFF00) >> 8) != VIR_EVENT_NAMESPACE_NETWORK) { + return VIR_PY_INT_FAIL; + } + + eventId = (virNetworkEventID) (eventID & 0xFF); + switch (eventId) { + case VIR_NETWORK_EVENT_ID_LIFECYCLE: + cb = VIR_NETWORK_EVENT_CALLBACK(libvirt_virConnectNetworkEventLifecycleCallback); + break; + + case VIR_NETWORK_EVENT_ID_LAST: + break; + } + + if (!cb) { + return VIR_PY_INT_FAIL; + } + + Py_INCREF(pyobj_cbData); + + LIBVIRT_BEGIN_ALLOW_THREADS; + ret = virConnectNetworkEventRegisterAny(conn, net, eventID, + cb, pyobj_cbData, + libvirt_virConnectNetworkEventFreeFunc); + LIBVIRT_END_ALLOW_THREADS; + + if (ret < 0) { + Py_DECREF(pyobj_cbData); + } + + py_retval = libvirt_intWrap(ret); + return py_retval; +} + +static PyObject * +libvirt_virConnectNetworkEventDeregisterAny(ATTRIBUTE_UNUSED PyObject * self, + PyObject * args) +{ + PyObject *py_retval; + PyObject *pyobj_conn; + int callbackID; + virConnectPtr conn; + int ret = 0; + + if (!PyArg_ParseTuple + (args, (char *) "Oi:virConnectNetworkEventDeregister", + &pyobj_conn, &callbackID)) + return NULL; + + DEBUG("libvirt_virConnectNetworkEventDeregister(%p) called\n", pyobj_conn); + + conn = (virConnectPtr) PyvirConnect_Get(pyobj_conn); + + LIBVIRT_BEGIN_ALLOW_THREADS; + + ret = virConnectNetworkEventDeregisterAny(conn, callbackID); + + LIBVIRT_END_ALLOW_THREADS; + py_retval = libvirt_intWrap(ret); + return py_retval; +} +#endif /* LIBVIR_CHECK_VERSION(1, 2, 1)*/ + #if LIBVIR_CHECK_VERSION(0, 10, 0) static void libvirt_virConnectCloseCallbackDispatch(virConnectPtr conn ATTRIBUTE_UNUSED, @@ -7369,6 +7519,10 @@ static PyMethodDef libvirtMethods[] = { {(char *) "virConnectDomainEventDeregister", libvirt_virConnectDomainEventDeregister, METH_VARARGS, NULL}, {(char *) "virConnectDomainEventRegisterAny", libvirt_virConnectDomainEventRegisterAny, METH_VARARGS, NULL}, {(char *) "virConnectDomainEventDeregisterAny", libvirt_virConnectDomainEventDeregisterAny, METH_VARARGS, NULL}, +#if LIBVIR_CHECK_VERSION(1, 2, 1) + {(char *) "virConnectNetworkEventRegisterAny", libvirt_virConnectNetworkEventRegisterAny, METH_VARARGS, NULL}, + {(char *) "virConnectNetworkEventDeregisterAny", libvirt_virConnectNetworkEventDeregisterAny, METH_VARARGS, NULL}, +#endif /* LIBVIR_CHECK_VERSION(1, 2, 1) */ #if LIBVIR_CHECK_VERSION(0, 10, 0) {(char *) "virConnectRegisterCloseCallback", libvirt_virConnectRegisterCloseCallback, METH_VARARGS, NULL}, {(char *) "virConnectUnregisterCloseCallback", libvirt_virConnectUnregisterCloseCallback, METH_VARARGS, NULL}, -- 1.8.4.2

2 1

[libvirt] [PATCH] Add docs about audit subsystem logging
by Daniel P. Berrange 02 Dec '13

02 Dec '13

From: "Daniel P. Berrange" <berrange(a)redhat.com> Adds a new page to the website "Deployment" section describing what data is sent to the audit logs and how to configure libvirtd audit settings. Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- docs/auditlog.html.in | 321 ++++++++++++++++++++++++++++++++++++++++++++++++++ docs/sitemap.html.in | 4 + 2 files changed, 325 insertions(+) create mode 100644 docs/auditlog.html.in diff --git a/docs/auditlog.html.in b/docs/auditlog.html.in new file mode 100644 index 0000000..c827ab9 --- /dev/null +++ b/docs/auditlog.html.in @@ -0,0 +1,321 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml"> + <body> + <h1>Audit log</h1> + + <ul id="toc"></ul> + + <h2><a name="intro">Introduction</a></h2> + + <p> + A number of the libvirt virtualization drivers (QEMU/KVM and LXC) include + support for logging details of important operations to the host's audit + subsystem. This provides administrators / auditors with a canonical historical + record of changes to virtual machines' / containers' lifecycle states and + their configuration. On hosts which are running the Linux audit daemon, + the logs will usually end up in <code>/var/log/audit/audit.log</code> + </p> + + <h2><a name="config">Configuration</a></h2> + + <p> + The libvirt audit integration is enabled by default on any host which has + the Linux audit subsystem active, and disabled otherwise. It is possible + to alter this behaviour in the <code>/etc/libvirt/libvirtd.conf</code> + configuration file, via the <code>audit_level</code> parameter + </p> + + <ul> + <li><code>audit_level=0</code> - libvirt auditing is disabled regardless + of host audit subsystem enablement.</li> + <li><code>audit_level=1</code> - libvirt auditing is enabled if the host + audit subsystem is enabled, otherwise it is disabled. This is the + default behaviour.</li> + <li><code>audit_level=2</code> - libvirt auditing is enabled regardless + of host audit subsystem enablement. If the host audit subsystem is + disabled, then libvirtd will refuse to complete startup and exit with + an error.</li> + </ul> + + <p> + In addition to have formal messages sent to the audit subsystem it is + possible to tell libvirt to inject messages into its own logging + layer. This will result in messages ending up in the systemd journal + or <code>/var/log/libvirt/libivrtd.log</code> on non-systemd hosts. + This is disabled by default, but can be requested by setting the + <code>audit_logging=1</code> configuration parameter in the same file + mentioned above. + </p> + + <h2><a name="types">Message types</a></h2> + + <p> + Libvirt defines three core audit message types each of which will + be described below. There are a number of common fields that will + be reported for all message types. + </p> + + <dl> + <dt>pid</dt> + <dd>Process ID of the libvirtd daemon generating the audit record.</dd> + <dt>uid</dt> + <dd>User ID of the libvirtd daemon process generating the audit record.</dd> + <dt>subj</dt> + <dd>Security context of the libvirtd daemon process generating the audit record.</dd> + <dt>msg</dt> + <dd>String containing a list of key=value pairs specific to the type of audit record being reported.</dd> + </dl> + + <p> + Some fields in the <code>msg</code> string are common to audit records + </p> + + <dl> + <dt>virt</dt> + <dd>Type of virtualization driver used. One of <code>qemu</code> or <code>lxc</code></dd> + <dt>vm</dt> + <dd>Host driver unique name of the guest</dd> + <dt>uuid</dt> + <dd>Globally unique identifier for the guest</dd> + <dt>exe</dt> + <dd>Path of the libvirtd daemon</dd> + <dt>hostname</dt> + <dd>Currently unused</dd> + <dt>addr</dt> + <dd>Currently unused</dd> + <dt>terminal</dt> + <dd>Currently unused</dd> + <dt>res</dt> + <dd>Result of the action, either <code>success</code> or <code>failed</code></dd> + </dl> + + <h3><a name="typecontrol">VIRT_CONTROL</a></h3> + + <p> + Reports change in the lifecycle state of a virtual machine. The <code>msg</code> + field will include the following sub-fields + </p> + + <dl> + <dt>op</dt> + <dd>Type of operation performed. One of <code>start</code>, <code>stop</code> or <code>init</code></dd> + <dt>reason</dt> + <dd>The reason which caused the operation to happen</dd> + <dt>vm-pid</dt> + <dd>ID of the primary/leading process associated with the guest</dd> + <dt>init-pid</dt> + <dd>ID of the <code>init</code> process in a container. Only if <code>op=init</code> and <code>virt=lxc</code></dd> + <dt>pid-ns</dt> + <dd>Namespace ID of the <code>init</code> process in a container. Only if <code>op=init</code> and <code>virt=lxc</code></dd> + </dl> + + <h3><a name="typemachine">VIRT_MACHINE_ID</a></h3> + + <p> + Reports the association of a security context with a guest. The <code>msg</code> + field will include the following sub-fields + </p> + + <dl> + <dt>model</dt> + <dd>The security driver type. One of <code>selinux</code> or <code>apparmor</code></dd> + <dt>vm-ctx</dt> + <dd>Security context for the guest process</dd> + <dt>img-ctx</dt> + <dd>Security context for the guest disk images and other assigned host resources</dd> + </dl> + + <h3><a name="typeresource">VIRT_RESOURCE</a></h3> + + <p> + Reports the usage of a host resource by a guest. The fields include will + vary according to the type of device being reported. When the guest is + initially booted records will be generated for all assigned resources. + If any changes are made to the running guest configuration, for example + hotplug devices, or adjust resources allocation, further records will + be generated. + </p> + + <h4><a name="typeresourcevcpu">Virtual CPU</a></h4> + + <p> + The <code>msg</code> field will include the following sub-fields + </p> + + <dl> + <dt>reason</dt> + <dd>The reason which caused the resource to be assigned to happen</dd> + <dt>resrc</dt> + <dd>The type of resource assigned. Set to <code>vcpu</code></dd> + <dt>old-vcpu</dt> + <dd>Original vCPU count, or 0</dd> + <dt>new-vcpu</dt> + <dd>Updated vCPU count</dd> + </dl> + + + <h4><a name="typeresourcemem">Memory</a></h4> + + <p> + The <code>msg</code> field will include the following sub-fields + </p> + + <dl> + <dt>reason</dt> + <dd>The reason which caused the resource to be assigned to happen</dd> + <dt>resrc</dt> + <dd>The type of resource assigned. Set to <code>mem</code></dd> + <dt>old-mem</dt> + <dd>Original memory size in bytes, or 0</dd> + <dt>new-mem</dt> + <dd>Updated memory size in bytes</dd> + </dl> + + <h4><a name="typeresourcedisk">Disk</a></h4> + <p> + The <code>msg</code> field will include the following sub-fields + </p> + + <dl> + <dt>reason</dt> + <dd>The reason which caused the resource to be assigned to happen</dd> + <dt>resrc</dt> + <dd>The type of resource assigned. Set to <code>disk</code></dd> + <dt>old-disk</dt> + <dd>Original host file or device path acting as the disk backing file</dd> + <dt>new-disk</dt> + <dd>Updated host file or device path acting as the disk backing file</dd> + </dl> + + <h4><a name="typeresourcenic">Network interface</a></h4> + + <p> + The <code>msg</code> field will include the following sub-fields + </p> + + <dl> + <dt>reason</dt> + <dd>The reason which caused the resource to be assigned to happen</dd> + <dt>resrc</dt> + <dd>The type of resource assigned. Set to <code>net</code></dd> + <dt>old-net</dt> + <dd>Original MAC address of the guest network interface</dd> + <dt>new-net</dt> + <dd>Updated MAC address of the guest network interface</dd> + </dl> + + <p> + If there is a host network interace associated with the guest NIC then + further records may be generated + </p> + + <dl> + <dt>reason</dt> + <dd>The reason which caused the resource to be assigned to happen</dd> + <dt>resrc</dt> + <dd>The type of resource assigned. Set to <code>net</code></dd> + <dt>net</dt> + <dd>MAC address of the host network interface</dd> + <dt>rdev</dt> + <dd>Name of the host network interface</dd> + </dl> + + <h4><a name="typeresourcefs">Filesystem</a></h4> + <p> + The <code>msg</code> field will include the following sub-fields + </p> + + <dl> + <dt>reason</dt> + <dd>The reason which caused the resource to be assigned to happen</dd> + <dt>resrc</dt> + <dd>The type of resource assigned. Set to <code>fs</code></dd> + <dt>old-fs</dt> + <dd>Original host directory, file or device path backing the filesystem </dd> + <dt>new-fs</dt> + <dd>Updated host directory, file or device path backing the filesystem</dd> + </dl> + + <h4><a name="typeresourcehost">Host device</a></h4> + <p> + The <code>msg</code> field will include the following sub-fields + </p> + + <dl> + <dt>reason</dt> + <dd>The reason which caused the resource to be assigned to happen</dd> + <dt>resrc</dt> + <dd>The type of resource assigned. Set to <code>hostdev</code> or <code>dev</code></dd> + <dt>dev</dt> + <dd>The unique bus identifier of the USB, PCI or SCSI device, if <code>resrc=dev</code></dd> + <dt>disk</dt> + <dd>The path of the block device assigned to the guest, if <code>resrc=hostdev</code></dd> + <dt>chardev</dt> + <dd>The path of the charecter device assigned to the guest, if <code>resrc=hostdev</code></dd> + </dl> + + <h4><a name="typeresourcetpm">TPM</a></h4> + <p> + The <code>msg</code> field will include the following sub-fields + </p> + + <dl> + <dt>reason</dt> + <dd>The reason which caused the resource to be assigned to happen</dd> + <dt>resrc</dt> + <dd>The type of resource assigned. Set to <code>tpm</code></dd> + <dt>device</dt> + <dd>The path of the host TPM device assigned to the guest</dd> + </dl> + + <h4><a name="typeresourcerng">RNG</a></h4> + <p> + The <code>msg</code> field will include the following sub-fields + </p> + + <dl> + <dt>reason</dt> + <dd>The reason which caused the resource to be assigned to happen</dd> + <dt>resrc</dt> + <dd>The type of resource assigned. Set to <code>rng</code></dd> + <dt>old-rng</dt> + <dd>Original path of the host entropy source for the RNG</dd> + <dt>new-rng</dt> + <dd>Updated path of the host entropy source for the RNG</dd> + </dl> + + + <h4><a name="typeresourceredir">Redirected device</a></h4> + <p> + The <code>msg</code> field will include the following sub-fields + </p> + + <dl> + <dt>reason</dt> + <dd>The reason which caused the resource to be assigned to happen</dd> + <dt>resrc</dt> + <dd>The type of resource assigned. Set to <code>redir</code></dd> + <dt>bus</dt> + <dd>The bus type, only <code>usb</code> allowed</dd> + <dt>device</dt> + <dd>The device type, only <code>USB redir</code> allowed</dd> + </dl> + + <h4><a name="typeresourcecgroup">Control group</a></h4> + + <p> + The <code>msg</code> field will include the following sub-fields + </p> + + <dl> + <dt>reason</dt> + <dd>The reason which caused the resource to be assigned to happen</dd> + <dt>resrc</dt> + <dd>The type of resource assigned. Set to <code>cgroup</code></dd> + <dt>cgroup</dt> + <dd>The name of the cgroup controller</dd> + </dl> + + </body> +</html> diff --git a/docs/sitemap.html.in b/docs/sitemap.html.in index d821a9e..60daf15 100644 --- a/docs/sitemap.html.in +++ b/docs/sitemap.html.in @@ -91,6 +91,10 @@ <span>The library and the daemon logging support</span> </li> <li> + <a href="auditlog.html">Audit log</a> + <span>Audit trail logs for host operations</span> + </li> + <li> <a href="firewall.html">Firewall</a> <span>Firewall and network filter configuration</span> </li> -- 1.8.3.1

3 3

[libvirt] GlusterFS with libvirt
by Umar Draz 02 Dec '13

02 Dec '13

Hi All, Is any body help me how I can integrate libvirt with glusterfs on Ubuntu 13.10 Server. I tried the following, but its not working. qemu-img: Unknown protocol 'gluster://localhost/gv1/test.img' Br. Umar

6 7

[libvirt] [PATCH] docs: fix typo in previous patch
by Eric Blake 02 Dec '13

02 Dec '13

Avoid a nested comment compilation error. * include/libvirt/libvirt.h.in: Fix typo. Signed-off-by: Eric Blake <eblake(a)redhat.com> --- Pushing as trivial/build-breaker, and sorry for the one-byte mistake. include/libvirt/libvirt.h.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/libvirt/libvirt.h.in b/include/libvirt/libvirt.h.in index 496986e..29d4dce 100644 --- a/include/libvirt/libvirt.h.in +++ b/include/libvirt/libvirt.h.in @@ -3587,7 +3587,7 @@ typedef enum { /** * virDomainEventCrashedDetailType: -/* + * * Details on the cause of a 'crashed' lifecycle event */ typedef enum { -- 1.8.3.1

1 0

[libvirt] Internal error message from netcf when trying to start libvirtd
by Christophe Fergeau 02 Dec '13

02 Dec '13

Hey, Due to a configuration issue on my system, libvirtd is not starting on my system (not complaining about this!): 2013-10-15 15:40:51.024+0000: 10222: info : libvirt version: 1.1.3 2013-10-15 15:40:51.024+0000: 10222: error : virNetTLSContextCheckCertFile:117 : Cannot read CA certificate '/home/teuf/usr/etc/pki/CA/cacert.pem': No such file or directory However, before libvirtd exits, I get another error message from the netcf code, which is unexpected this time: 2013-10-15 15:49:18.361+0000: 10222: error : netcfStateCleanup:105 : internal error: Attempt to close netcf state driver already closed This message comes from the call of virStateCleanup() at the end of main() in libvirtd.c. virStateCleanup() should not be called before daemonStateInit() has been called in main. After this call, things get more ugly as daemonStateInit() calls virStateInitialize() from a thread, so there's probably a small window for virStateInitialize() and virStateCleanup() running concurrently if an error occurs between the call to daemonStateInit() and the call to virNetServerRun(). I'm sending this email rather than a patch as I'm not sure what is the best way to fix it. The easy way would be for virStateCleanup() to be a noop when virStateInitialize() hasn't been called (iow remove the error message from netcfStateCleanup). However, this would leave this small race condition around (which is not that bad as it would only occurs in situations when the daemon fails to start). So another approach would be to set a vir_state_initialized boolean once the thread has called ivrStateInitialize, and only call virStateCleanup() when it's set. Or maybe there's a 3rd way to fix this? Let me know if you have any guidance into the best way to fix this, Christophe

3 7

[libvirt] [PATCH] Ensure to zero out the virDomainBlockJobInfo arg
by Daniel P. Berrange 02 Dec '13

02 Dec '13

From: "Daniel P. Berrange" <berrange(a)redhat.com> The virDomainGetBlockJobInfo method did not zero out the virDomainBlockJobInfo pointer arg, so when block jobs were not active it would return garbage for the bandwidth/cur/end fields. Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- src/libvirt.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/libvirt.c b/src/libvirt.c index eff44eb..a2df53d 100644 --- a/src/libvirt.c +++ b/src/libvirt.c @@ -20850,6 +20850,8 @@ int virDomainGetBlockJobInfo(virDomainPtr dom, const char *disk, virCheckNonNullArgGoto(disk, error); virCheckNonNullArgGoto(info, error); + memset(info, 0, sizeof(*info)); + if (conn->driver->domainGetBlockJobInfo) { int ret; ret = conn->driver->domainGetBlockJobInfo(dom, disk, info, flags); -- 1.8.3.1

2 1

[libvirt] [PATCH v2] docs: fix typos in libvirt.h.in
by Chen Hanxiao 02 Dec '13

02 Dec '13

From: Chen Hanxiao <chenhanxiao(a)cn.fujitsu.com> s/caused/causes Signed-off-by: Chen Hanxiao <chenhanxiao(a)cn.fujitsu.com> --- v2: modified according to Nehal's comment include/libvirt/libvirt.h.in | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/include/libvirt/libvirt.h.in b/include/libvirt/libvirt.h.in index 146a59b..5bc5a31 100644 --- a/include/libvirt/libvirt.h.in +++ b/include/libvirt/libvirt.h.in @@ -3461,7 +3461,7 @@ typedef enum { /** * virDomainEventDefinedDetailType: * - * Details on the caused of the 'defined' lifecycle event + * Details on the causes of the 'defined' lifecycle event */ typedef enum { VIR_DOMAIN_EVENT_DEFINED_ADDED = 0, /* Newly created config file */ @@ -3475,7 +3475,7 @@ typedef enum { /** * virDomainEventUndefinedDetailType: * - * Details on the caused of the 'undefined' lifecycle event + * Details on the causes of the 'undefined' lifecycle event */ typedef enum { VIR_DOMAIN_EVENT_UNDEFINED_REMOVED = 0, /* Deleted the config file */ @@ -3488,7 +3488,7 @@ typedef enum { /** * virDomainEventStartedDetailType: * - * Details on the caused of the 'started' lifecycle event + * Details on the causes of the 'started' lifecycle event */ typedef enum { VIR_DOMAIN_EVENT_STARTED_BOOTED = 0, /* Normal startup from boot */ @@ -3505,7 +3505,7 @@ typedef enum { /** * virDomainEventSuspendedDetailType: * - * Details on the caused of the 'suspended' lifecycle event + * Details on the causes of the 'suspended' lifecycle event */ typedef enum { VIR_DOMAIN_EVENT_SUSPENDED_PAUSED = 0, /* Normal suspend due to admin pause */ @@ -3524,7 +3524,7 @@ typedef enum { /** * virDomainEventResumedDetailType: * - * Details on the caused of the 'resumed' lifecycle event + * Details on the causes of the 'resumed' lifecycle event */ typedef enum { VIR_DOMAIN_EVENT_RESUMED_UNPAUSED = 0, /* Normal resume due to admin unpause */ @@ -3539,7 +3539,7 @@ typedef enum { /** * virDomainEventStoppedDetailType: * - * Details on the caused of the 'stopped' lifecycle event + * Details on the causes of the 'stopped' lifecycle event */ typedef enum { VIR_DOMAIN_EVENT_STOPPED_SHUTDOWN = 0, /* Normal shutdown */ -- 1.8.2.1

3 2