- Devel - libvirt List Archives

[libvirt] segment fault from libvirtmod
by Guannan Ren 07 Feb '12

07 Feb '12

Hi, The Makefile.am in python forget to add probes.o if WITH_DTRACE but after I added it and tried to connect, using libvirt.open("qemu:///system") in python , it reported: "segment fault" I tried to figure out, but failed. If anyone can help this, thanks. The following is the backtrace: #0 0x0000003c62a810a4 in free () from /lib64/libc.so.6 #1 0x00007ffff1836f29 in virFree (ptrptr=0x6a6a28) at util/memory.c:310 #2 0x00007ffff1849692 in virResetError (err=0x6a6a20) at util/virterror.c:387 #3 0x00007ffff13e2761 in do_open (name=0x7ffff7ed6444 "qemu:///system", auth=0x0, flags=0) at libvirt.c:1093 #4 0x00007ffff13e4d44 in virConnectOpen (name=0x7ffff7ed6444 "qemu:///system") at libvirt.c:1350 #5 0x00007ffff1824879 in libvirt_virConnectOpen (self=<optimized out>, args=<optimized out>) at libvirt.c:3637 #6 0x0000003c652dffbb in PyEval_EvalFrameEx () from /usr/lib64/libpython2.7.so.1.0 #7 0x0000003c652e0580 in PyEval_EvalFrameEx () from /usr/lib64/libpython2.7.so.1.0 #8 0x0000003c652e15a5 in PyEval_EvalCodeEx () from /usr/lib64/libpython2.7.so.1.0 #9 0x0000003c652e16d2 in PyEval_EvalCode () from /usr/lib64/libpython2.7.so.1.0 #10 0x0000003c652fb9ec in ?? () from /usr/lib64/libpython2.7.so.1.0 #11 0x0000003c652fc7f0 in PyRun_FileExFlags () from /usr/lib64/libpython2.7.so.1.0 #12 0x0000003c652fd26f in PyRun_SimpleFileExFlags () from /usr/lib64/libpython2.7.so.1.0 #13 0x0000003c6530e745 in Py_Main () from /usr/lib64/libpython2.7.so.1.0 #14 0x0000003c62a2169d in __libc_start_main () from /lib64/libc.so.6 #15 0x0000000000400651 in _start () Guannan Ren

4 6

[libvirt] [test-API][PATCH] Add 8 new APIs in domainAPI
by Wayne Sun 07 Feb '12

07 Feb '12

* new APIs reset(self, domname, flag = 0) get_vcpu_pin_info(self, domname, flag) is_updated(self, domname) inject_NMI(self, domname, flag = 0) open_console(self, domname, dev_name, stream, flag = 0) open_graphics(self, domname, idx, fd, flag = 1) screenshot(self, domname, stream, screen, flag = 0) get_migrate_max_speed(self, domname, flag = 0) A bug is filed to migrateGetMaxSpeed() about parameters, it'll affect get_migrate_max_speed() function, but the parameters should remain the status quo. Change will be followed up anyway. open_graphics() will not work now for lack qemu support, missing add_client qemu command. for dev_name in open_console, pass the alias name of console, serial or parallel port. * deleted outdated function get_ref(self, domname) --- lib/domainAPI.py | 91 +++++++++++++++++++++++++++++++++++++++++++++++++----- 1 files changed, 83 insertions(+), 8 deletions(-) diff --git a/lib/domainAPI.py b/lib/domainAPI.py index 91f2ba3..a8086ab 100644 --- a/lib/domainAPI.py +++ b/lib/domainAPI.py @@ -261,6 +261,16 @@ class DomainAPI(object): code = e.get_error_code() raise exception.LibvirtAPI(message, code) + def reset(self, domname, flag = 0): + try: + dom_obj = self.get_domain_by_name(domname) + retval = dom_obj.reset(flag) + return retval + except libvirt.libvirtError, e: + message = e.get_error_message() + code = e.get_error_code() + raise exception.LibvirtAPI(message, code) + def get_info(self, domname): try: dom_obj = self.get_domain_by_name(domname) @@ -335,36 +345,46 @@ class DomainAPI(object): code = e.get_error_code() raise exception.LibvirtAPI(message, code) - def get_ref(self, domname): + def get_vcpus(self, domname): try: dom_obj = self.get_domain_by_name(domname) - ref = dom_obj.ref() - return ref + vcpu_info = dom_obj.vcpus() + return vcpu_info except libvirt.libvirtError, e: message = e.get_error_message() code = e.get_error_code() raise exception.LibvirtAPI(message, code) - def get_vcpus(self, domname): + def set_pin_vcpu(self, domname, vcpu, cpumap): try: dom_obj = self.get_domain_by_name(domname) - vcpu_info = dom_obj.vcpus() - return vcpu_info + pin_vcpu = dom_obj.pinVcpu(vcpu, cpumap) + return pin_vcpu except libvirt.libvirtError, e: message = e.get_error_message() code = e.get_error_code() raise exception.LibvirtAPI(message, code) - def set_pin_vcpu(self, domname, vcpu, cpumap): + def set_pin_vcpu_flags(self, domname, vcpu, cpumap, flag): try: dom_obj = self.get_domain_by_name(domname) - pin_vcpu = dom_obj.pinVcpu(vcpu, cpumap) + pin_vcpu = dom_obj.pinVcpuFlags(vcpu, cpumap, flag) return pin_vcpu except libvirt.libvirtError, e: message = e.get_error_message() code = e.get_error_code() raise exception.LibvirtAPI(message, code) + def get_vcpu_pin_info(self, domname, flag): + try: + dom_obj = self.get_domain_by_name(domname) + pin_vcpu_info = dom_obj.vcpuPinInfo(flag) + return pin_vcpu_info + except libvirt.libvirtError, e: + message = e.get_error_message() + code = e.get_error_code() + raise exception.LibvirtAPI(message, code) + def get_uuid(self, domname): try: dom_obj = self.get_domain_by_name(domname) @@ -716,6 +736,15 @@ class DomainAPI(object): code = e.get_error_code() raise exception.LibvirtAPI(message, code) + def is_updated(self, domname): + try: + dom_obj = self.get_domain_by_name(domname) + return dom_obj.isUpdated() + except libvirt.libvirtError, e: + message = e.get_error_message() + code = e.get_error_code() + raise exception.LibvirtAPI(message, code) + def job_info(self, domname): try: dom_obj = self.get_domain_by_name(domname) @@ -878,6 +907,50 @@ class DomainAPI(object): code = e.get_error_code() raise exception.LibvirtAPI(message, code) + def inject_NMI(self, domname, flag = 0): + try: + dom_obj = self.get_domain_by_name(domname) + return dom_obj.injectNMI(flag) + except libvirt.libvirtError, e: + message = e.get_error_message() + code = e.get_error_code() + raise exception.LibvirtAPI(message, code) + + def open_console(self, domname, dev_name, stream, flag = 0): + try: + dom_obj = self.get_domain_by_name(domname) + return dom_obj.openConsole(dev_name, stream, flag) + except libvirt.libvirtError, e: + message = e.get_error_message() + code = e.get_error_code() + raise exception.LibvirtAPI(message, code) + + def open_graphics(self, domname, idx, fd, flag = 1): + try: + dom_obj = self.get_domain_by_name(domname) + return dom_obj.openGraphics(idx, fd, flag) + except libvirt.libvirtError, e: + message = e.get_error_message() + code = e.get_error_code() + raise exception.LibvirtAPI(message, code) + + def screenshot(self, domname, stream, screen, flag = 0): + try: + dom_obj = self.get_domain_by_name(domname) + return dom_obj.screenshot(stream, screen, flag) + except libvirt.libvirtError, e: + message = e.get_error_message() + code = e.get_error_code() + raise exception.LibvirtAPI(message, code) + + def get_migrate_max_speed(self, domname, flag = 0): + try: + dom_obj = self.get_domain_by_name(domname) + return dom_obj.migrateGetMaxSpeed(flag) + except libvirt.libvirtError, e: + message = e.get_error_message() + code = e.get_error_code() + raise exception.LibvirtAPI(message, code) # DomainState VIR_DOMAIN_NOSTATE = 0 @@ -903,3 +976,5 @@ VIR_DOMAIN_AFFECT_CURRENT = 0 VIR_DOMAIN_AFFECT_LIVE = 1 VIR_DOMAIN_AFFECT_CONFIG = 2 +# virDomainOpenGraphicsFlags +VIR_DOMAIN_OPEN_GRAPHICS_SKIPAUTH = 1 -- 1.7.1

1 0

[libvirt] [test-API][PATCH v2 2/2] Add and update functions in streamAPI
by Wayne Sun 07 Feb '12

07 Feb '12

* accpet connection object and stream flag as parameter in __init__ remove connect function for connction is given in as parameter. * remove newStream() from each function create new stream object in __init__. function also need flags parameter. * Add 5 new functions screenshot(self, domain, screen, flags = 0) download(self, vol, offset, length, flags = 0) upload(self, vol, offset, length, flags = 0) recvAll(self, handler, opaque) sendAll(self, handler, opaque) for recvAll and sendAll, handler is a user defined function which write/read data to/from file. --- lib/streamAPI.py | 75 ++++++++++++++++++++++++++++++++++++------------------ 1 files changed, 50 insertions(+), 25 deletions(-) diff --git a/lib/streamAPI.py b/lib/streamAPI.py index bc7d217..4da57ca 100644 --- a/lib/streamAPI.py +++ b/lib/streamAPI.py @@ -38,76 +38,101 @@ append_path(result.group(0)) import exception class StreamAPI(object): - def __init__(self, connection): + def __init__(self, connection, flag = 0): self.conn = connection + self.stream_obj = self.conn.newStream(flag) - def abort(self, flag = 0): + def abort(self): try: - stream_obj = newStream(flag) - return stream_obj.abort() + return self.stream_obj.abort() except libvirt.libvirtError, e: message = e.get_error_message() code = e.get_error_code() raise exception.LibvirtAPI(message, code) - def connect(self, flag = 0): + def finish(self): try: - stream_obj = newStream(flag) - return stream_obj.connect() + return self.stream_obj.finish() except libvirt.libvirtError, e: message = e.get_error_message() code = e.get_error_code() raise exception.LibvirtAPI(message, code) - def finish(self, flag = 0): + def recv(self, nbytes): try: - stream_obj = newStream(flag) - return stream_obj.finish() + return self.stream_obj.recv(nbytes) except libvirt.libvirtError, e: message = e.get_error_message() code = e.get_error_code() raise exception.LibvirtAPI(message, code) - def recv(self, flag = 0, data, nbytes): + def send(self, data): try: - stream_obj = newStream(flag) - return stream_obj.recv(data, nbytes) + return self.stream_obj.send(data) except libvirt.libvirtError, e: message = e.get_error_message() code = e.get_error_code() raise exception.LibvirtAPI(message, code) - def send(self, flag = 0, data, nbytes): + def eventAddCallback(self, cb, opaque): try: - stream_obj = newStream(flag) - return stream_obj.send(data, nbytes) + return self.stream_obj.eventAddCallback(cb, opaque) except libvirt.libvirtError, e: message = e.get_error_message() code = e.get_error_code() raise exception.LibvirtAPI(message, code) - def eventAddCallback(self, flag = 0, cb, opaque): + def eventRemoveCallback(self): try: - stream_obj = newStream(flag) - return stream_obj.eventAddCallback(cb, opaque) + return self.stream_obj.eventRemoveCallback() except libvirt.libvirtError, e: message = e.get_error_message() code = e.get_error_code() raise exception.LibvirtAPI(message, code) - def eventRemoveCallback(self, flag = 0): + def eventUpdateCallback(self, events): try: - stream_obj = newStream(flag) - return stream_obj.eventRemoveCallback() + return self.stream_obj.eventUpdateCallback(events) except libvirt.libvirtError, e: message = e.get_error_message() code = e.get_error_code() raise exception.LibvirtAPI(message, code) - def eventUpdateCallback(self, flag = 0, events) + def screenshot(self, domain, screen, flags = 0): try: - stream_obj = newStream(flag) - return stream_obj.eventUpdateCallback(events) + return self.stream_obj.screenshot(domain, screen, flags) + except libvirt.libvirtError, e: + message = e.get_error_message() + code = e.get_error_code() + raise exception.LibvirtAPI(message, code) + + def download(self, vol, offset, length, flags = 0): + try: + return self.stream_obj.download(vol, offset, length, flags) + except libvirt.libvirtError, e: + message = e.get_error_message() + code = e.get_error_code() + raise exception.LibvirtAPI(message, code) + + def upload(self, vol, offset, length, flags = 0): + try: + return self.stream_obj.upload(vol, offset, length, flags) + except libvirt.libvirtError, e: + message = e.get_error_message() + code = e.get_error_code() + raise exception.LibvirtAPI(message, code) + + def recvAll(self, handler, opaque): + try: + return self.stream_obj.recvAll(handler, opaque) + except libvirt.libvirtError, e: + message = e.get_error_message() + code = e.get_error_code() + raise exception.LibvirtAPI(message, code) + + def sendAll(self, handler, opaque): + try: + return self.stream_obj.sendAll(handler, opaque) except libvirt.libvirtError, e: message = e.get_error_message() code = e.get_error_code() -- 1.7.1

2 1

[libvirt] [PATCH 1/1] Clarify the purpose of domxml-from-native (v2)
by Dave Allan 07 Feb '12

07 Feb '12

Someone mentioned to me that they interpreted this section of the KVM driver page as suggesting that new guests should be created by creating a qemu commandline and converting it to XML with domxml-from-native. I don't think that's the intent of domxml-from-native, so I added that clarification. v2 Suggstion from eblake: Add link to the applications page --- docs/drvqemu.html.in | 13 ++++++++++--- 1 files changed, 10 insertions(+), 3 deletions(-) diff --git a/docs/drvqemu.html.in b/docs/drvqemu.html.in index fa5496c..fc76829 100644 --- a/docs/drvqemu.html.in +++ b/docs/drvqemu.html.in @@ -432,9 +432,16 @@ mount -t cgroup none /dev/cgroup -o devices <h3><a name="xmlimport">Converting from QEMU args to domain XML</a></h3> - The <code>virsh domxml-from-native</code> provides a way to convert an - existing set of QEMU args into a guest description using libvirt Domain XML - that can then be used by libvirt. + The <code>virsh domxml-from-native</code> provides a way to + convert an existing set of QEMU args into a guest description + using libvirt Domain XML that can then be used by libvirt. + Please note that this command is intended to be used to convert + existing qemu guests previously started from the command line to + be managed through libvirt. It should not be used a method of + creating new guests from scratch. New guests should be created + using an application calling the libvirt APIs (see + the <a href="apps.html">libvirt applications page</a> for some + examples) or by manually crafting XML to pass to virsh. <pre>$ cat > demo.args <<EOF -- 1.7.7.6

2 2

[libvirt] [PATCH] xen-xm: SIGSEGV in xenXMDomainDefineXML: filename
by Philipp Hahn 06 Feb '12

06 Feb '12

filename is not initialized to NULL while it's unconditionally freed in the error path. Signed-off-by: Philipp Hahn <hahn(a)univention.de> --- src/xen/xm_internal.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/xen/xm_internal.c b/src/xen/xm_internal.c index 3cb315a..5acac8b 100644 --- a/src/xen/xm_internal.c +++ b/src/xen/xm_internal.c @@ -1070,7 +1070,7 @@ int xenXMDomainCreate(virDomainPtr domain) { virDomainPtr xenXMDomainDefineXML(virConnectPtr conn, const char *xml) { virDomainPtr ret; - char *filename; + char *filename = NULL; const char *oldfilename; virDomainDefPtr def = NULL; virConfPtr conf = NULL; -- 1.7.1

2 1

[libvirt] [PATCH] xen-xm: fix data loss in domain edit
by Philipp Hahn 06 Feb '12

06 Feb '12

On CentOS5: If "virsh edit $DOM" is used and an error happens (for example changing any live cycle action to a non-existing value), libvirt forgets that $DOM exists, since it is already removed from the internal hash tables, which are used for domain lookup. In once case (unreproducible) even the persistent configuration /etc/xen/$DOM was deleted. Instead of using the compound function xenXMConfigSaveFile() explicitly use xenFomatXM() and virConfWriteFile() to distinguish between a failure in converting the libvirt definition to the xen-xm format and a problem when writing the file. Signed-off-by: Philipp Hahn <hahn(a)univention.de> --- src/xen/xm_internal.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/src/xen/xm_internal.c b/src/xen/xm_internal.c index 02a0e1d..3cb315a 100644 --- a/src/xen/xm_internal.c +++ b/src/xen/xm_internal.c @@ -1073,6 +1073,7 @@ virDomainPtr xenXMDomainDefineXML(virConnectPtr conn, const char *xml) char *filename; const char *oldfilename; virDomainDefPtr def = NULL; + virConfPtr conf = NULL; xenXMConfCachePtr entry = NULL; xenUnifiedPrivatePtr priv = (xenUnifiedPrivatePtr) conn->privateData; @@ -1101,6 +1102,9 @@ virDomainPtr xenXMDomainDefineXML(virConnectPtr conn, const char *xml) return (NULL); } + if (!(conf = xenFormatXM(conn, def, priv->xendConfigVersion))) + goto error; + /* * check that if there is another domain defined with the same uuid * it has the same name @@ -1156,7 +1160,7 @@ virDomainPtr xenXMDomainDefineXML(virConnectPtr conn, const char *xml) if (!(filename = virFileBuildPath(priv->configDir, def->name, NULL))) goto error; - if (xenXMConfigSaveFile(conn, filename, def) < 0) + if (virConfWriteFile(filename, conf) < 0) goto error; if (VIR_ALLOC(entry) < 0) { @@ -1199,6 +1203,7 @@ virDomainPtr xenXMDomainDefineXML(virConnectPtr conn, const char *xml) if (entry) VIR_FREE(entry->filename); VIR_FREE(entry); + virConfFree(conf); virDomainDefFree(def); xenUnifiedUnlock(priv); return (NULL); -- 1.7.1

2 1

[libvirt] [PATCH 1/1] Clarify the purpose of domxml-from-native
by Dave Allan 06 Feb '12

06 Feb '12

Someone mentioned to me that they interpreted this section of the KVM driver page as suggesting that new guests should be created by creating a qemu commandline and converting it to XML with domxml-from-native. I don't think that's the intent of domxml-from-native, so I added that clarification. --- docs/drvqemu.html.in | 12 +++++++++--- 1 files changed, 9 insertions(+), 3 deletions(-) diff --git a/docs/drvqemu.html.in b/docs/drvqemu.html.in index fa5496c..09c4f95 100644 --- a/docs/drvqemu.html.in +++ b/docs/drvqemu.html.in @@ -432,9 +432,15 @@ mount -t cgroup none /dev/cgroup -o devices <h3><a name="xmlimport">Converting from QEMU args to domain XML</a></h3> - The <code>virsh domxml-from-native</code> provides a way to convert an - existing set of QEMU args into a guest description using libvirt Domain XML - that can then be used by libvirt. + The <code>virsh domxml-from-native</code> provides a way to + convert an existing set of QEMU args into a guest description + using libvirt Domain XML that can then be used by libvirt. + Please note that this command is intended to be used to convert + existing qemu guests previously started from the command line to + be managed through libvirt. It should not be used a method of + creating new guests from scratch. New guests should be created + using an application calling the libvirt APIs or by manually + crafting XML to pass to virsh. <pre>$ cat > demo.args <<EOF -- 1.7.7.6

2 1

[libvirt] [PATCH v2 0/5] Introduce sVirt to LXC driver
by Daniel P. Berrange 06 Feb '12

06 Feb '12

This is an update of https://www.redhat.com/archives/libvir-list/2012-January/msg00418.html Changes since v1: - Pushed the first 2 patches which passed review - Update to include all Eric's suggested changes - Rebase to latest GIT master

3 19

[libvirt] [RFC PATCH V2] Add proxy FS support to libvirt
by M. Mohan Kumar 06 Feb '12

06 Feb '12

From: "M. Mohan Kumar" <mohan(a)in.ibm.com> A new FS driver type 'proxy' is added to QEMU 9p server. This patch adds support for using proxy FS driver from libvirt. QEMU proxy FS driver uses socket for communicating between helper and qemu proxy FS driver. Proxy helper (a stand alone binary part of qemu) is invoked with one of the descriptors created using socketpair call and the share path. Similarly QEMU is invoked with another descriptor created using the same socketpair system call and with other required FS driver parameters. Need for proxy FS driver ======================== Pass through security model in QEMU 9p server has following issues: 1) TOCTTOU vulnerability: Following symbolic links in the server could provide access to files beyond 9p export path. 2) Running QEMU with root privilege could be a security issue (pass through security model needs root privilege). Proxy FS driver is implemented to solve these issues. Proxy FS uses chroot + socket combination for securing the vulnerability known with following symbolic links. Intention of adding a new filesystem type is to allow qemu to run in non-root mode, but doing privileged operations in a chroot environment using socket IO. Proxy helper is invoked with root privileges and chroots into 9p export path. QEMU proxy fs driver sends filesystem request to proxy helper and receives the response from it. Proxy helper is designed such a way that it needs only few capabilities related to filesystem operations (such as CAP_DAC_OVERRIDE, CAP_FOWNER, etc) and all other capabilities are dropped (CAP_SYS_CHROOT, etc) Proxy patches http://permalink.gmane.org/gmane.comp.emulators.qemu/128735 Signed-off-by: M. Mohan Kumar <mohan(a)in.ibm.com> --- Changes from previous version * Remove the xml node for specifying the virtfs-proxy-helper, now it is determined from qemu binary. docs/formatdomain.html.in | 3 +- src/conf/domain_conf.c | 3 +- src/conf/domain_conf.h | 2 +- src/qemu/qemu_capabilities.c | 3 ++ src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 71 ++++++++++++++++++++++++++++++++++++++++-- src/qemu/qemu_command.h | 3 +- tests/qemuhelptest.c | 3 +- 8 files changed, 81 insertions(+), 8 deletions(-) diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index 18b7e22..e398779 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -1336,7 +1336,8 @@ This mode also has an optional sub-element <code>driver</code>, with an attribute <code>type='path'</code> - or <code>type='handle'</code> (since + or <code>type='handle'</code> + or <code>type='proxy'</code> (since 0.9.7). </dd> <dt><code>type='template'</code></dt> diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 0190a81..2d45324 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -250,7 +250,8 @@ VIR_ENUM_IMPL(virDomainFS, VIR_DOMAIN_FS_TYPE_LAST, VIR_ENUM_IMPL(virDomainFSDriverType, VIR_DOMAIN_FS_DRIVER_TYPE_LAST, "default", "path", - "handle") + "handle", + "proxy") VIR_ENUM_IMPL(virDomainFSAccessMode, VIR_DOMAIN_FS_ACCESSMODE_LAST, "passthrough", diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index 03aa5b6..3796da4 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -466,6 +466,7 @@ enum virDomainFSDriverType { VIR_DOMAIN_FS_DRIVER_TYPE_DEFAULT = 0, VIR_DOMAIN_FS_DRIVER_TYPE_PATH, VIR_DOMAIN_FS_DRIVER_TYPE_HANDLE, + VIR_DOMAIN_FS_DRIVER_TYPE_PROXY, VIR_DOMAIN_FS_DRIVER_TYPE_LAST }; @@ -491,7 +492,6 @@ struct _virDomainFSDef { virDomainDeviceInfo info; }; - /* 5 different types of networking config */ enum virDomainNetType { VIR_DOMAIN_NET_TYPE_USER, diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 43c7578..9c01a3b 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -144,6 +144,7 @@ VIR_ENUM_IMPL(qemuCaps, QEMU_CAPS_LAST, "ich9-ahci", "no-acpi", "fsdev-readonly", + "fsdev-proxy", ); struct qemu_feature_flags { @@ -1083,6 +1084,8 @@ qemuCapsComputeCmdFlags(const char *help, qemuCapsSet(flags, QEMU_CAPS_FSDEV); if (strstr(fsdev, "readonly")) qemuCapsSet(flags, QEMU_CAPS_FSDEV_READONLY); + if (strstr(fsdev, "sock_fd")) + qemuCapsSet(flags, QEMU_CAPS_FSDEV_PROXY); } if (strstr(help, "-smbios type")) qemuCapsSet(flags, QEMU_CAPS_SMBIOS_TYPE); diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index c759baf..e129e35 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -117,6 +117,7 @@ enum qemuCapsFlags { QEMU_CAPS_ICH9_AHCI = 77, /* -device ich9-ahci */ QEMU_CAPS_NO_ACPI = 78, /* -no-acpi */ QEMU_CAPS_FSDEV_READONLY =79, /* -fsdev readonly supported */ + QEMU_CAPS_FSDEV_PROXY = 80, /* -fsdev proxy supported */ QEMU_CAPS_LAST, /* this must always be the last item */ }; diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index f2e9cfa..0c79340 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -44,6 +44,7 @@ #include <sys/utsname.h> #include <sys/stat.h> #include <fcntl.h> +#include <libgen.h> #define VIR_FROM_THIS VIR_FROM_QEMU @@ -106,7 +107,8 @@ VIR_ENUM_DECL(qemuDomainFSDriver) VIR_ENUM_IMPL(qemuDomainFSDriver, VIR_DOMAIN_FS_DRIVER_TYPE_LAST, "local", "local", - "handle"); + "handle", + "proxy"); static void @@ -2080,9 +2082,43 @@ error: return NULL; } +/* + * Invokes the Proxy Helper with one of the socketpair as its parameter + * + */ +static int qemuInvokeProxyHelper(const char *emulator, int sock, const char *path) +{ +#define HELPER "virtfs-proxy-helper" + int ret_val, status; + virCommandPtr cmd; + char *helper, *dname; + + dname = dirname(strdup(emulator)); + if (virAsprintf(&helper, "%s/%s", dname, HELPER) < 0) { + VIR_FREE(dname); + virReportOOMError(); + return -1; + } + + cmd = virCommandNewArgList(helper, NULL); + virCommandAddArg(cmd, "-f"); + virCommandAddArgFormat(cmd, "%d", sock); + virCommandAddArg(cmd, "-p"); + virCommandAddArgFormat(cmd, "%s", path); + virCommandTransferFD(cmd, sock); + virCommandDaemonize(cmd); + ret_val = virCommandRun(cmd, &status); + if (ret_val < 0) + qemuReportError(VIR_ERR_INTERNAL_ERROR, + _("%s can't execute"), helper); + virCommandFree(cmd); + VIR_FREE(helper); + VIR_FREE(dname); + return ret_val; +} char *qemuBuildFSStr(virDomainFSDefPtr fs, - virBitmapPtr qemuCaps ATTRIBUTE_UNUSED) + virBitmapPtr qemuCaps ATTRIBUTE_UNUSED, int qemuSocket) { virBuffer opt = VIR_BUFFER_INITIALIZER; const char *driver = qemuDomainFSDriverTypeToString(fs->fsdriver); @@ -2108,6 +2144,10 @@ char *qemuBuildFSStr(virDomainFSDefPtr fs, virBufferAddLit(&opt, ",security_model=none"); } virBufferAsprintf(&opt, ",id=%s%s", QEMU_FSDEV_HOST_PREFIX, fs->info.alias); + + if (fs->fsdriver == VIR_DOMAIN_FS_DRIVER_TYPE_PROXY) + virBufferAsprintf(&opt, ",sock_fd=%d", qemuSocket); + virBufferAsprintf(&opt, ",path=%s", fs->src); if (fs->readonly) { @@ -4426,10 +4466,35 @@ qemuBuildCommandLine(virConnectPtr conn, if (qemuCapsGet(qemuCaps, QEMU_CAPS_FSDEV)) { for (i = 0 ; i < def->nfss ; i++) { char *optstr; + int sockets[2] = {-1, -1}; virDomainFSDefPtr fs = def->fss[i]; + /* + * If its a proxy FS, we need to create a socket pair + * and invoke proxy_helper + */ + if (fs->fsdriver == VIR_DOMAIN_FS_DRIVER_TYPE_PROXY) { + if (qemuCapsGet(qemuCaps, QEMU_CAPS_FSDEV_PROXY) < 0) { + qemuReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("proxy helper not supported")); + goto error; + } + /* create a socket pair */ + if (socketpair(PF_UNIX, SOCK_STREAM, 0, sockets) < 0) { + qemuReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("socketpair failed")); + goto error; + } + virCommandTransferFD(cmd, sockets[1]); + if (qemuInvokeProxyHelper(def->emulator, sockets[0], + fs->src) < 0) { + VIR_FORCE_CLOSE(sockets[0]); + VIR_FORCE_CLOSE(sockets[1]); + goto error; + } + } virCommandAddArg(cmd, "-fsdev"); - if (!(optstr = qemuBuildFSStr(fs, qemuCaps))) + if (!(optstr = qemuBuildFSStr(fs, qemuCaps, sockets[1]))) goto error; virCommandAddArg(cmd, optstr); VIR_FREE(optstr); diff --git a/src/qemu/qemu_command.h b/src/qemu/qemu_command.h index de61cf3..8e4f335 100644 --- a/src/qemu/qemu_command.h +++ b/src/qemu/qemu_command.h @@ -87,7 +87,8 @@ char *qemuBuildDriveStr(virConnectPtr conn, bool bootable, virBitmapPtr qemuCaps); char *qemuBuildFSStr(virDomainFSDefPtr fs, - virBitmapPtr qemuCaps); + virBitmapPtr qemuCaps, + int qemuSocket); /* Current, best practice */ char * qemuBuildDriveDevStr(virDomainDiskDefPtr disk, diff --git a/tests/qemuhelptest.c b/tests/qemuhelptest.c index 60155e7..455a7e1 100644 --- a/tests/qemuhelptest.c +++ b/tests/qemuhelptest.c @@ -648,7 +648,8 @@ mymain(void) QEMU_CAPS_PCI_ROMBAR, QEMU_CAPS_ICH9_AHCI, QEMU_CAPS_NO_ACPI, - QEMU_CAPS_FSDEV_READONLY); + QEMU_CAPS_FSDEV_READONLY, + QEMU_CAPS_FSDEV_PROXY); return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE; } -- 1.7.6

1 1

[libvirt] [PATCH] maint: Add test output files to .gitignore
by Peter Krempa 06 Feb '12

06 Feb '12

Commit 8f00276c8a6140cec6a6d50441c802981d329c0c consolidated other .gitignore files to the master one, but forgot to add some test output files. --- Detected by git status on a cleaned repo with make check done: # On branch master # Untracked files: # (use "git add <file>..." to include in what will be committed) # # tests/commandtest # tests/virtimetest .gitignore | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/.gitignore b/.gitignore index 3e85e4d..b7561dc 100644 --- a/.gitignore +++ b/.gitignore @@ -111,6 +111,7 @@ /tests/*.pid /tests/*xml2*test /tests/commandhelper +/tests/commandtest /tests/conftest /tests/cputest /tests/domainsnapshotxml2xmltest @@ -142,6 +143,7 @@ /tests/virhashtest /tests/virnet*test /tests/virshtest +/tests/virtimetest /tests/vmx2xmltest /tests/xencapstest /tests/xmconfigtest -- 1.7.3.4

2 2

[libvirt] [PATCH] Update myself in AUTHORS
by ajia＠redhat.com 06 Feb '12

06 Feb '12

From: Alex Jia <ajia(a)redhat.com> Move myself from 'Previous maintainers' section to 'the primary maintainers and people with commit access rights' section, because I have a commit right now. Signed-off-by: Alex Jia <ajia(a)redhat.com> --- AUTHORS | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/AUTHORS b/AUTHORS index ee510ab..578a377 100644 --- a/AUTHORS +++ b/AUTHORS @@ -30,6 +30,7 @@ The primary maintainers and people with commit access rights: Michal Prívozník <mprivozn(a)redhat.com> Peter Krempa <pkrempa(a)redhat.com> Christophe Fergeau <cfergeau(a)redhat.com> + Alex Jia <ajia(a)redhat.com> Previous maintainers: Karel Zak <kzak(a)redhat.com> @@ -182,7 +183,6 @@ Patches have also been contributed by: Guannan Ren <gren(a)redhat.com> John Williams <john.williams(a)petalogix.com> Michael Santos <michael.santos(a)gmail.com> - Alex Jia <ajia(a)redhat.com> Oskari Saarenmaa <os(a)ohmu.fi> Nan Zhang <nzhang(a)redhat.com> Wieland Hoffmann <themineo(a)googlemail.com> -- 1.7.1

3 3

[libvirt] Are they reasonable FD leaks?
by Alex Jia 06 Feb '12

06 Feb '12

Hi all, I met some FD leaks when I tried the following scenario: % dd if=/dev/null of=/var/lib/libvirt/images/foo bs=1 count=1 seek=10M % virsh define foo.xml (disk source file points to '/var/lib/libvirt/images/foo') % virsh vol-clone foo foo-clone default (the original guest name is 'foo') % virsh pool-refresh default % virsh vol-list default (make sure 'foo-clone' volume exists) % virsh define foo-clone.xml (disk source file points to '/var/lib/libvirt/images/foo-clone') % valgrind -v --track-fds=yes virsh undefine foo-clone --remove-all-storage <snip> ==21003== FILE DESCRIPTORS: 10 open at exit. ==21003== Open file descriptor 9: ==21003== at 0x39CF0D8BB7: pipe2 (in /lib64/libc-2.12.so) ==21003== by 0x4E4FC97: rpl_pipe2 (pipe2.c:59) ==21003== by 0x4D5C3FA: virNetClientNew (virnetclient.c:278) ==21003== by 0x4D5C7B2: virNetClientNewUNIX (virnetclient.c:352) ==21003== by 0x4D47EAA: doRemoteOpen (remote_driver.c:601) ==21003== by 0x4D499AF: remoteOpen (remote_driver.c:873) ==21003== by 0x4D12D23: do_open (libvirt.c:1196) ==21003== by 0x4D13EE5: virConnectOpenAuth (libvirt.c:1422) ==21003== by 0x415040: vshReconnect (virsh.c:637) ==21003== by 0x4152A7: vshCommandRun (virsh.c:17688) ==21003== by 0x4264D3: main (virsh.c:19270) ==21003== ==21003== Open file descriptor 8: ==21003== at 0x39CF0D8BB7: pipe2 (in /lib64/libc-2.12.so) ==21003== by 0x4E4FC97: rpl_pipe2 (pipe2.c:59) ==21003== by 0x4D5C3FA: virNetClientNew (virnetclient.c:278) ==21003== by 0x4D5C7B2: virNetClientNewUNIX (virnetclient.c:352) ==21003== by 0x4D47EAA: doRemoteOpen (remote_driver.c:601) ==21003== by 0x4D499AF: remoteOpen (remote_driver.c:873) ==21003== by 0x4D12D23: do_open (libvirt.c:1196) ==21003== by 0x4D13EE5: virConnectOpenAuth (libvirt.c:1422) ==21003== by 0x415040: vshReconnect (virsh.c:637) ==21003== by 0x4152A7: vshCommandRun (virsh.c:17688) ==21003== by 0x4264D3: main (virsh.c:19270) ==21003== ==21003== Open AF_UNIX socket 7: <unknown> ==21003== at 0x39CF0E67B7: socket (in /lib64/libc-2.12.so) ==21003== by 0x4D6B0F0: virNetSocketNewConnectUNIX (virnetsocket.c:490) ==21003== by 0x4D5C79F: virNetClientNewUNIX (virnetclient.c:349) ==21003== by 0x4D47EAA: doRemoteOpen (remote_driver.c:601) ==21003== by 0x4D499AF: remoteOpen (remote_driver.c:873) ==21003== by 0x4D12D23: do_open (libvirt.c:1196) ==21003== by 0x4D13EE5: virConnectOpenAuth (libvirt.c:1422) ==21003== by 0x415040: vshReconnect (virsh.c:637) ==21003== by 0x4152A7: vshCommandRun (virsh.c:17688) ==21003== by 0x4264D3: main (virsh.c:19270) </snip> It seems libvirt deliberately leaks these FDs, right? Regards, Alex

3 4

[libvirt] [PATCH] virsh: Fix resource leak while listing inactive domains with titles
by Peter Krempa 06 Feb '12

06 Feb '12

Commit fad5cd210899dfde4afe36712754dc921c3f3051 introduces a new flag that allows to show domain's title with domains. This commit introduced resource leak while listing inactive domains with titles. --- Sadly, I missed this even when it was incorrectly intended. :( (extra context for easier review) tools/virsh.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/virsh.c b/tools/virsh.c index 1613d2e..d6fe680 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -1000,34 +1000,34 @@ cmdList(vshControl *ctl, const vshCmd *cmd ATTRIBUTE_UNUSED) if (desc) { if (!(title = vshGetDomainDescription(ctl, dom, true, 0))) goto cleanup; vshPrint(ctl, "%-5s %-30s %-10s %s\n", "-", names[i], state == -2 ? _("saved") : _(vshDomainStateToString(state)), title); VIR_FREE(title); } else { vshPrint(ctl, " %-5s %-30s %s\n", "-", names[i], state == -2 ? _("saved") : _(vshDomainStateToString(state))); + } virDomainFree(dom); VIR_FREE(names[i]); - } } ret = true; cleanup: VIR_FREE(ids); VIR_FREE(names); return ret; } /* * "desc" command for managing domain description and title */ static const vshCmdInfo info_desc[] = { {"help", N_("show or set domain's description or title")}, {"desc", N_("Allows to show or modify description or title of a domain.")}, -- 1.7.3.4

2 2

[libvirt] [libvirt-glib 1/7] Fix gvir_config_object_new_from_xml error reporting
by Christophe Fergeau 06 Feb '12

06 Feb '12

It's currently failing to report parsing errors if the passed in error is NULL. --- libvirt-gconfig/libvirt-gconfig-object.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/libvirt-gconfig/libvirt-gconfig-object.c b/libvirt-gconfig/libvirt-gconfig-object.c index 2e28208..7e3cb88 100644 --- a/libvirt-gconfig/libvirt-gconfig-object.c +++ b/libvirt-gconfig/libvirt-gconfig-object.c @@ -636,10 +636,13 @@ GVirConfigObject *gvir_config_object_new_from_xml(GType type, GVirConfigObject *object; GVirConfigXmlDoc *doc; xmlNodePtr node; + GError *tmp_error = NULL; - node = gvir_config_xml_parse(xml, root_name, error); - if ((error != NULL) && (*error != NULL)) + node = gvir_config_xml_parse(xml, root_name, &tmp_error); + if (tmp_error != NULL) { + g_propagate_error(error, tmp_error); return NULL; + } doc = gvir_config_xml_doc_new(node->doc); object = GVIR_CONFIG_OBJECT(g_object_new(type, "doc", doc, -- 1.7.7.6

2 15

[libvirt] [PATCH] xen_xm: Fix SIGSEGV in xenXMDomainDefineXML
by Philipp Hahn 06 Feb '12

06 Feb '12

On CentOS5 with xen-3.0.3: Program received signal SIGSEGV, Segmentation fault. virFree (ptrptr=0x8) at util/memory.c:310 310 free(*(void**)ptrptr); (gdb) bt #0 virFree (ptrptr=0x8) at util/memory.c:310 #1 0x00002aaaaae167c8 in xenXMDomainDefineXML (conn=0x694e80, xml=0x6b2ce0 "P\fk") at xen/xm_internal.c:1199 #2 0x00002aaaaae070d7 in xenUnifiedDomainDefineXML (conn=0x8, xml=0x6ac040 "<domain type='xen'>\n <name>pv</name>\n <uuid>20291bc0-453a-4d6c-c6ac-4e5af63b932c</uuid>\n <memory>1048576</memory>\n <currentMemory>1048576</currentMemory>\n <vcpu>1</vcpu>\n <os>\n <type arch='x8"...) at xen/xen_driver.c:1524 #3 0x00002aaaaada7803 in virDomainDefineXML (conn=0x694e80, xml=0x6ac040 "<domain type='xen'>\n <name>pv</name>\n <uuid>20291bc0-453a-4d6c-c6ac-4e5af63b932c</uuid>\n <memory>1048576</memory>\n <currentMemory>1048576</currentMemory>\n <vcpu>1</vcpu>\n <os>\n <type arch='x8"...) at libvirt.c:7823 #4 0x0000000000426173 in cmdEdit (ctl=0x7fffffffb8e0, cmd=<value optimized out>) at virsh.c:14882 #5 0x000000000041c9ce in vshCommandRun (ctl=0x7fffffffb8e0, cmd=0x658c50) at virsh.c:17712 #6 0x000000000042c3b9 in main (argc=1, argv=<value optimized out>) at virsh.c:19317 Signed-off-by: Philipp Hahn <hahn(a)univention.de> --- src/xen/xm_internal.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/src/xen/xm_internal.c b/src/xen/xm_internal.c index a34e906..02a0e1d 100644 --- a/src/xen/xm_internal.c +++ b/src/xen/xm_internal.c @@ -1196,7 +1196,8 @@ virDomainPtr xenXMDomainDefineXML(virConnectPtr conn, const char *xml) error: VIR_FREE(filename); - VIR_FREE(entry->filename); + if (entry) + VIR_FREE(entry->filename); VIR_FREE(entry); virDomainDefFree(def); xenUnifiedUnlock(priv); -- 1.7.1

2 1

[libvirt] [libvirt-glib] Don't assign const char * to non-const
by Christophe Fergeau 06 Feb '12

06 Feb '12

This causes a gcc warning. --- libvirt-gobject/libvirt-gobject-storage-pool.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/libvirt-gobject/libvirt-gobject-storage-pool.c b/libvirt-gobject/libvirt-gobject-storage-pool.c index db496f3..5a4b4bc 100644 --- a/libvirt-gobject/libvirt-gobject-storage-pool.c +++ b/libvirt-gobject/libvirt-gobject-storage-pool.c @@ -548,7 +548,7 @@ GVirStorageVol *gvir_storage_pool_create_volume } GVirStorageVol *volume; - char *name; + const char *name; volume = GVIR_STORAGE_VOL(g_object_new(GVIR_TYPE_STORAGE_VOL, "handle", handle, -- 1.7.7.6

2 1

[libvirt] [PATCH] RFC Libvirt + Openvswitch
by Ansis Atteka 06 Feb '12

06 Feb '12

This patch allows libvirt to add interfaces to already existing Open vSwitch bridges. The following syntax in domain XML file must be used: <interface type='bridge'> <mac address='52:54:00:d0:3f:f2'/> <source bridge='ovsbr'/> <virtualport type='openvswitch'> <parameters interfaceid='921a80cd-e6de-5a2e-db9c-ab27f15a6e1d'/> </virtualport> <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/> </interface> or if libvirt should auto-generate the interfaceid us following syntax: <interface type='bridge'> <mac address='52:54:00:d0:3f:f2'/> <source bridge='ovsbr'/> <virtualport type='openvswitch'> </virtualport> <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/> </interface> To create Open vSwitch bridge us following command: ovs-vsctl add-br ovsbr 1. This patch has been tested only on Ubuntu 11.10 with KVM 2. Auto-generated interfaceid is not persistent across libvirt reboots --- configure.ac | 5 ++ src/Makefile.am | 2 + src/conf/domain_conf.c | 46 ++++++++++++++ src/conf/domain_conf.h | 6 ++ src/conf/netdev_openvswitch_conf.c | 94 +++++++++++++++++++++++++++++ src/conf/netdev_openvswitch_conf.h | 39 ++++++++++++ src/libvirt_private.syms | 12 ++++ src/lxc/lxc_driver.c | 19 ++++-- src/network/bridge_driver.c | 3 +- src/qemu/qemu_command.c | 3 +- src/qemu/qemu_hotplug.c | 7 ++- src/qemu/qemu_process.c | 3 + src/uml/uml_conf.c | 3 +- src/util/uuid.c | 19 ++++++ src/util/uuid.h | 1 + src/util/virnetdevopenvswitch.c | 114 ++++++++++++++++++++++++++++++++++++ src/util/virnetdevopenvswitch.h | 46 ++++++++++++++ src/util/virnetdevtap.c | 32 +++++++++- src/util/virnetdevtap.h | 8 ++- 19 files changed, 447 insertions(+), 15 deletions(-) create mode 100644 src/conf/netdev_openvswitch_conf.c create mode 100644 src/conf/netdev_openvswitch_conf.h create mode 100644 src/util/virnetdevopenvswitch.c create mode 100644 src/util/virnetdevopenvswitch.h diff --git a/configure.ac b/configure.ac index 9fb7bfc..dca178f 100644 --- a/configure.ac +++ b/configure.ac @@ -213,6 +213,8 @@ AC_PATH_PROG([UDEVSETTLE], [udevsettle], [], [/sbin:/usr/sbin:/usr/local/sbin:$PATH]) AC_PATH_PROG([MODPROBE], [modprobe], [], [/sbin:/usr/sbin:/usr/local/sbin:$PATH]) +AC_PATH_PROG([OVSVSCTL], [ovs-vsctl], [ovs-vsctl], + [/sbin:/usr/sbin:/usr/local/sbin:$PATH]) AC_DEFINE_UNQUOTED([DNSMASQ],["$DNSMASQ"], [Location or name of the dnsmasq program]) @@ -220,6 +222,9 @@ AC_DEFINE_UNQUOTED([RADVD],["$RADVD"], [Location or name of the radvd program]) AC_DEFINE_UNQUOTED([TC],["$TC"], [Location or name of the tc profram (see iproute2)]) +AC_DEFINE_UNQUOTED([OVSVSCTL],["$OVSVSCTL"], + [Location or name of the ovs-vsctl program]) + if test -n "$UDEVADM"; then AC_DEFINE_UNQUOTED([UDEVADM],["$UDEVADM"], [Location or name of the udevadm program]) diff --git a/src/Makefile.am b/src/Makefile.am index a3dd847..79a2dde 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -95,6 +95,7 @@ UTIL_SOURCES = \ util/virmacaddr.h util/virmacaddr.c \ util/virnetdev.h util/virnetdev.c \ util/virnetdevbandwidth.h util/virnetdevbandwidth.c \ + util/virnetdevopenvswitch.h util/virnetdevopenvswitch.c \ util/virnetdevbridge.h util/virnetdevbridge.c \ util/virnetdevmacvlan.c util/virnetdevmacvlan.h \ util/virnetdevtap.h util/virnetdevtap.c \ @@ -136,6 +137,7 @@ LOCK_DRIVER_SANLOCK_SOURCES = \ NETDEV_CONF_SOURCES = \ conf/netdev_bandwidth_conf.h conf/netdev_bandwidth_conf.c \ + conf/netdev_openvswitch_conf.h conf/netdev_openvswitch_conf.c \ conf/netdev_vport_profile_conf.h conf/netdev_vport_profile_conf.c # XML configuration format handling sources diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index aa4b32d..abec371 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -31,6 +31,7 @@ #include <sys/time.h> #include <strings.h> +#include "internal.h" #include "virterror_internal.h" #include "datatypes.h" #include "domain_conf.h" @@ -50,6 +51,7 @@ #include "count-one-bits.h" #include "secret_conf.h" #include "netdev_vport_profile_conf.h" +#include "netdev_openvswitch_conf.h" #include "netdev_bandwidth_conf.h" #define VIR_FROM_THIS VIR_FROM_DOMAIN @@ -952,6 +954,7 @@ virDomainActualNetDefFree(virDomainActualNetDefPtr def) switch (def->type) { case VIR_DOMAIN_NET_TYPE_BRIDGE: VIR_FREE(def->data.bridge.brname); + VIR_FREE(def->data.bridge.ovsPort); break; case VIR_DOMAIN_NET_TYPE_DIRECT: VIR_FREE(def->data.direct.linkdev); @@ -995,6 +998,7 @@ void virDomainNetDefFree(virDomainNetDefPtr def) case VIR_DOMAIN_NET_TYPE_BRIDGE: VIR_FREE(def->data.bridge.brname); VIR_FREE(def->data.bridge.ipaddr); + VIR_FREE(def->data.bridge.ovsPort); break; case VIR_DOMAIN_NET_TYPE_INTERNAL: @@ -3737,7 +3741,15 @@ virDomainActualNetDefParseXML(xmlNodePtr node, } if (actual->type == VIR_DOMAIN_NET_TYPE_BRIDGE) { + xmlNodePtr virtPortNode = virXPathNode("./virtualport", ctxt); actual->data.bridge.brname = virXPathString("string(./source[1]/@bridge)", ctxt); + if (virtPortNode && virXMLPropString(virtPortNode, "type") && + STREQ(virXMLPropString(virtPortNode, "type"), "openvswitch")) { + if (!(actual->data.bridge.ovsPort = + virNetDevOpenvswitchPortParse(virtPortNode))) { + goto error; + } + } } else if (actual->type == VIR_DOMAIN_NET_TYPE_DIRECT) { xmlNodePtr virtPortNode; @@ -3817,6 +3829,7 @@ virDomainNetDefParseXML(virCapsPtr caps, char *linkstate = NULL; virNWFilterHashTablePtr filterparams = NULL; virNetDevVPortProfilePtr virtPort = NULL; + virNetDevOpenvswitchPortPtr ovsPort = NULL; virDomainActualNetDefPtr actual = NULL; xmlNodePtr oldnode = ctxt->node; int ret; @@ -3870,6 +3883,13 @@ virDomainNetDefParseXML(virCapsPtr caps, xmlStrEqual(cur->name, BAD_CAST "virtualport")) { if (!(virtPort = virNetDevVPortProfileParse(cur))) goto error; + } else if ((ovsPort == NULL) && + ((def->type == VIR_DOMAIN_NET_TYPE_BRIDGE) && + xmlStrEqual(cur->name, BAD_CAST "virtualport") && + virXMLPropString(cur, "type") && + STREQ(virXMLPropString(cur, "type"), "openvswitch"))) { + if (!(ovsPort = virNetDevOpenvswitchPortParse(cur))) + goto error; } else if ((network == NULL) && ((def->type == VIR_DOMAIN_NET_TYPE_SERVER) || (def->type == VIR_DOMAIN_NET_TYPE_CLIENT) || @@ -4005,6 +4025,8 @@ virDomainNetDefParseXML(virCapsPtr caps, def->data.bridge.ipaddr = address; address = NULL; } + def->data.bridge.ovsPort = ovsPort; + ovsPort = NULL; break; case VIR_DOMAIN_NET_TYPE_CLIENT: @@ -10427,6 +10449,12 @@ virDomainActualNetDefFormat(virBufferPtr buf, case VIR_DOMAIN_NET_TYPE_BRIDGE: virBufferEscapeString(buf, " <source bridge='%s'/>\n", def->data.bridge.brname); + if (def->data.bridge.ovsPort) { + virBufferAdjustIndent(buf, 6); + if (virNetDevOpenvswitchPortFormat(def->data.bridge.ovsPort, buf) < 0) + return -1; + virBufferAdjustIndent(buf, -6); + } break; case VIR_DOMAIN_NET_TYPE_DIRECT: @@ -10514,6 +10542,12 @@ virDomainNetDefFormat(virBufferPtr buf, if (def->data.bridge.ipaddr) virBufferAsprintf(buf, " <ip address='%s'/>\n", def->data.bridge.ipaddr); + if (def->data.bridge.ovsPort) { + virBufferAdjustIndent(buf, 6); + if (virNetDevOpenvswitchPortFormat(def->data.bridge.ovsPort, buf) < 0) + return -1; + virBufferAdjustIndent(buf, -6); + } break; case VIR_DOMAIN_NET_TYPE_SERVER: @@ -13851,6 +13885,18 @@ virDomainNetGetActualBandwidth(virDomainNetDefPtr iface) return iface->bandwidth; } +virNetDevOpenvswitchPortPtr +virDomainNetGetActualOpenvswitchPortPtr(virDomainNetDefPtr iface) +{ + if (iface->type != VIR_DOMAIN_NET_TYPE_BRIDGE) + return NULL; + if (iface->data.bridge.ovsPort) + return iface->data.bridge.ovsPort; + if (!iface->data.network.actual) + return NULL; + return iface->data.network.actual->data.bridge.ovsPort; +} + /* Return listens[ii] from the appropriate union for the graphics * type, or NULL if this is an unsuitable type, or the index is out of diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index 0a2795d..b7eb7d1 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -41,6 +41,7 @@ # include "virnetdevmacvlan.h" # include "sysinfo.h" # include "virnetdevvportprofile.h" +# include "virnetdevopenvswitch.h" # include "virnetdevbandwidth.h" /* Different types of hypervisor */ @@ -594,6 +595,7 @@ struct _virDomainActualNetDef { union { struct { char *brname; + virNetDevOpenvswitchPortPtr ovsPort; } bridge; struct { char *linkdev; @@ -645,6 +647,7 @@ struct _virDomainNetDef { struct { char *brname; char *ipaddr; + virNetDevOpenvswitchPortPtr ovsPort; } bridge; struct { char *name; @@ -1877,6 +1880,9 @@ virDomainNetGetActualDirectVirtPortProfile(virDomainNetDefPtr iface); virNetDevBandwidthPtr virDomainNetGetActualBandwidth(virDomainNetDefPtr iface); +virNetDevOpenvswitchPortPtr +virDomainNetGetActualOpenvswitchPortPtr(virDomainNetDefPtr iface); + int virDomainControllerInsert(virDomainDefPtr def, virDomainControllerDefPtr controller); void virDomainControllerInsertPreAlloced(virDomainDefPtr def, diff --git a/src/conf/netdev_openvswitch_conf.c b/src/conf/netdev_openvswitch_conf.c new file mode 100644 index 0000000..ddae3aa --- /dev/null +++ b/src/conf/netdev_openvswitch_conf.c @@ -0,0 +1,94 @@ +/* + * Copyright (C) 2012 Nicira, 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 + * + * Authors: + * Dan Wendlandt <dan(a)nicira.com> + * Kyle Mestery <kmestery(a)cisco.com> + * Ansis Atteka <aatteka(a)nicira.com> + */ + +#include <config.h> + +#include "netdev_openvswitch_conf.h" +#include "virterror_internal.h" +#include "memory.h" +#include "uuid.h" + +#define VIR_FROM_THIS VIR_FROM_NONE +#define virNetDevError(code, ...) \ + virReportErrorHelper(VIR_FROM_THIS, code, __FILE__, \ + __FUNCTION__, __LINE__, __VA_ARGS__) + + +virNetDevOpenvswitchPortPtr +virNetDevOpenvswitchPortParse(xmlNodePtr node) +{ + char *InterfaceID = NULL; + virNetDevOpenvswitchPortPtr ovsPort = NULL; + xmlNodePtr cur = node->children; + + if (VIR_ALLOC(ovsPort) < 0) { + virReportOOMError(); + goto error; + } + + while (cur != NULL) { + if (xmlStrEqual(cur->name, BAD_CAST "parameters")) { + InterfaceID = virXMLPropString(cur, "interfaceid"); + break; + } + cur = cur->next; + } + + if (InterfaceID == NULL || (strlen(InterfaceID) == 0)) { + // interfaceID does not have to be a UUID, + // but a UUID is a reasonable default + if (virUUIDGenerateStr(ovsPort->InterfaceID)) { + virNetDevError(VIR_ERR_XML_ERROR, "%s", + _("cannot generate a random uuid for interfaceid")); + goto error; + } + } else { + if (virStrcpyStatic(ovsPort->InterfaceID, InterfaceID) == NULL) { + virNetDevError(VIR_ERR_XML_ERROR, "%s", + _("InterfaceID parameter too long")); + goto error; + } + } + +cleanup: + return ovsPort; + +error: + VIR_FREE(ovsPort); + goto cleanup; +} + + +int +virNetDevOpenvswitchPortFormat(virNetDevOpenvswitchPortPtr ovsPort, + virBufferPtr buf) +{ + if (ovsPort == NULL) + return 0; + + virBufferAsprintf(buf, "<virtualport type='openvswitch'>\n"); + virBufferAsprintf(buf, " <parameters interfaceid='%s'/>\n", + ovsPort->InterfaceID); + virBufferAddLit(buf, "</virtualport>\n"); + return 0; +} diff --git a/src/conf/netdev_openvswitch_conf.h b/src/conf/netdev_openvswitch_conf.h new file mode 100644 index 0000000..fd8e079 --- /dev/null +++ b/src/conf/netdev_openvswitch_conf.h @@ -0,0 +1,39 @@ +/* + * Copyright (C) 2012 Nicira, 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 + * + * Authors: + * Dan Wendlandt <dan(a)nicira.com> + * Kyle Mestery <kmestery(a)cisco.com> + * Ansis Atteka <aatteka(a)nicira.com> + */ + +#ifndef __VIR_NETDEV_OPENVSWITCH_CONF_H__ +# define __VIR_NETDEV_OPENVSWITCH_CONF_H__ + +# include "internal.h" +# include "virnetdevopenvswitch.h" +# include "buf.h" +# include "xml.h" + +virNetDevOpenvswitchPortPtr +virNetDevOpenvswitchPortParse(xmlNodePtr node); + +int +virNetDevOpenvswitchPortFormat(virNetDevOpenvswitchPortPtr ovsPort, + virBufferPtr buf); + +#endif /* __VIR_NETDEV_OPENVSWITCH_CONF_H__ */ diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index d6ad36c..0666d5c 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -379,6 +379,7 @@ virDomainNetGetActualBridgeName; virDomainNetGetActualDirectDev; virDomainNetGetActualDirectMode; virDomainNetGetActualDirectVirtPortProfile; +virDomainNetGetActualOpenvswitchPortPtr; virDomainNetGetActualType; virDomainNetIndexByMac; virDomainNetInsert; @@ -738,6 +739,10 @@ virShrinkN; virNetDevBandwidthFormat; virNetDevBandwidthParse; +# netdev_openvswitch_conf.h +virNetDevOpenvswitchPortFormat; +virNetDevOpenvswitchPortParse; + # netdev_vportprofile_conf.h virNetDevVPortProfileFormat; @@ -1145,6 +1150,7 @@ virGetHostUUID; virSetHostUUIDStr; virUUIDFormat; virUUIDGenerate; +virUUIDGenerateStr; virUUIDParse; @@ -1237,10 +1243,16 @@ virNetDevMacVLanCreateWithVPortProfile; virNetDevMacVLanDeleteWithVPortProfile; +# virnetdevopenvswitch.h +virNetDevOpenvswitchAddPort; +virNetDevOpenvswitchDelPort; + + # virnetdevtap.h virNetDevTapCreate; virNetDevTapCreateInBridgePort; virNetDevTapDelete; +virNetDevTapDeleteInBridgePort; # virnetdevveth.h diff --git a/src/lxc/lxc_driver.c b/src/lxc/lxc_driver.c index b712da4..1fab77a 100644 --- a/src/lxc/lxc_driver.c +++ b/src/lxc/lxc_driver.c @@ -56,6 +56,7 @@ #include "domain_nwfilter.h" #include "network/bridge_driver.h" #include "virnetdev.h" +#include "virnetdevtap.h" #include "virnodesuspend.h" #include "virtime.h" #include "virtypedparam.h" @@ -1132,10 +1133,12 @@ static void lxcVmCleanup(lxc_driver_t *driver, priv->monitorWatch = -1; for (i = 0 ; i < vm->def->nnets ; i++) { - ignore_value(virNetDevSetOnline(vm->def->nets[i]->ifname, false)); - ignore_value(virNetDevVethDelete(vm->def->nets[i]->ifname)); - - networkReleaseActualDevice(vm->def->nets[i]); + virDomainNetDefPtr iface = vm->def->nets[i]; + ignore_value(virNetDevSetOnline(iface->ifname, false)); + ignore_value(virNetDevVethDelete(iface->ifname)); + ignore_value(virNetDevTapDeleteInBridgePort(iface->ifname, + virDomainNetGetActualOpenvswitchPortPtr(iface))); + networkReleaseActualDevice(iface); } virDomainConfVMNWFilterTeardown(vm); @@ -1377,8 +1380,12 @@ static int lxcSetupInterfaces(virConnectPtr conn, cleanup: if (ret != 0) { - for (i = 0 ; i < def->nnets ; i++) - networkReleaseActualDevice(def->nets[i]); + for (i = 0 ; i < def->nnets ; i++) { + virDomainNetDefPtr iface = def->nets[i]; + ignore_value(virNetDevTapDeleteInBridgePort(iface->ifname, + virDomainNetGetActualOpenvswitchPortPtr(iface))); + networkReleaseActualDevice(iface); + } } return ret; } diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c index 57ebb9f..1423d3f 100644 --- a/src/network/bridge_driver.c +++ b/src/network/bridge_driver.c @@ -1765,7 +1765,8 @@ networkStartNetworkVirtual(struct network_driver *driver, goto err0; } if (virNetDevTapCreateInBridgePort(network->def->bridge, - &macTapIfName, network->def->mac, 0, false, NULL) < 0) { + &macTapIfName, network->def->mac, 0, + false, NULL, NULL) < 0) { VIR_FREE(macTapIfName); goto err0; } diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 0e26df1..d6a81f1 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -247,7 +247,8 @@ qemuNetworkIfaceConnect(virDomainDefPtr def, memcpy(tapmac, net->mac, VIR_MAC_BUFLEN); tapmac[0] = 0xFE; /* Discourage bridge from using TAP dev MAC */ err = virNetDevTapCreateInBridgePort(brname, &net->ifname, tapmac, - vnet_hdr, true, &tapfd); + vnet_hdr, true, &tapfd, + virDomainNetGetActualOpenvswitchPortPtr(net)); virDomainAuditNetDevice(def, net, "/dev/net/tun", tapfd >= 0); if (err < 0) { if (template_ifname) diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index b4870be..85a004d 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -40,6 +40,7 @@ #include "qemu_cgroup.h" #include "locking/domain_lock.h" #include "network/bridge_driver.h" +#include "virnetdevtap.h" #define VIR_FROM_THIS VIR_FROM_QEMU @@ -837,7 +838,8 @@ cleanup: if (iface_connected) virDomainConfNWFilterTeardown(net); - + ignore_value(virNetDevTapDeleteInBridgePort(net->ifname, + virDomainNetGetActualOpenvswitchPortPtr(net))); networkReleaseActualDevice(net); } @@ -1937,7 +1939,8 @@ int qemuDomainDetachNetDevice(struct qemud_driver *driver, detach->ifname); } } - + ignore_value(virNetDevTapDeleteInBridgePort(detach->ifname, + virDomainNetGetActualOpenvswitchPortPtr(detach))); networkReleaseActualDevice(detach); if (vm->def->nnets > 1) { memmove(vm->def->nets + i, diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 2d92d66..14eeef8 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -62,6 +62,7 @@ #include "network/bridge_driver.h" #include "uuid.h" #include "virtime.h" +#include "virnetdevtap.h" #define VIR_FROM_THIS VIR_FROM_QEMU @@ -3731,6 +3732,8 @@ void qemuProcessStop(struct qemud_driver *driver, /* release the physical device (or any other resources used by * this interface in the network driver */ + ignore_value(virNetDevTapDeleteInBridgePort(net->ifname, + virDomainNetGetActualOpenvswitchPortPtr(net))); networkReleaseActualDevice(net); } diff --git a/src/uml/uml_conf.c b/src/uml/uml_conf.c index 316d558..b8610ea 100644 --- a/src/uml/uml_conf.c +++ b/src/uml/uml_conf.c @@ -142,7 +142,8 @@ umlConnectTapDevice(virConnectPtr conn, memcpy(tapmac, net->mac, VIR_MAC_BUFLEN); tapmac[0] = 0xFE; /* Discourage bridge from using TAP dev MAC */ if (virNetDevTapCreateInBridgePort(bridge, &net->ifname, tapmac, - 0, true, NULL) < 0) { + 0, true, NULL, + virDomainNetGetActualOpenvswitchPortPtr(net)) < 0) { if (template_ifname) VIR_FREE(net->ifname); goto error; diff --git a/src/util/uuid.c b/src/util/uuid.c index 23822ec..d8188b7 100644 --- a/src/util/uuid.c +++ b/src/util/uuid.c @@ -116,6 +116,25 @@ virUUIDGenerate(unsigned char *uuid) } /** + * virUUIDGenerateString: + * @uuid: string of VIR_UUID_STRING_BUFLEN characters to store the UUID + * + * + * Generates a randomized unique identifier + * Returns 0 in case of success and -1 in case of failure + */ +int +virUUIDGenerateStr(char *uuidstr) +{ + unsigned char uuid[VIR_UUID_BUFLEN]; + + if (virUUIDGenerate(uuid) < 0) + return -1; + virUUIDFormat(uuid, uuidstr); + return 0; +} + +/** * virUUIDParse: * @uuidstr: zero terminated string representation of the UUID * @uuid: array of VIR_UUID_BUFLEN bytes to store the raw UUID diff --git a/src/util/uuid.h b/src/util/uuid.h index 7dbfad5..1ae7efb 100644 --- a/src/util/uuid.h +++ b/src/util/uuid.h @@ -30,6 +30,7 @@ int virGetHostUUID(unsigned char *host_uuid) ATTRIBUTE_NONNULL(1); int virUUIDIsValid(unsigned char *uuid); int virUUIDGenerate(unsigned char *uuid); +int virUUIDGenerateStr(char *struuid); int virUUIDParse(const char *uuidstr, unsigned char *uuid) diff --git a/src/util/virnetdevopenvswitch.c b/src/util/virnetdevopenvswitch.c new file mode 100644 index 0000000..c5bef8d --- /dev/null +++ b/src/util/virnetdevopenvswitch.c @@ -0,0 +1,114 @@ +/* + * Copyright (C) 2012 Nicira, 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 + * + * Authors: + * Dan Wendlandt <dan(a)nicira.com> + * Kyle Mestery <kmestery(a)cisco.com> + * Ansis Atteka <aatteka(a)nicira.com> + */ + +#include <config.h> + +#include "virnetdevopenvswitch.h" +#include "command.h" +#include "memory.h" +#include "virterror_internal.h" +#include "ignore-value.h" +#include "virmacaddr.h" + +#define VIR_FROM_THIS VIR_FROM_NONE + +/** + * virNetDevOpenvswitchAddPort: + * @brname: the bridge name + * @ifname: the network interface name + * @macaddr: the mac address of the virtual interface + * + * Add an interface to the OVS bridge + * + * Returns 0 in case of success or -1 in case of failure. + */ +int virNetDevOpenvswitchAddPort(const char *brname, const char *ifname, + const unsigned char *macaddr, + virNetDevOpenvswitchPortPtr ovsport) +{ + int ret = -1; + virCommandPtr cmd = NULL; + char macaddrstr[VIR_MAC_STRING_BUFLEN]; + char *attachedmac_ex_id = NULL; + char *ifaceid_ex_id = NULL; + + virMacAddrFormat(macaddr, macaddrstr); + + if (virAsprintf(&attachedmac_ex_id, "external-ids:attached-mac=\"%s\"", + macaddrstr) < 0) + goto cleanup; + if (virAsprintf(&ifaceid_ex_id, "external-ids:iface-id=\"%s\"", + ovsport->InterfaceID) < 0) + goto cleanup; + + cmd = virCommandNew(OVSVSCTL); + virCommandAddArgList(cmd, "--", "--may-exist", "add-port", + brname, ifname, + "--", "set", "Interface", ifname, attachedmac_ex_id, + "--", "set", "Interface", ifname, ifaceid_ex_id, + "--", "set", "Interface", ifname, + "external-ids:iface-status=active", + NULL); + + if (virCommandRun(cmd, NULL) < 0) { + virReportSystemError(VIR_ERR_INTERNAL_ERROR, + _("Unable to add port %s to OVS bridge %s"), + ifname, brname); + goto cleanup; + } + ret = 0; + + cleanup: + VIR_FREE(attachedmac_ex_id); + VIR_FREE(ifaceid_ex_id); + virCommandFree(cmd); + return ret; +} + +/** + * virNetDevOpenvswitchDelPort: + * @ifname: the network interface name + * + * Deletes an interface from a OVS bridge + * + * Returns 0 in case of success or -1 in case of failure. + */ +int virNetDevOpenvswitchDelPort(const char *ifname) +{ + int ret = -1; + virCommandPtr cmd = NULL; + + cmd = virCommandNew(OVSVSCTL); + virCommandAddArgList(cmd, "--", "--if-exists", "del-port", ifname, NULL); + + if (virCommandRun(cmd, NULL) < 0) { + virReportSystemError(VIR_ERR_INTERNAL_ERROR, + _("Unable to delete port %s from OVS"), ifname); + goto cleanup; + } + ret = 0; + + cleanup: + virCommandFree(cmd); + return ret; +} diff --git a/src/util/virnetdevopenvswitch.h b/src/util/virnetdevopenvswitch.h new file mode 100644 index 0000000..210546b --- /dev/null +++ b/src/util/virnetdevopenvswitch.h @@ -0,0 +1,46 @@ +/* + * Copyright (C) 2012 Nicira, 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 + * + * Authors: + * Dan Wendlandt <dan(a)nicira.com> + * Kyle Mestery <kmestery(a)cisco.com> + * Ansis Atteka <aatteka(a)nicira.com> + */ + +#ifndef __VIR_NETDEV_OPENVSWITCH_H__ +# define __VIR_NETDEV_OPENVSWITCH_H__ + +# include "internal.h" +# include "util.h" + +typedef struct _virNetDevOpenvswitchPort virNetDevOpenvswitchPort; +typedef virNetDevOpenvswitchPort *virNetDevOpenvswitchPortPtr; +struct _virNetDevOpenvswitchPort { + char InterfaceID[VIR_UUID_STRING_BUFLEN]; +}; + +int virNetDevOpenvswitchAddPort(const char *brname, + const char *ifname, + const unsigned char *macaddr, + virNetDevOpenvswitchPortPtr ovsport) + ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(3) + ATTRIBUTE_RETURN_CHECK; + +int virNetDevOpenvswitchDelPort(const char *ifname) + ATTRIBUTE_NONNULL(1) ATTRIBUTE_RETURN_CHECK; + +#endif /* __VIR_NETDEV_OPENVSWITCH_H__ */ diff --git a/src/util/virnetdevtap.c b/src/util/virnetdevtap.c index 2ed53c6..975bb85 100644 --- a/src/util/virnetdevtap.c +++ b/src/util/virnetdevtap.c @@ -25,6 +25,7 @@ #include "virnetdevtap.h" #include "virnetdev.h" #include "virnetdevbridge.h" +#include "virnetdevopenvswitch.h" #include "virterror_internal.h" #include "virfile.h" #include "virterror_internal.h" @@ -249,6 +250,7 @@ int virNetDevTapDelete(const char *ifname ATTRIBUTE_UNUSED) * @macaddr: desired MAC address (VIR_MAC_BUFLEN long) * @vnet_hdr: whether to try enabling IFF_VNET_HDR * @tapfd: file descriptor return value for the new tap device + * @ovsport: Open vSwitch specific configuration * * This function creates a new tap device on a bridge. @ifname can be either * a fixed name or a name template with '%d' for dynamic name allocation. @@ -265,7 +267,8 @@ int virNetDevTapCreateInBridgePort(const char *brname, const unsigned char *macaddr, int vnet_hdr, bool up, - int *tapfd) + int *tapfd, + virNetDevOpenvswitchPortPtr ovsport) { if (virNetDevTapCreate(ifname, vnet_hdr, tapfd) < 0) return -1; @@ -286,8 +289,13 @@ int virNetDevTapCreateInBridgePort(const char *brname, if (virNetDevSetMTUFromDevice(*ifname, brname) < 0) goto error; - if (virNetDevBridgeAddPort(brname, *ifname) < 0) - goto error; + if (ovsport) { + if (virNetDevOpenvswitchAddPort(brname, *ifname, macaddr, ovsport) < 0) + goto error; + } else { + if (virNetDevBridgeAddPort(brname, *ifname) < 0) + goto error; + } if (virNetDevSetOnline(*ifname, up) < 0) goto error; @@ -299,3 +307,21 @@ int virNetDevTapCreateInBridgePort(const char *brname, return errno; } + +/** + * virNetDevTapDeleteInBridgePort: + * @ifname: the interface name (or name template) + * @ovsport: Open vSwitch specific configuration + * + * This function detaches tap device from a bridge. + * + * Returns 0 in case of success or -1 on failure + */ +int virNetDevTapDeleteInBridgePort(char *ifname, + virNetDevOpenvswitchPortPtr ovsport) +{ + int ret = 0; + if (ovsport) + ret = virNetDevOpenvswitchDelPort(ifname); + return ret; +} diff --git a/src/util/virnetdevtap.h b/src/util/virnetdevtap.h index fb35ac5..5b16570 100644 --- a/src/util/virnetdevtap.h +++ b/src/util/virnetdevtap.h @@ -24,6 +24,7 @@ # define __VIR_NETDEV_TAP_H__ # include "internal.h" +# include "conf/domain_conf.h" int virNetDevTapCreate(char **ifname, int vnet_hdr, @@ -38,8 +39,13 @@ int virNetDevTapCreateInBridgePort(const char *brname, const unsigned char *macaddr, int vnet_hdr, bool up, - int *tapfd) + int *tapfd, + virNetDevOpenvswitchPortPtr ovsport) ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(3) ATTRIBUTE_RETURN_CHECK; +int virNetDevTapDeleteInBridgePort(char *ifname, + virNetDevOpenvswitchPortPtr ovsport) +ATTRIBUTE_NONNULL(1) ATTRIBUTE_RETURN_CHECK; + #endif /* __VIR_NETDEV_TAP_H__ */ -- 1.7.5.4

2 1

[libvirt] [PATCH] qemu: Fix seamless spice migration
by Jiri Denemark 06 Feb '12

06 Feb '12

Calling qemuDomainMigrateGraphicsRelocate notifies spice clients to connect to destination qemu so that they can seamlessly switch streams once migration is done. Unfortunately, current qemu is not able to accept any connections while incoming migration connection is open. Thus, we need to delay opening the migration connection to the point spice client is already connected to the destination qemu. --- src/qemu/qemu_migration.c | 83 +++++++++++++++++++++++++++++--------------- 1 files changed, 55 insertions(+), 28 deletions(-) diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index 8453a47..687e77d 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -1381,6 +1381,7 @@ cleanup: enum qemuMigrationDestinationType { MIGRATION_DEST_HOST, + MIGRATION_DEST_CONNECT_HOST, MIGRATION_DEST_UNIX, MIGRATION_DEST_FD, }; @@ -1519,6 +1520,44 @@ cleanup: } static int +qemuMigrationConnect(struct qemud_driver *driver, + virDomainObjPtr vm, + qemuMigrationSpecPtr spec) +{ + virNetSocketPtr sock; + const char *host; + char *port = NULL; + int ret = -1; + + host = spec->dest.host.name; + if (virAsprintf(&port, "%d", spec->dest.host.port) < 0) { + virReportOOMError(); + return -1; + } + + spec->destType = MIGRATION_DEST_FD; + spec->dest.fd.qemu = -1; + + if (virSecurityManagerSetSocketLabel(driver->securityManager, vm->def) < 0) + goto cleanup; + if (virNetSocketNewConnectTCP(host, port, &sock) == 0) { + spec->dest.fd.qemu = virNetSocketDupFD(sock, true); + virNetSocketFree(sock); + } + if (virSecurityManagerClearSocketLabel(driver->securityManager, vm->def) < 0 || + spec->dest.fd.qemu == -1) + goto cleanup; + + ret = 0; + +cleanup: + VIR_FREE(port); + if (ret < 0) + VIR_FORCE_CLOSE(spec->dest.fd.qemu); + return ret; +} + +static int qemuMigrationRun(struct qemud_driver *driver, virDomainObjPtr vm, const char *cookiein, @@ -1583,6 +1622,11 @@ qemuMigrationRun(struct qemud_driver *driver, if (flags & VIR_MIGRATE_NON_SHARED_INC) migrate_flags |= QEMU_MONITOR_MIGRATE_NON_SHARED_INC; + /* connect to the destination qemu if needed */ + if (spec->destType == MIGRATION_DEST_CONNECT_HOST && + qemuMigrationConnect(driver, vm, spec) < 0) + goto cleanup; + switch (spec->destType) { case MIGRATION_DEST_HOST: ret = qemuMonitorMigrateToHost(priv->mon, migrate_flags, @@ -1590,6 +1634,10 @@ qemuMigrationRun(struct qemud_driver *driver, spec->dest.host.port); break; + case MIGRATION_DEST_CONNECT_HOST: + /* handled above and transformed into MIGRATION_DEST_FD */ + break; + case MIGRATION_DEST_UNIX: if (qemuCapsGet(priv->qemuCaps, QEMU_CAPS_MIGRATE_QEMU_UNIX)) { ret = qemuMonitorMigrateToUnix(priv->mon, migrate_flags, @@ -1712,7 +1760,6 @@ static int doNativeMigrate(struct qemud_driver *driver, xmlURIPtr uribits = NULL; int ret = -1; qemuMigrationSpec spec; - char *tmp = NULL; VIR_DEBUG("driver=%p, vm=%p, uri=%s, cookiein=%s, cookieinlen=%d, " "cookieout=%p, cookieoutlen=%p, flags=%lx, resource=%lu", @@ -1720,6 +1767,7 @@ static int doNativeMigrate(struct qemud_driver *driver, cookieout, cookieoutlen, flags, resource); if (STRPREFIX(uri, "tcp:") && !STRPREFIX(uri, "tcp://")) { + char *tmp; /* HACK: source host generates bogus URIs, so fix them up */ if (virAsprintf(&tmp, "tcp://%s", uri + strlen("tcp:")) < 0) { virReportOOMError(); @@ -1736,41 +1784,20 @@ static int doNativeMigrate(struct qemud_driver *driver, return -1; } - spec.fwdType = MIGRATION_FWD_DIRECT; - - if (qemuCapsGet(priv->qemuCaps, QEMU_CAPS_MIGRATE_QEMU_FD)) { - virNetSocketPtr sock; - - spec.destType = MIGRATION_DEST_FD; - spec.dest.fd.qemu = -1; - - if (virAsprintf(&tmp, "%d", uribits->port) < 0) { - virReportOOMError(); - goto cleanup; - } - if (virSecurityManagerSetSocketLabel(driver->securityManager, vm->def) < 0) - goto cleanup; - if (virNetSocketNewConnectTCP(uribits->server, tmp, &sock) == 0) { - spec.dest.fd.qemu = virNetSocketDupFD(sock, true); - virNetSocketFree(sock); - } - if (virSecurityManagerClearSocketLabel(driver->securityManager, vm->def) < 0 || - spec.dest.fd.qemu == -1) - goto cleanup; - } else { + if (qemuCapsGet(priv->qemuCaps, QEMU_CAPS_MIGRATE_QEMU_FD)) + spec.destType = MIGRATION_DEST_CONNECT_HOST; + else spec.destType = MIGRATION_DEST_HOST; - spec.dest.host.name = uribits->server; - spec.dest.host.port = uribits->port; - } + spec.dest.host.name = uribits->server; + spec.dest.host.port = uribits->port; + spec.fwdType = MIGRATION_FWD_DIRECT; ret = qemuMigrationRun(driver, vm, cookiein, cookieinlen, cookieout, cookieoutlen, flags, resource, &spec, dconn); -cleanup: if (spec.destType == MIGRATION_DEST_FD) VIR_FORCE_CLOSE(spec.dest.fd.qemu); - VIR_FREE(tmp); xmlFreeURI(uribits); return ret; -- 1.7.8.4

2 2

[libvirt] [PATCH] docs: Enhance documentation of the old-style boot configuration
by Jiri Denemark 06 Feb '12

06 Feb '12

Also encourages people to use per-device boot elements for better control. --- docs/formatdomain.html.in | 22 +++++++++++++++++----- 1 files changed, 17 insertions(+), 5 deletions(-) diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index 6bf64a6..ff09113 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -131,12 +131,24 @@ <dd>The <code>dev</code> attribute takes one of the values "fd", "hd", "cdrom" or "network" and is used to specify the next boot device to consider. The <code>boot</code> element can be repeated multiple - times to setup a priority list of boot devices to try in turn. The - <code>boot</code> element cannot be used if per-device boot elements - are used (see <a href="#elementsDisks">disks</a>, + times to setup a priority list of boot devices to try in turn. + Multiple devices of the same type are sorted according to their + targets while preserving the order of buses. After defining the + domain, its XML configuration returned by libvirt (through + virDomainGetXMLDesc) lists devices in the sorted order. Once sorted, + the first device is marked as bootable. Thus, e.g., a domain + configured to boot from "hd" with vdb, hda, vda, and hdc disks + assigned to it will boot from vda (the sorted list is vda, vdb, hda, + hdc). Similar domain with hdc, vda, vdb, and hda disks will boot from + hda (sorted disks are: hda, hdc, vda, vdb). It can be tricky to + configure in the desired way, which is why per-device boot elements + (see <a href="#elementsDisks">disks</a>, <a href="#elementsNICS">network interfaces</a>, and - <a href="#elementsUSB">USB and PCI devices</a> sections below). - Since 0.1.3, per-device boot since 0.8.8 + <a href="#elementsUSB">USB and PCI devices</a> sections below) were + introduced and they are the preferred way providing full control over + booting order. The <code>boot</code> element and per-device boot + elements are mutually exclusive. Since 0.1.3, + per-device boot since 0.8.8 </dd> <dt><code>bootmenu</code></dt> <dd> Whether or not to enable an interactive boot menu prompt on guest -- 1.7.8.4

2 2

[libvirt] [PATCH] tests: Fix build with -Werror
by Jiri Denemark 06 Feb '12

06 Feb '12

--- Pushed as build-breaker. Use of uninitialized "n" after the former "error" label was the issue (gcc didn't get it right though). I forgot to mention this in the commit message :-( tests/cputest.c | 17 +++++++---------- 1 files changed, 7 insertions(+), 10 deletions(-) diff --git a/tests/cputest.c b/tests/cputest.c index 15614a7..870f99f 100644 --- a/tests/cputest.c +++ b/tests/cputest.c @@ -126,17 +126,17 @@ cpuTestLoadMultiXML(const char *arch, goto cleanup; if (!(doc = virXMLParseFileCtxt(xml, &ctxt))) - goto error; + goto cleanup; n = virXPathNodeSet("/cpuTest/cpu", ctxt, &nodes); if (n <= 0 || (VIR_ALLOC_N(cpus, n) < 0)) - goto error; + goto cleanup; for (i = 0; i < n; i++) { ctxt->node = nodes[i]; cpus[i] = virCPUDefParseXML(nodes[i], ctxt, VIR_CPU_TYPE_HOST); if (!cpus[i]) - goto error; + goto cleanup_cpus; } *count = n; @@ -148,13 +148,10 @@ cleanup: xmlFreeDoc(doc); return cpus; -error: - if (cpus) { - for (i = 0; i < n; i++) - virCPUDefFree(cpus[i]); - VIR_FREE(cpus); - cpus = NULL; - } +cleanup_cpus: + for (i = 0; i < n; i++) + virCPUDefFree(cpus[i]); + VIR_FREE(cpus); goto cleanup; } -- 1.7.8.4

1 0

[libvirt] [PATCH] apparmor: Add missing comma
by Jiri Denemark 06 Feb '12

06 Feb '12

Typo introduced by c18a88ac --- Pushed as build-breaker. src/security/virt-aa-helper.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/security/virt-aa-helper.c b/src/security/virt-aa-helper.c index 1971f40..3c9e541 100644 --- a/src/security/virt-aa-helper.c +++ b/src/security/virt-aa-helper.c @@ -917,7 +917,7 @@ get_files(vahControl * ctl) int ret = virDomainDiskDefForeachPath(ctl->def->disks[i], ctl->allowDiskFormatProbing, true, - -1, -1 /* current uid:gid */ + -1, -1, /* current uid:gid */ add_file_path, &buf); if (ret != 0) -- 1.7.8.4

1 0

[libvirt] [PATCH] virsh: Avoid invalid read of size errors
by ajia＠redhat.com 06 Feb '12

06 Feb '12

From: Alex Jia <ajia(a)redhat.com> Detected by valgrind. the codes are allocating 0 bytes memory to variable cpumap by vshCalloc function, and then the function VIR_USE_CPU will access it later, a invalid read error will be hit. * tools/virsh.c(cmdVcpuPin): fix invalid read error. * How to reproduce? % valgrind -v --read-var-info=yes virsh vcpupin <domain> 0 0 * Actual result: ==27271== ERROR SUMMARY: 5 errors from 2 contexts (suppressed: 8 from 6) ==27271== ==27271== 1 errors in context 1 of 2: ==27271== Invalid read of size 1 ==27271== at 0x39CF087E2E: __GI_memcpy (in /lib64/libc-2.12.so) ==27271== by 0x39CF114FDC: xdrmem_putbytes (in /lib64/libc-2.12.so) ==27271== by 0x39CF114707: xdr_opaque (in /lib64/libc-2.12.so) ==27271== by 0x4D56194: xdr_remote_domain_pin_vcpu_args (remote_protocol.c:1844) ==27271== by 0x4D6CCE1: virNetMessageEncodePayload (virnetmessage.c:341) ==27271== by 0x4D5A44B: virNetClientProgramCall (virnetclientprogram.c:327) ==27271== by 0x4D36EDB: callWithFD (remote_driver.c:4546) ==27271== by 0x4D36F7B: call (remote_driver.c:4567) ==27271== by 0x4D3B2C1: remoteDomainPinVcpu (remote_client_bodies.h:1566) ==27271== by 0x4D199D3: virDomainPinVcpu (libvirt.c:8585) ==27271== by 0x4241F4: cmdVcpuPin (virsh.c:5262) ==27271== by 0x4150A6: vshCommandRun (virsh.c:17712) ==27271== Address 0x5602b80 is 0 bytes after a block of size 0 alloc'd ==27271== at 0x4A04A28: calloc (vg_replace_malloc.c:467) ==27271== by 0x4C89BDF: virAllocN (memory.c:129) ==27271== by 0x423868: _vshCalloc.clone.2 (virsh.c:454) ==27271== by 0x423EF9: cmdVcpuPin (virsh.c:5190) ==27271== by 0x4150A6: vshCommandRun (virsh.c:17712) ==27271== by 0x426583: main (virsh.c:19289) ==27271== ==27271== ==27271== 4 errors in context 2 of 2: ==27271== Invalid read of size 1 ==27271== at 0x424133: cmdVcpuPin (virsh.c:5245) ==27271== by 0x4150A6: vshCommandRun (virsh.c:17712) ==27271== by 0x426583: main (virsh.c:19289) ==27271== Address 0x5602b80 is 0 bytes after a block of size 0 alloc'd ==27271== at 0x4A04A28: calloc (vg_replace_malloc.c:467) ==27271== by 0x4C89BDF: virAllocN (memory.c:129) ==27271== by 0x423868: _vshCalloc.clone.2 (virsh.c:454) ==27271== by 0x423EF9: cmdVcpuPin (virsh.c:5190) ==27271== by 0x4150A6: vshCommandRun (virsh.c:17712) ==27271== by 0x426583: main (virsh.c:19289) Signed-off-by: Alex Jia <ajia(a)redhat.com> --- tools/virsh.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/virsh.c b/tools/virsh.c index 72ca93a..1613d2e 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -5187,7 +5187,7 @@ cmdVcpuPin(vshControl *ctl, const vshCmd *cmd) /* Pin mode: pinning specified vcpu to specified physical cpus*/ - cpumap = vshCalloc(ctl, 0, cpumaplen); + cpumap = vshCalloc(ctl, cpumaplen, sizeof(cpumap)); /* Parse cpulist */ cur = cpulist; if (*cur == 0) { -- 1.7.1

3 2

[libvirt] [PATCH 1/4] add a qemu-specific event register API, to passthough the new events come from qemu
by shaohef＠linux.vnet.ibm.com 05 Feb '12

05 Feb '12

From: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com> Basically, this feature can go along with qemu monitor passthrough. That way, if we use new commands in the monitor that generate new events, we want some way to receive those new events too. Signed-off-by: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com> --- include/libvirt/libvirt-qemu.h | 27 ++++ include/libvirt/libvirt.h.in | 2 +- src/conf/domain_event.c | 293 ++++++++++++++++++++++++++++++++++++++-- src/conf/domain_event.h | 50 ++++++- src/driver.h | 14 ++ src/libvirt-qemu.c | 189 ++++++++++++++++++++++++++ src/libvirt_private.syms | 6 + src/libvirt_qemu.syms | 5 + 8 files changed, 571 insertions(+), 15 deletions(-) diff --git a/include/libvirt/libvirt-qemu.h b/include/libvirt/libvirt-qemu.h index 7f12e4f..3aa944a 100644 --- a/include/libvirt/libvirt-qemu.h +++ b/include/libvirt/libvirt-qemu.h @@ -32,6 +32,33 @@ virDomainPtr virDomainQemuAttach(virConnectPtr domain, unsigned int pid, unsigned int flags); +/** + * virConnectDomainQemuEventCallback: + * @conn: connection object + * @dom: domain on which the event occurred + * @eventName : the name of the unknow or un-implementation event + * @eventArgs: the content of the unknow or un-implementation event + * + * The callback signature to use when registering for an event of type + * VIR_QEMU_DOMAIN_EVENT_ID_UNKNOWN with virConnectDomainQemuEventRegister() + */ +typedef void (*virConnectDomainQemuEventCallback)(virConnectPtr conn, + virDomainPtr dom, + const char *eventName, /* The JSON event name */ + const char *eventArgs, /* The JSON string of args */ + void *opaque); + +int +virConnectDomainQemuEventRegister(virConnectPtr conn, + virDomainPtr dom, /* option to filter */ + const char *eventName, /* JSON event name */ + virConnectDomainQemuEventCallback cb, + void *opaque, + virFreeCallback freecb); +int +virConnectDomainQemuEventDeregister(virConnectPtr conn, + int callbackID); + # ifdef __cplusplus } # endif diff --git a/include/libvirt/libvirt.h.in b/include/libvirt/libvirt.h.in index 2480add..9fcb400 100644 --- a/include/libvirt/libvirt.h.in +++ b/include/libvirt/libvirt.h.in @@ -3207,7 +3207,6 @@ typedef void (*virConnectDomainEventBlockJobCallback)(virConnectPtr conn, int type, int status, void *opaque); - /** * virConnectDomainEventDiskChangeReason: * @@ -3263,6 +3262,7 @@ typedef enum { VIR_DOMAIN_EVENT_ID_CONTROL_ERROR = 7, /* virConnectDomainEventGenericCallback */ VIR_DOMAIN_EVENT_ID_BLOCK_JOB = 8, /* virConnectDomainEventBlockJobCallback */ VIR_DOMAIN_EVENT_ID_DISK_CHANGE = 9, /* virConnectDomainEventDiskChangeCallback */ + VIR_QEMU_DOMAIN_EVENT_ID_UNKNOWN = 10, /* virConnectDomainEventDefaultCallback */ /* * NB: this enum value will increase over time as new events are diff --git a/src/conf/domain_event.c b/src/conf/domain_event.c index 614ab97..0388a66 100644 --- a/src/conf/domain_event.c +++ b/src/conf/domain_event.c @@ -45,7 +45,9 @@ typedef virDomainMeta *virDomainMetaPtr; struct _virDomainEventCallback { int callbackID; + int qemuCallbackID; int eventID; + char *eventName; virConnectPtr conn; virDomainMetaPtr dom; virConnectDomainEventGenericCallback cb; @@ -94,6 +96,10 @@ struct _virDomainEvent { char *devAlias; int reason; } diskChange; + struct { + char *eventName; + char *eventArgs; + }qemuUnknownEvent; } data; }; @@ -112,6 +118,7 @@ virDomainEventCallbackListFree(virDomainEventCallbackListPtr list) for (i=0; i<list->count; i++) { virFreeCallback freecb = list->callbacks[i]->freecb; + VIR_FREE(list->callbacks[i]->eventName); if (freecb) (*freecb)(list->callbacks[i]->opaque); VIR_FREE(list->callbacks[i]); @@ -187,8 +194,10 @@ virDomainEventCallbackListRemoveID(virConnectPtr conn, if (freecb) (*freecb)(cbList->callbacks[i]->opaque); virUnrefConnect(cbList->callbacks[i]->conn); + if (cbList->callbacks[i]->eventID == VIR_QEMU_DOMAIN_EVENT_ID_UNKNOWN) { + VIR_FREE(cbList->callbacks[i]->eventName); + } VIR_FREE(cbList->callbacks[i]); - if (i < (cbList->count - 1)) memmove(cbList->callbacks + i, cbList->callbacks + i + 1, @@ -231,6 +240,9 @@ virDomainEventCallbackListRemoveConn(virConnectPtr conn, if (freecb) (*freecb)(cbList->callbacks[i]->opaque); virUnrefConnect(cbList->callbacks[i]->conn); + if (cbList->callbacks[i]->eventID == VIR_QEMU_DOMAIN_EVENT_ID_UNKNOWN) { + VIR_FREE(cbList->callbacks[i]->eventName); + } VIR_FREE(cbList->callbacks[i]); if (i < (cbList->count - 1)) @@ -299,6 +311,9 @@ int virDomainEventCallbackListPurgeMarked(virDomainEventCallbackListPtr cbList) if (freecb) (*freecb)(cbList->callbacks[i]->opaque); virUnrefConnect(cbList->callbacks[i]->conn); + if (cbList->callbacks[i]->eventID == VIR_QEMU_DOMAIN_EVENT_ID_UNKNOWN) { + VIR_FREE(cbList->callbacks[i]->eventName); + } VIR_FREE(cbList->callbacks[i]); if (i < (cbList->count - 1)) @@ -404,7 +419,98 @@ virDomainEventCallbackListAddID(virConnectPtr conn, cbList->callbacks[cbList->count] = event; cbList->count++; + event->callbackID = cbList->nextID++; + + return event->callbackID; + +no_memory: + virReportOOMError(); + + if (event) { + if (event->dom) + VIR_FREE(event->dom->name); + VIR_FREE(event->dom); + } + VIR_FREE(event); + return -1; +} + + + +/** + * virDomainEventCallbackListAddName: + * @conn: pointer to the connection + * @cbList: the list + * @eventName: the event eventName + * @callback: the callback to add + * @eventID: the specific eventID + * @opaque: opaque data tio pass to callback + * + * Internal function to add a callback from a virDomainEventCallbackListPtr + */ +int +virDomainEventCallbackListAddName(virConnectPtr conn, + virDomainEventCallbackListPtr cbList, + virDomainPtr dom, + const char* eventName, + int eventID, + virConnectDomainEventGenericCallback callback, + void *opaque, + virFreeCallback freecb) +{ + virDomainEventCallbackPtr event; + int i; + + /* Check incoming */ + if ( !cbList ) { + return -1; + } + + /* check if we already have this callback on our list */ + for (i = 0 ; i < cbList->count ; i++) { + if (cbList->callbacks[i]->cb == VIR_DOMAIN_EVENT_CALLBACK(callback) && + STREQ(cbList->callbacks[i]->eventName, eventName) && + cbList->callbacks[i]->eventID == eventID && + cbList->callbacks[i]->conn == conn) { + eventReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("event callback already tracked")); + return -1; + } + } + if (eventID > VIR_DOMAIN_EVENT_ID_LAST || eventID < VIR_DOMAIN_EVENT_ID_LIFECYCLE) { + eventReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("not suport this kind of eventID: %d"), eventID); + } + /* Allocate new event */ + if (VIR_ALLOC(event) < 0) + goto no_memory; + event->conn = conn; + event->cb = callback; + if (eventName == NULL) + goto no_memory; + event->eventName = strdup(eventName); + if ( event->eventName == NULL) + goto no_memory; + event->opaque = opaque; + event->freecb = freecb; + event->eventID = eventID; + if (dom) { + if (VIR_ALLOC(event->dom) < 0) + goto no_memory; + if (!(event->dom->name = strdup(dom->name))) + goto no_memory; + memcpy(event->dom->uuid, dom->uuid, VIR_UUID_BUFLEN); + event->dom->id = dom->id; + } + /* Make space on list */ + if (VIR_REALLOC_N(cbList->callbacks, cbList->count + 1) < 0) + goto no_memory; + + event->conn->refs++; + + cbList->callbacks[cbList->count] = event; + cbList->count++; event->callbackID = cbList->nextID++; return event->callbackID; @@ -416,11 +522,40 @@ no_memory: if (event->dom) VIR_FREE(event->dom->name); VIR_FREE(event->dom); + VIR_FREE(event->eventName); } VIR_FREE(event); return -1; } +/** + * virDomainEventCallbackListAddQemuCallbackID: + * @conn: pointer to the connection + * @cbList: the list + * @callbackID: the libvirt callback ID + * @qemuCallbackID: the libvirtd callback ID to add + * + * Internal function to add a Daemon libvirtd callbackID + */ +int +virDomainEventCallbackListAddQemuCallbackID(virConnectPtr conn, + virDomainEventCallbackListPtr cbList, + int callbackID, + int qemuCallbackID) +{ + int i; + for (i = 0 ; i < cbList->count ; i++) { + if (cbList->callbacks[i]->callbackID == callbackID && + cbList->callbacks[i]->conn == conn) { + cbList->callbacks[i]->qemuCallbackID = qemuCallbackID; + return 0; + } + } + + eventReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("could not find event callback for deletion")); + return -1; +} int virDomainEventCallbackListCountID(virConnectPtr conn, virDomainEventCallbackListPtr cbList, @@ -442,6 +577,27 @@ int virDomainEventCallbackListCountID(virConnectPtr conn, } +int +virDomainEventCallbackListCountName(virConnectPtr conn, + virDomainEventCallbackListPtr cbList, + const char *eventName) +{ + int i; + int count = 0; + + for (i = 0 ; i < cbList->count ; i++) { + if (cbList->callbacks[i]->deleted) + continue; + + if (STREQ(cbList->callbacks[i]->eventName,eventName) && + cbList->callbacks[i]->conn == conn) + count++; + } + + return count; +} + + int virDomainEventCallbackListEventID(virConnectPtr conn, virDomainEventCallbackListPtr cbList, int callbackID) @@ -461,6 +617,44 @@ int virDomainEventCallbackListEventID(virConnectPtr conn, } +const char* +virDomainEventCallbackListEventName(virConnectPtr conn, + virDomainEventCallbackListPtr cbList, + int callbackID) +{ + int i; + + for (i = 0 ; i < cbList->count ; i++) { + if (cbList->callbacks[i]->deleted) + continue; + + if (cbList->callbacks[i]->callbackID == callbackID && + cbList->callbacks[i]->conn == conn) + return cbList->callbacks[i]->eventName; + } + + return NULL; +} + +int +virDomainEventCallbackListEventQemuCallbackID(virConnectPtr conn, + virDomainEventCallbackListPtr cbList, + int callbackID) +{ + int i; + + for (i = 0 ; i < cbList->count ; i++) { + if (cbList->callbacks[i]->deleted) + continue; + + if (cbList->callbacks[i]->callbackID == callbackID && + cbList->callbacks[i]->conn == conn) + return cbList->callbacks[i]->qemuCallbackID; + } + + return -1; +} + int virDomainEventCallbackListCount(virDomainEventCallbackListPtr cbList) { int i; @@ -521,6 +715,11 @@ void virDomainEventFree(virDomainEventPtr event) VIR_FREE(event->data.diskChange.newSrcPath); VIR_FREE(event->data.diskChange.devAlias); break; + + case VIR_QEMU_DOMAIN_EVENT_ID_UNKNOWN: + VIR_FREE(event->data.qemuUnknownEvent.eventName); + VIR_FREE(event->data.qemuUnknownEvent.eventArgs); + break; } VIR_FREE(event->dom.name); @@ -956,6 +1155,51 @@ virDomainEventPtr virDomainEventBlockJobNewFromDom(virDomainPtr dom, path, type, status); } +static virDomainEventPtr +virDomainEventUnknownNew(int id, const char *name, unsigned char *uuid, + const char *eventName, const char *eventArgs) +{ + virDomainEventPtr ev = + virDomainEventNewInternal(VIR_QEMU_DOMAIN_EVENT_ID_UNKNOWN, + id, name, uuid); + if (ev) { + if (!(ev->data.qemuUnknownEvent.eventName = strdup(eventName))) { + virReportOOMError(); + VIR_FREE(ev->dom.name); + VIR_FREE(ev); + return NULL; + } + if (eventArgs) { + if (!(ev->data.qemuUnknownEvent.eventArgs = strdup(eventArgs))) { + virReportOOMError(); + VIR_FREE(ev->data.qemuUnknownEvent.eventName); + VIR_FREE(ev->dom.name); + VIR_FREE(ev); + return NULL; + } + } + } + + return ev; +} + +virDomainEventPtr virDomainEventUnknownNewFromObj(virDomainObjPtr obj, + const char *eventName, + const char *eventArgs) +{ + + return virDomainEventUnknownNew(obj->def->id, obj->def->name, + obj->def->uuid, eventName, eventArgs); +} + +virDomainEventPtr virDomainEventUnknownNewFromDom(virDomainPtr dom, + const char *eventName, + const char *eventArgs) +{ + return virDomainEventUnknownNew(dom->id, dom->name, dom->uuid, + eventName, eventArgs); +} + virDomainEventPtr virDomainEventControlErrorNewFromDom(virDomainPtr dom) { virDomainEventPtr ev = @@ -1095,11 +1339,12 @@ virDomainEventQueuePush(virDomainEventQueuePtr evtQueue, } -void virDomainEventDispatchDefaultFunc(virConnectPtr conn, - virDomainEventPtr event, - virConnectDomainEventGenericCallback cb, - void *cbopaque, - void *opaque ATTRIBUTE_UNUSED) +void +virDomainEventDispatchDefaultFunc(virConnectPtr conn, + virDomainEventPtr event, + virConnectDomainEventGenericCallback cb, + void *cbopaque, + void *opaque ATTRIBUTE_UNUSED) { virDomainPtr dom = virGetDomain(conn, event->dom.name, event->dom.uuid); if (!dom) @@ -1180,6 +1425,13 @@ void virDomainEventDispatchDefaultFunc(virConnectPtr conn, cbopaque); break; + case VIR_QEMU_DOMAIN_EVENT_ID_UNKNOWN: + ((virConnectDomainQemuEventCallback)cb)(conn, dom, + event->data.qemuUnknownEvent.eventName, + event->data.qemuUnknownEvent.eventArgs, + cbopaque); + break; + default: VIR_WARN("Unexpected event ID %d", event->eventID); break; @@ -1189,8 +1441,9 @@ void virDomainEventDispatchDefaultFunc(virConnectPtr conn, } -static int virDomainEventDispatchMatchCallback(virDomainEventPtr event, - virDomainEventCallbackPtr cb) +static int +virDomainEventDispatchMatchCallback(virDomainEventPtr event, + virDomainEventCallbackPtr cb) { if (!cb) return 0; @@ -1198,7 +1451,12 @@ static int virDomainEventDispatchMatchCallback(virDomainEventPtr event, return 0; if (cb->eventID != event->eventID) return 0; - + if (event->eventID == VIR_QEMU_DOMAIN_EVENT_ID_UNKNOWN) { + if (event->data.qemuUnknownEvent.eventName == NULL || + cb->eventName == NULL || + STRNEQ(cb->eventName, event->data.qemuUnknownEvent.eventName)) + return 0; + } if (cb->dom) { /* Deliberately ignoring 'id' for matching, since that * will cause problems when a domain switches between @@ -1341,3 +1599,20 @@ virDomainEventStateDeregisterAny(virConnectPtr conn, virDomainEventStateUnlock(state); return ret; } +int +virDomainQemuEventStateDeregister(virConnectPtr conn, + virDomainEventStatePtr state, + int callbackID) +{ + int ret; + + virDomainEventStateLock(state); + if (state->isDispatching) + ret = virDomainEventCallbackListMarkDeleteID(conn, + state->callbacks, callbackID); + else + ret = virDomainEventCallbackListRemoveID(conn, + state->callbacks, callbackID); + virDomainEventStateUnlock(state); + return ret; +} diff --git a/src/conf/domain_event.h b/src/conf/domain_event.h index 3ba418e..f2fe847 100644 --- a/src/conf/domain_event.h +++ b/src/conf/domain_event.h @@ -83,14 +83,23 @@ int virDomainEventCallbackListAddID(virConnectPtr conn, virFreeCallback freecb) ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(5); +int virDomainEventCallbackListAddName(virConnectPtr conn, + virDomainEventCallbackListPtr cbList, + virDomainPtr dom, + const char* eventName, + int eventID, + virConnectDomainEventGenericCallback callback, + void *opaque, + virFreeCallback freecb) + ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(4) ATTRIBUTE_NONNULL(6); int virDomainEventCallbackListRemove(virConnectPtr conn, virDomainEventCallbackListPtr cbList, virConnectDomainEventCallback callback) ATTRIBUTE_NONNULL(1); -int virDomainEventCallbackListRemoveID(virConnectPtr conn, - virDomainEventCallbackListPtr cbList, - int callbackID) +int virDomainQemuEventCallbackListRemoveID(virConnectPtr conn, + virDomainEventCallbackListPtr cbList, + int callbackID) ATTRIBUTE_NONNULL(1); int virDomainEventCallbackListRemoveConn(virConnectPtr conn, virDomainEventCallbackListPtr cbList) @@ -106,9 +115,14 @@ int virDomainEventCallbackListMarkDeleteID(virConnectPtr conn, int callbackID) ATTRIBUTE_NONNULL(1); - int virDomainEventCallbackListPurgeMarked(virDomainEventCallbackListPtr cbList); +int virDomainEventCallbackListAddQemuCallbackID(virConnectPtr conn, + virDomainEventCallbackListPtr cbList, + int callbackID, + int qemuCallbackID) + ATTRIBUTE_NONNULL(1); + int virDomainEventCallbackListCount(virDomainEventCallbackListPtr cbList); int virDomainEventCallbackListCountID(virConnectPtr conn, virDomainEventCallbackListPtr cbList, @@ -119,6 +133,21 @@ int virDomainEventCallbackListEventID(virConnectPtr conn, int callbackID) ATTRIBUTE_NONNULL(1); +int virDomainEventCallbackListCountName(virConnectPtr conn, + virDomainEventCallbackListPtr cbList, + const char *eventName) + ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(3); + +int virDomainEventCallbackListEventQemuCallbackID(virConnectPtr conn, + virDomainEventCallbackListPtr cbList, + int callbackID) + ATTRIBUTE_NONNULL(1); + +const char* virDomainEventCallbackListEventName(virConnectPtr conn, + virDomainEventCallbackListPtr cbList, + int callbackID) + ATTRIBUTE_NONNULL(1); + virDomainEventQueuePtr virDomainEventQueueNew(void); virDomainEventPtr virDomainEventNew(int id, const char *name, const unsigned char *uuid, int type, int detail); @@ -190,6 +219,13 @@ virDomainEventPtr virDomainEventDiskChangeNewFromDom(virDomainPtr dom, const char *devAlias, int reason); +virDomainEventPtr virDomainEventUnknownNewFromObj(virDomainObjPtr obj, + const char *eventName, + const char *eventArgs); +virDomainEventPtr virDomainEventUnknownNewFromDom(virDomainPtr dom, + const char *eventName, + const char *eventArgs); + int virDomainEventQueuePush(virDomainEventQueuePtr evtQueue, virDomainEventPtr event); @@ -246,5 +282,9 @@ virDomainEventStateDeregisterAny(virConnectPtr conn, virDomainEventStatePtr state, int callbackID) ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2); - +int +virDomainQemuEventStateDeregister(virConnectPtr conn, + virDomainEventStatePtr state, + int callbackID) + ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2); #endif diff --git a/src/driver.h b/src/driver.h index 941ff51..51164a9 100644 --- a/src/driver.h +++ b/src/driver.h @@ -635,6 +635,18 @@ typedef virDomainPtr unsigned int flags); typedef int + (*virDrvDomainQemuEventRegister)(virConnectPtr conn, + virDomainPtr dom, /* option to filter */ + const char *eventName, /* JSON event name */ + virConnectDomainEventGenericCallback cb, + void *opaque, + virFreeCallback freecb); + +typedef int + (*virDrvDomainQemuEventDeregister)(virConnectPtr conn, + int callbackID); + +typedef int (*virDrvDomainOpenConsole)(virDomainPtr dom, const char *dev_name, virStreamPtr st, @@ -915,6 +927,8 @@ struct _virDriver { virDrvDomainSnapshotDelete domainSnapshotDelete; virDrvDomainQemuMonitorCommand qemuDomainMonitorCommand; virDrvDomainQemuAttach qemuDomainAttach; + virDrvDomainQemuEventRegister qemuDomainQemuEventRegister; + virDrvDomainQemuEventDeregister qemuDomainQemuEventDeregister; virDrvDomainOpenConsole domainOpenConsole; virDrvDomainOpenGraphics domainOpenGraphics; virDrvDomainInjectNMI domainInjectNMI; diff --git a/src/libvirt-qemu.c b/src/libvirt-qemu.c index 248cc33..7722b7b 100644 --- a/src/libvirt-qemu.c +++ b/src/libvirt-qemu.c @@ -36,6 +36,77 @@ virReportErrorHelper(VIR_FROM_DOM, error, NULL, __FUNCTION__, \ __LINE__, info) +/* Helper macros to implement VIR_DOMAIN_DEBUG using just C99. This + * assumes you pass fewer than 15 arguments to VIR_DOMAIN_DEBUG, but + * can easily be expanded if needed. + * + * Note that gcc provides extensions of "define a(b...) b" or + * "define a(b,...) b,##__VA_ARGS__" as a means of eliding a comma + * when no var-args are present, but we don't want to require gcc. + */ +#define VIR_ARG15(_1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, ...) _15 +#define VIR_HAS_COMMA(...) VIR_ARG15(__VA_ARGS__, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0) + +/* Form the name VIR_DOMAIN_DEBUG_[01], then call that macro, + * according to how many arguments are present. Two-phase due to + * macro expansion rules. */ +#define VIR_DOMAIN_DEBUG_EXPAND(a, b, ...) \ + VIR_DOMAIN_DEBUG_PASTE(a, b, __VA_ARGS__) +#define VIR_DOMAIN_DEBUG_PASTE(a, b, ...) \ + a##b(__VA_ARGS__) + +/* Internal use only, when VIR_DOMAIN_DEBUG has one argument. */ +#define VIR_DOMAIN_DEBUG_0(dom) \ + VIR_DOMAIN_DEBUG_2(dom, "%s", "") + +/* Internal use only, when VIR_DOMAIN_DEBUG has three or more arguments. */ +#define VIR_DOMAIN_DEBUG_1(dom, fmt, ...) \ + VIR_DOMAIN_DEBUG_2(dom, ", " fmt, __VA_ARGS__) + +/* Internal use only, with final format. */ +#define VIR_DOMAIN_DEBUG_2(dom, fmt, ...) \ + do { \ + char _uuidstr[VIR_UUID_STRING_BUFLEN]; \ + const char *_domname = NULL; \ + \ + if (!VIR_IS_DOMAIN(dom)) { \ + memset(_uuidstr, 0, sizeof(_uuidstr)); \ + } else { \ + virUUIDFormat((dom)->uuid, _uuidstr); \ + _domname = (dom)->name; \ + } \ + \ + VIR_DEBUG("dom=%p, (VM: name=%s, uuid=%s)" fmt, \ + dom, NULLSTR(_domname), _uuidstr, __VA_ARGS__); \ + } while (0) + +/** + * VIR_DOMAIN_DEBUG: + * @dom: domain + * @fmt: optional format for additional information + * @...: optional arguments corresponding to @fmt. + */ +#define VIR_DOMAIN_DEBUG(...) \ + VIR_DOMAIN_DEBUG_EXPAND(VIR_DOMAIN_DEBUG_, \ + VIR_HAS_COMMA(__VA_ARGS__), \ + __VA_ARGS__) + +/** + * VIR_UUID_DEBUG: + * @conn: connection + * @uuid: possibly null UUID array + */ +#define VIR_UUID_DEBUG(conn, uuid) \ + do { \ + if (uuid) { \ + char _uuidstr[VIR_UUID_STRING_BUFLEN]; \ + virUUIDFormat(uuid, _uuidstr); \ + VIR_DEBUG("conn=%p, uuid=%s", conn, _uuidstr); \ + } else { \ + VIR_DEBUG("conn=%p, uuid=(null)", conn); \ + } \ + } while (0) + /** * virDomainQemuMonitorCommand: * @domain: a domain object @@ -178,3 +249,121 @@ error: virDispatchError(conn); return NULL; } + +/** + * virConnectDomainQemuEventRegister: + * @conn: pointer to the connection + * @dom: pointer to the domain + * @eventName: the event Name to receive + * @cb: callback to the function handling domain events + * @opaque: opaque data to pass on to the callback + * @freecb: optional function to deallocate opaque when not used anymore + * + * Adds a callback to receive notifications of arbitrary qemu domain events + * occurring on a domain. + * + * If dom is NULL, then events will be monitored for any domain. If dom + * is non-NULL, then only the specific domain will be monitored + * + * Most types of event have a callback providing a custom set of parameters + * for the event. When registering an event, it is thus neccessary to use + * the VIR_DOMAIN_EVENT_CALLBACK() macro to cast the supplied function pointer + * to match the signature of this method. + * + * The virDomainPtr object handle passed into the callback upon delivery + * of an event is only valid for the duration of execution of the callback. + * If the callback wishes to keep the domain object after the callback returns, + * it shall take a reference to it, by calling virDomainRef. + * The reference can be released once the object is no longer required + * by calling virDomainFree. + * + * The return value from this method is a positive integer identifier + * for the callback. To unregister a callback, this callback ID should + * be passed to the virConnectDomainQemuEventDeregister method + * + * Returns a callback identifier on success, -1 on failure + */ +int +virConnectDomainQemuEventRegister(virConnectPtr conn, + virDomainPtr dom, /* option to filter */ + const char *eventName, /* JSON event name */ + virConnectDomainQemuEventCallback cb, + void *opaque, + virFreeCallback freecb) +{ + VIR_DOMAIN_DEBUG(dom, "conn=%p, eventName=%s, cb=%p, opaque=%p, freecb=%p", + conn, eventName, cb, opaque, freecb); + + virResetLastError(); + + if (!VIR_IS_CONNECT(conn)) { + virLibConnError(conn, VIR_ERR_INVALID_CONN, __FUNCTION__); + virDispatchError(NULL); + return -1; + } + if (dom != NULL && + !(VIR_IS_CONNECTED_DOMAIN(dom) && dom->conn == conn)) { + virLibConnError(conn, VIR_ERR_INVALID_CONN, __FUNCTION__); + virDispatchError(conn); + return -1; + } + if (eventName == NULL || cb == NULL) { + virLibConnError(conn, VIR_ERR_INVALID_ARG, __FUNCTION__); + goto error; + } + + if ((conn->driver) && (conn->driver->qemuDomainQemuEventRegister)) { + int ret; + ret = conn->driver->qemuDomainQemuEventRegister(conn, dom, eventName, cb, opaque, freecb); + if (ret < 0) + goto error; + return ret; + } + + virLibConnError(conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); +error: + virDispatchError(conn); + return -1; +} + +/** + * virConnectDomainQemuEventDeregister: + * @conn: pointer to the connection + * @callbackID: the callback identifier + * + * Removes an event callback. The callbackID parameter should be the + * vaule obtained from a previous virConnectDomainQemuEventDeregister method. + * + * Returns 0 on success, -1 on failure + */ +int +virConnectDomainQemuEventDeregister(virConnectPtr conn, + int callbackID) +{ + + VIR_DEBUG("conn=%p, callbackID=%d", conn, callbackID); + + virResetLastError(); + + if (!VIR_IS_CONNECT(conn)) { + virLibConnError(conn, VIR_ERR_INVALID_CONN, __FUNCTION__); + virDispatchError(NULL); + return -1; + } + if (callbackID < 0) { + virLibConnError(conn, VIR_ERR_INVALID_ARG, __FUNCTION__); + goto error; + } + if ((conn->driver) && (conn->driver->qemuDomainQemuEventDeregister)) { + int ret; + ret = conn->driver->qemuDomainQemuEventDeregister(conn, callbackID); + if (ret < 0) + goto error; + return ret; + } + + virLibConnError(conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); +error: + virDispatchError(conn); + return -1; +} diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 48ffdf2..75e544a 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -471,11 +471,16 @@ virDomainWatchdogModelTypeToString; # domain_event.h virDomainEventBlockJobNewFromObj; virDomainEventBlockJobNewFromDom; +virDomainEventUnknownNewFromObj; +virDomainEventunknownNewFromDom; virDomainEventCallbackListAdd; virDomainEventCallbackListAddID; +virDomainEventCallbackListAddName; virDomainEventCallbackListCount; virDomainEventCallbackListCountID; +virDomainEventCallbackListCountName; virDomainEventCallbackListEventID; +virDomainEventCallbackListEventName; virDomainEventCallbackListFree; virDomainEventCallbackListMarkDelete; virDomainEventCallbackListMarkDeleteID; @@ -512,6 +517,7 @@ virDomainEventRebootNewFromDom; virDomainEventRebootNewFromObj; virDomainEventStateDeregister; virDomainEventStateDeregisterAny; +virDomainQemuEventStateDeregister; virDomainEventStateFlush; virDomainEventStateFree; virDomainEventStateNew; diff --git a/src/libvirt_qemu.syms b/src/libvirt_qemu.syms index 8447730..a17e387 100644 --- a/src/libvirt_qemu.syms +++ b/src/libvirt_qemu.syms @@ -19,3 +19,8 @@ LIBVIRT_QEMU_0.9.4 { global: virDomainQemuAttach; } LIBVIRT_QEMU_0.8.3; +LIBVIRT_QEMU_0.9.9 { + global: + virConnectDomainQemuEventRegister; + virConnectDomainQemuEventDeregister; +} LIBVIRT_QEMU_0.9.4; -- 1.7.5.4

4 16

[libvirt] Fwd: oVirt Beijing - March 21st
by Itamar Heim 04 Feb '12

04 Feb '12

-------- Original Message -------- Subject: oVirt Beijing - March 21st Date: Fri, 03 Feb 2012 15:52:41 -0500 From: Carl Trieloff <cctrieloff(a)redhat.com> Spread the word/ come join us! http://www.ovirt.org/news-and-events/workshop/ Carl

1 0

[libvirt] [PATCH 1/2 v3] Python: Refactoring virTypedParameter conversion for NUMA tuning APIs
by Guannan Ren 04 Feb '12

04 Feb '12

*virDomainSetNumaParameters *virDomainGetNumaParameters --- python/Makefile.am | 4 +- python/libvirt-override-api.xml | 13 ++ python/libvirt-override.c | 314 +++++++++++++++++++++++++++++++++++++++ 3 files changed, 330 insertions(+), 1 deletions(-) diff --git a/python/Makefile.am b/python/Makefile.am index 3068eee..4302fa5 100644 --- a/python/Makefile.am +++ b/python/Makefile.am @@ -8,6 +8,8 @@ SUBDIRS= . tests INCLUDES = \ $(PYTHON_INCLUDES) \ -I$(top_srcdir)/include \ + -I$(top_srcdir)/src \ + -I$(top_srcdir)/gnulib/lib \ -I$(top_builddir)/include \ -I$(top_builddir)/$(subdir) \ $(GETTEXT_CPPFLAGS) @@ -42,7 +44,7 @@ all-local: libvirt.py libvirt_qemu.py pyexec_LTLIBRARIES = libvirtmod.la libvirtmod_qemu.la -libvirtmod_la_SOURCES = libvirt-override.c typewrappers.c +libvirtmod_la_SOURCES = libvirt-override.c typewrappers.c ../src/util/virtypedparam.c nodist_libvirtmod_la_SOURCES = libvirt.c libvirt.h # Python <= 2.4 header files contain a redundant decl, hence we # need extra flags here diff --git a/python/libvirt-override-api.xml b/python/libvirt-override-api.xml index 704fee9..748aa17 100644 --- a/python/libvirt-override-api.xml +++ b/python/libvirt-override-api.xml @@ -248,6 +248,19 @@ <arg name='domain' type='virDomainPtr' info='pointer to domain object'/> <arg name='flags' type='int' info='an OR'ed set of virDomainModificationImpact'/> </function> + <function name='virDomainSetNumaParameters' file='python'> + <info>Change the NUMA tunables</info> + <return type='int' info='-1 in case of error, 0 in case of success.'/> + <arg name='domain' type='virDomainPtr' info='pointer to domain object'/> + <arg name='params' type='virTypedParameterPtr' info='pointer to numa tunable objects'/> + <arg name='flags' type='int' info='an OR'ed set of virDomainModificationImpact'/> + </function> + <function name='virDomainGetNumaParameters' file='python'> + <info>Get the NUMA parameters</info> + <return type='int' info='returns a dictionary of params in case of success, -1 in case of error'/> + <arg name='domain' type='virDomainPtr' info='pointer to domain object'/> + <arg name='flags' type='int' info='an OR'ed set of virDomainModificationImpact'/> + </function> <function name='virConnectListStoragePools' file='python'> <info>list the storage pools, stores the pointers to the names in @names</info> <arg name='conn' type='virConnectPtr' info='pointer to the hypervisor connection'/> diff --git a/python/libvirt-override.c b/python/libvirt-override.c index d2aad0f..5f9d83e 100644 --- a/python/libvirt-override.c +++ b/python/libvirt-override.c @@ -21,6 +21,7 @@ #include "libvirt/virterror.h" #include "typewrappers.h" #include "libvirt.h" +#include "util/virtypedparam.h" #ifndef __CYGWIN__ extern void initlibvirtmod(void); @@ -61,6 +62,208 @@ static char *py_str(PyObject *obj) return PyString_AsString(str); } +/* Two helper functions to help the conversions between C to Python + * for the virTypedParameter used in the following APIs. */ +static PyObject * +getPyVirTypedParameter(virTypedParameterPtr params, int nparams) +{ + PyObject *info; + PyObject *key, *val; + PyObject *ret = NULL; + int i; + + if (!params) + return ret; + + /* convert to a Python tuple of long objects */ + if ((info = PyDict_New()) == NULL) { + return ret; + } + + for (i = 0 ; i < nparams ; i++) { + switch (params[i].type) { + case VIR_TYPED_PARAM_INT: + val = PyInt_FromLong((long)params[i].value.i); + break; + + case VIR_TYPED_PARAM_UINT: + val = PyInt_FromLong((unsigned long)params[i].value.ui); + break; + + case VIR_TYPED_PARAM_LLONG: + val = PyLong_FromLongLong((long long)params[i].value.l); + break; + + case VIR_TYPED_PARAM_ULLONG: + val = PyLong_FromUnsignedLongLong((unsigned long long)params[i].value.ul); + break; + + case VIR_TYPED_PARAM_DOUBLE: + val = PyFloat_FromDouble((double)params[i].value.d); + break; + + case VIR_TYPED_PARAM_BOOLEAN: + val = PyBool_FromLong((long)params[i].value.b); + break; + + case VIR_TYPED_PARAM_STRING: + val = libvirt_constcharPtrWrap(params[i].value.s); + break; + + default: + Py_DECREF(info); + return ret; + } + + key = libvirt_constcharPtrWrap(params[i].field); + if (!key || !val) + goto fail; + + if (PyDict_SetItem(info, key, val) < 0) + goto fail; + + Py_DECREF(key); + Py_DECREF(val); + } + return info; +fail: + Py_XDECREF(info); + Py_XDECREF(key); + Py_XDECREF(val); + return ret; +} + +static PyObject * +setPyVirTypedParameter(PyObject *info, virTypedParameterPtr params, int nparams) +{ + PyObject *key, *val; + PyObject *ret = NULL; + int i; + + if (!info || !params) + return ret; + + /* convert to a Python tuple of long objects */ + for (i = 0; i < nparams; i++) { + key = libvirt_constcharPtrWrap(params[i].field); + val = PyDict_GetItem(info, key); + Py_DECREF(key); + + if (val == NULL) + continue; + + switch (params[i].type) { + case VIR_TYPED_PARAM_INT: + { + long long_val; + if (PyInt_Check(val)) { + long_val = PyInt_AsLong(val); + if ((long_val == -1) && PyErr_Occurred()) + return ret; + } else { + PyErr_SetString(PyExc_TypeError, + "Attribute value type must be int"); + return ret; + } + params[i].value.i = (int)long_val; + } + break; + case VIR_TYPED_PARAM_UINT: + { + long long_val; + if (PyInt_Check(val)) { + long_val = PyInt_AsLong(val); + if ((long_val == -1) && PyErr_Occurred()) + return ret; + } else { + PyErr_SetString(PyExc_TypeError, + "Attribute value type must be int"); + return ret; + } + params[i].value.ui = (unsigned int)long_val; + } + break; + case VIR_TYPED_PARAM_LLONG: + { + long long llong_val; + if (PyLong_Check(val)) { + llong_val = PyLong_AsLongLong(val); + if ((llong_val == -1) && PyErr_Occurred()) + return ret; + } else { + PyErr_SetString(PyExc_TypeError, + "Attribute value type must be long"); + return ret; + } + params[i].value.l = llong_val; + } + break; + case VIR_TYPED_PARAM_ULLONG: + { + unsigned long long ullong_val; + if (PyLong_Check(val)) { + ullong_val = PyLong_AsUnsignedLongLong(val); + if ((ullong_val == -1) && PyErr_Occurred()) + return ret; + } else { + PyErr_SetString(PyExc_TypeError, + "Attribute value type must be long"); + return ret; + + } + params[i].value.ul = ullong_val; + } + break; + case VIR_TYPED_PARAM_DOUBLE: + { + double double_val; + if (PyFloat_Check(val)) { + double_val = PyFloat_AsDouble(val); + if ((double_val == -1) && PyErr_Occurred()) + return ret; + } else { + PyErr_SetString(PyExc_TypeError, + "Attribute value type must be float"); + return ret; + } + params[i].value.d = double_val; + } + break; + case VIR_TYPED_PARAM_BOOLEAN: + { + /* Hack - Python's definition of Py_True breaks strict + * aliasing rules, so can't directly compare + */ + if (PyBool_Check(val)) { + PyObject *hacktrue = PyBool_FromLong(1); + params[i].value.b = hacktrue == val ? 1: 0; + Py_DECREF(hacktrue); + } else { + PyErr_SetString(PyExc_TypeError, + "Attribute value type must be bool"); + return ret; + } + } + break; + case VIR_TYPED_PARAM_STRING: + { + if (PyString_Check(val)) { + free(params[i].value.s); + params[i].value.s = PyString_AsString(val); + } else { + PyErr_SetString(PyExc_TypeError, + "Attribute value type must be string"); + return ret; + } + } + break; + default: + return ret; + } + } + return VIR_PY_NONE; +} + /************************************************************************ * * * Statistics * @@ -1000,6 +1203,115 @@ libvirt_virDomainGetMemoryParameters(PyObject *self ATTRIBUTE_UNUSED, } static PyObject * +libvirt_virDomainSetNumaParameters(PyObject *self ATTRIBUTE_UNUSED, + PyObject *args) +{ + virDomainPtr domain; + PyObject *pyobj_domain, *info; + PyObject *ret = NULL; + int i_retval; + int nparams = 0; + unsigned int flags; + virTypedParameterPtr params; + + if (!PyArg_ParseTuple(args, + (char *)"OOi:virDomainSetNumaParameters", + &pyobj_domain, &info, &flags)) + return(NULL); + domain = (virDomainPtr) PyvirDomain_Get(pyobj_domain); + + LIBVIRT_BEGIN_ALLOW_THREADS; + i_retval = virDomainGetNumaParameters(domain, NULL, &nparams, flags); + LIBVIRT_END_ALLOW_THREADS; + + if (i_retval < 0) + return VIR_PY_INT_FAIL; + + if ((params = malloc(sizeof(*params)*nparams)) == NULL) + return PyErr_NoMemory(); + + LIBVIRT_BEGIN_ALLOW_THREADS; + i_retval = virDomainGetNumaParameters(domain, params, &nparams, flags); + LIBVIRT_END_ALLOW_THREADS; + + if (i_retval < 0) { + ret = VIR_PY_INT_FAIL; + goto fail; + } + + if (!setPyVirTypedParameter(info, params, nparams)) + goto fail; + + LIBVIRT_BEGIN_ALLOW_THREADS; + i_retval = virDomainSetNumaParameters(domain, params, nparams, flags); + LIBVIRT_END_ALLOW_THREADS; + + if (i_retval < 0) { + ret = VIR_PY_INT_FAIL; + goto fail; + } + + /* The string generated by PyString_AsString + * must not be deallocated */ + free(params); + return VIR_PY_INT_SUCCESS; +fail: + /*same as above*/ + free(params); + return ret; +} + +static PyObject * +libvirt_virDomainGetNumaParameters(PyObject *self ATTRIBUTE_UNUSED, + PyObject *args) +{ + virDomainPtr domain; + PyObject *pyobj_domain, *info; + PyObject *ret = NULL; + int i_retval; + int nparams = 0; + unsigned int flags; + virTypedParameterPtr params; + + if (!PyArg_ParseTuple(args, (char *)"Oi:virDomainGetNumaParameters", + &pyobj_domain, &flags)) + return(NULL); + domain = (virDomainPtr) PyvirDomain_Get(pyobj_domain); + + LIBVIRT_BEGIN_ALLOW_THREADS; + i_retval = virDomainGetNumaParameters(domain, NULL, &nparams, flags); + LIBVIRT_END_ALLOW_THREADS; + + if (i_retval < 0) + return VIR_PY_INT_FAIL; + + if ((params = malloc(sizeof(*params)*nparams)) == NULL) + return PyErr_NoMemory(); + + LIBVIRT_BEGIN_ALLOW_THREADS; + i_retval = virDomainGetNumaParameters(domain, params, &nparams, flags); + LIBVIRT_END_ALLOW_THREADS; + + if (i_retval < 0) { + ret = VIR_PY_INT_FAIL; + goto fail; + } + + info = getPyVirTypedParameter(params, nparams); + if (!info) + goto fail; + + virTypedParameterArrayClear(params, nparams); + free(params); + return info; + +fail: + virTypedParameterArrayClear(params, nparams); + free(params); + return ret; +} + +static PyObject * libvirt_virDomainGetVcpus(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) { virDomainPtr domain; @@ -5162,6 +5474,8 @@ static PyMethodDef libvirtMethods[] = { {(char *) "virDomainGetBlkioParameters", libvirt_virDomainGetBlkioParameters, METH_VARARGS, NULL}, {(char *) "virDomainSetMemoryParameters", libvirt_virDomainSetMemoryParameters, METH_VARARGS, NULL}, {(char *) "virDomainGetMemoryParameters", libvirt_virDomainGetMemoryParameters, METH_VARARGS, NULL}, + {(char *) "virDomainSetNumaParameters", libvirt_virDomainSetNumaParameters, METH_VARARGS, NULL}, + {(char *) "virDomainGetNumaParameters", libvirt_virDomainGetNumaParameters, METH_VARARGS, NULL}, {(char *) "virDomainGetVcpus", libvirt_virDomainGetVcpus, METH_VARARGS, NULL}, {(char *) "virDomainPinVcpu", libvirt_virDomainPinVcpu, METH_VARARGS, NULL}, {(char *) "virDomainPinVcpuFlags", libvirt_virDomainPinVcpuFlags, METH_VARARGS, NULL}, -- 1.7.7.5

3 9

[libvirt] [PATCH] maint: consolidate several .gitignore files
by Eric Blake 03 Feb '12

03 Feb '12

Unlike .cvsignore under CVS, git allows for ignoring nested names. We weren't very consistent where new tests were being ignored (some in .gitignore, some in tests/.gitignore), and I found it easier to just consolidate everything. * .gitignore: Subsume entries from subdirectories. * daemon/.gitignore: Delete. * docs/.gitignore: Likewise. * docs/devhelp/.gitignore: Likewise. * docs/html/.gitignore: Likewise. * examples/dominfo/.gitignore: Likewise. * examples/domsuspend/.gitignore: Likewise. * examples/hellolibvirt/.gitignore: Likewise. * examples/openauth/.gitignore: Likewise. * examples/domain-events/events-c/.gitignore: Likewise. * include/libvirt/.gitignore: Likewise. * src/.gitignore: Likewise. * src/esx/.gitignore: Likewise. * tests/.gitignore: Likewise. * tools/.gitignore: Likewise. --- .gitignore | 75 +++++++++++++++++++++++++++- daemon/.gitignore | 15 ------ docs/.gitignore | 8 --- docs/devhelp/.gitignore | 4 -- docs/html/.gitignore | 1 - examples/domain-events/events-c/.gitignore | 6 -- examples/dominfo/.gitignore | 5 -- examples/domsuspend/.gitignore | 5 -- examples/hellolibvirt/.gitignore | 5 -- examples/openauth/.gitignore | 5 -- include/libvirt/.gitignore | 3 - python/.gitignore | 13 ----- src/.gitignore | 22 -------- src/esx/.gitignore | 1 - tests/.gitignore | 44 ---------------- tools/.gitignore | 14 ----- 16 files changed, 73 insertions(+), 153 deletions(-) delete mode 100644 daemon/.gitignore delete mode 100644 docs/.gitignore delete mode 100644 docs/devhelp/.gitignore delete mode 100644 docs/html/.gitignore delete mode 100644 examples/domain-events/events-c/.gitignore delete mode 100644 examples/dominfo/.gitignore delete mode 100644 examples/domsuspend/.gitignore delete mode 100644 examples/hellolibvirt/.gitignore delete mode 100644 examples/openauth/.gitignore delete mode 100644 include/libvirt/.gitignore delete mode 100644 python/.gitignore delete mode 100644 src/.gitignore delete mode 100644 src/esx/.gitignore delete mode 100644 tests/.gitignore delete mode 100644 tools/.gitignore diff --git a/.gitignore b/.gitignore index d1a4226..3e85e4d 100644 --- a/.gitignore +++ b/.gitignore @@ -1,19 +1,28 @@ *#*# *.#*# *.a +*.cov *.exe *.gcda *.gcno *.gcov +*.html +*.i *.la *.lo +*.loT *.o *.orig +*.pyc *.rej +*.s *~ +.deps .git .git-module-status +.libs .lvimrc +.memdump .sc-start-sc_* /ABOUT-NLS /COPYING @@ -37,11 +46,30 @@ /configure /configure.lineno /daemon/*_dispatch.h +/daemon/libvirt_qemud +/daemon/libvirtd +/daemon/libvirtd.init +/daemon/libvirtd.service +/daemon/libvirtd*.logrotate +/daemon/libvirtd.8 +/daemon/libvirtd.8.in +/daemon/libvirtd.pod +/daemon/probes.h +/docs/devhelp/libvirt.devhelp /docs/hvsupport.html.in +/docs/libvirt-api.xml /docs/libvirt-qemu-*.xml +/docs/libvirt-refs.xml +/docs/todo.html.in +/examples/domain-events/events-c/event-test +/examples/dominfo/info1 +/examples/domsuspend/suspend +/examples/hellolibvirt/hellolibvirt +/examples/openauth/openauth /gnulib/lib/* /gnulib/m4/* /gnulib/tests/* +/include/libvirt/libvirt.h /libtool /libvirt-*.tar.gz /libvirt-[0-9]* @@ -55,31 +83,74 @@ /mkinstalldirs /po/* /proxy/ +/python/generated.stamp /python/generator.py.stamp +/python/libvirt-export.c /python/libvirt-qemu-export.c /python/libvirt-qemu.[ch] +/python/libvirt.[ch] +/python/libvirt.py /python/libvirt_qemu.py /sc_* +/src/esx/*.generated.* /src/hyperv/*.generated.* -/src/libvirt_iohelper +/src/libvirt*.def +/src/libvirt.syms +/src/libvirt_*.stp +/src/libvirt_*helper +/src/libvirt_lxc /src/locking/qemu-sanlock.conf +/src/probes.h /src/remote/*_client_bodies.h /src/remote/*_protocol.[ch] /src/rpc/virkeepaliveprotocol.[ch] /src/rpc/virnetprotocol.[ch] /src/util/virkeymaps.h +/src/virt-aa-helper /tests/*.log +/tests/*.pid +/tests/*xml2*test +/tests/commandhelper +/tests/conftest /tests/cputest /tests/domainsnapshotxml2xmltest +/tests/esxutilstest +/tests/eventtest /tests/hashtest /tests/jsontest /tests/networkxml2argvtest +/tests/nodeinfotest /tests/nwfilterxml2xmltest +/tests/object-locking +/tests/object-locking-files.txt +/tests/object-locking.cm[ix] /tests/openvzutilstest +/tests/qemuargv2xmltest +/tests/qemuhelptest /tests/qemuxmlnstest +/tests/qparamtest +/tests/reconnect +/tests/secaatest +/tests/seclabeltest +/tests/sexpr2xmltest /tests/shunloadtest +/tests/sockettest +/tests/ssh +/tests/statstest +/tests/utiltest +/tests/virbuftest /tests/virhashtest -/tools/virt-host-validate +/tests/virnet*test +/tests/virshtest +/tests/vmx2xmltest +/tests/xencapstest +/tests/xmconfigtest +/tools/*.[18] +/tools/libvirt-guests.init +/tools/virsh +/tools/virsh-*-edit.c +/tools/virt-*-validate +/tools/virt-sanlock-cleanup /update.log Makefile Makefile.in diff --git a/daemon/.gitignore b/daemon/.gitignore deleted file mode 100644 index 2873143..0000000 --- a/daemon/.gitignore +++ /dev/null @@ -1,15 +0,0 @@ -*.la -*.lo -.deps -.libs -Makefile -Makefile.in -libvirt_qemud -libvirtd -libvirtd.init -libvirtd.service -libvirtd*.logrotate -libvirtd.8 -libvirtd.8.in -libvirtd.pod -probes.h diff --git a/docs/.gitignore b/docs/.gitignore deleted file mode 100644 index dd78dd0..0000000 --- a/docs/.gitignore +++ /dev/null @@ -1,8 +0,0 @@ -Makefile -Makefile.in -.memdump -apibuild.pyc -*.html -libvirt-api.xml -libvirt-refs.xml -todo.html.in diff --git a/docs/devhelp/.gitignore b/docs/devhelp/.gitignore deleted file mode 100644 index 9c75b93..0000000 --- a/docs/devhelp/.gitignore +++ /dev/null @@ -1,4 +0,0 @@ -Makefile -Makefile.in -libvirt.devhelp -*.html diff --git a/docs/html/.gitignore b/docs/html/.gitignore deleted file mode 100644 index 2d19fc7..0000000 --- a/docs/html/.gitignore +++ /dev/null @@ -1 +0,0 @@ -*.html diff --git a/examples/domain-events/events-c/.gitignore b/examples/domain-events/events-c/.gitignore deleted file mode 100644 index ed9ac4d..0000000 --- a/examples/domain-events/events-c/.gitignore +++ /dev/null @@ -1,6 +0,0 @@ -Makefile -Makefile.in -*.exe -.deps -.libs -event-test diff --git a/examples/dominfo/.gitignore b/examples/dominfo/.gitignore deleted file mode 100644 index 4626c13..0000000 --- a/examples/dominfo/.gitignore +++ /dev/null @@ -1,5 +0,0 @@ -Makefile.in -Makefile -.deps -.libs -info1 diff --git a/examples/domsuspend/.gitignore b/examples/domsuspend/.gitignore deleted file mode 100644 index 02eeb79..0000000 --- a/examples/domsuspend/.gitignore +++ /dev/null @@ -1,5 +0,0 @@ -Makefile.in -Makefile -.deps -.libs -suspend diff --git a/examples/hellolibvirt/.gitignore b/examples/hellolibvirt/.gitignore deleted file mode 100644 index b8d036d..0000000 --- a/examples/hellolibvirt/.gitignore +++ /dev/null @@ -1,5 +0,0 @@ -Makefile -Makefile.in -hellolibvirt -.deps -.libs diff --git a/examples/openauth/.gitignore b/examples/openauth/.gitignore deleted file mode 100644 index 1431557..0000000 --- a/examples/openauth/.gitignore +++ /dev/null @@ -1,5 +0,0 @@ -Makefile -Makefile.in -openauth -.deps -.libs diff --git a/include/libvirt/.gitignore b/include/libvirt/.gitignore deleted file mode 100644 index 7bd42da..0000000 --- a/include/libvirt/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -Makefile -Makefile.in -libvirt.h diff --git a/python/.gitignore b/python/.gitignore deleted file mode 100644 index c191f74..0000000 --- a/python/.gitignore +++ /dev/null @@ -1,13 +0,0 @@ -Makefile -Makefile.in -.deps -.libs -*.lo -*.la -*.loT -libvirt.py -libvirt-export.c -libvirt.c -libvirt.h -*.pyc -generated.stamp diff --git a/src/.gitignore b/src/.gitignore deleted file mode 100644 index 64e6aec..0000000 --- a/src/.gitignore +++ /dev/null @@ -1,22 +0,0 @@ -Makefile -Makefile.in -.deps -.libs -*.lo -*.loT -*.la -*.exe -*.cov -libvirt_parthelper -libvirt_lxc -libvirt.def -libvirt.syms -libvirt_qemu.def -*.i -*.s -remote_protocol-structs-t -virt-aa-helper -libvirt_functions.stp -libvirt_probes.stp -probes.o -probes.h diff --git a/src/esx/.gitignore b/src/esx/.gitignore deleted file mode 100644 index 29e1d48..0000000 --- a/src/esx/.gitignore +++ /dev/null @@ -1 +0,0 @@ -*.generated.* diff --git a/tests/.gitignore b/tests/.gitignore deleted file mode 100644 index 027b421..0000000 --- a/tests/.gitignore +++ /dev/null @@ -1,44 +0,0 @@ -*.exe -.deps -.libs -ssh -commandhelper -commandhelper.log -commandhelper.pid -commandtest -conftest -esxutilstest -eventtest -interfacexml2xmltest -networkxml2xmltest -nodedevxml2xmltest -nodeinfotest -object-locking -object-locking-files.txt -object-locking.cmi -object-locking.cmx -qemuargv2xmltest -qemuhelptest -qemuxml2argvtest -qemuxml2xmltest -qparamtest -reconnect -secaatest -seclabeltest -sexpr2xmltest -sockettest -statstest -storagepoolxml2xmltest -storagevolxml2xmltest -utiltest -virbuftest -virnetmessagetest -virnetsockettest -virnettlscontexttest -virshtest -virtimetest -vmx2xmltest -xencapstest -xmconfigtest -xml2sexprtest -xml2vmxtest diff --git a/tools/.gitignore b/tools/.gitignore deleted file mode 100644 index 0f7a25e..0000000 --- a/tools/.gitignore +++ /dev/null @@ -1,14 +0,0 @@ -libvirt-guests.init -virt-xml-validate -virt-pki-validate -virt-sanlock-cleanup -*.1 -*.8 -Makefile -Makefile.in -virsh-net-edit.c -virsh-pool-edit.c -virsh -*.exe -.libs -.deps -- 1.7.7.6

2 2

[libvirt] [PATCHv2 0/2] qemu: new GRACEFUL flag for virDomainDestroy
by Laine Stump 03 Feb '12

03 Feb '12

This is the 2nd attempt at solving the problem of virDomainDestroy uncermoniously sending SIGKILL to the qemu process before it's had a chance to flush its disk buffers. In v1, I altered the default behavior of virDomainDestroy(), but that was rejected as changing established API behavior. In v2, the default behavior is maintained, and a new flag VIR_DOMAIN_DESTROY_GRACEFUL is added fo the virDomainDestroyFlags API. If that flag is included in the call, virDomainDestroyFlags will only send SIGTERM to the qemu process, and if that is unsuccessful, it will return an error rather than sending SIGKILL. I've also included a 2nd patch which lengthens the timeout prior to sending SIGKILL. Although there has been some sentiment against doing this, my opinion is that it's the prudent thing to do because: 1) The original timeout of 1.6 seconds was arbitrarily selected, and obviously isn't always adequate. 2) In the cases where the current timeout *is* adequate, there will be exactly 0 change in behavior anyway. The only time behavior will change (and that will just be in the form of a longer delay before the API call returns) will be in those cases where we would otherwise have caused guest disk corruption. I know which of those two options I would choose if it was my guest. 3) Just adding a new flag to the libvirt API does not do anything to help those who are stuck (if only temporarily) with an existing version of an application that doesn't support the new API flag. Since libvirt is the cause of the problem, we should try to mitigate the problem as much as possible without requiring updates of other packages.

4 14

[libvirt] [PATCHv4 0/2] qemu: eliminate "Ignoring open failure" (virFileOpenAs)
by Laine Stump 03 Feb '12

03 Feb '12

I believe this version addresses all the issues Eric raised in his review of V3, *except* those that we agreed should be left for a later patch. Patch 2/2 is unchanged all the way since v1. Patch 1/2 has the following changes from V3: * The "last ditch attempt to open the file in the parent process after failing with fork+setuid is done only if VIR_FILE_OPEN_NOFORK is false (meaning that it wasn't already tried). fchmod/fchown is then performed if necessary. * fchmod is only attempted after checking the file's current permissions and seeing that they don't match what is desired. * fchown and fchmod stuff is moved into a helper function that's called from 3 places. * fixed typos, added command about uid & gid no longer being "-1" Items *NOT* addressed: * eliminate log messages in child process * figure out how to have qemuOpenFile call virFileOpenAs just once * switch from use of waitpid to virPidWait() (and use of virPidAbort() to cause the child to terminate when an error is encountered while waiting for an fd from the child. * figure out when it is appropriate to unlink the file on failure. * move virFileOpenAs (and several other functions) to virfile.c

2 6

[libvirt] [PATCH v2 0/1] netlink events
by D. Herrendoerfer 03 Feb '12

03 Feb '12

From: "D. Herrendoerfer" <d.herrendoerfer(a)herrendoerfer.name> This is the second version of the netlink event code. it has most of the proposed changes by Eric and Daniel included. DirkH D. Herrendoerfer (1): Add netlink message event service daemon/libvirtd.c | 9 + src/Makefile.am | 1 + src/libvirt_private.syms | 8 + src/util/virnetlink.c | 447 ++++++++++++++++++++++++++++++++++++++++++++++ src/util/virnetlink.h | 64 +++++++ 5 files changed, 529 insertions(+), 0 deletions(-) create mode 100644 src/util/virnetlink.c create mode 100644 src/util/virnetlink.h -- 1.7.7.5

2 5

[libvirt] [RFC Incomplete Patch] Libvirt + Openvswitch
by Dan Wendlandt 03 Feb '12

03 Feb '12

Hello all, I know of many people who want to spin up VMs using libvirt + kvm/qemu and attach those VMs to an openvswitch bridge (see: http://www.openvswitch.org) However, the only way I know of to get this working is a kludge that uses to tap devices along with <interface type="ethernet"> while running ovs-vsctl outside of libvirt. Even worse, doing this on RHEL/Fedora seems to require privilege tweaks (e.g., running qemu as root, not dropping capabilities), which may not be acceptable for production deployments (see: http://fedoraproject.org/wiki/How_to_debug_Virtualization_problems#Errors_u…) So I would like to start taking steps toward better libvirt/openvswitch integration. My initial step has the fairly limit goal of enabling kvm/qemu VM NICs to attach to an openvswitch bridge in much the same way VM NIC can already attached to the linux bridge. For example, specifying: <interface type="openvswitch"> <source bridge="br0"/> <mac address="ca:fe:de;ad:be:ef"/> </interface> I also wanted to add a new child element of <interface> that can be used to specify some OVS specific configuration. To start, I just want to expose a single 'interfaceid' value (this parameter is specific to openvswitch). Extending the previous example: <interface type="openvswitch"> <source bridge="br0"/> <mac address="ca:fe:de;ad:be:ef"/> <openvswitchport interfaceid="interface-xyz"/> </interface> For this first step (see attached patch), I am only targeting the model where the OVS bridge has been created externally ahead of time. I am not tackling any of the "network" logic that actually creates/destroys bridges, as it is not needed for my target use case. A couple notes about the attached patch: - I haven't actually run this code. I was just poking around the libvirt code to learn about it and figured that a diff was the most concrete way to propose what I was thinking of doing. I would be curious for pointers about big chunks of work that I may have missed (for example, I haven't added any tests yet). - the code was modeled on the network interface "bandwidth" code, that calls out to 'tc' to configure bandwidth rates. Ideally we would be able to make direct C calls to OVS (and we plan to make that possible in the future), but calling an external utility right now is the only viable path. - no attention was paid to style guidelines. Will do that before any real submission. - I wasn't very clear on the notion of an "actual" net def, as opposed to a normal net def. What's the best place to look for documentation on this? Anyway, I'm primarily looking for feedback about whether I'm barking up the right tree before I spend time debugging or polishing the patch, so I would appreciate thoughts, advice, etc. Thanks, Dan -- ~~~~~~~~~~~~~~~~~~~~~~~~~~~ Dan Wendlandt Nicira Networks: www.nicira.com twitter: danwendlandt ~~~~~~~~~~~~~~~~~~~~~~~~~~~

7 22

[libvirt] [libvirt-glib] Add gvir_storage_vol_resize()
by Zeeshan Ali (Khattak) 03 Feb '12

03 Feb '12

From: "Zeeshan Ali (Khattak)" <zeeshanak(a)gnome.org> Add wrapper for virStorageVolResize(). --- libvirt-gobject/libvirt-gobject-storage-vol.c | 27 +++++++++++++++++++++++++ libvirt-gobject/libvirt-gobject-storage-vol.h | 20 ++++++++++++++++++ libvirt-gobject/libvirt-gobject.sym | 1 + 3 files changed, 48 insertions(+), 0 deletions(-) diff --git a/libvirt-gobject/libvirt-gobject-storage-vol.c b/libvirt-gobject/libvirt-gobject-storage-vol.c index 491e2e6..78ce76e 100644 --- a/libvirt-gobject/libvirt-gobject-storage-vol.c +++ b/libvirt-gobject/libvirt-gobject-storage-vol.c @@ -299,3 +299,30 @@ gboolean gvir_storage_vol_delete(GVirStorageVol *vol, return TRUE; } + +/** + * gvir_storage_vol_resize: + * @vol: the storage volume to resize + * @capacity: the new capacity of the volume + * @flags: (type GVirStorageVolResizeFlags): the flags + * @err: Return location for errors, or NULL + * + * Changes the capacity of the storage volume @vol to @capacity. + * + * Returns: #TRUE success, #FALSE otherwise + */ +gboolean gvir_storage_vol_resize(GVirStorageVol *vol, + guint64 capacity, + guint flags, + GError **err) +{ + if (virStorageVolResize(vol->priv->handle, capacity, flags) < 0) { + gvir_set_error_literal(err, + GVIR_STORAGE_VOL_ERROR, + 0, + "Unable to resize volume storage"); + return FALSE; + } + + return TRUE; +} diff --git a/libvirt-gobject/libvirt-gobject-storage-vol.h b/libvirt-gobject/libvirt-gobject-storage-vol.h index 25f683a..b425f0a 100644 --- a/libvirt-gobject/libvirt-gobject-storage-vol.h +++ b/libvirt-gobject/libvirt-gobject-storage-vol.h @@ -23,6 +23,7 @@ #if !defined(__LIBVIRT_GOBJECT_H__) && !defined(LIBVIRT_GOBJECT_BUILD) #error "Only <libvirt-gobject/libvirt-gobject.h> can be included directly." #endif +#include <libvirt/libvirt.h> #ifndef __LIBVIRT_GOBJECT_STORAGE_VOL_H__ #define __LIBVIRT_GOBJECT_STORAGE_VOL_H__ @@ -65,6 +66,21 @@ typedef enum { GVIR_STORAGE_VOL_STATE_DIR = 2, /* Directory-passthrough based volume */ } GVirStorageVolType; +/** + * GVirStorageVolResizeFlags: + * @GVIR_STORAGE_VOL_RESIZE_NONE: No flags + * @GVIR_STORAGE_VOL_RESIZE_ALLOCATE: force allocation of new size + * @GVIR_STORAGE_VOL_RESIZE_DELTA: size is relative to current + * @GVIR_STORAGE_VOL_RESIZE_SHRINK: allow decrease in capacity. This combined + * with #GVIR_STORAGE_VOL_RESIZE_DELTA, implies a negative delta. + */ +typedef enum { + GVIR_STORAGE_VOL_RESIZE_NONE = 0, + GVIR_STORAGE_VOL_RESIZE_ALLOCATE = VIR_STORAGE_VOL_RESIZE_ALLOCATE, + GVIR_STORAGE_VOL_RESIZE_DELTA = VIR_STORAGE_VOL_RESIZE_DELTA, + GVIR_STORAGE_VOL_RESIZE_SHRINK = VIR_STORAGE_VOL_RESIZE_SHRINK, +} GVirStorageVolResizeFlags; + typedef struct _GVirStorageVolInfo GVirStorageVolInfo; struct _GVirStorageVolInfo { @@ -89,6 +105,10 @@ GVirConfigStorageVol *gvir_storage_vol_get_config(GVirStorageVol *vol, GError **err); GVirStorageVolInfo *gvir_storage_vol_get_info(GVirStorageVol *vol, GError **err); +gboolean gvir_storage_vol_resize(GVirStorageVol *vol, + guint64 capacity, + guint flags, + GError **err); G_END_DECLS diff --git a/libvirt-gobject/libvirt-gobject.sym b/libvirt-gobject/libvirt-gobject.sym index a4f03f7..468bf65 100644 --- a/libvirt-gobject/libvirt-gobject.sym +++ b/libvirt-gobject/libvirt-gobject.sym @@ -126,6 +126,7 @@ LIBVIRT_GOBJECT_0.0.4 { gvir_storage_vol_get_config; gvir_storage_vol_get_info; gvir_storage_vol_delete; + gvir_storage_vol_resize; gvir_connection_handle_get_type; -- 1.7.7.6

3 2

[libvirt] [PATCH] virterror.c: Fix several spelling mistakes
by Philipp Hahn 03 Feb '12

03 Feb '12

compat{a->i}bility erron{->e}ous nec{c->}essary. Either "the" or "a". Signed-off-by: Philipp Hahn <hahn(a)univention.de> --- ChangeLog-old | 36 ++++++++++++++++++------------------ docs/drvlxc.html.in | 2 +- docs/formatdomain.html.in | 4 ++-- docs/locking.html.in | 2 +- docs/migration.html.in | 2 +- docs/news.html.in | 6 +++--- src/conf/domain_conf.c | 6 +++--- src/libvirt.c | 2 +- src/lxc/lxc_container.c | 2 +- src/qemu/qemu_migration.c | 2 +- src/rpc/virnetserverprogram.c | 2 +- src/util/virterror.c | 8 ++++---- src/xenxs/xen_sxpr.c | 2 +- 13 files changed, 38 insertions(+), 38 deletions(-) diff --git a/ChangeLog-old b/ChangeLog-old index c3b41e2..b5d44d5 100644 --- a/ChangeLog-old +++ b/ChangeLog-old @@ -882,7 +882,7 @@ Wed May 13 18:06:17 CEST 2009 Daniel Veillard <veillard(a)redhat.com> Wed May 13 12:34:06 BST 2009 Daniel P. Berrange <berrange(a)redhat.com> * src/lxc_container.c: Replace sys/capability.h with - linux/capability.h, to avoid unneccessary dependancy + linux/capability.h, to avoid unnecessary dependency on the libcap package. Tue May 12 16:39:06 EDT 2009 Cole Robinson <crobinso(a)redhat.com> @@ -3351,7 +3351,7 @@ Tue Jan 20 20:22:53 GMT 2009 Daniel P. Berrange <berrange(a)redhat.com> Tue Jan 20 19:49:53 GMT 2009 Daniel P. Berrange <berrange(a)redhat.com> * .x-sc_prohibit_nonreentrant: Blacklist some places where - use of non-threadsafe APIs are not neccessary to check + use of non-threadsafe APIs are not necessary to check * Makefile.am, Makefile.maint, Makefile.nonreentrant: Add check for non-reentrant safe API calls * Makefile.cfg: Temporarily disable non-reentrant check @@ -3591,7 +3591,7 @@ Thu Jan 15 19:54:19 GMT 2009 Daniel P. Berrange <berrange(a)redhat.com> * src/Makefile.am, src/threads.c, src/threads.h: Generic internal API for threads * src/threads-pthread.c, src/threads-pthread.h: UNIX pthreads impl * src/threads-win32.c, src/threads-win32.h: Win32 threads impl - * src/internal.h: Remove unnneccessary pthreads macros + * src/internal.h: Remove unnecessary pthreads macros * src/libvirt_private.syms: Add symbols for internal threads API * po/POTFILES.in: Add node_device_conf.c * proxy/Makefile.am: Add threads.c to build @@ -4262,7 +4262,7 @@ Thu Dec 18 11:50:58 GMT 2008 Daniel P. Berrange <berrange(a)redhat.com> Misc daemon bug fixes (John Levon) * qemud/qemud.c: Fix conditional for node devices - * qemud/remote.c: Remove unneccessary path.h include + * qemud/remote.c: Remove unnecessary path.h include Thu Dec 18 07:47:58 +0100 2008 Jim Meyering <meyering(a)redhat.com> @@ -5032,7 +5032,7 @@ Tue Nov 25 11:17:40 GMT 2008 Daniel P. Berrange <berrange(a)redhat.com> Tue Nov 25 10:49:40 GMT 2008 Daniel P. Berrange <berrange(a)redhat.com> - * src/Makefile.am: Remove unneccessary $(builddir) usage which + * src/Makefile.am: Remove unnecessary $(builddir) usage which breaks on older automake. Remove duplicate CFLAGS from merge error * src/xen_unified.c: Wire up XM driver for autostart @@ -5093,7 +5093,7 @@ Mon Nov 24 19:22:40 GMT 2008 Daniel P. Berrange <berrange(a)redhat.com> * tests/Makefile.am, tests/sexpr2xmltest.c, tests/testutilsxen.c, tests/xencapstest.c, tests/xmconfigtest.c, tests/xml2sexprtest.c: Disable all - Xen tests when Xen driver build is disabled. Remove unneccessary + Xen tests when Xen driver build is disabled. Remove unnecessary WITH_XEN conditionals from source, since the entire build is disabled in Makefile.am @@ -6822,7 +6822,7 @@ Wed Aug 20 21:05:09 BST 2008 Daniel P. Berrange <berrange(a)redhat.com> src/xen_unified.h, src/xend_internal.c, src/xend_internal.h, src/xm_internal.c, src/xs_internal.c, src/xs_internal.h tests/testutils.h: Remove preprocessor conditions for driver - compilation. Remove unneccessary "extern C" declarations. + compilation. Remove unnecessary "extern C" declarations. Wed Aug 20 20:42:09 BST 2008 Daniel P. Berrange <berrange(a)redhat.com> @@ -7008,7 +7008,7 @@ Fri Aug 8 16:41:24 BST 2008 Daniel Berrange <berrange(a)redhat.com> src/storage_backend_fs.c, src/storage_backend_iscsi.c, src/storage_backend_logical.c, src/util.c, src/util.h, src/veth.c, tests/qemuxml2argvtest.c: Fix const-correctness - of virRun and virExec, and remove unneccessary casts in callers + of virRun and virExec, and remove unnecessary casts in callers Fri Aug 8 16:53:24 CEST 2008 Daniel Veillard <veillard(a)redhat.com> @@ -7530,7 +7530,7 @@ Wed Jul 16 16:44:27 CEST 2008 Daniel Veillard <veillard(a)redhat.com> Sat Jul 12 14:52:59 BST 2008 Daniel P. Berrange <berrange(a)redhat.com> - * src/qemu_conf.c: Remove unneccessary c-ctype.h include + * src/qemu_conf.c: Remove unnecessary c-ctype.h include Fri Jul 11 20:32:59 BST 2008 Daniel P. Berrange <berrange(a)redhat.com> @@ -8612,7 +8612,7 @@ Thu May 1 14:10:28 EST 2008 Daniel P. Berrange <berrange(a)redhat.com> Tue Apr 29 12:32:28 EST 2008 Daniel P. Berrange <berrange(a)redhat.com> - * configure.in: Remove compatability macros AC_CHECK_*_ONCE for + * configure.in: Remove compatibility macros AC_CHECK_*_ONCE for now part of onceonly.m4 in gnulib/m4/ Wed Apr 29 18:10:00 CEST 2008 Jim Meyering <meyering(a)redhat.com> @@ -8628,7 +8628,7 @@ Wed Apr 29 18:10:00 CEST 2008 Jim Meyering <meyering(a)redhat.com> Tue Apr 29 11:54:28 EST 2008 Daniel P. Berrange <berrange(a)redhat.com> - * configure.in: Add compatability macros AC_CHECK_*_ONCE for + * configure.in: Add compatibility macros AC_CHECK_*_ONCE for older autoconf (RHEL-5 vintage) Tue Apr 29 08:13:28 EST 2008 Daniel P. Berrange <berrange(a)redhat.com> @@ -10247,7 +10247,7 @@ Fri Jan 25 12:00:00 BST 2008 Richard W.M. Jones <rjones(a)redhat.com> Fri Jan 25 10:46:32 CET 2008 Daniel Veillard <veillard(a)redhat.com> - * src/xen_internal.c: fix an erronous use of VIR_DOMAIN_NONE instead + * src/xen_internal.c: fix an erroneous use of VIR_DOMAIN_NONE instead of VIR_DOMAIN_NOSTATE (both defined as 0, no regression) Thu Jan 24 18:08:28 CET 2008 Daniel Veillard <veillard(a)redhat.com> @@ -10283,8 +10283,8 @@ Tue Jan 22 16:27:47 EST 2008 Daniel P. Berrange <berrange(a)redhat.com> * configure.ac: Remove use of PKG_CHECK_EXISTS macro. Avoid lines going over 80 chars wide. Make sasl check automatic - enable/disable as neccessary. - * acinclude.m4: Added compatability macro for old pkg-config + enable/disable as necessary. + * acinclude.m4: Added compatibility macro for old pkg-config * src/gnutls_1_0_compat.h: Add compat for gnutls_cipher_algorithm_t Mon Jan 21 18:03:47 CET 2008 Jim Meyering <meyering(a)redhat.com> @@ -11617,7 +11617,7 @@ Tue Oct 23 17:30:52 CEST 2007 Daniel Veillard <veillard(a)redhat.com> Mon Oct 22 22:33:59 CEST 2007 Daniel Veillard <veillard(a)redhat.com> * src/xen_internal.c src/xen_unified.c src/xen_unified.h - src/xend_internal.c src/xml.c src/xml.h: commited erronously + src/xend_internal.c src/xml.c src/xml.h: committed erroneously the NUMA patches sent for review on the list in last commit. But that should not affect non NUMA users so early push should not be a problem. @@ -12117,7 +12117,7 @@ Mon Aug 13 21:18:48 EST 2007 Daniel P. Berrange <berrange(a)redhat.com> * src/util.h, src/util.c: Allow a file descriptor to be supplied for STDIN when calling virExec(), or if -1, redirect from /dev/null * src/qemu_driver.c, src/openvz_driver.c: Pass in -1 for new stdin - parameter above where neccessary. Patch from Jim Paris + parameter above where necessary. Patch from Jim Paris Mon Aug 13 20:13:48 EST 2007 Daniel P. Berrange <berrange(a)redhat.com> @@ -15485,7 +15485,7 @@ Fri Aug 4 20:19:23 EDT 2006 Daniel Berrange <berrange(a)redhat.com> * src/libvirt.c: Fix off-by-one in validated VCPU number (it is zero based, not one based). * include/libvirt/libvirt.h: Add some convenience macros for - calculating neccessary CPU map lengths & total host CPUs + calculating necessary CPU map lengths & total host CPUs * src/virsh.c: Add 'vcpuinfo' and 'vcpumap' commands Fri Aug 4 14:45:25 CEST 2006 Daniel Veillard <veillard(a)redhat.com> @@ -15708,7 +15708,7 @@ Wed Jun 14 13:10:03 EDT 2006 Daniel Veillard <veillard(a)redhat.com> Tue Jun 13 14:06:01 EDT 2006 Daniel P. Berrange <berrange(a)redhat.com> * src/virsh.c: use 'double' instead of 'float' when calculating - 'CPU time' field for dominfo command, to ensure no unneccessary + 'CPU time' field for dominfo command, to ensure no unnecessary loss of precision converting from nanoseconds to seconds. Tue Jun 13 18:35:22 EDT 2006 Daniel Veillard <veillard(a)redhat.com> diff --git a/docs/drvlxc.html.in b/docs/drvlxc.html.in index 47837d1..c817a9b 100644 --- a/docs/drvlxc.html.in +++ b/docs/drvlxc.html.in @@ -35,7 +35,7 @@ mount them use: NB, the blkio controller in some kernels will not allow creation of nested sub-directories which will prevent correct operation of the libvirt LXC -driver. On such kernels, it may be neccessary to unmount the blkio controller. +driver. On such kernels, it may be necessary to unmount the blkio controller. diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index 6bf64a6..284e780 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -2885,8 +2885,8 @@ qemu-kvm -net nic,model=? /dev/null <dl> <dt><code>video</code></dt> <dd> - The <code>video</code> element is the a container for describing - video devices. For backwards compatability, if no <code>video</code> + The <code>video</code> element is the container for describing + video devices. For backwards compatibility, if no <code>video</code> is set but there is a <code>graphics</code> in domain xml, then libvirt will add a default <code>video</code> according to the guest type. For a guest of type "kvm", the default <code>video</code> for it is: diff --git a/docs/locking.html.in b/docs/locking.html.in index 5a64453..28781a4 100644 --- a/docs/locking.html.in +++ b/docs/locking.html.in @@ -76,7 +76,7 @@ The sanlock daemon must be started on every single host that will be running virtual machines. So repeat these - steps as neccessary. + steps as necessary. <h2><a name="sanlockplugin">libvirt sanlock plugin configuration</a></h2> diff --git a/docs/migration.html.in b/docs/migration.html.in index 3676f0b..9d9d9b9 100644 --- a/docs/migration.html.in +++ b/docs/migration.html.in @@ -25,7 +25,7 @@ on the hypervisor in question, but will typically have the lowest computational costs by minimising the number of data copies involved. The native data transports will also require extra hypervisor-specific network configuration steps by the administrator when - deploying a host. For some hypervisors, it might be neccessary to open up a large range + deploying a host. For some hypervisors, it might be necessary to open up a large range of ports on the firewall to allow multiple concurrent migration operations. diff --git a/docs/news.html.in b/docs/news.html.in index c8365d9..f8e07f1 100644 --- a/docs/news.html.in +++ b/docs/news.html.in @@ -5471,7 +5471,7 @@ and check the <a href="http://libvirt.org/git/?p=libvirt.git;a=log">GIT log</a> qemu: Search binaries in PATH instead of hardcoding /usr/bin (Matthias Bolte), Implement QMP support for extracting CPU thread ID (Daniel P. Berrange), Misc fixes to QMP monitor support for QEMU (Daniel P. Berrange), - Fix setup of compatability serial devices from console device (Daniel P. Berrange), + Fix setup of compatibility serial devices from console device (Daniel P. Berrange), Start modernizing configure (Eric Blake), Add a rule to check for uses of readlink. (Chris Lalancette), Add virConnectGetVersion Python API (Taizo ITO), @@ -6025,7 +6025,7 @@ and check the <a href="http://libvirt.org/git/?p=libvirt.git;a=log">GIT log</a> Fix a typo in virDiskHasValidPciAddr() (Jiri Denemark), Fix a number of small typos (Dan Kenigsberg), add doc for graphic and video elements (Florian Vichot), - Fix up 'neccessary -> necessary' in a comment. (Chris Lalancette), + Fix up 'necessary -> necessary' in a comment. (Chris Lalancette), Fix up comments for domainXML{To,From}Native. (Chris Lalancette), Simple fix of a comment in qemuStringToArgvEnv. (Chris Lalancette), Add a README file to src/ explaining the directory structure (Daniel P. Berrange), @@ -6125,7 +6125,7 @@ and check the <a href="http://libvirt.org/git/?p=libvirt.git;a=log">GIT log</a> Pull connection handling code out of doTunnelMigrate (Daniel P. Berrange), Refactor native QEMU migration code (Daniel P. Berrange), Don't force dconn to be NULL in virDomainMigrate (Daniel P. Berrange), - Remove unneccessary uri_in parameter from virMigratePrepareTunnel (Daniel P. Berrange), + Remove unnecessary uri_in parameter from virMigratePrepareTunnel (Daniel P. Berrange), Move the VIR_DRV_FEATURE* constants (Daniel P. Berrange), Fix configure.ac message vertical alignment (Daniel P. Berrange), cgroup: Fix -Werror breakage (Cole Robinson), diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 26e24f0..dcb9549 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -2970,7 +2970,7 @@ virDomainDiskDefParseXML(virCapsPtr caps, /* People sometimes pass a bogus '' source path when they mean to omit the source element completely. eg CDROM without media. This is - just a little compatability check to help + just a little compatibility check to help those broken apps */ if (source && STREQ(source, "")) VIR_FREE(source); @@ -8002,7 +8002,7 @@ static virDomainDefPtr virDomainDefParseXML(virCapsPtr caps, } VIR_FREE(nodes); - /* For backwards compatability, if no <video> tag is set but there + /* For backwards compatibility, if no <video> tag is set but there * is a <graphics> tag, then we add a single video tag */ if (def->ngraphics && !def->nvideos) { virDomainVideoDefPtr video; @@ -9531,7 +9531,7 @@ virDomainDefMaybeAddSmartcardController(virDomainDefPtr def) /* * Based on the declared <address/> info for any devices, - * add neccessary drive controllers which are not already present + * add necessary drive controllers which are not already present * in the XML. This is for compat with existing apps which will * not know/care about <controller> info in the XML */ diff --git a/src/libvirt.c b/src/libvirt.c index e8473c2..11e2635 100644 --- a/src/libvirt.c +++ b/src/libvirt.c @@ -16577,7 +16577,7 @@ error: * is non-NULL, then only the specific domain will be monitored * * Most types of event have a callback providing a custom set of parameters - * for the event. When registering an event, it is thus neccessary to use + * for the event. When registering an event, it is thus necessary to use * the VIR_DOMAIN_EVENT_CALLBACK() macro to cast the supplied function pointer * to match the signature of this method. * diff --git a/src/lxc/lxc_container.c b/src/lxc/lxc_container.c index 1c148e2..04af39b 100644 --- a/src/lxc/lxc_container.c +++ b/src/lxc/lxc_container.c @@ -432,7 +432,7 @@ static int lxcContainerMountBasicFS(const char *srcprefix, bool pivotRoot) int mflags; } mnts[] = { /* When we want to make a bind mount readonly, for unknown reasons, - * it is currently neccessary to bind it once, and then remount the + * it is currently necessary to bind it once, and then remount the * bind with the readonly flag. If this is not done, then the original * mount point in the main OS becomes readonly too which is not what * we want. Hence some things have two entries here. diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index 8453a47..6e8ea98 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -1317,7 +1317,7 @@ qemuMigrationPrepareDirect(struct qemud_driver *driver, /* XXX this really should have been a properly well-formed * URI, but we can't add in tcp:// now without breaking - * compatability with old targets. We at least make the + * compatibility with old targets. We at least make the * new targets accept both syntaxes though. */ /* Caller frees */ diff --git a/src/rpc/virnetserverprogram.c b/src/rpc/virnetserverprogram.c index d2ede6b..7f589c8 100644 --- a/src/rpc/virnetserverprogram.c +++ b/src/rpc/virnetserverprogram.c @@ -384,7 +384,7 @@ virNetServerProgramDispatchCall(virNetServerProgramPtr prog, if (virNetServerClientNeedAuth(client) && dispatcher->needAuth) { /* Explicitly *NOT* calling remoteDispatchAuthError() because - we want back-compatability with libvirt clients which don't + we want back-compatibility with libvirt clients which don't support the VIR_ERR_AUTH_FAILED error code */ virNetError(VIR_ERR_RPC, "%s", _("authentication required")); diff --git a/src/util/virterror.c b/src/util/virterror.c index edd5198..fb5ca6f 100644 --- a/src/util/virterror.c +++ b/src/util/virterror.c @@ -228,7 +228,7 @@ virErrorGenericFailure(virErrorPtr err) /* - * Internal helper to perform a deep copy of the an error + * Internal helper to perform a deep copy of an error */ static int virCopyError(virErrorPtr from, @@ -439,7 +439,7 @@ virResetLastError(void) * Since 0.6.0, all errors reported in the per-connection object * are also duplicated in the global error object. As such an * application can always use virGetLastError(). This method - * remains for backwards compatability. + * remains for backwards compatibility. * * Returns a pointer to the last error or NULL if none occurred. */ @@ -470,7 +470,7 @@ virConnGetLastError(virConnectPtr conn) * Since 0.6.0, all errors reported in the per-connection object * are also duplicated in the global error object. As such an * application can always use virGetLastError(). This method - * remains for backwards compatability. + * remains for backwards compatibility. * * One will need to free the result with virResetError() * @@ -683,7 +683,7 @@ virRaiseErrorFull(const char *filename ATTRIBUTE_UNUSED, /* * All errors are recorded in thread local storage - * For compatability, public API calls will copy them + * For compatibility, public API calls will copy them * to the per-connection error object when necessary */ to = virLastErrorObject(); diff --git a/src/xenxs/xen_sxpr.c b/src/xenxs/xen_sxpr.c index 756eb77..f8390ea 100644 --- a/src/xenxs/xen_sxpr.c +++ b/src/xenxs/xen_sxpr.c @@ -651,7 +651,7 @@ xenParseSxprSound(virDomainDefPtr def, int i; /* - * Special compatability code for Xen with a bogus + * Special compatibility code for Xen with a bogus * sound=all in config. * * NB deliberately, don't include all possible -- 1.7.1

2 1

[libvirt] [PATCH v4] npiv: Auto-generate WWN if it's not specified
by Osier Yang 03 Feb '12

03 Feb '12

The auto-generated WWN comply with the new addressing schema of WWN: <quote> the first nibble is either hex 5 or 6 followed by a 3-byte vendor identifier and 36 bits for a vendor-specified serial number. </quote> We choose hex 5 for the first nibble. And use Qumranet's OUI (00:1A:4A) as the 3-byte vendor indentifier. The last 36 bits are auto-generated. v3 - v4: * No changes, rebasing according the files reorgnization. --- src/conf/node_device_conf.c | 35 ++++++++++++++++++----------------- src/libvirt_private.syms | 1 + src/util/virrandom.c | 25 +++++++++++++++++++++++++ src/util/virrandom.h | 1 + 4 files changed, 45 insertions(+), 17 deletions(-) diff --git a/src/conf/node_device_conf.c b/src/conf/node_device_conf.c index d9dc9ac..6812ee9 100644 --- a/src/conf/node_device_conf.c +++ b/src/conf/node_device_conf.c @@ -63,19 +63,12 @@ VIR_ENUM_IMPL(virNodeDevHBACap, VIR_NODE_DEV_CAP_HBA_LAST, static int virNodeDevCapsDefParseString(const char *xpath, xmlXPathContextPtr ctxt, - char **string, - virNodeDeviceDefPtr def, - const char *missing_error_fmt) + char **string) { char *s; - s = virXPathString(xpath, ctxt); - if (s == NULL) { - virNodeDeviceReportError(VIR_ERR_INTERNAL_ERROR, - missing_error_fmt, - def->name); + if (!(s = virXPathString(xpath, ctxt))) return -1; - } *string = s; return 0; @@ -763,18 +756,26 @@ virNodeDevCapScsiHostParseXML(xmlXPathContextPtr ctxt, if (virNodeDevCapsDefParseString("string(./wwnn[1])", ctxt, - &data->scsi_host.wwnn, - def, - _("no WWNN supplied for '%s'")) < 0) { - goto out; + &data->scsi_host.wwnn) < 0) { + if (virWWNGenerate(&data->scsi_host.wwnn) < 0) { + virNodeDeviceReportError(VIR_ERR_INTERNAL_ERROR, + _("no WWNN supplied for '%s', and " + "auto-generation failed"), + def->name); + goto out; + } } if (virNodeDevCapsDefParseString("string(./wwpn[1])", ctxt, - &data->scsi_host.wwpn, - def, - _("no WWPN supplied for '%s'")) < 0) { - goto out; + &data->scsi_host.wwpn) < 0) { + if (virWWNGenerate(&data->scsi_host.wwpn) < 0) { + virNodeDeviceReportError(VIR_ERR_INTERNAL_ERROR, + _("no WWPN supplied for '%s', and " + "auto-generation failed"), + def->name); + goto out; + } } ctxt->node = orignode2; diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index e300f06..0d5758f 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -1374,6 +1374,7 @@ virPidFileDeletePath; # virrandom.h virRandomBits; virRandomInitialize; +virWWNGenerate; # virsocketaddr.h diff --git a/src/util/virrandom.c b/src/util/virrandom.c index ec0cf03..3839989 100644 --- a/src/util/virrandom.c +++ b/src/util/virrandom.c @@ -26,6 +26,10 @@ #include "virrandom.h" #include "threads.h" #include "count-one-bits.h" +#include "util.h" +#include "virterror_internal.h" + +#define VIR_FROM_THIS VIR_FROM_NONE static char randomState[128]; static struct random_data randomData; @@ -79,3 +83,24 @@ uint64_t virRandomBits(int nbits) virMutexUnlock(&randomLock); return ret; } + +#define QUMRANET_OUI "001a4a" + +int virWWNGenerate(char **wwn) { + int suffix[5]; + + suffix[0] = virRandomBits(16); + suffix[1] = virRandomBits(256); + suffix[2] = virRandomBits(256); + suffix[3] = virRandomBits(256); + suffix[4] = virRandomBits(256); + + if (virAsprintf(wwn, "%x%s%x%02x%02x%02x%02x", 0x5, QUMRANET_OUI, + suffix[0], suffix[1], suffix[2], + suffix[3], suffix[4]) < 0) { + virReportOOMError(); + return -1; + } + + return 0; +} diff --git a/src/util/virrandom.h b/src/util/virrandom.h index e180a2f..5e2cdcf 100644 --- a/src/util/virrandom.h +++ b/src/util/virrandom.h @@ -27,5 +27,6 @@ int virRandomInitialize(uint32_t seed) ATTRIBUTE_RETURN_CHECK; uint64_t virRandomBits(int nbits); +int virWWNGenerate(char **wwn); #endif /* __VIR_RANDOM_H__ */ -- 1.7.7.3

2 2

[libvirt] [PATCH] Added missing memory reporting into python bindings
by Martin Kletzander 03 Feb '12

03 Feb '12

Two types of memory stats were not reported by python bindings. This patch fixes both of them. --- python/libvirt-override.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/python/libvirt-override.c b/python/libvirt-override.c index 18849f8..289a9bb 100644 --- a/python/libvirt-override.c +++ b/python/libvirt-override.c @@ -258,6 +258,12 @@ libvirt_virDomainMemoryStats(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) { else if (stats[i].tag == VIR_DOMAIN_MEMORY_STAT_AVAILABLE) PyDict_SetItem(info, libvirt_constcharPtrWrap("available"), PyLong_FromUnsignedLongLong(stats[i].val)); + else if (stats[i].tag == VIR_DOMAIN_MEMORY_STAT_ACTUAL_BALLOON) + PyDict_SetItem(info, libvirt_constcharPtrWrap("actual"), + PyLong_FromUnsignedLongLong(stats[i].val)); + else if (stats[i].tag == VIR_DOMAIN_MEMORY_STAT_RSS) + PyDict_SetItem(info, libvirt_constcharPtrWrap("rss"), + PyLong_FromUnsignedLongLong(stats[i].val)); } return info; } -- 1.7.3.4

2 1

[libvirt] [PATCH 0/5] switch python bindings to use libvirt_util
by Eric Blake 03 Feb '12

03 Feb '12

As threatened here: https://www.redhat.com/archives/libvir-list/2012-February/msg00122.html and as requested here: https://www.redhat.com/archives/libvir-list/2012-January/msg00491.html along with some prerequisite patches. I was quite shocked when I discovered that we didn't have a syntax-check rule requiring the use of VIR_FREE, before these patches. Eric Blake (5): build: clean up CPPFLAGS/INCLUDES usage python: drop redundant function build: prohibit raw malloc and free build: expand rule to cover testsuite python: use libvirt_util to avoid raw free cfg.mk | 9 + daemon/Makefile.am | 20 +- examples/dominfo/Makefile.am | 4 +- examples/domsuspend/Makefile.am | 4 +- examples/hellolibvirt/Makefile.am | 4 +- examples/openauth/Makefile.am | 4 +- python/Makefile.am | 22 ++- python/generator.py | 4 +- python/libvirt-override.c | 364 ++++++++++++++++++------------------- python/typewrappers.c | 21 +-- python/typewrappers.h | 3 +- src/Makefile.am | 70 ++++---- src/conf/network_conf.c | 2 +- src/cpu/cpu.c | 4 +- src/libxl/libxl_conf.c | 13 +- src/rpc/virnetmessage.c | 23 ++- tests/Makefile.am | 9 +- tests/commandhelper.c | 6 +- tests/cputest.c | 36 ++-- tests/domainsnapshotxml2xmltest.c | 6 +- tests/interfacexml2xmltest.c | 6 +- tests/networkxml2argvtest.c | 10 +- tests/networkxml2xmltest.c | 10 +- tests/nodedevxml2xmltest.c | 6 +- tests/nodeinfotest.c | 10 +- tests/nwfilterxml2xmltest.c | 10 +- tests/qemuargv2xmltest.c | 20 +- tests/qemuxml2argvtest.c | 28 ++-- tests/qemuxml2xmltest.c | 10 +- tests/qemuxmlnstest.c | 23 ++- tests/qparamtest.c | 2 +- tests/sexpr2xmltest.c | 10 +- tests/storagepoolxml2xmltest.c | 10 +- tests/storagevolxml2xmltest.c | 14 +- tests/testutils.c | 9 +- tests/testutils.h | 3 +- tests/virshtest.c | 4 +- tests/xencapstest.c | 10 +- tests/xmconfigtest.c | 10 +- tests/xml2sexprtest.c | 10 +- tools/Makefile.am | 12 +- tools/virsh.c | 9 +- 42 files changed, 429 insertions(+), 435 deletions(-) -- 1.7.7.6

2 11

[libvirt] need help in vm migration
by punit gupta 03 Feb '12

03 Feb '12

sir i am using fedora 14 and libvirt 0.8 and qemu 13 ,and i am trying to migrate my vm using virt-manager but it is giving error . >> internal error Process exited while reading console log output: char device redirected to /dev/pts/1 qemu: could not open disk image /home/punit/qemu/dos1.img: No such file or directory where as file is present in the directry . please help -- Punit Gupta M-Tech (C.S.E) (jiit noida)

3 2

[libvirt] [PATCH] command: allow merging stdout and stderr in string capture
by Eric Blake 03 Feb '12

03 Feb '12

Sometimes, its easier to run children with 2>&1 in shell notation, and just deal with stdout and stderr interleaved. This was already possible for fd handling; extend it to also work when doing string capture of a child process. * docs/internals/command.html.in: Document this. * src/util/command.c (virCommandSetErrorBuffer): Likewise. (virCommandRun, virExecWithHook): Implement it. * tests/commandtest.c (test14): Test it. * daemon/remote.c (remoteDispatchAuthPolkit): Use new command feature. --- In response to: https://www.redhat.com/archives/libvir-list/2012-January/msg01262.html Hmm, I thought I sent this earlier, but can't find it on the archives. daemon/remote.c | 11 +++-------- docs/internals/command.html.in | 5 ++++- src/util/command.c | 16 ++++++++++++++-- tests/commandtest.c | 26 +++++++++++++++++++++++++- 4 files changed, 46 insertions(+), 12 deletions(-) diff --git a/daemon/remote.c b/daemon/remote.c index 26ac4a6..1cea942 100644 --- a/daemon/remote.c +++ b/daemon/remote.c @@ -2477,7 +2477,7 @@ remoteDispatchAuthPolkit(virNetServerPtr server ATTRIBUTE_UNUSED, int status = -1; char *ident = NULL; bool authdismissed = 0; - char *pkout = NULL, *pkerr = NULL; + char *pkout = NULL; struct daemonClientPrivate *priv = virNetServerClientGetPrivateData(client); virCommandPtr cmd = NULL; @@ -2489,7 +2489,7 @@ remoteDispatchAuthPolkit(virNetServerPtr server ATTRIBUTE_UNUSED, cmd = virCommandNewArgList(PKCHECK_PATH, "--action-id", action, NULL); virCommandSetOutputBuffer(cmd, &pkout); - virCommandSetErrorBuffer(cmd, &pkerr); + virCommandSetErrorBuffer(cmd, &pkout); VIR_DEBUG("Start PolicyKit auth %d", virNetServerClientGetFD(client)); if (virNetServerClientGetAuth(client) != VIR_NET_SERVER_SERVICE_AUTH_POLKIT) { @@ -2548,17 +2548,12 @@ error: if (authdismissed) { virNetError(VIR_ERR_AUTH_CANCELLED, "%s", _("authentication cancelled by user")); - } else if (pkout || pkerr) { - virNetError(VIR_ERR_AUTH_FAILED, "%s %s", - pkerr ? pkerr : "", - pkout ? pkout : ""); } else { virNetError(VIR_ERR_AUTH_FAILED, "%s", - _("authentication failed")); + pkout && *pkout ? pkout : _("authentication failed")); } VIR_FREE(pkout); - VIR_FREE(pkerr); virNetMessageSaveError(rerr); virMutexUnlock(&priv->lock); return -1; diff --git a/docs/internals/command.html.in b/docs/internals/command.html.in index 7dcf462..7bb9aa3 100644 --- a/docs/internals/command.html.in +++ b/docs/internals/command.html.in @@ -373,7 +373,10 @@ allocation of collected information (however, on an out-of-memory condition, the buffer may still be NULL). The caller is responsible for freeing registered buffers, since the - buffers are designed to persist beyond virCommandFree. + buffers are designed to persist beyond virCommandFree. It + is possible to pass the same pointer to both + virCommandSetOutputBuffer and virCommandSetErrorBuffer, in which + case the child process interleaves output into a single string. <h3><a name="directory">Setting working directory</a></h3> diff --git a/src/util/command.c b/src/util/command.c index 6f51fbb..a2d5f84 100644 --- a/src/util/command.c +++ b/src/util/command.c @@ -464,7 +464,9 @@ virExecWithHook(const char *const*argv, } if (errfd != NULL) { - if (*errfd == -1) { + if (errfd == outfd) { + childerr = childout; + } else if (*errfd == -1) { if (pipe2(pipeerr, O_CLOEXEC) < 0) { virReportSystemError(errno, "%s", _("Failed to create pipe")); @@ -1428,7 +1430,10 @@ virCommandSetOutputBuffer(virCommandPtr cmd, char **outbuf) * guaranteed to be allocated after successful virCommandRun or * virCommandWait, and is best-effort allocated after failed * virCommandRun; caller is responsible for freeing *errbuf. - * This requires the use of virCommandRun. + * This requires the use of virCommandRun. It is possible to + * pass the same pointer as for virCommandSetOutputBuffer(), in + * which case the child process will interleave all output into + * a single string. */ void virCommandSetErrorBuffer(virCommandPtr cmd, char **errbuf) @@ -1940,6 +1945,13 @@ virCommandRun(virCommandPtr cmd, int *exitstatus) cmd->inpipe = infd[1]; } + /* If caller requested the same string for stdout and stderr, then + * merge those into one string. */ + if (cmd->outbuf && cmd->outbuf == cmd->errbuf) { + cmd->errfdptr = &cmd->outfd; + cmd->errbuf = NULL; + } + /* If caller hasn't requested capture of stdout/err, then capture * it ourselves so we can log it. But the intermediate child for * a daemon has no expected output, and we don't want our diff --git a/tests/commandtest.c b/tests/commandtest.c index 9b9130c..3997d2c 100644 --- a/tests/commandtest.c +++ b/tests/commandtest.c @@ -508,6 +508,14 @@ static int test14(const void *unused ATTRIBUTE_UNUSED) const char *errexpect = "BEGIN STDERR\n" "Hello World\n" "END STDERR\n"; + + char *jointactual = NULL; + const char *jointexpect = "BEGIN STDOUT\n" + "BEGIN STDERR\n" + "Hello World\n" + "Hello World\n" + "END STDOUT\n" + "END STDERR\n"; int ret = -1; virCommandSetInputBuffer(cmd, "Hello World\n"); @@ -523,7 +531,18 @@ static int test14(const void *unused ATTRIBUTE_UNUSED) goto cleanup; virCommandFree(cmd); - cmd = NULL; + + cmd = virCommandNew(abs_builddir "/commandhelper"); + virCommandSetInputBuffer(cmd, "Hello World\n"); + virCommandSetOutputBuffer(cmd, &jointactual); + virCommandSetErrorBuffer(cmd, &jointactual); + if (virCommandRun(cmd, NULL) < 0) { + virErrorPtr err = virGetLastError(); + printf("Cannot run child %s\n", err->message); + goto cleanup; + } + if (!jointactual) + goto cleanup; if (!STREQ(outactual, outexpect)) { virtTestDifference(stderr, outexpect, outactual); @@ -533,6 +552,10 @@ static int test14(const void *unused ATTRIBUTE_UNUSED) virtTestDifference(stderr, errexpect, erractual); goto cleanup; } + if (!STREQ(jointactual, jointexpect)) { + virtTestDifference(stderr, jointexpect, jointactual); + goto cleanup; + } ret = checkoutput("test14"); @@ -540,6 +563,7 @@ cleanup: virCommandFree(cmd); VIR_FREE(outactual); VIR_FREE(erractual); + VIR_FREE(jointactual); return ret; } -- 1.7.7.6

2 2

[libvirt] [PATCH] virsh: extension of virsh attach-disk for rawio
by Taku Izumi 03 Feb '12

03 Feb '12

This patch extends "virsh attach-disk" command so that we can specify "rawio" attribute. Signed-off-by: Taku Izumi <izumi.taku(a)jp.fujitsu.com> --- tools/virsh.c | 3 +++ tools/virsh.pod | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-) Index: libvirt/tools/virsh.c =================================================================== --- libvirt.orig/tools/virsh.c +++ libvirt/tools/virsh.c @@ -13883,6 +13883,7 @@ static const vshCmdOptDef opts_attach_di {"sourcetype", VSH_OT_STRING, 0, N_("type of source (block|file)")}, {"serial", VSH_OT_STRING, 0, N_("serial of disk device")}, {"shareable", VSH_OT_BOOL, 0, N_("shareable between domains")}, + {"rawio", VSH_OT_BOOL, 0, N_("needs rawio capability")}, {"address", VSH_OT_STRING, 0, N_("address of disk device")}, {"multifunction", VSH_OT_BOOL, 0, N_("use multifunction pci under specified address")}, @@ -14102,6 +14103,8 @@ cmdAttachDisk(vshControl *ctl, const vsh (isFile) ? "file" : "block"); if (type) virBufferAsprintf(&buf, " device='%s'", type); + if (vshCommandOptBool (cmd, "rawio")) + virBufferAddLit(&buf, " rawio='yes'"); virBufferAddLit(&buf, ">\n"); if (driver || subdriver) Index: libvirt/tools/virsh.pod =================================================================== --- libvirt.orig/tools/virsh.pod +++ libvirt/tools/virsh.pod @@ -1404,7 +1404,7 @@ the device does not use managed mode. =item B<attach-disk> I<domain-id> I<source> I<target> [I<--driver driver>] [I<--subdriver subdriver>] [I<--cache cache>] [I<--type type>] [I<--mode mode>] [I<--persistent>] [I<--sourcetype soucetype>] -[I<--serial serial>] [I<--shareable>] [I<--address address>] +[I<--serial serial>] [I<--shareable>] [I<--rawio>] [I<--address address>] [I<--multifunction>] Attach a new disk device to the domain. @@ -1421,6 +1421,7 @@ I<cache> can be one of "default", "none" "directsync" or "unsafe". I<serial> is the serial of disk device. I<shareable> indicates the disk device is shareable between domains. +I<rawio> indicates the disk is needs rawio capability. I<address> is the address of disk device in the form of pci:domain.bus.slot.function, scsi:controller.bus.unit or ide:controller.bus.unit. I<multifunction> indicates specified pci address is a multifunction pci device -- Taku Izumi <izumi.taku(a)jp.fujitsu.com>

3 2

[libvirt] [PATCH] qemu: fix my typo at commit 74e034964c32edb1732d0ff7642f3977f3587d72
by Taku Izumi 03 Feb '12

03 Feb '12

Fix my typo at commit 74e034964c32edb1732d0ff7642f3977f3587d72 "disk->rawio == -1" indicates that this value is not specified. So in case of this, domain must not be tainted. Signed-off-by: Taku Izumi <izumi.taku(a)jp.fujitsu.com> --- src/qemu/qemu_domain.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Index: libvirt/src/qemu/qemu_domain.c =================================================================== --- libvirt.orig/src/qemu/qemu_domain.c +++ libvirt/src/qemu/qemu_domain.c @@ -1260,7 +1260,7 @@ void qemuDomainObjCheckDiskTaint(struct driver->allowDiskFormatProbing) qemuDomainObjTaint(driver, obj, VIR_DOMAIN_TAINT_DISK_PROBING, logFD); - if (disk->rawio) + if (disk->rawio == 1) qemuDomainObjTaint(driver, obj, VIR_DOMAIN_TAINT_HIGH_PRIVILEGES, logFD); }

3 3

[libvirt] [PATCH] Fixed connection definition for non-SELinux builds
by Martin Kletzander 03 Feb '12

03 Feb '12

This patch fixes the access of variable "con" in two files where the variable was declared only on SELinux builds and thus the build failed without SELinux. It's a rather nasty fix but helps fix the build quickly and without any major changes to the code. --- src/lxc/lxc_container.c | 2 ++ src/lxc/lxc_controller.c | 2 ++ 2 files changed, 4 insertions(+), 0 deletions(-) diff --git a/src/lxc/lxc_container.c b/src/lxc/lxc_container.c index d1156e4..1c148e2 100644 --- a/src/lxc/lxc_container.c +++ b/src/lxc/lxc_container.c @@ -449,6 +449,8 @@ static int lxcContainerMountBasicFS(const char *srcprefix, bool pivotRoot) char *opts = NULL; #if HAVE_SELINUX security_context_t con; +#else + bool con = false; #endif VIR_DEBUG("Mounting basic filesystems %s pivotRoot=%d", NULLSTR(srcprefix), pivotRoot); diff --git a/src/lxc/lxc_controller.c b/src/lxc/lxc_controller.c index fedb7c8..8f336f5 100644 --- a/src/lxc/lxc_controller.c +++ b/src/lxc/lxc_controller.c @@ -1438,6 +1438,8 @@ lxcControllerRun(virDomainDefPtr def, if (root) { #if HAVE_SELINUX security_context_t con; +#else + bool con = false; #endif char *opts; VIR_DEBUG("Setting up private /dev/pts"); -- 1.7.3.4

3 2

[libvirt] [PATCH 0/2] Added RSS reporting for qemu
by Martin Kletzander 03 Feb '12

03 Feb '12

This patch enables reporting of Resident Set Size for qemu process. It is available through qemudDomainMemoryStats and qemudGetProcessInfo. The reporting is also added into "virsh dommemstat" command. Martin Kletzander (2): Added RSS information gathering into qemudGetProcessInfo Added RSS reporting include/libvirt/libvirt.h.in | 7 +++++- src/qemu/qemu_driver.c | 46 +++++++++++++++++++++++++++++++---------- tools/virsh.c | 2 + 3 files changed, 43 insertions(+), 12 deletions(-) -- 1.7.3.4

2 7

[libvirt] [PATCH] Replace TAB with white spaces
by Osier Yang 03 Feb '12

03 Feb '12

--- src/libvirt.c | 28 ++++++++++++++-------------- 1 files changed, 14 insertions(+), 14 deletions(-) diff --git a/src/libvirt.c b/src/libvirt.c index f58dfa6..e8473c2 100644 --- a/src/libvirt.c +++ b/src/libvirt.c @@ -8519,9 +8519,9 @@ error: * Bytes are stored in little-endian order: CPU0-7, 8-15... * In each byte, lowest CPU number is least significant bit. * @maplen: number of bytes in cpumap, from 1 up to size of CPU map in - * underlying virtualization system (Xen...). - * If maplen < size, missing bytes are set to zero. - * If maplen > size, failure code is returned. + * underlying virtualization system (Xen...). + * If maplen < size, missing bytes are set to zero. + * If maplen > size, failure code is returned. * * Dynamically change the real CPUs which can be allocated to a virtual CPU. * This function may require privileged access to the hypervisor. @@ -8730,15 +8730,15 @@ error: * @maxinfo: number of structures in info array * @cpumaps: pointer to a bit map of real CPUs for all vcpus of this * domain (in 8-bit bytes) (OUT) - * If cpumaps is NULL, then no cpumap information is returned by the API. - * It's assumed there is <maxinfo> cpumap in cpumaps array. - * The memory allocated to cpumaps must be (maxinfo * maplen) bytes - * (ie: calloc(maxinfo, maplen)). - * One cpumap inside cpumaps has the format described in + * If cpumaps is NULL, then no cpumap information is returned by the API. + * It's assumed there is <maxinfo> cpumap in cpumaps array. + * The memory allocated to cpumaps must be (maxinfo * maplen) bytes + * (ie: calloc(maxinfo, maplen)). + * One cpumap inside cpumaps has the format described in * virDomainPinVcpu() API. * @maplen: number of bytes in one cpumap, from 1 up to size of CPU map in - * underlying virtualization system (Xen...). - * Must be zero when cpumaps is NULL and positive when it is non-NULL. + * underlying virtualization system (Xen...). + * Must be zero when cpumaps is NULL and positive when it is non-NULL. * * Extract information about virtual CPUs of domain, store it in info array * and also in cpumaps if this pointer isn't NULL. This call may fail @@ -11160,7 +11160,7 @@ virStoragePoolGetConnect (virStoragePoolPtr pool) * Returns the number of pools found, or -1 on error */ int -virConnectNumOfStoragePools (virConnectPtr conn) +virConnectNumOfStoragePools(virConnectPtr conn) { VIR_DEBUG("conn=%p", conn); @@ -11200,9 +11200,9 @@ error: * Returns 0 on success, -1 on error */ int -virConnectListStoragePools (virConnectPtr conn, - char **const names, - int maxnames) +virConnectListStoragePools(virConnectPtr conn, + char **const names, + int maxnames) { VIR_DEBUG("conn=%p, names=%p, maxnames=%d", conn, names, maxnames); -- 1.7.7.3

2 2

[libvirt] [PATCH] lxc: Fix build with AppArmor
by Jiri Denemark 03 Feb '12

03 Feb '12

--- src/Makefile.am | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index b25a439..dd77eec 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1526,6 +1526,9 @@ endif if WITH_SECDRIVER_SELINUX libvirt_lxc_LDADD += $(SELINUX_LIBS) endif +if WITH_SECDRIVER_APPARMOR +libvirt_lxc_LDADD += $(APPARMOR_LIBS) +endif libvirt_lxc_CFLAGS = \ $(LIBPARTED_CFLAGS) \ $(NUMACTL_CFLAGS) \ @@ -1541,6 +1544,9 @@ endif if WITH_SECDRIVER_SELINUX libvirt_lxc_CFLAGS += $(SELINUX_CFLAGS) endif +if WITH_SECDRIVER_APPARMOR +libvirt_lxc_CFLAGS += $(APPARMOR_CFLAGS) +endif endif endif EXTRA_DIST += $(LXC_CONTROLLER_SOURCES) -- 1.7.8.4

2 2

[libvirt] [PATCH] conf: Plug memory on virDomainDiskDefParseXML
by ajia＠redhat.com 03 Feb '12

03 Feb '12

From: Alex Jia <ajia(a)redhat.com> Detected by valgrind. Leak is introduced in commit 397e6a7. * src/conf/domain_conf.c(virDomainDiskDefParseXML): fix memory leak. How to reproduce? % make -C tests check TESTS=qemuxml2argvtest % cd tests && valgrind -v --leak-check=full ./qemuxml2argvtest * Actual result: ==16352== 4 bytes in 1 blocks are definitely lost in loss record 12 of 147 ==16352== at 0x4A05FDE: malloc (vg_replace_malloc.c:236) ==16352== by 0x39D90A67DD: xmlStrndup (xmlstring.c:45) ==16352== by 0x4E83D5: virDomainDiskDefParseXML (domain_conf.c:2894) ==16352== by 0x4F542D: virDomainDefParseXML (domain_conf.c:7626) ==16352== by 0x4F8683: virDomainDefParseNode (domain_conf.c:8390) ==16352== by 0x4F904E: virDomainDefParse (domain_conf.c:8340) ==16352== by 0x41C626: testCompareXMLToArgvHelper (qemuxml2argvtest.c:105) ==16352== by 0x41DED1: virtTestRun (testutils.c:142) ==16352== by 0x418172: mymain (qemuxml2argvtest.c:486) ==16352== by 0x41D5C7: virtTestMain (testutils.c:697) ==16352== by 0x39CF01ECDC: (below main) (in /lib64/libc-2.12.so) Signed-off-by: Alex Jia <ajia(a)redhat.com> --- src/conf/domain_conf.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index aeef9db..26e24f0 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -3413,6 +3413,7 @@ cleanup: VIR_FREE(bus); VIR_FREE(type); VIR_FREE(snapshot); + VIR_FREE(rawio); VIR_FREE(target); VIR_FREE(source); while (nhosts > 0) { -- 1.7.1

2 1

[libvirt] [PATCH 1/1] Add detail to documentation on storage pools and volumes.
by Dave Allan 02 Feb '12

02 Feb '12

The storage pools page contains details about the capabilities of the various pool types, but not an overview of how they are intended to be used. This patch adds some explanation of what pools and volumes can be used for and why an administrator might want to use them. --- docs/storage.html.in | 82 ++++++++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 79 insertions(+), 3 deletions(-) diff --git a/docs/storage.html.in b/docs/storage.html.in index a9c7f1c..0e3e289 100644 --- a/docs/storage.html.in +++ b/docs/storage.html.in @@ -3,9 +3,85 @@ <body> <h1 >Storage Management</h1> -This page describes the backends for the storage management capabilities in -libvirt. - + Libvirt provides storage management on the physical host through + storage pools and volumes. + + + A storage pool is a quantity of storage set aside by an + administrator, often a dedicated storage administrator, for use + by virtual machines. Storage pools are divided into storage + volumes either by the storage administrator or the system + administrator, and the volumes are assigned to VMs as block + devices. + + + For example, the storage administrator responsible for an NFS + server creates a share to store virtual machines' data. The + system administrator defines a pool on the virtualization host + with the details of the share + (e.g. nfs.example.com:/path/to/share should be mounted on + /vm_data). When the pool is started, libvirt mounts the share + on the specified directory, just as if the system administrator + logged in and executed 'mount nfs.example.com:/path/to/share + /vmdata'. If the pool is configured to autostart, libvirt + ensures that the NFS share is mounted on the directory specified + when libvirt is started. + + + Once the pool is started, the files in the NFS share are + reported as volumes, and the storage volumes' paths may be + queried using the libvirt APIs. The volumes' paths can then be + copied into the section of a VM's XML definition describing the + source storage for the VM's block devices. In the case of NFS, + an application using the libvirt APIs can create and delete + volumes in the pool (files in the NFS share) up to the limit of + the size of the pool (the storage capacity of the share). Not + all pool types support creating and deleting volumes. Stopping + the pool (somewhat unfortunately referred to by virsh and the + API as "pool-destroy") undoes the start operation, in this case, + unmounting the NFS share. The data on the share is not modified + by the destroy operation, despite the name. See man virsh for + more details. + + + A second example is an iSCSI pool. A storage administrator + provisions an iSCSI target to present a set of LUNs to the host + running the VMs. When libvirt is configured to manage that + iSCSI target as a pool, libvirt will ensure that the host logs + into the iSCSI target and libvirt can then report the available + LUNs as storage volumes. The volumes' paths can be queried and + used in VM's XML definitions as in the NFS example. In this + case, the LUNs are defined on the iSCSI server, and libvirt + cannot create and delete volumes. + + + Storage pools and volumes are not required for the proper + operation of VMs. Pools and volumes provide a way for libvirt + to ensure that a particular piece of storage will be available + for a VM, but some administrators will prefer to manage their + own storage and VMs will operate properly without any pools or + volumes defined. On systems that do not use pools, system + administrators must ensure the availability of the VMs' storage + using whatever tools they prefer, for example, adding the NFS + share to the host's fstab so that the share is mounted at boot + time. + + + If at this point the value of pools and volumes over traditional + system administration tools is unclear, note that one of the + features of libvirt is its remote protocol, so it's possible to + manage all aspects of a virtual machine's lifecycle as well as + the configuration of the resources required by the VM. These + operations can be performed on a remote host entirely within the + libvirt API. In other words, a management application using + libvirt can enable a user to perform all the required tasks for + configuring the host for a VM: allocating resources, running the + VM, shutting it down and deallocating the resources, without + requiring shell access or any other control channel. + + + Libvirt supports the following storage pool types: + <ul> <li> <a href="#StorageBackendDir">Directory backend</a> -- 1.7.7.6

2 1

[libvirt] [PATCH] tests: avoid test failure on rawhide gnutls
by Eric Blake 02 Feb '12

02 Feb '12

I hit a VERY weird testsuite failure on rawhide, which included _binary_ output to stderr, followed by a hang waiting for me to type something! (Here, using ^@ for NUL): $ ./commandtest TEST: commandtest WARNING: gnome-keyring:: couldn't send data: Bad file descriptor .WARNING: gnome-keyring:: couldn't send data: Bad file descriptor .WARNING: gnome-keyring:: couldn't send data: Bad file descriptor WARNING: gnome-keyring:: couldn't send data: Bad file descriptor .8^@^@^@8^@^@^@^A^@^@^@^Bay^A^@^@^@)PRIVATE-GNOME-KEYRING-PKCS11-PROTOCOL-V-1 I finally traced it to the fact that gnome-keyring, called via gnutls_global_init which is turn called by virNetTLSInit, opens an internal fd that it expects to communicate to via a pthread_atfork handler (never mind that it violates POSIX by using non-async-signal-safe functions in that handler: https://bugzilla.redhat.com/show_bug.cgi?id=772320) Our problem stems from the fact that we pulled the rug out from under the library's expectations by closing an fd that it had just opened. While we aren't responsible for fixing the bugs in that pthread_atfork handler, we can at least avoid the bugs by not closing the fd in the first place. * tests/commandtest.c (mymain): Avoid closing fds that were opened by virInitialize. --- Pushing under the build-breaker rule. It cost me the better part of a morning to track this one down, so I left a super-long comment to help the next person to read the file understand what we're fighting against. tests/commandtest.c | 20 ++++++++++++++++++-- 1 files changed, 18 insertions(+), 2 deletions(-) diff --git a/tests/commandtest.c b/tests/commandtest.c index efc48fe..b4b6044 100644 --- a/tests/commandtest.c +++ b/tests/commandtest.c @@ -784,6 +784,22 @@ mymain(void) setpgid(0, 0); setsid(); + /* Our test expects particular fd values; to get that, we must not + * leak fds that we inherited from a lazy parent. At the same + * time, virInitialize may open some fds (perhaps via third-party + * libraries that it uses), and we must not kill off an fd that + * this process opens as it might break expectations of a + * pthread_atfork handler, as well as interfering with our tests + * trying to ensure we aren't leaking to our children. The + * solution is to do things in two phases - reserve the fds we + * want by overwriting any externally inherited fds, then + * initialize, then clear the slots for testing. */ + if ((fd = open("/dev/null", O_RDONLY)) < 0 || + dup2(fd, 3) < 0 || + dup2(fd, 4) < 0 || + dup2(fd, 5) < 0 || + (fd > 5 && VIR_CLOSE(fd) < 0)) + return EXIT_FAILURE; /* Prime the debug/verbose settings from the env vars, * since we're about to reset 'environ' */ @@ -791,8 +807,8 @@ mymain(void) virTestGetVerbose(); virInitialize(); - /* Kill off any inherited fds that might interfere with our - * testing. */ + + /* Phase two of killing interfering fds; see above. */ fd = 3; VIR_FORCE_CLOSE(fd); fd = 4; -- 1.7.7.5

3 3

[libvirt] [PATCH v3 0/7] Console corruption patchset
by Peter Krempa 02 Feb '12

02 Feb '12

This is the third version of this patchset, rebased, polisehd and tweaked after Eric's review. This series contains one new patch that enables reuse of code in patches later on. The qemu driver implementation of console handling is very similar to LXC's implementation, so porting this functionality to LXC should be trivial and I'll post a follow-up patch when the qemu's driver will be ok. Peter Krempa (7): pidfile: Make checking binary path in virPidFileRead optional Add flags for virDomainOpenConsole virsh: add support for VIR_DOMAIN_CONSOLE_* flags fdstream: Emit stream abort callback even if poll() doesnt. fdstream: Add internal callback on stream close util: Add helpers for safe domain console operations qemu: Add ability to abort existing console while creating new one configure.ac | 39 ++++- include/libvirt/libvirt.h.in | 12 ++ po/POTFILES.in | 1 + src/Makefile.am | 6 +- src/conf/virconsole.c | 396 ++++++++++++++++++++++++++++++++++++++++++ src/conf/virconsole.h | 36 ++++ src/fdstream.c | 89 +++++++++- src/fdstream.h | 11 ++ src/libvirt.c | 11 +- src/libvirt_private.syms | 6 + src/qemu/qemu_domain.c | 5 + src/qemu/qemu_domain.h | 3 + src/qemu/qemu_driver.c | 21 ++- src/util/virpidfile.c | 21 ++- tools/console.c | 5 +- tools/console.h | 3 +- tools/virsh.c | 24 ++- tools/virsh.pod | 8 +- 18 files changed, 660 insertions(+), 37 deletions(-) create mode 100644 src/conf/virconsole.c create mode 100644 src/conf/virconsole.h -- 1.7.3.4

2 13

[libvirt] link failure on RHEL 5
by Eric Blake 02 Feb '12

02 Feb '12

I haven't investigated what is missing in the Makefiles, but I'm getting link failures on RHEL 5: ../src/.libs/libvirt_driver_nwfilter.a(libvirt_driver_nwfilter_la-nwfilter_ebiptables_driver.o): In function `_printDataType': /home/dummy/libvirt/src/nwfilter/nwfilter_ebiptables_driver.c:306: undefined reference to `virMacAddrFormat' /home/dummy/libvirt/src/.libs/libvirt.so: undefined reference to `virMacAddrCompare' /home/dummy/libvirt/src/.libs/libvirt.so: undefined reference to `virMacAddrGenerate' -- Eric Blake eblake(a)redhat.com +1-919-301-3266 Libvirt virtualization library http://libvirt.org

1 1

[libvirt] Small postpone of the 0.9.10 freeze
by Daniel Veillard 02 Feb '12

02 Feb '12

I'm finally back from vacation, and looking at the list it seems there is many patches floating that should be pushed for 0.9.10 . I suggest then to take a few more days to try to push patches especially about APIs, and enter the freeze on Monday instead. So we have a couple more working days to try to push features to git before 0.9.10 freeze, Daniel -- Daniel Veillard | libxml Gnome XML XSLT toolkit http://xmlsoft.org/ daniel(a)veillard.com | Rpmfind RPM search engine http://rpmfind.net/ http://veillard.com/ | virtualization library http://libvirt.org/

1 0

[libvirt] [PATCHv3 0/4] API for modification of domain metadata
by Peter Krempa 02 Feb '12

02 Feb '12

This third version incorporates fixes of Eric's review and a rebase on the top of Jirka's new API. Differences to v2: xml: Add element <title> to allow short description of domains - Move <title> before <description> - fix tests to accomodate this - remove forgotten length limits from docs - fixed XML schema to work around libxml2 newline escape bug API: Add api to set and get domain metadata - added new remote procedures to remote_protocol-structs ( and installed tools to detect it in the future :( ) - Fixed function docs to accomodate new code semantics - Changed error message to sync with other API functions - Changed debug prints to print strings instead of pointers - Removed conditions forbidding expansion/work with newer versins - Changed RPC return type to nonnull_string virsh: Add support for modifying domain description and titles qemu: Add support for virDomainGetMetadata and virDomainSetMetadata - no changes docs/formatdomain.html.in | 8 +- docs/schemas/domaincommon.rng | 15 +- include/libvirt/libvirt.h.in | 24 ++ include/libvirt/virterror.h | 1 + src/conf/domain_conf.c | 11 + src/conf/domain_conf.h | 1 + src/driver.h | 16 ++ src/libvirt.c | 178 ++++++++++++ src/libvirt_public.syms | 2 + src/qemu/qemu_driver.c | 174 ++++++++++++ src/remote/remote_driver.c | 2 + src/remote/remote_protocol.x | 24 ++- src/remote_protocol-structs | 19 ++ src/util/virterror.c | 6 + .../qemu-simple-description-title.xml | 27 ++ tests/qemuxml2argvdata/qemuxml2argv-minimal.xml | 5 + tools/virsh.c | 283 ++++++++++++++++++-- tools/virsh.pod | 34 +++- 18 files changed, 806 insertions(+), 24 deletions(-) create mode 100644 tests/domainschemadata/qemu-simple-description-title.xml -- 1.7.3.4

3 14