- Devel - libvirt List Archives

[libvirt] [test-API PATCH] streamAPI: Create stream objects that are already encapsulated
by Peter Krempa 26 Mar '12

26 Mar '12

With this patch, the newStream() method of the ConnectAPI class returns an already encapsulated StreamAPI object . *lib/connectAPI.py: - modify newStream method to return StreamAPI object *lib/streamAPI.py: - modify constructor to take virStream objects --- lib/connectAPI.py | 4 +++- lib/streamAPI.py | 9 ++------- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/lib/connectAPI.py b/lib/connectAPI.py index f52467f..2723fc8 100644 --- a/lib/connectAPI.py +++ b/lib/connectAPI.py @@ -24,6 +24,7 @@ import os import re import libvirt +from lib import streamAPI def append_path(path): """Append root path of package""" @@ -226,7 +227,8 @@ class ConnectAPI(object): def newStream(self, flag = 0): try: - return self.conn.newStream(flag) + st_obj = self.conn.newStream(flag) + return streamAPI.StreamAPI(st_obj) except libvirt.libvirtError, e: message = e.get_error_message() code = e.get_error_code() diff --git a/lib/streamAPI.py b/lib/streamAPI.py index 18ce71e..f551992 100644 --- a/lib/streamAPI.py +++ b/lib/streamAPI.py @@ -38,13 +38,8 @@ append_path(result.group(0)) import exception class StreamAPI(object): - def __init__(self, conn, flags = 0): - try: - self.stream = conn.newStream(flags) - except libvirt.libvirtError, e: - message = e.get_error_message() - code = e.get_error_code() - raise exception.LibvirtAPI(message, code) + def __init__(self, stream): + self.stream = stream; def getStream(self): return self.stream -- 1.7.3.4

2 2

[libvirt] [PATCH] test-API: Remove trailing spaces
by Osier Yang 26 Mar '12

26 Mar '12

Script used to do the work: % for f in $(find . -type f -name "*.py"); do \ sed -i -e "s/$?*$\s\+$/\1/g" $f; \ done --- env_inspect.py | 20 +++++----- exception.py | 12 +++--- lib/snapshotAPI.py | 18 ++++---- logxmlparser.py | 80 +++++++++++++++++++------------------- process.py | 6 +- repos/domain/attach_interface.py | 2 +- repos/domain/ownership_test.py | 2 +- 7 files changed, 70 insertions(+), 70 deletions(-) diff --git a/env_inspect.py b/env_inspect.py index e790e03..a290329 100644 --- a/env_inspect.py +++ b/env_inspect.py @@ -13,11 +13,11 @@ # The GPL text is available in the file COPYING that accompanies this # distribution and at <http://www.gnu.org/licenses>. # -# Filename: envinspect.py -# Summary: To generate a callable class for clearing testing environment -# Description: The module match the reference of clearing function -# from each testcase to the corresponding testcase's -# argument in the order of testcase running +# Filename: envinspect.py +# Summary: To generate a callable class for clearing testing environment +# Description: The module match the reference of clearing function +# from each testcase to the corresponding testcase's +# argument in the order of testcase running import subprocess @@ -72,7 +72,7 @@ class EnvInspect(object): """to check and collect the testing enviroment infomation before performing testing """ - + def __init__(self, logger): self.logger = logger @@ -87,7 +87,7 @@ class EnvInspect(object): self.logger.info(" %-36s%-6s" % (get_libvirt_ver()[1], result)) if get_libvirt_pyth_ver()[0] == 100: - result = NOTOK + result = NOTOK flag = 1 else: result = OK @@ -100,7 +100,7 @@ class EnvInspect(object): result = OK self.logger.info(" %-36s%-6s" % (get_libvirt_cli_ver()[1], result)) - if get_qemu_kvm_ver()[0] == 150 and flag == 0: + if get_qemu_kvm_ver()[0] == 150 and flag == 0: flag = 0 elif get_qemu_kvm_ver()[0] == 150 and flag == 1: flag = 1 @@ -115,8 +115,8 @@ class EnvInspect(object): result = OK self.logger.info(" %-36s%-6s" % (get_kernel_ver()[1], result)) - return flag - + return flag + OK = "ok" NOTOK = "not ok" diff --git a/exception.py b/exception.py index 1a6d6f1..5a6a6d3 100644 --- a/exception.py +++ b/exception.py @@ -13,10 +13,10 @@ # The GPL text is available in the file COPYING that accompanies this # distribution and at <http://www.gnu.org/licenses>. # -# Filename: exception.py -# Summary: the exception class -# Description: The module defines the exceptions the framework could use -# when fatal error occurred. +# Filename: exception.py +# Summary: the exception class +# Description: The module defines the exceptions the framework could use +# when fatal error occurred. import libvirt @@ -32,13 +32,13 @@ class LibvirtException(Exception): return repr(self.errorstr) def response(self): - self.status = {'code':self.code, 'message':"%s:%s" % + self.status = {'code':self.code, 'message':"%s:%s" % (self.message, str(self))} return self.status class FileDoesNotExist(LibvirtException): code = 201 - message = "File does not exist" + message = "File does not exist" class SectionDoesNotExist(LibvirtException): code = 202 diff --git a/lib/snapshotAPI.py b/lib/snapshotAPI.py index 43ccb89..d363992 100644 --- a/lib/snapshotAPI.py +++ b/lib/snapshotAPI.py @@ -24,14 +24,14 @@ import libvirt import re import os -def append_path(path): +def append_path(path): """Append root path of package""" if path in sys.path: pass else: sys.path.append(path) - -pwd = os.getcwd() + +pwd = os.getcwd() result = re.search('(.*)libvirt-test-API', pwd) append_path(result.group(0)) @@ -39,7 +39,7 @@ import exception class SnapshotAPI(object): def __init__(self, connection): - self.conn = connection + self.conn = connection def create(self, domname, xml_desc, flag = 0): try: @@ -57,7 +57,7 @@ class SnapshotAPI(object): except libvirt.libvirtError, e: message = e.get_error_message() code = e.get_error_code() - raise exception.LibvirtAPI(message, code) + raise exception.LibvirtAPI(message, code) def snapshot_name_list(self, domname, flag = 0): try: @@ -66,7 +66,7 @@ class SnapshotAPI(object): except libvirt.libvirtError, e: message = e.get_error_message() code = e.get_error_code() - raise exception.LibvirtAPI(message, code) + raise exception.LibvirtAPI(message, code) def snapshot_nums(self, domname, flag = 0): try: @@ -95,7 +95,7 @@ class SnapshotAPI(object): message = e.get_error_message() code = e.get_error_code() raise exception.LibvirtAPI(message, code) - + def delete(self, domname, snapname, flag = 0): try: snap = self.snapshot_lookup_by_name(domname, snapname, flag = 0) @@ -103,7 +103,7 @@ class SnapshotAPI(object): except libvirt.libvirtError, e: message = e.get_error_message() code = e.get_error_code() - raise exception.LibvirtAPI(message, code) + raise exception.LibvirtAPI(message, code) def get_xml_desc(self, domname, snapname, flag = 0): try: @@ -122,4 +122,4 @@ class SnapshotAPI(object): message = e.get_error_message() code = e.get_error_code() raise exception.LibvirtAPI(message, code) - + diff --git a/logxmlparser.py b/logxmlparser.py index 014397e..48e3c51 100644 --- a/logxmlparser.py +++ b/logxmlparser.py @@ -13,10 +13,10 @@ # The GPL text is available in the file COPYING that accompanies this # distribution and at <http://www.gnu.org/licenses>. # -# Filename: xmlparser.py -# Summary: generate xmlfile for log management -# Description: The module gives methods to write xml block -# during a testrun running +# Filename: xmlparser.py +# Summary: generate xmlfile for log management +# Description: The module gives methods to write xml block +# during a testrun running import os import copy @@ -30,19 +30,19 @@ class LogXMLParser(object): """ def __init__(self, logxml): self.logxml = logxml - self.doc = Document() + self.doc = Document() - def generate_logxml(self): + def generate_logxml(self): """ generate a new log xml file with head if that doesn't exist """ XMLFILE = open(self.logxml, "w") XMLFILE.write('<?xml version="1.0"?><?xml-stylesheet type="text/xsl"\ href="log.xsl"?><log xmlns:xlink= \ - "http://www.w3.org/1999/xlink"></log>') - XMLFILE.close() + "http://www.w3.org/1999/xlink"></log>') + XMLFILE.close() def add_testrun_xml(self, testrunid): """ add testrun info into log xml file""" - xmldoc = minidom.parse(self.logxml) + xmldoc = minidom.parse(self.logxml) testrun = self.doc.createElement('testrun') testrun.setAttribute("name", testrunid) xmldoc.childNodes[1].appendChild(testrun) @@ -52,30 +52,30 @@ class LogXMLParser(object): def add_test_xml(self, testrunid, testid): """ add a test info into log xml file""" xmldoc = minidom.parse(self.logxml) - test = self.doc.createElement('test') + test = self.doc.createElement('test') test.setAttribute("id", testid) testrunlist = xmldoc.getElementsByTagName('testrun') for testrun in testrunlist: runattr = testrun.attributes["name"] if runattr.value == testrunid: - testrun.appendChild(test) + testrun.appendChild(test) - self.__write_to_file(xmldoc, self.logxml) + self.__write_to_file(xmldoc, self.logxml) def add_testprocedure_xml(self, testrunid, testid, test_procedure): """ add test procedure info into log xml file """ xmldoc = minidom.parse(self.logxml) procedure = self.doc.createElement('test_procedure') - casename = test_procedure.keys()[0] + casename = test_procedure.keys()[0] valuedict = test_procedure[casename] test_casename = self.doc.createElement('action') - test_casename.setAttribute('name', casename) + test_casename.setAttribute('name', casename) for arg in valuedict.keys(): - test_arg = self.doc.createElement('arg') - test_arg.setAttribute("name", arg) + test_arg = self.doc.createElement('arg') + test_arg.setAttribute("name", arg) test_value = self.doc.createTextNode(valuedict[arg]) test_arg.appendChild(test_value) test_casename.appendChild(test_arg) @@ -92,20 +92,20 @@ class LogXMLParser(object): if testattr.value == testid: test.appendChild(procedure) - self. __write_to_file(xmldoc, self.logxml) + self. __write_to_file(xmldoc, self.logxml) - def add_test_summary(self, testrunid, testid, result, + def add_test_summary(self, testrunid, testid, result, start_time, end_time, path): """ add a test summary xml block into log xml file """ xmldoc = minidom.parse(self.logxml) testresult = self.doc.createElement('result') resulttext = self.doc.createTextNode(result) testresult.appendChild(resulttext) - + teststarttime = self.doc.createElement('start_time') starttimetext = self.doc.createTextNode(start_time) teststarttime.appendChild(starttimetext) - + testendtime = self.doc.createElement('end_time') endtimetext = self.doc.createTextNode(end_time) testendtime.appendChild(endtimetext) @@ -126,20 +126,20 @@ class LogXMLParser(object): test.childNodes.insert(0, testpath) test.childNodes.insert(0, testendtime) test.childNodes.insert(0, teststarttime) - test.childNodes.insert(0, testresult) + test.childNodes.insert(0, testresult) self. __write_to_file(xmldoc, self.logxml) - def add_testrun_summary(self, testrunid, passnum, failnum, totalnum, + def add_testrun_summary(self, testrunid, passnum, failnum, totalnum, start_time, end_time): """ add a testrun summary xml block into log xml file """ xmldoc = minidom.parse(self.logxml) testpass = self.doc.createElement('pass') passtext = self.doc.createTextNode(str(passnum)) testpass.appendChild(passtext) - - testfail = self.doc.createElement('fail') + + testfail = self.doc.createElement('fail') failtext = self.doc.createTextNode(str(failnum)) testfail.appendChild(failtext) @@ -154,7 +154,7 @@ class LogXMLParser(object): teststarttime = self.doc.createElement('start_time') starttimetext = self.doc.createTextNode(start_time) teststarttime.appendChild(starttimetext) - + testendtime = self.doc.createElement('end_time') endtimetext = self.doc.createTextNode(end_time) testendtime.appendChild(endtimetext) @@ -170,10 +170,10 @@ class LogXMLParser(object): testrun.childNodes.insert(0, testpass) self. __write_to_file(xmldoc, self.logxml) - + def remove_test_xml(self, testrunid, testid): """ to remove a test xml block from a log xml file """ - xmldoc = minidom.parse(self.logxml) + xmldoc = minidom.parse(self.logxml) testrunlist = xmldoc.getElementsByTagName('testrun') testrunattrlist = [] @@ -187,21 +187,21 @@ class LogXMLParser(object): testattr = test.attributes["id"] if testattr.value == testid: testattrlist.append(testattr.value) - testrun.removeChild(test) + testrun.removeChild(test) if len(testattrlist) == 0: raise exception.NoTestFound( - "In the xmllog file testrunid %s no testid %s found" % + "In the xmllog file testrunid %s no testid %s found" % (testrunid, testid)) if len(testrunattrlist) == 0: raise exception.NoTestRunFound( - "In the xmllog file no testrunid %s found" % + "In the xmllog file no testrunid %s found" % testrunid) - self. __write_to_file(xmldoc, self.logxml) - + self. __write_to_file(xmldoc, self.logxml) + def remove_testrun_xml(self, testrunid): """ remove a testrun xml block from log xml file """ - xmldoc = minidom.parse(self.logxml) + xmldoc = minidom.parse(self.logxml) testrunlist = xmldoc.getElementsByTagName('testrun') testrunattrlist = [] @@ -213,9 +213,9 @@ class LogXMLParser(object): if len(testrunattrlist) == 0: raise exception.NoTestRunFound( - "In the xmllog file no testrunid %s found" % + "In the xmllog file no testrunid %s found" % testrunid) - + self. __write_to_file(xmldoc, self.logxml) def remove_alltestrun_xml(self): @@ -228,8 +228,8 @@ class LogXMLParser(object): runattr = testrun.attributes["name"] testrunattrlist.append(runattr.value) xmldoc.childNodes[1].removeChild(testrun) - - self. __write_to_file(xmldoc, self.logxml) + + self. __write_to_file(xmldoc, self.logxml) return testrunattrlist def merge_xmlfiles(self, logxml_two): @@ -241,13 +241,13 @@ class LogXMLParser(object): for testrun in testrunlist_two_copy: xmldoc_one.childNodes[1].appendChild(testrun) - - self. __write_to_file(xmldoc_one, self.logxml) + + self. __write_to_file(xmldoc_one, self.logxml) self. __write_to_file(xmldoc_two, logxml_two) def __write_to_file(self, xmldoc, logxml): """ save changes into log xml file """ file = open(logxml, "w") - xmldoc.writexml(file) + xmldoc.writexml(file) file.close() diff --git a/process.py b/process.py index 4d65f72..a712816 100644 --- a/process.py +++ b/process.py @@ -13,10 +13,10 @@ # The GPL text is available in the file COPYING that accompanies this # distribution and at <http://www.gnu.org/licenses>. # -# Filename: process.py -# Summary: multiprocessing module +# Filename: process.py +# Summary: multiprocessing module # Description: If the switch of multiprocessing is on, -# the module will be called to fork subprocess +# the module will be called to fork subprocess import os import sys diff --git a/repos/domain/attach_interface.py b/repos/domain/attach_interface.py index 9d475a3..e6bbbda 100644 --- a/repos/domain/attach_interface.py +++ b/repos/domain/attach_interface.py @@ -107,7 +107,7 @@ def attach_interface(params): return 1 finally: conn.close() - logger.info("closed hypervisor connection") + logger.info("closed hypervisor connection") if test_result: return 0 diff --git a/repos/domain/ownership_test.py b/repos/domain/ownership_test.py index 1eacbcf..5464d86 100644 --- a/repos/domain/ownership_test.py +++ b/repos/domain/ownership_test.py @@ -230,7 +230,7 @@ def ownership_test(params): logger.info("check the domain state") ret = check_domain_running(domobj, guestname, logger) if ret: - return return_close(conn, logger, 1) + return return_close(conn, logger, 1) try: domobj.save(guestname, SAVE_FILE) -- 1.7.7.3

2 1

[libvirt] [PATCH] Add qemu support for ppc64 on FC16 or above for rpm packaging
by Li Zhang 25 Mar '12

25 Mar '12

On Fedora16 or above, qemu is supported now. So it is added in rpm packaging. Signed-off-by: Li Zhang <zhlcindy(a)linux.vnet.ibm.com> --- libvirt.spec.in | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libvirt.spec.in b/libvirt.spec.in index 072fd8e..568a84f 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -139,8 +139,8 @@ %define with_xen 0 %endif -# Fedora doesn't have any QEMU on ppc64 - only ppc -%if 0%{?fedora} +# Fedora doesn't have any QEMU on ppc64 until FC16 - only ppc +%if 0%{?fedora} < 16 %ifarch ppc64 %define with_qemu 0 %endif -- 1.7.5.4

2 4

[libvirt] QEMU fstatfs(2) and libvirt SELinux policy
by Stefan Hajnoczi 24 Mar '12

24 Mar '12

Hi, I have a question about the libvirt SELinux policy that can be applied to QEMU processes. Yesterday Laine helped Khoa and me diagnose an issue where QEMU was doing fstatfs(2) but SELinux prevented this FILESYSTEM__GETATTR operation, resulting in a failed syscall with -EACCES. The SELinux hook is: security/selinux/hooks.c:selinux_sb_statfs(): return superblock_has_perm(cred, dentry->d_sb, FILESYSTEM__GETATTR, &ad); It turns out this problem also affects XFS discard support in QEMU today. QEMU calls platform_test_xfs_fd() in libxfs, which works like this: static __inline__ int platform_test_xfs_fd(int fd) { struct statfs buf; if (fstatfs(fd, &buf) < 0) return 0; return (buf.f_type == 0x58465342); /* XFSB */ } In other words, XFS detection will fail when SELinux is enabled. I'm not familiar with libvirt's use of SELinux. Can someone explain if we need to expand the policy in libvirt and how to do that? Thanks, Stefan

7 10

[libvirt] [PATCH] spec: Add missed dependancy for numad
by Osier Yang 24 Mar '12

24 Mar '12

numad is available since Fedora 17 and RHEL6.X. And it's not supported on s390[x] and ARM. --- configure.ac | 26 +++++++++++++++++++++----- libvirt.spec.in | 19 ++++++++++++++++++- src/qemu/qemu_process.c | 2 +- 3 files changed, 40 insertions(+), 7 deletions(-) diff --git a/configure.ac b/configure.ac index 31f0835..ce9c0ff 100644 --- a/configure.ac +++ b/configure.ac @@ -1445,14 +1445,29 @@ AM_CONDITIONAL([HAVE_NUMACTL], [test "$with_numactl" != "no"]) AC_SUBST([NUMACTL_CFLAGS]) AC_SUBST([NUMACTL_LIBS]) -dnl Do we have numad? -if test "$with_qemu" = "yes"; then - AC_PATH_PROG([NUMAD], [numad], [], [/bin:/usr/bin:/usr/local/bin:$PATH]) +dnl numad +AC_ARG_WITH([numad], + AC_HELP_STRING([--with-numad], [use numad to manage CPU placement dynamically @<:@default=check@:>@]), + [], + [with_numad=check]) - if test -n "$NUMAD"; then - AC_DEFINE_UNQUOTED([NUMAD],["$NUMAD"], [Location or name of the numad program]) +if test "$with_numad" != "no" ; then + AC_PATH_PROG([NUMAD], [numad], [], [/bin:/usr/bin]) + if test -z "$NUMAD" ; then + if test "$with_numad" = "check"; then + with_numad="no" + else + AC_MSG_ERROR([You must install the 'numad' to manage CPU placement dynamically]) fi + else + with_numad="yes" + fi + if test "$with_numad" = "yes"; then + AC_DEFINE_UNQUOTED([HAVE_NUMAD], 1, [whether numad is available]) + AC_DEFINE_UNQUOTED([NUMAD],["$NUMAD"], [Location or name of the numad program]) + fi fi +AM_CONDITIONAL([HAVE_NUMAD], [test "$with_numad" != "no"]) dnl pcap lib LIBPCAP_CONFIG="pcap-config" @@ -2774,6 +2789,7 @@ AC_MSG_NOTICE([Warning Flags: $WARN_CFLAGS]) AC_MSG_NOTICE([ Readline: $lv_use_readline]) AC_MSG_NOTICE([ Python: $with_python]) AC_MSG_NOTICE([ DTrace: $with_dtrace]) +AC_MSG_NOTICE([ numad: $with_numad]) AC_MSG_NOTICE([ XML Catalog: $XML_CATALOG_FILE]) AC_MSG_NOTICE([ Init script: $with_init_script]) AC_MSG_NOTICE([Console locks: $with_console_lock_files]) diff --git a/libvirt.spec.in b/libvirt.spec.in index 072fd8e..78800c7 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -84,6 +84,7 @@ %define with_cgconfig 0%{!?_without_cgconfig:0} %define with_sanlock 0%{!?_without_sanlock:0} %define with_systemd 0%{!?_without_systemd:0} +%define with_numad 0%{!?_without_numad:0} # Non-server/HV driver defaults which are always enabled %define with_python 0%{!?_without_python:1} @@ -205,11 +206,19 @@ %define with_storage_disk 0 %endif -# Enable libpcap library %if %{with_qemu} %define with_nwfilter 0%{!?_without_nwfilter:%{server_drivers}} +# Enable libpcap library %define with_libpcap 0%{!?_without_libpcap:%{server_drivers}} %define with_macvtap 0%{!?_without_macvtap:%{server_drivers}} + +# numad is used to manage the CPU placement dynamically, +# it's not available on s390[x] and ARM. +%if 0%{?fedora} >= 17 || 0%{?rhel} >= 6 +%ifnarch s390 s390x %{arm} +%define with_numad 0%{!?_without_numad:%{server_drivers}} +%endif +%endif %endif %if %{with_macvtap} @@ -357,6 +366,9 @@ Requires(post): systemd-sysv Requires(preun): systemd-units Requires(postun): systemd-units %endif +%if %{with_numad} +Requires: numad +%endif # All build-time requirements %if 0%{?enable_autotools} @@ -690,6 +702,10 @@ of recent versions of Linux (and other OSes). %define _without_numactl --without-numactl %endif +%if ! %{with_numad} +%define _without_numad --without-numad +%endif + %if ! %{with_capng} %define _without_capng --without-capng %endif @@ -775,6 +791,7 @@ autoreconf -if %{?_without_storage_disk} \ %{?_without_storage_mpath} \ %{?_without_numactl} \ + %{?_without_numad} \ %{?_without_capng} \ %{?_without_netcf} \ %{?_without_selinux} \ diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 8915a9a..d0706b4 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -1633,7 +1633,7 @@ qemuProcessInitNumaMemoryPolicy(virDomainObjPtr vm) } #endif -#if defined(NUMAD) +#if HAVE_NUMAD static char * qemuGetNumadAdvice(virDomainDefPtr def) { -- 1.7.7.3

2 2

[libvirt] [PATCH 0/2] atomic snapshots, round 2
by Eric Blake 24 Mar '12

24 Mar '12

Depends on round 1 v2 being applied first: https://www.redhat.com/archives/libvir-list/2012-March/msg00747.html So far, I've tested that the error handling path works when targeting the qemu of Fedora 16; I still plan to test that the success path works with a self-built qemu using the code that has been accepted for the upcoming qemu 1.1. Eric Blake (2): snapshot: add support for qemu transaction command snapshot: wire up qemu transaction command src/qemu/qemu_driver.c | 112 ++++++++++++++++++++++++++++++++++++++++-- src/qemu/qemu_monitor.c | 33 ++++++++++-- src/qemu/qemu_monitor.h | 4 ++ src/qemu/qemu_monitor_json.c | 82 ++++++++++++++++++++++++------- src/qemu/qemu_monitor_json.h | 2 + 5 files changed, 205 insertions(+), 28 deletions(-) -- 1.7.7.6

2 6

[libvirt] [PATCH 0/3] atomic snapshots, round 1
by Eric Blake 24 Mar '12

24 Mar '12

I figured it's better to post small patch series for incremental review than to slam the list with a 20 patch series. I'm in the middle of coding up my RFC for interaction with the new qemu 1.1 'transaction' monitor command, and this is the first step. [1] https://www.redhat.com/archives/libvir-list/2012-March/msg00578.html To avoid a merge conflict, this patch [2] needs to be applied first. [2] https://www.redhat.com/archives/libvir-list/2012-March/msg00744.html Eric Blake (3): snapshot: add qemu capability for 'transaction' command snapshot: add atomic create flag snapshot: rudimentary qemu support for atomic disk snapshot include/libvirt/libvirt.h.in | 2 ++ src/libvirt.c | 21 ++++++++++++++------- src/qemu/qemu_capabilities.c | 1 + src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_driver.c | 40 +++++++++++++++++++++++++++------------- src/qemu/qemu_monitor_json.c | 3 +++ tools/virsh.c | 6 ++++++ tools/virsh.pod | 16 ++++++++++++++-- 8 files changed, 68 insertions(+), 22 deletions(-) -- 1.7.7.6

2 13

[libvirt] [PATCH 00/14] Support reading auth credentials from a config file
by Daniel P. Berrange 24 Mar '12

24 Mar '12

When connecting to a remote libvirtd, or hypervisor that requires authentication we have callbacks which can be used to prompt for various credentials. This is tedious if you are looking to automate stuff though. While we could let each application implement a custom auth callback for fetching credentials from a config file, it is nicer if we provide this ability directly in libvirt, so that all apps can benefit from it. So this series introduces a new config file in which authentication credentials can be placed. It supports setting multiple sets of credentials, of varying types in one file. I use the '.ini' config file syntax, since this makes it easy to reuse the same config file in virt-viewer & similar apps to store VNC / SPICE credentials. To find the config file we check for each of - Path from LIBVIRT_AUTH_FILE env var - Query param 'authfile=PATH' in the URI params - /etc/libvirt/auth.conf - $HOME/.libvirt/auth.conf if no config file is present, everything should carry on as normal. If the config is present, then it is consulted to fill in credentials first. Only if there are still missing credentials, will the auth callbacks then be invoked. See the docs in patch 12 of this series for the config file syntax examples. This is supported for all drivers that do auth, remote, esx, xenapi, hyperv and phyp, though I have only tested it with the remote driver. I would appreciate someone giving it a go with the other drivers. The first 7 patches are actually all related to the viruri.[ch] file, expanding its functionality & adding tests. This is to make sure the auth config patches can have easy access to the query params. The last 7 patches are related to the auth config file support again including tests

3 37

[libvirt] [PATCH] build: fix incorrect enum declaration
by Eric Blake 24 Mar '12

24 Mar '12

Recent changes have caused build failures on builds where pdwtags works: commit a26a196 mistakenly exported a public variable commits a26a196, 57ddcc2, 487c063 all had copy-paste bugs in hand-updating the golden API rather than rerunning pdwtags * include/libvirt/libvirt.h.in (virDomainEventTrayChangeReason): Make this a typedef, not external storage. * src/remote_protocol-structs (remote_procedure): Fix spelling. --- Pushing under the build-breaker rule, as 'make -C src check' failed. The build is still broken, though, due to a missing qparams.h file causing 'make -C tests check' to fail. include/libvirt/libvirt.h.in | 2 +- src/remote_protocol-structs | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/include/libvirt/libvirt.h.in b/include/libvirt/libvirt.h.in index c702e66..8bb5c57 100644 --- a/include/libvirt/libvirt.h.in +++ b/include/libvirt/libvirt.h.in @@ -3684,7 +3684,7 @@ typedef void (*virConnectDomainEventDiskChangeCallback)(virConnectPtr conn, * * The reason describing why the callback was called */ -enum { +typedef enum { VIR_DOMAIN_EVENT_TRAY_CHANGE_OPEN = 0, VIR_DOMAIN_EVENT_TRAY_CHANGE_CLOSE, diff --git a/src/remote_protocol-structs b/src/remote_protocol-structs index 474e574..9b2414f 100644 --- a/src/remote_protocol-structs +++ b/src/remote_protocol-structs @@ -1654,13 +1654,13 @@ struct remote_domain_event_tray_change_msg { remote_nonnull_domain dom; remote_nonnull_string devAlias; int reason; -} +}; struct remote_domain_event_pmwakeup_msg { remote_nonnull_domain dom; -} +}; struct remote_domain_event_pmsuspend_msg { remote_nonnull_domain dom; -} +}; struct remote_domain_managed_save_args { remote_nonnull_domain dom; u_int flags; @@ -2189,7 +2189,7 @@ enum remote_procedure { REMOTE_PROC_DOMAIN_GET_METADATA = 265, REMOTE_PROC_DOMAIN_BLOCK_REBASE = 266, REMOTE_PROC_DOMAIN_PM_WAKEUP = 267, - REMOTE_PROC_DOMAIN_TRAY_CHANGE = 268, - REMOTE_PROC_DOMAIN_PMWAKEUP = 269, - REMOTE_PROC_DOMAIN_PMSUSPEND = 270, + REMOTE_PROC_DOMAIN_EVENT_TRAY_CHANGE = 268, + REMOTE_PROC_DOMAIN_EVENT_PMWAKEUP = 269, + REMOTE_PROC_DOMAIN_EVENT_PMSUSPEND = 270, }; -- 1.7.7.6

1 0

[libvirt] [PATCH 0/6] atomic snapshots, rounds 4 and 5
by Eric Blake 24 Mar '12

24 Mar '12

I was originally going to send this as two rounds, one for the XML additions of adding mirrors, and one for the flag addition to virDomainSnapshotDelete for mapping to drive-reopen; but it turned out that testing is easier if I finish the series. Note that this is minimally tested at the moment; I'm posting it to get review started, but I plan on hammering it tomorrow, and possibly coming up with slight alterations for a v2. This assumes that rounds 1-3 (ending here) have been applied: https://www.redhat.com/archives/libvir-list/2012-March/msg00846.html This should finish out my RFC here: https://www.redhat.com/archives/libvir-list/2012-March/msg00578.html but with one major caveat: https://lists.gnu.org/archive/html/qemu-devel/2012-03/msg01524.html Upstream qemu has not yet committed the 'drive-mirror' or 'drive-reopen' monitor commands, which this series (rounds 4-5) depends on. There are still bugs being worked out under the hood on the qemu side, and there is a slight possibility that fixing those bugs may change the public interface. Therefore, part of the review of this series should be to determine whether we take the risk of applying the patch now, or waiting for qemu to stabilize a bit further. I will probably push rounds 1-3 tomorrow, since they have been ACK'd (well, round 3 is still awaiting review), and since qemu has committed to the 'transaction' monitor command for qemu 1.1. For reference, it is likely that RHEL 6.3 will not wait for qemu 1.1, but will instead provide RHEL-specific monitor commands named __com.redhat_drive-mirror and __com.redhat_drive-reopen; I have hopefully structured things well enough that it will be a couple lines of patching to qemu_monitor_json.c to recognize that alternate command name. Eric Blake (6): snapshot: allow for creation of mirrored snapshots snapshot: add new snapshot delete flags snapshot: make it possible to check for mirrored snapshot snapshot: expose qemu commands for mirrored storage migration snapshot: implement new snapshot delete flags in qemu snapshot: enable mirrored snapshots on transient vm docs/formatsnapshot.html.in | 31 +++ docs/schemas/domainsnapshot.rng | 8 + include/libvirt/libvirt.h.in | 6 + src/conf/domain_conf.c | 58 +++++- src/conf/domain_conf.h | 4 + src/libvirt.c | 37 +++- src/libvirt_private.syms | 2 + src/qemu/qemu_capabilities.c | 3 + src/qemu/qemu_capabilities.h | 2 + src/qemu/qemu_driver.c | 242 +++++++++++++++++++- src/qemu/qemu_monitor.c | 50 ++++ src/qemu/qemu_monitor.h | 14 ++ src/qemu/qemu_monitor_json.c | 70 ++++++- src/qemu/qemu_monitor_json.h | 21 ++- .../disk_snapshot_mirror.xml | 13 + .../disk_snapshot_mirror.xml | 49 ++++ tests/domainsnapshotxml2xmltest.c | 4 +- tools/virsh.c | 13 + tools/virsh.pod | 21 ++- 19 files changed, 622 insertions(+), 26 deletions(-) create mode 100644 tests/domainsnapshotxml2xmlin/disk_snapshot_mirror.xml create mode 100644 tests/domainsnapshotxml2xmlout/disk_snapshot_mirror.xml -- 1.7.7.6

2 9