- Devel - libvirt List Archives

[libvirt] [PATCH] qemu: Adapt to new log format
by Michal Privoznik 02 Jan '13

02 Jan '13

Since 586502189edf9fd0f89a83de96717a2ea826fdb0 qemu commit, the log lines reporting chardev's path has changed from: $ ./x86_64-softmmu/qemu-system-x86_64 -serial pty -serial pty -monitor pty char device redirected to /dev/pts/5 char device redirected to /dev/pts/6 char device redirected to /dev/pts/7 to: $ ./x86_64-softmmu/qemu-system-x86_64 -serial pty -serial pty -monitor pty char device compat_monitor0 redirected to /dev/pts/5 char device serial0 redirected to /dev/pts/6 char device serial1 redirected to /dev/pts/7 However, with current code we are not prepared for such change, which results in us being unable to start any domain. --- src/qemu/qemu_process.c | 33 +++++++++++++++++++++++++++++---- 1 file changed, 29 insertions(+), 4 deletions(-) diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index eac6553..29bd082 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -1431,22 +1431,43 @@ cleanup: * * char device redirected to /dev/pts/3 * + * However, since 1.4 the line we are looking for has changed to: + * + * char device <alias> redirected to /some/path + * * Returns -1 for error, 0 success, 1 continue reading */ static int qemuProcessExtractTTYPath(const char *haystack, size_t *offset, + const char *alias, char **path) { - static const char needle[] = "char device redirected to"; - char *tmp, *dev; + static const char *needle[] = {"char device", "redirected to"}; + const char *tmp, *dev; VIR_FREE(*path); /* First look for our magic string */ - if (!(tmp = strstr(haystack + *offset, needle))) { + if (!(tmp = strstr(haystack + *offset, needle[0]))) return 1; + + tmp += strlen(needle[0]); + virSkipSpaces(&tmp); + + if (STRPREFIX(tmp, "char")) { + /* we are dealing with new style */ + tmp += strlen("char"); + if (!STRPREFIX(tmp, alias)) + return 1; + + tmp += strlen(alias); + virSkipSpaces(&tmp); } - tmp += sizeof(needle); + + if (!STRPREFIX(tmp, needle[1])) + return 1; + + tmp += strlen(needle[1]); dev = tmp; /* @@ -1569,6 +1590,7 @@ qemuProcessFindCharDevicePTYs(virDomainObjPtr vm, virDomainChrDefPtr chr = vm->def->serials[i]; if (chr->source.type == VIR_DOMAIN_CHR_TYPE_PTY) { if ((ret = qemuProcessExtractTTYPath(output, &offset, + chr->info.alias, &chr->source.data.file.path)) != 0) return ret; } @@ -1579,6 +1601,7 @@ qemuProcessFindCharDevicePTYs(virDomainObjPtr vm, virDomainChrDefPtr chr = vm->def->parallels[i]; if (chr->source.type == VIR_DOMAIN_CHR_TYPE_PTY) { if ((ret = qemuProcessExtractTTYPath(output, &offset, + chr->info.alias, &chr->source.data.file.path)) != 0) return ret; } @@ -1589,6 +1612,7 @@ qemuProcessFindCharDevicePTYs(virDomainObjPtr vm, virDomainChrDefPtr chr = vm->def->channels[i]; if (chr->source.type == VIR_DOMAIN_CHR_TYPE_PTY) { if ((ret = qemuProcessExtractTTYPath(output, &offset, + chr->info.alias, &chr->source.data.file.path)) != 0) return ret; } @@ -1608,6 +1632,7 @@ qemuProcessFindCharDevicePTYs(virDomainObjPtr vm, if (chr->source.type == VIR_DOMAIN_CHR_TYPE_PTY && chr->targetType == VIR_DOMAIN_CHR_CONSOLE_TARGET_TYPE_VIRTIO) { if ((ret = qemuProcessExtractTTYPath(output, &offset, + chr->info.alias, &chr->source.data.file.path)) != 0) return ret; } -- 1.8.0.2

4 7

[libvirt] ESX error while freeing inherited objects
by Ata Bohra 02 Jan '13

02 Jan '13

Hi All, Freeing of an object having inheritance depth >=2 throws an error such as:" internal error Call to esxVI_<grand_parent>_Free for unexpected type 'Child'. " For instance: Below code snippet is from esx_vi_generator.input (modified) object VirtualDevice Int key r Description deviceInfo o VirtualDeviceBackingInfo backing o VirtualDeviceConnectInfo connectable o Int controllerKey o Int unitNumber o end object VirtualController extends VirtualDevice Int busNumber r Int device ol end object VirtualIDEController extends VirtualController end object VirtualDeviceConfigSpec VirtualDeviceConfigSpecOperation operation o VirtualDeviceConfigSpecFileOperation fileOperation o VirtualDevice device r end object VirtualMachineConfigSpec... VirtualDeviceConfigSpec deviceChange ol..end On free of "VirtualMachineConfigSpec", I hit below error:"libvir: ESX Driver error : internal error Call to esxVI_VirtualDevice_Free for unexpected type 'VirtualIDEController'" But if I remove VirtualController and include its fields directly to VirtualIDEController, error is resolved. Please let me know if I'm missing anything, else, it seems like a bug with generated code. While debugging the error seems to come from: esx_vi_types.c: /* * Macros to implement dynamic dispatched functions */#define ESX_VI__TEMPLATE__DISPATCH(_actual_type, _actual_type_name, __type, \ _dispatch, _error_return) \ switch (_actual_type) { \ _dispatch \ \ case esxVI_Type_##__type: \ break; \ \ default: \ virReportError(VIR_ERR_INTERNAL_ERROR, \ _("Call to %s for unexpected type '%s'"), \ __FUNCTION__, _actual_type_name); \ return _error_return; \ } Thanks!Ata

1 1

[libvirt] [PATCH] ESX: append CURL headers to fix serviceContent entities
by Ata E Husain Bohra 01 Jan '13

01 Jan '13

Append curl headers with "SOAPAction" header to populate serviceContent object entities which are otherwise missing. --- src/esx/esx_vi.c | 2 ++ src/esx/esx_vi_generator.input | 3 +++ 2 files changed, 5 insertions(+) diff --git a/src/esx/esx_vi.c b/src/esx/esx_vi.c index 99c1eb1..a379183 100644 --- a/src/esx/esx_vi.c +++ b/src/esx/esx_vi.c @@ -322,6 +322,8 @@ esxVI_CURL_Connect(esxVI_CURL *curl, esxUtil_ParsedUri *parsedUri) * approx. 2 sec per POST operation. */ curl->headers = curl_slist_append(curl->headers, "Expect:"); + curl->headers = curl_slist_append(curl->headers, + _("SOAPAction: \"urn:vim25\"")); if (curl->headers == NULL) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", diff --git a/src/esx/esx_vi_generator.input b/src/esx/esx_vi_generator.input index 22c114e..236dcb3 100644 --- a/src/esx/esx_vi_generator.input +++ b/src/esx/esx_vi_generator.input @@ -1008,6 +1008,8 @@ object ServiceContent ManagedObjectReference clusterProfileManager o ManagedObjectReference complianceManager o ManagedObjectReference localizationManager o + ManagedObjectReference storageResourceManager o + ManagedObjectReference guestOperationsManager o end @@ -1073,6 +1075,7 @@ object UserSession DateTime lastActiveTime r String locale r String messageLocale r + Boolean extensionSession o end -- 1.7.9.5

3 3

[libvirt] [PATCH] sanlock: Chown lease files as well
by Michal Privoznik 31 Dec '12

31 Dec '12

Since sanlock doesn't run under root:root, we have chown()'ed the __LIBVIRT__DISKS__ lease file to the user:group defined in the sanlock config. However, when writing the patch I've forgot about lease files for each disk (this is the /var/lib/libvirt/sanlock/<md5>) file. --- src/locking/lock_driver_sanlock.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/src/locking/lock_driver_sanlock.c b/src/locking/lock_driver_sanlock.c index 75ced84..c955003 100644 --- a/src/locking/lock_driver_sanlock.c +++ b/src/locking/lock_driver_sanlock.c @@ -679,6 +679,17 @@ static int virLockManagerSanlockCreateLease(struct sanlk_resource *res) } VIR_DEBUG("Someone else just created lockspace %s", res->disks[0].path); } else { + /* chown() the path to make sure sanlock can access it */ + if ((driver->user != -1 || driver->group != -1) && + (fchown(fd, driver->user, driver->group) < 0)) { + virReportSystemError(errno, + _("cannot chown '%s' to (%u, %u)"), + res->disks[0].path, + (unsigned int) driver->user, + (unsigned int) driver->group); + goto error_unlink; + } + if ((rv = sanlock_align(&res->disks[0])) < 0) { if (rv <= -200) virReportError(VIR_ERR_INTERNAL_ERROR, -- 1.8.0.2

3 3

[libvirt] [test-API][PATCH V2] managedsave: change the checking method about bypass cache
by hongming 30 Dec '12

30 Dec '12

Check whether the O_DIRECT flag is in use on the managed save file during the duration of the managed save, since that is the real effect of the current implementation of the --bypass-cache flag. Add break condition into the while loop of get_fileflags() method in the PATCH V2 --- repos/managedsave/managedsave.py | 61 ++++++++++++++++++++------------------ 1 files changed, 32 insertions(+), 29 deletions(-) diff --git a/repos/managedsave/managedsave.py b/repos/managedsave/managedsave.py index 4a92151..70d4ebc 100644 --- a/repos/managedsave/managedsave.py +++ b/repos/managedsave/managedsave.py @@ -2,6 +2,8 @@ import os import math +import thread +import time import libvirt from libvirt import libvirtError @@ -39,39 +41,43 @@ def check_savefile_create(*args): logger.info("managed save file exists") return True -def compare_cachedfile(cachebefore, cacheafter): - """Compare cached value before managed save and its value after - managed save """ +def get_fileflags(): + """Get the file flags of managed save file""" + cmds = "cat /proc/$(lsof -w /var/lib/libvirt/qemu/save/"+guestname+".save"\ + "|awk '/libvirt_i/{print $2}')/fdinfo/1|grep flags|awk '{print $NF}'" + global fileflags + while True: + (status, output) = utils.exec_cmd(cmds, shell=True) + if status == 0: + if len(output) == 1: + logger.info("The flags of saved file %s " % output[0]) + fileflags = output[0][-5] + break + else: + logger.error("Fail to get the flags of saved file") + return 1 + + thread.exit_thread() - diff = cacheafter - cachebefore - logger.info("diff is %s " % diff) - percent = math.fabs(diff)/cachebefore - logger.info("diff percent is %s " % percent) - if percent < 0.05: +def check_fileflag(fileflags): + """Check the file flags of managed save file if include O_DIRECT""" + if int(fileflags) == 4: + logger.info("file flags include O_DIRECT") return True else: + logger.error("file flags doesn't include O_DIRECT") return False -def get_cachevalue(): - """Get the file system cached value """ - - cmds = "head -n4 /proc/meminfo|grep Cached|awk '{print $2}'" - (status, output) = utils.exec_cmd(cmds, shell=True) - if status != 0: - logger.error("Fail to run cmd line to get cache") - return 1 - else: - logger.debug(output[0]) - cachevalue= int(output[0]) - return cachevalue - def managedsave(params): """Managed save a running domain""" global logger logger = params['logger'] + global guestname guestname = params['guestname'] flags = params ['flags'] + global fileflags + fileflags = '' #Save given flags to sharedmod.data sharedmod.data['flagsave'] = flags @@ -122,17 +128,14 @@ def managedsave(params): #If given flags include bypass-cache,check if bypass file system cache if flagn % 2 == 1: - logger.info("Given flags include --bypass-cache") - os.system('echo 3 > /proc/sys/vm/drop_caches') - cache_before = get_cachevalue() - logger.info("Cached value before managedsave is %s" % cache_before) + logger.info("Given flags include --bypass-cache") + thread.start_new_thread(get_fileflags,()) + # Guarantee get_fileflags shell has run before managed save + time.sleep(5) domobj.managedSave(flagn) - cache_after = get_cachevalue() - logger.info("Cached value after managedsave is %s" % cache_after) - - if compare_cachedfile(cache_before, cache_after): + if check_fileflag(fileflags): logger.info("Bypass file system cache successfully") else: logger.error("Bypass file system cache failed") -- 1.7.7.6

2 1

[libvirt] virsh "net-create" explanation
by Bilal Ahmad 28 Dec '12

28 Dec '12

Hi all, I am new to libvirt and started looking at the source code. While tracing back the virsh command "net-create", I got stuck into a loop and I would really like someone to explain how this works. In the virsh-network.c, from: network = virNetworkCreateXML(ctl->conn, buffer); I traced back to: if (conn->networkDriver && conn->networkDriver->networkCreateXML) { virNetworkPtr ret; ret = conn->networkDriver->networkCreateXML(conn, xmlDesc); Then I traced back to the following struct to find how networkCreateXML is working: struct _virNetworkDriver { const char * name; /* the name of the driver */ virDrvOpen open; virDrvClose close; virDrvNumOfNetworks numOfNetworks; virDrvListNetworks listNetworks; virDrvNumOfDefinedNetworks numOfDefinedNetworks; virDrvListDefinedNetworks listDefinedNetworks; virDrvListAllNetworks listAllNetworks; virDrvNetworkLookupByUUID networkLookupByUUID; virDrvNetworkLookupByName networkLookupByName; virDrvNetworkCreateXML networkCreateXML; >From the above code, I located the definition of virDrvNetworkCreateXML and found the following: typedef virNetworkPtr (*virDrvNetworkCreateXML) (virConnectPtr conn, const char *xmlDesc); This is where I am unable to trace back to any other code. Can someone please explain the code with typedef above and where is the definition of the function this function pointer is pointing to? I want to get to the root of the networkCreateXML function and how it exactly works. Can someone please explain? Thanks a lot, Bilal

3 2

[libvirt] [PATCH] python: Adapt to virevent rename
by Michal Privoznik 28 Dec '12

28 Dec '12

With our recent renames under src/util/* we forgot to adapt python wrapper code generator. This results in some methods being not exposed: $ python examples/domain-events/events-python/event-test.py Using uri:qemu:///system Traceback (most recent call last): File "examples/domain-events/events-python/event-test.py", line 585, in <module> main() File "examples/domain-events/events-python/event-test.py", line 543, in main virEventLoopPureStart() File "examples/domain-events/events-python/event-test.py", line 416, in virEventLoopPureStart virEventLoopPureRegister() File "examples/domain-events/events-python/event-test.py", line 397, in virEventLoopPureRegister libvirt.virEventRegisterImpl(virEventAddHandleImpl, AttributeError: 'module' object has no attribute 'virEventRegisterImpl' --- Pushed under trivial rule. python/generator.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/python/generator.py b/python/generator.py index e9b9270..bae4edc 100755 --- a/python/generator.py +++ b/python/generator.py @@ -132,7 +132,7 @@ class docParser(xml.sax.handler.ContentHandler): if tag == 'function': if self.function != None: if (self.function_module == "libvirt" or - self.function_module == "event" or + self.function_module == "virevent" or self.function_module == "virterror"): function(self.function, self.function_descr, self.function_return, self.function_args, -- 1.8.0.2

1 0

[libvirt] [test-API][PATCH] Add volume upload and download cases
by Wayne Sun 28 Dec '12

28 Dec '12

* test download storage volumes using storage download API. * test upload storage volumes using storage upload API. For upload case, only raw volume format is supported, other format will fail. The offset and length value should be chosen from 0 and 1048576, because upload size is set as 1M. * both case use blocking stream. * sample conf is added. Signed-off-by: Wayne Sun <gsun(a)redhat.com> --- cases/storage_vol_upload_download.conf | 127 ++++++++++++++++++++++ repos/storage/vol_download.py | 157 +++++++++++++++++++++++++++ repos/storage/vol_upload.py | 183 ++++++++++++++++++++++++++++++++ 3 files changed, 467 insertions(+), 0 deletions(-) create mode 100644 cases/storage_vol_upload_download.conf create mode 100644 repos/storage/vol_download.py create mode 100644 repos/storage/vol_upload.py diff --git a/cases/storage_vol_upload_download.conf b/cases/storage_vol_upload_download.conf new file mode 100644 index 0000000..b393814 --- /dev/null +++ b/cases/storage_vol_upload_download.conf @@ -0,0 +1,127 @@ +storage:create_dir_pool + poolname + $defaultpoolname + +storage:vol_upload + poolname + $defaultpoolname + volname + $defaultvolumename + capacity + 10M + volformat + raw + offset + 0 + length + 0 +clean + +storage:vol_upload + poolname + $defaultpoolname + volname + $defaultvolumename + capacity + 10M + volformat + raw + offset + 1048576 + length + 0 +clean + +storage:vol_upload + poolname + $defaultpoolname + volname + $defaultvolumename + capacity + 10M + volformat + raw + offset + 0 + length + 1048576 +clean + +storage:vol_upload + poolname + $defaultpoolname + volname + $defaultvolumename + capacity + 10M + volformat + raw + offset + 1048576 + length + 1048576 +clean + +storage:vol_download + poolname + $defaultpoolname + volname + $defaultvolumename + capacity + 50M + volformat + raw + offset + 0 + length + 0 +clean + +storage:vol_download + poolname + $defaultpoolname + volname + $defaultvolumename + capacity + 50M + volformat + qcow2 + offset + 1048576 + length + 0 +clean + +storage:vol_download + poolname + $defaultpoolname + volname + $defaultvolumename + capacity + 50M + volformat + qed + offset + 0 + length + 1048576 +clean + +storage:vol_download + poolname + $defaultpoolname + volname + $defaultvolumename + capacity + 50M + volformat + raw + offset + 1048576 + length + 1048576 +clean + +storage:destroy_pool + poolname + $defaultpoolname diff --git a/repos/storage/vol_download.py b/repos/storage/vol_download.py new file mode 100644 index 0000000..839bc8a --- /dev/null +++ b/repos/storage/vol_download.py @@ -0,0 +1,157 @@ +#!/usr/bin/env python +# storage volume download testing + +import os +import string +import hashlib +from xml.dom import minidom + +import libvirt +from libvirt import libvirtError + +from src import sharedmod +from utils import utils + +required_params = ('poolname', 'volname', 'volformat', 'capacity', 'offset', + 'length',) +optional_params = {'xml' : 'xmls/dir_volume.xml', + } + +def get_pool_path(poolobj): + """ get pool xml description + """ + poolxml = poolobj.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 write_file(path, capacity): + """write test data to file + """ + logger.info("write %s data into file %s" % (capacity, path)) + out = utils.get_capacity_suffix_size(capacity) + f = open(path, 'w') + datastr = ''.join(string.lowercase + string.uppercase + + string.digits + '.' + '\n') + repeat = out['capacity_byte'] / 64 + data = ''.join(repeat * datastr) + f.write(data) + f.close() + +def digest(path, offset, length): + """read data from file with length bytes, begin at offset + and return md5 hexdigest + """ + f = open(path, 'r') + f.seek(offset) + m = hashlib.md5() + done = 0 + + while True: + want = 1024 + if length and length - done < want: + want = length - done + outstr = f.read(want) + got = len(outstr) + if got == 0: + break + done += got + m.update(outstr) + + logger.debug("total %s bytes data is readed" % done) + + f.close() + return m.hexdigest() + +def handler(stream, data, file_): + return file_.write(data) + +def vol_download(params): + """test volume download and check""" + + global logger + logger = params['logger'] + poolname = params['poolname'] + volname = params['volname'] + volformat = params['volformat'] + offset = int(params['offset']) + length = int(params['length']) + capacity = params['capacity'] + xmlstr = params['xml'] + + logger.info("the poolname is %s, volname is %s, volformat is %s" % + (poolname, volname, volformat)) + logger.info("download offset is: %s" % offset) + logger.info("the data length to download is: %s" % length) + + conn = sharedmod.libvirtobj['conn'] + try: + poolobj = conn.storagePoolLookupByName(poolname) + path_value = get_pool_path(poolobj) + volume_path = path_value + "/" + volname + + xmlstr = xmlstr.replace('VOLPATH', volume_path) + xmlstr = xmlstr.replace('SUFFIX', capacity[-1]) + xmlstr = xmlstr.replace('CAP', capacity[:-1]) + logger.debug("volume xml:\n%s" % xmlstr) + + logger.info("create %s raw volume" % volname) + vol = poolobj.createXML(xmlstr, 0) + + write_file(volume_path, capacity) + origdigest = digest(volume_path, offset, length) + logger.debug("the md5 hex digest of data read from %s is: %s" % + (volume_path, origdigest)) + + st = conn.newStream(0) + + test_path = path_value + "/" + "vol_test" + + f = open(test_path, 'w') + logger.info("start download") + vol.download(st, offset, length, 0) + logger.info("downloaded all data") + st.recvAll(handler, f) + logger.info("finished stream") + st.finish() + f.close() + + newdigest = digest(test_path, 0, 0) + logger.debug("the md5 hex digest of data read from %s is: %s" % + (test_path, newdigest)) + + if origdigest == newdigest: + logger.info("file digests match, download succeed") + else: + logger.error("file digests not match, download failed") + return 1 + + except libvirtError, e: + logger.error("libvirt call failed: " + str(e)) + return 1 + + return 0 + +def vol_download_clean(params): + """clean testing environment""" + poolname = params['poolname'] + volname = params['volname'] + + conn = sharedmod.libvirtobj['conn'] + poolobj = conn.storagePoolLookupByName(poolname) + path_value = get_pool_path(poolobj) + test_path = path_value + "/" + "vol_test" + + vol = poolobj.storageVolLookupByName(volname) + vol.delete(0) + + if os.path.exists(test_path): + os.unlink(test_path) + + return 0 diff --git a/repos/storage/vol_upload.py b/repos/storage/vol_upload.py new file mode 100644 index 0000000..42af06f --- /dev/null +++ b/repos/storage/vol_upload.py @@ -0,0 +1,183 @@ +#!/usr/bin/env python +# storage volume upload testing, only raw format volume is +# supported, other format might fail. offset and length can +# only be chosen in 0 and 1048576. + +import os +import string +import hashlib +from xml.dom import minidom + +import libvirt +from libvirt import libvirtError + +from src import sharedmod + +required_params = ('poolname', 'volname', 'volformat', 'capacity', + 'offset', 'length',) +optional_params = {'xml' : 'xmls/dir_volume.xml', + } + +def get_pool_path(poolobj): + """ get pool xml description + """ + poolxml = poolobj.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 write_file(path): + """write 1M test data to file + """ + logger.info("write data into file %s" % path) + f = open(path, 'w') + datastr = ''.join(string.lowercase + string.uppercase + + string.digits + '.' + '\n') + data = ''.join(16384 * datastr) + f.write(data) + f.close() + +def digest(path, offset, length): + """read data from file with length bytes, begin at offset + and return md5 hexdigest + """ + f = open(path, 'r') + f.seek(offset) + m = hashlib.md5() + done = 0 + + while True: + want = 1024 + if length and length - done < want: + want = length - done + outstr = f.read(want) + got = len(outstr) + if got == 0: + break + done += got + m.update(outstr) + + logger.debug("total %s bytes data is readed" % done) + + f.close() + return m.hexdigest() + +def handler(stream, data, file_): + return file_.read(data) + +def vol_upload(params): + """test volume download and check""" + + global logger + logger = params['logger'] + poolname = params['poolname'] + volname = params['volname'] + volformat = params['volformat'] + offset = int(params['offset']) + length = int(params['length']) + capacity = params['capacity'] + xmlstr = params['xml'] + + logger.info("the poolname is %s, volname is %s, volformat is %s" % + (poolname, volname, volformat)) + logger.info("upload offset is: %s" % offset) + logger.info("the data length to upload is: %s" % length) + + conn = sharedmod.libvirtobj['conn'] + try: + poolobj = conn.storagePoolLookupByName(poolname) + path_value = get_pool_path(poolobj) + volume_path = path_value + "/" + volname + + xmlstr = xmlstr.replace('VOLPATH', volume_path) + xmlstr = xmlstr.replace('SUFFIX', capacity[-1]) + xmlstr = xmlstr.replace('CAP', capacity[:-1]) + logger.debug("volume xml:\n%s" % xmlstr) + + logger.info("create %s raw volume" % volname) + vol = poolobj.createXML(xmlstr, 0) + + test_path = path_value + "/" + "vol_test" + write_file(test_path) + olddigest = digest(test_path, 0, 0) + logger.debug("the old file digest is: %s" % olddigest) + + if offset: + origdigestpre = digest(volume_path, 0, offset) + else: + origdigestpre = '' + logger.debug("the original pre region digest is: %s" % origdigestpre) + + origdigestpost = digest(volume_path, offset + 1024 * 1024, 0) + logger.debug("the original post region digest is: %s" % origdigestpost) + + st = conn.newStream(0) + + f = open(test_path, 'r') + logger.info("start upload") + vol.upload(st, offset, length, 0) + logger.info("sent all data") + st.sendAll(handler, f) + logger.info("finished stream") + st.finish() + f.close() + + newdigest = digest(volume_path, offset, 1024 * 1024) + logger.debug("the new file digest is: %s" % olddigest) + + if offset: + newdigestpre = digest(volume_path, 0, offset) + else: + newdigestpre = '' + logger.debug("the new pre region digest is: %s" % origdigestpre) + + newdigestpost = digest(volume_path, offset + 1024 * 1024, 0) + logger.debug("the new post region digest is: %s" % origdigestpost) + + if newdigestpre == origdigestpre: + logger.info("file pre region digests match") + else: + logger.error("file pre region digests not match") + return 1 + + if olddigest == newdigest: + logger.info("file digests match") + else: + logger.error("file digests not match") + return 1 + + if newdigestpost == origdigestpost: + logger.info("file post region digests match") + else: + logger.error("file post region digests not match") + return 1 + + except libvirtError, e: + logger.error("libvirt call failed: " + str(e)) + return 1 + + return 0 + +def vol_upload_clean(params): + """clean testing environment""" + poolname = params['poolname'] + volname = params['volname'] + + conn = sharedmod.libvirtobj['conn'] + poolobj = conn.storagePoolLookupByName(poolname) + path_value = get_pool_path(poolobj) + test_path = path_value + "/" + "vol_test" + + vol = poolobj.storageVolLookupByName(volname) + vol.delete(0) + + if os.path.exists(test_path): + os.unlink(test_path) + + return 0 -- 1.7.1

1 0

[libvirt] [PATCH 0/6] Fix multiple problems while dealing with transient networks
by Peter Krempa 28 Dec '12

28 Dec '12

This series fixes a few issues when dealing with transient networks: 1) Check for multiple DHCP sections is added also to transient networks 2) Create and clean up dnsmasq config files when dealing with transient networks 3) Add support for making network transient with undefine 4) a few cleanups Peter Krempa (6): conf: net: Fix helper for applying new network definition net: Change argument type of virNetworkObjIsDuplicate() net: Move creation of dnsmasq hosts file to function starting dnsmasq net: Remove dnsmasq and radvd files also when destroying transient nets net: Re-use checks when creating transient networks net: Add support for changing persistent networks to transient src/conf/network_conf.c | 4 +- src/conf/network_conf.h | 2 +- src/network/bridge_driver.c | 261 +++++++++++++++++++++++--------------------- 3 files changed, 138 insertions(+), 129 deletions(-) -- 1.7.12.4

4 30

Re: [libvirt] [Users] Vdsm/libvir error during deploy
by Dan Kenigsberg 27 Dec '12

27 Dec '12

On Mon, Dec 24, 2012 at 02:18:48PM +0100, Joop wrote: > Dan Kenigsberg wrote: > >Which version of libvirt is installed on your host? > > > libvirt-1.0.1-2.fc17.x86_64 > libvirt-client-1.0.1-2.fc17.x86_64 > libvirt-daemon-1.0.1-2.fc17.x86_64 > libvirt-daemon-config-network-1.0.1-2.fc17.x86_64 > libvirt-daemon-config-nwfilter-1.0.1-2.fc17.x86_64 > libvirt-daemon-driver-interface-1.0.1-2.fc17.x86_64 > libvirt-daemon-driver-lxc-1.0.1-2.fc17.x86_64 > libvirt-daemon-driver-network-1.0.1-2.fc17.x86_64 > libvirt-daemon-driver-nodedev-1.0.1-2.fc17.x86_64 > libvirt-daemon-driver-nwfilter-1.0.1-2.fc17.x86_64 > libvirt-daemon-driver-qemu-1.0.1-2.fc17.x86_64 > libvirt-daemon-driver-secret-1.0.1-2.fc17.x86_64 > libvirt-daemon-driver-storage-1.0.1-2.fc17.x86_64 > libvirt-daemon-driver-uml-1.0.1-2.fc17.x86_64 > libvirt-daemon-driver-xen-1.0.1-2.fc17.x86_64 > libvirt-lock-sanlock-1.0.1-2.fc17.x86_64 > libvirt-python-1.0.1-2.fc17.x86_64 > > From virt-preview repo > [fedora-virt-preview] > name=Virtualization packages from Rawhide built for latest Fedora > baseurl=http://fedorapeople.org/groups/virt/virt-preview/fedora-$releasever… > enabled=1 > skip_if_unavailable=1 > gpgcheck=0 > > >What is the output of the following python script on your machine? Mine > >says "1". Could it be that your libvirt says "0"? > > > >============= > > > >from vdsm import libvirtconnection > > > >conn = libvirtconnection.get() > >netXml = """<network> > > <name>test</name> > > <forward mode='passthrough'> > > <interface dev='em1'/> > > </forward> > ></network> > >""" > > > >net = conn.networkDefineXML(netXml) > >net.create() > >print net.isPersistent() > >net.destroy() > >net.undefine() > > > > > 0 > libvir: Network Driver error : Network not found: no network with > matching uuid > Traceback (most recent call last): > File "test.py", line 16, in <module> > net.undefine() > File "/usr/lib64/python2.7/site-packages/libvirt.py", line 2154, in > undefine > if ret == -1: raise libvirtError ('virNetworkUndefine() failed', > net=self) > libvirt.libvirtError: Network not found: no network with matching uuid > > So '0' :-(( > Suppose that error isn't good either. > Should I downgrade to an earlier version of libvirt? Please try. My guess is that this is a libvirt bug added by http://libvirt.org/git/?p=libvirt.git;a=commitdiff;h=0211fd6e04cdc402da2081… in libvirt 1.0.1. More authoritative answer is expected by those added to the CC line.

3 4

[libvirt] [PATCH] ESX: append CURL headers to fix serviceContent entities
by Ata E Husain Bohra 26 Dec '12

26 Dec '12

It seems with current SOAP header the call to retrieve "serviceContent" object does not populate all available references (for instance: ovfManager). The host exposes details of these Managed Object References (MoBs) if header is appended with "SOAPACtion" field. Ata E Husain Bohra (1): ESX: append CURL headers to fix serviceContent entities src/esx/esx_vi.c | 2 ++ src/esx/esx_vi_generator.input | 3 +++ 2 files changed, 5 insertions(+) -- 1.7.9.5

1 0

[libvirt] [jenkins@libvirt.sigxcpu.org: Build failed in Jenkins: libvirt-check #419]
by Guido Günther 25 Dec '12

25 Dec '12

Hi, it seems one of these commits 5411e7e176dcbb65591cb97ec128b5fd0f365805 473011334ccd93e8efbb67f2561f1d4e54d212ae 392c192240566d9e167d2b5a1022092d8f7e045c broke "make check" as seen on http://honk.sigxcpu.org:8001/job/libvirt-check/417/console output attached. I can't look into this in more right now though. Cheers, -- Guido P.S.: the libvirt-tck check is also currently broken but that's probably a fallout of the above.

3 7

[libvirt] [PATCH 0/2] Use more of qemuDomObjFromDomain
by Michal Privoznik 24 Dec '12

24 Dec '12

I know we are in the freeze so I will push this after upstream is thaw. Michal Privoznik (2): qemu: Relax locking in DomainHasManagedSaveImage and DomainMonitorCommand qemu: Convert some APIs to use qemuDomObjFromDomain src/qemu/qemu_driver.c | 478 +++++------------------------------------------ 1 files changed, 51 insertions(+), 427 deletions(-) -- 1.7.8.6

2 7

[libvirt] libvirt will wait 20 minutes or hang when the network interface down
by Benjamin Wang (gendwang) 24 Dec '12

24 Dec '12

Hi, I find that when the network interface is down. In most scenarios, the libvirt will wait 20 minutes and report the exception. In seldom scenarios, the polling thread will hang even if the network is recovered. The following is the formal description from libcurl website: http://curl.haxx.se/docs/faq.html (Section "4.19 Why doesn't cURL return an error when the network cable is unplugged?") The following is the similar case about thread hand: http://curl.haxx.se/mail/lib-2010-07/0108.html For "wait 20 minutes", although this is the TCP normal mechanism, but if a server manages tons of thousands of devices by libvirt. When 1000 devices are down, This could cause thread leak for a long period. For thread hang, this could cause thread leak forever. I tried to add the following codes in esx_vi.c. It seems that these code can avoid the above issues. Would you give your comments? if (curl->headers == NULL) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Could not build CURL header list")); return -1; } + curl_easy_setopt(curl->handle, CURLOPT_LOW_SPEED_LIMIT, 10); + curl_easy_setopt(curl->handle, CURLOPT_LOW_SPEED_TIME, 120); curl_easy_setopt(curl->handle, CURLOPT_USERAGENT, "libvirt-esx"); curl_easy_setopt(curl->handle, CURLOPT_HEADER, 0); curl_easy_setopt(curl->handle, CURLOPT_FOLLOWLOCATION, 0); curl_easy_setopt(curl->handle, CURLOPT_SSL_VERIFYPEER, B.R. Benjamin Wang

2 2

[libvirt] [PATCH 0/8] Fix PowerPC CPU driver
by Jiri Denemark 22 Dec '12

22 Dec '12

Current PowerPC driver is too complicated and mostly wrong as it was apparently created from x86 driver and not properly addapted for PowerPC architecture. More details about the issues are described in individual patches. Jiri Denemark (8): cpu: Introduce cpuModelIsAllowed internal API cpu: Make comparing PowerPC CPUs easier to read cpu: Fix PowerPCNodeData cpu: Fix loading PowerPC vendor from cpu_map.xml cpu: Reimplement PowerPCBaseline cpu: Reimplement PowerPCDecode cpu: Remove hardcoded list of PowerPC models cpu: Rename PowerPCUpdate and PowerPCDataFree functions src/cpu/cpu.c | 17 ++ src/cpu/cpu.h | 5 + src/cpu/cpu_generic.c | 19 +-- src/cpu/cpu_map.xml | 12 +- src/cpu/cpu_powerpc.c | 462 +++++++++++++++++--------------------------------- src/cpu/cpu_x86.c | 11 +- 6 files changed, 193 insertions(+), 333 deletions(-) -- 1.8.0.2

3 17

[libvirt] Release of libvirt-1.0.1
by Daniel Veillard 21 Dec '12

21 Dec '12

So as scheduled, and since we got only a few fixes on top of rc2 I made the release this morning, it is tagged in the git tree and tarball and rpms are available as usual at: ftp://libvirt.org/libvirt/ This is a balanced release with both new features, a lot of improvements and a reasonable amount of bug fixes too, overall a bit more than 350 commit, accumulated since 1.0.0. Features: - Introduce virtlockd daemon (Daniel P. Berrange) - parallels: add disk and network device support (Dmitry Guryanov) - Add virDomainSendProcessSignal API (Daniel P. Berrange) - Introduce virDomainFSTrim() public API (Michal Privoznik) - add fuse support for libvirt lxc (Gao feng) - Add Gluster protocol as supported network disk backend (Harsh Prateek Bora) - various snapshot improvements (Peter Krempa, Eric Blake) Documentation: - fix some typos in examples (Eric Blake) - Fix location of libvirt.conf and auth.conf (Michał Łomnicki) - Document offline migration (Jiri Denemark) - libvirt.c: Fix wording and grammar in virDomainFSTrim (Michal Privoznik) - Fix a few spaces (Ján Tomko) - boot order for host and redirected USB devices (Ján Tomko) - AbortJob: Fix documentation (Michal Privoznik) - Fix "virsh create" example (Guido Günther) Portability: - build: minor build fixes for BSD (Eric Blake) - Socket identity support for FreeBSD. (Roman Bogorodskiy) - Require SANLK_INQ_WAIT for inq_lockspace support (Guido Günther) - locking: Fix VPATH build and distribute generated files (Jiri Denemark) - build: Fix VPATH build (Jiri Denemark) - Change virCgroupGetAppRoot stub on non-Linux to avoid unused param warning (Daniel P. Berrange) - Qemu FreeBSD: fix compilation (Roman Bogorodskiy) - Drop mntent.h include. (Roman Bogorodskiy) - virsh: Fix usage of header termios.h (Peter Krempa) - pci: Fix building of 32bit PCI command array (Peter Krempa) - spec: require dbus-daemon when using libvirtd in Fedora (Eric Blake) - systemd: require dbus service (Eric Blake) - rpc: fix build failure with older dbus (Eric Blake) - build: fix build --without-network (Ján Tomko) - build: trivial fix error: implicit declaration of function 'malloc' (Natanael Copa) - run bootstrap if .gnulib is not present (Hu Tao) - add ppc64 and s390x to arches where qemu-kvm exists (Dan Horák) - nodeinfo: port nodecpumap to RHEL5 (Eric Blake) - spec: don't enable cgconfig under systemd (Eric Blake) Bug Fixes: - network: fix (non)update of dnsmasq config during virDomainUpdateDeviceFlags (Laine Stump) - sanlock: Re-add lockspace unconditionally (Michal Privoznik) - install: fix virtlockd installation (Eric Blake) - qemu: don't fail update netdev on bridge detach failure (Laine Stump) - selinux: fix NULL dereference in GetSecurityMountOptions (Ján Tomko) - network: prevent dnsmasq from listening on localhost (Laine Stump) - Fix error reporting when fetching SCSI/LVM keys (Daniel P. Berrange) - Fix probing of QED file format (Daniel P. Berrange) - Fix memory leak in QEMU QMP capabilities initialization (Daniel P. Berrange) - qemu: snapshot: Remove memory image if external checkpoint fails (Peter Krempa) - qemu: snapshot: Don't leak XML definition if restarting of CPUs fails (Peter Krempa) - qemu: fix uninitialized variable warning in doPeer2PeerMigrate (Ján Tomko) - conf: Remove duplicate declaration of virNetworkDNSDefPtr (Jiri Denemark) - qemu: Restart CPUs with valid async job type when doing external snapshots (Peter Krempa) - qemu: eliminate bogus error log when changing netdev's bridge (Laine Stump) - qemu: capabilities: fix machine name/canonical swappage (Cole Robinson) - Inhibit daemon shutdown during driver initialization (Guido Günther) - util: Don't fail virGetGroupIDByName when group not found (Christophe Fergeau) - util: Don't fail virGetUserIDByName when user not found (Christophe Fergeau) - storage: Error out earlier if the volume target path already exists (Osier Yang) - remote: Avoid the thread race condition (Daniel P. Berrange) - qemu: Fix memory (and FD) leak on PCI device detach (Jiri Denemark) - qemu: Don't free PCI device if adding it to activePciHostdevs fails (Jiri Denemark) - qemu: Fix error code when attaching existing device (Jiri Denemark) - Fix memory leak introduced by commit 501bfad1 (Jim Fehlig) - Shut down session libvirtd cleanly on host shutdown/user logout (Alexander Larsson) - Inhibit desktop shutdown while any virtual machines are running (Daniel P. Berrange) - conf: prevent crash with no uuid in cephx auth secret (Ján Tomko) - virsh: don't crash if shutdown --mode not provided (Eric Blake) - qemu: Fix up the default machine type for QMP probing (Viktor Mihajlovski) - Fix uninitialized variables (Guido Günther) - qemu: don't attempt undefined QMP commands (Eric Blake) - storage: fix scsi detach regression with cgroup ACLs (Eric Blake) - nwfilter: report an error on OOM (Ján Tomko) - virsh: check the return value of virStoragePoolGetAutostart (Ján Tomko) - conf: fix uninitialized variable in virDomainListSnapshots (Ján Tomko) - rpc: don't destroy xdr before creating it in virNetMessageEncodeHeader (Ján Tomko) - virsh: use correct sizeof when allocating cpumap (Ján Tomko) - util: fix virBitmap allocation in virProcessInfoGetAffinity (Ján Tomko) - conf: fix NULL check in virNetDevBandwidthParse (Ján Tomko) - Don't fail hard when we can't connect to the monitor (Guido Günther) - node_memory: Fix bug of node_memory_tune (Osier Yang) - node_memory: Do not fail if there is parameter unsupported (Osier Yang) - network: fix crash when portgroup has no name (Laine Stump) - maint: Fix use of invalid reboot flags (Michal Privoznik) - util: check for NULL parameter in virFileWrapperFdCatchError (Ján Tomko) - conf: snapshot: check return value of virDomainSnapshotObjListNum (Ján Tomko) - conf: check the return value of virXPathNodeSet (Ján Tomko) - cgroup: fix impossible overrun in virCgroupAddTaskController (Ján Tomko) - nwfilter: fix NULL pointer check in virNWFilterSnoopReqNew (Ján Tomko) - qemu: Fix error messages when dispatching guest agent commands (Peter Krempa) - qemu: Fix QMP Capabability Probing Failure (Viktor Mihajlovski) - qemu: Wait for monitor socket even without pid (Viktor Mihajlovski) - bitmap: fix typo to use UL type of integer constant in virBitmapIsAllSet (Guannan Ren) - qemu: fix a crash when save file can't be opened (Ján Tomko) - Fix leak of virNetworkPtr in LXC startup failure path (Daniel P. Berrange) - Fix error reporting in virNetDevVethDelete (Daniel P. Berrange) - Ensure transient def is removed if LXC start fails (Daniel P. Berrange) - Ensure failure to create macvtap device aborts LXC start (Daniel P. Berrange) - Avoid crash when LXC start fails with no interface target (Daniel P. Berrange) - Treat missing driver cgroup as fatal in LXC driver (Daniel P. Berrange) - Ensure LXC container exits if cgroups setup fails (Daniel P. Berrange) - Fix error handling in virSecurityManagerGetMountOptions (Daniel P. Berrange) - storage: fix device detach regression with cgroup ACLs (Eric Blake) - lxc: Don't crash if no security driver is specified in libvirt_lxc (Peter Krempa) - lxc: Avoid segfault of libvirt_lxc helper on early cleanup paths (Peter Krempa) - storage: fix logical volume cloning (Ján Tomko) - Fix exiting of libvirt_lxc program on container quit (Daniel P. Berrange) - Skip deleted timers when calculting next timeout (Daniel P. Berrange) - Fix virDiskNameToIndex to actually ignore partition numbers (Daniel P. Berrange) - qemu: Stop recursive detection of image chains when an image is missing (Peter Krempa) - storage: Fix bug of fs pool destroying (Osier Yang) - qemu: fix RBD attach regression (Scott Sullivan) - qemu: allow larger discrepency between memory & currentMemory in domain xml (Laine Stump) - sanlock: Retry after EINPROGRESS (Michal Privoznik) - virsh: fix uninitialized variable in cmdSnapshotEdit (Ján Tomko) - util: fix index when building lock owners array (Laine Stump) - Fix uninitialized variable in virLXCControllerSetupDevPTS (Daniel P. Berrange) - tests: Remove temporary directories in qemumonitorjsontest (Peter Krempa) - tests: Fix qemumonitorjsontest deadlock when the machine is under load (Peter Krempa) - qemu: Fix domain ID numbering race condition (Peter Krempa) - storage: fix broken backing chain (Philipp Hahn) - qemu: Don't corrupt pointer in qemuDomainSaveMemory() (Peter Krempa) - esx: Yet another connection fix for 5.1 (Martin Kletzander) - iohelper: Don't report errors on special FDs (Michal Privoznik) - qemu: Fix possible race when pausing guest (Peter Krempa) - conf: net: Fix deadlock if assignment of network def fails (Peter Krempa) - conf: net: Fix helper for applying new network definition (Peter Krempa) Improvements: - spec: Include lockd files in libvirt-daemon package (Jiri Denemark) - build: Install both qemu-lockd.conf and qemu-sanlock.conf (Jiri Denemark) - build: use fewer cat processes (Eric Blake) - build: Distribute more files (Jiri Denemark) - virsh: use vshReconnect for non-default connections too (Ján Tomko) - virsh: don't lie about reconnection in vshReconnect (Ján Tomko) - Add support for locking based on SCSI volume ID (Daniel P. Berrange) - Add support for locking based on LVM volume uuid (Daniel P. Berrange) - Add ability to maintain disk leases indirectly (Daniel P. Berrange) - Add a virtlockd client as a lock driver impl (Daniel P. Berrange) - Add support for re-exec() of virtlockd upon SIGUSR1 (Daniel P. Berrange) - Enable systemd socket activation with virtlockd (Daniel P. Berrange) - Implement dispatch functions for lock protocol in virtlockd (Daniel P. Berrange) - Define a wire protocol for talking to the virtlockd daemon (Daniel P. Berrange) - Introduce basic infrastructure for virtlockd daemon (Daniel P. Berrange) - Refactor creation of lock manager plugins (Daniel P. Berrange) - Support network boot for HVM guests in libxl (Jim Fehlig) - Add lots of debugging to storage file probing code (Daniel P. Berrange) - Log warning if storage magic matches, but version does not (Daniel P. Berrange) - network: match xml warning message (Eric Blake) - Fix make check with different object directory (Viktor Mihajlovski) - qemu: Improve error reporting from qemuDomainManagedSaveRemove (Peter Krempa) - qemu: Small code cleanups in the managedsave functions (Peter Krempa) - qemu: Refactor managed save functions to use domain lookup helpers (Peter Krempa) - qemu: Add a new domain lookup helper and improve the docs (Peter Krempa) - util: Fix warning message in previous patch (Peter Krempa) - util: rework error reporting in virGet(User|Group)IDByName (Peter Krempa) - Refactor virDomainHostdevFind method (Daniel P. Berrange) - Slightly refactor hostdev parsing / formating (Daniel P. Berrange) - Remove bogus const return values in storage file APIs (Daniel P. Berrange) - Add missing export of virStorageFileGetLVMKey & virStorageFileGetSCSIKey (Daniel P. Berrange) - Fix sorting of libvirt_private.syms and add syntax check rule (Daniel P. Berrange) - uml: Report error if inotify fails on driver startup (Cole Robinson) - tools: Only install guests init script if --with-init=script=redhat (Cole Robinson) - add vnc unix sockets to apparmor policy (Serge Hallyn) - add security hook for permitting hugetlbfs access (Serge Hallyn) - maint: mention when HACKING is rebuilt during make (Eric Blake) - qemu: reuse qemuMigrationIsAllowed when doing save and managedsave (Peter Krempa) - qemu: snapshot: Report better error message if migration isn't allowed (Peter Krempa) - qemu: Make qemuMigrationIsAllowed more reusable (Peter Krempa) - qemu: assume seccomp sandbox is supported since qemu 1.2 (Ján Tomko) - domain: Keep assigned class_id in domstatus XML (Michal Privoznik) - network: Create real network status files (Michal Privoznik) - bandwidth: Create network bandwidth (un)plug functions (Michal Privoznik) - bandwidth: Create rate update function (Michal Privoznik) - bandwidth: Create (un)plug functions (Michal Privoznik) - bandwidth: Create hierarchical shaping classes (Michal Privoznik) - bandwidth: add new 'floor' attribute (Michal Privoznik) - bandwidth: Attach sfq to leaf node (Michal Privoznik) - parallels: handle network adapters of type 'routed' (Dmitry Guryanov) - parallels: add routed pseudo network (Dmitry Guryanov) - parallels: parse virtual network properties (Dmitry Guryanov) - parallels: add network driver (Dmitry Guryanov) - parallels: move parallelsParseError to parallels_utils.h (Dmitry Guryanov) - parallels: add support of network interfaces to parallelsDomainDefineXML (Dmitry Guryanov) - parallels: parse information about network interfaces (Dmitry Guryanov) - examples: Fix balloon event callback (Jiri Denemark) - network: put dnsmasq parameters in conf-file instead of command line (Gene Czarcinski) - network: add support for DHCPv6 (Gene Czarcinski) - conf: split <forward> parser/clear into separate functions (Laine Stump) - conf: put data for network <forward> element into its own struct (Laine Stump) - conf: make virNetworkIpDefClear consistent with other functions (Laine Stump) - conf: rename some labels and functions in network_conf (Laine Stump) - network: backend functions for updating network dns host/srv/txt (Laine Stump) - conf: clear and parse functions for dns host/srv/txt records (Laine Stump) - conf: rename network dns host/srv/txt arrays (Laine Stump) - conf: use VIR_(INSERT|DELETE)_ELEMENT in virNetworkUpdate backend (Laine Stump) - util: add VIR_(APPEND|INSERT|DELETE)_ELEMENT (Laine Stump) - parallels: add support of removing disks (Dmitry Guryanov) - parallels: apply config after VM creation (Dmitry Guryanov) - parallels: add support of disks creation (Dmitry Guryanov) - parallels: add function parallelsGetDiskBusName (Dmitry Guryanov) - parallels: split parallelsStorageVolumeDelete function (Dmitry Guryanov) - parallels: fill volumes capacity parameter (Dmitry Guryanov) - parallels: add info about volumes (Dmitry Guryanov) - parallels: fix leaks in parallelsFindVolumes (Dmitry Guryanov) - parallels: create storage pools by VM list (Dmitry Guryanov) - parallels: remove unused code from storage driver (Dmitry Guryanov) - parallels: split parallelsStorageOpen function (Dmitry Guryanov) - parallels: handle disk devices in parallelsDomainDefineXML (Dmitry Guryanov) - parallels: add info about hard disk devices (Dmitry Guryanov) - Add support for offline migration (liguang) - S390: Assign default model "virtio" for network interfaces (Viktor Mihajlovski) - virsh: allow metadata preallocation when creating volumes (Ján Tomko) - storage: allow metadata preallocation when creating qcow2 images (Ján Tomko) - qemu: Allow the user to specify vendor and product for disk (Osier Yang) - Convert libxl driver to Xen 4.2 (Jim Fehlig) - network: prevent a few invalid configuration combinations (Laine Stump) - network: allow guest to guest IPv6 without gateway definition (Gene Czarcinski) - util: Do not keep PCI device config file open (Jiri Denemark) - util: Slightly refactor PCI list functions (Jiri Denemark) - qemu: Simplify the code (Osier Yang) - qemu: improve error for failed JSON commands (Eric Blake) - qemu: nicer error message if live disk snapshot unsupported (Eric Blake) - implement managedsave in libvirt xen legacy driver (Bamvor Jian Zhang) - Bind connection close callback APIs to python binding (Daniel P. Berrange) - Replace polling for active VMs with signalling by drivers (Daniel P. Berrange) - Only let VM drivers block libvirtd timed shutdown (Daniel P. Berrange) - Make QEMU perform managed save of all VMs on stop of libvirtd (Daniel P. Berrange) - build: fix incremental autogen.sh when no AUTHORS is present (Eric Blake) - Add iSCSI backend storage driver for ESX (Ata E Husain Bohra) - qemu: support live update of an interface's filter (Laine Stump) - nwfilter: utility function virNWFilterVarValueEqual (Stefan Berger) - conf: fix virDomainNetGetActualDirect*() and BridgeName() (Laine Stump) - virsh: Report errors if arguments of the schedinfo command are incorrect (Peter Krempa) - logging: more API needing to log flags (Eric Blake) - s/flags=%u/flags=%x/ in earlier commit (Daniel P. Berrange) - Allow duration=0 for virsh nodesuspend (Daniel P. Berrange) - Allow comma separated list of shutdown/reboot modes with virsh (Daniel P. Berrange) - Introduce APIs for splitting/joining strings (Daniel P. Berrange) - Add support for shutdown / reboot APIs in LXC driver (Daniel P. Berrange) - Introduce two new methods for triggering controlled shutdown/reboot (Daniel P. Berrange) - Move reboot/shutdown flags combination check into QEMU driver (Daniel P. Berrange) - Add APIs for talking to init via /dev/initctl (Daniel P. Berrange) - Ensure virDomainShutdownFlags logs flags parameter (Daniel P. Berrange) - Quote client identity in SASL whitelist log message (Daniel P. Berrange) - qemu: Refactor error reporting in qemu driver configuration parser (Peter Krempa) - qemu: Refactor config parameter retrieval (Peter Krempa) - network: use dnsmasq --bind-dynamic when available (Laine Stump) - util: new virSocketAddrIsPrivate function (Laine Stump) - util: capabilities detection for dnsmasq (Laine Stump) - virsh: do timing even for unusable connections (Ján Tomko) - Turn some dual-state int parameters into booleans (Daniel P. Berrange) - Introduce a 'stop' method to virDriverState (Daniel P. Berrange) - Implement virDomainSendProcessSignal for LXC driver (Daniel P. Berrange) - Add a 'send-process-signal' command to virsh (Daniel P. Berrange) - Specify remote protocol for virDomainSendProcessSignal (Daniel P. Berrange) - Rename misc QEMU structs/enums to use normal naming style (Daniel P. Berrange) - Replace 'struct qemud_driver *' with virQEMUDriverPtr (Daniel P. Berrange) - virsh: fix error messages in iface-bridge (Ján Tomko) - libssh2_session: support DSS keys as well (Ján Tomko) - virsh: Rewrite cmdDomDisplay (Martin Kletzander) - virsh: Expose new virDomainFSTrim API (Michal Privoznik) - qemu: Implement virDomainFSTrim (Michal Privoznik) - remote: Implement virDomainFSTrim (Michal Privoznik) - qemu: Add QEMU version computation to QMP probing (Viktor Mihajlovski) - mount fuse's meminfo file to container's /proc/meminfo (Gao feng) - make /proc/meminfo isolate with host through fuse (Gao feng) - add interface virCgroupGetAppRoot (Gao feng) - add interface virCgroupGetMemSwapUsage (Gao feng) - Add a configure option for fuse support in LXC driver (Gao feng) - Alphabetically sort libvirt_daemon.syms (Daniel P. Berrange) - Change bridge driver to use named initializers with virDriverState (Daniel P. Berrange) - virdbus: Add virDBusGetSessionBus helper (Alexander Larsson) - Specify name of target interface with macvlan error (Daniel P. Berrange) - Store initpid in the domain status XML for LXC (Daniel P. Berrange) - Pass virSecurityManagerPtr object further down into LXC setup code (Daniel P. Berrange) - tests: Add tests for gluster protocol based network disks support (Harsh Prateek Bora) - qemu: Add support for gluster protocol based network storage backend. (Harsh Prateek Bora) - Refactor ESX storage driver to implement facade pattern (Ata E Husain Bohra) - Add private data pointer to virStoragePool and virStorageVol (Ata E Husain Bohra) - cpu: Add Intel Haswell cpu model (Peter Krempa) - util: Use virReportSystemError for system error in pci.c (Osier Yang) - virsh: Report error when taking a snapshot with empty --memspec argument (Peter Krempa) - Warn if requesting update to non-existent timer/handle watch (Daniel P. Berrange) - qemuhelpdata: Revert my 'fix' (Michal Privoznik) - conf: Report sensible error for invalid disk name (Martin Kletzander) - Log an audit message with the LXC init pid (Daniel P. Berrange) - Use virNetServerRun instead of custom main loop (Daniel P. Berrange) - storage: Improve virStorageBackendFileSystemStop (Osier Yang) - tests: update qemuhelptest data (Ján Tomko) - tests: add boot order for host and redirected USB to qemu argv test (Ján Tomko) - conf: add support for booting from redirected USB devices (Ján Tomko) - qemu: graphics support for simultaneous one of each sdl, vnc, spice (Alon Levy) - qemu: refactor graphics code to not hardcode a single display (Alon Levy) - snapshot: make cloning of domain definition easier (Eric Blake) - snapshot: expose location through virsh snapshot-info (Eric Blake) - snapshot: implement new filter sets (Eric Blake) - snapshot: add virsh back-compat support for new filters (Eric Blake) - snapshot: add two more filter sets to API (Eric Blake) - nodeinfo: support kernels that lack socket information (Eric Blake) - snapshot: require user to supply external memory file name (Eric Blake) - virsh: save: report an error if XML file can't be read (Ján Tomko) - virsh: Use virNodeGetCPUMap if possible (Viktor Mihajlovski) - python: Use virNodeGetCPUMap where possible (Viktor Mihajlovski) - qemu, lxc: Change host CPU number detection logic. (Viktor Mihajlovski) - nodeinfo: enable nodeGetCPUCount for older kernels (Viktor Mihajlovski) - Use helper functions to format the journal iov array (Miloslav Trmač) - Add metadata to virLogOutputFunc (Miloslav Trmač) - Add a metadata parameter to virLog{, V}Message (Miloslav Trmač) - qemu: add bootindex for usb-host and usb-redir devices (Ján Tomko) - build: rerun bootstrap if AUTHORS is missing (Eric Blake) - qemu: Don't force port=0 for SPICE (Michal Privoznik) - snapshot: qemu: Fix detection of external snapshots when deleting (Peter Krempa) - nodeinfotest: Add test data from a AMD bulldozer machine. (Peter Krempa) - nodeinfotest: Add test data for 2 processor host with broken NUMA (Peter Krempa) - nodeinfo: Add check and workaround to guarantee valid cpu topologies (Peter Krempa) - qemu: Allow migration to be cancelled at prepare phase (Michal Privoznik) - capabilities: defaultConsoleTargetType can depend on architecture (Viktor Mihajlovski) - snapshot: qemu: Add support for external inactive snapshots (Peter Krempa) - virsh: add snapshot-create-as memspec support (Eric Blake) - virsh: make ,, escape parsing common (Eric Blake) - qemu: Emit event if 'cont' fails (Michal Privoznik) - Introduce new VIR_DOMAIN_EVENT_SUSPENDED_API_ERROR event (Michal Privoznik) - virsh: document which term is older (Eric Blake) - tests: Add test for controller order (Michal Privoznik) - qemu: Add controllers in specified order (Michal Privoznik) - qemu: Wrap controllers code into dummy loop (Michal Privoznik) - spec: replace scriptlets with new systemd macros (Václav Pavlín) - gitignore: ignore more files (liguang) - snapshot: qemu: Remove restrictions preventing external checkpoints (Peter Krempa) - snapshot: qemu: Add support for external checkpoints (Peter Krempa) - snapshot: qemu: Rename qemuDomainSnapshotCreateActive (Peter Krempa) - snapshot: qemu: Add async job type for snapshots (Peter Krempa) - snapshot: Add flag to enable creating checkpoints in live state (Peter Krempa) - qemu: Split out domain memory saving code to allow reuse (Peter Krempa) - qemu: Clean up snapshot retrieval to use the new helper (Peter Krempa) - cpu: Add AMD Opteron G5 cpu model (Peter Krempa) - cpu: Add newly added cpu flags (Peter Krempa) - snapshot: merge pre-snapshot checks (Eric Blake) - snapshot: populate new XML info for qemu snapshots (Eric Blake) - snapshot: improve disk align checking (Eric Blake) - snapshot: new XML for external system checkpoint (Eric Blake) - snapshot: simplify OOM checking during parse (Eric Blake) - Document bracket whitespace rules & add syntax-check rule (Daniel P. Berrange) - net: Mark network persistent when assigning persistent definition (Peter Krempa) - net: Add support for changing persistent networks to transient (Peter Krempa) - net: Re-use checks when creating transient networks (Peter Krempa) - net: Remove dnsmasq and radvd files also when destroying transient nets (Peter Krempa) - net: Move creation of dnsmasq hosts file to function starting dnsmasq (Peter Krempa) - net: Change argument type of virNetworkObjIsDuplicate() (Peter Krempa) - build: Do not ignore logging.c in sc_prohibit_mkstemp (Jiri Denemark) - qemu: use default machine type if missing it in qemu command line (Guannan Ren) Cleanups - storage: Remove the redundant white lines (Osier Yang) - Fix the indention (Osier Yang) - Do not export symbol virStateActive anymore (Osier Yang) - maint: Misc whitespace cleanups (Peter Krempa) - Fix the coding style (Osier Yang) - Fix indentions (Osier Yang) - qemu: Remove full stop from error messages (Jiri Denemark) - build: more fix to avoid C99 for loop (Hu Tao) - nwfilter: drop dead code (Eric Blake) - qemu: Drop word "either" from comments for agent monitor functions (Peter Krempa) - s/qemud/qemu/ in QEMU driver sources (Daniel P. Berrange) - Remove bogus newline at end of debug log message (Daniel P. Berrange) - build: avoid C99 for loop (Eric Blake) - util: Fix the indention (Osier Yang) - qemu/qemu_command.c: fix indent of label (Alon Levy) - qemu: Beautify code indent in migration codes (liguang) - qemu: Fix function header formating of 2 functions (Peter Krempa) - Remove spurious whitespace between function name & open brackets (Daniel P. Berrange) - Remove a chunk which should not have been pushed as part of 1.0.0 (Daniel Veillard) - logging.c: Properly indent and ignore one syntax-check rule (Michal Privoznik) Thanks everybody for your contributions, be it reports, code, reviews, ideas or documentation ! 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/

4 4

[libvirt] [PATCH] S390: Re-enable capability probing for virtio devices.
by Viktor Mihajlovski 21 Dec '12

21 Dec '12

Since we switched to QMP probing, the object types are spelled out explicitly, i.e. virtio-net-pci. This has effectively disabled the capability detection of s390 virtio devices. The trivial fix is to add the s390 virtio types explicitly to qemuCapsObjectProps. Signed-off-by: Viktor Mihajlovski <mihajlov(a)linux.vnet.ibm.com> --- src/qemu/qemu_capabilities.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index a6ac169..a705a53 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -1400,6 +1400,10 @@ static struct qemuCapsObjectTypeProps qemuCapsObjectProps[] = { ARRAY_CARDINALITY(qemuCapsObjectPropsVirtioBlk) }, { "virtio-net-pci", qemuCapsObjectPropsVirtioNet, ARRAY_CARDINALITY(qemuCapsObjectPropsVirtioNet) }, + { "virtio-blk-s390", qemuCapsObjectPropsVirtioBlk, + ARRAY_CARDINALITY(qemuCapsObjectPropsVirtioBlk) }, + { "virtio-net-s390", qemuCapsObjectPropsVirtioNet, + ARRAY_CARDINALITY(qemuCapsObjectPropsVirtioNet) }, { "pci-assign", qemuCapsObjectPropsPciAssign, ARRAY_CARDINALITY(qemuCapsObjectPropsPciAssign) }, { "kvm-pci-assign", qemuCapsObjectPropsPciAssign, -- 1.7.9.5

3 3

[libvirt] [PATCH] util: fix botched check for new netlink request filters
by Laine Stump 21 Dec '12

21 Dec '12

This is an adjustment to the fix for https://bugzilla.redhat.com/show_bug.cgi?id=889319 to account for two bonehead mistakes I made. commit ac2797cf2af2fd0e64c58a48409a8175d24d6f86 attempted to fix a problem with netlink in newer kernels requiring an extra attribute with a filter flag set in order to receive an IFLA_VFINFO_LIST from netlink. Unfortunately, the #ifdef that protected against compiling it in on systems without the new flag went a bit too far, assuring that the new code would *never* be compiled. The first problem was that, while some IFLA_* enum values are also not, so checking to see if it's #defined is not a valid method of determining whether or not to add the attribute. Fortunately, the flag that is being set (RTEXT_FILTER_VF) *is* #defined, and it is never present if IFLA_EXT_MASK isn't, so it's sufficient to just check for that flag. And to top it off, due to the code not actually compiling when I thought it did, I didn't realize that I'd been given the wrong arglist to nla_put() - you can't just send a const value to nla_put, you have to send it a pointer to memory containing what you want to add to the message, along with the length of that memory. This time I've actually sent the patch over to the other machine that's expriencing the problem, applied it to the branch being used (0.10.2) and verified that it works properly, i.e. it does fix the problem it's supposed to fix. :-/ --- src/util/virnetdev.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/util/virnetdev.c b/src/util/virnetdev.c index e5a0d6d..898e77a 100644 --- a/src/util/virnetdev.c +++ b/src/util/virnetdev.c @@ -1275,13 +1275,17 @@ virNetDevLinkDump(const char *ifname, int ifindex, goto buffer_too_small; } -# if defined(IFLA_EXT_MASK) && defined(RTEXT_FILTER_VF) +# if defined(RTEXT_FILTER_VF) /* if this filter exists in the kernel's netlink implementation, * we need to set it, otherwise the response message will not * contain the IFLA_VFINFO_LIST that we're looking for. */ - if (nla_put(nl_msg, IFLA_EXT_MASK, RTEXT_FILTER_VF) < 0) + { + uint32_t ifla_ext_mask = RTEXT_FILTER_VF; + + if (nla_put(nl_msg, IFLA_EXT_MASK, sizeof(ifla_ext_mask), &ifla_ext_mask) < 0) goto buffer_too_small; + } # endif if (virNetlinkCommand(nl_msg, recvbuf, &recvbuflen, -- 1.7.11.7

2 2

[libvirt] qemumonitorjsontest still hangs
by Eric Blake 21 Dec '12

21 Dec '12

I ran 'make check' under a heavily loaded system, and it hung in qemumonitorjsontest as follows: (gdb) t a a bt Thread 2 (Thread 0x2b0f8000e700 (LWP 423)): #0 0x00000032f96e998d in poll () from /lib64/libc.so.6 #1 0x00002b0f7f3a1951 in virEventPollRunOnce () at util/event_poll.c:615 #2 0x00002b0f7f39fb26 in virEventRunDefaultImpl () at util/event.c:247 #3 0x00000000004c25fa in qemuMonitorTestWorker (opaque=0x1ad8bc0) at qemumonitortestutils.c:308 #4 0x00002b0f7f3bbc39 in virThreadHelper (data=0x1ada580) at util/threads-pthread.c:161 #5 0x00000032f9a07d15 in start_thread () from /lib64/libpthread.so.0 #6 0x00000032f96f246d in clone () from /lib64/libc.so.6 Thread 1 (Thread 0x2b0f7fe0bbc0 (LWP 402)): #0 0x00000032f9a08e60 in pthread_join () from /lib64/libpthread.so.0 #1 0x00002b0f7f3bbeae in virThreadJoin (thread=0x1ad8be8) at util/threads-pthread.c:236 #2 0x00000000004c27b0 in qemuMonitorTestFree (test=0x1ad8bc0) at qemumonitortestutils.c:362 #3 0x00000000004144ba in testQemuMonitorJSONGetMachines (data=0x1ac7650) at qemumonitorjsontest.c:298 #4 0x0000000000414ef2 in virtTestRun (title=0x4c3434 "GetMachines", nloops=1, body=0x413f3e <testQemuMonitorJSONGetMachines>, data=0x1ac7650) at testutils.c:160 ---Type <return> to continue, or q <return> to quit--- #5 0x00000000004149f4 in mymain () at qemumonitorjsontest.c:446 #6 0x0000000000416092 in virtTestMain (argc=1, argv=0x7fffc02dcac8, func=0x41493d <mymain>) at testutils.c:719 #7 0x0000000000414aab in main (argc=1, argv=0x7fffc02dcac8) at qemumonitorjsontest.c:455 This was with latest libvirt.git, so I'm worried we still have a nasty race somewhere in there. -- Eric Blake eblake redhat com +1-919-301-3266 Libvirt virtualization library http://libvirt.org

1 0

[libvirt] [PATCH] blockjob: fix memleak that prevented block pivot
by Eric Blake 21 Dec '12

21 Dec '12

https://bugzilla.redhat.com/show_bug.cgi?id=888426 The code for doing a block-copy was supposed to track the destination file in drive->mirror, but was set up to do all mallocs prior to starting the copy so that OOM wouldn't leave things partially started. However, the wrong variable was being written; later in the code we silently did 'disk->mirror = mirror' which was still NULL, and thus leaking memory and leaving libvirt to think that the mirror job was never started, which prevented a pivot operation after a copy. * src/qemu/qemu_driver.c (qemuDomainBlockCopy): Initialize correct variable. --- src/qemu/qemu_driver.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 7d8dd21..184f852 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -13429,7 +13429,7 @@ qemuDomainBlockCopy(virDomainPtr dom, const char *path, } if (!format && disk->mirrorFormat > 0) format = virStorageFileFormatTypeToString(disk->mirrorFormat); - if (!(disk->mirror = strdup(dest))) { + if (!(mirror = strdup(dest))) { virReportOOMError(); goto endjob; } -- 1.7.1

2 2

[libvirt] vhost-net on ethernet interface type
by Raja Sivaramakrishnan 21 Dec '12

21 Dec '12

Hello, I would like to enable vhost-net on an interface of ethernet type. However, this doesn't work, probably due to the following code in libvirt. if (actualType == VIR_DOMAIN_NET_TYPE_NETWORK || actualType == VIR_DOMAIN_NET_TYPE_BRIDGE || actualType == VIR_DOMAIN_NET_TYPE_DIRECT) { /* Attempt to use vhost-net mode for these types of network device */ Can VIR_DOMAIN_NET_TYPE_ETHERNET also be included in the check above? Or is there some reason to disable vhost-net for this type? Thanks, Raja

2 2

[libvirt] [PATCH 0/8] Dump domain's IP addresses
by Michal Privoznik 21 Dec '12

21 Dec '12

It's been a while since I tried get this in. I've reworked the patches, the exposed API, and start new round of reviews. Moreover, during work I've come to point, where extending qemu guest agent seemed wise: http://lists.nongnu.org/archive/html/qemu-devel/2012-12/msg03264.html Therefore I am introducing 'flags' field, which can contain some boolean values we don't have yet, e.g. IFF_UP, IFF_PROMISC, etc. Re: 'dstaddr' field in struct _virDomainInterfaceIPAddress; It's basically a join of: union { char *dstaddr; /* for IFF_POINTOPOINT interface */ char *broadaddr; /* for IFF_BROADCAST interface */ } Since an interface cannot has both flags set (see man 3 getifaddrs) I've joined both into one 'char *dstaddr'. I know it is not mnemonic as the union, so I left it for discussion. I can change it if you want to. Michal Privoznik (8): Introduce virDomainInterfacesAddresses API Introduce virDomainInterfaceFree API qemu_agent: Implement 'guest-network-get-interfaces' command handling qemu: Implement qemuDomainInterfacesAddresses virsh: Expose virDomainInterfacesAddresses remote: Implement virDomainInterfacesAddresses python: Expose virDomainInterfacesAddresses python: create example for dumping domain IP addresses daemon/remote.c | 138 +++++++++++++++++++++++++++++++++ examples/python/Makefile.am | 2 +- examples/python/README | 1 + examples/python/domipaddrs.py | 50 ++++++++++++ include/libvirt/libvirt.h.in | 52 +++++++++++++ python/generator.py | 3 + python/libvirt-override-api.xml | 7 ++ python/libvirt-override.c | 120 +++++++++++++++++++++++++++++ src/driver.h | 6 ++ src/libvirt.c | 102 +++++++++++++++++++++++++ src/libvirt_public.syms | 7 ++ src/qemu/qemu_agent.c | 164 ++++++++++++++++++++++++++++++++++++++++ src/qemu/qemu_agent.h | 2 + src/qemu/qemu_driver.c | 68 +++++++++++++++++ src/remote/remote_driver.c | 86 +++++++++++++++++++++ src/remote/remote_protocol.x | 27 ++++++- src/remote_protocol-structs | 27 +++++++ tools/virsh-domain.c | 102 +++++++++++++++++++++++++ 18 files changed, 962 insertions(+), 2 deletions(-) create mode 100755 examples/python/domipaddrs.py -- 1.8.0.2

2 12

[libvirt] [PATCH 0/6] BUG fix for PowerPC.
by Li Zhang 21 Dec '12

21 Dec '12

From: Li Zhang <zhlcindy(a)linux.vnet.ibm.com> This patch series is to fix bugs on PowerPC we found when testing libvirt. Li Zhang (6): Set std VGA model as default model for ppc64. Use -machine option for PPC64 Remove QEMU_CAPS_NO_ACPI capability for non-x86 platform Support all backend serial devices for pSeries guest Set the default machine as pseries for PPC64 Use help string "-device driver," when getting additional caps. src/conf/capabilities.c | 6 ++++ src/conf/domain_conf.c | 2 ++ src/qemu/qemu_capabilities.c | 12 ++++++-- src/qemu/qemu_command.c | 31 +++++++++++--------- .../qemuxml2argv-machine-core-off.args | 2 +- .../qemuxml2argv-machine-core-on.args | 2 +- .../qemuxml2argv-pseries-basic.args | 2 +- .../qemuxml2argv-pseries-vio-user-assigned.args | 2 +- .../qemuxml2argvdata/qemuxml2argv-pseries-vio.args | 2 +- 9 files changed, 39 insertions(+), 22 deletions(-) -- 1.7.10.1

3 19

[libvirt] [PATCH v2 0/28] Rename files in src/util to have a 'vir' prefix
by Daniel P. Berrange 21 Dec '12

21 Dec '12

Currently the files in src/util are 50/50 split between those having a 'vir' prefix and those which don't. Finish the job by remaining all remaining files to have a 'vir' prefix too, guaranteeing that they can't clash with system headers[1]. The only case which was not a plain rename, was merging processinfo.{c,h} into the virprocess.{c,h} since the functionality logically belongs together. At the end src/Makefile.am is updated to sort util files alphabetically. Left as further work - make sure all functions in these files also have a 'vir' prefix. eg dnsmasq, ebtables, iptables, usb and pci files are violators in this regard. Also left, much of virutil.c should move into virfile.c Changes in v2: - Rebased to latest GIT - Turned on rename detection to make review easier Daniel [1] Not a theoretical problem - we already hit a clsah on 'usb.h' before forcing us to use 'hostusb.h' and 'memory.h' clashes with a system header but we never noticed so far. In-Reply-To:

3 32

[libvirt] [test-API][PATCH] managedsave: change the checking method about bypass cache
by hongming 21 Dec '12

21 Dec '12

Check whether the O_DIRECT flag is in use on the managed save file during the duration of the managed save, since that is the real effect of the current implementation of the --bypass-cache flag. --- repos/managedsave/managedsave.py | 66 +++++++++++++++++++------------------ 1 files changed, 34 insertions(+), 32 deletions(-) diff --git a/repos/managedsave/managedsave.py b/repos/managedsave/managedsave.py index 4a92151..b898876 100644 --- a/repos/managedsave/managedsave.py +++ b/repos/managedsave/managedsave.py @@ -2,6 +2,8 @@ import os import math +import thread +import time import libvirt from libvirt import libvirtError @@ -39,39 +41,42 @@ def check_savefile_create(*args): logger.info("managed save file exists") return True -def compare_cachedfile(cachebefore, cacheafter): - """Compare cached value before managed save and its value after - managed save """ - - diff = cacheafter - cachebefore - logger.info("diff is %s " % diff) - percent = math.fabs(diff)/cachebefore - logger.info("diff percent is %s " % percent) - if percent < 0.05: - return True - else: - return False - -def get_cachevalue(): - """Get the file system cached value """ - - cmds = "head -n4 /proc/meminfo|grep Cached|awk '{print $2}'" - (status, output) = utils.exec_cmd(cmds, shell=True) - if status != 0: - logger.error("Fail to run cmd line to get cache") - return 1 +def get_fileflags(): + """Get the file flags of managed save file""" + cmds = "cat /proc/$(lsof -w /var/lib/libvirt/qemu/save/"+guestname+".save"\ + "|awk '/libvirt_i/{print $2}')/fdinfo/1|grep flags|awk '{print $NF}'" + global fileflags + while True: + (status, output) = utils.exec_cmd(cmds, shell=True) + if status == 0: + for i in range(len(output)): + logger.info("The flags of saved file %s" % output[i]) + fileflags = output[i][-5] + else: + logger.error("Fail to get the flags of saved file") + return 1 + + thread.exit_thread() + +def check_fileflag(fileflags): + """Check the file flags of managed save file if include O_DIRECT""" + if int(fileflags) == 4: + logger.info("file flags include O_DIRECT") + return True else: - logger.debug(output[0]) - cachevalue= int(output[0]) - return cachevalue + logger.error("file flags doesn't include O_DIRECT") + return False def managedsave(params): """Managed save a running domain""" global logger logger = params['logger'] + global guestname guestname = params['guestname'] flags = params ['flags'] + global fileflags + fileflags = '' #Save given flags to sharedmod.data sharedmod.data['flagsave'] = flags @@ -122,17 +127,14 @@ def managedsave(params): #If given flags include bypass-cache,check if bypass file system cache if flagn % 2 == 1: - logger.info("Given flags include --bypass-cache") - os.system('echo 3 > /proc/sys/vm/drop_caches') - cache_before = get_cachevalue() - logger.info("Cached value before managedsave is %s" % cache_before) + logger.info("Given flags include --bypass-cache") + thread.start_new_thread(get_fileflags,()) + # Guarantee get_fileflags shell has run before managed save + time.sleep(5) domobj.managedSave(flagn) - cache_after = get_cachevalue() - logger.info("Cached value after managedsave is %s" % cache_after) - - if compare_cachedfile(cache_before, cache_after): + if check_fileflag(fileflags): logger.info("Bypass file system cache successfully") else: logger.error("Bypass file system cache failed") -- 1.7.7.6

1 0

[libvirt] [PATCH 0/2] account for change in netlink kernel ABI
by Laine Stump 20 Dec '12

20 Dec '12

The first of these two patches changes libvirt to account for a change in netlink's kernel ABI that happened upstream several months ago. The second patch adds in error logs to the functions that failed after the kernel change. Laine Stump (2): util: fix functions that retrieve SRIOV VF info util: add missing error log messages when failing to get netlink VFINFO src/util/virnetdev.c | 87 +++++++++++++++++++++++++++++----------------------- 1 file changed, 49 insertions(+), 38 deletions(-) -- 1.7.11.7

2 4

[libvirt] [PATCH 1/1] Add sysinfo data and enable virSysinfoRead test case for POWER
by Li Zhang 20 Dec '12

20 Dec '12

From: Li Zhang <zhlcindy(a)linux.vnet.ibm.com> This patch is to enable virSysinfoRead test case for POWER, and provide sysinfo data on POWER. Signed-off-by: Li Zhang <zhlcindy(a)linux.vnet.ibm.com> Reviewed-by: Viktor Mihajlovski <mihajlov(a)linux.vnet.ibm.com> --- tests/sysinfodata/ppccpuinfo.data | 85 ++++++++++++++++++++++++++++++++++ tests/sysinfodata/ppcsysinfo.expect | 87 +++++++++++++++++++++++++++++++++++ tests/sysinfotest.c | 25 ---------- 3 files changed, 172 insertions(+), 25 deletions(-) create mode 100644 tests/sysinfodata/ppccpuinfo.data create mode 100644 tests/sysinfodata/ppcsysinfo.expect diff --git a/tests/sysinfodata/ppccpuinfo.data b/tests/sysinfodata/ppccpuinfo.data new file mode 100644 index 0000000..bf4433c --- /dev/null +++ b/tests/sysinfodata/ppccpuinfo.data @@ -0,0 +1,85 @@ +processor : 0 +cpu : POWER7 (raw), altivec supported +clock : 8.388608MHz +revision : 2.3 (pvr 003f 0203) + +processor : 4 +cpu : POWER7 (raw), altivec supported +clock : 8.388608MHz +revision : 2.3 (pvr 003f 0203) + +processor : 8 +cpu : POWER7 (raw), altivec supported +clock : 8.388608MHz +revision : 2.3 (pvr 003f 0203) + +processor : 12 +cpu : POWER7 (raw), altivec supported +clock : 8.388608MHz +revision : 2.3 (pvr 003f 0203) + +processor : 16 +cpu : POWER7 (raw), altivec supported +clock : 8.388608MHz +revision : 2.3 (pvr 003f 0203) + +processor : 20 +cpu : POWER7 (raw), altivec supported +clock : 8.388608MHz +revision : 2.3 (pvr 003f 0203) + +processor : 24 +cpu : POWER7 (raw), altivec supported +clock : 8.388608MHz +revision : 2.3 (pvr 003f 0203) + +processor : 28 +cpu : POWER7 (raw), altivec supported +clock : 8.388608MHz +revision : 2.3 (pvr 003f 0203) + +processor : 32 +cpu : POWER7 (raw), altivec supported +clock : 8.388608MHz +revision : 2.3 (pvr 003f 0203) + +processor : 36 +cpu : POWER7 (raw), altivec supported +clock : 8.388608MHz +revision : 2.3 (pvr 003f 0203) + +processor : 40 +cpu : POWER7 (raw), altivec supported +clock : 8.388608MHz +revision : 2.3 (pvr 003f 0203) + +processor : 44 +cpu : POWER7 (raw), altivec supported +clock : 8.388608MHz +revision : 2.3 (pvr 003f 0203) + +processor : 48 +cpu : POWER7 (raw), altivec supported +clock : 8.388608MHz +revision : 2.3 (pvr 003f 0203) + +processor : 52 +cpu : POWER7 (raw), altivec supported +clock : 8.388608MHz +revision : 2.3 (pvr 003f 0203) + +processor : 56 +cpu : POWER7 (raw), altivec supported +clock : 8.388608MHz +revision : 2.3 (pvr 003f 0203) + +processor : 60 +cpu : POWER7 (raw), altivec supported +clock : 8.388608MHz +revision : 2.3 (pvr 003f 0203) + +timebase : 512000000 +platform : PowerNV +model : 8246-L2C +machine : PowerNV 8246-L2C +firmware : OPAL v2 diff --git a/tests/sysinfodata/ppcsysinfo.expect b/tests/sysinfodata/ppcsysinfo.expect new file mode 100644 index 0000000..32407e0 --- /dev/null +++ b/tests/sysinfodata/ppcsysinfo.expect @@ -0,0 +1,87 @@ +<sysinfo type='smbios'> + <system> + <entry name='version'>PowerNV 8246-L2C</entry> + <entry name='serial'>8246-L2C</entry> + <entry name='family'>PowerNV</entry> + </system> + <processor> + <entry name='socket_destination'>0</entry> + <entry name='type'>POWER7 (raw), altivec supported</entry> + <entry name='version'>2.3 (pvr 003f 0203)</entry> + </processor> + <processor> + <entry name='socket_destination'>4</entry> + <entry name='type'>POWER7 (raw), altivec supported</entry> + <entry name='version'>2.3 (pvr 003f 0203)</entry> + </processor> + <processor> + <entry name='socket_destination'>8</entry> + <entry name='type'>POWER7 (raw), altivec supported</entry> + <entry name='version'>2.3 (pvr 003f 0203)</entry> + </processor> + <processor> + <entry name='socket_destination'>12</entry> + <entry name='type'>POWER7 (raw), altivec supported</entry> + <entry name='version'>2.3 (pvr 003f 0203)</entry> + </processor> + <processor> + <entry name='socket_destination'>16</entry> + <entry name='type'>POWER7 (raw), altivec supported</entry> + <entry name='version'>2.3 (pvr 003f 0203)</entry> + </processor> + <processor> + <entry name='socket_destination'>20</entry> + <entry name='type'>POWER7 (raw), altivec supported</entry> + <entry name='version'>2.3 (pvr 003f 0203)</entry> + </processor> + <processor> + <entry name='socket_destination'>24</entry> + <entry name='type'>POWER7 (raw), altivec supported</entry> + <entry name='version'>2.3 (pvr 003f 0203)</entry> + </processor> + <processor> + <entry name='socket_destination'>28</entry> + <entry name='type'>POWER7 (raw), altivec supported</entry> + <entry name='version'>2.3 (pvr 003f 0203)</entry> + </processor> + <processor> + <entry name='socket_destination'>32</entry> + <entry name='type'>POWER7 (raw), altivec supported</entry> + <entry name='version'>2.3 (pvr 003f 0203)</entry> + </processor> + <processor> + <entry name='socket_destination'>36</entry> + <entry name='type'>POWER7 (raw), altivec supported</entry> + <entry name='version'>2.3 (pvr 003f 0203)</entry> + </processor> + <processor> + <entry name='socket_destination'>40</entry> + <entry name='type'>POWER7 (raw), altivec supported</entry> + <entry name='version'>2.3 (pvr 003f 0203)</entry> + </processor> + <processor> + <entry name='socket_destination'>44</entry> + <entry name='type'>POWER7 (raw), altivec supported</entry> + <entry name='version'>2.3 (pvr 003f 0203)</entry> + </processor> + <processor> + <entry name='socket_destination'>48</entry> + <entry name='type'>POWER7 (raw), altivec supported</entry> + <entry name='version'>2.3 (pvr 003f 0203)</entry> + </processor> + <processor> + <entry name='socket_destination'>52</entry> + <entry name='type'>POWER7 (raw), altivec supported</entry> + <entry name='version'>2.3 (pvr 003f 0203)</entry> + </processor> + <processor> + <entry name='socket_destination'>56</entry> + <entry name='type'>POWER7 (raw), altivec supported</entry> + <entry name='version'>2.3 (pvr 003f 0203)</entry> + </processor> + <processor> + <entry name='socket_destination'>60</entry> + <entry name='type'>POWER7 (raw), altivec supported</entry> + <entry name='version'>2.3 (pvr 003f 0203)</entry> + </processor> +</sysinfo> diff --git a/tests/sysinfotest.c b/tests/sysinfotest.c index 79ee128..353bc76 100644 --- a/tests/sysinfotest.c +++ b/tests/sysinfotest.c @@ -50,27 +50,6 @@ struct testSysinfoData { char *expected; /* (required) file containing output of virSysinfoFormat */ }; -# if defined(__powerpc__) || defined(__powerpc64__) -/* TODO ppc: remove the if defined() branch - to enable the real test run after providing test data, see below. - */ -static int -testSysinfo(const void *data ATTRIBUTE_UNUSED) -{ - return EXIT_AM_SKIP; -} - -static int -sysinfotest_run(const char *test ATTRIBUTE_UNUSED, - const char *decoder ATTRIBUTE_UNUSED, - const char *sysinfo ATTRIBUTE_UNUSED, - const char *cpuinfo ATTRIBUTE_UNUSED, - const char *expected ATTRIBUTE_UNUSED) -{ - return testSysinfo(NULL); -} -# else - static int testSysinfo(const void *data) { @@ -143,7 +122,6 @@ error: VIR_FREE(testdata.expected); return ret; } -# endif /* defined(__powerpc__) ... */ # if defined(__s390__) || defined(__s390x__) static int @@ -158,9 +136,6 @@ test_s390(void) VIRT_TEST_MAIN(test_s390) # elif defined(__powerpc__) || defined(__powerpc64__) -/* TODO for PPC owner: provide test data - and enable the real sysinfotest_run above -*/ static int test_ppc(void) { -- 1.7.10.1

3 2

[libvirt] [PATCH] security: fix #endif comment in security_stack.h
by Ján Tomko 20 Dec '12

20 Dec '12

--- Pushed under the trivial rule. --- src/security/security_stack.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/security/security_stack.h b/src/security/security_stack.h index 4ba55f7..b38f9a9 100644 --- a/src/security/security_stack.h +++ b/src/security/security_stack.h @@ -35,4 +35,4 @@ virSecurityStackGetPrimary(virSecurityManagerPtr mgr); virSecurityManagerPtr* virSecurityStackGetNested(virSecurityManagerPtr mgr); -#endif /* __VIR_SECURITY_DAC */ +#endif /* __VIR_SECURITY_STACK */ -- 1.7.8.6

1 0

[libvirt] [PATCH 0/5] Miscellaneous cleanups
by Martin Kletzander 20 Dec '12

20 Dec '12

My cleanup branch got up to 5 commits so in order to get rid of it, I'm sending it. Some of them could be most probably pushed as trivial, but since some are older (even though the commit date is new), I'm sending it in the pack together. Martin Kletzander (5): fix typo in the word affinities conf: minor indentation cleanups conf: Don't format cputune element when not needed conf: eliminate redundant use of VIR_ALLOC docs: aesthetical cleanups docs/hacking.html.in | 12 ++++---- src/conf/domain_conf.c | 80 ++++++++++++++++++++++-------------------------- src/libxl/libxl_driver.c | 4 +-- src/qemu/qemu_process.c | 8 ++--- 4 files changed, 48 insertions(+), 56 deletions(-) -- 1.8.0.2

2 14

[libvirt] [PATCH] conf: cpu: Fix to escape cpu model, vendor_id and vendor
by Ken ICHIKAWA 20 Dec '12

20 Dec '12

This patch fixes a problem that encoded xml special charas of cpu model, vendor_id and vendor are saved as decoded xml special charas. If I define model name including encoded xml special charas in domain XML like below: <domain> <cpu mode='custom' match='exact'> <model fallback='allow'>><</model> </cpu> </domain> domain xml definition file is saved as <domain> <cpu mode='custom' match='exact'> <model fallback='allow'>><</model> </cpu> </domain> After that, if libvirtd is restarted, dumpxml command, edit command and etc. are disabled with below error until I stop libvirtd and fix the xml file manually. 2012-12-20 04:56:54.371+0000: 11893: error : catchXMLError:691 : /etc/libvirt/qemu/f17.xml:25: StartTag: invalid element name <model fallback='allow'>><</model> ------------------------------^ Also vendor_id and vendor have same problem. Signed-off-by: Ken ICHIKAWA <ichikawa.ken(a)jp.fujitsu.com> --- src/conf/cpu_conf.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/conf/cpu_conf.c b/src/conf/cpu_conf.c index 3973c83..e9f9431 100644 --- a/src/conf/cpu_conf.c +++ b/src/conf/cpu_conf.c @@ -609,17 +609,17 @@ virCPUDefFormatBuf(virBufferPtr buf, } virBufferAsprintf(buf, " fallback='%s'", fallback); if (def->vendor_id) - virBufferAsprintf(buf, " vendor_id='%s'", def->vendor_id); + virBufferEscapeString(buf, " vendor_id='%s'", def->vendor_id); } if (formatModel && def->model) { - virBufferAsprintf(buf, ">%s</model>\n", def->model); + virBufferEscapeString(buf, ">%s</model>\n", def->model); } else { virBufferAddLit(buf, "/>\n"); } } if (formatModel && def->vendor) - virBufferAsprintf(buf, "<vendor>%s</vendor>\n", def->vendor); + virBufferEscapeString(buf, "<vendor>%s</vendor>\n", def->vendor); if (def->sockets && def->cores && def->threads) { virBufferAddLit(buf, "<topology"); -- 1.7.11.7

2 1

[libvirt] [PATCH v2.1 00/11] Rework storage migration
by Michal Privoznik 20 Dec '12

20 Dec '12

This patch set re-implements migration with storage for enough new qemu. Currently, you can migrate a domain to a host without need for shared storage. This is done by setting 'blk' or 'inc' attribute (representing VIR_MIGRATE_NON_SHARED_DISK and VIR_MIGRATE_NON_SHARED_INC flags respectively) of 'migrate' monitor command. However, the qemu implementation is buggy and applications are advised to switch to new impementation which, moreover, offers some nice features, like migrating only explicitly specified disks. The new functionality is controlled via 'nbd-server-*' and 'drive-mirror' commands. The flow is meant to look like this: 1) User invokes libvirt's migrate functionality. 2) libvirt checks that no block jobs are active on the source. 3) libvirt starts the destination QEMU and sets up the NBD server using the nbd-server-start and nbd-server-add commands. 4) libvirt starts drive-mirror with a destination pointing to the remote NBD server, for example nbd:host:port:exportname=diskname (where diskname is the -drive id specified on the destination). 5) once all mirroring jobs reach steady state, libvirt invokes the migrate command. 6) once migration completed, libvirt invokes the nbd-server-stop command on the destination QEMU. If we just skip the 2nd step and there is an active block-job, qemu will fail in step 4. No big deal. Since we try to NOT break migration and keep things compatible, this feature is enabled iff both sides support it. Since there's obvious need for some data transfer between src and dst, I've put it into qemuCookieMigration: 1) src -> dest: (QEMU_MIGRATION_PHASE_BEGIN3 -> QEMU_MIGRATION_PHASE_PREPARE) <nbd> <disk size='17179869184'/> </nbd> Hey destination, I know how to use this cool new feature. Moreover, these are the disks I'll send you. Each one of them is X bytes big. It's one of the prerequisite - the file (disk->src) on dst exists and has at least the same size as on dst. 2) dst -> src: (QEMU_MIGRATION_PHASE_PREPARE -> QEMU_MIGRATION_PHASE_PERFORM3) <nbd port='X'/> Okay, I (destination) support this feature as well. I've created all files as you (src) told me to and you can start rolling data. I am listening on port X. 3) src -> dst: (QEMU_MIGRATION_PHASE_PERFORM3 -> QEMU_MIGRATION_PHASE_FINISH3) <nbd port='-1'/> Migration completed, destination, you may shut the NBD server down. If either src or dst doesn't support NBD, it is not used and whole process fall backs to old implementation. diff to v1: -Eric's and Daniel's suggestions worked in. To point out the bigger ones: don't do NBD style when TUNNELLED requested, added 'b:writable' to 'nbd-server-add' -drop '/qemu-migration/nbd/disk/@src' attribute from migration cookie. As pointed out by Jirka, disk->src can be changed during migration (e.g. by migration hook or by passed xml). So I've tried (as suggested on the list) passing disk alias. However, since qemu hasn't been started on destination yet, the aliases hasn't been generated yet. So we have to rely on ordering completely. diff to v2: -rebase to reflect changes made by offline migration patch -send initial nbd cookie only if needed The patches 1,3 and 5 has been ACKed already. Michal Privoznik (11): qemu: Introduce NBD_SERVER capability Introduce NBD migration cookie qemu: Introduce nbd-server-start command qemu: Introduce nbd-server-add command qemu: Introduce nbd-server-stop command qemu_migration: Introduce qemuMigrationStartNBDServer qemu_migration: Move port allocation to a separate func qemu_migration: Implement qemuMigrationStartNBDServer() qemu_migration: Implement qemuMigrationDriveMirror qemu_migration: Check size prerequisites qemu_migration: Stop NBD server at Finish phase src/qemu/qemu_capabilities.c | 3 + src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_migration.c | 624 ++++++++++++++++++++++++++++++++++++++++--- src/qemu/qemu_monitor.c | 63 +++++ src/qemu/qemu_monitor.h | 7 + src/qemu/qemu_monitor_json.c | 95 +++++++ src/qemu/qemu_monitor_json.h | 7 + 7 files changed, 768 insertions(+), 32 deletions(-) -- 1.8.0.2

2 14

[libvirt] [PATCH] maint: formatting cleanups in buf.c
by Eric Blake 19 Dec '12

19 Dec '12

* src/util/buf.c: Use consistent formatting. --- Pushing under the trivial rule. src/util/buf.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/src/util/buf.c b/src/util/buf.c index e5a6ab7..e5406da 100644 --- a/src/util/buf.c +++ b/src/util/buf.c @@ -106,8 +106,8 @@ virBufferGetIndent(const virBufferPtr buf, bool dynamic) /** * virBufferGrow: - * @buf: the buffer - * @len: the minimum free size to allocate on top of existing used space + * @buf: the buffer + * @len: the minimum free size to allocate on top of existing used space * * Grow the available space of a buffer to at least @len bytes. * @@ -282,8 +282,8 @@ virBufferUse(const virBufferPtr buf) /** * virBufferAsprintf: * @buf: the buffer to append to - * @format: the format - * @...: the variable list of arguments + * @format: the format + * @...: the variable list of arguments * * Do a formatted print to an XML buffer. Auto indentation may be applied. */ @@ -299,8 +299,8 @@ virBufferAsprintf(virBufferPtr buf, const char *format, ...) /** * virBufferVasprintf: * @buf: the buffer to append to - * @format: the format - * @argptr: the variable list of arguments + * @format: the format + * @argptr: the variable list of arguments * * Do a formatted print to an XML buffer. Auto indentation may be applied. */ @@ -458,7 +458,7 @@ virBufferEscapeSexpr(virBufferPtr buf, virBufferEscape(buf, '\\', "\\'", format, str); } -/* Work around spurious strchr() diagnostics given by -Wlogical-op * +/* Work around spurious strchr() diagnostics given by -Wlogical-op * for gcc < 4.6. Doing it via a local pragma keeps the damage * smaller than disabling it on the package level. Unfortunately, the * affected GCCs don't allow diagnostic push/pop which would have @@ -522,7 +522,7 @@ virBufferEscape(virBufferPtr buf, char escape, const char *toescape, /** * virBufferURIEncodeString: * @buf: the buffer to append to - * @str: the string argument which will be URI-encoded + * @str: the string argument which will be URI-encoded * * Append the string to the buffer. The string will be URI-encoded * during the append (ie any non alpha-numeric characters are replaced @@ -630,7 +630,7 @@ virBufferEscapeShell(virBufferPtr buf, const char *str) /** * virBufferStrcat: * @buf: the buffer to append to - * @...: the variable list of strings, the last argument must be NULL + * @...: the variable list of strings, the last argument must be NULL * * Concatenate strings to an XML buffer. Auto indentation may be applied * after each string argument. -- 1.8.0.2

1 0

[libvirt] [PATCH] build: make broken -Wlogical-op test be gcc-only
by Eric Blake 19 Dec '12

19 Dec '12

Commit 8b8fcdea introduced a check for broken gcc -Wlogical-op, but did not guard the check against non-gcc compilers, which might lead to spurious failures when another compiler encounters an unknown pragma. Additionally, all of our compiler warning logic should belong in a single file, and use cache variables to allow overriding the decision at configure time if necessary. * configure.ac (BROKEN_GCC_WLOGICALOP): Move... * m4/virt-compile-warnings.m4 (LIBVIRT_COMPILE_WARNINGS): ...here, and update to modern autoconf idioms. --- Fixes the issues mentioned here: https://www.redhat.com/archives/libvir-list/2012-December/msg01197.html https://www.redhat.com/archives/libvir-list/2012-December/msg01211.html configure.ac | 23 ----------------------- m4/virt-compile-warnings.m4 | 22 ++++++++++++++++++++++ 2 files changed, 22 insertions(+), 23 deletions(-) diff --git a/configure.ac b/configure.ac index 20caa92..3c97e4f 100644 --- a/configure.ac +++ b/configure.ac @@ -255,29 +255,6 @@ AC_CHECK_TYPE([struct ifreq], #include <net/if.h> ]]) -dnl Check whether strchr(s, char variable) causes a bogus compile warning -dnl which is the case with a certain range of GCC versions -AC_MSG_CHECKING([whether GCC -Wlogical-op is broken]) - -save_CFLAGS="$CFLAGS" -CFLAGS="-O2 -Wlogical-op -Werror" - -AC_TRY_COMPILE([#include <string.h>], - [const char *haystack; - char needle; - return strchr(haystack, needle) == haystack;], - [gcc_false_strchr_warning=no], - [gcc_false_strchr_warning=yes]) - -CFLAGS="$save_CFLAGS" - -if test "x$gcc_false_strchr_warning" = xyes; then - AC_DEFINE_UNQUOTED([BROKEN_GCC_WLOGICALOP], 1, - [GCC -Wlogical-op is reporting false positive on strchr]) -fi - -AC_MSG_RESULT([$gcc_false_strchr_warning]) - dnl Our only use of libtasn1.h is in the testsuite, and can be skipped dnl if the header is not present. Assume -ltasn1 is present if the dnl header could be found. diff --git a/m4/virt-compile-warnings.m4 b/m4/virt-compile-warnings.m4 index 4a0f289..a08fcac 100644 --- a/m4/virt-compile-warnings.m4 +++ b/m4/virt-compile-warnings.m4 @@ -95,6 +95,22 @@ AC_DEFUN([LIBVIRT_COMPILE_WARNINGS],[ dontwarn="$dontwarn -Wmissing-declarations" fi + dnl Check whether strchr(s, char variable) causes a bogus compile + dnl warning, which is the case with GCC < 4.6 on some glibc + AC_CACHE_CHECK([whether GCC -Wlogical-op gives bogus warnings], + [lv_cv_gcc_wlogical_op_broken], [ + save_CFLAGS="$CFLAGS" + CFLAGS="-O2 -Wlogical-op -Werror" + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ + #include <string.h> + ]], [[ + const char *haystack; + char needle; + return strchr(haystack, needle) == haystack;]])], + [lv_cv_gcc_wlogical_op_broken=no], + [lv_cv_gcc_wlogical_op_broken=yes]) + CFLAGS="$save_CFLAGS"]) + # We might fundamentally need some of these disabled forever, but # ideally we'd turn many of them on dontwarn="$dontwarn -Wfloat-equal" @@ -196,4 +212,10 @@ AC_DEFUN([LIBVIRT_COMPILE_WARNINGS],[ WARN_PYTHON_CFLAGS=$WARN_CFLAGS AC_SUBST(WARN_PYTHON_CFLAGS) WARN_CFLAGS=$save_WARN_CFLAGS + + if test "$gl_cv_warn_c__Wlogical_op" = yes && + test "$lv_cv_gcc_wlogical_op_broken" = yes; then + AC_DEFINE_UNQUOTED([BROKEN_GCC_WLOGICALOP], 1, + [Define to 1 if gcc -Wlogical-op reports false positives on strchr]) + fi ]) -- 1.8.0.2

2 2

[libvirt] [PATCH] build: use strchr now that we can work around broken gcc
by Eric Blake 19 Dec '12

19 Dec '12

Revert the complex workaround of commit 39d91e9, now that we have a nicer framework for shutting up broken gcc. * src/util/buf.c (virBufferEscape): Simplify. --- src/util/buf.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/src/util/buf.c b/src/util/buf.c index 030dc97..e5a6ab7 100644 --- a/src/util/buf.c +++ b/src/util/buf.c @@ -458,2 +458,2 @@ virBufferEscapeSexpr(virBufferPtr buf, virBufferEscape(buf, '\\', "\\'", format, str); } +/* Work around spurious strchr() diagnostics given by -Wlogical-op + * for gcc < 4.6. Doing it via a local pragma keeps the damage + * smaller than disabling it on the package level. Unfortunately, the + * affected GCCs don't allow diagnostic push/pop which would have + * further reduced the impact. */ +#if BROKEN_GCC_WLOGICALOP +# pragma GCC diagnostic ignored "-Wlogical-op" +#endif + /** * virBufferEscape: * @buf: the buffer to append to @@ -499,11 +508,7 @@ virBufferEscape(virBufferPtr buf, char escape, const char *toescape, cur = str; out = escaped; while (*cur != 0) { - /* strchr work-around for gcc 4.3 & 4.4 bug with -Wlogical-op - * http://gcc.gnu.org/bugzilla/show_bug.cgi?id=36513 - */ - char needle[2] = { *cur, 0 }; - if (strstr(toescape, needle)) + if (strchr(toescape, *cur)) *out++ = escape; *out++ = *cur; cur++; -- 1.8.0.2

2 1

[libvirt] [PATCH] build: Check for broken GCC -Wlogical-op was too optimistic
by Viktor Mihajlovski 19 Dec '12

19 Dec '12

The check for a broken GCC -Wlogical-op implemententation was written under the wrong assumption that unknown warning options would be gracefully ignored. Thanks to Eric Blake and Daniel Berrange for pointing that out. Signed-off-by: Viktor Mihajlovski <mihajlov(a)linux.vnet.ibm.com> --- configure.ac | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 20caa92..828ae01 100644 --- a/configure.ac +++ b/configure.ac @@ -260,7 +260,13 @@ dnl which is the case with a certain range of GCC versions AC_MSG_CHECKING([whether GCC -Wlogical-op is broken]) save_CFLAGS="$CFLAGS" -CFLAGS="-O2 -Wlogical-op -Werror" +for w_opt in $WARN_CFLAGS; do + case $w_opt in + "-Wlogical-op" | "-Werror" ) + CFLAGS="$CFLAGS $w_opt" + ;; + esac +done AC_TRY_COMPILE([#include <string.h>], [const char *haystack; -- 1.7.9.5

2 1

[libvirt] virtulazation error
by Gangadahr Jena 19 Dec '12

19 Dec '12

hi every one when i am start windows os using virtual macine manager on redhat 6 os it showing this type of error-Error starting domain: unsupported configuration: Only PCI device addresses with function=0 are supported with this QEMU binary

2 1

[libvirt] [PATCH 0/2] FreeBSD: nodeinfo support and CPU affinity stubs
by Roman Bogorodskiy 19 Dec '12

19 Dec '12

With this set of changes it's now possible to connect to libvirtd using virsh and start/shutdown domains with the obvious limitation that networking is not supported at this point. CPU affinity most likely could be implemented using cpu_setaffinity(2) and cpu_getaffinity(2) on FreeBSD, but networking support looks more important now. Roman Bogorodskiy (2): FreeBSD: add nodeinfo support. FreeBSD: stub out CPU affinity functions. src/nodeinfo.c | 75 +++++++++++++++++++++++++++++++++++++++++++++++++- src/util/processinfo.c | 22 +++++++++++++++ 2 files changed, 96 insertions(+), 1 deletion(-) -- 1.8.0

3 16

[libvirt] [PATCHv3 0/3] sysinfo: s390 bug fix and tests
by Viktor Mihajlovski 19 Dec '12

19 Dec '12

Primarily this fixes a memory issue in virSysinfoRead on s390. As a side effect it became necessary to work around a GCC bug. Finally I have followed Daniel Berrange's suggestion to provide tests for sysinfo. V2: Turned single patch into series V3: Fixed -Werror induced build break with current GCC Viktor Mihajlovski (3): build: Check for broken GCC -Wlogical-op in configure S390: Fix virSysinfoRead memory corruption tests: Add tests for sysinfo cfg.mk | 2 +- configure.ac | 23 ++++ src/libvirt_private.syms | 1 + src/util/sysinfo.c | 195 +++++++++++++++++---------------- tests/Makefile.am | 6 + tests/sysinfodata/dmidecode.sh | 3 + tests/sysinfodata/s390cpuinfo.data | 12 ++ tests/sysinfodata/s390sysinfo.data | 114 +++++++++++++++++++ tests/sysinfodata/s390sysinfo.expect | 25 +++++ tests/sysinfodata/x86sysinfo.data | 83 ++++++++++++++ tests/sysinfodata/x86sysinfo.expect | 53 +++++++++ tests/sysinfotest.c | 200 ++++++++++++++++++++++++++++++++++ 12 files changed, 622 insertions(+), 95 deletions(-) create mode 100755 tests/sysinfodata/dmidecode.sh create mode 100644 tests/sysinfodata/s390cpuinfo.data create mode 100644 tests/sysinfodata/s390sysinfo.data create mode 100644 tests/sysinfodata/s390sysinfo.expect create mode 100644 tests/sysinfodata/x86sysinfo.data create mode 100644 tests/sysinfodata/x86sysinfo.expect create mode 100644 tests/sysinfotest.c -- 1.7.9.5

3 13

[libvirt] [RFC] Support for qemu's virtio-rng
by Peter Krempa 19 Dec '12

19 Dec '12

Commit 16c915ba42b45df7a64a6908287f03bfa3764bed in the qemu.git tree introduced support for emulating a virtio-rng device used to pass-through entropy to the guests. Qemu provides two backends to gather entropy from: 1) Default chardev backend This backend supports reading non-blocking character devices that provide entropy such as /dev/random (by default) or others according to configuration. This backend also supports basic rate limiting of the entropy read from the source. Unfortunately as the rate limiting is done just on a per-guest basis this cannot protect the host from being starved of entropy by multiple guests although their individual rates are limited. 2) EGD backend This backend uses the EGD protocol to communicate with a daemon that servers entropy. The EGD protocol is a simple protocol that was introduced by the entropy gathering daemon (a substitute for /dev/random on machines that don't support it). This protocol can be used for centralized management of entropy allocation to the hosts. This by itself isn't really useful as implementations of EGD daemons are trying to create the entropy instead of using available sources and multiplexing/rate-limiting them. For this functionality we will (probably) need a separate server to serve the entropy to the guests but more on this topic later. To represent the configuration of the virtio-rng device to the guest I propose the following domain XML snipped to be used: For the first use case I propose: <domain> [...] <devices> [...] <rng model='virtio'> <rate bytes='1024' period='1000'/> <source type='char'>/dev/urandom</source> -- or -- <source type='char'/> -- for the default source -- </rng> </devices> </domain> For the EGD backend used manually (without any managed server) I propose: <rng model='virtio'> <rate bytes='1024' period='1000'/> <source type='egd'> <remote type='unix'>/path/to/socket</remote> -- or -- <remote type='tcp' port='12345'>host.addr</remote> -- optionally or even more options, but they don't seem useful </source> </rng> Now these solutions are mere envelopes on top of the qemu functionality and don't really let us do any advanced configuration or management and they don't protect the host or guests by themselves from starving others from entropy. The solution for the problem described above is to have a central point where guests can request entropy and this central point will do all the rate limiting. To do this we will need to add a daemon that will talk the EGD protocol. This daemon will need to read entropy on request from the kernel software entropy device (/dev/random) or possibly a hardware RNG and distribute it to the hosts. To enable concurrent access and avoid starvation the daemon will implement a "shaping protocol" based on the hierarchical token bucket approach used to rate-limit network flows. For implementation details on this one I'll send a separate RFC. To allow configuration of the groups and sources I propose to create a separate driver with infrastructure similar to the network driver. This will allow to start multiple entropy distribution daemons with different sources and define the hierarchical classes to allow guest grouping. With this infrastructure you will be able to specify the rng device as follows: <rng model='virtio'> <source type='pool' pool='default'>classname</source> </rng> This will auto-configure all parameters according to the configuration of the pool and ensure that te guest gets classified correctly. As the start I'll implement the two basic options and then I'll propose another RFC how I will approach the second part more closely. Peter

2 1

[libvirt] [PATCH] Add smartcard support to libvirt-gconfig
by alexl＠redhat.com 19 Dec '12

19 Dec '12

From: Alexander Larsson <alexl(a)redhat.com> This handles <smartcard> devices. --- libvirt-gconfig/Makefile.am | 8 ++ .../libvirt-gconfig-domain-device-private.h | 3 + libvirt-gconfig/libvirt-gconfig-domain-device.c | 2 +- ...rt-gconfig-domain-smartcard-host-certificates.c | 124 +++++++++++++++++++++ ...rt-gconfig-domain-smartcard-host-certificates.h | 74 ++++++++++++ .../libvirt-gconfig-domain-smartcard-host.c | 75 +++++++++++++ .../libvirt-gconfig-domain-smartcard-host.h | 67 +++++++++++ .../libvirt-gconfig-domain-smartcard-passthrough.c | 116 +++++++++++++++++++ .../libvirt-gconfig-domain-smartcard-passthrough.h | 70 ++++++++++++ libvirt-gconfig/libvirt-gconfig-domain-smartcard.c | 90 +++++++++++++++ libvirt-gconfig/libvirt-gconfig-domain-smartcard.h | 67 +++++++++++ libvirt-gconfig/libvirt-gconfig.h | 4 + libvirt-gconfig/libvirt-gconfig.sym | 21 ++++ 13 files changed, 720 insertions(+), 1 deletion(-) create mode 100644 libvirt-gconfig/libvirt-gconfig-domain-smartcard-host-certificates.c create mode 100644 libvirt-gconfig/libvirt-gconfig-domain-smartcard-host-certificates.h create mode 100644 libvirt-gconfig/libvirt-gconfig-domain-smartcard-host.c create mode 100644 libvirt-gconfig/libvirt-gconfig-domain-smartcard-host.h create mode 100644 libvirt-gconfig/libvirt-gconfig-domain-smartcard-passthrough.c create mode 100644 libvirt-gconfig/libvirt-gconfig-domain-smartcard-passthrough.h create mode 100644 libvirt-gconfig/libvirt-gconfig-domain-smartcard.c create mode 100644 libvirt-gconfig/libvirt-gconfig-domain-smartcard.h diff --git a/libvirt-gconfig/Makefile.am b/libvirt-gconfig/Makefile.am index 507e733..6b3b2cb 100644 --- a/libvirt-gconfig/Makefile.am +++ b/libvirt-gconfig/Makefile.am @@ -54,6 +54,10 @@ GCONFIG_HEADER_FILES = \ libvirt-gconfig-domain-redirdev.h \ libvirt-gconfig-domain-seclabel.h \ libvirt-gconfig-domain-serial.h \ + libvirt-gconfig-domain-smartcard.h \ + libvirt-gconfig-domain-smartcard-host.h \ + libvirt-gconfig-domain-smartcard-host-certificates.h \ + libvirt-gconfig-domain-smartcard-passthrough.h \ libvirt-gconfig-domain-snapshot.h \ libvirt-gconfig-domain-sound.h \ libvirt-gconfig-domain-timer.h \ @@ -127,6 +131,10 @@ GCONFIG_SOURCE_FILES = \ libvirt-gconfig-domain-redirdev.c \ libvirt-gconfig-domain-seclabel.c \ libvirt-gconfig-domain-serial.c \ + libvirt-gconfig-domain-smartcard.c \ + libvirt-gconfig-domain-smartcard-host.c \ + libvirt-gconfig-domain-smartcard-host-certificates.c \ + libvirt-gconfig-domain-smartcard-passthrough.c \ libvirt-gconfig-domain-snapshot.c \ libvirt-gconfig-domain-sound.c \ libvirt-gconfig-domain-timer.c \ diff --git a/libvirt-gconfig/libvirt-gconfig-domain-device-private.h b/libvirt-gconfig/libvirt-gconfig-domain-device-private.h index 3ec83c3..d8ac47f 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain-device-private.h +++ b/libvirt-gconfig/libvirt-gconfig-domain-device-private.h @@ -45,6 +45,9 @@ gvir_config_domain_graphics_new_from_tree(GVirConfigXmlDoc *doc, GVirConfigDomainDevice * gvir_config_domain_interface_new_from_tree(GVirConfigXmlDoc *doc, xmlNodePtr tree); +GVirConfigDomainDevice * +gvir_config_domain_smartcard_new_from_tree(GVirConfigXmlDoc *doc, + xmlNodePtr tree); G_END_DECLS diff --git a/libvirt-gconfig/libvirt-gconfig-domain-device.c b/libvirt-gconfig/libvirt-gconfig-domain-device.c index 60d6bcc..e3dbe8d 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain-device.c +++ b/libvirt-gconfig/libvirt-gconfig-domain-device.c @@ -72,7 +72,7 @@ gvir_config_domain_device_new_from_tree(GVirConfigXmlDoc *doc, } else if (xmlStrEqual(tree->name, (xmlChar*)"redirdev")) { type = GVIR_CONFIG_TYPE_DOMAIN_REDIRDEV; } else if (xmlStrEqual(tree->name, (xmlChar*)"smartcard")) { - goto unimplemented; + return gvir_config_domain_smartcard_new_from_tree(doc, tree); } else if (xmlStrEqual(tree->name, (xmlChar*)"interface")) { return gvir_config_domain_interface_new_from_tree(doc, tree); } else if (xmlStrEqual(tree->name, (xmlChar*)"input")) { diff --git a/libvirt-gconfig/libvirt-gconfig-domain-smartcard-host-certificates.c b/libvirt-gconfig/libvirt-gconfig-domain-smartcard-host-certificates.c new file mode 100644 index 0000000..c013be7 --- /dev/null +++ b/libvirt-gconfig/libvirt-gconfig-domain-smartcard-host-certificates.c @@ -0,0 +1,124 @@ +/* + * libvirt-gconfig-domain-smartcard-host-certificates.c: libvirt domain smartcard host-certificates configuration + * + * Copyright (C) 2012 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * + * Author: Alexander Larsson <alexl(a)redhat.com> + */ + +#include <config.h> + +#include "libvirt-gconfig/libvirt-gconfig.h" +#include "libvirt-gconfig/libvirt-gconfig-private.h" + +#define GVIR_CONFIG_DOMAIN_SMARTCARD_HOST_CERTIFICATES_GET_PRIVATE(obj) \ + (G_TYPE_INSTANCE_GET_PRIVATE((obj), GVIR_CONFIG_TYPE_DOMAIN_SMARTCARD_HOST_CERTIFICATES, GVirConfigDomainSmartcardHostCertificatesPrivate)) + +struct _GVirConfigDomainSmartcardHostCertificatesPrivate +{ + gboolean unused; +}; + +G_DEFINE_TYPE(GVirConfigDomainSmartcardHostCertificates, gvir_config_domain_smartcard_host_certificates, GVIR_CONFIG_TYPE_DOMAIN_SMARTCARD); + + +static void gvir_config_domain_smartcard_host_certificates_class_init(GVirConfigDomainSmartcardHostCertificatesClass *klass) +{ + g_type_class_add_private(klass, sizeof(GVirConfigDomainSmartcardHostCertificatesPrivate)); +} + + +static void gvir_config_domain_smartcard_host_certificates_init(GVirConfigDomainSmartcardHostCertificates *smartcard) +{ + g_debug("Init GVirConfigDomainSmartcardHostCertificates=%p", smartcard); + + smartcard->priv = GVIR_CONFIG_DOMAIN_SMARTCARD_HOST_CERTIFICATES_GET_PRIVATE(smartcard); +} + + +GVirConfigDomainSmartcardHostCertificates *gvir_config_domain_smartcard_host_certificates_new(void) +{ + GVirConfigObject *object; + + object = gvir_config_object_new(GVIR_CONFIG_TYPE_DOMAIN_SMARTCARD_HOST_CERTIFICATES, + "smartcard", NULL); + gvir_config_object_set_attribute(object, "mode", "host-certificates", NULL); + return GVIR_CONFIG_DOMAIN_SMARTCARD_HOST_CERTIFICATES(object); +} + +GVirConfigDomainSmartcardHostCertificates *gvir_config_domain_smartcard_host_certificates_new_from_xml(const gchar *xml, + GError **error) +{ + GVirConfigObject *object; + + object = gvir_config_object_new_from_xml(GVIR_CONFIG_TYPE_DOMAIN_SMARTCARD_HOST_CERTIFICATES, + "smartcard", NULL, xml, error); + if (g_strcmp0(gvir_config_object_get_attribute(object, NULL, "mode"), "host-certificates") != 0) { + g_object_unref(G_OBJECT(object)); + return NULL; + } + return GVIR_CONFIG_DOMAIN_SMARTCARD_HOST_CERTIFICATES(object); +} + +/** + * gvir_config_domain_smartcard_host_certificates_set_database: + * @path: (allow-none): + */ +void +gvir_config_domain_smartcard_host_certificates_set_database (GVirConfigDomainSmartcardHostCertificates *smartcard, + const char *path) +{ + g_return_if_fail(GVIR_CONFIG_IS_DOMAIN_SMARTCARD_HOST_CERTIFICATES(smartcard)); + + gvir_config_object_set_node_content(GVIR_CONFIG_OBJECT(smartcard), + "database", path); +} + +/** + * gvir_config_domain_smartcard_host_certificates_set_certificates: + * @cert1: (allow-none): + * @cert2: (allow-none): + * @cert3: (allow-none): + */ +void +gvir_config_domain_smartcard_host_certificates_set_certificates (GVirConfigDomainSmartcardHostCertificates *smartcard, + const char *cert1, + const char *cert2, + const char *cert3) +{ + GVirConfigObject *child; + + g_return_if_fail(GVIR_CONFIG_IS_DOMAIN_SMARTCARD_HOST_CERTIFICATES(smartcard)); + + gvir_config_object_delete_children(GVIR_CONFIG_OBJECT(smartcard), + "certificate", NULL); + + if (cert1 == NULL) + return; + + child = gvir_config_object_add_child(GVIR_CONFIG_OBJECT(smartcard), "certificate"); + gvir_config_object_set_node_content(GVIR_CONFIG_OBJECT(smartcard), NULL, cert1); + g_object_unref(G_OBJECT(child)); + + child = gvir_config_object_add_child(GVIR_CONFIG_OBJECT(smartcard), "certificate"); + gvir_config_object_set_node_content(GVIR_CONFIG_OBJECT(smartcard), NULL, cert2); + g_object_unref(G_OBJECT(child)); + + child = gvir_config_object_add_child(GVIR_CONFIG_OBJECT(smartcard), "certificate"); + gvir_config_object_set_node_content(GVIR_CONFIG_OBJECT(smartcard), NULL, cert3); + g_object_unref(G_OBJECT(child)); +} diff --git a/libvirt-gconfig/libvirt-gconfig-domain-smartcard-host-certificates.h b/libvirt-gconfig/libvirt-gconfig-domain-smartcard-host-certificates.h new file mode 100644 index 0000000..3d370e3 --- /dev/null +++ b/libvirt-gconfig/libvirt-gconfig-domain-smartcard-host-certificates.h @@ -0,0 +1,74 @@ +/* + * libvirt-gconfig-domain-smartcard-host-certificates.h: libvirt domain smartcard host-certificates configuration + * + * Copyright (C) 2012 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * + * Author: Alexander Larsson <alexl(a)redhat.com> + */ + +#if !defined(__LIBVIRT_GCONFIG_H__) && !defined(LIBVIRT_GCONFIG_BUILD) +#error "Only <libvirt-gconfig/libvirt-gconfig.h> can be included directly." +#endif + +#ifndef __LIBVIRT_GCONFIG_DOMAIN_SMARTCARD_HOST_CERTIFICATES_H__ +#define __LIBVIRT_GCONFIG_DOMAIN_SMARTCARD_HOST_CERTIFICATES_H__ + +G_BEGIN_DECLS + +#define GVIR_CONFIG_TYPE_DOMAIN_SMARTCARD_HOST_CERTIFICATES (gvir_config_domain_smartcard_host_certificates_get_type ()) +#define GVIR_CONFIG_DOMAIN_SMARTCARD_HOST_CERTIFICATES(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GVIR_CONFIG_TYPE_DOMAIN_SMARTCARD_HOST_CERTIFICATES, GVirConfigDomainSmartcardHostCertificates)) +#define GVIR_CONFIG_DOMAIN_SMARTCARD_HOST_CERTIFICATES_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GVIR_CONFIG_TYPE_DOMAIN_SMARTCARD_HOST_CERTIFICATES, GVirConfigDomainSmartcardHostCertificatesClass)) +#define GVIR_CONFIG_IS_DOMAIN_SMARTCARD_HOST_CERTIFICATES(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GVIR_CONFIG_TYPE_DOMAIN_SMARTCARD_HOST_CERTIFICATES)) +#define GVIR_CONFIG_IS_DOMAIN_SMARTCARD_HOST_CERTIFICATES_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GVIR_CONFIG_TYPE_DOMAIN_SMARTCARD_HOST_CERTIFICATES)) +#define GVIR_CONFIG_DOMAIN_SMARTCARD_HOST_CERTIFICATES_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GVIR_CONFIG_TYPE_DOMAIN_SMARTCARD_HOST_CERTIFICATES, GVirConfigDomainSmartcardHostCertificatesClass)) + +typedef struct _GVirConfigDomainSmartcardHostCertificates GVirConfigDomainSmartcardHostCertificates; +typedef struct _GVirConfigDomainSmartcardHostCertificatesPrivate GVirConfigDomainSmartcardHostCertificatesPrivate; +typedef struct _GVirConfigDomainSmartcardHostCertificatesClass GVirConfigDomainSmartcardHostCertificatesClass; + +struct _GVirConfigDomainSmartcardHostCertificates +{ + GVirConfigDomainSmartcard parent; + + GVirConfigDomainSmartcardHostCertificatesPrivate *priv; + + /* Do not add fields to this struct */ +}; + +struct _GVirConfigDomainSmartcardHostCertificatesClass +{ + GVirConfigDomainSmartcardClass parent_class; + + gpointer padding[20]; +}; + +GType gvir_config_domain_smartcard_host_certificates_get_type(void); + +GVirConfigDomainSmartcardHostCertificates *gvir_config_domain_smartcard_host_certificates_new(void); +GVirConfigDomainSmartcardHostCertificates *gvir_config_domain_smartcard_host_certificates_new_from_xml(const gchar *xml, + GError **error); + +void gvir_config_domain_smartcard_host_certificates_set_database (GVirConfigDomainSmartcardHostCertificates *smartcard, + const char *path); +void gvir_config_domain_smartcard_host_certificates_set_certificates (GVirConfigDomainSmartcardHostCertificates *smartcard, + const char *cert1, + const char *cert2, + const char *cert3); + +G_END_DECLS + +#endif /* __LIBVIRT_GCONFIG_DOMAIN_SMARTCARD_HOST_CERTIFICATES_H__ */ diff --git a/libvirt-gconfig/libvirt-gconfig-domain-smartcard-host.c b/libvirt-gconfig/libvirt-gconfig-domain-smartcard-host.c new file mode 100644 index 0000000..035c291 --- /dev/null +++ b/libvirt-gconfig/libvirt-gconfig-domain-smartcard-host.c @@ -0,0 +1,75 @@ +/* + * libvirt-gconfig-domain-smartcard-host.c: libvirt domain smartcard host configuration + * + * Copyright (C) 2012 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * + * Author: Alexander Larsson <alexl(a)redhat.com> + */ + +#include <config.h> + +#include "libvirt-gconfig/libvirt-gconfig.h" +#include "libvirt-gconfig/libvirt-gconfig-private.h" + +#define GVIR_CONFIG_DOMAIN_SMARTCARD_HOST_GET_PRIVATE(obj) \ + (G_TYPE_INSTANCE_GET_PRIVATE((obj), GVIR_CONFIG_TYPE_DOMAIN_SMARTCARD_HOST, GVirConfigDomainSmartcardHostPrivate)) + +struct _GVirConfigDomainSmartcardHostPrivate +{ + gboolean unused; +}; + +G_DEFINE_TYPE(GVirConfigDomainSmartcardHost, gvir_config_domain_smartcard_host, GVIR_CONFIG_TYPE_DOMAIN_SMARTCARD); + + +static void gvir_config_domain_smartcard_host_class_init(GVirConfigDomainSmartcardHostClass *klass) +{ + g_type_class_add_private(klass, sizeof(GVirConfigDomainSmartcardHostPrivate)); +} + + +static void gvir_config_domain_smartcard_host_init(GVirConfigDomainSmartcardHost *smartcard) +{ + g_debug("Init GVirConfigDomainSmartcardHost=%p", smartcard); + + smartcard->priv = GVIR_CONFIG_DOMAIN_SMARTCARD_HOST_GET_PRIVATE(smartcard); +} + + +GVirConfigDomainSmartcardHost *gvir_config_domain_smartcard_host_new(void) +{ + GVirConfigObject *object; + + object = gvir_config_object_new(GVIR_CONFIG_TYPE_DOMAIN_SMARTCARD_HOST, + "smartcard", NULL); + gvir_config_object_set_attribute(object, "mode", "host", NULL); + return GVIR_CONFIG_DOMAIN_SMARTCARD_HOST(object); +} + +GVirConfigDomainSmartcardHost *gvir_config_domain_smartcard_host_new_from_xml(const gchar *xml, + GError **error) +{ + GVirConfigObject *object; + + object = gvir_config_object_new_from_xml(GVIR_CONFIG_TYPE_DOMAIN_SMARTCARD_HOST, + "smartcard", NULL, xml, error); + if (g_strcmp0(gvir_config_object_get_attribute(object, NULL, "mode"), "host") != 0) { + g_object_unref(G_OBJECT(object)); + return NULL; + } + return GVIR_CONFIG_DOMAIN_SMARTCARD_HOST(object); +} diff --git a/libvirt-gconfig/libvirt-gconfig-domain-smartcard-host.h b/libvirt-gconfig/libvirt-gconfig-domain-smartcard-host.h new file mode 100644 index 0000000..f1dcba2 --- /dev/null +++ b/libvirt-gconfig/libvirt-gconfig-domain-smartcard-host.h @@ -0,0 +1,67 @@ +/* + * libvirt-gconfig-domain-smartcard-host.h: libvirt domain smartcard host configuration + * + * Copyright (C) 2012 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * + * Author: Alexander Larsson <alexl(a)redhat.com> + */ + +#if !defined(__LIBVIRT_GCONFIG_H__) && !defined(LIBVIRT_GCONFIG_BUILD) +#error "Only <libvirt-gconfig/libvirt-gconfig.h> can be included directly." +#endif + +#ifndef __LIBVIRT_GCONFIG_DOMAIN_SMARTCARD_HOST_H__ +#define __LIBVIRT_GCONFIG_DOMAIN_SMARTCARD_HOST_H__ + +G_BEGIN_DECLS + +#define GVIR_CONFIG_TYPE_DOMAIN_SMARTCARD_HOST (gvir_config_domain_smartcard_host_get_type ()) +#define GVIR_CONFIG_DOMAIN_SMARTCARD_HOST(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GVIR_CONFIG_TYPE_DOMAIN_SMARTCARD_HOST, GVirConfigDomainSmartcardHost)) +#define GVIR_CONFIG_DOMAIN_SMARTCARD_HOST_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GVIR_CONFIG_TYPE_DOMAIN_SMARTCARD_HOST, GVirConfigDomainSmartcardHostClass)) +#define GVIR_CONFIG_IS_DOMAIN_SMARTCARD_HOST(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GVIR_CONFIG_TYPE_DOMAIN_SMARTCARD_HOST)) +#define GVIR_CONFIG_IS_DOMAIN_SMARTCARD_HOST_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GVIR_CONFIG_TYPE_DOMAIN_SMARTCARD_HOST)) +#define GVIR_CONFIG_DOMAIN_SMARTCARD_HOST_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GVIR_CONFIG_TYPE_DOMAIN_SMARTCARD_HOST, GVirConfigDomainSmartcardHostClass)) + +typedef struct _GVirConfigDomainSmartcardHost GVirConfigDomainSmartcardHost; +typedef struct _GVirConfigDomainSmartcardHostPrivate GVirConfigDomainSmartcardHostPrivate; +typedef struct _GVirConfigDomainSmartcardHostClass GVirConfigDomainSmartcardHostClass; + +struct _GVirConfigDomainSmartcardHost +{ + GVirConfigDomainSmartcard parent; + + GVirConfigDomainSmartcardHostPrivate *priv; + + /* Do not add fields to this struct */ +}; + +struct _GVirConfigDomainSmartcardHostClass +{ + GVirConfigDomainSmartcardClass parent_class; + + gpointer padding[20]; +}; + +GType gvir_config_domain_smartcard_host_get_type(void); + +GVirConfigDomainSmartcardHost *gvir_config_domain_smartcard_host_new(void); +GVirConfigDomainSmartcardHost *gvir_config_domain_smartcard_host_new_from_xml(const gchar *xml, + GError **error); + +G_END_DECLS + +#endif /* __LIBVIRT_GCONFIG_DOMAIN_SMARTCARD_HOST_H__ */ diff --git a/libvirt-gconfig/libvirt-gconfig-domain-smartcard-passthrough.c b/libvirt-gconfig/libvirt-gconfig-domain-smartcard-passthrough.c new file mode 100644 index 0000000..10fd460 --- /dev/null +++ b/libvirt-gconfig/libvirt-gconfig-domain-smartcard-passthrough.c @@ -0,0 +1,116 @@ +/* + * libvirt-gconfig-domain-smartcard-passthrough.c: libvirt domain smartcard passthrough configuration + * + * Copyright (C) 2012 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * + * Author: Alexander Larsson <alexl(a)redhat.com> + */ + +#include <config.h> + +#include "libvirt-gconfig/libvirt-gconfig.h" +#include "libvirt-gconfig/libvirt-gconfig-private.h" + +#define GVIR_CONFIG_DOMAIN_SMARTCARD_PASSTHROUGH_GET_PRIVATE(obj) \ + (G_TYPE_INSTANCE_GET_PRIVATE((obj), GVIR_CONFIG_TYPE_DOMAIN_SMARTCARD_PASSTHROUGH, GVirConfigDomainSmartcardPassthroughPrivate)) + +struct _GVirConfigDomainSmartcardPassthroughPrivate +{ + gboolean unused; +}; + +G_DEFINE_TYPE(GVirConfigDomainSmartcardPassthrough, gvir_config_domain_smartcard_passthrough, GVIR_CONFIG_TYPE_DOMAIN_SMARTCARD); + + +static void gvir_config_domain_smartcard_passthrough_class_init(GVirConfigDomainSmartcardPassthroughClass *klass) +{ + g_type_class_add_private(klass, sizeof(GVirConfigDomainSmartcardPassthroughPrivate)); +} + + +static void gvir_config_domain_smartcard_passthrough_init(GVirConfigDomainSmartcardPassthrough *smartcard) +{ + g_debug("Init GVirConfigDomainSmartcardPassthrough=%p", smartcard); + + smartcard->priv = GVIR_CONFIG_DOMAIN_SMARTCARD_PASSTHROUGH_GET_PRIVATE(smartcard); +} + + +GVirConfigDomainSmartcardPassthrough *gvir_config_domain_smartcard_passthrough_new(void) +{ + GVirConfigObject *object; + + object = gvir_config_object_new(GVIR_CONFIG_TYPE_DOMAIN_SMARTCARD_PASSTHROUGH, + "smartcard", NULL); + gvir_config_object_set_attribute(object, "mode", "passthrough", NULL); + return GVIR_CONFIG_DOMAIN_SMARTCARD_PASSTHROUGH(object); +} + +GVirConfigDomainSmartcardPassthrough *gvir_config_domain_smartcard_passthrough_new_from_xml(const gchar *xml, + GError **error) +{ + GVirConfigObject *object; + + object = gvir_config_object_new_from_xml(GVIR_CONFIG_TYPE_DOMAIN_SMARTCARD_PASSTHROUGH, + "smartcard", NULL, xml, error); + if (g_strcmp0(gvir_config_object_get_attribute(object, NULL, "mode"), "passthrough") != 0) { + g_object_unref(G_OBJECT(object)); + return NULL; + } + return GVIR_CONFIG_DOMAIN_SMARTCARD_PASSTHROUGH(object); +} + + +static void prepend_prop(xmlNodePtr node, xmlAttrPtr prop) +{ + if (node->properties == NULL) { + node->properties = prop; + } else { + prop->next = node->properties; + node->properties->prev = prop; + node->properties = prop; + } +} + +void +gvir_config_domain_smartcard_passthrough_set_source(GVirConfigDomainSmartcardPassthrough *smartcard, + GVirConfigDomainChardevSource *source) +{ + xmlNodePtr smartcard_node; + xmlNodePtr source_node; + xmlNodePtr child; + xmlAttrPtr attr; + + g_return_if_fail(GVIR_CONFIG_IS_DOMAIN_SMARTCARD_PASSTHROUGH(smartcard)); + g_return_if_fail(GVIR_CONFIG_IS_DOMAIN_CHARDEV_SOURCE(source)); + + smartcard_node = gvir_config_object_get_xml_node(GVIR_CONFIG_OBJECT(smartcard)); + source_node = gvir_config_object_get_xml_node(GVIR_CONFIG_OBJECT(source)); + + g_return_if_fail((smartcard_node != NULL) && (source_node != NULL)); + + for (child = source_node->children; child != NULL; child = child->next) { + xmlUnlinkNode(child); + xmlAddChild(smartcard_node, child); + } + + for (attr = source_node->properties; attr != NULL; attr = attr->next) { + xmlAttrPtr new_attr; + new_attr = xmlCopyProp(smartcard_node, attr); + prepend_prop(smartcard_node, new_attr); + } +} diff --git a/libvirt-gconfig/libvirt-gconfig-domain-smartcard-passthrough.h b/libvirt-gconfig/libvirt-gconfig-domain-smartcard-passthrough.h new file mode 100644 index 0000000..c2bd50c --- /dev/null +++ b/libvirt-gconfig/libvirt-gconfig-domain-smartcard-passthrough.h @@ -0,0 +1,70 @@ +/* + * libvirt-gconfig-domain-smartcard-passthrough.h: libvirt domain smartcard passthrough configuration + * + * Copyright (C) 2012 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * + * Author: Alexander Larsson <alexl(a)redhat.com> + */ + +#if !defined(__LIBVIRT_GCONFIG_H__) && !defined(LIBVIRT_GCONFIG_BUILD) +#error "Only <libvirt-gconfig/libvirt-gconfig.h> can be included directly." +#endif + +#ifndef __LIBVIRT_GCONFIG_DOMAIN_SMARTCARD_PASSTHROUGH_H__ +#define __LIBVIRT_GCONFIG_DOMAIN_SMARTCARD_PASSTHROUGH_H__ + +G_BEGIN_DECLS + +#define GVIR_CONFIG_TYPE_DOMAIN_SMARTCARD_PASSTHROUGH (gvir_config_domain_smartcard_passthrough_get_type ()) +#define GVIR_CONFIG_DOMAIN_SMARTCARD_PASSTHROUGH(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GVIR_CONFIG_TYPE_DOMAIN_SMARTCARD_PASSTHROUGH, GVirConfigDomainSmartcardPassthrough)) +#define GVIR_CONFIG_DOMAIN_SMARTCARD_PASSTHROUGH_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GVIR_CONFIG_TYPE_DOMAIN_SMARTCARD_PASSTHROUGH, GVirConfigDomainSmartcardPassthroughClass)) +#define GVIR_CONFIG_IS_DOMAIN_SMARTCARD_PASSTHROUGH(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GVIR_CONFIG_TYPE_DOMAIN_SMARTCARD_PASSTHROUGH)) +#define GVIR_CONFIG_IS_DOMAIN_SMARTCARD_PASSTHROUGH_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GVIR_CONFIG_TYPE_DOMAIN_SMARTCARD_PASSTHROUGH)) +#define GVIR_CONFIG_DOMAIN_SMARTCARD_PASSTHROUGH_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GVIR_CONFIG_TYPE_DOMAIN_SMARTCARD_PASSTHROUGH, GVirConfigDomainSmartcardPassthroughClass)) + +typedef struct _GVirConfigDomainSmartcardPassthrough GVirConfigDomainSmartcardPassthrough; +typedef struct _GVirConfigDomainSmartcardPassthroughPrivate GVirConfigDomainSmartcardPassthroughPrivate; +typedef struct _GVirConfigDomainSmartcardPassthroughClass GVirConfigDomainSmartcardPassthroughClass; + +struct _GVirConfigDomainSmartcardPassthrough +{ + GVirConfigDomainSmartcard parent; + + GVirConfigDomainSmartcardPassthroughPrivate *priv; + + /* Do not add fields to this struct */ +}; + +struct _GVirConfigDomainSmartcardPassthroughClass +{ + GVirConfigDomainSmartcardClass parent_class; + + gpointer padding[20]; +}; + +GType gvir_config_domain_smartcard_passthrough_get_type(void); + +GVirConfigDomainSmartcardPassthrough *gvir_config_domain_smartcard_passthrough_new(void); +GVirConfigDomainSmartcardPassthrough *gvir_config_domain_smartcard_passthrough_new_from_xml(const gchar *xml, + GError **error); +void gvir_config_domain_smartcard_passthrough_set_source(GVirConfigDomainSmartcardPassthrough *smartcard, + GVirConfigDomainChardevSource *source); + + +G_END_DECLS + +#endif /* __LIBVIRT_GCONFIG_DOMAIN_SMARTCARD_PASSTHROUGH_H__ */ diff --git a/libvirt-gconfig/libvirt-gconfig-domain-smartcard.c b/libvirt-gconfig/libvirt-gconfig-domain-smartcard.c new file mode 100644 index 0000000..73ea867 --- /dev/null +++ b/libvirt-gconfig/libvirt-gconfig-domain-smartcard.c @@ -0,0 +1,90 @@ +/* + * libvirt-gconfig-domain-smartcard.c: libvirt domain smartcard configuration + * + * Copyright (C) 2012 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * + * Author: Alexander Larsson <alexl(a)redhat.com> + */ + +#include <config.h> + +#include "libvirt-gconfig/libvirt-gconfig.h" +#include "libvirt-gconfig/libvirt-gconfig-private.h" + +#define GVIR_CONFIG_DOMAIN_SMARTCARD_GET_PRIVATE(obj) \ + (G_TYPE_INSTANCE_GET_PRIVATE((obj), GVIR_CONFIG_TYPE_DOMAIN_SMARTCARD, GVirConfigDomainSmartcardPrivate)) + +struct _GVirConfigDomainSmartcardPrivate +{ + gboolean unused; +}; + +G_DEFINE_ABSTRACT_TYPE(GVirConfigDomainSmartcard, gvir_config_domain_smartcard, GVIR_CONFIG_TYPE_DOMAIN_DEVICE); + + +static void gvir_config_domain_smartcard_class_init(GVirConfigDomainSmartcardClass *klass) +{ + g_type_class_add_private(klass, sizeof(GVirConfigDomainSmartcardPrivate)); +} + + +static void gvir_config_domain_smartcard_init(GVirConfigDomainSmartcard *smartcard) +{ + g_debug("Init GVirConfigDomainSmartcard=%p", smartcard); + + smartcard->priv = GVIR_CONFIG_DOMAIN_SMARTCARD_GET_PRIVATE(smartcard); +} + +/** + * gvir_config_domain_smartcard_set_address: + * @address: (allow-none): + */ +void gvir_config_domain_smartcard_set_address(GVirConfigDomainRedirdev *redirdev, + GVirConfigDomainAddress *address) +{ + g_return_if_fail(GVIR_CONFIG_IS_DOMAIN_REDIRDEV(redirdev)); + g_return_if_fail(address == NULL || GVIR_CONFIG_IS_DOMAIN_ADDRESS(address)); + + gvir_config_object_attach_replace(GVIR_CONFIG_OBJECT(redirdev), + "address", + GVIR_CONFIG_OBJECT(address)); +} + +G_GNUC_INTERNAL GVirConfigDomainDevice * +gvir_config_domain_smartcard_new_from_tree(GVirConfigXmlDoc *doc, + xmlNodePtr tree) +{ + const char *mode; + GType gtype; + + mode = gvir_config_xml_get_attribute_content(tree, "mode"); + if (mode == NULL) + return NULL; + + if (g_str_equal(mode, "host")) { + gtype = GVIR_CONFIG_TYPE_DOMAIN_SMARTCARD_HOST; + } else if (g_str_equal(mode, "host-certificates")) { + gtype = GVIR_CONFIG_TYPE_DOMAIN_SMARTCARD_HOST_CERTIFICATES; + } else if (g_str_equal(mode, "passthrough")) { + gtype = GVIR_CONFIG_TYPE_DOMAIN_SMARTCARD_PASSTHROUGH; + } else { + g_debug("Unknown domain smartcard node: %s", mode); + return NULL; + } + + return GVIR_CONFIG_DOMAIN_DEVICE(gvir_config_object_new_from_tree(gtype, doc, NULL, tree)); +} diff --git a/libvirt-gconfig/libvirt-gconfig-domain-smartcard.h b/libvirt-gconfig/libvirt-gconfig-domain-smartcard.h new file mode 100644 index 0000000..5136b02 --- /dev/null +++ b/libvirt-gconfig/libvirt-gconfig-domain-smartcard.h @@ -0,0 +1,67 @@ +/* + * libvirt-gconfig-domain-smartcard.h: libvirt domain smartcard configuration + * + * Copyright (C) 2012 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * + * Author: Alexander Larsson <alexl(a)redhat.com> + */ + +#if !defined(__LIBVIRT_GCONFIG_H__) && !defined(LIBVIRT_GCONFIG_BUILD) +#error "Only <libvirt-gconfig/libvirt-gconfig.h> can be included directly." +#endif + +#ifndef __LIBVIRT_GCONFIG_DOMAIN_SMARTCARD_H__ +#define __LIBVIRT_GCONFIG_DOMAIN_SMARTCARD_H__ + +G_BEGIN_DECLS + +#define GVIR_CONFIG_TYPE_DOMAIN_SMARTCARD (gvir_config_domain_smartcard_get_type ()) +#define GVIR_CONFIG_DOMAIN_SMARTCARD(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GVIR_CONFIG_TYPE_DOMAIN_SMARTCARD, GVirConfigDomainSmartcard)) +#define GVIR_CONFIG_DOMAIN_SMARTCARD_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GVIR_CONFIG_TYPE_DOMAIN_SMARTCARD, GVirConfigDomainSmartcardClass)) +#define GVIR_CONFIG_IS_DOMAIN_SMARTCARD(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GVIR_CONFIG_TYPE_DOMAIN_SMARTCARD)) +#define GVIR_CONFIG_IS_DOMAIN_SMARTCARD_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GVIR_CONFIG_TYPE_DOMAIN_SMARTCARD)) +#define GVIR_CONFIG_DOMAIN_SMARTCARD_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GVIR_CONFIG_TYPE_DOMAIN_SMARTCARD, GVirConfigDomainSmartcardClass)) + +typedef struct _GVirConfigDomainSmartcard GVirConfigDomainSmartcard; +typedef struct _GVirConfigDomainSmartcardPrivate GVirConfigDomainSmartcardPrivate; +typedef struct _GVirConfigDomainSmartcardClass GVirConfigDomainSmartcardClass; + +struct _GVirConfigDomainSmartcard +{ + GVirConfigDomainDevice parent; + + GVirConfigDomainSmartcardPrivate *priv; + + /* Do not add fields to this struct */ +}; + +struct _GVirConfigDomainSmartcardClass +{ + GVirConfigDomainDeviceClass parent_class; + + gpointer padding[20]; +}; + + +GType gvir_config_domain_smartcard_get_type(void); + +void gvir_config_domain_smartcard_set_address(GVirConfigDomainRedirdev *redirdev, + GVirConfigDomainAddress *address); + +G_END_DECLS + +#endif /* __LIBVIRT_GCONFIG_DOMAIN_SMARTCARD_H__ */ diff --git a/libvirt-gconfig/libvirt-gconfig.h b/libvirt-gconfig/libvirt-gconfig.h index 0428259..9feaba2 100644 --- a/libvirt-gconfig/libvirt-gconfig.h +++ b/libvirt-gconfig/libvirt-gconfig.h @@ -71,6 +71,10 @@ #include <libvirt-gconfig/libvirt-gconfig-domain-redirdev.h> #include <libvirt-gconfig/libvirt-gconfig-domain-seclabel.h> #include <libvirt-gconfig/libvirt-gconfig-domain-serial.h> +#include <libvirt-gconfig/libvirt-gconfig-domain-smartcard.h> +#include <libvirt-gconfig/libvirt-gconfig-domain-smartcard-host.h> +#include <libvirt-gconfig/libvirt-gconfig-domain-smartcard-host-certificates.h> +#include <libvirt-gconfig/libvirt-gconfig-domain-smartcard-passthrough.h> #include <libvirt-gconfig/libvirt-gconfig-domain-snapshot.h> #include <libvirt-gconfig/libvirt-gconfig-domain-sound.h> #include <libvirt-gconfig/libvirt-gconfig-domain-timer.h> diff --git a/libvirt-gconfig/libvirt-gconfig.sym b/libvirt-gconfig/libvirt-gconfig.sym index 622e0f2..d9cff90 100644 --- a/libvirt-gconfig/libvirt-gconfig.sym +++ b/libvirt-gconfig/libvirt-gconfig.sym @@ -483,4 +483,25 @@ LIBVIRT_GCONFIG_0.1.4 { gvir_config_domain_set_power_management; } LIBVIRT_GCONFIG_0.1.3; +LIBVIRT_GCONFIG_0.1.5 { + global: + gvir_config_domain_smartcard_get_type; + gvir_config_domain_smartcard_set_address; + + gvir_config_domain_smartcard_host_get_type; + gvir_config_domain_smartcard_host_new; + gvir_config_domain_smartcard_host_new_from_xml; + + gvir_config_domain_smartcard_host_certificates_get_type; + gvir_config_domain_smartcard_host_certificates_new; + gvir_config_domain_smartcard_host_certificates_new_from_xml; + gvir_config_domain_smartcard_host_certificates_set_database; + gvir_config_domain_smartcard_host_certificates_set_certificates; + + gvir_config_domain_smartcard_passthrough_get_type; + gvir_config_domain_smartcard_passthrough_new; + gvir_config_domain_smartcard_passthrough_new_from_xml; + gvir_config_domain_smartcard_passthrough_set_source; +} LIBVIRT_GCONFIG_0.1.4; + # .... define new API here using predicted next version number .... -- 1.8.0.1

2 2

[libvirt] [PATCH] Fix arch datatype in vahControl in virt-aa-helper.c
by Daniel P. Berrange 19 Dec '12

19 Dec '12

From: "Daniel P. Berrange" <berrange(a)redhat.com> When changing to virArch, the virt-aa-helper.c file was not completely changed. The vahControl struct was left with a char *arch field, instead of virArch arch field. Pushed as a build breaker fix --- src/security/virt-aa-helper.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/security/virt-aa-helper.c b/src/security/virt-aa-helper.c index c07e69d..16ce7f3 100644 --- a/src/security/virt-aa-helper.c +++ b/src/security/virt-aa-helper.c @@ -72,7 +72,7 @@ typedef struct { virDomainDefPtr def; /* VM definition */ virCapsPtr caps; /* VM capabilities */ char *hvm; /* type of hypervisor (eg hvm, xen) */ - char *arch; /* machine architecture */ + virArch arch; /* machine architecture */ char *newfile; /* newly added file */ bool append; /* append to .files instead of rewrite */ } vahControl; @@ -87,7 +87,6 @@ vahDeinit(vahControl * ctl) virCapabilitiesFree(ctl->caps); VIR_FREE(ctl->files); VIR_FREE(ctl->hvm); - VIR_FREE(ctl->arch); VIR_FREE(ctl->newfile); return 0; -- 1.7.11.7

1 0

[libvirt] [PATCH] Change string form of VIR_ARCH_ITANIUM back to ia64
by Daniel P. Berrange 19 Dec '12

19 Dec '12

From: "Daniel P. Berrange" <berrange(a)redhat.com> Historically there was an inconsistency in handling of the itanium arch. The xen driver & CPU model code treated it as 'ia64' but the QEMU capabilities code used 'itanium'. On the grounds that no one has ever seriously used itanium with QEMU, while RHEL shipped itanium with Xen, we should favour 'ia64' as the canonical format Pushed as a test breaker fix from virArch fallout --- src/qemu/qemu_capabilities.c | 4 ---- src/util/virarch.c | 4 +--- 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index ae75bc6..50d999a 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -251,8 +251,6 @@ VIR_ONCE_GLOBAL_INIT(qemuCaps) static virArch qemuCapsArchFromString(const char *arch) { - if (STREQ(arch, "ia64")) - return VIR_ARCH_ITANIUM; if (STREQ(arch, "i386")) return VIR_ARCH_I686; if (STREQ(arch, "arm")) @@ -266,8 +264,6 @@ static const char *qemuCapsArchToString(virArch arch) { if (arch == VIR_ARCH_I686) return "i386"; - else if (arch == VIR_ARCH_ITANIUM) - return "ia64"; else if (arch == VIR_ARCH_ARMV7L) return "arm"; diff --git a/src/util/virarch.c b/src/util/virarch.c index 5458b74..1376887 100644 --- a/src/util/virarch.c +++ b/src/util/virarch.c @@ -39,7 +39,7 @@ static const struct virArchData { { "cris", 32, VIR_ARCH_LITTLE_ENDIAN }, { "i686", 32, VIR_ARCH_LITTLE_ENDIAN }, - { "itanium", 64, VIR_ARCH_LITTLE_ENDIAN }, + { "ia64", 64, VIR_ARCH_LITTLE_ENDIAN }, { "lm32", 32, VIR_ARCH_BIG_ENDIAN }, { "m68k", 32, VIR_ARCH_BIG_ENDIAN }, { "microblaze", 32, VIR_ARCH_BIG_ENDIAN }, @@ -159,8 +159,6 @@ virArch virArchFromHost(void) ut.machine[3] == '6' && ut.machine[4] == '\0') { arch = VIR_ARCH_I686; - } else if (STREQ(ut.machine, "ia64")) { - arch = VIR_ARCH_ITANIUM; } else if (STREQ(ut.machine, "amd64")) { arch = VIR_ARCH_X86_64; } else { -- 1.7.11.7

1 0

[libvirt] (no subject)
by Daniel P. Berrange 19 Dec '12

19 Dec '12

o

1 1

[libvirt] [PATCH] Fix CPU baseline to not hardcode arch
by Daniel P. Berrange 19 Dec '12

19 Dec '12

From: "Daniel P. Berrange" <berrange(a)redhat.com> Prior to the virArch changes, the CPU baseline method would free the arch string in the returned CPU. Fix the regression by setting arch to VIR_ARCH_NONE at the end Pushed as a test breaker fix from virArch fallout Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- src/cpu/cpu_x86.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/cpu/cpu_x86.c b/src/cpu/cpu_x86.c index 2001b99..cb21910 100644 --- a/src/cpu/cpu_x86.c +++ b/src/cpu/cpu_x86.c @@ -1715,6 +1715,8 @@ x86Baseline(virCPUDefPtr *cpus, if (!outputVendor) VIR_FREE(cpu->vendor); + cpu->arch = VIR_ARCH_NONE; + cleanup: x86ModelFree(base_model); x86MapFree(map); -- 1.7.11.7

1 0

[libvirt] [PATCH] Fix SELinux security label test
by Daniel P. Berrange 19 Dec '12

19 Dec '12

From: "Daniel P. Berrange" <berrange(a)redhat.com> If securityselinuxtest was run on a system with newer SELinux policy it would fail, due to using svirt_tcg_t instead of svirt_t. Fixing the domain type to be KVM avoids this issue. Pushed as a build fix --- tests/securityselinuxtest.c | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/securityselinuxtest.c b/tests/securityselinuxtest.c index 8bcf3a1..0fa70ba 100644 --- a/tests/securityselinuxtest.c +++ b/tests/securityselinuxtest.c @@ -77,6 +77,7 @@ testBuildDomainDef(bool dynamic, if (VIR_ALLOC(secdef) < 0) goto no_memory; + def->virtType = VIR_DOMAIN_VIRT_KVM; def->seclabels[0] = secdef; def->seclabels[0]->type = dynamic ? VIR_DOMAIN_SECLABEL_DYNAMIC : VIR_DOMAIN_SECLABEL_STATIC; -- 1.7.11.7

1 0

[libvirt] [PATCH 0/8 v7] Unprivileged SG_IO support
by Osier Yang 19 Dec '12

19 Dec '12

As a result of RFC [1], this implements the unprivleged SG_IO support. v6 - v7: * No restoring of unpriv_sgio per Daniel's thought. * Use "major:minor" as the hash key per Jirka's suggestion. Osier Yang (8): util: Prepare helpers for unpriv_sgio setting qemu: Add a hash table for the shared disks docs: Add docs and rng schema for new XML cdbfilter conf: Parse and format the new XML tag cdbfilter qemu: set unpriv_sgio when domain starting qemu: Check if the shared disk's cdbfilter conflicts with others qemu: Set unpriv_sgio when attaching disk qemu: Error out if the shared disk conf conflicts with others when attaching docs/formatdomain.html.in | 13 ++- docs/schemas/domaincommon.rng | 52 ++++-- src/conf/domain_conf.c | 58 +++++-- src/conf/domain_conf.h | 10 + src/libvirt_private.syms | 4 + src/qemu/qemu_conf.c | 92 ++++++++++ src/qemu/qemu_conf.h | 12 ++ src/qemu/qemu_driver.c | 38 ++++ src/qemu/qemu_process.c | 75 ++++++++ src/qemu/qemu_process.h | 2 + src/util/util.c | 180 ++++++++++++++++++++ src/util/util.h | 8 + ...ml2argv-disk-scsi-lun-passthrough-cdbfilter.xml | 32 ++++ tests/qemuxml2xmltest.c | 1 + 14 files changed, 547 insertions(+), 30 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-lun-passthrough-cdbfilter.xml [1] https://www.redhat.com/archives/libvir-list/2012-November/msg00988.html [2] https://www.redhat.com/archives/libvir-list/2012-December/msg00325.html Regards, Osier

3 35

[libvirt] VirtualBox 4.2 Drivers Complete?
by Arslan Waqar 18 Dec '12

18 Dec '12

I was using a VM on Vbox (Ubuntu 12.04) and from the virsh I tried: virsh # dommemstat 2 and I got the following errors: error: Failed to get memory statistics for domain 2 error: this function is not supported by the connection driver: virDomainMemoryStats Are the Drivers for Vbox 4.2 incomplete? -- Regards, Arslan Waqar.

2 1

[libvirt] [PATCH 0/6] Use enum for tracking valid architectures
by Daniel P. Berrange 18 Dec '12

18 Dec '12

Different operating systems have different names for architectures. eg x86_64 x64, amd64. This can cause inconsistency in libvirt code dealing with architectures. To deal with this define an enum for valid architectures and a canonical string mapping. Update all code internally to use the enum instead of 'char *' for arch data.

5 21

[libvirt] [PATCH] spec: Do not install *.py[co] in python examples
by Jiri Denemark 18 Dec '12

18 Dec '12

Unfortunately, rpm is stupid enough to bytycompile python scripts even though they are located in /usr/share/doc/libvirt-python-*/examples and it does so after %install phase is finished. Thus there's no way we could remove those files from BUILDROOT. As a workaround, we may safely remove the examples subdirectory completely without losing anything. The python scripts that were installed there are also copied directly into /usr/share/doc/libvirt-python-*/ by %doc python/tests/*.py rule. And yes, the files are actually tests, not examples. --- libvirt.spec.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libvirt.spec.in b/libvirt.spec.in index 7457a48..13cc8a2 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -1392,6 +1392,8 @@ rm -f $RPM_BUILD_ROOT%{_datadir}/augeas/lenses/tests/test_libvirtd_lxc.aug %if ! %{with_python} rm -rf $RPM_BUILD_ROOT%{_datadir}/doc/libvirt-python-%{version} +%else +rm -rf $RPM_BUILD_ROOT%{_datadir}/doc/libvirt-python-%{version}/examples %endif %if ! %{with_qemu} -- 1.8.0.2

2 2

[libvirt] [PATCH 00/28] Rename files in src/util to have a 'vir' prefix
by Daniel P. Berrange 18 Dec '12

18 Dec '12

Currently the files in src/util are 50/50 split between those having a 'vir' prefix and those which don't. Finish the job by remaining all remaining files to have a 'vir' prefix too, guaranteeing that they can't clash with system headers[1]. The only case which was not a plain rename, was merging processinfo.{c,h} into the virprocess.{c,h} since the functionality logically belongs together. At the end src/Makefile.am is updated to sort util files alphabetically. Left as further work - make sure all functions in these files also have a 'vir' prefix. eg dnsmasq, ebtables, iptables, usb and pci files are violators in this regard. Also left, much of virutil.c should move into virfile.c Daniel [1] Not a theoretical problem - we already hit a clsah on 'usb.h' before forcing us to use 'hostusb.h' and 'memory.h' clashes with a system header but we never noticed so far.

3 38

[libvirt] Important question
by Gene Czarcinski 18 Dec '12

18 Dec '12

OK, so maybe I an nuts but it seems to me that there is this 800 pound gorilla wondering around the Fedora 18 tent and its name is firewalld! Or it with respect to virtual guests and libvirt (since libvirt is a critical part of networking support). Maybe I am missing some critical information as to how to configure firewalld so that guests can perform functions which the same guest can do on a Fedora 17 host. She only firewalld configuration I have been able to come up with is to configure it disabled. https://bugzilla.redhat.com/show_bug.cgi?id=888288 I have test this problem on different hardware and with/without mu usual updates of libvirt-1.0.1 and NetworkManager-git20121130. Please tell me that there is just this little thing I need to do and everything will work. With Fedora 18 to be released "real soon now", this is a very big problem! I remember with SELinux first appeared ... most people disabled it. Is this what is going to happen with firewalld? A big part of my problem is that I see little notice that there is a problem. I do not like cross posting but this needs to be on a couple of lists so I will be sending each a copy of this message. Gene

1 0

[libvirt] [PATCH] spec: Fix script warning when uninstalling libvirt-client
by Cole Robinson 18 Dec '12

18 Dec '12

https://bugzilla.redhat.com/show_bug.cgi?id=888071 --- libvirt.spec.in | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libvirt.spec.in b/libvirt.spec.in index 7457a48..a5dce14 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -1605,8 +1605,9 @@ fi /sbin/chkconfig --add libvirt-guests %endif -%postun client -p /sbin/ldconfig +%postun client +/sbin/ldconfig %if %{with_systemd} %if %{with_systemd_macros} %systemd_postun_with_restart libvirt-guests.service -- 1.8.0.2

2 2

[libvirt] [PATCH 0/6 v8] Unprivleged SG_IO support
by Osier Yang 18 Dec '12

18 Dec '12

As a result of RFC [1], this implements the unprivleged SG_IO support. 1/6 and 2/6 are already acked. v7 - v8: * Change the XML tag name from "cdbfilter" to "sgio", and to leave enough room for future values, the values of "sgio" are "filtered" and "unfiltered" now. v6 - v7: * No restoring of unpriv_sgio per Daniel's thought. * Use "major:minor" as the hash key per Jirka's suggestion. Osier Yang (6): util: Prepare helpers for unpriv_sgio setting qemu: Add a hash table for the shared disks docs: Add docs and rng schema for new XML tag sgio conf: Parse and format the new XML qemu: qemu: set unpriv_sgio when starting domain and attaching disk qemu: Check if the shared disk's cdbfilter conflicts with others docs/formatdomain.html.in | 14 ++- docs/schemas/domaincommon.rng | 54 +++++--- src/conf/domain_conf.c | 55 ++++++-- src/conf/domain_conf.h | 10 ++ src/libvirt_private.syms | 4 + src/qemu/qemu_conf.c | 86 ++++++++++++ src/qemu/qemu_conf.h | 12 ++ src/qemu/qemu_driver.c | 30 ++++ src/qemu/qemu_process.c | 99 ++++++++++++++ src/qemu/qemu_process.h | 4 + src/util/util.c | 140 ++++++++++++++++++++ src/util/util.h | 13 ++ ...qemuxml2argv-disk-scsi-lun-passthrough-sgio.xml | 32 +++++ tests/qemuxml2xmltest.c | 1 + 14 files changed, 522 insertions(+), 32 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-lun-passthrough-sgio.xml [1] https://www.redhat.com/archives/libvir-list/2012-November/msg00988.html [2] https://www.redhat.com/archives/libvir-list/2012-December/msg00325.html Regards, Osier

1 6

[libvirt] [RFC] qcow2v3 features support
by Ján Tomko 18 Dec '12

18 Dec '12

Since 1.1 [1], QEMU supports qcow2 version 3 images. These are still reffered to as qcow2 everywhere (qmp, qemu/qemu-img command line). This format (besides some internal improvements) includes a bitfield of compatible/incompatible/auto-clear features. [2] The only feature so far is delayed refcount updating (since 1.2 [3]), which is compatible with 1.1 if the file has been closed properly, if not it has the dirty flag set. For qcow2v3 images, -o compat=1.1 has to be passed to qemu-img. (compat=0.10 means qcow2 which is the default at the moment) For delayed refcount updates it's -o lazy_refcounts=on. Using these options would require parsing 'qemu-img create -f qcow2 -o ? /dev/null' output, or assuming they are supported. Do we need a new format type (qcow2v3) that translates to qcow2 for qemu, or would XML like this be enough? <target> <path>/var/lib/libvirt/images/image</path> <format type='qcow2'/> <features version='1.1'> <lazy_refcounts compatible="no"/> </features> ... </target> Jan [1] http://git.qemu.org/?p=qemu.git;a=commitdiff;h=6744cbab8 [2] http://lists.gnu.org/archive/html/qemu-devel/2012-04/msg03077.html [3] http://git.qemu.org/?p=qemu.git;a=commitdiff;h=bfe8043e9

2 1

[libvirt] libvirt domcument question
by zhijun liu 18 Dec '12

18 Dec '12

hi,all when I read the document at http://libvirt.org/formatdomain.html about the domain's xml format ,"disk" element has a optional subelment is "readonly",when I read the paragraph:readonlyIf present, this indicates the device cannot be modified by the guest. For now, this is the default for disks with attribute type='cdrom'. it's say type='cdrom',I'm not sure that is correct or not,I think this is a slips of pen and a possible writting maybe device='cdrom'.forgive me if I misundestanded it. also I'm not sure should send this question to libvirt-list or libvirt-user or others?liuzhijun

2 1

[libvirt] [PATCH] docs: Fix documentation for readonly element
by Jiri Denemark 18 Dec '12

18 Dec '12

--- Pushed as trivial. docs/formatdomain.html.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index 8d9ab9e..94df6f8 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -1631,7 +1631,7 @@ <dt><code>readonly</code></dt> <dd>If present, this indicates the device cannot be modified by the guest. For now, this is the default for disks with - attribute <code>type='cdrom'</code>. + attribute <code>device='cdrom'</code>. </dd> <dt><code>shareable</code></dt> <dd>If present, this indicates the device is expected to be shared -- 1.8.0.2

1 0

[libvirt] [PATCH] Fix parsing of vendor_id
by Ken ICHIKAWA 18 Dec '12

18 Dec '12

I have a problem about parsing vendor_id of domain XML. When define vendor_id attribute, why definition of fallback attribute is needed? I explain below for example. (I used virsh edit.) Current domain xml state is like below, <domain> <cpu> </cpu> </domain> And I redefine domain xml like below, <domain> <cpu> <model vendor_id='aaaabbbbcccc'>core2duo</model> </cpu> </domain> Then, do dumpxml, vendor_id is not reflected like below. <domain> <cpu mode='custom' match='exact'> <model fallback='allow'>core2duo</model> </cpu> </domain> I think this is not right behavior. It should be defined like below. <domain> <cpu mode='custom' match='exact'> <model fallback='allow' vendor_id='aaaabbbbcccc'>core2duo</model> </cpu> </domain> And if I define fallback attribute and vendor_id attribute at the same time, or define vendor_id attribute after fallback attribute is defined, vendor_id attribute is reflected normally. Is it a bug? or is there some reason? I read past mailing list's thread about the patch adding vendor_id but I could not find the reason. https://www.redhat.com/archives/libvir-list/2012-June/thread.html#00917 It seems that patch v1 doesn't need definition of fallback attribute but v2 needs it. If it's a bug, please consider to apply this patch. This patch fixes a problem that vendor_id attribute can not be defined when fallback attribute is not defined. Signed-off-by: Ken ICHIKAWA <ichikawa.ken(a)jp.fujitsu.com> --- src/conf/cpu_conf.c | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/src/conf/cpu_conf.c b/src/conf/cpu_conf.c index 8cb54a3..6157ed7 100644 --- a/src/conf/cpu_conf.c +++ b/src/conf/cpu_conf.c @@ -300,32 +300,32 @@ virCPUDefParseXML(const xmlNodePtr node, goto error; } } + } - if (virXPathBoolean("boolean(./model[1]/@vendor_id)", ctxt)) { - char *vendor_id; - - vendor_id = virXPathString("string(./model[1]/@vendor_id)", - ctxt); - if (!vendor_id || - strlen(vendor_id) != VIR_CPU_VENDOR_ID_LENGTH) { - virReportError(VIR_ERR_XML_ERROR, - _("vendor_id must be exactly" - " %d characters long"), - VIR_CPU_VENDOR_ID_LENGTH); + if (virXPathBoolean("boolean(./model[1]/@vendor_id)", ctxt)) { + char *vendor_id; + + vendor_id = virXPathString("string(./model[1]/@vendor_id)", + ctxt); + if (!vendor_id || + strlen(vendor_id) != VIR_CPU_VENDOR_ID_LENGTH) { + virReportError(VIR_ERR_XML_ERROR, + _("vendor_id must be exactly" + " %d characters long"), + VIR_CPU_VENDOR_ID_LENGTH); + VIR_FREE(vendor_id); + goto error; + } + /* ensure that the string can be passed to qemu*/ + for (i = 0; i < strlen(vendor_id); i++) { + if (vendor_id[i]==',') { + virReportError(VIR_ERR_XML_ERROR, "%s", + _("vendor id is invalid")); VIR_FREE(vendor_id); goto error; } - /* ensure that the string can be passed to qemu*/ - for (i = 0; i < strlen(vendor_id); i++) { - if (vendor_id[i]==',') { - virReportError(VIR_ERR_XML_ERROR, "%s", - _("vendor id is invalid")); - VIR_FREE(vendor_id); - goto error; - } - } - def->vendor_id = vendor_id; } + def->vendor_id = vendor_id; } } -- 1.7.11.7

2 2

[libvirt] [PATCH] hostusb: Move USB_DEVFS define to hostusb.h to fix the build
by Cole Robinson 17 Dec '12

17 Dec '12

--- Pushed since it's a trivial build breaker src/util/hostusb.c | 1 - src/util/hostusb.h | 2 ++ 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/util/hostusb.c b/src/util/hostusb.c index 24f925b..2eb80a0 100644 --- a/src/util/hostusb.c +++ b/src/util/hostusb.c @@ -38,7 +38,6 @@ #include "virterror_internal.h" #define USB_SYSFS "/sys/bus/usb" -#define USB_DEVFS "/dev/bus/usb/" #define USB_ID_LEN 10 /* "1234 5678" */ #define USB_ADDR_LEN 8 /* "123:456" */ diff --git a/src/util/hostusb.h b/src/util/hostusb.h index aee1526..ad2476d 100644 --- a/src/util/hostusb.h +++ b/src/util/hostusb.h @@ -25,6 +25,8 @@ # include "internal.h" +# define USB_DEVFS "/dev/bus/usb/" + typedef struct _usbDevice usbDevice; typedef struct _usbDeviceList usbDeviceList; -- 1.8.0.2

2 1

[libvirt] libvirt-1.0.1 and F18 problem
by Gene Czarcinski 17 Dec '12

17 Dec '12

I am sure this not just a 1.0.1 problem and there appears to be a bugzilla report on it: https://bugzilla.redhat.com/show_bug.cgi?id=869625 Given a F17 host and a F18 host, there is significantly different behavior when running a guest (in my case a F18 guest). On F18, I cannot ssh or scp to the host let alone any other system. Also, although DHCPv6 is working and I am getting an IPv6 DHCP address assigned. Also, I can use firefox to access an Internet website. Oh, and host returns no response. I am not sure what is wrong but I hope this is easy to fix. Gene

1 1

[libvirt] [PATCH] network: don't require private addresses if dnsmasq uses SO_BINDTODEVICE
by Laine Stump 17 Dec '12

17 Dec '12

This is yet another refinement to the fix for CVE-2012-3411: https://bugzilla.redhat.com/show_bug.cgi?id=833033 It turns out that it would be very intrusive to correctly backport the entire --bind-dynamic option to older dnsmasq versions (e.g. dnsmasq-2.48 that is used on RHEL6.x and CentOS 6.x), but very simple to patch those versions to just use SO_BINDTODEVICE on all their listening sockets (SO_BINDTODEVICE also has the desired effect of permitting only traffic that was received on the interface(s) where dnsmasq was set to listen.) This patch modifies the dnsmasq capabilities detection to detect the string: --bind-interfaces with SO_BINDTODEVICE in the output of "dnsmasq --version", and in that case realize that using the old --bind-interfaces option is just as safe as --bind-dynamic (and therefore *not* forbid creation of networks that use public IP address ranges). If -bind-dynamic is available, it is still preferred over --bind-interfaces. Note that this patch does no harm in upstream, or in any distro's downstream if it happens to end up there, but builds for distros that have a new enough dnsmasq to support --bind-dynamic do *NOT* need to specifically backport this patch; it's only required for distro releases that have dnsmasq too old to have --bind-dynamic (and those distros will need to add the SO_BINDTODEVICE patch to dnsmasq, *including the extra string in the --version output*, as well. --- src/network/bridge_driver.c | 6 ++++-- src/util/dnsmasq.c | 15 ++++++++++++--- src/util/dnsmasq.h | 1 + 3 files changed, 17 insertions(+), 5 deletions(-) diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c index c62e729..fdd9382 100644 --- a/src/network/bridge_driver.c +++ b/src/network/bridge_driver.c @@ -725,13 +725,15 @@ networkDnsmasqConfContents(virNetworkObjPtr network, * dnsmasq doesn't have bind-dynamic, only allow listening on * private/local IP addresses (see RFC1918/RFC3484/RFC4193) */ - if (!virSocketAddrIsPrivate(&tmpipdef->address)) { + if (!dnsmasqCapsGet(caps, DNSMASQ_CAPS_BINDTODEVICE) && + !virSocketAddrIsPrivate(&tmpipdef->address)) { unsigned long version = dnsmasqCapsGetVersion(caps); virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("Publicly routable address %s is prohibited. " "The version of dnsmasq on this host (%d.%d) doesn't " - "support the bind-dynamic option, which is required " + "support the bind-dynamic option or use SO_BINDTODEVICE " + "on listening sockets, one of which is required " "for safe operation on a publicly routable subnet " "(see CVE-2012-3411). You must either upgrade dnsmasq, " "or use a private/local subnet range for this network " diff --git a/src/util/dnsmasq.c b/src/util/dnsmasq.c index e8eab1e..ba51447 100644 --- a/src/util/dnsmasq.c +++ b/src/util/dnsmasq.c @@ -664,10 +664,19 @@ dnsmasqCapsSetFromBuffer(dnsmasqCapsPtr caps, const char *buf) if (strstr(buf, "--bind-dynamic")) dnsmasqCapsSet(caps, DNSMASQ_CAPS_BIND_DYNAMIC); - VIR_INFO("dnsmasq version is %d.%d, --bind-dynamic is %s", + /* if this string is a part of the --version output, dnsmasq + * has been patched to use SO_BINDTODEVICE when listening, + * so that it will only accept requests that arrived on the + * listening interface(s) + */ + if (strstr(buf, "--bind-interfaces with SO_BINDTODEVICE")) + dnsmasqCapsSet(caps, DNSMASQ_CAPS_BINDTODEVICE); + + VIR_INFO("dnsmasq version is %d.%d, --bind-dynamic is %spresent, " + "SO_BINDTODEVICE is %sin use", (int)caps->version / 1000000, (int)(caps->version % 1000000) / 1000, - dnsmasqCapsGet(caps, DNSMASQ_CAPS_BIND_DYNAMIC) - ? "present" : "NOT present"); + dnsmasqCapsGet(caps, DNSMASQ_CAPS_BIND_DYNAMIC) ? "" : "NOT ", + dnsmasqCapsGet(caps, DNSMASQ_CAPS_BIND_DYNAMIC) ? "" : "NOT "); return 0; fail: diff --git a/src/util/dnsmasq.h b/src/util/dnsmasq.h index 7a39232..b83bc96 100644 --- a/src/util/dnsmasq.h +++ b/src/util/dnsmasq.h @@ -68,6 +68,7 @@ typedef struct typedef enum { DNSMASQ_CAPS_BIND_DYNAMIC = 0, /* support for --bind-dynamic */ + DNSMASQ_CAPS_BINDTODEVICE = 1, /* uses SO_BINDTODEVICE for --bind-interfaces */ DNSMASQ_CAPS_LAST, /* this must always be the last item */ } dnsmasqCapsFlags; -- 1.7.11.7

2 1

[libvirt] [PATCH] build: Fix AUTHORS generation
by Jiri Denemark 17 Dec '12

17 Dec '12

Using s/#authorslist#/$$out/ makes perl eat @domain part of all email addresses from $out since it tries to interpret them as array variables. I'm not sure if we can escape those in s/// but I know we can use print: s/#authorslist#// and print '$$out' to tell perl not to even inside $out. This patch also fixes gen-AUTHORS so that it works in VPATH. --- Makefile.am | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile.am b/Makefile.am index 9556b42..05301cd 100644 --- a/Makefile.am +++ b/Makefile.am @@ -95,9 +95,9 @@ gen-ChangeLog: .PHONY: gen-AUTHORS gen-AUTHORS: - $(AM_V_GEN)if test -d .git; then \ - out="`git log --pretty=format:'%aN <%aE>' | sort -u`" && \ - cat $(srcdir)/AUTHORS.in | perl -p -e "s/#authorslist#/$$out/" > \ + $(AM_V_GEN)if test -d $(srcdir)/.git; then \ + out="`cd $(srcdir) && git log --pretty=format:'%aN <%aE>' | sort -u`" && \ + cat $(srcdir)/AUTHORS.in | perl -p -e "s/#authorslist#// and print '$$out'" > \ $(distdir)/AUTHORS-tmp && \ mv -f $(distdir)/AUTHORS-tmp $(distdir)/AUTHORS ; \ fi -- 1.8.0.2

2 2

[libvirt] [PATCH] apparmor: Fix build
by Jiri Denemark 17 Dec '12

17 Dec '12

--- Pushed as a trivial build-breaker. src/security/virt-aa-helper.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/security/virt-aa-helper.c b/src/security/virt-aa-helper.c index 888c416..86fd5c4 100644 --- a/src/security/virt-aa-helper.c +++ b/src/security/virt-aa-helper.c @@ -1022,7 +1022,8 @@ get_files(vahControl * ctl) switch (dev->source.subsys.type) { case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_USB: { usbDevice *usb = usbGetDevice(dev->source.subsys.u.usb.bus, - dev->source.subsys.u.usb.device); + dev->source.subsys.u.usb.device, + NULL); if (usb == NULL) continue; -- 1.8.0.2

1 0

[libvirt] [PATCH] .gitignore: add tests/sysinfotest
by Cole Robinson 17 Dec '12

17 Dec '12

--- Pushed since it's trivial .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 32ae8a7..0557d59 100644 --- a/.gitignore +++ b/.gitignore @@ -164,6 +164,7 @@ /tests/ssh /tests/statstest /tests/storagebackendsheepdogtest +/tests/sysinfotest /tests/utiltest /tests/viratomictest /tests/virauthconfigtest -- 1.8.0.2

1 0

[libvirt] [PATCH] daemon: Preface polkit error output with 'polkit:'
by Cole Robinson 17 Dec '12

17 Dec '12

There's been a few bugs about an expected error from polkit: https://bugzilla.redhat.com/show_bug.cgi?id=873799 https://bugzilla.redhat.com/show_bug.cgi?id=872166 The error is: Authorization requires authentication but no agent is available. The error means that polkit needs a password, but there is no polkit agent registered in your session. Polkit agents are the bit of UI that pop up and actually ask for your password. Preface the error with the string 'polkit:' so folks can hopefully make more sense of it. --- daemon/remote.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/daemon/remote.c b/daemon/remote.c index 41b8ea8..f85dae0 100644 --- a/daemon/remote.c +++ b/daemon/remote.c @@ -2887,9 +2887,10 @@ error: if (authdismissed) { virReportError(VIR_ERR_AUTH_CANCELLED, "%s", _("authentication cancelled by user")); + } else if (pkout && *pkout) { + virReportError(VIR_ERR_AUTH_FAILED, "polkit: %s", pkout); } else { - virReportError(VIR_ERR_AUTH_FAILED, "%s", - pkout && *pkout ? pkout : _("authentication failed")); + virReportError(VIR_ERR_AUTH_FAILED, "%s", _("authentication failed")); } VIR_FREE(pkout); -- 1.8.0.2

2 2

[libvirt] Network XML Description
by Fawad Khaliq 17 Dec '12

17 Dec '12

Hi all, The XML description of a network does not contain information of the Domains (VMs) plugged into a network. For example, there is a network named 'default' and there are two domains named: domainA and domainB. The Network XML description of 'default' network cannot tell what domains are plugged into it (in this scenario: domainA and domainB). What reasons could be behind this Network XML format convention? Thanks, Fawad

3 3

[libvirt] [PATCH 00/23] Improve device support for LXC
by Daniel P. Berrange 17 Dec '12

17 Dec '12

This series makes some major improvements to the device support for LXC - USB, block and char device passthrough - Hotplug/unplug support for disk, nic, usb, block and char devices

4 58

[libvirt] [PATCH] build: libvirt-guests files misplaced in specfile
by Viktor Mihajlovski 17 Dec '12

17 Dec '12

In a non-systemd environment the post and preun scripts of libvirt-client fail, since the required files are in libvirt-daemon. Moved them to client. One curious thing: %{_unitdir}/libvirt-guests.service was contained in both libvirt-client and libvirt-daemon. I removed the extra copy from daemon. Note: this should be checked by someone building RPMs for a systemd machine. I don't have one at the moment. Signed-off-by: Viktor Mihajlovski <mihajlov(a)linux.vnet.ibm.com> --- libvirt.spec.in | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libvirt.spec.in b/libvirt.spec.in index 7457a48..b826a8f 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -1662,15 +1662,12 @@ fi %dir %attr(0700, root, root) %{_sysconfdir}/libvirt/nwfilter/ -%attr(0755, root, root) %{_libexecdir}/libvirt-guests.sh %if %{with_systemd} %{_unitdir}/libvirtd.service -%{_unitdir}/libvirt-guests.service %{_unitdir}/virtlockd.service %{_unitdir}/virtlockd.socket %else %{_sysconfdir}/rc.d/init.d/libvirtd -%{_sysconfdir}/rc.d/init.d/libvirt-guests %{_sysconfdir}/rc.d/init.d/virtlockd %endif %doc daemon/libvirtd.upstart @@ -1948,8 +1945,11 @@ rm -f $RPM_BUILD_ROOT%{_sysconfdir}/sysctl.d/libvirtd %if %{with_systemd} %{_unitdir}/libvirt-guests.service +%else +%{_sysconfdir}/rc.d/init.d/libvirt-guests %endif %config(noreplace) %{_sysconfdir}/sysconfig/libvirt-guests +%attr(0755, root, root) %{_libexecdir}/libvirt-guests.sh %dir %attr(0755, root, root) %{_localstatedir}/lib/libvirt/ %if %{with_sasl} -- 1.7.9.5

1 0

[libvirt] No VirtualBox Driver
by Arslan Waqar 17 Dec '12

17 Dec '12

Hi all, I am new to the group and hence there might be a chance I might be asking a simple question... The thing is I compiled and installed libvirt from git. Then in my terminal window I started virsh. It started. Then since I had Virtual Box installed on my machine I ran "connect vbox:///session". Once I did this I got two errors which said: error: Failed to connect to the hypervisor error: internal error unable to initialize VirtualBox driver API I am unable to resolve this issue...Any input is welcome! Thanks! -- Regards, Arslan Waqar.

2 9

[libvirt] [PATCH 0/4] Cleanup and fix parsing of vendor_id in the XML cpu definition
by Peter Krempa 17 Dec '12

17 Dec '12

This patchset contains Ken ICHIKAWA's patch to fix parsing of vendor_id (with tweaked commit message) and my cleanups to pre-existing problems in the code which I found while reviewing Ken's patch. Ken ICHIKAWA (1): conf: cpu: Fix parsing of vendor_id Peter Krempa (3): conf: cpu: Fix memory leak when specifying cpu vendor_id manually conf: cpu: Refactor parsing of vendor_id and fallback attributes conf: cpu: Break some long lines src/conf/cpu_conf.c | 82 +++++++++++++++++++++++++---------------------------- 1 file changed, 38 insertions(+), 44 deletions(-) -- 1.8.0.2

2 8

[libvirt] ANNOUNCE: New libosinfo project mailing list
by Daniel P. Berrange 17 Dec '12

17 Dec '12

Historically the libosinfo project has used virt-tools-list(a)redhat.com for all its discussions. Since the project has grown and matured, it is time for a dedicated mailing list. If you are interested/involved with libosinfo, please subscribe to the new list: https://www.redhat.com/mailman/listinfo/libosinfo The list only accepts postings from members. Once subscribed you can post to libosinfo(a)redhat.com 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] Socket identity support for FreeBSD.
by Roman Bogorodskiy 17 Dec '12

17 Dec '12

This adds an implementation of virNetSocketGetUNIXIdentity() using LOCAL_PEERCRED socket option and xucred struct, defined in <sys/ucred.h> on systems that have it. --- configure.ac | 3 ++- src/rpc/virnetsocket.c | 30 +++++++++++++++++++++++++++++- 2 files changed, 31 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index bf32f95..1cb9e91 100644 --- a/configure.ac +++ b/configure.ac @@ -187,7 +187,8 @@ LIBS=$old_libs dnl Availability of various common headers (non-fatal if missing). AC_CHECK_HEADERS([pwd.h paths.h regex.h sys/un.h \ sys/poll.h syslog.h mntent.h net/ethernet.h linux/magic.h \ - sys/un.h sys/syscall.h netinet/tcp.h ifaddrs.h libtasn1.h]) + sys/un.h sys/syscall.h netinet/tcp.h ifaddrs.h libtasn1.h \ + sys/ucred.h]) dnl Check whether endian provides handy macros. AC_CHECK_DECLS([htole64], [], [], [[#include <endian.h>]]) diff --git a/src/rpc/virnetsocket.c b/src/rpc/virnetsocket.c index a1b64d7..70c621f 100644 --- a/src/rpc/virnetsocket.c +++ b/src/rpc/virnetsocket.c @@ -35,6 +35,10 @@ # include <netinet/tcp.h> #endif +#ifdef HAVE_SYS_UCRED_H +# include <sys/ucred.h> +#endif + #include "c-ctype.h" #include "virnetsocket.h" #include "util.h" @@ -1091,7 +1095,7 @@ int virNetSocketGetPort(virNetSocketPtr sock) } -#ifdef SO_PEERCRED +#if defined(SO_PEERCRED) int virNetSocketGetUNIXIdentity(virNetSocketPtr sock, uid_t *uid, gid_t *gid, @@ -1115,6 +1119,30 @@ int virNetSocketGetUNIXIdentity(virNetSocketPtr sock, virMutexUnlock(&sock->lock); return 0; } +#elif defined(LOCAL_PEERCRED) +int virNetSocketGetUNIXIdentity(virNetSocketPtr sock, + uid_t *uid, + gid_t *gid, + pid_t *pid) +{ + struct xucred cr; + socklen_t cr_len = sizeof(cr); + virMutexLock(&sock->lock); + + if (getsockopt(sock->fd, SOL_SOCKET, LOCAL_PEERCRED, &cr, &cr_len) < 0) { + virReportSystemError(errno, "%s", + _("Failed to get client socket identity")); + virMutexUnlock(&sock->lock); + return -1; + } + + *pid = -1; + *uid = cr.cr_uid; + *gid = cr.cr_gid; + + virMutexUnlock(&sock->lock); + return 0; +} #else int virNetSocketGetUNIXIdentity(virNetSocketPtr sock ATTRIBUTE_UNUSED, uid_t *uid ATTRIBUTE_UNUSED, -- 1.8.0

3 2

[libvirt] libvirt git doesn't know to use -no-kvm on qemu-kvm 1.2
by Cole Robinson 17 Dec '12

17 Dec '12

Libvirt git isn't correctly starting plain qemu guests when using qemu-kvm 1.2 (on Fedora 18). The problem is that -no-kvm is not passed to the binary, so the default mode is used, which is kvm=enabled. The issue comes from capabilities probing: we probe against 'qemu-kvm -M none', which responds to 'query-kvm' with enabled=False, when regular invocation is enabled=True. We should be able to work around this by using -machine ...,accel=kvm|tcg unconditionally for qemu >= 1.2, and not have to do the -enable-kvm/-no-kvm dance. accel= has been around for a while and libguestfs uses it so it should be reliable. - Cole

2 1

[libvirt] [PATCH] docs: Replace with in docs/news.html.in
by Peter Krempa 17 Dec '12

17 Dec '12

Pushing under the trivial rule. --- docs/news.html.in | 740 +++++++++++++++++++++++++++--------------------------- 1 file changed, 370 insertions(+), 370 deletions(-) diff --git a/docs/news.html.in b/docs/news.html.in index 7ba6408..5b8dca5 100644 --- a/docs/news.html.in +++ b/docs/news.html.in @@ -11,386 +11,386 @@ and check the <a href="http://libvirt.org/git/?p=libvirt.git;a=log">GIT log</a> <h3>1.0.1: Dec 17 2012</h3> <ul> <li> Features: - Introduce virtlockd daemon (Daniel P. Berrange), - parallels: add disk and network device support (Dmitry Guryanov), - Add virDomainSendProcessSignal API (Daniel P. Berrange), - Introduce virDomainFSTrim() public API (Michal Privoznik), - add fuse support for libvirt lxc (Gao feng), - Add Gluster protocol as supported network disk backend (Harsh Prateek Bora), - various snapshot improvements (Peter Krempa, Eric Blake) + Introduce virtlockd daemon (Daniel P. Berrange), + parallels: add disk and network device support (Dmitry Guryanov), + Add virDomainSendProcessSignal API (Daniel P. Berrange), + Introduce virDomainFSTrim() public API (Michal Privoznik), + add fuse support for libvirt lxc (Gao feng), + Add Gluster protocol as supported network disk backend (Harsh Prateek Bora), + various snapshot improvements (Peter Krempa, Eric Blake) </li> [...]

1 0

[libvirt] can't remove cgroup files of the domain, thanks!
by Caizhifeng 17 Dec '12

17 Dec '12

HI all: I am now working with libvirt 1.0.0 and come up a problem when I try to destroy a domain, The libvirtd just waiting rmdir command to return for hours, but it seem to never to return .. The stack is : 0x00007fa752261287 in rmdir () from /lib/x86_64-linux-gnu/libc.so.6 (gdb) bt #0 0x00007fa752261287 in rmdir () from /lib/x86_64-linux-gnu/libc.so.6 #1 0x00007fa7533f44ad in virCgroupRemoveRecursively (grppath=0x138dca0 "/sys/fs/cgroup/libvirt/qemu/win7_gl//emulator") at util/cgroup.c:728 #2 0x00007fa7533f443a in virCgroupRemoveRecursively (grppath=0x138c5b0 "/sys/fs/cgroup/libvirt/qemu/win7_gl/") at util/cgroup.c:720 #3 0x00007fa7533f45f4 in virCgroupRemove (group=0x138c8d0) at util/cgroup.c:773 #4 0x00000000004d74ba in qemuRemoveCgroup (driver=0x7fa744010170, vm=0x7fa744005eb0, quiet=0) at qemu/qemu_cgroup.c:760 #5 0x00000000004c9813 in qemuProcessStop (driver=0x7fa744010170, vm=0x7fa744005eb0, reason=VIR_DOMAIN_SHUTOFF_SHUTDOWN, flags=0) at qemu/qemu_process.c:4159 #6 0x00000000004becc4 in qemuProcessHandleMonitorEOF (mon=0x7fa72c008e30, vm=0x7fa744005eb0) at qemu/qemu_process.c:312 #7 0x00000000004a0e14 in qemuMonitorIO (watch=332, fd=22, events=0, opaque=0x7fa72c008e30) at qemu/qemu_monitor.c:641 #8 0x00007fa7533f85b7 in virEventPollDispatchHandles (nfds=11, fds=0x13949e0) at util/event_poll.c:485 #9 0x00007fa7533f8dd8 in virEventPollRunOnce () at util/event_poll.c:632 #10 0x00007fa7533f6fd8 in virEventRunDefaultImpl () at util/event.c:247 #11 0x00007fa75351cbb9 in virNetServerRun (srv=0x1389ea0) at rpc/virnetserver.c:1004 #12 0x00000000004222ac in main (argc=2, argv=0x7fff95b34878) at libvirtd.c:1354 (gdb) root@vmc-22:~# lsof | grep cgroup libvirtd 2435 root 17r DIR 0,19 0 326488 /sys/fs/cgroup/libvirt/qemu/win7_gl root@vmc-22:~# root@vmc-22:~# root@vmc-22:~# lsattr /sys/fs/cgroup/libvirt/qemu/win7_gl lsattr: Inappropriate ioctl for device While reading flags on /sys/fs/cgroup/libvirt/qemu/win7_gl/emulator lsattr: Inappropriate ioctl for device While reading flags on /sys/fs/cgroup/libvirt/qemu/win7_gl/vcpu1 lsattr: Inappropriate ioctl for device While reading flags on /sys/fs/cgroup/libvirt/qemu/win7_gl/vcpu0 lsattr: Inappropriate ioctl for device While reading flags on /sys/fs/cgroup/libvirt/qemu/win7_gl/cpuset.memory_spread_slab lsattr: Inappropriate ioctl for device While reading flags on /sys/fs/cgroup/libvirt/qemu/win7_gl/cpuset.memory_spread_page lsattr: Inappropriate ioctl for device While reading flags on /sys/fs/cgroup/libvirt/qemu/win7_gl/cpuset.memory_pressure lsattr: Inappropriate ioctl for device While reading flags on /sys/fs/cgroup/libvirt/qemu/win7_gl/cpuset.memory_migrate lsattr: Inappropriate ioctl for device While reading flags on /sys/fs/cgroup/libvirt/qemu/win7_gl/cpuset.sched_relax_domain_level lsattr: Inappropriate ioctl for device While reading flags on /sys/fs/cgroup/libvirt/qemu/win7_gl/cpuset.sched_load_balance lsattr: Inappropriate ioctl for device While reading flags on /sys/fs/cgroup/libvirt/qemu/win7_gl/cpuset.mem_hardwall lsattr: Inappropriate ioctl for device While reading flags on /sys/fs/cgroup/libvirt/qemu/win7_gl/cpuset.mem_exclusive lsattr: Inappropriate ioctl for device While reading flags on /sys/fs/cgroup/libvirt/qemu/win7_gl/cpuset.cpu_exclusive lsattr: Inappropriate ioctl for device While reading flags on /sys/fs/cgroup/libvirt/qemu/win7_gl/cpuset.mems lsattr: Inappropriate ioctl for device While reading flags on /sys/fs/cgroup/libvirt/qemu/win7_gl/cpuset.cpus lsattr: Inappropriate ioctl for device While reading flags on /sys/fs/cgroup/libvirt/qemu/win7_gl/cpu.rt_period_us lsattr: Inappropriate ioctl for device While reading flags on /sys/fs/cgroup/libvirt/qemu/win7_gl/cpu.rt_runtime_us lsattr: Inappropriate ioctl for device While reading flags on /sys/fs/cgroup/libvirt/qemu/win7_gl/cpu.stat lsattr: Inappropriate ioctl for device While reading flags on /sys/fs/cgroup/libvirt/qemu/win7_gl/cpu.cfs_period_us lsattr: Inappropriate ioctl for device While reading flags on /sys/fs/cgroup/libvirt/qemu/win7_gl/cpu.cfs_quota_us lsattr: Inappropriate ioctl for device While reading flags on /sys/fs/cgroup/libvirt/qemu/win7_gl/cpu.shares lsattr: Inappropriate ioctl for device While reading flags on /sys/fs/cgroup/libvirt/qemu/win7_gl/cpuacct.stat lsattr: Inappropriate ioctl for device While reading flags on /sys/fs/cgroup/libvirt/qemu/win7_gl/cpuacct.usage_percpu lsattr: Inappropriate ioctl for device While reading flags on /sys/fs/cgroup/libvirt/qemu/win7_gl/cpuacct.usage lsattr: Inappropriate ioctl for device While reading flags on /sys/fs/cgroup/libvirt/qemu/win7_gl/memory.memsw.failcnt lsattr: Inappropriate ioctl for device While reading flags on /sys/fs/cgroup/libvirt/qemu/win7_gl/memory.memsw.limit_in_bytes lsattr: Inappropriate ioctl for device While reading flags on /sys/fs/cgroup/libvirt/qemu/win7_gl/memory.memsw.max_usage_in_bytes lsattr: Inappropriate ioctl for device While reading flags on /sys/fs/cgroup/libvirt/qemu/win7_gl/memory.memsw.usage_in_bytes lsattr: Inappropriate ioctl for device While reading flags on /sys/fs/cgroup/libvirt/qemu/win7_gl/memory.numa_stat lsattr: Inappropriate ioctl for device While reading flags on /sys/fs/cgroup/libvirt/qemu/win7_gl/memory.oom_control lsattr: Inappropriate ioctl for device While reading flags on /sys/fs/cgroup/libvirt/qemu/win7_gl/memory.move_charge_at_immigrate lsattr: Inappropriate ioctl for device While reading flags on /sys/fs/cgroup/libvirt/qemu/win7_gl/memory.swappiness lsattr: Inappropriate ioctl for device While reading flags on /sys/fs/cgroup/libvirt/qemu/win7_gl/memory.use_hierarchy lsattr: Inappropriate ioctl for device While reading flags on /sys/fs/cgroup/libvirt/qemu/win7_gl/memory.force_empty lsattr: Inappropriate ioctl for device While reading flags on /sys/fs/cgroup/libvirt/qemu/win7_gl/memory.stat lsattr: Inappropriate ioctl for device While reading flags on /sys/fs/cgroup/libvirt/qemu/win7_gl/memory.failcnt lsattr: Inappropriate ioctl for device While reading flags on /sys/fs/cgroup/libvirt/qemu/win7_gl/memory.soft_limit_in_bytes lsattr: Inappropriate ioctl for device While reading flags on /sys/fs/cgroup/libvirt/qemu/win7_gl/memory.limit_in_bytes lsattr: Inappropriate ioctl for device While reading flags on /sys/fs/cgroup/libvirt/qemu/win7_gl/memory.max_usage_in_bytes lsattr: Inappropriate ioctl for device While reading flags on /sys/fs/cgroup/libvirt/qemu/win7_gl/memory.usage_in_bytes lsattr: Inappropriate ioctl for device While reading flags on /sys/fs/cgroup/libvirt/qemu/win7_gl/devices.list lsattr: Inappropriate ioctl for device While reading flags on /sys/fs/cgroup/libvirt/qemu/win7_gl/devices.deny lsattr: Inappropriate ioctl for device While reading flags on /sys/fs/cgroup/libvirt/qemu/win7_gl/devices.allow lsattr: Inappropriate ioctl for device While reading flags on /sys/fs/cgroup/libvirt/qemu/win7_gl/freezer.state lsattr: Inappropriate ioctl for device While reading flags on /sys/fs/cgroup/libvirt/qemu/win7_gl/blkio.throttle.io_serviced lsattr: Inappropriate ioctl for device While reading flags on /sys/fs/cgroup/libvirt/qemu/win7_gl/blkio.throttle.io_service_bytes lsattr: Inappropriate ioctl for device While reading flags on /sys/fs/cgroup/libvirt/qemu/win7_gl/blkio.throttle.write_iops_device lsattr: Inappropriate ioctl for device While reading flags on /sys/fs/cgroup/libvirt/qemu/win7_gl/blkio.throttle.read_iops_device lsattr: Inappropriate ioctl for device While reading flags on /sys/fs/cgroup/libvirt/qemu/win7_gl/blkio.throttle.write_bps_device lsattr: Inappropriate ioctl for device While reading flags on /sys/fs/cgroup/libvirt/qemu/win7_gl/blkio.throttle.read_bps_device lsattr: Inappropriate ioctl for device While reading flags on /sys/fs/cgroup/libvirt/qemu/win7_gl/blkio.reset_stats lsattr: Inappropriate ioctl for device While reading flags on /sys/fs/cgroup/libvirt/qemu/win7_gl/blkio.io_queued lsattr: Inappropriate ioctl for device While reading flags on /sys/fs/cgroup/libvirt/qemu/win7_gl/blkio.io_merged lsattr: Inappropriate ioctl for device While reading flags on /sys/fs/cgroup/libvirt/qemu/win7_gl/blkio.io_wait_time lsattr: Inappropriate ioctl for device While reading flags on /sys/fs/cgroup/libvirt/qemu/win7_gl/blkio.io_service_time lsattr: Inappropriate ioctl for device While reading flags on /sys/fs/cgroup/libvirt/qemu/win7_gl/blkio.io_serviced lsattr: Inappropriate ioctl for device While reading flags on /sys/fs/cgroup/libvirt/qemu/win7_gl/blkio.io_service_bytes lsattr: Inappropriate ioctl for device While reading flags on /sys/fs/cgroup/libvirt/qemu/win7_gl/blkio.sectors lsattr: Inappropriate ioctl for device While reading flags on /sys/fs/cgroup/libvirt/qemu/win7_gl/blkio.time lsattr: Inappropriate ioctl for device While reading flags on /sys/fs/cgroup/libvirt/qemu/win7_gl/blkio.weight lsattr: Inappropriate ioctl for device While reading flags on /sys/fs/cgroup/libvirt/qemu/win7_gl/blkio.weight_device lsattr: Inappropriate ioctl for device While reading flags on /sys/fs/cgroup/libvirt/qemu/win7_gl/cgroup.clone_children lsattr: Inappropriate ioctl for device While reading flags on /sys/fs/cgroup/libvirt/qemu/win7_gl/cgroup.event_control lsattr: Inappropriate ioctl for device While reading flags on /sys/fs/cgroup/libvirt/qemu/win7_gl/notify_on_release lsattr: Inappropriate ioctl for device While reading flags on /sys/fs/cgroup/libvirt/qemu/win7_gl/cgroup.procs lsattr: Inappropriate ioctl for device While reading flags on /sys/fs/cgroup/libvirt/qemu/win7_gl/tasks root@vmc-22:~# when I use command "service libvirt-bin stop", I can stop libvirtd; but rmdir command still never return: root@vmc-22:~# rmdir /sys/fs/cgroup/libvirt/qemu/win7_gl//emulator ^C root@vmc-22:~# Is someone know this problem? How can I solve this problem? Thank you very much! ------------------------------------------------------------------------------------------------------------------------------------- ???????????????????????????????????????? ???????????????????????????????????????? ???????????????????????????????????????? ??? This e-mail and its attachments contain confidential information from H3C, which is intended only for the person or entity whose address is listed above. Any use of the information contained herein in any way (including, but not limited to, total or partial disclosure, reproduction, or dissemination) by persons other than the intended recipient(s) is prohibited. If you receive this e-mail in error, please notify the sender by phone or email immediately and delete it!

1 0

[libvirt] [test-API][PATCH] set_vcpus_*: Add check point with vcpusFlags API
by Wayne Sun 17 Dec '12

17 Dec '12

* add check with vcpusFlags API, it return current or max vcpu base on given flags Signed-off-by: Wayne Sun <gsun(a)redhat.com> --- repos/setVcpus/set_vcpus_config.py | 28 ++++++++++++++++++++++++---- repos/setVcpus/set_vcpus_live.py | 8 ++++++++ 2 files changed, 32 insertions(+), 4 deletions(-) diff --git a/repos/setVcpus/set_vcpus_config.py b/repos/setVcpus/set_vcpus_config.py index 289dad1..3bb3984 100644 --- a/repos/setVcpus/set_vcpus_config.py +++ b/repos/setVcpus/set_vcpus_config.py @@ -63,19 +63,39 @@ def set_vcpus_config(params): try: domobj = conn.lookupByName(guestname) if vcpu: + flags = libvirt.VIR_DOMAIN_AFFECT_CONFIG logger.info("the given vcpu number is %s" % vcpu) logger.info("set domain vcpu as %s with flag: %s" % - (vcpu, libvirt.VIR_DOMAIN_AFFECT_CONFIG)) - domobj.setVcpusFlags(int(vcpu), libvirt.VIR_DOMAIN_AFFECT_CONFIG) + (vcpu, flags)) + domobj.setVcpusFlags(int(vcpu), flags) logger.info("set domain vcpu succeed") + logger.info("check with vcpusFlags api") + ret = domobj.vcpusFlags(flags) + logger.info("vcpusFlags return current vcpu is: %s" % ret) + if ret == int(vcpu): + logger.info("vcpusFlags check succeed") + else: + logger.error("vcpusFlags check failed") + return 1 + if maxvcpu: + flags = libvirt.VIR_DOMAIN_VCPU_MAXIMUM logger.info("the given max vcpu number is %s" % maxvcpu) logger.info("set domain maximum vcpu as %s with flag: %s" % - (maxvcpu, libvirt.VIR_DOMAIN_VCPU_MAXIMUM)) - domobj.setVcpusFlags(int(maxvcpu), libvirt.VIR_DOMAIN_VCPU_MAXIMUM) + (maxvcpu, flags)) + domobj.setVcpusFlags(int(maxvcpu), flags) logger.info("set domain vcpu succeed") + logger.info("check with vcpusFlags api") + ret = domobj.vcpusFlags(flags) + logger.info("vcpusFlags return max vcpu is: %s" % ret) + if ret == int(maxvcpu): + logger.info("vcpusFlags check succeed") + else: + logger.error("vcpusFlags check failed") + return 1 + except libvirtError, e: logger.error("libvirt call failed: " + str(e)) return 1 diff --git a/repos/setVcpus/set_vcpus_live.py b/repos/setVcpus/set_vcpus_live.py index 35a2976..fdd8f8a 100644 --- a/repos/setVcpus/set_vcpus_live.py +++ b/repos/setVcpus/set_vcpus_live.py @@ -82,6 +82,14 @@ def set_vcpus_live(params): logger.info("set domain vcpu as %s with flag: %s" % (vcpu, libvirt.VIR_DOMAIN_VCPU_LIVE)) domobj.setVcpusFlags(vcpu, libvirt.VIR_DOMAIN_VCPU_LIVE) + logger.info("check with vcpusFlags api") + ret = domobj.vcpusFlags(libvirt.VIR_DOMAIN_VCPU_LIVE) + logger.info("vcpusFlags return current vcpu is: %s" % ret) + if ret == vcpu: + logger.info("vcpusFlags check succeed") + else: + logger.error("vcpusFlags check failed") + return 1 except libvirtError, e: logger.error("libvirt call failed: " + str(e)) return 1 -- 1.7.1

2 1

[libvirt] [test-API][PATCH] Add two numa parameters cases
by Wayne Sun 17 Dec '12

17 Dec '12

* cover live and config flags. * config case use numaParameters API to check and confirm with check domain config xml. * live update numa parameters is with problem now, setNumaParameters API is with bug 857312 on live domain. Also use numaParameters API to check after set, then check domain pid status with allowed memory list to confirm the nodeset. * The mode check in live case is marked as TODO for later. Signed-off-by: Wayne Sun <gsun(a)redhat.com> --- cases/numa_param.conf | 51 +++++++++++++++++ repos/numa/numa_param_config.py | 119 +++++++++++++++++++++++++++++++++++++++ repos/numa/numa_param_live.py | 104 ++++++++++++++++++++++++++++++++++ 3 files changed, 274 insertions(+), 0 deletions(-) create mode 100644 cases/numa_param.conf create mode 100644 repos/numa/__init__.py create mode 100644 repos/numa/numa_param_config.py create mode 100644 repos/numa/numa_param_live.py diff --git a/cases/numa_param.conf b/cases/numa_param.conf new file mode 100644 index 0000000..64268a3 --- /dev/null +++ b/cases/numa_param.conf @@ -0,0 +1,51 @@ +domain:install_linux_cdrom + guestname + $defaultname + guestos + $defaultos + guestarch + $defaultarch + vcpu + 4 + memory + $defaultmem + hddriver + $defaulthd + nicdriver + $defaultnic + imageformat + qcow2 + +numa:numa_param_live + guestname + $defaultname + nodeset + 0 + mode + 0 + +domain:destroy + guestname + $defaultname + +numa:numa_param_config + guestname + $defaultname + nodeset + 0-1 + mode + 2 + +domain:start + guestname + $defaultname + +domain:destroy + guestname + $defaultname + +domain:undefine + guestname + $defaultname + +options cleanup=enable diff --git a/repos/numa/__init__.py b/repos/numa/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/repos/numa/numa_param_config.py b/repos/numa/numa_param_config.py new file mode 100644 index 0000000..52b21dd --- /dev/null +++ b/repos/numa/numa_param_config.py @@ -0,0 +1,119 @@ +#!/usr/bin/env python +# Test set domain numa parameters with flag +# VIR_DOMAIN_AFFECT_CONFIG and check + +from xml.dom import minidom + +import libvirt +from libvirt import libvirtError + +from src import sharedmod +from utils import utils + +required_params = ('guestname', 'nodeset', 'mode') +optional_params = {} + +def check_numa_params(domobj, mode, node_tuple): + """dump domain config xml description to check numa params + """ + guestxml = domobj.XMLDesc(2) + logger.debug("domain %s xml is :\n%s" %(domobj.name(), guestxml)) + xml = minidom.parseString(guestxml) + numatune = xml.getElementsByTagName('numatune')[0] + mem_element = numatune.getElementsByTagName('memory')[0] + + if mem_element.hasAttribute('mode') and \ + mem_element.hasAttribute('nodeset'): + attr = mem_element.getAttributeNode('mode') + mode_val = attr.nodeValue + logger.info("memory mode in config xml is: %s" % mode_val) + if mode_val == 'strict': + mode_num = 0 + elif mode_val == 'preferred': + mode_num = 1 + elif mode_val == 'interleave': + mode_num = 2 + else: + logger.error("mode value is invalid") + return 1 + + attr = mem_element.getAttributeNode('nodeset') + nodeset_val = attr.nodeValue + logger.info("nodeset in config xml is: %s" % nodeset_val) + else: + logger.error("no 'mode' and 'nodeset' atrribute for element memory") + return 1 + + ret = utils.param_to_tuple(nodeset_val, node_num) + logger.debug("nudeset in config xml to tuple is:") + logger.debug(ret) + if not ret: + logger.error("fail to parse nodeset to tuple") + return 1 + + if mode_num == mode and ret == node_tuple: + return 0 + else: + return 1 + +def numa_param_config(params): + """set domain numa parameters with config flag and check + """ + global logger + logger = params['logger'] + params.pop('logger') + guestname = params['guestname'] + nodeset = params['nodeset'] + mode = int(params['mode']) + + logger.info("the name of virtual machine is %s" % guestname) + logger.info("the given node number is: %s" % nodeset) + logger.info("the given mode is: %s" % mode) + + global node_num + cmd = "lscpu|grep 'NUMA node(s)'" + ret, output = utils.exec_cmd(cmd, shell=True) + node_num = int(output[0].split(' ')[-1]) + node_tuple = utils.param_to_tuple(nodeset, node_num) + logger.debug("nodeset to tuple is:") + logger.debug(node_tuple) + + param = {'numa_nodeset': nodeset, 'numa_mode': mode} + logger.info("numa param dict for set is: %s" % param) + + conn = sharedmod.libvirtobj['conn'] + + try: + domobj = conn.lookupByName(guestname) + logger.info("set domain numa parameters with flag: %s" % + libvirt.VIR_DOMAIN_AFFECT_CONFIG) + domobj.setNumaParameters(param, libvirt.VIR_DOMAIN_AFFECT_CONFIG) + logger.info("set domain numa parameters succeed") + + logger.info("check numa parameters") + ret = domobj.numaParameters(libvirt.VIR_DOMAIN_AFFECT_CONFIG) + logger.info("numa parameters after set is: %s" % ret) + + new_tuple = utils.param_to_tuple(ret['numa_nodeset'], node_num) + if not new_tuple: + logger.error("fail to parse nodeset to tuple") + return 1 + + if new_tuple == node_tuple and ret['numa_mode'] == mode: + logger.info("numa parameters is as expected") + else: + logger.error("numa parameters is not as expected") + return 1 + + except libvirtError, e: + logger.error("libvirt call failed: " + str(e)) + return 1 + + logger.info("check domain config xml of numa params") + ret = check_numa_params(domobj, mode, node_tuple) + if ret: + logger.error("numa params in domain config xml are not expected") + return 1 + else: + logger.info("numa params in domain config xml are expected") + return 0 diff --git a/repos/numa/numa_param_live.py b/repos/numa/numa_param_live.py new file mode 100644 index 0000000..8bec4f9 --- /dev/null +++ b/repos/numa/numa_param_live.py @@ -0,0 +1,104 @@ +#!/usr/bin/env python +# Test set domain numa parameters with flag VIR_DOMAIN_AFFECT_LIVE +# and check + +from xml.dom import minidom + +import libvirt +from libvirt import libvirtError + +from src import sharedmod +from utils import utils + +required_params = ('guestname', 'nodeset', 'mode') +optional_params = {} + +def check_numa_params(guestname, mode, node_tuple): + """dump domain live xml description to check numa params and + check memory allowed list of domain pid + """ + cmd = "cat /var/run/libvirt/qemu/%s.pid" % guestname + status, pid = utils.exec_cmd(cmd, shell=True) + if status: + logger.error("failed to get the pid of domain %s" % guestname) + return 1 + + cmd = "grep Mems_allowed_list /proc/%s/status" % pid[0] + status, output = utils.exec_cmd(cmd, shell=True) + nodeval = output[0].split('\t')[1] + ret = utils.param_to_tuple(nodeset_val, node_num) + logger.info("Mems_allowed_list in domain pid status is: %s" % nodeval) + logger.debug("parse nodeset to tuple is:") + logger.debug(ret) + if not ret: + logger.error("fail to parse nodeset to tuple") + return 1 + + # TODO: add check for mode + + if ret == node_tuple: + return 0 + else: + return 1 + +def numa_param_live(params): + """set domain numa parameters with live flag and check + """ + global logger + logger = params['logger'] + params.pop('logger') + guestname = params['guestname'] + nodeset = params['nodeset'] + mode = int(params['mode']) + + logger.info("the name of virtual machine is %s" % guestname) + logger.info("the given node number is: %s" % nodeset) + logger.info("the given mode is: %s" % mode) + + global node_num + cmd = "lscpu|grep 'NUMA node(s)'" + ret, output = utils.exec_cmd(cmd, shell=True) + node_num = int(output[0].split(' ')[-1]) + node_tuple = utils.param_to_tuple(nodeset, node_num) + logger.debug("nodeset to tuple is:") + logger.debug(node_tuple) + + param = {'numa_nodeset': nodeset, 'numa_mode': mode} + logger.info("numa param dict for set is: %s" % param) + + conn = sharedmod.libvirtobj['conn'] + + try: + domobj = conn.lookupByName(guestname) + logger.info("set domain numa parameters with flag: %s" % + libvirt.VIR_DOMAIN_AFFECT_LIVE) + domobj.setNumaParameters(param, libvirt.VIR_DOMAIN_AFFECT_LIVE) + logger.info("set domain numa parameters succeed") + + logger.info("check numa parameters") + ret = domobj.numaParameters(libvirt.VIR_DOMAIN_AFFECT_LIVE) + logger.info("numa parameters after set is: %s" % ret) + + new_tuple = utils.param_to_tuple(ret['numa_nodeset'], node_num) + if not new_tuple: + logger.error("fail to parse nodeset to tuple") + return 1 + + if new_tuple == node_tuple and ret['numa_mode'] == mode: + logger.info("numa parameters is as expected") + else: + logger.error("numa parameters is not as expected") + return 1 + + except libvirtError, e: + logger.error("libvirt call failed: " + str(e)) + return 1 + + logger.info("check whether numa params is working") + ret = check_numa_params(guestname, mode, node_tuple) + if ret: + logger.error("numa params working as expected") + return 1 + else: + logger.info("numa params working as expected") + return 0 -- 1.7.1

2 1

[libvirt] [PATCH v3 0/4]use newer video device by -device in qemu commandline
by Guannan Ren 17 Dec '12

17 Dec '12

v2: Check qemu version, it has to be qemu >= 1.2 for using new video device with -device qemu option v3: Add a new caps bit QEMU_CAPS_1DOT20_PLUS to mark qemu >= 1.2 Add a new testcase for improved qemu commandline Fixed all placed pointed out in v2 This patch set aims to use qemu VGA device with -device option to replace -vga option. The mapping is as follows. '-device VGA' maps to '-vga std' '-device cirrus-vga' maps to '-vga cirrus' '-device qxl-vga' maps to '-vga qxl' (there is also '-device qxl' for secondary devices) '-device vmware-svga' maps to '-vga vmware' Through this change, guests will be able to use any available PCI slot number rather than fixed 0x2 slot for primary video device. Guannan Ren(4) [PATCH v3 1/4] qemu: add qemu vga devices caps and one cap to mark them [PATCH v3 2/4] conf: add optional attribte primary to video <model> [PATCH v3 3/4] qemu: use newer -device video device in qemu commandline [PATCH v3 4/4] tests: add one -device video device testcase docs/formatdomain.html.in | 6 ++++- docs/schemas/domaincommon.rng | 8 ++++++ src/conf/domain_conf.c | 27 ++++++++++++++++++++- src/conf/domain_conf.h | 1 + src/qemu/qemu_capabilities.c | 14 ++++++++++- src/qemu/qemu_capabilities.h | 5 ++++ src/qemu/qemu_command.c | 178 ++++++++++++++++++++++++++++++++++++.. src/qemu/qemu_command.h | 4 ++- tests/qemuhelptest.c | 50 +++++++++++++++++++++++++++++++------- tests/qemuxml2argvdata/qemuxml2argv-video-device-pciaddr-default.args | 9 +++++++ tests/qemuxml2argvdata/qemuxml2argv-video-device-pciaddr-default.xml | 44 +++++++++++++++++++++++++++++++++ tests/qemuxml2argvtest.c | 14 ++++++++--- 12 files changed, 293 insertions(+), 67 deletions(-)

2 14

[libvirt] [PATCH] Support custom 'svirt_tcg_t' context for TCG based guests
by Daniel P. Berrange 16 Dec '12

16 Dec '12

From: "Daniel P. Berrange" <berrange(a)redhat.com> The current SELinux policy only works for KVM guests, since TCG requires the 'execmem' privilege. There is a 'virt_use_execmem' boolean to turn this on globally, but that is unpleasant for users. This changes libvirt to automatically use a new 'svirt_tcg_t' context for TCG based guests. This obsoletes the previous boolean tunable and makes things 'just work(tm)' Since we can't assume we run with new enough policy, I also make us log a warning message (once only) if we find the policy lacks support. In this case we fallback to the normal label and expect users to set the boolean tunable Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- src/security/security_selinux.c | 48 +++++++++++++++++++++++++++++++++++++---- 1 file changed, 44 insertions(+), 4 deletions(-) diff --git a/src/security/security_selinux.c b/src/security/security_selinux.c index 5409e32..82cbc80 100644 --- a/src/security/security_selinux.c +++ b/src/security/security_selinux.c @@ -58,6 +58,7 @@ typedef virSecuritySELinuxCallbackData *virSecuritySELinuxCallbackDataPtr; struct _virSecuritySELinuxData { char *domain_context; + char *alt_domain_context; char *file_context; char *content_context; virHashTablePtr mcs; @@ -446,8 +447,23 @@ virSecuritySELinuxQEMUInitialize(virSecurityManagerPtr mgr) } ptr = strchrnul(data->domain_context, '\n'); - if (ptr) + if (ptr && *ptr == '\n') { *ptr = '\0'; + ptr++; + if (*ptr != '\0') { + data->alt_domain_context = strdup(ptr); + if (!data->alt_domain_context) { + virReportOOMError(); + goto error; + } + ptr = strchrnul(data->alt_domain_context, '\n'); + if (ptr && *ptr == '\n') + *ptr = '\0'; + } + } + VIR_DEBUG("Loaded domain context '%s', alt domain context '%s'", + data->domain_context, NULLSTR(data->alt_domain_context)); + if (virFileReadAll(selinux_virtual_image_context_path(), 2*MAX_CONTEXT, &(data->file_context)) < 0) { virReportSystemError(errno, @@ -469,6 +485,9 @@ virSecuritySELinuxQEMUInitialize(virSecurityManagerPtr mgr) *ptr = '\0'; } + VIR_DEBUG("Loaded file context '%s', content context '%s'", + data->file_context, data->content_context); + if (!(data->mcs = virHashCreate(10, NULL))) goto error; @@ -476,6 +495,7 @@ virSecuritySELinuxQEMUInitialize(virSecurityManagerPtr mgr) error: VIR_FREE(data->domain_context); + VIR_FREE(data->alt_domain_context); VIR_FREE(data->file_context); VIR_FREE(data->content_context); virHashFree(data->mcs); @@ -506,6 +526,7 @@ virSecuritySELinuxGenSecurityLabel(virSecurityManagerPtr mgr, const char *range; virSecurityLabelDefPtr seclabel; virSecuritySELinuxDataPtr data; + const char *baselabel; if (mgr == NULL) { virReportError(VIR_ERR_INTERNAL_ERROR, @@ -568,10 +589,28 @@ virSecuritySELinuxGenSecurityLabel(virSecurityManagerPtr mgr, if (virSecuritySELinuxMCSAdd(mgr, mcs) < 0) goto cleanup; + baselabel = seclabel->baselabel; + if (!baselabel) { + if (def->virtType == VIR_DOMAIN_VIRT_QEMU) { + if (data->alt_domain_context == NULL) { + static bool warned = false; + if (!warned) { + VIR_WARN("SELinux policy does not define a domain type for QEMU TCG. " + "Guest startup may be denied due to missing 'execmem' privilege " + "unless the 'virt_use_execmem' policy boolean is enabled"); + warned = true; + } + baselabel = data->domain_context; + } else { + baselabel = data->alt_domain_context; + } + } else { + baselabel = data->domain_context; + } + } + seclabel->label = - virSecuritySELinuxGenNewContext(seclabel->baselabel ? - seclabel->baselabel : - data->domain_context, mcs, false); + virSecuritySELinuxGenNewContext(baselabel, mcs, false); if (!seclabel->label) { virReportError(VIR_ERR_INTERNAL_ERROR, _("cannot generate selinux context for %s"), mcs); @@ -722,6 +761,7 @@ virSecuritySELinuxSecurityDriverClose(virSecurityManagerPtr mgr) virHashFree(data->mcs); VIR_FREE(data->domain_context); + VIR_FREE(data->alt_domain_context); VIR_FREE(data->file_context); VIR_FREE(data->content_context); -- 1.7.11.7

2 1

[libvirt] [PATCH] build: minor build fixes for BSD
by Eric Blake 16 Dec '12

16 Dec '12

Noticed these while building on FreeBSD. * src/qemu/qemu_monitor.c (qemuMonitorBlockInfoLookup): Rename variable to avoid 'devname' collision. * src/qemu/qemu_driver.c (qemuDomainInterfaceStats): Mark unused variable. --- Pushing under the build-breaker rule. src/qemu/qemu_driver.c | 2 +- src/qemu/qemu_monitor.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 6f0849c..2dd6922 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -8898,7 +8898,7 @@ cleanup: } #else static int -qemuDomainInterfaceStats(virDomainPtr dom, +qemuDomainInterfaceStats(virDomainPtr dom ATTRIBUTE_UNUSED, const char *path ATTRIBUTE_UNUSED, struct _virDomainInterfaceStats *stats ATTRIBUTE_UNUSED) { diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c index 5ad6c15..131e8df 100644 --- a/src/qemu/qemu_monitor.c +++ b/src/qemu/qemu_monitor.c @@ -1428,16 +1428,16 @@ qemuMonitorGetBlockInfo(qemuMonitorPtr mon) struct qemuDomainDiskInfo * qemuMonitorBlockInfoLookup(virHashTablePtr blockInfo, - const char *devname) + const char *dev) { struct qemuDomainDiskInfo *info; - VIR_DEBUG("blockInfo=%p dev=%s", blockInfo, NULLSTR(devname)); + VIR_DEBUG("blockInfo=%p dev=%s", blockInfo, NULLSTR(dev)); - if (!(info = virHashLookup(blockInfo, devname))) { + if (!(info = virHashLookup(blockInfo, dev))) { virReportError(VIR_ERR_INTERNAL_ERROR, _("cannot find info for device '%s'"), - NULLSTR(devname)); + NULLSTR(dev)); } return info; -- 1.8.0.2

2 1

[libvirt] Some help in Starting up
by Arslan Waqar 16 Dec '12

16 Dec '12

Hi everyone! I hope you bear with me, and I would be grateful for that, as I am very new to all this... I want to develop for libvirt and want to specifically work on it for the VirtualBox domain. The problem is I have no idea how to set up my development environment... I have a ubuntu 64 bit machine with me, with The latest Virtual box installed (from the official site), and git already installed. Now what am I suposed to do? get libvirt code from the git repository? if that is so then what would be the next step? -- Regards, Arslan Waqar.

2 1

[libvirt] [PATCH] If driver startup fails, dispatch virErrors
by Cole Robinson 15 Dec '12

15 Dec '12

API users won't have any way to interact with the errors since this is before a connection pointer is available, but the default error handler at calls VIR_ERROR which gives us a better chance of seeing the issue. --- src/libvirt.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/libvirt.c b/src/libvirt.c index 6a7a817..5f8b087 100644 --- a/src/libvirt.c +++ b/src/libvirt.c @@ -813,6 +813,7 @@ int virStateInitialize(bool privileged, if (virStateDriverTab[i]->initialize(privileged, callback, opaque) < 0) { + virDispatchError(NULL); VIR_ERROR(_("Initialization of %s state driver failed"), virStateDriverTab[i]->name); return -1; -- 1.8.0.1

2 3

[libvirt] Entering freeze for libvirt-1.0.1
by Daniel Veillard 14 Dec '12

14 Dec '12

As planned I have just tagged the tree and pushed a release candidate 1 tarball and assorted rpms to ftp://libvirt.org/libvirt/ If everything goes well, I will push an rc2 on Friday incorporating the various fixes found in the meantime and plan to push the final release early Monday 17. Give it a try, report problems you may hit, thanks ! 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/

3 5

[libvirt] [PATCH] network: fix (non)update of dnsmasq config during virDomainUpdateDeviceFlags
by Laine Stump 14 Dec '12

14 Dec '12

A forgotten "!" in recently-modified code at the top of networkRefreshDaemon() meant an improper early return, which led to 1) dnsmasq config files not being updated from the newly modified config, and 2) dnsmasq not being sent a SIGHUP so that it could learn about the changes to the config. virNetworkDefGetIpByIndex() returns NULL if there are no ip objects of the requested type, and if there are no IP elements, then dnsmasq shouldn't be running, so we can return early. Otherwise we should rewrite the config files and send a SIGHUP. --- src/network/bridge_driver.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c index a32755d..c62e729 100644 --- a/src/network/bridge_driver.c +++ b/src/network/bridge_driver.c @@ -1123,7 +1123,7 @@ networkRefreshDhcpDaemon(struct network_driver *driver, dnsmasqContext *dctx = NULL; /* if no IP addresses specified, nothing to do */ - if (virNetworkDefGetIpByIndex(network->def, AF_UNSPEC, 0)) + if (!virNetworkDefGetIpByIndex(network->def, AF_UNSPEC, 0)) return 0; /* if there's no running dnsmasq, just start it */ -- 1.7.11.7

2 2

[libvirt] [PATCH 0/2] qemu driver FreeBSD support: fix compilation, second round
by Roman Bogorodskiy 14 Dec '12

14 Dec '12

Second version of the patch which addresses issues pointed out by the reviewers. Roman Bogorodskiy (2): Drop mntent.h include. Qemu FreeBSD: fix compilation configure.ac | 42 ++++++++++++++++++++++++++++++------------ src/qemu/qemu_conf.c | 1 - src/qemu/qemu_process.c | 12 +++++++++++- src/util/virinitctl.c | 9 +++++++++ 4 files changed, 50 insertions(+), 14 deletions(-) -- 1.7.11.5

3 6

[libvirt] [PATCH] Define SANLK_INQ_WAIT if missing in headers
by Guido Günther 14 Dec '12

14 Dec '12

so we can build with older sanlock (like 2.2) --- I've applied this to the current Debian builds since we're lagging a bit regarding sanlock but it might make sense to also support this upstream. Cheers, -- Guido src/locking/lock_driver_sanlock.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/locking/lock_driver_sanlock.c b/src/locking/lock_driver_sanlock.c index 430e11e..84f81ec 100644 --- a/src/locking/lock_driver_sanlock.c +++ b/src/locking/lock_driver_sanlock.c @@ -338,6 +338,9 @@ retry: if ((rv = sanlock_add_lockspace(&ls, 0)) < 0) { if (-rv == EINPROGRESS) { #ifdef HAVE_SANLOCK_INQ_LOCKSPACE +# ifndef SANLK_INQ_WAIT +# define SANLK_INQ_WAIT 0x00000001 +# endif /* we have this function which blocks until lockspace change the * state. It returns 0 if lockspace has been added, -ENOENT if it * hasn't. XXX should we goto retry? */ -- 1.7.10.4

3 4

[libvirt] [PATCH] qemu: Don't increment jobs counter before DomainObj ref count is incremented
by Michal Privoznik 14 Dec '12

14 Dec '12

Currently, if domain is being destroyed, it's private data can be freed. If there's however another thread waiting to start a job, it may lead to a NULL dereference and SIGSEGV. Check if reference counter on domain object was successfully incremented. Reported-By: Scott Sullivan <ssullivan(a)liquidweb.com> --- Reported here: https://www.redhat.com/archives/libvir-list/2012-December/msg00931.html src/qemu/qemu_domain.c | 11 +++++++---- 1 files changed, 7 insertions(+), 4 deletions(-) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 8d8cf02..5cc5bf7 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -764,18 +764,21 @@ qemuDomainObjBeginJobInternal(virQEMUDriverPtr driver, enum qemuDomainJob job, enum qemuDomainAsyncJob asyncJob) { - qemuDomainObjPrivatePtr priv = obj->privateData; + qemuDomainObjPrivatePtr priv; unsigned long long now; unsigned long long then; bool nested = job == QEMU_JOB_ASYNC_NESTED; - priv->jobs_queued++; - if (virTimeMillisNow(&now) < 0) return -1; then = now + QEMU_JOB_WAIT_TIME; - virObjectRef(obj); + if (!virObjectRef(obj)) + return -1; + + priv = obj->privateData; + priv->jobs_queued++; + if (driver_locked) qemuDriverUnlock(driver); -- 1.7.8.6

2 1

[libvirt] libvirtd crash upon virsh destroy
by Scott Sullivan 14 Dec '12

14 Dec '12

Running libvirt v1.0.0, with f0e72b2f5c675f927d04545dc5095f9e5998f171 applied. The problem (which I cannot reproduce reliably), is that libvirtd crashes sometimes on a destroy (sequence of events and crash log below). I was wondering if anyone had any insights as to the cause of this crash, or even if any commits after v1.0.0 might address this. If I can provide anymore information to help debug this I would be happy to try and provide it. At the time of this crash, the instance being destroyed did not have any RBD attachments, it was just running off its local LVM. Sequence of events: 1.) virsh destroy ID End of file while reading data: Input/output error ; error: Failed to reconnect to the hypervisor (libvirtd at this point has crashed) 2.) Resulting crash entry from /var/log/libvirt/libvirtd.log: 2012-11-26 17:37:13.239+0000: 10314: error : qemuMonitorIO:614 : internal error End of file from monitor 2012-11-27 16:48:56.195+0000: 10314: error : qemuMonitorIO:614 : internal error End of file from monitor Caught Segmentation violation dumping internal log buffer: ====== start of log ===== ^@patchTimeouts:410 : Dispatch 2 2012-11-27 16:48:56.078+000010314: debug : virEventPollDispatchHandles:455 : Dispatch 10 2012-11-27 16:48:56.078+000010314: debug : virEventPollDispatchHandles:469 : i=0 w=1 2012-11-27 16:48:56.078+000010314: debug : virEventPollDispatchHandles:483 : EVENT_POLL_DISPATCH_HANDLE: watch=1 events=1 2012-11-27 16:48:56.078+000010314: debug : virEventPollDispatchHandles:469 : i=1 w=2 2012-11-27 16:48:56.078+000010314: debug : virEventPollDispatchHandles:469 : i=2 w=3 2012-11-27 16:48:56.078+000010314: debug : virEventPollDispatchHandles:469 : i=3 w=4 2012-11-27 16:48:56.078+000010314: debug : virEventPollDispatchHandles:469 : i=4 w=5 2012-11-27 16:48:56.078+000010314: debug : virEventPollDispatchHandles:469 : i=5 w=6 2012-11-27 16:48:56.078+000010314: debug : virEventPollDispatchHandles:469 : i=6 w=7 2012-11-27 16:48:56.078+000010314: debug : virEventPollDispatchHandles:469 : i=7 w=8 2012-11-27 16:48:56.078+000010314: debug : virEventPollDispatchHandles:469 : i=8 w=42213 2012-11-27 16:48:56.078+000010314: debug : virEventPollDispatchHandles:469 : i=9 w=50563 2012-11-27 16:48:56.078+000010314: debug : virEventPollCleanupTimeouts:501 : Cleanup 2 2012-11-27 16:48:56.078+000010314: debug : virEventPollCleanupHandles:549 : Cleanup 10 2012-11-27 16:48:56.078+000010314: debug : virEventRunDefaultImpl:244 : running default event implementation 2012-11-27 16:48:56.078+000010314: debug : virEventPollCleanupTimeouts:501 : Cleanup 2 2012-11-27 16:48:56.078+000010314: debug : virEventPollCleanupHandles:549 : Cleanup 10 2012-11-27 16:48:56.078+000010314: debug : virEventPollMakePollFDs:378 : Prepare n=0 w=1, f=7 e=1 d=0 2012-11-27 16:48:56.078+000010314: debug : virEventPollMakePollFDs:378 : Prepare n=1 w=2, f=9 e=1 d=0 2012-11-27 16:48:56.078+000010314: debug : virEventPollMakePollFDs:378 : Prepare n=2 w=3, f=12 e=1 d=0 2012-11-27 16:48:56.078+000010314: debug : virEventPollMakePollFDs:378 : Prepare n=3 w=4, f=13 e=1 d=0 2012-11-27 16:48:56.078+000010314: debug : virEventPollMakePollFDs:378 : Prepare n=4 w=5, f=6 e=1 d=0 2012-11-27 16:48:56.078+000010314: debug : virEventPollMakePollFDs:378 : Prepare n=5 w=6, f=14 e=1 d=0 2012-11-27 16:48:56.078+000010314: debug : virEventPollMakePollFDs:378 : Prepare n=6 w=7, f=16 e=1 d=0 2012-11-27 16:48:56.078+000010314: debug : virEventPollMakePollFDs:378 : Prepare n=7 w=8, f=20 e=25 d=0 2012-11-27 16:48:56.078+000010314: debug : virEventPollMakePollFDs:378 : Prepare n=8 w=42213, f=24 e=25 d=0 2012-11-27 16:48:56.078+000010314: debug : virEventPollMakePollFDs:378 : Prepare n=9 w=50563, f=18 e=5 d=0 2012-11-27 16:48:56.078+000010314: debug : virEventPollCalculateTimeout:320 : Calculate expiry of 2 timers 2012-11-27 16:48:56.078+000010314: debug : virEventPollCalculateTimeout:326 : Got a timeout scheduled for 1354034941072 2012-11-27 16:48:56.078+000010314: debug : virEventPollCalculateTimeout:346 : Timeout at 1354034941072 due in 4994 ms 2012-11-27 16:48:56.078+000010314: debug : virEventPollRunOnce:614 : EVENT_POLL_RUN: nhandles=10 timeout=4994 2012-11-27 16:48:56.078+000010314: debug : virEventPollRunOnce:625 : Poll got 1 event(s) 2012-11-27 16:48:56.078+000010314: debug : virEventPollDispatchTimeouts:410 : Dispatch 2 2012-11-27 16:48:56.078+000010314: debug : virEventPollDispatchHandles:455 : Dispatch 10 2012-11-27 16:48:56.078+000010314: debug : virEventPollDispatchHandles:469 : i=0 w=1 2012-11-27 16:48:56.078+000010314: debug : virEventPollDispatchHandles:469 : i=1 w=2 2012-11-27 16:48:56.078+000010314: debug : virEventPollDispatchHandles:469 : i=2 w=3 2012-11-27 16:48:56.078+000010314: debug : virEventPollDispatchHandles:469 : i=3 w=4 2012-11-27 16:48:56.078+000010314: debug : virEventPollDispatchHandles:469 : i=4 w=5 2012-11-27 16:48:56.078+000010314: debug : virEventPollDispatchHandles:469 : i=5 w=6 2012-11-27 16:48:56.078+000010314: debug : virEventPollDispatchHandles:469 : i=6 w=7 2012-11-27 16:48:56.078+000010314: debug : virEventPollDispatchHandles:469 : i=7 w=8 2012-11-27 16:48:56.078+000010314: debug : virEventPollDispatchHandles:469 : i=8 w=42213 2012-11-27 16:48:56.078+000010314: debug : virEventPollDispatchHandles:469 : i=9 w=50563 2012-11-27 16:48:56.078+000010314: debug : virEventPollDispatchHandles:483 : EVENT_POLL_DISPATCH_HANDLE: watch=50563 events=2 2012-11-27 16:48:56.078+000010314: debug : virNetMessageFree:73 : msg=0x888520 nfds=0 cb=(nil) 2012-11-27 16:48:56.078+000010314: debug : virNetServerClientCalculateHandleMode:153 : tls=(nil) hs=-1, rx=0x88cd10 tx=(nil) 2012-11-27 16:48:56.078+000010314: debug : virNetServerClientCalculateHandleMode:184 : mode=1 2012-11-27 16:48:56.078+000010314: debug : virEventPollUpdateHandle:146 : EVENT_POLL_UPDATE_HANDLE: watch=50563 events=1 2012-11-27 16:48:56.078+000010314: debug : virEventPollInterruptLocked:697 : Skip interrupt, 1 904570880 2012-11-27 16:48:56.078+000010314: debug : virEventPollCleanupTimeouts:501 : Cleanup 2 2012-11-27 16:48:56.078+000010314: debug : virEventPollCleanupHandles:549 : Cleanup 10 2012-11-27 16:48:56.078+000010314: debug : virEventRunDefaultImpl:244 : running default event implementation 2012-11-27 16:48:56.078+000010314: debug : virEventPollCleanupTimeouts:501 : Cleanup 2 2012-11-27 16:48:56.078+000010314: debug : virEventPollCleanupHandles:549 : Cleanup 10 2012-11-27 16:48:56.078+000010314: debug : virEventPollMakePollFDs:378 : Prepare n=0 w=1, f=7 e=1 d=0 2012-11-27 16:48:56.078+000010314: debug : virEventPollMakePollFDs:378 : Prepare n=1 w=2, f=9 e=1 d=0 2012-11-27 16:48:56.078+000010314: debug : virEventPollMakePollFDs:378 : Prepare n=2 w=3, f=12 e=1 d=0 2012-11-27 16:48:56.078+000010314: debug : virEventPollMakePollFDs:378 : Prepare n=3 w=4, f=13 e=1 d=0 2012-11-27 16:48:56.078+000010314: debug : virEventPollMakePollFDs:378 : Prepare n=4 w=5, f=6 e=1 d=0 2012-11-27 16:48:56.078+000010314: debug : virEventPollMakePollFDs:378 : Prepare n=5 w=6, f=14 e=1 d=0 2012-11-27 16:48:56.078+000010314: debug : virEventPollMakePollFDs:378 : Prepare n=6 w=7, f=16 e=1 d=0 2012-11-27 16:48:56.078+000010314: debug : virEventPollMakePollFDs:378 : Prepare n=7 w=8, f=20 e=25 d=0 2012-11-27 16:48:56.078+000010314: debug : virEventPollMakePollFDs:378 : Prepare n=8 w=42213, f=24 e=25 d=0 2012-11-27 16:48:56.078+000010314: debug : virEventPollMakePollFDs:378 : Prepare n=9 w=50563, f=18 e=1 d=0 2012-11-27 16:48:56.078+000010314: debug : virEventPollCalculateTimeout:320 : Calculate expiry of 2 timers 2012-11-27 16:48:56.078+000010314: debug : virEventPollCalculateTimeout:326 : Got a timeout scheduled for 1354034941072 2012-11-27 16:48:56.078+000010314: debug : virEventPollCalculateTimeout:346 : Timeout at 1354034941072 due in 4994 ms 2012-11-27 16:48:56.078+000010314: debug : virEventPollRunOnce:614 : EVENT_POLL_RUN: nhandles=10 timeout=4994 2012-11-27 16:48:56.078+000010314: debug : virEventPollRunOnce:625 : Poll got 1 event(s) 2012-11-27 16:48:56.078+000010314: debug : virEventPollDispatchTimeouts:410 : Dispatch 2 2012-11-27 16:48:56.078+000010314: debug : virEventPollDispatchHandles:455 : Dispatch 10 2012-11-27 16:48:56.078+000010314: debug : virEventPollDispatchHandles:469 : i=0 w=1 2012-11-27 16:48:56.078+000010314: debug : virEventPollDispatchHandles:469 : i=1 w=2 2012-11-27 16:48:56.078+000010314: debug : virEventPollDispatchHandles:469 : i=2 w=3 2012-11-27 16:48:56.078+000010314: debug : virEventPollDispatchHandles:469 : i=3 w=4 2012-11-27 16:48:56.078+000010314: debug : virEventPollDispatchHandles:469 : i=4 w=5 2012-11-27 16:48:56.078+000010314: debug : virEventPollDispatchHandles:469 : i=5 w=6 2012-11-27 16:48:56.078+000010314: debug : virEventPollDispatchHandles:469 : i=6 w=7 2012-11-27 16:48:56.078+000010314: debug : virEventPollDispatchHandles:469 : i=7 w=8 2012-11-27 16:48:56.078+000010314: debug : virEventPollDispatchHandles:469 : i=8 w=42213 2012-11-27 16:48:56.078+000010314: debug : virEventPollDispatchHandles:469 : i=9 w=50563 2012-11-27 16:48:56.078+000010314: debug : virEventPollDispatchHandles:483 : EVENT_POLL_DISPATCH_HANDLE: watch=50563 events=1 2012-11-27 16:48:56.078+000010314: debug : virNetMessageDecodeLength:152 : Got length, now need 28 total (24 more) 2012-11-27 16:48:56.078+000010314: debug : virNetServerClientCalculateHandleMode:153 : tls=(nil) hs=-1, rx=0x88cd10 tx=(nil) 2012-11-27 16:48:56.078+000010314: debug : virNetServerClientCalculateHandleMode:184 : mode=1 2012-11-27 16:48:56.078+000010314: debug : virEventPollUpdateHandle:146 : EVENT_POLL_UPDATE_HANDLE: watch=50563 events=1 2012-11-27 16:48:56.078+000010314: debug : virEventPollInterruptLocked:697 : Skip interrupt, 1 904570880 2012-11-27 16:48:56.078+000010314: debug : virNetServerClientDispatchRead:1007 : RPC_SERVER_CLIENT_MSG_RX: client=0x88d980 len=28 prog=536903814 vers=1 proc=110 type=0 status=0 serial=3 2012-11-27 16:48:56.078+000010314: debug : virKeepAliveCheckMessage:384 : ka=0x887c00, client=0x88d980, msg=0x88cd10 2012-11-27 16:48:56.078+000010314: debug : virEventPollUpdateTimeout:254 : EVENT_POLL_UPDATE_TIMEOUT: timer=101086 frequency=5000 2012-11-27 16:48:56.078+000010314: debug : virEventPollInterruptLocked:697 : Skip interrupt, 1 904570880 2012-11-27 16:48:56.078+000010314: debug : virObjectRef:168 : OBJECT_REF: obj=0x88d980 2012-11-27 16:48:56.078+000010314: debug : virNetServerDispatchNewMessage:219 : server=0x879d80 client=0x88d980 message=0x88cd10 2012-11-27 16:48:56.078+000010314: debug : virObjectRef:168 : OBJECT_REF: obj=0x882540 2012-11-27 16:48:56.078+000010314: debug : virNetMessageNew:45 : msg=0x87af70 tracked=1 2012-11-27 16:48:56.078+000010314: debug : virNetServerClientCalculateHandleMode:153 : tls=(nil) hs=-1, rx=0x87af70 tx=(nil) 2012-11-27 16:48:56.078+000010314: debug : virNetServerClientCalculateHandleMode:184 : mode=1 2012-11-27 16:48:56.078+000010318: debug : virNetServerHandleJob:190 : server=0x879d80 client=0x88d980 message=0x88cd10 prog=0x882540 2012-11-27 16:48:56.078+000010314: debug : virEventPollUpdateHandle:146 : EVENT_POLL_UPDATE_HANDLE: watch=50563 events=1 2012-11-27 16:48:56.078+000010314: debug : virEventPollInterruptLocked:697 : Skip interrupt, 1 904570880 2012-11-27 16:48:56.078+000010318: debug : virNetServerProgramDispatch:284 : prog=536903814 ver=1 type=0 status=0 serial=3 proc=110 2012-11-27 16:48:56.078+000010314: debug : virEventPollCleanupTimeouts:501 : Cleanup 2 2012-11-27 16:48:56.078+000010314: debug : virEventPollCleanupHandles:549 : Cleanup 10 2012-11-27 16:48:56.078+000010318: debug : remoteDispatchGetURIHelper:7297 : server=0x879d80 client=0x88d980 msg=0x88cd10 rerr=0x7f642e214be0 args=0x7f6400000cf0 ret=0x7f6400000c80 2012-11-27 16:48:56.078+000010314: debug : virEventRunDefaultImpl:244 : running default event implementation 2012-11-27 16:48:56.078+000010314: debug : virEventPollCleanupTimeouts:501 : Cleanup 2 2012-11-27 16:48:56.078+000010318: debug : virConnectGetURI:1711 : conn=0x7f641c0728f0 2012-11-27 16:48:56.078+000010314: debug : virEventPollCleanupHandles:549 : Cleanup 10 2012-11-27 16:48:56.078+000010318: debug : virNetMessageEncodePayload:358 : Encode length as 48 2012-11-27 16:48:56.078+000010314: debug : virEventPollMakePollFDs:378 : Prepare n=0 w=1, f=7 e=1 d=0 2012-11-27 16:48:56.078+000010314: debug : virEventPollMakePollFDs:378 : Prepare n=1 w=2, f=9 e=1 d=0 2012-11-27 16:48:56.078+000010318: debug : virNetServerClientSendMessageLocked:1251 : msg=0x88cd10 proc=110 len=48 offset=0 2012-11-27 16:48:56.078+000010314: debug : virEventPollMakePollFDs:378 : Prepare n=2 w=3, f=12 e=1 d=0 2012-11-27 16:48:56.078+000010318: debug : virNetServerClientSendMessageLocked:1259 : RPC_SERVER_CLIENT_MSG_TX_QUEUE: client=0x88d980 len=48 prog=536903814 vers=1 proc=110 type=1 status=0 serial=3 2012-11-27 16:48:56.078+000010314: debug : virEventPollMakePollFDs:378 : Prepare n=3 w=4, f=13 e=1 d=0 2012-11-27 16:48:56.078+000010318: debug : virNetServerClientCalculateHandleMode:153 : tls=(nil) hs=-1, rx=0x87af70 tx=0x88cd10 2012-11-27 16:48:56.078+000010314: debug : virEventPollMakePollFDs:378 : Prepare n=4 w=5, f=6 e=1 d=0 2012-11-27 16:48:56.078+000010318: debug : virNetServerClientCalculateHandleMode:184 : mode=3 2012-11-27 16:48:56.078+000010314: debug : virEventPollMakePollFDs:378 : Prepare n=5 w=6, f=14 e=1 d=0 2012-11-27 16:48:56.078+000010314: debug : virEventPollMakePollFDs:378 : Prepare n=6 w=7, f=16 e=1 d=0 2012-11-27 16:48:56.078+000010318: debug : virEventPollUpdateHandle:146 : EVENT_POLL_UPDATE_HANDLE: watch=50563 events=3 2012-11-27 16:48:56.078+000010314: debug : virEventPollMakePollFDs:378 : Prepare n=7 w=8, f=20 e=25 d=0 2012-11-27 16:48:56.078+000010314: debug : virEventPollMakePollFDs:378 : Prepare n=8 w=42213, f=24 e=25 d=0 2012-11-27 16:48:56.078+000010314: debug : virEventPollMakePollFDs:378 : Prepare n=9 w=50563, f=18 e=1 d=0 2012-11-27 16:48:56.078+000010314: debug : virEventPollCalculateTimeout:320 : Calculate expiry of 2 timers 2012-11-27 16:48:56.078+000010314: debug : virEventPollCalculateTimeout:326 : Got a timeout scheduled for 1354034941078 2012-11-27 16:48:56.078+000010314: debug : virEventPollCalculateTimeout:346 : Timeout at 1354034941078 due in 5000 ms 2012-11-27 16:48:56.078+000010314: debug : virEventPollRunOnce:614 : EVENT_POLL_RUN: nhandles=10 timeout=5000 2012-11-27 16:48:56.078+000010318: debug : virEventPollInterruptLocked:701 : Interrupting 2012-11-27 16:48:56.078+000010318: debug : virObjectUnref:135 : OBJECT_UNREF: obj=0x882540 2012-11-27 16:48:56.078+000010318: debug : virObjectUnref:135 : OBJECT_UNREF: obj=0x88d980 2012-11-27 16:48:56.078+000010314: debug : virEventPollRunOnce:625 : Poll got 1 event(s) 2012-11-27 16:48:56.078+000010314: debug : virEventPollDispatchTimeouts:410 : Dispatch 2 2012-11-27 16:48:56.078+000010314: debug : virEventPollDispatchHandles:455 : Dispatch 10 2012-11-27 16:48:56.078+000010314: debug : virEventPollDispatchHandles:469 : i=0 w=1 2012-11-27 16:48:56.078+000010314: debug : virEventPollDispatchHandles:483 : EVENT_POLL_DISPATCH_HANDLE: watch=1 events=1 2012-11-27 16:48:56.078+000010314: debug : virEventPollDispatchHandles:469 : i=1 w=2 2012-11-27 16:48:56.078+000010314: debug : virEventPollDispatchHandles:469 : i=2 w=3 2012-11-27 16:48:56.078+000010314: debug : virEventPollDispatchHandles:469 : i=3 w=4 2012-11-27 16:48:56.078+000010314: debug : virEventPollDispatchHandles:469 : i=4 w=5 2012-11-27 16:48:56.078+000010314: debug : virEventPollDispatchHandles:469 : i=5 w=6 2012-11-27 16:48:56.078+000010314: debug : virEventPollDispatchHandles:469 : i=6 w=7 2012-11-27 16:48:56.078+000010314: debug : virEventPollDispatchHandles:469 : i=7 w=8 2012-11-27 16:48:56.078+000010314: debug : virEventPollDispatchHandles:469 : i=8 w=42213 2012-11-27 16:48:56.078+000010314: debug : virEventPollDispatchHandles:469 : i=9 w=50563 2012-11-27 16:48:56.078+000010314: debug : virEventPollCleanupTimeouts:501 : Cleanup 2 2012-11-27 16:48:56.078+000010314: debug : virEventPollCleanupHandles:549 : Cleanup 10 2012-11-27 16:48:56.078+000010314: debug : virEventRunDefaultImpl:244 : running default event implementation 2012-11-27 16:48:56.078+000010314: debug : virEventPollCleanupTimeouts:501 : Cleanup 2 2012-11-27 16:48:56.078+000010314: debug : virEventPollCleanupHandles:549 : Cleanup 10 2012-11-27 16:48:56.078+000010314: debug : virEventPollMakePollFDs:378 : Prepare n=0 w=1, f=7 e=1 d=0 2012-11-27 16:48:56.078+000010314: debug : virEventPollMakePollFDs:378 : Prepare n=1 w=2, f=9 e=1 d=0 2012-11-27 16:48:56.078+000010314: debug : virEventPollMakePollFDs:378 : Prepare n=2 w=3, f=12 e=1 d=0 2012-11-27 16:48:56.078+000010314: debug : virEventPollMakePollFDs:378 : Prepare n=3 w=4, f=13 e=1 d=0 2012-11-27 16:48:56.078+000010314: debug : virEventPollMakePollFDs:378 : Prepare n=4 w=5, f=6 e=1 d=0 2012-11-27 16:48:56.078+000010314: debug : virEventPollMakePollFDs:378 : Prepare n=5 w=6, f=14 e=1 d=0 2012-11-27 16:48:56.078+000010314: debug : virEventPollMakePollFDs:378 : Prepare n=6 w=7, f=16 e=1 d=0 2012-11-27 16:48:56.078+000010314: debug : virEventPollMakePollFDs:378 : Prepare n=7 w=8, f=20 e=25 d=0 2012-11-27 16:48:56.078+000010314: debug : virEventPollMakePollFDs:378 : Prepare n=8 w=42213, f=24 e=25 d=0 2012-11-27 16:48:56.078+000010314: debug : virEventPollMakePollFDs:378 : Prepare n=9 w=50563, f=18 e=5 d=0 2012-11-27 16:48:56.078+000010314: debug : virEventPollCalculateTimeout:320 : Calculate expiry of 2 timers 2012-11-27 16:48:56.078+000010314: debug : virEventPollCalculateTimeout:326 : Got a timeout scheduled for 1354034941078 2012-11-27 16:48:56.078+000010314: debug : virEventPollCalculateTimeout:346 : Timeout at 1354034941078 due in 5000 ms 2012-11-27 16:48:56.078+000010314: debug : virEventPollRunOnce:614 : EVENT_POLL_RUN: nhandles=10 timeout=5000 2012-11-27 16:48:56.078+000010314: debug : virEventPollRunOnce:625 : Poll got 1 event(s) 2012-11-27 16:48:56.078+000010314: debug : virEventPollDispatchTimeouts:410 : Dispatch 2 2012-11-27 16:48:56.078+000010314: debug : virEventPollDispatchHandles:455 : Dispatch 10 2012-11-27 16:48:56.078+000010314: debug : virEventPollDispatchHandles:469 : i=0 w=1 2012-11-27 16:48:56.078+000010314: debug : virEventPollDispatchHandles:469 : i=1 w=2 2012-11-27 16:48:56.078+000010314: debug : virEventPollDispatchHandles:469 : i=2 w=3 2012-11-27 16:48:56.078+000010314: debug : virEventPollDispatchHandles:469 : i=3 w=4 2012-11-27 16:48:56.078+000010314: debug : virEventPollDispatchHandles:469 : i=4 w=5 2012-11-27 16:48:56.078+000010314: debug : virEventPollDispatchHandles:469 : i=5 w=6 2012-11-27 16:48:56.078+000010314: debug : virEventPollDispatchHandles:469 : i=6 w=7 2012-11-27 16:48:56.078+000010314: debug : virEventPollDispatchHandles:469 : i=7 w=8 2012-11-27 16:48:56.078+000010314: debug : virEventPollDispatchHandles:469 : i=8 w=42213 2012-11-27 16:48:56.078+000010314: debug : virEventPollDispatchHandles:469 : i=9 w=50563 2012-11-27 16:48:56.078+000010314: debug : virEventPollDispatchHandles:483 : EVENT_POLL_DISPATCH_HANDLE: watch=50563 events=2 2012-11-27 16:48:56.078+000010314: debug : virNetMessageFree:73 : msg=0x88cd10 nfds=0 cb=(nil) 2012-11-27 16:48:56.078+000010314: debug : virNetServerClientCalculateHandleMode:153 : tls=(nil) hs=-1, rx=0x87af70 tx=(nil) 2012-11-27 16:48:56.078+000010314: debug : virNetServerClientCalculateHandleMode:184 : mode=1 2012-11-27 16:48:56.078+000010314: debug : virEventPollUpdateHandle:146 : EVENT_POLL_UPDATE_HANDLE: watch=50563 events=1 2012-11-27 16:48:56.078+000010314: debug : virEventPollInterruptLocked:697 : Skip interrupt, 1 904570880 2012-11-27 16:48:56.078+000010314: debug : virEventPollCleanupTimeouts:501 : Cleanup 2 2012-11-27 16:48:56.078+000010314: debug : virEventPollCleanupHandles:549 : Cleanup 10 2012-11-27 16:48:56.078+000010314: debug : virEventRunDefaultImpl:244 : running default event implementation 2012-11-27 16:48:56.078+000010314: debug : virEventPollCleanupTimeouts:501 : Cleanup 2 2012-11-27 16:48:56.078+000010314: debug : virEventPollCleanupHandles:549 : Cleanup 10 2012-11-27 16:48:56.079+000010314: debug : virEventPollMakePollFDs:378 : Prepare n=0 w=1, f=7 e=1 d=0 2012-11-27 16:48:56.079+000010314: debug : virEventPollMakePollFDs:378 : Prepare n=1 w=2, f=9 e=1 d=0 2012-11-27 16:48:56.079+000010314: debug : virEventPollMakePollFDs:378 : Prepare n=2 w=3, f=12 e=1 d=0 2012-11-27 16:48:56.079+000010314: debug : virEventPollMakePollFDs:378 : Prepare n=3 w=4, f=13 e=1 d=0 2012-11-27 16:48:56.079+000010314: debug : virEventPollMakePollFDs:378 : Prepare n=4 w=5, f=6 e=1 d=0 2012-11-27 16:48:56.079+000010314: debug : virEventPollMakePollFDs:378 : Prepare n=5 w=6, f=14 e=1 d=0 2012-11-27 16:48:56.079+000010314: debug : virEventPollMakePollFDs:378 : Prepare n=6 w=7, f=16 e=1 d=0 2012-11-27 16:48:56.079+000010314: debug : virEventPollMakePollFDs:378 : Prepare n=7 w=8, f=20 e=25 d=0 2012-11-27 16:48:56.079+000010314: debug : virEventPollMakePollFDs:378 : Prepare n=8 w=42213, f=24 e=25 d=0 2012-11-27 16:48:56.079+000010314: debug : virEventPollMakePollFDs:378 : Prepare n=9 w=50563, f=18 e=1 d=0 2012-11-27 16:48:56.079+000010314: debug : virEventPollCalculateTimeout:320 : Calculate expiry of 2 timers 2012-11-27 16:48:56.079+000010314: debug : virEventPollCalculateTimeout:326 : Got a timeout scheduled for 1354034941078 2012-11-27 16:48:56.079+000010314: debug : virEventPollCalculateTimeout:346 : Timeout at 1354034941078 due in 4999 ms 2012-11-27 16:48:56.079+000010314: debug : virEventPollRunOnce:614 : EVENT_POLL_RUN: nhandles=10 timeout=4999 2012-11-27 16:48:56.079+000010314: debug : virEventPollRunOnce:625 : Poll got 1 event(s) 2012-11-27 16:48:56.079+000010314: debug : virEventPollDispatchTimeouts:410 : Dispatch 2 2012-11-27 16:48:56.079+000010314: debug : virEventPollDispatchHandles:455 : Dispatch 10 2012-11-27 16:48:56.079+000010314: debug : virEventPollDispatchHandles:469 : i=0 w=1 2012-11-27 16:48:56.079+000010314: debug : virEventPollDispatchHandles:469 : i=1 w=2 2012-11-27 16:48:56.079+000010314: debug : virEventPollDispatchHandles:469 : i=2 w=3 2012-11-27 16:48:56.079+000010314: debug : virEventPollDispatchHandles:469 : i=3 w=4 2012-11-27 16:48:56.079+000010314: debug : virEventPollDispatchHandles:469 : i=4 w=5 2012-11-27 16:48:56.079+000010314: debug : virEventPollDispatchHandles:469 : i=5 w=6 2012-11-27 16:48:56.079+000010314: debug : virEventPollDispatchHandles:469 : i=6 w=7 2012-11-27 16:48:56.079+000010314: debug : virEventPollDispatchHandles:469 : i=7 w=8 2012-11-27 16:48:56.079+000010314: debug : virEventPollDispatchHandles:469 : i=8 w=42213 2012-11-27 16:48:56.079+000010314: debug : virEventPollDispatchHandles:469 : i=9 w=50563 2012-11-27 16:48:56.079+000010314: debug : virEventPollDispatchHandles:483 : EVENT_POLL_DISPATCH_HANDLE: watch=50563 events=1 2012-11-27 16:48:56.079+000010314: debug : virNetMessageDecodeLength:152 : Got length, now need 40 total (36 more) 2012-11-27 16:48:56.079+000010314: debug : virNetServerClientCalculateHandleMode:153 : tls=(nil) hs=-1, rx=0x87af70 tx=(nil) 2012-11-27 16:48:56.079+000010314: debug : virNetServerClientCalculateHandleMode:184 : mode=1 2012-11-27 16:48:56.079+000010314: debug : virEventPollUpdateHandle:146 : EVENT_POLL_UPDATE_HANDLE: watch=50563 events=1 2012-11-27 16:48:56.079+000010314: debug : virEventPollInterruptLocked:697 : Skip interrupt, 1 904570880 2012-11-27 16:48:56.079+000010314: debug : virNetServerClientDispatchRead:1007 : RPC_SERVER_CLIENT_MSG_RX: client=0x88d980 len=40 prog=536903814 vers=1 proc=23 type=0 status=0 serial=4 2012-11-27 16:48:56.079+000010314: debug : virKeepAliveCheckMessage:384 : ka=0x887c00, client=0x88d980, msg=0x87af70 2012-11-27 16:48:56.079+000010314: debug : virEventPollUpdateTimeout:254 : EVENT_POLL_UPDATE_TIMEOUT: timer=101086 frequency=5000 2012-11-27 16:48:56.079+000010314: debug : virEventPollInterruptLocked:697 : Skip interrupt, 1 904570880 2012-11-27 16:48:56.079+000010314: debug : virObjectRef:168 : OBJECT_REF: obj=0x88d980 2012-11-27 16:48:56.079+000010314: debug : virNetServerDispatchNewMessage:219 : server=0x879d80 client=0x88d980 message=0x87af70 2012-11-27 16:48:56.079+000010314: debug : virObjectRef:168 : OBJECT_REF: obj=0x882540 2012-11-27 16:48:56.079+000010314: debug : virNetMessageNew:45 : msg=0x888590 tracked=1 2012-11-27 16:48:56.079+000010314: debug : virNetServerClientCalculateHandleMode:153 : tls=(nil) hs=-1, rx=0x888590 tx=(nil) 2012-11-27 16:48:56.079+000010314: debug : virNetServerClientCalculateHandleMode:184 : mode=1 2012-11-27 16:48:56.079+000010314: debug : virEventPollUpdateHandle:146 : EVENT_POLL_UPDATE_HANDLE: watch=50563 events=1 2012-11-27 16:48:56.079+000010314: debug : virEventPollInterruptLocked:697 : Skip interrupt, 1 904570880 2012-11-27 16:48:56.079+000010314: debug : virNetServerClientDispatchRead:1007 : RPC_SERVER_CLIENT_MSG_RX: client=0x88d980 len=40 prog=536903814 vers=1 proc=23 type=0 status=0 serial=4 2012-11-27 16:48:56.079+000010314: debug : virKeepAliveCheckMessage:384 : ka=0x887c00, client=0x88d980, msg=0x87af70 2012-11-27 16:48:56.079+000010314: debug : virEventPollUpdateTimeout:254 : EVENT_POLL_UPDATE_TIMEOUT: timer=101086 frequency=5000 2012-11-27 16:48:56.079+000010314: debug : virEventPollInterruptLocked:697 : Skip interrupt, 1 904570880 2012-11-27 16:48:56.079+000010314: debug : virObjectRef:168 : OBJECT_REF: obj=0x88d980 2012-11-27 16:48:56.079+000010314: debug : virNetServerDispatchNewMessage:219 : server=0x879d80 client=0x88d980 message=0x87af70 2012-11-27 16:48:56.079+000010314: debug : virObjectRef:168 : OBJECT_REF: obj=0x882540 2012-11-27 16:48:56.079+000010314: debug : virNetMessageNew:45 : msg=0x888590 tracked=1 2012-11-27 16:48:56.079+000010314: debug : virNetServerClientCalculateHandleMode:153 : tls=(nil) hs=-1, rx=0x888590 tx=(nil) 2012-11-27 16:48:56.079+000010314: debug : virNetServerClientCalculateHandleMode:184 : mode=1 2012-11-27 16:48:56.079+000010314: debug : virEventPollUpdateHandle:146 : EVENT_POLL_UPDATE_HANDLE: watch=50563 events=1 2012-11-27 16:48:56.079+000010314: debug : virEventPollInterruptLocked:697 : Skip interrupt, 1 904570880 2012-11-27 16:48:56.079+000010315: debug : virNetServerHandleJob:190 : server=0x879d80 client=0x88d980 message=0x87af70 prog=0x882540 2012-11-27 16:48:56.079+000010314: debug : virEventPollCleanupTimeouts:501 : Cleanup 2 2012-11-27 16:48:56.079+000010314: debug : virEventPollCleanupHandles:549 : Cleanup 10 2012-11-27 16:48:56.079+000010315: debug : virNetServerProgramDispatch:284 : prog=536903814 ver=1 type=0 status=0 serial=4 proc=23 2012-11-27 16:48:56.079+000010314: debug : virEventRunDefaultImpl:244 : running default event implementation 2012-11-27 16:48:56.079+000010314: debug : virEventPollCleanupTimeouts:501 : Cleanup 2 2012-11-27 16:48:56.079+000010315: debug : remoteDispatchDomainLookupByNameHelper:3084 : server=0x879d80 client=0x88d980 msg=0x87af70 rerr=0x7f6430017be0 args=0x7f640800f550 ret=0x7f640800f610 2012-11-27 16:48:56.079+000010314: debug : virEventPollCleanupHandles:549 : Cleanup 10 2012-11-27 16:48:56.079+000010314: debug : virEventPollMakePollFDs:378 : Prepare n=0 w=1, f=7 e=1 d=0 2012-11-27 16:48:56.079+000010315: debug : virDomainLookupByName:2128 : conn=0x7f641c0728f0, name=4274X8 2012-11-27 16:48:56.079+000010314: debug : virEventPollMakePollFDs:378 : Prepare n=1 w=2, f=9 e=1 d=0 2012-11-27 16:48:56.079+000010314: debug : virEventPollMakePollFDs:378 : Prepare n=2 w=3, f=12 e=1 d=0 2012-11-27 16:48:56.079+000010314: debug : virEventPollMakePollFDs:378 : Prepare n=3 w=4, f=13 e=1 d=0 2012-11-27 16:48:56.079+000010315: debug : virObjectNew:110 : OBJECT_NEW: obj=0x7f640800f5d0 classname=virDomain 2012-11-27 16:48:56.079+000010314: debug : virEventPollMakePollFDs:378 : Prepare n=4 w=5, f=6 e=1 d=0 2012-11-27 16:48:56.079+000010314: debug : virEventPollMakePollFDs:378 : Prepare n=5 w=6, f=14 e=1 d=0 2012-11-27 16:48:56.079+000010315: debug : virObjectRef:168 : OBJECT_REF: obj=0x7f641c0728f0 2012-11-27 16:48:56.079+000010314: debug : virEventPollMakePollFDs:378 : Prepare n=6 w=7, f=16 e=1 d=0 2012-11-27 16:48:56.079+000010314: debug : virEventPollMakePollFDs:378 : Prepare n=7 w=8, f=20 e=25 d=0 2012-11-27 16:48:56.079+000010314: debug : virEventPollMakePollFDs:378 : Prepare n=8 w=42213, f=24 e=25 d=0 2012-11-27 16:48:56.079+000010315: debug : virDomainFree:2292 : dom=0x7f640800f5d0, (VM: name=4274X8, uuid=3b14a4c4-19e0-11e2-ad58-8ccdadf125ba) 2012-11-27 16:48:56.079+000010314: debug : virEventPollMakePollFDs:378 : Prepare n=9 w=50563, f=18 e=1 d=0 2012-11-27 16:48:56.079+000010315: debug : virObjectUnref:135 : OBJECT_UNREF: obj=0x7f640800f5d0 2012-11-27 16:48:56.079+000010314: debug : virEventPollCalculateTimeout:320 : Calculate expiry of 2 timers 2012-11-27 16:48:56.079+000010315: debug : virObjectUnref:137 : OBJECT_DISPOSE: obj=0x7f640800f5d0 2012-11-27 16:48:56.079+000010314: debug : virEventPollCalculateTimeout:326 : Got a timeout scheduled for 1354034941079 2012-11-27 16:48:56.079+000010314: debug : virEventPollCalculateTimeout:346 : Timeout at 1354034941079 due in 5000 ms 2012-11-27 16:48:56.079+000010315: debug : virDomainDispose:225 : release domain 0x7f640800f5d0 4274X8 3b14a4c4-19e0-11e2-ad58-8ccdadf125ba 2012-11-27 16:48:56.079+000010314: debug : virEventPollRunOnce:614 : EVENT_POLL_RUN: nhandles=10 timeout=5000 2012-11-27 16:48:56.079+000010315: debug : virObjectUnref:135 : OBJECT_UNREF: obj=0x7f641c0728f0 2012-11-27 16:48:56.079+000010315: debug : virNetMessageEncodePayload:358 : Encode length as 60 2012-11-27 16:48:56.079+000010315: debug : virNetServerClientSendMessageLocked:1251 : msg=0x87af70 proc=23 len=60 offset=0 2012-11-27 16:48:56.079+000010315: debug : virNetServerClientSendMessageLocked:1259 : RPC_SERVER_CLIENT_MSG_TX_QUEUE: client=0x88d980 len=60 prog=536903814 vers=1 proc=23 type=1 status=0 serial=4 2012-11-27 16:48:56.079+000010315: debug : virNetServerClientCalculateHandleMode:153 : tls=(nil) hs=-1, rx=0x888590 tx=0x87af70 2012-11-27 16:48:56.079+000010315: debug : virNetServerClientCalculateHandleMode:184 : mode=3 2012-11-27 16:48:56.079+000010315: debug : virEventPollUpdateHandle:146 : EVENT_POLL_UPDATE_HANDLE: watch=50563 events=3 2012-11-27 16:48:56.079+000010315: debug : virEventPollInterruptLocked:701 : Interrupting 2012-11-27 16:48:56.079+000010315: debug : virObjectUnref:135 : OBJECT_UNREF: obj=0x882540 2012-11-27 16:48:56.079+000010315: debug : virObjectUnref:135 : OBJECT_UNREF: obj=0x88d980 2012-11-27 16:48:56.079+000010314: debug : virEventPollRunOnce:625 : Poll got 1 event(s) 2012-11-27 16:48:56.079+000010314: debug : virEventPollDispatchTimeouts:410 : Dispatch 2 2012-11-27 16:48:56.079+000010314: debug : virEventPollDispatchHandles:455 : Dispatch 10 2012-11-27 16:48:56.079+000010314: debug : virEventPollDispatchHandles:469 : i=0 w=1 2012-11-27 16:48:56.079+000010314: debug : virEventPollDispatchHandles:483 : EVENT_POLL_DISPATCH_HANDLE: watch=1 events=1 2012-11-27 16:48:56.079+000010314: debug : virEventPollDispatchHandles:469 : i=1 w=2 2012-11-27 16:48:56.079+000010314: debug : virEventPollDispatchHandles:469 : i=2 w=3 2012-11-27 16:48:56.079+000010314: debug : virEventPollDispatchHandles:469 : i=3 w=4 2012-11-27 16:48:56.079+000010314: debug : virEventPollDispatchHandles:469 : i=4 w=5 2012-11-27 16:48:56.079+000010314: debug : virEventPollDispatchHandles:469 : i=5 w=6 2012-11-27 16:48:56.079+000010314: debug : virEventPollDispatchHandles:469 : i=6 w=7 2012-11-27 16:48:56.079+000010314: debug : virEventPollDispatchHandles:469 : i=7 w=8 2012-11-27 16:48:56.079+000010314: debug : virEventPollDispatchHandles:469 : i=8 w=42213 2012-11-27 16:48:56.079+000010314: debug : virEventPollDispatchHandles:469 : i=9 w=50563 2012-11-27 16:48:56.079+000010314: debug : virEventPollCleanupTimeouts:501 : Cleanup 2 2012-11-27 16:48:56.079+000010314: debug : virEventPollCleanupHandles:549 : Cleanup 10 2012-11-27 16:48:56.079+000010314: debug : virEventRunDefaultImpl:244 : running default event implementation 2012-11-27 16:48:56.079+000010314: debug : virEventPollCleanupTimeouts:501 : Cleanup 2 2012-11-27 16:48:56.079+000010314: debug : virEventPollCleanupHandles:549 : Cleanup 10 2012-11-27 16:48:56.079+000010314: debug : virEventPollMakePollFDs:378 : Prepare n=0 w=1, f=7 e=1 d=0 2012-11-27 16:48:56.079+000010314: debug : virEventPollMakePollFDs:378 : Prepare n=1 w=2, f=9 e=1 d=0 2012-11-27 16:48:56.079+000010314: debug : virEventPollMakePollFDs:378 : Prepare n=2 w=3, f=12 e=1 d=0 2012-11-27 16:48:56.079+000010314: debug : virEventPollMakePollFDs:378 : Prepare n=3 w=4, f=13 e=1 d=0 2012-11-27 16:48:56.079+000010314: debug : virEventPollMakePollFDs:378 : Prepare n=4 w=5, f=6 e=1 d=0 2012-11-27 16:48:56.079+000010314: debug : virEventPollMakePollFDs:378 : Prepare n=5 w=6, f=14 e=1 d=0 2012-11-27 16:48:56.079+000010314: debug : virEventPollMakePollFDs:378 : Prepare n=6 w=7, f=16 e=1 d=0 2012-11-27 16:48:56.079+000010314: debug : virEventPollMakePollFDs:378 : Prepare n=7 w=8, f=20 e=25 d=0 2012-11-27 16:48:56.079+000010314: debug : virEventPollMakePollFDs:378 : Prepare n=8 w=42213, f=24 e=25 d=0 2012-11-27 16:48:56.079+000010314: debug : virEventPollMakePollFDs:378 : Prepare n=9 w=50563, f=18 e=5 d=0 2012-11-27 16:48:56.079+000010314: debug : virEventPollCalculateTimeout:320 : Calculate expiry of 2 timers 2012-11-27 16:48:56.079+000010314: debug : virEventPollCalculateTimeout:326 : Got a timeout scheduled for 1354034941079 2012-11-27 16:48:56.079+000010314: debug : virEventPollCalculateTimeout:346 : Timeout at 1354034941079 due in 5000 ms 2012-11-27 16:48:56.079+000010314: debug : virEventPollRunOnce:614 : EVENT_POLL_RUN: nhandles=10 timeout=5000 2012-11-27 16:48:56.079+000010314: debug : virEventPollRunOnce:625 : Poll got 1 event(s) 2012-11-27 16:48:56.079+000010314: debug : virEventPollDispatchTimeouts:410 : Dispatch 2 2012-11-27 16:48:56.079+000010314: debug : virEventPollDispatchHandles:455 : Dispatch 10 2012-11-27 16:48:56.079+000010314: debug : virEventPollDispatchHandles:469 : i=0 w=1 2012-11-27 16:48:56.079+000010314: debug : virEventPollDispatchHandles:469 : i=1 w=2 2012-11-27 16:48:56.079+000010314: debug : virEventPollDispatchHandles:469 : i=2 w=3 2012-11-27 16:48:56.079+000010314: debug : virEventPollDispatchHandles:469 : i=4 w=5 2012-11-27 16:48:56.079+000010314: debug : virEventPollDispatchHandles:469 : i=5 w=6 2012-11-27 16:48:56.079+000010314: debug : virEventPollDispatchHandles:469 : i=6 w=7 2012-11-27 16:48:56.079+000010314: debug : virEventPollDispatchHandles:469 : i=7 w=8 2012-11-27 16:48:56.079+000010314: debug : virEventPollDispatchHandles:469 : i=8 w=42213 2012-11-27 16:48:56.079+000010314: debug : virEventPollDispatchHandles:469 : i=9 w=50563 2012-11-27 16:48:56.079+000010314: debug : virEventPollDispatchHandles:483 : EVENT_POLL_DISPATCH_HANDLE: watch=50563 events=2 2012-11-27 16:48:56.079+000010314: debug : virNetMessageFree:73 : msg=0x87af70 nfds=0 cb=(nil) 2012-11-27 16:48:56.079+000010314: debug : virNetServerClientCalculateHandleMode:153 : tls=(nil) hs=-1, rx=0x888590 tx=(nil) 2012-11-27 16:48:56.079+000010314: debug : virNetServerClientCalculateHandleMode:184 : mode=1 2012-11-27 16:48:56.079+000010314: debug : virEventPollUpdateHandle:146 : EVENT_POLL_UPDATE_HANDLE: watch=50563 events=1 2012-11-27 16:48:56.079+000010314: debug : virEventPollInterruptLocked:697 : Skip interrupt, 1 904570880 2012-11-27 16:48:56.079+000010314: debug : virEventPollCleanupTimeouts:501 : Cleanup 2 2012-11-27 16:48:56.079+000010314: debug : virEventPollCleanupHandles:549 : Cleanup 10 2012-11-27 16:48:56.079+000010314: debug : virEventRunDefaultImpl:244 : running default event implementation 2012-11-27 16:48:56.079+000010314: debug : virEventPollCleanupTimeouts:501 : Cleanup 2 2012-11-27 16:48:56.079+000010314: debug : virEventPollCleanupHandles:549 : Cleanup 10 2012-11-27 16:48:56.079+000010314: debug : virEventPollMakePollFDs:378 : Prepare n=0 w=1, f=7 e=1 d=0 2012-11-27 16:48:56.079+000010314: debug : virEventPollMakePollFDs:378 : Prepare n=1 w=2, f=9 e=1 d=0 2012-11-27 16:48:56.079+000010314: debug : virEventPollMakePollFDs:378 : Prepare n=2 w=3, f=12 e=1 d=0 2012-11-27 16:48:56.079+000010314: debug : virEventPollMakePollFDs:378 : Prepare n=3 w=4, f=13 e=1 d=0 2012-11-27 16:48:56.079+000010314: debug : virEventPollMakePollFDs:378 : Prepare n=4 w=5, f=6 e=1 d=0 2012-11-27 16:48:56.079+000010314: debug : virEventPollMakePollFDs:378 : Prepare n=5 w=6, f=14 e=1 d=0 2012-11-27 16:48:56.079+000010314: debug : virEventPollMakePollFDs:378 : Prepare n=6 w=7, f=16 e=1 d=0 2012-11-27 16:48:56.079+000010314: debug : virEventPollMakePollFDs:378 : Prepare n=7 w=8, f=20 e=25 d=0 2012-11-27 16:48:56.079+000010314: debug : virEventPollMakePollFDs:378 : Prepare n=8 w=42213, f=24 e=25 d=0 2012-11-27 16:48:56.079+000010314: debug : virEventPollMakePollFDs:378 : Prepare n=9 w=50563, f=18 e=1 d=0 2012-11-27 16:48:56.079+000010314: debug : virEventPollCalculateTimeout:320 : Calculate expiry of 2 timers 2012-11-27 16:48:56.079+000010314: debug : virEventPollCalculateTimeout:326 : Got a timeout scheduled for 1354034941079 2012-11-27 16:48:56.079+000010314: debug : virEventPollCalculateTimeout:346 : Timeout at 1354034941079 due in 5000 ms 2012-11-27 16:48:56.079+000010314: debug : virEventPollRunOnce:614 : EVENT_POLL_RUN: nhandles=10 timeout=5000 2012-11-27 16:48:56.079+000010314: debug : virEventPollRunOnce:625 : Poll got 1 event(s) 2012-11-27 16:48:56.079+000010314: debug : virEventPollDispatchTimeouts:410 : Dispatch 2 2012-11-27 16:48:56.079+000010314: debug : virEventPollDispatchHandles:455 : Dispatch 10 2012-11-27 16:48:56.079+000010314: debug : virEventPollDispatchHandles:469 : i=0 w=1 2012-11-27 16:48:56.079+000010314: debug : virEventPollDispatchHandles:469 : i=1 w=2 2012-11-27 16:48:56.079+000010314: debug : virEventPollDispatchHandles:469 : i=2 w=3 2012-11-27 16:48:56.079+000010314: debug : virEventPollDispatchHandles:469 : i=3 w=4 2012-11-27 16:48:56.079+000010314: debug : virEventPollDispatchHandles:469 : i=4 w=5 2012-11-27 16:48:56.080+000010314: debug : virEventPollDispatchHandles:469 : i=5 w=6 2012-11-27 16:48:56.080+000010314: debug : virEventPollDispatchHandles:469 : i=6 w=7 2012-11-27 16:48:56.080+000010314: debug : virEventPollDispatchHandles:469 : i=7 w=8 2012-11-27 16:48:56.080+000010314: debug : virEventPollDispatchHandles:469 : i=8 w=42213 2012-11-27 16:48:56.080+000010314: debug : virEventPollDispatchHandles:469 : i=9 w=50563 2012-11-27 16:48:56.080+000010314: debug : virEventPollDispatchHandles:483 : EVENT_POLL_DISPATCH_HANDLE: watch=50563 events=1 2012-11-27 16:48:56.080+000010314: debug : virNetMessageDecodeLength:152 : Got length, now need 60 total (56 more) 2012-11-27 16:48:56.080+000010314: debug : virNetServerClientCalculateHandleMode:153 : tls=(nil) hs=-1, rx=0x888590 tx=(nil) 2012-11-27 16:48:56.080+000010314: debug : virNetServerClientCalculateHandleMode:184 : mode=1 2012-11-27 16:48:56.080+000010314: debug : virEventPollUpdateHandle:146 : EVENT_POLL_UPDATE_HANDLE: watch=50563 events=1 2012-11-27 16:48:56.080+000010314: debug : virEventPollInterruptLocked:697 : Skip interrupt, 1 904570880 2012-11-27 16:48:56.080+000010314: debug : virNetServerClientDispatchRead:1007 : RPC_SERVER_CLIENT_MSG_RX: client=0x88d980 len=60 prog=536903814 vers=1 proc=12 type=0 status=0 serial=5 2012-11-27 16:48:56.080+000010314: debug : virKeepAliveCheckMessage:384 : ka=0x887c00, client=0x88d980, msg=0x888590 2012-11-27 16:48:56.080+000010314: debug : virEventPollUpdateTimeout:254 : EVENT_POLL_UPDATE_TIMEOUT: timer=101086 frequency=5000 2012-11-27 16:48:56.080+000010314: debug : virEventPollInterruptLocked:697 : Skip interrupt, 1 904570880 2012-11-27 16:48:56.080+000010314: debug : virObjectRef:168 : OBJECT_REF: obj=0x88d980 2012-11-27 16:48:56.080+000010314: debug : virNetServerDispatchNewMessage:219 : server=0x879d80 client=0x88d980 message=0x888590 2012-11-27 16:48:56.080+000010314: debug : virObjectRef:168 : OBJECT_REF: obj=0x882540 2012-11-27 16:48:56.080+000010314: debug : virNetMessageNew:45 : msg=0x88cd10 tracked=1 2012-11-27 16:48:56.080+000010314: debug : virNetServerClientCalculateHandleMode:153 : tls=(nil) hs=-1, rx=0x88cd10 tx=(nil) 2012-11-27 16:48:56.080+000010314: debug : virNetServerClientCalculateHandleMode:184 : mode=1 2012-11-27 16:48:56.080+000010314: debug : virEventPollUpdateHandle:146 : EVENT_POLL_UPDATE_HANDLE: watch=50563 events=1 2012-11-27 16:48:56.080+000010314: debug : virEventPollInterruptLocked:697 : Skip interrupt, 1 904570880 2012-11-27 16:48:56.080+000010314: debug : virEventPollCleanupTimeouts:501 : Cleanup 2 2012-11-27 16:48:56.080+000010314: debug : virEventPollCleanupHandles:549 : Cleanup 10 2012-11-27 16:48:56.080+000010314: debug : virEventRunDefaultImpl:244 : running default event implementation 2012-11-27 16:48:56.080+000010314: debug : virEventPollCleanupTimeouts:501 : Cleanup 2 2012-11-27 16:48:56.080+000010314: debug : virEventPollCleanupHandles:549 : Cleanup 10 2012-11-27 16:48:56.080+000010314: debug : virEventPollMakePollFDs:378 : Prepare n=0 w=1, f=7 e=1 d=0 2012-11-27 16:48:56.080+000010314: debug : virEventPollMakePollFDs:378 : Prepare n=1 w=2, f=9 e=1 d=0 2012-11-27 16:48:56.080+000010319: debug : virNetServerHandleJob:190 : server=0x879d80 client=0x88d980 message=0x888590 prog=0x882540 2012-11-27 16:48:56.080+000010314: debug : virEventPollMakePollFDs:378 : Prepare n=2 w=3, f=12 e=1 d=0 2012-11-27 16:48:56.080+000010314: debug : virEventPollMakePollFDs:378 : Prepare n=3 w=4, f=13 e=1 d=0 2012-11-27 16:48:56.080+000010319: debug : virNetServerProgramDispatch:284 : prog=536903814 ver=1 type=0 status=0 serial=5 proc=12 2012-11-27 16:48:56.080+000010314: debug : virEventPollMakePollFDs:378 : Prepare n=4 w=5, f=6 e=1 d=0 2012-11-27 16:48:56.080+000010314: debug : virEventPollMakePollFDs:378 : Prepare n=5 w=6, f=14 e=1 d=0 2012-11-27 16:48:56.080+000010314: debug : virEventPollMakePollFDs:378 : Prepare n=6 w=7, f=16 e=1 d=0 2012-11-27 16:48:56.080+000010319: debug : remoteDispatchDomainDestroyHelper:1254 : server=0x879d80 client=0x88d980 msg=0x888590 rerr=0x7f642d813be0 args=0x7f64180021c0 ret=0x7f6418002bc0 2012-11-27 16:48:56.080+000010314: debug : virEventPollMakePollFDs:378 : Prepare n=7 w=8, f=20 e=25 d=0 2012-11-27 16:48:56.080+000010314: debug : virEventPollMakePollFDs:378 : Prepare n=8 w=42213, f=24 e=25 d=0 2012-11-27 16:48:56.080+000010319: debug : virObjectNew:110 : OBJECT_NEW: obj=0x7f6418002180 classname=virDomain 2012-11-27 16:48:56.080+000010314: debug : virEventPollMakePollFDs:378 : Prepare n=9 w=50563, f=18 e=1 d=0 2012-11-27 16:48:56.080+000010314: debug : virEventPollCalculateTimeout:320 : Calculate expiry of 2 timers 2012-11-27 16:48:56.080+000010319: debug : virObjectRef:168 : OBJECT_REF: obj=0x7f641c0728f0 2012-11-27 16:48:56.080+000010314: debug : virEventPollCalculateTimeout:326 : Got a timeout scheduled for 1354034941080 2012-11-27 16:48:56.080+000010314: debug : virEventPollCalculateTimeout:346 : Timeout at 1354034941080 due in 5000 ms 2012-11-27 16:48:56.080+000010314: debug : virEventPollRunOnce:614 : EVENT_POLL_RUN: nhandles=10 timeout=5000 2012-11-27 16:48:56.080+000010319: debug : virDomainDestroy:2183 : dom=0x7f6418002180, (VM: name=4274X8, uuid=3b14a4c4-19e0-11e2-ad58-8ccdadf125ba) 2012-11-27 16:48:56.080+000010319: debug : qemuProcessKill:3941 : vm=4274X8 pid=22404 flags=1 2012-11-27 16:48:56.080+000010319: debug : virProcessKillPainfully:253 : vpid=22404 force=1 2012-11-27 16:48:56.097+000010314: debug : virEventPollRunOnce:625 : Poll got 1 event(s) 2012-11-27 16:48:56.097+000010314: debug : virEventPollDispatchTimeouts:410 : Dispatch 2 2012-11-27 16:48:56.097+000010314: debug : virEventPollDispatchHandles:455 : Dispatch 10 2012-11-27 16:48:56.097+000010314: debug : virEventPollDispatchHandles:469 : i=0 w=1 2012-11-27 16:48:56.097+000010314: debug : virEventPollDispatchHandles:469 : i=1 w=2 2012-11-27 16:48:56.097+000010314: debug : virEventPollDispatchHandles:469 : i=2 w=3 2012-11-27 16:48:56.097+000010314: debug : virEventPollDispatchHandles:469 : i=3 w=4 2012-11-27 16:48:56.097+000010314: debug : virEventPollDispatchHandles:469 : i=4 w=5 2012-11-27 16:48:56.097+000010314: debug : virEventPollDispatchHandles:469 : i=5 w=6 2012-11-27 16:48:56.097+000010314: debug : virEventPollDispatchHandles:483 : EVENT_POLL_DISPATCH_HANDLE: watch=6 events=1 2012-11-27 16:48:56.097+000010314: debug : virNetlinkEventCallback:346 : dispatching to max 0 clients, called from event watch 6 2012-11-27 16:48:56.097+000010314: debug : virNetlinkEventCallback:359 : event not handled. 2012-11-27 16:48:56.097+000010314: debug : virEventPollDispatchHandles:469 : i=6 w=7 2012-11-27 16:48:56.097+000010314: debug : virEventPollDispatchHandles:469 : i=7 w=8 2012-11-27 16:48:56.097+000010314: debug : virEventPollDispatchHandles:469 : i=8 w=42213 2012-11-27 16:48:56.097+000010314: debug : virEventPollDispatchHandles:469 : i=9 w=50563 2012-11-27 16:48:56.097+000010314: debug : virEventPollCleanupTimeouts:501 : Cleanup 2 2012-11-27 16:48:56.097+000010314: debug : virEventPollCleanupHandles:549 : Cleanup 10 2012-11-27 16:48:56.097+000010314: debug : virEventRunDefaultImpl:244 : running default event implementation 2012-11-27 16:48:56.097+000010314: debug : virEventPollCleanupTimeouts:501 : Cleanup 2 2012-11-27 16:48:56.097+000010314: debug : virEventPollCleanupHandles:549 : Cleanup 10 2012-11-27 16:48:56.097+000010314: debug : virEventPollMakePollFDs:378 : Prepare n=0 w=1, f=7 e=1 d=0 2012-11-27 16:48:56.097+000010314: debug : virEventPollMakePollFDs:378 : Prepare n=1 w=2, f=9 e=1 d=0 2012-11-27 16:48:56.097+000010314: debug : virEventPollMakePollFDs:378 : Prepare n=2 w=3, f=12 e=1 d=0 2012-11-27 16:48:56.097+000010314: debug : virEventPollMakePollFDs:378 : Prepare n=3 w=4, f=13 e=1 d=0 2012-11-27 16:48:56.097+000010314: debug : virEventPollMakePollFDs:378 : Prepare n=4 w=5, f=6 e=1 d=0 2012-11-27 16:48:56.097+000010314: debug : virEventPollMakePollFDs:378 : Prepare n=5 w=6, f=14 e=1 d=0 2012-11-27 16:48:56.097+000010314: debug : virEventPollMakePollFDs:378 : Prepare n=6 w=7, f=16 e=1 d=0 2012-11-27 16:48:56.097+000010314: debug : virEventPollMakePollFDs:378 : Prepare n=7 w=8, f=20 e=25 d=0 2012-11-27 16:48:56.097+000010314: debug : virEventPollMakePollFDs:378 : Prepare n=8 w=42213, f=24 e=25 d=0 2012-11-27 16:48:56.097+000010314: debug : virEventPollMakePollFDs:378 : Prepare n=9 w=50563, f=18 e=1 d=0 2012-11-27 16:48:56.097+000010314: debug : virEventPollCalculateTimeout:320 : Calculate expiry of 2 timers 2012-11-27 16:48:56.097+000010314: debug : virEventPollCalculateTimeout:326 : Got a timeout scheduled for 1354034941080 2012-11-27 16:48:56.097+000010314: debug : virEventPollCalculateTimeout:346 : Timeout at 1354034941080 due in 4983 ms 2012-11-27 16:48:56.097+000010314: debug : virEventPollRunOnce:614 : EVENT_POLL_RUN: nhandles=10 timeout=4983 2012-11-27 16:48:56.097+000010314: debug : virEventPollRunOnce:625 : Poll got 1 event(s) 2012-11-27 16:48:56.097+000010314: debug : virEventPollDispatchTimeouts:410 : Dispatch 2 2012-11-27 16:48:56.097+000010314: debug : virEventPollDispatchHandles:455 : Dispatch 10 2012-11-27 16:48:56.097+000010314: debug : virEventPollDispatchHandles:469 : i=0 w=1 2012-11-27 16:48:56.097+000010314: debug : virEventPollDispatchHandles:469 : i=1 w=2 2012-11-27 16:48:56.097+000010314: debug : virEventPollDispatchHandles:469 : i=2 w=3 2012-11-27 16:48:56.097+000010314: debug : virEventPollDispatchHandles:469 : i=3 w=4 2012-11-27 16:48:56.097+000010314: debug : virEventPollDispatchHandles:469 : i=4 w=5 2012-11-27 16:48:56.097+000010314: debug : virEventPollDispatchHandles:469 : i=5 w=6 2012-11-27 16:48:56.097+000010314: debug : virEventPollDispatchHandles:483 : EVENT_POLL_DISPATCH_HANDLE: watch=6 events=1 2012-11-27 16:48:56.097+000010314: debug : virNetlinkEventCallback:346 : dispatching to max 0 clients, called from event watch 6 2012-11-27 16:48:56.097+000010314: debug : virNetlinkEventCallback:359 : event not handled. 2012-11-27 16:48:56.097+000010314: debug : virEventPollDispatchHandles:469 : i=6 w=7 2012-11-27 16:48:56.097+000010314: debug : virEventPollDispatchHandles:469 : i=7 w=8 2012-11-27 16:48:56.097+000010314: debug : virEventPollDispatchHandles:469 : i=8 w=42213 2012-11-27 16:48:56.097+000010314: debug : virEventPollDispatchHandles:469 : i=9 w=50563 2012-11-27 16:48:56.097+000010314: debug : virEventPollCleanupTimeouts:501 : Cleanup 2 2012-11-27 16:48:56.097+000010314: debug : virEventPollCleanupHandles:549 : Cleanup 10 2012-11-27 16:48:56.097+000010314: debug : virEventRunDefaultImpl:244 : running default event implementation 2012-11-27 16:48:56.097+000010314: debug : virEventPollCleanupTimeouts:501 : Cleanup 2 2012-11-27 16:48:56.097+000010314: debug : virEventPollCleanupHandles:549 : Cleanup 10 2012-11-27 16:48:56.097+000010314: debug : virEventPollMakePollFDs:378 : Prepare n=0 w=1, f=7 e=1 d=0 2012-11-27 16:48:56.097+000010314: debug : virEventPollMakePollFDs:378 : Prepare n=1 w=2, f=9 e=1 d=0 2012-11-27 16:48:56.097+000010314: debug : virEventPollMakePollFDs:378 : Prepare n=2 w=3, f=12 e=1 d=0 2012-11-27 16:48:56.097+000010314: debug : virEventPollMakePollFDs:378 : Prepare n=3 w=4, f=13 e=1 d=0 2012-11-27 16:48:56.097+000010314: debug : virEventPollMakePollFDs:378 : Prepare n=4 w=5, f=6 e=1 d=0 2012-11-27 16:48:56.097+000010314: debug : virEventPollMakePollFDs:378 : Prepare n=5 w=6, f=14 e=1 d=0 2012-11-27 16:48:56.097+000010314: debug : virEventPollMakePollFDs:378 : Prepare n=6 w=7, f=16 e=1 d=0 2012-11-27 16:48:56.097+000010314: debug : virEventPollMakePollFDs:378 : Prepare n=7 w=8, f=20 e=25 d=0 2012-11-27 16:48:56.097+000010314: debug : virEventPollMakePollFDs:378 : Prepare n=8 w=42213, f=24 e=25 d=0 2012-11-27 16:48:56.097+000010314: debug : virEventPollMakePollFDs:378 : Prepare n=9 w=50563, f=18 e=1 d=0 2012-11-27 16:48:56.097+000010314: debug : virEventPollCalculateTimeout:320 : Calculate expiry of 2 timers 2012-11-27 16:48:56.097+000010314: debug : virEventPollCalculateTimeout:326 : Got a timeout scheduled for 1354034941080 2012-11-27 16:48:56.097+000010314: debug : virEventPollCalculateTimeout:346 : Timeout at 1354034941080 due in 4983 ms 2012-11-27 16:48:56.097+000010314: debug : virEventPollRunOnce:614 : EVENT_POLL_RUN: nhandles=10 timeout=4983 2012-11-27 16:48:56.097+000010314: debug : virEventPollRunOnce:625 : Poll got 2 event(s) 2012-11-27 16:48:56.097+000010314: debug : virEventPollDispatchTimeouts:410 : Dispatch 2 2012-11-27 16:48:56.097+000010314: debug : virEventPollDispatchHandles:455 : Dispatch 10 2012-11-27 16:48:56.097+000010314: debug : virEventPollDispatchHandles:469 : i=0 w=1 2012-11-27 16:48:56.097+000010314: debug : virEventPollDispatchHandles:469 : i=1 w=2 2012-11-27 16:48:56.097+000010314: debug : virEventPollDispatchHandles:469 : i=2 w=3 2012-11-27 16:48:56.097+000010314: debug : virEventPollDispatchHandles:469 : i=3 w=4 2012-11-27 16:48:56.097+000010314: debug : virEventPollDispatchHandles:469 : i=4 w=5 2012-11-27 16:48:56.097+000010314: debug : virEventPollDispatchHandles:469 : i=5 w=6 2012-11-27 16:48:56.097+000010314: debug : virEventPollDispatchHandles:483 : EVENT_POLL_DISPATCH_HANDLE: watch=6 events=1 2012-11-27 16:48:56.097+000010314: debug : virNetlinkEventCallback:346 : dispatching to max 0 clients, called from event watch 6 2012-11-27 16:48:56.097+000010314: debug : virNetlinkEventCallback:359 : event not handled. 2012-11-27 16:48:56.097+000010314: debug : virEventPollDispatchHandles:469 : i=6 w=7 2012-11-27 16:48:56.097+000010314: debug : virEventPollDispatchHandles:483 : EVENT_POLL_DISPATCH_HANDLE: watch=7 events=1 2012-11-27 16:48:56.097+000010314: debug : udevEventHandleCallback:1467 : udev action: 'remove' 2012-11-27 16:48:56.097+000010314: debug : udevRemoveOneDevice:1218 : Failed to find device to remove that has udev name '/sys/devices/virtual/net/4274X8_0/queues/tx-0' 2012-11-27 16:48:56.097+000010314: debug : virEventPollDispatchHandles:469 : i=7 w=8 2012-11-27 16:48:56.097+000010314: debug : virEventPollDispatchHandles:469 : i=8 w=42213 2012-11-27 16:48:56.097+000010314: debug : virEventPollDispatchHandles:469 : i=9 w=50563 2012-11-27 16:48:56.097+000010314: debug : virEventPollCleanupTimeouts:501 : Cleanup 2 2012-11-27 16:48:56.097+000010314: debug : virEventPollCleanupHandles:549 : Cleanup 10 2012-11-27 16:48:56.097+000010314: debug : virEventRunDefaultImpl:244 : running default event implementation 2012-11-27 16:48:56.097+000010314: debug : virEventPollCleanupTimeouts:501 : Cleanup 2 2012-11-27 16:48:56.097+000010314: debug : virEventPollCleanupHandles:549 : Cleanup 10 2012-11-27 16:48:56.097+000010314: debug : virEventPollMakePollFDs:378 : Prepare n=0 w=1, f=7 e=1 d=0 2012-11-27 16:48:56.097+000010314: debug : virEventPollMakePollFDs:378 : Prepare n=1 w=2, f=9 e=1 d=0 2012-11-27 16:48:56.097+000010314: debug : virEventPollMakePollFDs:378 : Prepare n=2 w=3, f=12 e=1 d=0 2012-11-27 16:48:56.097+000010314: debug : virEventPollMakePollFDs:378 : Prepare n=3 w=4, f=13 e=1 d=0 2012-11-27 16:48:56.097+000010314: debug : virEventPollMakePollFDs:378 : Prepare n=4 w=5, f=6 e=1 d=0 2012-11-27 16:48:56.097+000010314: debug : virEventPollMakePollFDs:378 : Prepare n=5 w=6, f=14 e=1 d=0 2012-11-27 16:48:56.097+000010314: debug : virEventPollMakePollFDs:378 : Prepare n=6 w=7, f=16 e=1 d=0 2012-11-27 16:48:56.097+000010314: debug : virEventPollMakePollFDs:378 : Prepare n=8 w=42213, f=24 e=25 d=0 2012-11-27 16:48:56.097+000010314: debug : virEventPollMakePollFDs:378 : Prepare n=9 w=50563, f=18 e=1 d=0 2012-11-27 16:48:56.097+000010314: debug : virEventPollCalculateTimeout:320 : Calculate expiry of 2 timers 2012-11-27 16:48:56.097+000010314: debug : virEventPollCalculateTimeout:326 : Got a timeout scheduled for 1354034941080 2012-11-27 16:48:56.097+000010314: debug : virEventPollCalculateTimeout:346 : Timeout at 1354034941080 due in 4983 ms 2012-11-27 16:48:56.097+000010314: debug : virEventPollRunOnce:614 : EVENT_POLL_RUN: nhandles=10 timeout=4983 2012-11-27 16:48:56.097+000010314: debug : virEventPollRunOnce:625 : Poll got 1 event(s) 2012-11-27 16:48:56.097+000010314: debug : virEventPollDispatchTimeouts:410 : Dispatch 2 2012-11-27 16:48:56.097+000010314: debug : virEventPollDispatchHandles:455 : Dispatch 10 2012-11-27 16:48:56.097+000010314: debug : virEventPollDispatchHandles:469 : i=0 w=1 2012-11-27 16:48:56.097+000010314: debug : virEventPollDispatchHandles:469 : i=1 w=2 2012-11-27 16:48:56.097+000010314: debug : virEventPollDispatchHandles:469 : i=2 w=3 2012-11-27 16:48:56.097+000010314: debug : virEventPollDispatchHandles:469 : i=3 w=4 2012-11-27 16:48:56.097+000010314: debug : virEventPollDispatchHandles:469 : i=4 w=5 2012-11-27 16:48:56.097+000010314: debug : virEventPollDispatchHandles:469 : i=5 w=6 2012-11-27 16:48:56.097+000010314: debug : virEventPollDispatchHandles:469 : i=6 w=7 2012-11-27 16:48:56.097+000010314: debug : virEventPollDispatchHandles:483 : EVENT_POLL_DISPATCH_HANDLE: watch=7 events=1 2012-11-27 16:48:56.097+000010314: debug : udevEventHandleCallback:1467 : udev action: 'remove' 2012-11-27 16:48:56.097+000010314: debug : udevRemoveOneDevice:1218 : Failed to find device to remove that has udev name '/sys/devices/virtual/net/4274X8_0/queues/rx-0' 2012-11-27 16:48:56.097+000010314: debug : virEventPollDispatchHandles:469 : i=7 w=8 2012-11-27 16:48:56.097+000010314: debug : virEventPollDispatchHandles:469 : i=8 w=42213 2012-11-27 16:48:56.097+000010314: debug : virEventPollDispatchHandles:469 : i=9 w=50563 2012-11-27 16:48:56.097+000010314: debug : virEventPollCleanupTimeouts:501 : Cleanup 2 2012-11-27 16:48:56.097+000010314: debug : virEventPollCleanupHandles:549 : Cleanup 10 2012-11-27 16:48:56.097+000010314: debug : virEventRunDefaultImpl:244 : running default event implementation 2012-11-27 16:48:56.097+000010314: debug : virEventPollCleanupTimeouts:501 : Cleanup 2 2012-11-27 16:48:56.097+000010314: debug : virEventPollCleanupHandles:549 : Cleanup 10 2012-11-27 16:48:56.097+000010314: debug : virEventPollMakePollFDs:378 : Prepare n=0 w=1, f=7 e=1 d=0 2012-11-27 16:48:56.097+000010314: debug : virEventPollMakePollFDs:378 : Prepare n=1 w=2, f=9 e=1 d=0 2012-11-27 16:48:56.097+000010314: debug : virEventPollMakePollFDs:378 : Prepare n=2 w=3, f=12 e=1 d=0 2012-11-27 16:48:56.097+000010314: debug : virEventPollMakePollFDs:378 : Prepare n=3 w=4, f=13 e=1 d=0 2012-11-27 16:48:56.097+000010314: debug : virEventPollMakePollFDs:378 : Prepare n=4 w=5, f=6 e=1 d=0 2012-11-27 16:48:56.097+000010314: debug : virEventPollMakePollFDs:378 : Prepare n=5 w=6, f=14 e=1 d=0 2012-11-27 16:48:56.097+000010314: debug : virEventPollMakePollFDs:378 : Prepare n=6 w=7, f=16 e=1 d=0 2012-11-27 16:48:56.097+000010314: debug : virEventPollMakePollFDs:378 : Prepare n=7 w=8, f=20 e=25 d=0 2012-11-27 16:48:56.097+000010314: debug : virEventPollMakePollFDs:378 : Prepare n=8 w=42213, f=24 e=25 d=0 2012-11-27 16:48:56.097+000010314: debug : virEventPollMakePollFDs:378 : Prepare n=9 w=50563, f=18 e=1 d=0 2012-11-27 16:48:56.097+000010314: debug : virEventPollCalculateTimeout:320 : Calculate expiry of 2 timers 2012-11-27 16:48:56.097+000010314: debug : virEventPollCalculateTimeout:326 : Got a timeout scheduled for 1354034941080 2012-11-27 16:48:56.097+000010314: debug : virEventPollCalculateTimeout:346 : Timeout at 1354034941080 due in 4983 ms 2012-11-27 16:48:56.097+000010314: debug : virEventPollRunOnce:614 : EVENT_POLL_RUN: nhandles=10 timeout=4983 2012-11-27 16:48:56.126+000010314: debug : virEventPollRunOnce:625 : Poll got 1 event(s) 2012-11-27 16:48:56.126+000010314: debug : virEventPollDispatchTimeouts:410 : Dispatch 2 2012-11-27 16:48:56.126+000010314: debug : virEventPollDispatchHandles:455 : Dispatch 10 2012-11-27 16:48:56.126+000010314: debug : virEventPollDispatchHandles:469 : i=0 w=1 2012-11-27 16:48:56.126+000010314: debug : virEventPollDispatchHandles:469 : i=1 w=2 2012-11-27 16:48:56.126+000010314: debug : virEventPollDispatchHandles:469 : i=2 w=3 2012-11-27 16:48:56.126+000010314: debug : virEventPollDispatchHandles:469 : i=3 w=4 2012-11-27 16:48:56.126+000010314: debug : virEventPollDispatchHandles:469 : i=4 w=5 2012-11-27 16:48:56.126+000010314: debug : virEventPollDispatchHandles:469 : i=5 w=6 2012-11-27 16:48:56.126+000010314: debug : virEventPollDispatchHandles:469 : i=6 w=7 2012-11-27 16:48:56.126+000010314: debug : virEventPollDispatchHandles:483 : EVENT_POLL_DISPATCH_HANDLE: watch=7 events=1 2012-11-27 16:48:56.126+000010314: debug : udevEventHandleCallback:1467 : udev action: 'remove' 2012-11-27 16:48:56.126+000010314: debug : udevRemoveOneDevice:1214 : Removing device 'net_4274X8_0_fe_54_00_4b_82_15' with sysfs path '/sys/devices/virtual/net/4274X8_0' 2012-11-27 16:48:56.126+000010314: debug : virEventPollDispatchHandles:469 : i=7 w=8 2012-11-27 16:48:56.126+000010314: debug : virEventPollDispatchHandles:469 : i=8 w=42213 2012-11-27 16:48:56.126+000010314: debug : virEventPollDispatchHandles:469 : i=9 w=50563 2012-11-27 16:48:56.126+000010314: debug : virEventPollCleanupTimeouts:501 : Cleanup 2 2012-11-27 16:48:56.126+000010314: debug : virEventPollCleanupHandles:549 : Cleanup 10 2012-11-27 16:48:56.126+000010314: debug : virEventRunDefaultImpl:244 : running default event implementation 2012-11-27 16:48:56.126+000010314: debug : virEventPollCleanupTimeouts:501 : Cleanup 2 2012-11-27 16:48:56.126+000010314: debug : virEventPollCleanupHandles:549 : Cleanup 10 2012-11-27 16:48:56.126+000010314: debug : virEventPollMakePollFDs:378 : Prepare n=0 w=1, f=7 e=1 d=0 2012-11-27 16:48:56.126+000010314: debug : virEventPollMakePollFDs:378 : Prepare n=1 w=2, f=9 e=1 d=0 2012-11-27 16:48:56.126+000010314: debug : virEventPollMakePollFDs:378 : Prepare n=2 w=3, f=12 e=1 d=0 2012-11-27 16:48:56.126+000010314: debug : virEventPollMakePollFDs:378 : Prepare n=3 w=4, f=13 e=1 d=0 2012-11-27 16:48:56.126+000010314: debug : virEventPollMakePollFDs:378 : Prepare n=4 w=5, f=6 e=1 d=0 2012-11-27 16:48:56.126+000010314: debug : virEventPollMakePollFDs:378 : Prepare n=5 w=6, f=14 e=1 d=0 2012-11-27 16:48:56.126+000010314: debug : virEventPollMakePollFDs:378 : Prepare n=6 w=7, f=16 e=1 d=0 2012-11-27 16:48:56.126+000010314: debug : virEventPollMakePollFDs:378 : Prepare n=7 w=8, f=20 e=25 d=0 2012-11-27 16:48:56.126+000010314: debug : virEventPollMakePollFDs:378 : Prepare n=8 w=42213, f=24 e=25 d=0 2012-11-27 16:48:56.126+000010314: debug : virEventPollMakePollFDs:378 : Prepare n=9 w=50563, f=18 e=1 d=0 2012-11-27 16:48:56.126+000010314: debug : virEventPollCalculateTimeout:320 : Calculate expiry of 2 timers 2012-11-27 16:48:56.126+000010314: debug : virEventPollCalculateTimeout:326 : Got a timeout scheduled for 1354034941080 2012-11-27 16:48:56.126+000010314: debug : virEventPollCalculateTimeout:346 : Timeout at 1354034941080 due in 4954 ms 2012-11-27 16:48:56.126+000010314: debug : virEventPollRunOnce:614 : EVENT_POLL_RUN: nhandles=10 timeout=4954 2012-11-27 16:48:56.194+000010314: debug : virEventPollRunOnce:625 : Poll got 1 event(s) 2012-11-27 16:48:56.194+000010314: debug : virEventPollDispatchTimeouts:410 : Dispatch 2 2012-11-27 16:48:56.194+000010314: debug : virEventPollDispatchHandles:455 : Dispatch 10 2012-11-27 16:48:56.194+000010314: debug : virEventPollDispatchHandles:469 : i=0 w=1 2012-11-27 16:48:56.194+000010314: debug : virEventPollDispatchHandles:469 : i=1 w=2 2012-11-27 16:48:56.194+000010314: debug : virEventPollDispatchHandles:469 : i=2 w=3 2012-11-27 16:48:56.194+000010314: debug : virEventPollDispatchHandles:469 : i=3 w=4 2012-11-27 16:48:56.194+000010314: debug : virEventPollDispatchHandles:469 : i=4 w=5 2012-11-27 16:48:56.194+000010314: debug : virEventPollDispatchHandles:469 : i=5 w=6 2012-11-27 16:48:56.194+000010314: debug : virEventPollDispatchHandles:469 : i=6 w=7 2012-11-27 16:48:56.194+000010314: debug : virEventPollDispatchHandles:469 : i=7 w=8 2012-11-27 16:48:56.194+000010314: debug : virEventPollDispatchHandles:483 : EVENT_POLL_DISPATCH_HANDLE: watch=8 events=9 2012-11-27 16:48:56.194+000010314: debug : virObjectRef:168 : OBJECT_REF: obj=0x7f6418000a10 2012-11-27 16:48:56.195+000010314: error : qemuMonitorIO:614 : internal error End of file from monitor 2012-11-27 16:48:56.195+000010314: debug : qemuMonitorIO:647 : Error on monitor internal error End of file from monitor 2012-11-27 16:48:56.195+000010314: debug : virEventPollUpdateHandle:146 : EVENT_POLL_UPDATE_HANDLE: watch=8 events=12 2012-11-27 16:48:56.195+000010314: debug : virEventPollInterruptLocked:697 : Skip interrupt, 1 904570880 2012-11-27 16:48:56.195+000010314: debug : virObjectUnref:135 : OBJECT_UNREF: obj=0x7f6418000a10 2012-11-27 16:48:56.195+000010314: debug : qemuMonitorIO:670 : Triggering EOF callback 2012-11-27 16:48:56.195+000010314: debug : qemuProcessHandleMonitorEOF:283 : Received EOF on 0x7f64200072f0 '4274X8' 2012-11-27 16:48:56.280+000010319: debug : virObjectRef:168 : OBJECT_REF: obj=0x7f64200072f0 2012-11-27 16:48:56.280+000010314: debug : qemuProcessStop:3992 : Shutting down VM '4274X8' pid=22404 flags=0 2012-11-27 16:48:56.280+000010314: debug : virFileClose:72 : Closed fd 22 2012-11-27 16:48:56.280+000010314: debug : qemuMonitorClose:838 : QEMU_MONITOR_CLOSE: mon=0x7f6418000a10 refs=2 2012-11-27 16:48:56.280+000010314: debug : virEventPollRemoveHandle:175 : EVENT_POLL_REMOVE_HANDLE: watch=8 2012-11-27 16:48:56.280+000010314: debug : virEventPollRemoveHandle:188 : mark delete 7 20 2012-11-27 16:48:56.280+000010314: debug : virEventPollInterruptLocked:697 : Skip interrupt, 1 904570880 2012-11-27 16:48:56.280+000010314: debug : virFileClose:72 : Closed fd 20 2012-11-27 16:48:56.280+000010314: debug : virObjectUnref:135 : OBJECT_UNREF: obj=0x7f6418000a10 2012-11-27 16:48:56.280+000010314: debug : qemuProcessKill:3941 : vm=4274X8 pid=22404 flags=5 2012-11-27 16:48:56.280+000010314: debug : virProcessKillPainfully:253 : vpid=22404 force=1 2012-11-27 16:48:56.280+000010314: debug : virObjectRef:168 : OBJECT_REF: obj=0x7f64200072f0 2012-11-27 16:48:56.280+000010314: debug : virObjectUnref:135 : OBJECT_UNREF: obj=0x7f64200072f0 2012-11-27 16:48:56.280+000010314: debug : qemuDomainCleanupRun:1996 : driver=0x7f642001bd70, vm=4274X8 2012-11-27 16:48:56.280+000010314: debug : qemuProcessAutoDestroyRemove:4463 : vm=4274X8 2012-11-27 16:48:56.280+000010314: debug : qemuDriverCloseCallbackUnset:661 : vm=4274X8, uuid=3b14a4c4-19e0-11e2-ad58-8ccdadf125ba, cb=0x7f6428cd7800 2012-11-27 16:48:56.280+000010314: debug : virSecurityDACRestoreSecurityAllLabel:726 : Restoring security label on 4274X8 migrated=0 2012-11-27 16:48:56.280+000010314: info : virSecurityDACRestoreSecurityFileLabel:315 : Restoring DAC user and group on '/dev/LVM/4274X8' 2012-11-27 16:48:56.280+000010314: info : virSecurityDACSetOwnership:271 : Setting DAC user and group on '/dev/dm-4' to '0:0' 2012-11-27 16:48:56.280+000010314: debug : virObjectUnref:135 : OBJECT_UNREF: obj=0x7f64200a24a0 2012-11-27 16:48:56.280+000010314: debug : virObjectUnref:137 : OBJECT_DISPOSE: obj=0x7f64200a24a0 2012-11-27 16:48:56.280+000010314: debug : virObjectUnref:135 : OBJECT_UNREF: obj=0x7f64200072f0 2012-11-27 16:48:56.280+000010314: debug : virEventPollDispatchHandles:469 : i=8 w=42213 2012-11-27 16:48:56.280+000010314: debug : virEventPollDispatchHandles:469 : i=9 w=50563 2012-11-27 16:48:56.280+000010314: debug : virEventPollCleanupTimeouts:501 : Cleanup 2 2012-11-27 16:48:56.280+000010314: debug : virEventPollCleanupHandles:549 : Cleanup 10 2012-11-27 16:48:56.280+000010314: debug : virEventPollCleanupHandles:562 : EVENT_POLL_PURGE_HANDLE: watch=8 2012-11-27 16:48:56.280+000010314: debug : virObjectUnref:135 : OBJECT_UNREF: obj=0x7f6418000a10 2012-11-27 16:48:56.280+000010314: debug : virObjectUnref:137 : OBJECT_DISPOSE: obj=0x7f6418000a10 2012-11-27 16:48:56.280+000010314: debug : qemuMonitorDispose:247 : mon=0x7f6418000a10 2012-11-27 16:48:56.280+000010314: debug : virObjectUnref:135 : OBJECT_UNREF: obj=0x7f64200072f0 2012-11-27 16:48:56.280+000010314: debug : virEventRunDefaultImpl:244 : running default event implementation 2012-11-27 16:48:56.280+000010314: debug : virEventPollCleanupTimeouts:501 : Cleanup 2 2012-11-27 16:48:56.280+000010314: debug : virEventPollCleanupHandles:549 : Cleanup 9 2012-11-27 16:48:56.280+000010314: debug : virEventPollMakePollFDs:378 : Prepare n=0 w=1, f=7 e=1 d=0 2012-11-27 16:48:56.280+000010314: debug : virEventPollMakePollFDs:378 : Prepare n=1 w=2, f=9 e=1 d=0 2012-11-27 16:48:56.280+000010314: debug : virEventPollMakePollFDs:378 : Prepare n=2 w=3, f=12 e=1 d=0 2012-11-27 16:48:56.281+000010314: debug : virEventPollMakePollFDs:378 : Prepare n=3 w=4, f=13 e=1 d=0 2012-11-27 16:48:56.281+000010314: debug : virEventPollMakePollFDs:378 : Prepare n=4 w=5, f=6 e=1 d=0 2012-11-27 16:48:56.281+000010314: debug : virEventPollMakePollFDs:378 : Prepare n=5 w=6, f=14 e=1 d=0 2012-11-27 16:48:56.281+000010314: debug : virEventPollMakePollFDs:378 : Prepare n=6 w=7, f=16 e=1 d=0 2012-11-27 16:48:56.281+000010314: debug : virEventPollMakePollFDs:378 : Prepare n=7 w=42213, f=24 e=25 d=0 2012-11-27 16:48:56.281+000010314: debug : virEventPollMakePollFDs:378 : Prepare n=8 w=50563, f=18 e=1 d=0 2012-11-27 16:48:56.281+000010314: debug : virEventPollCalculateTimeout:320 : Calculate expiry of 2 timers 2012-11-27 16:48:56.281+000010314: debug : virEventPollCalculateTimeout:326 : Got a timeout scheduled for 1354034941080 2012-11-27 16:48:56.281+000010314: debug : virEventPollCalculateTimeout:346 : Timeout at 1354034941080 due in 4799 ms 2012-11-27 16:48:56.281+000010314: debug : virEventPollRunOnce:614 : EVENT_POLL_RUN: nhandles=9 timeout=4799 2012-11-27 16:48:56.281+000010319: debug : virObjectUnref:135 : OBJECT_UNREF: obj=0x7f64200072f0 2012-11-27 16:48:56.281+000010319: debug : virObjectUnref:137 : OBJECT_DISPOSE: obj=0x7f64200072f0 2012-11-27 16:48:56.281+000010319: debug : virDomainObjDispose:1746 : obj=0x7f64200072f0 ====== end of log =====

3 4

[libvirt] [PATCH] docs: fix some typos in examples
by Eric Blake 14 Dec '12

14 Dec '12

As detected in https://bugzilla.redhat.com/show_bug.cgi?id=887187 * docs/formatdomain.html.in: Fix XML typos. --- Pushing under the trivial rule. docs/formatdomain.html.in | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index 8e234fd..b845a8a 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -1048,7 +1048,7 @@ <hap/> <privnet/> <hyperv> - <relaxed state='on'> + <relaxed state='on'/> </hyperv> </features> @@ -2584,7 +2584,7 @@ </interface> <interface type='bridge'> <source bridge='ovsbr'/> - <virtualport type='openvswitch'/> + <virtualport type='openvswitch'> <parameters profileid='menial' interfaceid='09b11c53-8b5c-4eeb-8f00-d84eaa0aaa4f'/> </virtualport> </interface> @@ -3871,7 +3871,7 @@ qemu-kvm -net nic,model=? /dev/null <serial type="dev"> <source path="/dev/ttyS0"/> <target port="1"/> - </serial> + </serial> </devices> ...</pre> -- 1.8.0.2

1 0

[libvirt] [PATCH] sanlock: Re-add lockspace unconditionally
by Michal Privoznik 14 Dec '12

14 Dec '12

Currently, if sanlock is already registering a lockspace other libvirtd instances (from other hosts) obtain -EINPROGRESS. On sufficiently new sanlock, sanlock_inq_lockspace() is called, which suspend execution until lockspace state is changed. With current libvirt implementation, we fail to retry adding the lockspace again but continue in error path. Therefore we produce meaningless error message: virLockManagerSanlockSetupLockspace:363 : Unable to add lockspace /var/lib/libvirt/sanlock/__LIBVIRT__DISKS__: Success qemudLoadDriverConfig:558 : Failed to load lock manager sanlock We should try to re-add the lockspace after its state change to be sure it was added successfully. In fact, with sufficiently new sanlock we can just avoid dummy usleep() which is used if there's no inquire API. --- src/locking/lock_driver_sanlock.c | 20 ++++++++------------ 1 files changed, 8 insertions(+), 12 deletions(-) diff --git a/src/locking/lock_driver_sanlock.c b/src/locking/lock_driver_sanlock.c index 430e11e..a072343 100644 --- a/src/locking/lock_driver_sanlock.c +++ b/src/locking/lock_driver_sanlock.c @@ -197,9 +197,7 @@ static int virLockManagerSanlockSetupLockspace(void) struct sanlk_lockspace ls; char *path = NULL; char *dir = NULL; -#ifndef HAVE_SANLOCK_INQ_LOCKSPACE int retries = LOCKSPACE_RETRIES; -#endif if (virAsprintf(&path, "%s/%s", driver->autoDiskLeasePath, @@ -332,25 +330,23 @@ static int virLockManagerSanlockSetupLockspace(void) * either call a sanlock API that blocks us until lockspace changes state, * or we can fallback to polling. */ -#ifndef HAVE_SANLOCK_INQ_LOCKSPACE retry: -#endif if ((rv = sanlock_add_lockspace(&ls, 0)) < 0) { - if (-rv == EINPROGRESS) { + if (-rv == EINPROGRESS && --retries) { #ifdef HAVE_SANLOCK_INQ_LOCKSPACE /* we have this function which blocks until lockspace change the * state. It returns 0 if lockspace has been added, -ENOENT if it - * hasn't. XXX should we goto retry? */ + * hasn't. */ VIR_DEBUG("Inquiring lockspace"); - rv = sanlock_inq_lockspace(&ls, SANLK_INQ_WAIT); + if (sanlock_inq_lockspace(&ls, SANLK_INQ_WAIT) < 0) + VIR_DEBUG("Unable to inquire lockspace"); #else /* fall back to polling */ - if (retries--) { - usleep(LOCKSPACE_SLEEP * 1000); - VIR_DEBUG("Retrying to add lockspace (left %d)", retries); - goto retry; - } + VIR_DEBUG("Sleeping for %dms", LOCKSPACE_SLEEP); + usleep(LOCKSPACE_SLEEP * 1000); #endif + VIR_DEBUG("Retrying to add lockspace (left %d)", retries); + goto retry; } if (-rv != EEXIST) { if (rv <= -200) -- 1.7.8.6

2 2

[libvirt] [PATCH] install: fix virtlockd installation
by Eric Blake 14 Dec '12

14 Dec '12

The virtlockd daemon scripts were lousy, when compared to their counterparts in daemon/Makefile.am. In particular, when init scripts were selected, this resulted in 'make distcheck' failing due to failure to clean up src/virtlockd.init. * src/Makefile.am (install-systemd): Fix dependencies. Use MKDIR_P. (uninstall-systemd): Remove empty directory. Use fewer processes. (install-init, install-sysconfig): Use MKDIR_P. (uninstall-init): Remove correct file, and also empty directory. (uninstall-sysconfig): Remove empty directory. (CLEANFILES): Clean up built sources. --- src/Makefile.am | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index 25b6e3f..dd7e219 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1628,24 +1628,26 @@ EXTRA_DIST += locking/virtlockd.sysconf \ locking/test_libvirt_lockd.aug.in install-sysconfig: - mkdir -p $(DESTDIR)$(sysconfdir)/sysconfig + $(MKDIR_P) $(DESTDIR)$(sysconfdir)/sysconfig $(INSTALL_DATA) $(srcdir)/locking/virtlockd.sysconf \ $(DESTDIR)$(sysconfdir)/sysconfig/virtlockd uninstall-sysconfig: rm -f $(DESTDIR)$(sysconfdir)/sysconfig/virtlockd + rmdir $(DESTDIR)$(sysconfdir)/sysconfig || : EXTRA_DIST += locking/virtlockd.init.in if WITH_LIBVIRTD if LIBVIRT_INIT_SCRIPT_RED_HAT install-init:: virtlockd.init install-sysconfig - mkdir -p $(DESTDIR)$(sysconfdir)/rc.d/init.d + $(MKDIR_P) $(DESTDIR)$(sysconfdir)/rc.d/init.d $(INSTALL_SCRIPT) virtlockd.init \ $(DESTDIR)$(sysconfdir)/rc.d/init.d/virtlockd uninstall-init:: uninstall-sysconfig - rm -f $(DESTDIR)$(sysconfdir)/rc.d/init.d/libvirtd + rm -f $(DESTDIR)$(sysconfdir)/rc.d/init.d/virtlockd + rmdir $(DESTDIR)$(sysconfdir)/rc.d/init.d || : BUILT_SOURCES += virtlockd.init else @@ -1677,16 +1679,17 @@ SYSTEMD_UNIT_DIR = /lib/systemd/system BUILT_SOURCES += virtlockd.service virtlockd.socket -install-systemd: virtlockd.init install-sysconfig - mkdir -p $(DESTDIR)$(SYSTEMD_UNIT_DIR) +install-systemd: virtlockd.service virtlockd.socket install-sysconfig + $(MKDIR_P) $(DESTDIR)$(SYSTEMD_UNIT_DIR) $(INSTALL_SCRIPT) virtlockd.service \ $(DESTDIR)$(SYSTEMD_UNIT_DIR)/ $(INSTALL_SCRIPT) virtlockd.socket \ $(DESTDIR)$(SYSTEMD_UNIT_DIR)/ uninstall-systemd: uninstall-sysconfig - rm -f $(DESTDIR)$(SYSTEMD_UNIT_DIR)/virtlockd.service - rm -f $(DESTDIR)$(SYSTEMD_UNIT_DIR)/virtlockd.socket + rm -f $(DESTDIR)$(SYSTEMD_UNIT_DIR)/virtlockd.service \ + $(DESTDIR)$(SYSTEMD_UNIT_DIR)/virtlockd.socket + rmdir $(DESTDIR)$(SYSTEMD_UNIT_DIR) || : else install-systemd: uninstall-systemd: @@ -2050,5 +2053,6 @@ endif rmdir "$(DESTDIR)$(localstatedir)/lib/libvirt" ||: CLEANFILES += *.gcov .libs/*.gcda .libs/*.gcno *.gcno *.gcda *.i *.s +CLEANFILES += $(BUILT_SOURCES) DISTCLEANFILES += $(GENERATED_SYM_FILES) MAINTAINERCLEANFILES += $(REMOTE_DRIVER_GENERATED) $(VIR_NET_RPC_GENERATED) -- 1.8.0.2

3 6

[libvirt] [PATCH] docs: Fix location of libvirt.conf and auth.conf
by Michał Łomnicki 14 Dec '12

14 Dec '12

For a unprivileged user libvirt.conf and auth.conf are looked up in $XDG_CONFIG_HOME but the docs incorrectly state that it's $XDG_CONFIG_DIR. --- docs/auth.html.in | 2 +- docs/uri.html.in | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/auth.html.in b/docs/auth.html.in index d792eb1..929afd0 100644 --- a/docs/auth.html.in +++ b/docs/auth.html.in @@ -25,7 +25,7 @@ for the authentication file using the following sequence: variable.</li> <li>The file path specified by the "authfile=/some/file" URI query parameter</li> - <li>The file $XDG_CONFIG_DIR/libvirt/auth.conf</li> + <li>The file $XDG_CONFIG_HOME/libvirt/auth.conf</li> <li>The file /etc/libvirt/auth.conf</li> </ol> diff --git a/docs/uri.html.in b/docs/uri.html.in index 5812ca9..97a1cdb 100644 --- a/docs/uri.html.in +++ b/docs/uri.html.in @@ -30,7 +30,7 @@ virConnectPtr conn = virConnectOpenReadOnly ("test:///default"); To simplify life for administrators, it is possible to setup URI aliases in a libvirt client configuration file. The configuration file is <code>/etc/libvirt/libvirt.conf</code> -for the root user, or <code>$XDG_CONFIG_DIR/libvirt/libvirt.conf</code> for any unprivileged user. +for the root user, or <code>$XDG_CONFIG_HOME/libvirt/libvirt.conf</code> for any unprivileged user. In this file, the following syntax can be used to setup aliases -- 1.7.9.5

2 1

[libvirt] [PATCH 0/2] Another round of build fixes for lockd
by Jiri Denemark 14 Dec '12

14 Dec '12

make rpm finally succeeds with these two patches. Jiri Denemark (2): build: Install both qemu-lockd.conf and qemu-sanlock.conf spec: Include lockd files in libvirt-daemon package libvirt.spec.in | 4 ++++ src/Makefile.am | 5 +++-- 2 files changed, 7 insertions(+), 2 deletions(-) -- 1.8.0.2

2 5

[libvirt] [test-API][PATCH v2] Add 2 vcpupin cases cover config and live flags
by Wayne Sun 14 Dec '12

14 Dec '12

v1: add 2 vcpupin cases * use pinVcpuFlags to pin domain vcpu to host cpu * 2 cases cover config and live flags * cpulist with '^', '-' and ',' is supported to give multiple host cpus * vcpus and vcpuPinInfo are used as part of the checking * a sample conf is added v2: move format cpulist functions to utils * the format cpulist functions could be reused for cases need parse param with '-', '^' and ','. Signed-off-by: Wayne Sun <gsun(a)redhat.com> --- cases/vcpupin.conf | 67 +++++++++++++++++++++++ repos/setVcpus/vcpupin_config.py | 109 ++++++++++++++++++++++++++++++++++++++ repos/setVcpus/vcpupin_live.py | 101 +++++++++++++++++++++++++++++++++++ utils/utils.py | 71 ++++++++++++++++++++++++ 4 files changed, 348 insertions(+), 0 deletions(-) create mode 100644 cases/vcpupin.conf create mode 100644 repos/setVcpus/vcpupin_config.py create mode 100644 repos/setVcpus/vcpupin_live.py diff --git a/cases/vcpupin.conf b/cases/vcpupin.conf new file mode 100644 index 0000000..880247f --- /dev/null +++ b/cases/vcpupin.conf @@ -0,0 +1,67 @@ +domain:install_linux_cdrom + guestname + $defaultname + guestos + $defaultos + guestarch + $defaultarch + vcpu + 4 + memory + $defaultmem + hddriver + $defaulthd + nicdriver + $defaultnic + imageformat + qcow2 + +setVcpus:vcpupin_live + guestname + $defaultname + vcpu + 0 + cpulist + 2,4-6,^4 + +setVcpus:vcpupin_live + guestname + $defaultname + vcpu + 1 + cpulist + 3 + +domain:destroy + guestname + $defaultname + +setVcpus:vcpupin_config + guestname + $defaultname + vcpu + 2 + cpulist + 0-8,^1 + +setVcpus:vcpupin_config + guestname + $defaultname + vcpu + 3 + cpulist + ^2,0-8 + +domain:start + guestname + $defaultname + +domain:destroy + guestname + $defaultname + +domain:undefine + guestname + $defaultname + +options cleanup=enable diff --git a/repos/setVcpus/vcpupin_config.py b/repos/setVcpus/vcpupin_config.py new file mode 100644 index 0000000..80df659 --- /dev/null +++ b/repos/setVcpus/vcpupin_config.py @@ -0,0 +1,109 @@ +#!/usr/bin/env python +# Test domain vcpu pin with flag VIR_DOMAIN_AFFECT_CONFIG, check +# domain config xml with vcpupin configuration. + +import re +from xml.dom import minidom + +import libvirt +from libvirt import libvirtError + +from src import sharedmod +from utils import utils + +required_params = ('guestname', 'vcpu', 'cpulist',) +optional_params = {} + +def vcpupin_check(domobj, vcpu, cpumap): + """check domain config xml with vcpupin element + """ + guestxml = domobj.XMLDesc(2) + logger.debug("domain %s xml :\n%s" %(domobj.name(), guestxml)) + + doc = minidom.parseString(guestxml) + vcpupin = doc.getElementsByTagName('vcpupin') + if not vcpupin: + logger.error("no vcpupin element in domain xml") + return 1 + + for i in range(len(vcpupin)): + if vcpupin[i].hasAttribute('vcpu') and \ + vcpupin[i].hasAttribute('cpuset'): + vcpu_attr = vcpupin[i].getAttributeNode('vcpu') + cpu_attr = vcpupin[i].getAttributeNode('cpuset') + if int(vcpu_attr.nodeValue) == vcpu: + cpulist = cpu_attr.nodeValue + if cpulist == '': + cpumap_tmp = () + for i in range(maxcpu): + cpumap_tmp += (False,) + else: + cpumap_tmp = utils.param_to_tuple(cpulist, maxcpu) + + if cpumap_tmp == cpumap: + logger.info("cpuset is as expected in domain xml") + return 0 + else: + logger.error("cpuset is not as expected in domain xml") + return 1 + + if i == len(vcpupin) - 1: + logger.error("the vcpupin element with given vcpu is not found") + return 1 + +def vcpupin_config(params): + """pin domain vcpu to host cpu with config flag + """ + global logger + logger = params['logger'] + params.pop('logger') + guestname = params['guestname'] + vcpu = int(params['vcpu']) + cpulist = params['cpulist'] + + logger.info("the name of virtual machine is %s" % guestname) + logger.info("the given vcpu is %s" % vcpu) + logger.info("the given cpulist is %s" % cpulist) + + global maxcpu + maxcpu = utils.get_host_cpus() + logger.info("%s physical cpu on host" % maxcpu) + + conn = sharedmod.libvirtobj['conn'] + + try: + domobj = conn.lookupByName(guestname) + cpumap = utils.param_to_tuple(cpulist, maxcpu) + + if not cpumap: + logger.error("cpulist: Invalid format") + return 1 + + logger.debug("cpumap for vcpu pin is:") + logger.debug(cpumap) + + logger.info("pin domain vcpu %s to host cpulist %s with flag: %s" % + (vcpu, cpulist, libvirt.VIR_DOMAIN_AFFECT_CONFIG)) + domobj.pinVcpuFlags(vcpu, cpumap, libvirt.VIR_DOMAIN_AFFECT_CONFIG) + + logger.info("check vcpu pin info") + ret = domobj.vcpuPinInfo(libvirt.VIR_DOMAIN_AFFECT_CONFIG) + logger.debug("vcpu pin info is:") + logger.debug(ret) + if ret[vcpu] == cpumap: + logger.info("vcpu pin info is expected") + else: + logger.error("vcpu pin info is not expected") + return 1 + except libvirtError, e: + logger.error("libvirt call failed: " + str(e)) + return 1 + + logger.info("check domain vcpupin configuration in xml") + ret = vcpupin_check(domobj, vcpu, cpumap) + if ret: + logger.error("domain vcpu pin check failed") + return 1 + else: + logger.info("domain vcpu pin check succeed") + return 0 diff --git a/repos/setVcpus/vcpupin_live.py b/repos/setVcpus/vcpupin_live.py new file mode 100644 index 0000000..c3dfe8e --- /dev/null +++ b/repos/setVcpus/vcpupin_live.py @@ -0,0 +1,101 @@ +#!/usr/bin/env python +# Test domain vcpu pin with flag VIR_DOMAIN_AFFECT_LIVE, check +# vcpu subprocess status under domain task list on host. + +import re + +import libvirt +from libvirt import libvirtError + +from src import sharedmod +from utils import utils + +required_params = ('guestname', 'vcpu', 'cpulist',) +optional_params = {} + +def vcpupin_check(guestname, vcpu, cpumap): + """check vcpu subprocess status of the running virtual machine + grep Cpus_allowed_list /proc/PID/task/*/status + """ + tmp_str = '' + cmd = "cat /var/run/libvirt/qemu/%s.pid" % guestname + status, pid = utils.exec_cmd(cmd, shell=True) + if status: + logger.error("failed to get the pid of domain %s" % guestname) + return 1 + + cmd = "grep Cpus_allowed_list /proc/%s/task/*/status" % pid[0] + status, output = utils.exec_cmd(cmd, shell=True) + logger.debug("command '%s' output is:" % cmd) + for i in range(len(output)): + tmp_str += ''.join(output[i]) + '\n' + logger.debug(tmp_str) + + task_list = output[1:] + vcpu_task = task_list[int(vcpu)] + cpulist = vcpu_task.split('\t')[1] + ret = utils.param_to_tuple(cpulist, maxcpu) + + if ret == cpumap: + logger.info("vcpu process cpus allowed list is expected") + return 0 + else: + logger.error("vcpu process cpus allowed list is not expected") + return 1 + +def vcpupin_live(params): + """pin domain vcpu to host cpu with live flag + """ + global logger + logger = params['logger'] + params.pop('logger') + guestname = params['guestname'] + vcpu = int(params['vcpu']) + cpulist = params['cpulist'] + + logger.info("the name of virtual machine is %s" % guestname) + logger.info("the given vcpu is %s" % vcpu) + logger.info("the given cpulist is %s" % cpulist) + + global maxcpu + maxcpu = utils.get_host_cpus() + logger.info("%s physical cpu on host" % maxcpu) + + conn = sharedmod.libvirtobj['conn'] + + try: + domobj = conn.lookupByName(guestname) + cpumap = utils.param_to_tuple(cpulist, maxcpu) + if not cpumap: + logger.error("cpulist: Invalid format") + return 1 + + logger.debug("cpumap for vcpu pin is:") + logger.debug(cpumap) + + logger.info("pin domain vcpu %s to host cpu %s with flag: %s" % + (vcpu, cpulist, libvirt.VIR_DOMAIN_AFFECT_LIVE)) + domobj.pinVcpuFlags(vcpu, cpumap, libvirt.VIR_DOMAIN_AFFECT_LIVE) + + logger.info("check vcpus info") + ret = domobj.vcpus() + logger.debug("vcpus info is:") + logger.debug(ret) + if ret[1][vcpu] == cpumap: + logger.info("vcpus info is expected") + else: + logger.error("vcpus info is not expected") + return 1 + + except libvirtError, e: + logger.error("libvirt call failed: " + str(e)) + return 1 + + logger.info("check vcpu pin status on host") + ret = vcpupin_check(guestname, vcpu, cpumap) + if ret: + logger.error("domain vcpu pin failed") + return 1 + else: + logger.info("domain vcpu pin succeed") + return 0 diff --git a/utils/utils.py b/utils/utils.py index e242847..36171cf 100644 --- a/utils/utils.py +++ b/utils/utils.py @@ -645,6 +645,77 @@ def run_mount_app(hostname, username, password, print "mount fail" return 1 +def format_parammap(paramlist, map_test, length): + """paramlist contains numbers which can be divided by '-', '^' and + ',', map_test is a tuple for getting it's content (True or False) + and form the new tuple base on numbers in paramlist, length is + the length of the return tuple + """ + parammap = () + + try: + if re.match('\^', paramlist): + unuse = int(re.split('\^', paramlist)[1]) + for i in range(length): + if i == unuse: + parammap += (False,) + else: + parammap += (map_test[i],) + + elif '-' in paramlist: + param = re.split('-', paramlist) + if not len(param) == 2: + return False + if not int(param[1]) < length: + print "paramlist: out of max range" + return False + if int(param[1]) < int(param[0]): + return False + + for i in range(length): + if i in range(int(param[0]), int(param[1])+1): + parammap += (True,) + else: + parammap += (map_test[i],) + + else: + for i in range(length): + if i == int(paramlist): + parammap += (True,) + else: + parammap += (map_test[i],) + + return parammap + except ValueError, e: + print "ValueError: " + str(e) + return False + +def param_to_tuple(paramlist, length): + """paramlist contains numbers which can be divided by '-', '^' and + ',', length is the length of the return tuple, return tuple only + have True or False value + """ + map_test = () + for i in range(length): + map_test += (False,) + + if ',' in paramlist: + param = re.split(',', paramlist) + for i in range(len(param)): + parammap = format_parammap(param[i], map_test, length) + if parammap: + map_test = parammap + else: + return False + return parammap + + else: + parammap = format_parammap(paramlist, map_test, length) + if parammap: + return parammap + else: + return False + def run_wget_app(hostname, username, password, file_url, logger): """Simple test for wget app on specified host""" cmd_line = "wget -P /tmp %s -o /tmp/wget.log" % (file_url) -- 1.7.1

2 1

[libvirt] [PATCH] qemu: don't fail update netdev on bridge detach failure
by Laine Stump 14 Dec '12

14 Dec '12

When a network device's bridge connection is changed by virDomainUpdateDevice, libvirt first removes the netdev's tap from its old bridge, then adds it to the new bridge. Sometimes, due to a network being destroyed while a guest device is still attached, the tap may already be "removed" from the old bridge (or the old bridge may not even exist any more); the existing code was needlessly failing the update when this happened, making it impossible to recover from the situation without completely detaching (i.e. removing) the netdev from the guest and re-attaching. Instead of failing the entire operation when removal of the tap from the old bridge fails, this patch changes qemuDomainChangeNetBridge to just log a warning and continue, allowing a reasonable recover from the situation. (you'll appreciate this change if you ever accidentally destroy a network while your guests are still using it). --- src/qemu/qemu_hotplug.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index 3dfdb65..e9a5e35 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -1306,8 +1306,14 @@ qemuDomainChangeNetBridge(virConnectPtr conn, if (oldbridge) { ret = virNetDevBridgeRemovePort(oldbridge, olddev->ifname); virDomainAuditNet(vm, olddev, NULL, "detach", ret == 0); - if (ret < 0) - goto cleanup; + if (ret < 0) { + /* warn but continue - possibly the old network + * had been destroyed and reconstructed, leaving the + * tap device orphaned. + */ + VIR_WARN("Unable to detach device %s from bridge %s", + olddev->ifname, oldbridge); + } } ret = virNetDevBridgeAddPort(newbridge, olddev->ifname); -- 1.7.11.7

2 2

[libvirt] [PATCH] build: use fewer cat processes
by Eric Blake 14 Dec '12

14 Dec '12

* src/Makefile.am (libvirt.syms): Let cat loop for us. --- I'll wait for a review before pushing, rather than claiming it is trivial. src/Makefile.am | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index 33b4ab0..cf6096a 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1457,9 +1457,7 @@ libvirt.syms: libvirt_public.syms $(USED_SYM_FILES) \ printf '\n\n# Private symbols\n\n' >>$@-tmp && \ printf 'LIBVIRT_PRIVATE_$(VERSION) {\n\n' >>$@-tmp && \ printf 'global:\n\n' >>$@-tmp && \ - for file in $(USED_SYM_FILES); do \ - cat $$file >>$@-tmp; \ - done && \ + cat $(USED_SYM_FILES) >>$@-tmp && \ printf '\n\nlocal:\n*;\n\n};' >>$@-tmp && \ chmod a-w $@-tmp && \ mv $@-tmp libvirt.syms -- 1.8.0.2

2 2

[libvirt] [PATCH] build: Distribute more files
by Jiri Denemark 13 Dec '12

13 Dec '12

--- src/Makefile.am | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index 2791cb6..33b4ab0 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -367,6 +367,7 @@ check-symfile: endif check-symsorting: $(AM_V_GEN)$(PERL) $(srcdir)/check-symsorting.pl $(USED_SYM_FILES) +EXTRA_DIST += check-symfile.pl check-symsorting.pl PROTOCOL_STRUCTS = \ $(srcdir)/remote_protocol-structs \ @@ -389,7 +390,7 @@ else !WITH_REMOTE # re-generated when configured --without-remote. check-protocol: endif -EXTRA_DIST += $(PROTOCOL_STRUCTS) check-symfile.pl +EXTRA_DIST += $(PROTOCOL_STRUCTS) check-local: check-protocol check-symfile check-symsorting .PHONY: check-protocol $(PROTOCOL_STRUCTS:structs=struct) @@ -1575,6 +1576,9 @@ lockd_la_SOURCES = \ lockd_la_CFLAGS = -I$(top_srcdir)/src/conf $(AM_CFLAGS) lockd_la_LDFLAGS = -module -avoid-version lockd_la_LIBADD = ../gnulib/lib/libgnu.la libvirt-net-rpc.la libvirt-net-rpc-client.la +augeas_DATA += locking/libvirt_lockd.aug +augeastest_DATA += test_libvirt_lockd.aug +CLEANFILES += test_libvirt_lockd.aug if WITH_DTRACE_PROBES lockd_la_LIBADD += libvirt_probes.lo endif @@ -1620,7 +1624,10 @@ EXTRA_DIST += $(LOCK_DAEMON_SOURCES) \ $(LOCK_DRIVER_LOCKD_SOURCES) endif -EXTRA_DIST += locking/virtlockd.sysconf +EXTRA_DIST += locking/virtlockd.sysconf \ + locking/lockd.conf \ + locking/libvirt_lockd.aug \ + locking/test_libvirt_lockd.aug.in install-sysconfig: mkdir -p $(DESTDIR)$(sysconfdir)/sysconfig -- 1.8.0.2

2 3

[libvirt] [PATCH] selinux: fix NULL dereference in GetSecurityMountOptions
by Ján Tomko 13 Dec '12

13 Dec '12

In the case of an OOM error in virDomainDefGetSecurityLabelDef, secdef is set to NULL, then dereferenced while printing the debug message. --- src/security/security_selinux.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/src/security/security_selinux.c b/src/security/security_selinux.c index 5409e32..9134bc8 100644 --- a/src/security/security_selinux.c +++ b/src/security/security_selinux.c @@ -1993,7 +1993,8 @@ virSecuritySELinuxGetSecurityMountOptions(virSecurityManagerPtr mgr, return NULL; } - VIR_DEBUG("imageLabel=%s opts=%s", secdef->imagelabel, opts); + VIR_DEBUG("imageLabel=%s opts=%s", + secdef ? secdef->imagelabel : "(null)", opts); return opts; } -- 1.7.8.6

3 2

[libvirt] [PATCH] build: Fix VPATH build
by Jiri Denemark 13 Dec '12

13 Dec '12

$(srcdir) is already part of $$file since commit f1f9a7ac7e. --- Pushed as a build-breaker. src/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Makefile.am b/src/Makefile.am index bb80992..7c2d8ed 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1451,7 +1451,7 @@ libvirt.syms: libvirt_public.syms $(USED_SYM_FILES) \ printf 'LIBVIRT_PRIVATE_$(VERSION) {\n\n' >>$@-tmp && \ printf 'global:\n\n' >>$@-tmp && \ for file in $(USED_SYM_FILES); do \ - cat $(srcdir)/$$file >>$@-tmp; \ + cat $$file >>$@-tmp; \ done && \ printf '\n\nlocal:\n*;\n\n};' >>$@-tmp && \ chmod a-w $@-tmp && \ -- 1.8.0.2

2 1

[libvirt] [PATCH] network: prevent dnsmasq from listening on localhost
by Laine Stump 13 Dec '12

13 Dec '12

This patch resolves the problem reported in: https://bugzilla.redhat.com/show_bug.cgi?id=886663 The source of the problem was the fix for CVE 2011-3411: https://bugzilla.redhat.com/show_bug.cgi?id=833033 which was originally committed upstream in commit 753ff83a50263d6975f88d6605d4b5ddfcc97560. That commit improperly removed the "--except-interface lo" from dnsmasq commandlines when --bind-dynamic was used (based on comments in the latter bug). It turns out that the problem reported in the CVE could be eliminated without removing "--except-interface lo", and removing it actually caused each instance of dnsmasq to listen on localhost on port 53, which created a new problem: If another instance of dnsmasq using "bind-interfaces" (instead of "bind-dynamic") had already been started (or if another instance started later used "bind-dynamic"), this wouldn't have any immediately visible ill effects, but if you tried to start another dnsmasq instance using "bind-interfaces" *after* starting any libvirt networks, the new dnsmasq would fail to start, because there was already another process listening on port 53. (Subsequent to the CVE fix, another patch changed the network driver to put dnsmasq options in a conf file rather than directly on the dnsmasq commandline, but preserved the same options.) This patch changes the network driver to *always* add "except-interface=lo" to dnsmasq conf files, regardless of whether we use bind-dynamic or bind-interfaces. This way no libvirt dnsmasq instances are listening on localhost (and the CVE is still fixed). The actual code change is miniscule, but must be propogated through all of the test files as well. --- src/network/bridge_driver.c | 7 ++++--- tests/networkxml2confdata/dhcp6-nat-network.conf | 1 + tests/networkxml2confdata/dhcp6-network.conf | 1 + tests/networkxml2confdata/dhcp6host-routed-network.conf | 1 + tests/networkxml2confdata/isolated-network.conf | 2 +- tests/networkxml2confdata/nat-network-dns-hosts.conf | 1 + tests/networkxml2confdata/nat-network-dns-srv-record-minimal.conf | 2 +- tests/networkxml2confdata/nat-network-dns-srv-record.conf | 1 + tests/networkxml2confdata/nat-network-dns-txt-record.conf | 1 + tests/networkxml2confdata/nat-network.conf | 1 + tests/networkxml2confdata/netboot-network.conf | 2 +- tests/networkxml2confdata/netboot-proxy-network.conf | 2 +- tests/networkxml2confdata/routed-network.conf | 1 + 13 files changed, 16 insertions(+), 7 deletions(-) diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c index 4e1958d..a32755d 100644 --- a/src/network/bridge_driver.c +++ b/src/network/bridge_driver.c @@ -689,6 +689,9 @@ networkDnsmasqConfContents(virNetworkObjPtr network, if (pidfile) virBufferAsprintf(&configbuf, "pid-file=%s\n", pidfile); + /* dnsmasq will *always* listen on localhost unless told otherwise */ + virBufferAddLit(&configbuf, "except-interface=lo\n"); + if (dnsmasqCapsGet(caps, DNSMASQ_CAPS_BIND_DYNAMIC)) { /* using --bind-dynamic with only --interface (no * --listen-address) prevents dnsmasq from responding to dns @@ -702,9 +705,7 @@ networkDnsmasqConfContents(virNetworkObjPtr network, "interface=%s\n", network->def->bridge); } else { - virBufferAddLit(&configbuf, - "bind-interfaces\n" - "except-interface=lo\n"); + virBufferAddLit(&configbuf, "bind-interfaces\n"); /* * --interface does not actually work with dnsmasq < 2.47, * due to DAD for ipv6 addresses on the interface. diff --git a/tests/networkxml2confdata/dhcp6-nat-network.conf b/tests/networkxml2confdata/dhcp6-nat-network.conf index d488900..050f3db 100644 --- a/tests/networkxml2confdata/dhcp6-nat-network.conf +++ b/tests/networkxml2confdata/dhcp6-nat-network.conf @@ -7,6 +7,7 @@ strict-order domain-needed local=// +except-interface=lo bind-dynamic interface=virbr0 dhcp-range=192.168.122.2,192.168.122.254 diff --git a/tests/networkxml2confdata/dhcp6-network.conf b/tests/networkxml2confdata/dhcp6-network.conf index 5c1030c..5fde07f 100644 --- a/tests/networkxml2confdata/dhcp6-network.conf +++ b/tests/networkxml2confdata/dhcp6-network.conf @@ -9,6 +9,7 @@ domain-needed domain=mynet expand-hosts local=/mynet/ +except-interface=lo bind-dynamic interface=virbr0 dhcp-range=2001:db8:ac10:fd01::1:10,2001:db8:ac10:fd01::1:ff diff --git a/tests/networkxml2confdata/dhcp6host-routed-network.conf b/tests/networkxml2confdata/dhcp6host-routed-network.conf index cb4d0cc..f8f05c2 100644 --- a/tests/networkxml2confdata/dhcp6host-routed-network.conf +++ b/tests/networkxml2confdata/dhcp6host-routed-network.conf @@ -7,6 +7,7 @@ strict-order domain-needed local=// +except-interface=lo bind-dynamic interface=virbr1 dhcp-range=192.168.122.1,static diff --git a/tests/networkxml2confdata/isolated-network.conf b/tests/networkxml2confdata/isolated-network.conf index 55a44d3..f8997bd 100644 --- a/tests/networkxml2confdata/isolated-network.conf +++ b/tests/networkxml2confdata/isolated-network.conf @@ -7,8 +7,8 @@ strict-order domain-needed local=// -bind-interfaces except-interface=lo +bind-interfaces listen-address=192.168.152.1 dhcp-option=3 no-resolv diff --git a/tests/networkxml2confdata/nat-network-dns-hosts.conf b/tests/networkxml2confdata/nat-network-dns-hosts.conf index ae8f8c5..2577882 100644 --- a/tests/networkxml2confdata/nat-network-dns-hosts.conf +++ b/tests/networkxml2confdata/nat-network-dns-hosts.conf @@ -9,6 +9,7 @@ domain-needed domain=example.com expand-hosts local=/example.com/ +except-interface=lo bind-dynamic interface=virbr0 addn-hosts=/var/lib/libvirt/dnsmasq/default.addnhosts diff --git a/tests/networkxml2confdata/nat-network-dns-srv-record-minimal.conf b/tests/networkxml2confdata/nat-network-dns-srv-record-minimal.conf index faa36e6..1e9b59c 100644 --- a/tests/networkxml2confdata/nat-network-dns-srv-record-minimal.conf +++ b/tests/networkxml2confdata/nat-network-dns-srv-record-minimal.conf @@ -7,8 +7,8 @@ strict-order domain-needed local=// -bind-interfaces except-interface=lo +bind-interfaces listen-address=192.168.122.1 listen-address=192.168.123.1 listen-address=fc00:db8:ac10:fe01::1 diff --git a/tests/networkxml2confdata/nat-network-dns-srv-record.conf b/tests/networkxml2confdata/nat-network-dns-srv-record.conf index 6079912..53d044a 100644 --- a/tests/networkxml2confdata/nat-network-dns-srv-record.conf +++ b/tests/networkxml2confdata/nat-network-dns-srv-record.conf @@ -7,6 +7,7 @@ strict-order domain-needed local=// +except-interface=lo bind-dynamic interface=virbr0 srv-host=name.tcp.test-domain-name,.,1024,10,10 diff --git a/tests/networkxml2confdata/nat-network-dns-txt-record.conf b/tests/networkxml2confdata/nat-network-dns-txt-record.conf index c448bdc..921cae1 100644 --- a/tests/networkxml2confdata/nat-network-dns-txt-record.conf +++ b/tests/networkxml2confdata/nat-network-dns-txt-record.conf @@ -7,6 +7,7 @@ strict-order domain-needed local=// +except-interface=lo bind-dynamic interface=virbr0 txt-record=example,example value diff --git a/tests/networkxml2confdata/nat-network.conf b/tests/networkxml2confdata/nat-network.conf index 8f28fef..beb714b 100644 --- a/tests/networkxml2confdata/nat-network.conf +++ b/tests/networkxml2confdata/nat-network.conf @@ -7,6 +7,7 @@ strict-order domain-needed local=// +except-interface=lo bind-dynamic interface=virbr0 dhcp-range=192.168.122.2,192.168.122.254 diff --git a/tests/networkxml2confdata/netboot-network.conf b/tests/networkxml2confdata/netboot-network.conf index 83dd2b3..b6f3c23 100644 --- a/tests/networkxml2confdata/netboot-network.conf +++ b/tests/networkxml2confdata/netboot-network.conf @@ -9,8 +9,8 @@ domain-needed domain=example.com expand-hosts local=/example.com/ -bind-interfaces except-interface=lo +bind-interfaces listen-address=192.168.122.1 dhcp-range=192.168.122.2,192.168.122.254 dhcp-no-override diff --git a/tests/networkxml2confdata/netboot-proxy-network.conf b/tests/networkxml2confdata/netboot-proxy-network.conf index b266d81..1e969fa 100644 --- a/tests/networkxml2confdata/netboot-proxy-network.conf +++ b/tests/networkxml2confdata/netboot-proxy-network.conf @@ -9,8 +9,8 @@ domain-needed domain=example.com expand-hosts local=/example.com/ -bind-interfaces except-interface=lo +bind-interfaces listen-address=192.168.122.1 dhcp-range=192.168.122.2,192.168.122.254 dhcp-no-override diff --git a/tests/networkxml2confdata/routed-network.conf b/tests/networkxml2confdata/routed-network.conf index dc53a4e..62ffd7a 100644 --- a/tests/networkxml2confdata/routed-network.conf +++ b/tests/networkxml2confdata/routed-network.conf @@ -7,6 +7,7 @@ strict-order domain-needed local=// +except-interface=lo bind-dynamic interface=virbr1 addn-hosts=/var/lib/libvirt/dnsmasq/local.addnhosts -- 1.7.11.7

3 5

[libvirt] [PATCH] locking: Fix VPATH build and distribute generated files
by Jiri Denemark 13 Dec '12

13 Dec '12

--- src/Makefile.am | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index 7c2d8ed..5a9fb84 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -149,19 +149,22 @@ LOCK_DRIVER_SANLOCK_HELPER_SOURCES = \ locking/sanlock_helper.c LOCK_PROTOCOL_GENERATED = \ - locking/lock_protocol.h \ - locking/lock_protocol.c \ + $(srcdir)/locking/lock_protocol.h \ + $(srcdir)/locking/lock_protocol.c \ $(NULL) -EXTRA_DIST += locking/lock_protocol.x +LOCK_PROTOCOL = $(srcdir)/locking/lock_protocol.x +EXTRA_DIST += $(LOCK_PROTOCOL) \ + $(LOCK_PROTOCOL_GENERATED) BUILT_SOURCES += $(LOCK_PROTOCOL_GENERATED) MAINTAINERCLEANFILES += $(LOCK_PROTOCOL_GENERATED) LOCK_DAEMON_GENERATED = \ - locking/lock_daemon_dispatch_stubs.h + $(srcdir)/locking/lock_daemon_dispatch_stubs.h $(NULL) BUILT_SOURCES += $(LOCK_DAEMON_GENERATED) +EXTRA_DIST += $(LOCK_DAEMON_GENERATED) MAINTAINERCLEANFILES += $(LOCK_DAEMON_GENERATED) LOCK_DRIVER_LOCKD_SOURCES = \ @@ -177,8 +180,11 @@ LOCK_DAEMON_SOURCES = \ locking/lock_daemon_dispatch.h \ $(NULL) -$(srcdir)/locking/lock_daemon_dispatch_stubs.h: locking/lock_protocol.x $(srcdir)/rpc/gendispatch.pl Makefile.am - $(AM_V_GEN)perl -w $(srcdir)/rpc/gendispatch.pl -b virLockSpaceProtocol VIR_LOCK_SPACE_PROTOCOL $< > $@ +$(srcdir)/locking/lock_daemon_dispatch_stubs.h: $(LOCK_PROTOCOL) \ + $(srcdir)/rpc/gendispatch.pl Makefile.am + $(AM_V_GEN)perl -w $(srcdir)/rpc/gendispatch.pl \ + -b virLockSpaceProtocol VIR_LOCK_SPACE_PROTOCOL \ + $(LOCK_PROTOCOL) > $@ NETDEV_CONF_SOURCES = \ -- 1.8.0.2

3 3