- Devel - libvirt List Archives

[libvirt] [PATCH 1/5] Public API to allow defining new domain using OVA file
by Ata E Husain Bohra 11 Feb '13

11 Feb '13

Appends a new API to libvirt public driver that supports defining a new domain using OVA format. API expects following inputs: 1. connection pointer. 2. path to OVA package (single file format). 3. Storage pool name where new domain needs to be created. API returns pointers to newly created domain that is not powered ON. Libvirt driver sanitizes the inputs and calls hypervisor specific driver callbacks to abstract OVA install implementation. --- include/libvirt/libvirt.h.in | 3 +++ src/driver.h | 5 ++++ src/libvirt.c | 58 ++++++++++++++++++++++++++++++++++++++++++ src/libvirt_public.syms | 5 ++++ 4 files changed, 71 insertions(+) diff --git a/include/libvirt/libvirt.h.in b/include/libvirt/libvirt.h.in index 09c89c5..ea342bc 100644 --- a/include/libvirt/libvirt.h.in +++ b/include/libvirt/libvirt.h.in @@ -1919,6 +1919,9 @@ int virDomainMemoryPeek (virDomainPtr dom, */ virDomainPtr virDomainDefineXML (virConnectPtr conn, const char *xml); +virDomainPtr virDomainDefineOVA (virConnectPtr conn, + const char *ovapath, + const char *poolname); int virDomainUndefine (virDomainPtr domain); typedef enum { diff --git a/src/driver.h b/src/driver.h index 01c95cf..08382a0 100644 --- a/src/driver.h +++ b/src/driver.h @@ -274,6 +274,10 @@ typedef int typedef virDomainPtr (*virDrvDomainDefineXML) (virConnectPtr conn, const char *xml); +typedef virDomainPtr + (*virDrvDomainDefineOVA) (virConnectPtr conn, + const char *ovapath, + const char *poolname); typedef int (*virDrvDomainUndefine) (virDomainPtr dom); typedef int @@ -1008,6 +1012,7 @@ struct _virDriver { virDrvDomainCreate domainCreate; virDrvDomainCreateWithFlags domainCreateWithFlags; virDrvDomainDefineXML domainDefineXML; + virDrvDomainDefineOVA domainDefineOVA; virDrvDomainUndefine domainUndefine; virDrvDomainUndefineFlags domainUndefineFlags; virDrvDomainAttachDevice domainAttachDevice; diff --git a/src/libvirt.c b/src/libvirt.c index 6d1da12..bdc21b4 100644 --- a/src/libvirt.c +++ b/src/libvirt.c @@ -1988,6 +1988,8 @@ error: return NULL; } + + /** * virDomainCreateLinux: * @conn: pointer to the hypervisor connection @@ -8334,6 +8336,62 @@ error: } /** + * virDomainDefineOVA: + * @conn: pointer to the hypervisor connection + * @ovapath: OVA file path + * @poolname: storage pool where domain needs to be created + * + * OVA stands for Open Virtualuzation Archive and consist of + * three important components: + * 1. XML descriptor: defines the virtual machine hardware description, + * network connectivity etc. + * 2. Virtual disk (may be compressed or optimized). + * 3. Manifest file. + * + * Define a new domain but does not start it. + * This function may require privileged access to the hypervisor. + * + * Returns a new domain object or NULL in case of failure + */ +virDomainPtr +virDomainDefineOVA(virConnectPtr conn, const char *ovapath, + const char *poolname) +{ + VIR_DEBUG("conn=%p, ovaPath=%s, poolname=%s", + conn, ovapath, poolname); + + virResetLastError(); + + if (!VIR_IS_CONNECT(conn)) { + virLibConnError(VIR_ERR_INVALID_CONN, __FUNCTION__); + virDispatchError(NULL); + return NULL; + } + if (conn->flags & VIR_CONNECT_RO) { + virLibConnError(VIR_ERR_OPERATION_DENIED, __FUNCTION__); + goto error; + } + virCheckNonNullArgGoto(ovapath, error); + virCheckNonNullArgGoto(poolname, error); + + if (conn->driver->domainDefineOVA) { + virDomainPtr ret; + ret = conn->driver->domainDefineOVA( + conn, ovapath, poolname); + if (!ret) + goto error; + return ret; + } + + virLibConnError(VIR_ERR_NO_SUPPORT, __FUNCTION__); + +error: + virDispatchError(conn); + return NULL; + +} + +/** * virDomainCreate: * @domain: pointer to a defined domain * diff --git a/src/libvirt_public.syms b/src/libvirt_public.syms index 2107519..1af48c9 100644 --- a/src/libvirt_public.syms +++ b/src/libvirt_public.syms @@ -585,4 +585,9 @@ LIBVIRT_1.0.2 { virDomainOpenChannel; } LIBVIRT_1.0.1; +LIBVIRT_1.0.3 { + global: + virDomainDefineOVA; +} LIBVIRT_1.0.2; + # .... define new API here using predicted next version number .... -- 1.7.9.5

3 3

[libvirt] Environment variable CLASSPATH not set!
by harryxiyou 09 Feb '13

09 Feb '13

Hi all, We are developing a hdfs-based File system, which is HLFS( http://code.google.com/p/cloudxy/wiki/WHAT_IS_CLOUDXY) Now, we have developed HLFS driver for Libvirt.You can find our patch for Libvirt network disk (Online storage) here http://cloudxy.googlecode.com/svn/branches/hlfs/person/harry/hlfs/patches/h… But when i boot a VM from a base linux OS, which the OS have been installed into our HLFS block device at first. However, it(HDFS or JVM) says i have not set the CLASSPATH like following. [...] uri:hdfs:///tmp/testenv/testfs,head:hdfs,dir:/tmp/testenv,fsname:testfs,hostname:default,port:0,user:kanghua Environment variable CLASSPATH not set! ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ fs is null, hdfsConnect error! [...] Actually, i have set CLASSPATH in ~/.bashrc like following. I have installed CDH3u2 for developing. I can do other hdfs jobs successfully. $ cat /home/jiawei/.bashrc [...] export HLFS_HOME=/home/jiawei/workshop3/hlfs export LOG_HOME=$HLFS_HOME/3part/log export SNAPPY_HOME=$HLFS_HOME/3part/snappy export HADOOP_HOME=$HLFS_HOME/3part/hadoop export JAVA_HOME=/usr/lib/jvm/java-6-sun export PATH=/usr/bin/:/usr/local/bin/:/bin/:/usr/sbin/:/sbin/:$JAVA_HOME/bin/ #export LD_LIBRARY_PATH=$JAVAHOME/lib export LD_LIBRARY_PATH=$JAVA_HOME/jre/lib/i386/server/:$HADOOP_HOME/lib32/:$LOG_HOME/lib32/:$SNAPPY_HOME/lib32/:$HLFS_HOME/output/lib32/:/usr/lib/ export PKG_CONFIG_PATH=/usr/lib/pkgconfig/:/usr/share/pkgconfig/ export CFLAGS="-L/usr/lib -L/lib -L/usr/lib64" export CXXFLAGS="-L/usr/lib -L/lib" export CLASSPATH=.:$JAVA_HOME/lib/dt.jar:$JAVA_HOME/lib/htmlconverter.jar:$JAVA_HOME/lib/jconsole.jar:$JAVA_HOME/lib/jconsole.jar:$JAVA_HOME/lib/tools.jar:$JAVA_HOME/jre/lib/charsets.jar:$JAVA_HOME/jre/lib/deploy.jar:$JAVA_HOME/jre/lib/javaws.jar:$JAVA_HOME/jre/lib/jce.jar:$JAVA_HOME/jre/lib/jsse.jar:$JAVA_HOME/jre/lib/management-agent.jar:$JAVA_HOME/jre/lib/plugin.jar:$JAVA_HOME/jre/lib/resources.jar:$JAVA_HOME/jre/lib/rt.jar:$JAVA_HOME/jre/lib/:$JAVA_HOME/lib/:/usr/lib/hadoop-0.20/conf:/usr/lib/jvm/java-6-sun/lib/tools.jar:/usr/lib/hadoop-0.20:/usr/lib/hadoop-0.20/hadoop-core-0.20.2-cdh3u2.jar:/usr/lib/hadoop-0.20/lib/ant-contrib-1.0b3.jar:/usr/lib/hadoop-0.20/lib/aspectjrt-1.6.5.jar:/usr/lib/hadoop-0.20/lib/aspectjtools-1.6.5.jar:/usr/lib/hadoop-0.20/lib/commons-cli-1.2.jar:/usr/lib/hadoop-0.20/lib/commons-codec-1.4.jar:/usr/lib/hadoop-0.20/lib/commons-daemon-1.0.1.jar:/usr/lib/hadoop-0.20/lib/commons-el-1.0.jar:/usr/lib/hadoop-0.20/lib/commons-httpclient-3.1.jar:/usr/lib/hadoop-0.20/lib/commons-logging-1.0.4.jar:/usr/lib/hadoop-0.20/lib/commons-logging-api-1.0.4.jar:/usr/lib/hadoop-0.20/lib/commons-net-1.4.1.jar:/usr/lib/hadoop-0.20/lib/core-3.1.1.jar:/usr/lib/hadoop-0.20/lib/hadoop-fairscheduler-0.20.2-cdh3u2.jar:/usr/lib/hadoop-0.20/lib/hsqldb-1.8.0.10.jar:/usr/lib/hadoop-0.20/lib/jackson-core-asl-1.5.2.jar:/usr/lib/hadoop-0.20/lib/jackson-mapper-asl-1.5.2.jar:/usr/lib/hadoop-0.20/lib/jasper-compiler-5.5.12.jar:/usr/lib/hadoop-0.20/lib/jasper-runtime-5.5.12.jar:/usr/lib/hadoop-0.20/lib/jets3t-0.6.1.jar:/usr/lib/hadoop-0.20/lib/jetty-6.1.26.cloudera.1.jar:/usr/lib/hadoop-0.20/lib/jetty-servlet-tester-6.1.26.cloudera.1.jar:/usr/lib/hadoop-0.20/lib/jetty-util-6.1.26.cloudera.1.jar:/usr/lib/hadoop-0.20/lib/jsch-0.1.42.jar:/usr/lib/hadoop-0.20/lib/junit-4.5.jar:/usr/lib/hadoop-0.20/lib/kfs-0.2.2.jar:/usr/lib/hadoop-0.20/lib/log4j-1.2.15.jar:/usr/lib/hadoop-0.20/lib/mockito-all-1.8.2.jar:/usr/lib/hadoop-0.20/lib/oro-2.0.8.jar:/usr/lib/hadoop-0.20/lib/servlet-api-2.5-20081211.jar:/usr/lib/hadoop-0.20/lib/servlet-api-2.5-6.1.14.jar:/usr/lib/hadoop-0.20/lib/slf4j-api-1.4.3.jar:/usr/lib/hadoop-0.20/lib/slf4j-log4j12-1.4.3.jar:/usr/lib/hadoop-0.20/lib/xmlenc-0.52.jar:/usr/lib/hadoop-0.20/lib/jsp-2.1/jsp-2.1.jar:/usr/lib/hadoop-0.20/lib/jsp-2.1/jsp-api-2.1.jar I have reproted this matter as an issue to handle, which you can see http://code.google.com/p/cloudxy/issues/detail?id=37 for details. I have seen libvirt source codes for this problem, i find it may lead to by following problems. 1, Some changes made by gnulib, which i find gnulib has some files and funcs have done some jobs for CLASSPATH like csharpexec.c, javacomp.c, javaexec.c, etc. 2, After i compile libvirt source codes, i get virsh script, which has a variable named 'relink_command' that has been set some libraries and paths permanently. 3, Maybe some other reasons. Could anyone give me some suggestions? How could i solve this problem? Thanks a lot in advance ;-) -- Thanks Harry Wei

1 0

[libvirt] [PATCH 0/4] fix yet another regression due to my backingChain rewrite
by Eric Blake 09 Feb '13

09 Feb '13

https://bugzilla.redhat.com/show_bug.cgi?id=903248 details a regression that I caused, which is tickled by the odd way in which VDSM uses (abuses?) symlinks to qcow2 files with relative backing file names. The first two patches are quite trivial; the third a bit longer but still straightforward; and the meat of the series is the fourth patch. Meanwhile, I know of at least one other regression that I still need to fix in the same area of code: https://bugzilla.redhat.com/show_bug.cgi?id=896685 is caused when cgroups are not present (such as in qemu:///session); I hope to patch that one tomorrow. Eric Blake (4): storage: factor out large integer reads storage: rearrange functions storage: refactor metadata lookup storage: don't follow backing chain symlinks too eagerly src/util/virstoragefile.c | 475 +++++++++++++++++++++++----------------------- src/util/virstoragefile.h | 1 + 2 files changed, 240 insertions(+), 236 deletions(-) -- 1.8.1

2 11

[libvirt] [PATCH] fix a bug of sheepdog storage driver
by harryxiyou＠gmail.com 09 Feb '13

09 Feb '13

Don't try to refresh Sheepdog volume if creating volume fails. Signed-off-by: Harry Wei <harryxiyou(a)gmail.com> --- src/storage/storage_backend_sheepdog.c | 10 +++++++--- 1 files changed, 7 insertions(+), 3 deletions(-) diff --git a/src/storage/storage_backend_sheepdog.c b/src/storage/storage_backend_sheepdog.c index cd18f33..218284d 100644 --- a/src/storage/storage_backend_sheepdog.c +++ b/src/storage/storage_backend_sheepdog.c @@ -156,7 +156,7 @@ virStorageBackendSheepdogCreateVol(virConnectPtr conn ATTRIBUTE_UNUSED, virStorageVolDefPtr vol) { - int ret; + int ret = -1; if (vol->target.encryption != NULL) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", @@ -167,10 +167,14 @@ virStorageBackendSheepdogCreateVol(virConnectPtr conn ATTRIBUTE_UNUSED, virCommandPtr cmd = virCommandNewArgList(COLLIE, "vdi", "create", vol->name, NULL); virCommandAddArgFormat(cmd, "%llu", vol->capacity); virStorageBackendSheepdogAddHostArg(cmd, pool); - ret = virCommandRun(cmd, NULL); + if (virCommandRun(cmd, NULL) < 0) + goto cleanup; - virStorageBackendSheepdogRefreshVol(conn, pool, vol); + if (virStorageBackendSheepdogRefreshVol(conn, pool, vol) < 0) + goto cleanup; + ret = 0; +cleanup: virCommandFree(cmd); return ret; } -- 1.7.0.4

4 3

[libvirt] [PATCH 00/15] Permit setting capabilities for uid!=0 processes
by Laine Stump 08 Feb '13

08 Feb '13

There are a bunch of patches here, but each is small and single-purpose to make reviewing easier (and also so that any potential regressions can be easily bisected). The original purpose of the patches was to permit setting CAP_COMPROMISE_KERNEL for non-root qemu processes, since Fedora 18 now requires that in order for generic PCI passthrough to work (the alternative was to always run qemu as root). Although we may not actually want to do that part (if we can convince kernel people to implement CAP_COMPROMISE_KERNEL such that it's only required when *opening* the necessary sysfs file (done by libvirt), rather than for every read/write (done by qemu), then we will not need CAP_COMPROMISE_KERNEL for qemu), but that is just a couple lines in the final patch, and the rest of the series is still useful, as it make dropping/keeping caps truly work for non-root child processes - this has never before been the case. (for example, CAP_SYS_RAWIO is needed for generic scsi passthrough to work, and until now the only way to have that was to run *all* qemus as root). A bit higher level description of what I've done with all the patches: 1) remove the programmable "hook" from virExecWithHook(), since that function was only called from one place, and always with the same hook function. Rename virExecWithHook() to virExec(), and replace the call to that hook with inline code. 2) give virCommand an API to set the intended uid/gid of the command that's going to be run, and use that instead of a "user hook" where appropriate (in the process completely eliminating two hook functions). 3) Also add an API to virCommand to do the final "set the process label" step for selinux/apparmor. 4) Add a new API to the security driver (and use it from qemu) called virSecurityManagerSetChildProcessLabel() which a) is called prior to virCommandRun() rather than from a command "hook" function, b) takes a virCommand, and c) rather than immediately performing the operation (as virSecurityManagerSetProcessLabel() did), merely stores the necessary information in the virCommand so that virExec can perform the operation (setting selinux label, setuid/gid, etc) 5) make a new function combining the setting of uid/gid and maintaining of capabilities, because that is the only way you can set uid!=0 and still maintain capabilities. Use this in virExec() 6) *Finally* set the CAP_COMPROMISE_KERNEL capability unconditionally for all qemu processes. (If we really do have to do this, we may want to consider making it a qemu.conf setting). Laine Stump (15): util: eliminate generic hook from virExecWithHook util: eliminate extra args from virExec util: refactor virCommandHook into virExec and virCommandHandshakeChild util: add virCommandSetUID and virCommandSetGID util: make virSetUIDGID a NOP when uid or gid is -1 qemu: replace exec hook with virCommandSetUID/GID in qemuCaps* qemu: replace exec hook with virCommandSetUID/GID in storage_backend build: define SECDRIVER_LIBS in Makefile.am util: add security label setting to virCommand security: add new virSecurityManagerSetChildProcessLabel API qemu: let virCommand set child process security labels/uid/gid util: drop capabilities immediately after changing uid/gid of child util: virSetUIDGIDWithCaps - change uid while keeping caps util: maintain caps when running command with uid != 0 qemu: set CAP_COMPROMISE_KERNEL so that pci passthrough works src/Makefile.am | 35 ++- src/libvirt_private.syms | 5 + src/qemu/qemu_capabilities.c | 61 ++--- src/qemu/qemu_process.c | 23 +- src/security/security_apparmor.c | 41 +++- src/security/security_dac.c | 24 +- src/security/security_driver.h | 6 +- src/security/security_manager.c | 13 +- src/security/security_manager.h | 6 +- src/security/security_nop.c | 10 +- src/security/security_selinux.c | 34 ++- src/security/security_stack.c | 20 +- src/storage/storage_backend.c | 28 +-- src/util/vircommand.c | 481 ++++++++++++++++++--------------------- src/util/vircommand.h | 9 +- src/util/virutil.c | 113 ++++++++- src/util/virutil.h | 1 + 17 files changed, 543 insertions(+), 367 deletions(-) -- 1.8.1

3 36

[libvirt] [PATCH] qemu: support vhost-net for generic ethernet devices
by Laine Stump 08 Feb '13

08 Feb '13

>From qemu's point of view these are still just tap devices, so there's no reason they shouldn't work with vhost-net; as a matter of fact, Raja Sivaramakrishnan <srajag00(a)yahoo.com> verified on libvir-list that at least the qemu_command.c part of this patch works: https://www.redhat.com/archives/libvir-list/2012-December/msg01314.html (the hotplug case is extrapolation on my part). --- src/qemu/qemu_command.c | 1 + src/qemu/qemu_hotplug.c | 3 +++ 2 files changed, 4 insertions(+) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 33f2ecd..6c28123 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -6159,6 +6159,7 @@ qemuBuildCommandLine(virConnectPtr conn, if (actualType == VIR_DOMAIN_NET_TYPE_NETWORK || actualType == VIR_DOMAIN_NET_TYPE_BRIDGE || + actualType == VIR_DOMAIN_NET_TYPE_ETHERNET || actualType == VIR_DOMAIN_NET_TYPE_DIRECT) { /* Attempt to use vhost-net mode for these types of network device */ diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index 4504f0b..0c28a6a 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -754,6 +754,9 @@ int qemuDomainAttachNetDevice(virConnectPtr conn, iface_connected = true; if (qemuOpenVhostNet(vm->def, net, priv->qemuCaps, &vhostfd) < 0) goto cleanup; + } else if (actualType == VIR_DOMAIN_NET_TYPE_ETHERNET) { + if (qemuOpenVhostNet(vm->def, net, priv->qemuCaps, &vhostfd) < 0) + goto cleanup; } if (virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_NET_NAME) || -- 1.7.11.7

2 2

[libvirt] [PATCH] network_conf.c: Free xmlDoc after use
by Michal Privoznik 08 Feb '13

08 Feb '13

The virNetworkObjUpdateParseFile() function was not freeing the xml variable, leaving us with a memory leak. --- src/conf/network_conf.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/conf/network_conf.c b/src/conf/network_conf.c index c93916d..3604ff7 100644 --- a/src/conf/network_conf.c +++ b/src/conf/network_conf.c @@ -1895,6 +1895,7 @@ virNetworkObjUpdateParseFile(const char *filename, ret = 0; cleanup: + xmlFreeDoc(xml); xmlXPathFreeContext(ctxt); return ret; } -- 1.8.0.2

3 3

[libvirt] [PATCH] virsh-snapshot: Fix xpath query to determine snapshot state
by Peter Krempa 08 Feb '13

08 Feb '13

The query didn't match the external state correctly for offline internal snapshots. --- tools/virsh-snapshot.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/virsh-snapshot.c b/tools/virsh-snapshot.c index ba57059..66776e2 100644 --- a/tools/virsh-snapshot.c +++ b/tools/virsh-snapshot.c @@ -983,8 +983,8 @@ cmdSnapshotInfo(vshControl *ctl, const vshCmd *cmd) * external snapshot. */ switch (virXPathBoolean("boolean(/domainsnapshot/memory)", ctxt)) { case 1: - external = virXPathBoolean("boolean(/domainsnapshot/memory/@snapshot=external " - "| /domainsnapshot/disks/disk/@snapshot=external)", + external = virXPathBoolean("boolean(/domainsnapshot/memory[@snapshot='external'] " + "| /domainsnapshot/disks/disk[@snapshot='external'])", ctxt); break; case 0: -- 1.8.1.1

2 2

[libvirt] [PATCH V3 0/2] Add support for QEMU file descriptor sets
by Stefan Berger 08 Feb '13

08 Feb '13

The following patch series adds initial support for QEMU file descriptor sets implementing support for creating the proper command line. Some devices are using the sets now. Regards, Stefan

3 11

[libvirt] Why not add snapshot operations for Sheepdog storage driver in Libvirt
by harryxiyou 08 Feb '13

08 Feb '13

Hi all, Virsh has following operations about snapshot. Snapshot (help keyword 'snapshot') snapshot-create Create a snapshot from XML snapshot-create-as Create a snapshot from a set of args snapshot-current Get or set the current snapshot snapshot-delete Delete a domain snapshot snapshot-dumpxml Dump XML for a domain snapshot snapshot-edit edit XML for a snapshot snapshot-info snapshot information snapshot-list List snapshots for a domain snapshot-parent Get the name of the parent of a snapshot snapshot-revert Revert a domain to a snapshot But i cannot find relevant realization in Sheepdog storage driver in Libvirt. I am sure Sheepdog storage driver, now, cannot support snapshot operations in Libvirt. I wonder whether Sheepdog can realize snapshot operations in Libvirt? Maybe i can finish these jobs. I am not clear about how to let Sheepdog storage driver support snapshot operations. Could anyone give me some suggestions? Thanks in advance. -- Thanks Harry Wei

2 1

[libvirt] [PATCH] fix some bugs of sheepdog storage driver
by harryxiyou＠gmail.com 08 Feb '13

08 Feb '13

Signed-off-by: Harry Wei <harryxiyou(a)gmail.com> --- src/storage/storage_backend_sheepdog.c | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/src/storage/storage_backend_sheepdog.c b/src/storage/storage_backend_sheepdog.c index 218284d..1ce5aa4 100644 --- a/src/storage/storage_backend_sheepdog.c +++ b/src/storage/storage_backend_sheepdog.c @@ -120,6 +120,8 @@ virStorageBackendSheepdogRefreshPool(virConnectPtr conn ATTRIBUTE_UNUSED, virCommandPtr cmd; cmd = virCommandNewArgList(COLLIE, "node", "info", "-r", NULL); + if (cmd == NULL) + return -1; virStorageBackendSheepdogAddHostArg(cmd, pool); virCommandSetOutputBuffer(cmd, &output); ret = virCommandRun(cmd, NULL); @@ -142,6 +144,8 @@ virStorageBackendSheepdogDeleteVol(virConnectPtr conn ATTRIBUTE_UNUSED, virCheckFlags(0, -1); virCommandPtr cmd = virCommandNewArgList(COLLIE, "vdi", "delete", vol->name, NULL); + if (cmd == NULL) + return -1; virStorageBackendSheepdogAddHostArg(cmd, pool); int ret = virCommandRun(cmd, NULL); @@ -165,6 +169,8 @@ virStorageBackendSheepdogCreateVol(virConnectPtr conn ATTRIBUTE_UNUSED, } virCommandPtr cmd = virCommandNewArgList(COLLIE, "vdi", "create", vol->name, NULL); + if (cmd == NULL) + return -1; virCommandAddArgFormat(cmd, "%llu", vol->capacity); virStorageBackendSheepdogAddHostArg(cmd, pool); if (virCommandRun(cmd, NULL) < 0) @@ -251,6 +257,8 @@ virStorageBackendSheepdogRefreshVol(virConnectPtr conn ATTRIBUTE_UNUSED, char *output = NULL; virCommandPtr cmd = virCommandNewArgList(COLLIE, "vdi", "list", vol->name, "-r", NULL); + if (cmd == NULL) + return -1; virStorageBackendSheepdogAddHostArg(cmd, pool); virCommandSetOutputBuffer(cmd, &output); ret = virCommandRun(cmd, NULL); @@ -293,6 +301,8 @@ virStorageBackendSheepdogResizeVol(virConnectPtr conn ATTRIBUTE_UNUSED, virCheckFlags(0, -1); virCommandPtr cmd = virCommandNewArgList(COLLIE, "vdi", "resize", vol->name, NULL); + if (cmd == NULL) + return -1; virCommandAddArgFormat(cmd, "%llu", capacity); virStorageBackendSheepdogAddHostArg(cmd, pool); int ret = virCommandRun(cmd, NULL); -- 1.7.0.4

2 1

[libvirt] [PATCH] fix some bugs of sheepdog storage driver
by harryxiyou＠gmail.com 08 Feb '13

08 Feb '13

Don't try to do other jobs if get cmd NULL. Signed-off-by: Harry Wei <harryxiyou(a)gmail.com> --- src/storage/storage_backend_sheepdog.c | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/src/storage/storage_backend_sheepdog.c b/src/storage/storage_backend_sheepdog.c index 218284d..1ce5aa4 100644 --- a/src/storage/storage_backend_sheepdog.c +++ b/src/storage/storage_backend_sheepdog.c @@ -120,6 +120,8 @@ virStorageBackendSheepdogRefreshPool(virConnectPtr conn ATTRIBUTE_UNUSED, virCommandPtr cmd; cmd = virCommandNewArgList(COLLIE, "node", "info", "-r", NULL); + if (cmd == NULL) + return -1; virStorageBackendSheepdogAddHostArg(cmd, pool); virCommandSetOutputBuffer(cmd, &output); ret = virCommandRun(cmd, NULL); @@ -142,6 +144,8 @@ virStorageBackendSheepdogDeleteVol(virConnectPtr conn ATTRIBUTE_UNUSED, virCheckFlags(0, -1); virCommandPtr cmd = virCommandNewArgList(COLLIE, "vdi", "delete", vol->name, NULL); + if (cmd == NULL) + return -1; virStorageBackendSheepdogAddHostArg(cmd, pool); int ret = virCommandRun(cmd, NULL); @@ -165,6 +169,8 @@ virStorageBackendSheepdogCreateVol(virConnectPtr conn ATTRIBUTE_UNUSED, } virCommandPtr cmd = virCommandNewArgList(COLLIE, "vdi", "create", vol->name, NULL); + if (cmd == NULL) + return -1; virCommandAddArgFormat(cmd, "%llu", vol->capacity); virStorageBackendSheepdogAddHostArg(cmd, pool); if (virCommandRun(cmd, NULL) < 0) @@ -251,6 +257,8 @@ virStorageBackendSheepdogRefreshVol(virConnectPtr conn ATTRIBUTE_UNUSED, char *output = NULL; virCommandPtr cmd = virCommandNewArgList(COLLIE, "vdi", "list", vol->name, "-r", NULL); + if (cmd == NULL) + return -1; virStorageBackendSheepdogAddHostArg(cmd, pool); virCommandSetOutputBuffer(cmd, &output); ret = virCommandRun(cmd, NULL); @@ -293,6 +301,8 @@ virStorageBackendSheepdogResizeVol(virConnectPtr conn ATTRIBUTE_UNUSED, virCheckFlags(0, -1); virCommandPtr cmd = virCommandNewArgList(COLLIE, "vdi", "resize", vol->name, NULL); + if (cmd == NULL) + return -1; virCommandAddArgFormat(cmd, "%llu", capacity); virStorageBackendSheepdogAddHostArg(cmd, pool); int ret = virCommandRun(cmd, NULL); -- 1.7.0.4

3 2

Re: [libvirt] [Patch]Fix bugs of Sheepdog storage driver
by harryxiyou 08 Feb '13

08 Feb '13

On Fri, Feb 8, 2013 at 1:06 PM, Osier Yang <jyang(a)redhat.com> wrote: [...] > Google Groups小组敬上 > > That's bad if one could get one notice like this each time after > reviewing your patch. :-) Not sure how to get rid of this, but > I think it's caused by the permission, so please either change > the google group to public, or don't cc to the list when posting > patch. > Thanks, it's because i add "cloudxy(a)googlegroups.com" ML to the CC'ed list. >> You sent same patch multiple times. It might be caused by the mail >> delay though, I.E, you don't see the one sent out earlier. Perhaps >> you should check you mailbox setting to avoid the small flood. >> Sorry, i am not familiar with 'git send-email --compose' well. So it sends several times. I will fix this problem. [...] >> So, consider to change the commit log to: >> >> Don't try to refresh the volume if creating volume fails. This one is well for me, thanks. >>> >>> Signed-off-by: Harry Wei<harryxiyou(a)gmail.com> >>> --- >>> src/storage/storage_backend_sheepdog.c | 5 ++++- >>> 1 files changed, 4 insertions(+), 1 deletions(-) >>> >>> diff --git a/src/storage/storage_backend_sheepdog.c >>> b/src/storage/storage_backend_sheepdog.c >>> index cd18f33..f987604 100644 >>> --- a/src/storage/storage_backend_sheepdog.c >>> +++ b/src/storage/storage_backend_sheepdog.c >>> @@ -168,9 +168,12 @@ virStorageBackendSheepdogCreateVol(virConnectPtr >>> conn ATTRIBUTE_UNUSED, >>> virCommandAddArgFormat(cmd, "%llu", vol->capacity); >>> virStorageBackendSheepdogAddHostArg(cmd, pool); >>> ret = virCommandRun(cmd, NULL); >>> + if (ret< 0) >>> + goto cleanup; >> >> >> We prefer: >> >> if ((ret = virCommandRun(cmd, NULL)) < 0) >> goto cleanup; >> >> However, you can avoid using the "ret" here by initialize it >> to "-1", with that you can simply do: >> >> if (virCommandRun(cmd, NULL) < 0) >> goto cleanup; >> >>> >>> - virStorageBackendSheepdogRefreshVol(conn, pool, vol); >>> + ret = virStorageBackendSheepdogRefreshVol(conn, pool, vol); >> >> >> And: >> >> if (virStorageBackendSheepdogRefreshVol(conn, pool, vol) < 0) >> goto cleanup; >> >> ret = 0; >> >>> >>> +cleanup: >>> virCommandFree(cmd); >>> return ret; >>> } We cannot do like [...] if (virCommandRun(cmd, NULL) < 0) goto cleanup; [...] if (virStorageBackendSheepdogRefreshVol(conn, pool, vol) < 0) goto cleanup; [...] +cleanup: virCommandFree(cmd); return ret; We must initialize "ret", because if either virCommandRun and virStorageBackendSheepdogRefreshVol has some errors, they will return '-1' to "ret". Then execute "return ret", which who calls virStorageBackendSheepdogCreateVol will know it has happened some errors. So we should modify them like this. [...] if ((ret = virCommandRun(cmd, NULL)) < 0) goto cleanup; [...] if (ret = virStorageBackendSheepdogRefreshVol(conn, pool, vol)) < 0) goto cleanup; cleanup: virCommandFree(cmd); return ret; } Osier Yang, do you agree with me? -- Thanks Harry Wei

2 4

[libvirt] [PATCH 0/3] Make access to virCapsPtr threadsafe in QEMU
by Daniel P. Berrange 08 Feb '13

08 Feb '13

The 'caps' object in virQEMUDriverPtr can be re-created at any time, so currently any access is protected by the 'driver' lock. This is really bad for concurrency, since the 'caps' object is used all over the place. This series refactors the QEMU driver so that this is a reference counted object. The lock is now only required while obtaining a reference to the object. This will let us remove the QEMU driver lock from much code in the future.

2 10

[libvirt] [Patch]Fix bugs of Sheepdog storage driver
by harryxiyou＠gmail.com 08 Feb '13

08 Feb '13

virStorageBackendSheepdogCreateVol calls virCommandRun whihout checking the return value, which this return value determines us whether we should call virStorageBackendSheepdogRefreshVol func. And we should also give a return value to virStorageBackendSheepdogRefreshVol func because it may cause errors. Following patch can fix these bugs. This patch have checked by 'make syntax-check'. Signed-off-by: Harry Wei <harryxiyou(a)gmail.com> --- src/storage/storage_backend_sheepdog.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/src/storage/storage_backend_sheepdog.c b/src/storage/storage_backend_sheepdog.c index cd18f33..f987604 100644 --- a/src/storage/storage_backend_sheepdog.c +++ b/src/storage/storage_backend_sheepdog.c @@ -168,9 +168,12 @@ virStorageBackendSheepdogCreateVol(virConnectPtr conn ATTRIBUTE_UNUSED, virCommandAddArgFormat(cmd, "%llu", vol->capacity); virStorageBackendSheepdogAddHostArg(cmd, pool); ret = virCommandRun(cmd, NULL); + if (ret < 0) + goto cleanup; - virStorageBackendSheepdogRefreshVol(conn, pool, vol); + ret = virStorageBackendSheepdogRefreshVol(conn, pool, vol); +cleanup: virCommandFree(cmd); return ret; } -- 1.7.0.4

2 2

[libvirt] [Patch]Fix bugs of Sheepdog storage driver
by harryxiyou＠gmail.com 08 Feb '13

08 Feb '13

diff --git a/src/storage/storage_backend_sheepdog.c b/src/storage/storage_backend_sheepdog.c index cd18f33..f987604 100644 --- a/src/storage/storage_backend_sheepdog.c +++ b/src/storage/storage_backend_sheepdog.c @@ -168,9 +168,12 @@ virStorageBackendSheepdogCreateVol(virConnectPtr conn ATTRIBUTE_UNUSED, virCommandAddArgFormat(cmd, "%llu", vol->capacity); virStorageBackendSheepdogAddHostArg(cmd, pool); ret = virCommandRun(cmd, NULL); + if (ret < 0) + goto cleanup; - virStorageBackendSheepdogRefreshVol(conn, pool, vol); + ret = virStorageBackendSheepdogRefreshVol(conn, pool, vol); +cleanup: virCommandFree(cmd); return ret; } -- 1.7.0.4

1 0

[libvirt] [Patch]Fix a bug of Sheepdog storage driver
by harryxiyou＠gmail.com 08 Feb '13

08 Feb '13

Signed-off-by: Harry Wei <harryxiyou(a)gmail.com> --- src/storage/storage_backend_sheepdog.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/src/storage/storage_backend_sheepdog.c b/src/storage/storage_backend_sheepdog.c index cd18f33..f987604 100644 --- a/src/storage/storage_backend_sheepdog.c +++ b/src/storage/storage_backend_sheepdog.c @@ -168,9 +168,12 @@ virStorageBackendSheepdogCreateVol(virConnectPtr conn ATTRIBUTE_UNUSED, virCommandAddArgFormat(cmd, "%llu", vol->capacity); virStorageBackendSheepdogAddHostArg(cmd, pool); ret = virCommandRun(cmd, NULL); + if (ret < 0) + goto cleanup; - virStorageBackendSheepdogRefreshVol(conn, pool, vol); + ret = virStorageBackendSheepdogRefreshVol(conn, pool, vol); +cleanup: virCommandFree(cmd); return ret; } -- 1.7.0.4

1 0

[libvirt] [PATCH v2 0/5] cgroup refactor
by Hu Tao 08 Feb '13

08 Feb '13

This series refactors cgroup code to: - provide lazy creation of cgroup directories, despite of what level they are. - remove cgroup directories if no one is using the corresponding virCgroup. This series is splitted in a manner for easier review. Patch 2 is the main implementation. Patch 3, 4, 5 should have been squashed into one in order to build, but harder to review. Hu Tao (5): refactor virCgroupDetectMounts and virCgroupDetectPlacement cgroup: refactor virCgroup cgroup: replace old cgroup qemu: replace old cgroup lxc: replace old cgroup src/conf/domain_conf.h | 5 + src/libvirt_private.syms | 7 +- src/lxc/lxc_cgroup.c | 40 +- src/lxc/lxc_cgroup.h | 2 +- src/lxc/lxc_controller.c | 31 +- src/lxc/lxc_driver.c | 177 +++---- src/lxc/lxc_process.c | 19 +- src/qemu/qemu_cgroup.c | 162 +++--- src/qemu/qemu_cgroup.h | 3 +- src/qemu/qemu_driver.c | 351 +++++-------- src/qemu/qemu_hotplug.c | 21 +- src/qemu/qemu_migration.c | 20 +- src/qemu/qemu_process.c | 7 +- src/util/vircgroup.c | 1263 +++++++++++++++++++++------------------------ src/util/vircgroup.h | 19 +- 15 files changed, 921 insertions(+), 1206 deletions(-) -- 1.8.0.1.240.ge8a1f5a

2 7

[libvirt] [PATCH 00/13] Resolve resource leaks found by Valgrind
by John Ferlan 07 Feb '13

07 Feb '13

This set of patches resolves issues seen in the Valgrind tests. The update to the .valgrind.supp file is from my environment and is very basic. Some paths in the previous version don't exist anymore. Based on recent (and continuing) commandtest failures, adjustments still may be necessary depending on environment. To assist in that I also updated the hacking document to describe a bit more about the Valgrind tests with respect to success, failure, and false positives. In particular, how to hopefully recognize each and decide whether what's seen is a false positive. Prior to the recent vircommand and commandtest changes, the commandtest was passing, but now it fails. The failure may be related to: https://www.redhat.com/archives/libvir-list/2013-February/msg00269.html I spent some time looking at the output, but could not figure out a root cause. I'll keep trying, but figured at the very least the other changes are still valid. John Ferlan (13): virnettlscontexttest: Resolve memory leak found by Valgrind qemuxml2argvtest: Resolve resource leaks found by Valgrind netdev_vlan_conf: Resolve memory leak found by Valgrind. vport_profile_conf: Resolve memory leak found by Valgrind domain_conf: Resolve resource leaks found by Valgrind qemu_command: Resolve resource leaks found by Valgrind qemumonitorjsontest: Resolve resource leaks found by Valgrind qemumonitortestutils: Resolve resource leaks found by Valgrind virnetttlcontext: Resolve issues found by Valgrind valgrind: Adjust the suppression file hacking: Add more information about Valgrind HACKING: Sync with docs/hacking.html.in cfg.mk: Add hacking.in.html to sc_prohibit_raw_allocation HACKING | 93 ++++++++++- cfg.mk | 2 +- docs/hacking.html.in | 96 +++++++++++- src/conf/domain_conf.c | 12 +- src/conf/netdev_vlan_conf.c | 3 +- src/conf/netdev_vport_profile_conf.c | 1 + src/qemu/qemu_command.c | 68 ++++---- src/rpc/virnettlscontext.c | 4 +- tests/.valgrind.supp | 292 +++++++---------------------------- tests/qemumonitorjsontest.c | 23 ++- tests/qemumonitortestutils.c | 7 +- tests/qemuxml2argvtest.c | 6 +- tests/virnettlscontexttest.c | 8 +- 13 files changed, 319 insertions(+), 296 deletions(-) -- 1.7.11.7

3 28

[libvirt] [PATCH 2/2] Add syntax-check to make sure Python files don't contain trailing semicolon
by Guido Günther 07 Feb '13

07 Feb '13

We allow for a trailing semicolon in full line comments since docs/index.py has some SQL statements in it. --- cfg.mk | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/cfg.mk b/cfg.mk index 2dfde01..b92ae85 100644 --- a/cfg.mk +++ b/cfg.mk @@ -702,6 +702,13 @@ sc_require_enum_last_marker: { echo '$(ME): enum impl needs to use _LAST marker' 1>&2; \ exit 1; } || : +# In Python files we don't want to end lines with a semicolon like in C +sc_prohibit_semicolon_at_eol_in_python: + @prohibit='^[^#].*\;$$' \ + in_vc_files='\.py$$' \ + halt="Don't use semicolon at eol in python files" \ + $(_sc_search_regexp) + # We don't use this feature of maint.mk. prev_version_file = /dev/null -- 1.7.10.4

2 2

[libvirt] [PATCH] syntax-check: Don't check non-reentrant functions in docs
by Peter Krempa 07 Feb '13

07 Feb '13

Otherwise constructions like "random (used by default)" end up breaking syntax check by apparently using non-reentrant functions. --- cfg.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cfg.mk b/cfg.mk index 2dfde01..309a2d7 100644 --- a/cfg.mk +++ b/cfg.mk @@ -813,7 +813,7 @@ exclude_file_name_regexp--sc_prohibit_newline_at_end_of_diagnostic = \ ^src/rpc/gendispatch\.pl$$ exclude_file_name_regexp--sc_prohibit_nonreentrant = \ - ^((po|tests)/|docs/.*py|run.in$$) + ^((po|tests)/|docs/.*(py|html\.in)|run.in$$) exclude_file_name_regexp--sc_prohibit_raw_allocation = \ ^(src/util/viralloc\.[ch]|examples/.*|tests/securityselinuxhelper.c)$$ -- 1.8.1.1

2 2

[libvirt] [PATCH] qemu: Report nicer error if decompression of save image fails
by Peter Krempa 07 Feb '13

07 Feb '13

This patch is a little more specific what failed while trying to restore a guest from a save image. --- src/qemu/qemu_driver.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 979a027..c96ba7a 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -4903,6 +4903,8 @@ qemuDomainSaveImageStartVM(virConnectPtr conn, if (virCommandWait(cmd, NULL) < 0) { qemuProcessStop(driver, vm, VIR_DOMAIN_SHUTOFF_FAILED, 0); + virReportError(VIR_ERR_OPERATION_FAILED, "%s", + _("Decompression of save image failed")); ret = -1; } VIR_DEBUG("Decompression binary stderr: %s", NULLSTR(errbuf)); -- 1.8.1.1

2 2

[libvirt] [PATCH] Fix PKI directory used for QEMU test suite
by Daniel P. Berrange 07 Feb '13

07 Feb '13

From: "Daniel P. Berrange" <berrange(a)redhat.com> The data files for testing QEMU command line generation are hardcoded to use /etc/pki, so we should explicitly set that in the test case, avoiding the dynamic SYSCONFDIR value. Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- tests/qemuxml2argvtest.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index c0c720e..c2a379d 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -282,6 +282,13 @@ mymain(void) VIR_FREE(driver.config->spiceListen); VIR_FREE(driver.config->vncListen); + VIR_FREE(driver.config->vncTLSx509certdir); + if ((driver.config->vncTLSx509certdir = strdup("/etc/pki/libvirt-vnc")) == NULL) + return EXIT_FAILURE; + VIR_FREE(driver.config->spiceTLSx509certdir); + if ((driver.config->spiceTLSx509certdir = strdup("/etc/pki/libvirt-spice")) == NULL) + return EXIT_FAILURE; + if ((driver.caps = testQemuCapsInit()) == NULL) return EXIT_FAILURE; VIR_FREE(driver.config->stateDir); -- 1.8.1

3 2

[libvirt] [PATCH 1/2] virCommandDoAsyncIO: Resolve race
by Michal Privoznik 07 Feb '13

07 Feb '13

With current implementation, virCommandWait unregister the stdio callback and finish reading itself. However, the eventloop may already have been in process of executing the callback in which case one obtain these obscure error messages, like: 2013-02-06 11:41:43.766+0000: 19078: warning : virEventPollRemoveHandle:183 : Ignoring invalid remove watch -1 2013-02-06 11:41:43.766+0000: 19078: warning : virFileClose:65 : Tried to close invalid fd 25 The solution is to introduce a mutex and condition to virCommand, and wait in virCommandWait for the eventloop to process all IOs. This, however, requires all callees to unlock all mutexes held, otherwise the eventloop may try to lock one of them and experience deadlock. If that's the case, we will never be woken up to unlock the problematic mutex. --- src/qemu/qemu_driver.c | 58 +++++++++++++++++++++++++--- src/qemu/qemu_migration.c | 15 +++++++- src/util/vircommand.c | 98 ++++++++++++++++++++++++++++++++++++----------- src/util/virfile.c | 4 ++ 4 files changed, 146 insertions(+), 29 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 979a027..e10fc89 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -2757,6 +2757,7 @@ qemuDomainSaveMemory(virQEMUDriverPtr driver, int fd = -1; int directFlag = 0; virFileWrapperFdPtr wrapperFd = NULL; + int wrapperFd_ret; unsigned int wrapperFlags = VIR_FILE_WRAPPER_NON_BLOCKING; unsigned long long pad; unsigned long long offset; @@ -2833,7 +2834,15 @@ qemuDomainSaveMemory(virQEMUDriverPtr driver, goto cleanup; } - if (virFileWrapperFdClose(wrapperFd) < 0) + /* virCommandDoAsyncIO requires us to release all locks held */ + virObjectRef(vm); + virObjectUnlock(vm); + qemuDriverUnlock(driver); + wrapperFd_ret = virFileWrapperFdClose(wrapperFd); + qemuDriverLock(driver); + virObjectLock(vm); + virObjectUnref(vm); + if (wrapperFd_ret < 0) goto cleanup; if ((fd = qemuOpenFile(driver, path, O_WRONLY, NULL, NULL)) < 0) @@ -3240,6 +3249,7 @@ doCoreDump(virQEMUDriverPtr driver, int fd = -1; int ret = -1; virFileWrapperFdPtr wrapperFd = NULL; + int wrapperFd_ret; int directFlag = 0; unsigned int flags = VIR_FILE_WRAPPER_NON_BLOCKING; @@ -3281,7 +3291,16 @@ doCoreDump(virQEMUDriverPtr driver, path); goto cleanup; } - if (virFileWrapperFdClose(wrapperFd) < 0) + + /* virCommandDoAsyncIO requires us to release all locks held */ + virObjectRef(vm); + virObjectUnlock(vm); + qemuDriverUnlock(driver); + wrapperFd_ret = virFileWrapperFdClose(wrapperFd); + qemuDriverLock(driver); + virObjectLock(vm); + virObjectUnref(vm); + if (wrapperFd_ret < 0) goto cleanup; ret = 0; @@ -4854,6 +4873,7 @@ qemuDomainSaveImageStartVM(virConnectPtr conn, virDomainEventPtr event; int intermediatefd = -1; virCommandPtr cmd = NULL; + int cmd_ret; char *errbuf = NULL; virQEMUDriverConfigPtr cfg = virQEMUDriverGetConfig(driver); @@ -4901,7 +4921,15 @@ qemuDomainSaveImageStartVM(virConnectPtr conn, VIR_FORCE_CLOSE(*fd); } - if (virCommandWait(cmd, NULL) < 0) { + /* virCommandDoAsyncIO requires us to release all locks held */ + virObjectRef(vm); + virObjectUnlock(vm); + qemuDriverUnlock(driver); + cmd_ret = virCommandWait(cmd, NULL); + qemuDriverLock(driver); + virObjectLock(vm); + virObjectUnref(vm); + if (cmd_ret < 0) { qemuProcessStop(driver, vm, VIR_DOMAIN_SHUTOFF_FAILED, 0); ret = -1; } @@ -4976,6 +5004,7 @@ qemuDomainRestoreFlags(virConnectPtr conn, int ret = -1; virQEMUSaveHeader header; virFileWrapperFdPtr wrapperFd = NULL; + int wrapperFd_ret; int state = -1; virCheckFlags(VIR_DOMAIN_SAVE_BYPASS_CACHE | @@ -5009,7 +5038,16 @@ qemuDomainRestoreFlags(virConnectPtr conn, ret = qemuDomainSaveImageStartVM(conn, driver, vm, &fd, &header, path, false); - if (virFileWrapperFdClose(wrapperFd) < 0) + + /* virCommandDoAsyncIO requires us to release all locks held */ + virObjectRef(vm); + virObjectUnlock(vm); + qemuDriverUnlock(driver); + wrapperFd_ret = virFileWrapperFdClose(wrapperFd); + qemuDriverLock(driver); + virObjectLock(vm); + virObjectUnref(vm); + if (wrapperFd_ret < 0) VIR_WARN("Failed to close %s", path); if (qemuDomainObjEndJob(driver, vm) == 0) @@ -5153,6 +5191,7 @@ qemuDomainObjRestore(virConnectPtr conn, int ret = -1; virQEMUSaveHeader header; virFileWrapperFdPtr wrapperFd = NULL; + int wrapperFd_ret; fd = qemuDomainSaveImageOpen(driver, path, &def, &header, bypass_cache, &wrapperFd, NULL, -1, false, @@ -5182,7 +5221,16 @@ qemuDomainObjRestore(virConnectPtr conn, ret = qemuDomainSaveImageStartVM(conn, driver, vm, &fd, &header, path, start_paused); - if (virFileWrapperFdClose(wrapperFd) < 0) + + /* virCommandDoAsyncIO requires us to release all locks held */ + virObjectRef(vm); + virObjectUnlock(vm); + qemuDriverUnlock(driver); + wrapperFd_ret = virFileWrapperFdClose(wrapperFd); + qemuDriverLock(driver); + virObjectLock(vm); + virObjectUnref(vm); + if (wrapperFd_ret < 0) VIR_WARN("Failed to close %s", path); cleanup: diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index a75fb4e..ddbfd18 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -3610,6 +3610,7 @@ qemuMigrationToFile(virQEMUDriverPtr driver, virDomainObjPtr vm, int rc; bool restoreLabel = false; virCommandPtr cmd = NULL; + int cmd_ret; int pipeFD[2] = { -1, -1 }; unsigned long saveMigBandwidth = priv->migMaxBandwidth; char *errbuf = NULL; @@ -3729,8 +3730,18 @@ qemuMigrationToFile(virQEMUDriverPtr driver, virDomainObjPtr vm, if (rc < 0) goto cleanup; - if (cmd && virCommandWait(cmd, NULL) < 0) - goto cleanup; + if (cmd) { + /* virCommandDoAsyncIO requires us to release all locks held */ + virObjectRef(vm); + virObjectUnlock(vm); + qemuDriverUnlock(driver); + cmd_ret = virCommandWait(cmd, NULL); + qemuDriverLock(driver); + virObjectLock(vm); + virObjectUnref(vm); + if (cmd_ret < 0) + goto cleanup; + } ret = 0; diff --git a/src/util/vircommand.c b/src/util/vircommand.c index db7dbca..97ff135 100644 --- a/src/util/vircommand.c +++ b/src/util/vircommand.c @@ -42,6 +42,7 @@ #include "virpidfile.h" #include "virprocess.h" #include "virbuffer.h" +#include "virthread.h" #define VIR_FROM_THIS VIR_FROM_NONE @@ -90,6 +91,9 @@ struct _virCommand { int outWatch; int errWatch; + virMutex lock; + virCond cond; + bool handshake; int handshakeWait[2]; int handshakeNotify[2]; @@ -788,9 +792,24 @@ virCommandNewArgs(const char *const*args) cmd->inWatch = cmd->outWatch = cmd->errWatch = -1; cmd->pid = -1; + if (virMutexInit(&cmd->lock) < 0) { + virReportSystemError(errno, "%s", _("Unable to init mutex")); + goto error; + } + + if (virCondInit(&cmd->cond) < 0) { + virReportSystemError(errno, "%s", _("Unable to init cond")); + virMutexDestroy(&cmd->lock); + goto error; + } + virCommandAddArgSet(cmd, args); return cmd; + +error: + VIR_FREE(cmd); + return NULL; } /** @@ -2146,6 +2165,8 @@ virCommandHandleReadWrite(int watch, int fd, int events, void *opaque) bool eof = false; int *fdptr = NULL, **fdptrptr = NULL; + virMutexLock(&cmd->lock); + VIR_DEBUG("watch=%d fd=%d events=%d", watch, fd, events); errno = 0; @@ -2190,14 +2211,21 @@ virCommandHandleReadWrite(int watch, int fd, int events, void *opaque) bufptr = &cmd->outbuf; fdptr = &cmd->outfd; fdptrptr = &cmd->outfdptr; - } else { + } else if (watch == cmd->errWatch) { watchPtr = &cmd->errWatch; bufptr = &cmd->errbuf; fdptr = &cmd->errfd; fdptrptr = &cmd->errfdptr; + } else { + /* Suspicious wakeup ... */ + virCondBroadcast(&cmd->cond); + virMutexUnlock(&cmd->lock); + return; } - if (events & VIR_EVENT_HANDLE_READABLE) { + if (events & (VIR_EVENT_HANDLE_READABLE | + VIR_EVENT_HANDLE_HANGUP | + VIR_EVENT_HANDLE_ERROR)) { if (**bufptr) len = strlen(**bufptr); @@ -2241,7 +2269,9 @@ virCommandHandleReadWrite(int watch, int fd, int events, void *opaque) *bufptr = NULL; if (fdptrptr) *fdptrptr = NULL; + virCondBroadcast(&cmd->cond); } + virMutexUnlock(&cmd->lock); } @@ -2377,24 +2407,24 @@ virCommandRunAsync(virCommandPtr cmd, pid_t *pid) virReportError(VIR_ERR_INTERNAL_ERROR, _("command is already running as pid %lld"), (long long) cmd->pid); - return -1; + goto cleanup; } if (!synchronous && (cmd->flags & VIR_EXEC_DAEMON)) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("daemonized command cannot use virCommandRunAsync")); - return -1; + goto cleanup; } if (cmd->pwd && (cmd->flags & VIR_EXEC_DAEMON)) { virReportError(VIR_ERR_INTERNAL_ERROR, _("daemonized command cannot set working directory %s"), cmd->pwd); - return -1; + goto cleanup; } if (cmd->pidfile && !(cmd->flags & VIR_EXEC_DAEMON)) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("creation of pid file requires daemonized command")); - return -1; + goto cleanup; } str = virCommandToString(cmd); @@ -2439,6 +2469,12 @@ virCommandRunAsync(virCommandPtr cmd, pid_t *pid) ret = virCommandRegisterEventLoop(cmd); } +cleanup: + if (ret < 0) { + VIR_FORCE_CLOSE(infd[0]); + VIR_FORCE_CLOSE(infd[1]); + cmd->infd = -1; + } return ret; } @@ -2453,13 +2489,16 @@ virCommandRunAsync(virCommandPtr cmd, pid_t *pid) * completion. Returns 0 if the command * finished with the exit status set. If @exitstatus is NULL, then the * child must exit with status 0 for this to succeed. + * + * In case virCommandDoAsyncIO() has been requested previously on + * @cmd, this command may block. So you are required to unlock all + * locks held prior calling this function. */ int virCommandWait(virCommandPtr cmd, int *exitstatus) { int ret; int status = 0; - const int events = VIR_EVENT_HANDLE_READABLE | VIR_EVENT_HANDLE_HANGUP; if (!cmd ||cmd->has_error == ENOMEM) { virReportOOMError(); @@ -2485,22 +2524,25 @@ virCommandWait(virCommandPtr cmd, int *exitstatus) * and repeat the exitstatus check code ourselves. */ ret = virProcessWait(cmd->pid, exitstatus ? exitstatus : &status); - if (cmd->inWatch != -1) { - virEventRemoveHandle(cmd->inWatch); - cmd->inWatch = -1; - } - - if (cmd->outWatch != -1) { - virEventRemoveHandle(cmd->outWatch); - virCommandHandleReadWrite(cmd->outWatch, cmd->outfd, events, cmd); - cmd->outWatch = -1; - } - - if (cmd->errWatch != -1) { - virEventRemoveHandle(cmd->errWatch); - virCommandHandleReadWrite(cmd->errWatch, cmd->errfd, events, cmd); - cmd->errWatch = -1; + /* Hopefully, all locks has been unlocked. Otherwise, the + * eventloop might be trying to lock one of them again, which + * will deadlock (obviously), and we will never be woken up here */ + virMutexLock(&cmd->lock); + while (!(cmd->inWatch == -1 && + cmd->outWatch == -1 && + cmd->errWatch == -1)) { + VIR_DEBUG("Waiting on in=%d out=%d err=%d", + cmd->inWatch, cmd->outWatch, cmd->errWatch); + + if (virCondWait(&cmd->cond, &cmd->lock) < 0) { + virReportSystemError(errno, "%s", + _("Unable to wait on condition")); + break; + } + VIR_DEBUG("Done waiting on in=%d out=%d err=%d", + cmd->inWatch, cmd->outWatch, cmd->errWatch); } + virMutexUnlock(&cmd->lock); if (ret == 0) { cmd->pid = -1; @@ -2719,6 +2761,9 @@ virCommandFree(virCommandPtr cmd) VIR_FORCE_CLOSE(cmd->transfer[i]); } + virMutexDestroy(&cmd->lock); + ignore_value(virCondDestroy(&cmd->cond)); + VIR_FREE(cmd->inbuf); VIR_FORCE_CLOSE(cmd->outfd); VIR_FORCE_CLOSE(cmd->errfd); @@ -2772,6 +2817,7 @@ virCommandFree(virCommandPtr cmd) * * ... * + * // release all locks held (qemu, virDomainObj, ... ) * if (virCommandWait(cmd, NULL) < 0) * goto cleanup; * @@ -2789,6 +2835,14 @@ virCommandFree(virCommandPtr cmd) * of data to be written to @cmd's stdin, don't pass any binary * data. If you want to re-run command, you need to call this and * buffer setting functions (virCommandSet.*Buffer) prior each run. + * + * Moreover, you are required to unlock all mutexes held prior calling + * virCommandWait. Due to current implementation, the virCommandWait + * waits for the event loop to finish all IOs on @cmd. However, if we + * are holding a locked mutex already and the event loop decides to + * issue a different callback which tries to lock the mutex it will + * deadlock and don't call any other callbacks. Not even the one which + * will unlock us. */ void virCommandDoAsyncIO(virCommandPtr cmd) diff --git a/src/util/virfile.c b/src/util/virfile.c index b4765fb..bb33801 100644 --- a/src/util/virfile.c +++ b/src/util/virfile.c @@ -278,6 +278,10 @@ virFileWrapperFdNew(int *fd ATTRIBUTE_UNUSED, * callers can conditionally create a virFileWrapperFd wrapper but * unconditionally call the cleanup code. To avoid deadlock, only * call this after closing the fd resulting from virFileWrapperFdNew(). + * + * Since the virFileWrapperFdNew has requested asynchronous IO on + * underlying virCommand and this uses virCommandWait so we are + * required to unlock all locks held. */ int virFileWrapperFdClose(virFileWrapperFdPtr wfd) -- 1.8.0.2

4 6

[libvirt] Fix bugs of Sheepdog storage driver
by harryxiyou＠gmail.com 07 Feb '13

07 Feb '13

--- src/storage/storage_backend_sheepdog.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/src/storage/storage_backend_sheepdog.c b/src/storage/storage_backend_sheepdog.c index cd18f33..2cbfe01 100644 --- a/src/storage/storage_backend_sheepdog.c +++ b/src/storage/storage_backend_sheepdog.c @@ -168,9 +168,12 @@ virStorageBackendSheepdogCreateVol(virConnectPtr conn ATTRIBUTE_UNUSED, virCommandAddArgFormat(cmd, "%llu", vol->capacity); virStorageBackendSheepdogAddHostArg(cmd, pool); ret = virCommandRun(cmd, NULL); + if (ret < 0) + goto cleanup; - virStorageBackendSheepdogRefreshVol(conn, pool, vol); + ret = virStorageBackendSheepdogRefreshVol(conn, pool, vol); +cleanup: virCommandFree(cmd); return ret; } -- 1.7.0.4

3 2

[libvirt] [PATCH 0/5]] S390: Support for native CCW bus
by Viktor Mihajlovski 07 Feb '13

07 Feb '13

Originally, QEMU did not implement a native I/O bus for s390. The initial implementation had a machine type 's390-virtio' featuring a fully paravirtualized I/O system with an artificial bus type 'virtio-s390'. This bus had a number of short-comings, like the need for a non-standard device discovery mechanism, a limited number of devices, limited hotplugging capabilites and the lack of persistent device addresses. To resolve these issues a new machine type 's390-ccw-virtio' has been recently added to QEMU which implementa the native s390 CCW I/O bus. Guests with arch='s390x' and machine='s390-ccw-virtio' can now be defined with up to 262144 virtio devices. This series adds the support for the s390-ccw-virtio machine type and the CCW bus to libvirt. As usual we start with the documentation/schema, the generic configuration stuff, continue with the QEMU driver including device hotplug and finally add qemu2xml testcases. J.B. Joret (1): S390: Add hotplug support for s390 virtio devices Viktor Mihajlovski (4): S390: Documentation for CCW address type S390: domain_conf support for CCW S390: QEMU driver support for CCW addresses S390: Testcases for virtio-ccw machines docs/formatdomain.html.in | 12 + docs/schemas/domaincommon.rng | 21 ++ src/conf/domain_conf.c | 80 +++++- src/conf/domain_conf.h | 16 ++ src/libvirt_private.syms | 1 + src/qemu/qemu_capabilities.c | 47 +++- src/qemu/qemu_capabilities.h | 7 +- src/qemu/qemu_command.c | 269 +++++++++++++++++++- src/qemu/qemu_command.h | 6 + src/qemu/qemu_domain.c | 1 + src/qemu/qemu_domain.h | 3 + src/qemu/qemu_driver.c | 26 +- src/qemu/qemu_hotplug.c | 149 +++++++---- src/qemu/qemu_hotplug.h | 14 +- src/qemu/qemu_process.c | 12 +- .../qemuxml2argv-console-virtio-ccw.args | 10 + .../qemuxml2argv-console-virtio-ccw.xml | 27 ++ .../qemuxml2argv-console-virtio-s390.args | 4 +- .../qemuxml2argv-console-virtio-s390.xml | 2 +- .../qemuxml2argv-disk-virtio-ccw-many.args | 12 + .../qemuxml2argv-disk-virtio-ccw-many.xml | 39 +++ .../qemuxml2argv-disk-virtio-ccw.args | 8 + .../qemuxml2argv-disk-virtio-ccw.xml | 30 +++ .../qemuxml2argv-net-virtio-ccw.args | 8 + .../qemuxml2argv-net-virtio-ccw.xml | 30 +++ tests/qemuxml2argvtest.c | 11 +- tests/testutilsqemu.c | 3 +- 27 files changed, 752 insertions(+), 96 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-console-virtio-ccw.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-console-virtio-ccw.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-ccw-many.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-ccw-many.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-ccw.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-ccw.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-net-virtio-ccw.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-net-virtio-ccw.xml -- 1.7.9.5

2 9

[libvirt] [PATCH v3 00/13] More refactoring of QEMU driver objects & locking
by Daniel P. Berrange 07 Feb '13

07 Feb '13

An update of https://www.redhat.com/archives/libvir-list/2013-January/msg01407.html This series does more general refactoring to help in the goal of killing the big QEMU driver lock. There are 3 key changes in this series - Isolating all QEMU configuration parameters in one struct. - Making virDomainObjList self-locking - Add dedicated locking to PCI/USB device lists There are all the really hard bits of the QEMU locking. As can be seen from the last patch there is still more work to be done before the QEMU driver lock can be said to be truely dead, but this is less critical. In v3: - Rebase, since previous series no longer applied to GIT In v2: - Rebase, since previous series no longer applied to GIT

4 42

[libvirt] [libvirt-glib] [PATCH 0/3] minor improvements towards Vala usage
by Claudio Bley 07 Feb '13

07 Feb '13

Hi. I'm currently evaluating libvirt-glib using the Vala bindings. I found a few obstacles on the way. Here are some patches. Claudio Bley (3): Fix typo in gvir_config_init's comment Add "transfer none" annotation to argv parameter gvir_stream_receive: annotate buffer parameter with "element-type guint8" libvirt-gconfig/libvirt-gconfig-main.c | 6 +++--- libvirt-glib/libvirt-glib-main.c | 4 ++-- libvirt-gobject/libvirt-gobject-stream.c | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) -- 1.7.11.7

2 6

[libvirt] [PATCH] virCondDestroy: Loose attribute RETURN_CHECK
by Michal Privoznik 07 Feb '13

07 Feb '13

We are wrapping it in ignore_value() anyway. --- src/nwfilter/nwfilter_dhcpsnoop.c | 2 +- src/qemu/qemu_agent.c | 2 +- src/qemu/qemu_domain.c | 6 +++--- src/qemu/qemu_monitor.c | 3 +-- src/rpc/virnetclient.c | 6 +++--- src/util/virthread.h | 2 +- src/util/virthreadpool.c | 6 +++--- tools/console.c | 2 +- 8 files changed, 14 insertions(+), 15 deletions(-) diff --git a/src/nwfilter/nwfilter_dhcpsnoop.c b/src/nwfilter/nwfilter_dhcpsnoop.c index 90b5615..5124069 100644 --- a/src/nwfilter/nwfilter_dhcpsnoop.c +++ b/src/nwfilter/nwfilter_dhcpsnoop.c @@ -636,7 +636,7 @@ virNWFilterSnoopReqFree(virNWFilterSnoopReqPtr req) virNWFilterHashTableFree(req->vars); virMutexDestroy(&req->lock); - ignore_value(virCondDestroy(&req->threadStatusCond)); + virCondDestroy(&req->threadStatusCond); VIR_FREE(req); } diff --git a/src/qemu/qemu_agent.c b/src/qemu/qemu_agent.c index 05641da..ebe777b 100644 --- a/src/qemu/qemu_agent.c +++ b/src/qemu/qemu_agent.c @@ -158,7 +158,7 @@ static void qemuAgentDispose(void *obj) VIR_DEBUG("mon=%p", mon); if (mon->cb && mon->cb->destroy) (mon->cb->destroy)(mon, mon->vm); - ignore_value(virCondDestroy(&mon->notify)); + virCondDestroy(&mon->notify); VIR_FREE(mon->buffer); } diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 5bf0ab0..46c22e1 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -133,7 +133,7 @@ qemuDomainObjInitJob(qemuDomainObjPrivatePtr priv) return -1; if (virCondInit(&priv->job.asyncCond) < 0) { - ignore_value(virCondDestroy(&priv->job.cond)); + virCondDestroy(&priv->job.cond); return -1; } @@ -194,8 +194,8 @@ qemuDomainObjTransferJob(virDomainObjPtr obj) static void qemuDomainObjFreeJob(qemuDomainObjPrivatePtr priv) { - ignore_value(virCondDestroy(&priv->job.cond)); - ignore_value(virCondDestroy(&priv->job.asyncCond)); + virCondDestroy(&priv->job.cond); + virCondDestroy(&priv->job.asyncCond); } static bool diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c index 3f1aed8..7af571d 100644 --- a/src/qemu/qemu_monitor.c +++ b/src/qemu/qemu_monitor.c @@ -236,8 +236,7 @@ static void qemuMonitorDispose(void *obj) VIR_DEBUG("mon=%p", mon); if (mon->cb && mon->cb->destroy) (mon->cb->destroy)(mon, mon->vm); - if (virCondDestroy(&mon->notify) < 0) - {} + virCondDestroy(&mon->notify); VIR_FREE(mon->buffer); } diff --git a/src/rpc/virnetclient.c b/src/rpc/virnetclient.c index 44638e2..4efa578 100644 --- a/src/rpc/virnetclient.c +++ b/src/rpc/virnetclient.c @@ -1382,7 +1382,7 @@ static bool virNetClientIOEventLoopRemoveDone(virNetClientCallPtr call, VIR_DEBUG("Removing completed call %p", call); if (call->expectReply) VIR_WARN("Got a call expecting a reply but without a waiting thread"); - ignore_value(virCondDestroy(&call->cond)); + virCondDestroy(&call->cond); VIR_FREE(call->msg); VIR_FREE(call); } @@ -1409,7 +1409,7 @@ virNetClientIOEventLoopRemoveAll(virNetClientCallPtr call, return false; VIR_DEBUG("Removing call %p", call); - ignore_value(virCondDestroy(&call->cond)); + virCondDestroy(&call->cond); VIR_FREE(call->msg); VIR_FREE(call); return true; @@ -1972,7 +1972,7 @@ static int virNetClientSendInternal(virNetClientPtr client, if (ret == 1) return 1; - ignore_value(virCondDestroy(&call->cond)); + virCondDestroy(&call->cond); VIR_FREE(call); return ret; } diff --git a/src/util/virthread.h b/src/util/virthread.h index c209440..c59a2cf 100644 --- a/src/util/virthread.h +++ b/src/util/virthread.h @@ -87,7 +87,7 @@ void virMutexUnlock(virMutexPtr m); int virCondInit(virCondPtr c) ATTRIBUTE_RETURN_CHECK; -int virCondDestroy(virCondPtr c) ATTRIBUTE_RETURN_CHECK; +int virCondDestroy(virCondPtr c); /* virCondWait, virCondWaitUntil: * These functions can return without the associated predicate diff --git a/src/util/virthreadpool.c b/src/util/virthreadpool.c index 7b8ba70..e657145 100644 --- a/src/util/virthreadpool.c +++ b/src/util/virthreadpool.c @@ -271,11 +271,11 @@ void virThreadPoolFree(virThreadPoolPtr pool) VIR_FREE(pool->workers); virMutexUnlock(&pool->mutex); virMutexDestroy(&pool->mutex); - ignore_value(virCondDestroy(&pool->quit_cond)); - ignore_value(virCondDestroy(&pool->cond)); + virCondDestroy(&pool->quit_cond); + virCondDestroy(&pool->cond); if (priority) { VIR_FREE(pool->prioWorkers); - ignore_value(virCondDestroy(&pool->prioCond)); + virCondDestroy(&pool->prioCond); } VIR_FREE(pool); } diff --git a/tools/console.c b/tools/console.c index 29873ea..e423134 100644 --- a/tools/console.c +++ b/tools/console.c @@ -407,7 +407,7 @@ int vshRunConsole(virDomainPtr dom, if (con->st) virStreamFree(con->st); virMutexDestroy(&con->lock); - ignore_value(virCondDestroy(&con->cond)); + virCondDestroy(&con->cond); VIR_FREE(con); } -- 1.8.0.2

2 1

[libvirt] [PATCH] qemu: Fix crash when changing media of cdrom or floppy disk
by Osier Yang 07 Feb '13

07 Feb '13

The disk def could be free'ed by qemuDomainChangeEjectableMedia for cdrom or floppy disk. This moves the setup/checking before the attaching takes place. --- src/qemu/qemu_driver.c | 29 ++++++++++++++--------------- src/qemu/qemu_process.c | 16 ++++++++++++---- src/qemu/qemu_process.h | 3 ++- 3 files changed, 28 insertions(+), 20 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 906501b..3509880 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -5829,8 +5829,20 @@ qemuDomainAttachDeviceDiskLive(virConnectPtr conn, if (disk->type == VIR_DOMAIN_DISK_TYPE_BLOCK && disk->shared && - (qemuCheckSharedDisk(driver->sharedDisks, disk) < 0)) - goto end; + disk->src) { + if (qemuCheckSharedDisk(driver->sharedDisks, disk, false) < 0) + goto end; + + if (qemuAddSharedDisk(driver->sharedDisks, disk->src) < 0) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Failed to add disk '%s' to shared disk table"), + disk->src); + goto end; + } + } + + if (qemuSetUnprivSGIO(disk) < 0) + goto end; if (qemuDomainDetermineDiskChain(driver, disk, false) < 0) goto end; @@ -5883,19 +5895,6 @@ qemuDomainAttachDeviceDiskLive(virConnectPtr conn, NULLSTR(disk->src)); } - if (ret == 0) { - if (disk->type == VIR_DOMAIN_DISK_TYPE_BLOCK && - disk->shared && - disk->src) { - if (qemuAddSharedDisk(driver->sharedDisks, disk->src) < 0) - VIR_WARN("Failed to add disk '%s' to shared disk table", - disk->src); - } - - if (qemuSetUnprivSGIO(disk) < 0) - VIR_WARN("Failed to set unpriv_sgio of disk '%s'", disk->src); - } - end: if (cgroup) virCgroupFree(&cgroup); diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 98ed552..ee5a10c 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -3442,7 +3442,14 @@ qemuSetUnprivSGIO(virDomainDiskDefPtr disk) return 0; } -/* Check if a shared disk's setting conflicts with the conf +/* qemuCheckSharedDisk: + * @sharedDisks: Shared disk hash table + * @disk: Disk def + * @after_adding: Whether this function is involked after + * adding the disk to the hash table by + * qemuAddSharedDisk. + * + * Check if a shared disk's setting conflicts with the conf * used by other domain(s). Currently only checks the sgio * setting. Note that this should only be called for disk with * block source. @@ -3451,7 +3458,8 @@ qemuSetUnprivSGIO(virDomainDiskDefPtr disk) */ int qemuCheckSharedDisk(virHashTablePtr sharedDisks, - virDomainDiskDefPtr disk) + virDomainDiskDefPtr disk, + bool after_adding) { int val; size_t *ref = NULL; @@ -3470,7 +3478,7 @@ qemuCheckSharedDisk(virHashTablePtr sharedDisks, if (!(ref = virHashLookup(sharedDisks, key))) goto cleanup; - if (ref == (void *)0x1) + if (after_adding && ref == (void *)0x1) goto cleanup; if (virGetDeviceUnprivSGIO(disk->src, NULL, &val) < 0) { @@ -3846,7 +3854,7 @@ int qemuProcessStart(virConnectPtr conn, if (qemuAddSharedDisk(driver->sharedDisks, disk->src) < 0) goto cleanup; - if (qemuCheckSharedDisk(driver->sharedDisks, disk) < 0) + if (qemuCheckSharedDisk(driver->sharedDisks, disk, true) < 0) goto cleanup; } diff --git a/src/qemu/qemu_process.h b/src/qemu/qemu_process.h index 313fa39..ff294e7 100644 --- a/src/qemu/qemu_process.h +++ b/src/qemu/qemu_process.h @@ -101,6 +101,7 @@ virBitmapPtr qemuPrepareCpumap(virQEMUDriverPtr driver, int qemuSetUnprivSGIO(virDomainDiskDefPtr disk); int qemuCheckSharedDisk(virHashTablePtr sharedDisks, - virDomainDiskDefPtr disk); + virDomainDiskDefPtr disk, + bool after_adding); #endif /* __QEMU_PROCESS_H__ */ -- 1.7.7.6

2 1

[libvirt] [PATCH v3 0/6] Introduce virCommandDoAsyncIO
by Michal Privoznik 07 Feb '13

07 Feb '13

Currently, if we want to use IO with asynchronous command we have to copy code from virFileWrapperFd to misuse our event loop for reading and writing to the command. However, we can extend our virCommand implementation to automatically set things up. All patches but the first has been ACKed already. diff to v2: -even more of Peter's suggestion worked in diff to v1: -drop usleep(100) while waiting for the event loop to process our string IOs and do it ourselves instead. Michal Privoznik (6): virCommand: Introduce virCommandDoAsyncIO Introduce event loop to commandtest tests: Create test for virCommandDoAsyncIO virFileWrapperFd: Switch to new virCommandDoAsyncIO qemu: Catch stderr of image decompression binary qemu: Catch stderr of image compression binary src/libvirt_private.syms | 1 + src/qemu/qemu_driver.c | 5 + src/qemu/qemu_migration.c | 9 +- src/util/vircommand.c | 308 +++++++++++++++++++++++++++++++++++++++++--- src/util/vircommand.h | 1 + src/util/virfile.c | 82 +----------- tests/commanddata/test3.log | 2 +- tests/commandtest.c | 136 +++++++++++++++++++ 8 files changed, 447 insertions(+), 97 deletions(-) -- 1.8.0.2

3 11

[libvirt] [PATCH] qemu: Fix crash when using shared cdrom or floppy disk without source
by Osier Yang 07 Feb '13

07 Feb '13

How to reproduce the crash: * Start a guest with a disk like: <disk type='block' device='cdrom'> <driver name='qemu' type='raw'/> <target dev='hdc' bus='ide'/> <readonly/> <shareable/> <address type='drive' controller='0' bus='1' target='0' unit='0'/> </disk> It's caused by disk->src for this disk is NULL. This patch fixes it. --- src/qemu/qemu_process.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index a2ce007..d1872c0 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -3837,7 +3837,9 @@ int qemuProcessStart(virConnectPtr conn, _("Raw I/O is not supported on this platform")); #endif - if (disk->type == VIR_DOMAIN_DISK_TYPE_BLOCK && disk->shared) { + if (disk->type == VIR_DOMAIN_DISK_TYPE_BLOCK && + disk->shared && + disk->src) { if (qemuAddSharedDisk(driver->sharedDisks, disk->src) < 0) goto cleanup; @@ -4246,7 +4248,9 @@ void qemuProcessStop(virQEMUDriverPtr driver, for (i = 0; i < vm->def->ndisks; i++) { virDomainDiskDefPtr disk = vm->def->disks[i]; - if (disk->type == VIR_DOMAIN_DISK_TYPE_BLOCK && disk->shared) { + if (disk->type == VIR_DOMAIN_DISK_TYPE_BLOCK && + disk->shared && + disk->src) { ignore_value(qemuRemoveSharedDisk(driver->sharedDisks, disk->src)); } } -- 1.7.7.6

2 1

[libvirt] [PATCH 1/2] Remove more trailing semicolons in Python files
by Guido Günther 07 Feb '13

07 Feb '13

--- docs/apibuild.py | 56 ++++---- docs/index.py | 32 ++--- examples/domain-events/events-python/event-test.py | 24 ++-- python/generator.py | 146 ++++++++++---------- python/libvirt-override-virConnect.py | 10 +- python/tests/create.py | 2 +- 6 files changed, 135 insertions(+), 135 deletions(-) diff --git a/docs/apibuild.py b/docs/apibuild.py index 2bdbf2d..df12ba6 100755 --- a/docs/apibuild.py +++ b/docs/apibuild.py @@ -409,7 +409,7 @@ class CLexer: return self.lineno def push(self, token): - self.tokens.insert(0, token); + self.tokens.insert(0, token) def debug(self): print "Last token: ", self.last @@ -429,7 +429,7 @@ class CLexer: if line[0] == '#': self.tokens = map((lambda x: ('preproc', x)), string.split(line)) - break; + break l = len(line) if line[0] == '"' or line[0] == "'": end = line[0] @@ -699,7 +699,7 @@ class CParser: if self.top_comment == "": self.top_comment = com if self.comment == None or com[0] == '*': - self.comment = com; + self.comment = com else: self.comment = self.comment + com token = self.lexer.token() @@ -897,7 +897,7 @@ class CParser: while i < nbargs: if args[i][1] == arg: args[i] = (args[i][0], arg, desc) - break; + break i = i + 1 if i >= nbargs: if not quiet: @@ -1141,10 +1141,10 @@ class CParser: type = type + token[1] token = self.token() elif token != None and token[0] == 'sep' and token[1] == ';': - break; + break elif token != None and token[0] == 'name': type = base_type - continue; + continue else: self.error("parsing typedef: expecting ';'", token) return token @@ -1239,7 +1239,7 @@ class CParser: else: self.error("parseStruct: name", token) token = self.token() - self.type = base_type; + self.type = base_type self.struct_fields = fields #self.debug("end parseStruct", token) #print fields @@ -1289,7 +1289,7 @@ class CParser: else: self.error("parseUnion: name", token) token = self.token() - self.type = base_type; + self.type = base_type self.union_fields = fields # self.debug("end parseUnion", token) # print fields @@ -1633,7 +1633,7 @@ class CParser: self.type = self.type + token[1] token = self.token() if token == None or token[0] != "name" : - self.error("parsing function type, name expected", token); + self.error("parsing function type, name expected", token) return token self.type = self.type + token[1] nametok = token @@ -1643,14 +1643,14 @@ class CParser: token = self.token() if token != None and token[0] == "sep" and token[1] == '(': token = self.token() - type = self.type; - token = self.parseSignature(token); - self.type = type; + type = self.type + token = self.parseSignature(token) + self.type = type else: - self.error("parsing function type, '(' expected", token); + self.error("parsing function type, '(' expected", token) return token else: - self.error("parsing function type, ')' expected", token); + self.error("parsing function type, ')' expected", token) return token self.lexer.push(token) token = nametok @@ -1675,7 +1675,7 @@ class CParser: self.type = self.type + token[1] token = self.token() else: - self.error("parsing array type, ']' expected", token); + self.error("parsing array type, ']' expected", token) return token elif token != None and token[0] == "sep" and token[1] == ':': # remove :12 in case it's a limited int size @@ -1904,7 +1904,7 @@ class CParser: self.index_add(self.name, self.filename, static, "function", d) token = self.token() - token = self.parseBlock(token); + token = self.parseBlock(token) elif token[1] == ',': self.comment = None self.index_add(self.name, self.filename, static, @@ -2014,7 +2014,7 @@ class docBuilder: for header in self.headers.keys(): parser = CParser(header) idx = parser.parse() - self.headers[header] = idx; + self.headers[header] = idx self.idx.merge(idx) def scanModules(self): @@ -2032,19 +2032,19 @@ class docBuilder: skip = 1 for incl in self.includes: if string.find(file, incl) != -1: - skip = 0; + skip = 0 break if skip == 0: - self.modules[file] = None; + self.modules[file] = None files = glob.glob(directory + "/*.h") for file in files: skip = 1 for incl in self.includes: if string.find(file, incl) != -1: - skip = 0; + skip = 0 break if skip == 0: - self.headers[file] = None; + self.headers[file] = None self.scanHeaders() self.scanModules() @@ -2067,11 +2067,11 @@ class docBuilder: val = eval(info[0]) except: val = info[0] - output.write(" value='%s'" % (val)); + output.write(" value='%s'" % (val)) if info[2] != None and info[2] != '': - output.write(" type='%s'" % info[2]); + output.write(" type='%s'" % info[2]) if info[1] != None and info[1] != '': - output.write(" info='%s'" % escape(info[1])); + output.write(" info='%s'" % escape(info[1])) output.write("/>\n") def serialize_macro(self, output, name): @@ -2119,7 +2119,7 @@ class docBuilder: if self.idx.structs.has_key(name) and ( \ type(self.idx.structs[name].info) == type(()) or type(self.idx.structs[name].info) == type([])): - output.write(">\n"); + output.write(">\n") try: for field in self.idx.structs[name].info: desc = field[2] @@ -2136,7 +2136,7 @@ class docBuilder: self.warning("Failed to serialize struct %s" % (name)) output.write(" </struct>\n") else: - output.write("/>\n"); + output.write("/>\n") else : output.write(" <typedef name='%s' file='%s' type='%s'" % ( name, self.modulename_file(id.header), id.info)) @@ -2176,7 +2176,7 @@ class docBuilder: if apstr != "": apstr = apstr + " && " apstr = apstr + cond - output.write(" <cond>%s</cond>\n"% (apstr)); + output.write(" <cond>%s</cond>\n"% (apstr)) try: (ret, params, desc) = id.info output.write(" <info><![CDATA[%s]]></info>\n" % (desc)) @@ -2388,7 +2388,7 @@ class docBuilder: letter = id[0] output.write(" <letter name='%s'>\n" % (letter)) output.write(" <word name='%s'>\n" % (id)) - tokens = index[id]; + tokens = index[id] tokens.sort() tok = None for token in tokens: diff --git a/docs/index.py b/docs/index.py index df6bd81..ce5180f 100755 --- a/docs/index.py +++ b/docs/index.py @@ -166,15 +166,15 @@ def checkTables(db, verbose = 1): print "table %s missing" % (table) createTable(db, table) try: - ret = c.execute("SELECT count(*) from %s" % table); + ret = c.execute("SELECT count(*) from %s" % table) row = c.fetchone() if verbose: print "Table %s contains %d records" % (table, row[0]) except: print "Troubles with table %s : repairing" % (table) - ret = c.execute("repair table %s" % table); + ret = c.execute("repair table %s" % table) print "repairing returned %d" % (ret) - ret = c.execute("SELECT count(*) from %s" % table); + ret = c.execute("SELECT count(*) from %s" % table) row = c.fetchone() print "Table %s contains %d records" % (table, row[0]) if verbose: @@ -600,7 +600,7 @@ def addWordHTML(word, resource, id, section, relevance): pass else: wordsDictHTML[word] = {} - d = wordsDictHTML[word]; + d = wordsDictHTML[word] d[resource] = (relevance, id, section) return relevance @@ -647,7 +647,7 @@ def addWordArchive(word, id, relevance): pass else: wordsDictArchive[word] = {} - d = wordsDictArchive[word]; + d = wordsDictArchive[word] d[id] = relevance return relevance @@ -989,7 +989,7 @@ def analyzeHTML(doc, resource, p, section, id): return words def analyzeHTML(doc, resource): - para = 0; + para = 0 ctxt = doc.xpathNewContext() try: res = ctxt.xpathEval("//head/title") @@ -1079,7 +1079,7 @@ def scanXMLMsgArchive(url, title, force = 0): try: print "Loading %s" % (url) - doc = libxml2.htmlParseFile(url, None); + doc = libxml2.htmlParseFile(url, None) except: doc = None if doc == None: @@ -1102,7 +1102,7 @@ def scanXMLDateArchive(t = None, force = 0): url = getXMLDateArchive(t) print "loading %s" % (url) try: - doc = libxml2.htmlParseFile(url, None); + doc = libxml2.htmlParseFile(url, None) except: doc = None if doc == None: @@ -1150,7 +1150,7 @@ def analyzeArchives(t = None, force = 0): refs = wordsDictArchive[word] if refs == None: skipped = skipped + 1 - continue; + continue for id in refs.keys(): relevance = refs[id] updateWordArchive(word, id, relevance) @@ -1170,7 +1170,7 @@ def analyzeHTMLTop(): refs = wordsDictHTML[word] if refs == None: skipped = skipped + 1 - continue; + continue for resource in refs.keys(): (relevance, id, section) = refs[resource] updateWordHTML(word, resource, section, id, relevance) @@ -1199,7 +1199,7 @@ def analyzeAPITop(): refs = wordsDict[word] if refs == None: skipped = skipped + 1 - continue; + continue for (module, symbol) in refs.keys(): updateWord(word, symbol, refs[(module, symbol)]) i = i + 1 @@ -1228,26 +1228,26 @@ def main(): elif args[i] == '--archive': analyzeArchives(None, force) elif args[i] == '--archive-year': - i = i + 1; + i = i + 1 year = args[i] months = ["January" , "February", "March", "April", "May", "June", "July", "August", "September", "October", - "November", "December"]; + "November", "December"] for month in months: try: str = "%s-%s" % (year, month) T = time.strptime(str, "%Y-%B") - t = time.mktime(T) + 3600 * 24 * 10; + t = time.mktime(T) + 3600 * 24 * 10 analyzeArchives(t, force) except: print "Failed to index month archive:" print sys.exc_type, sys.exc_value elif args[i] == '--archive-month': - i = i + 1; + i = i + 1 month = args[i] try: T = time.strptime(month, "%Y-%B") - t = time.mktime(T) + 3600 * 24 * 10; + t = time.mktime(T) + 3600 * 24 * 10 analyzeArchives(t, force) except: print "Failed to index month archive:" diff --git a/examples/domain-events/events-python/event-test.py b/examples/domain-events/events-python/event-test.py index 3095e94..b456dec 100644 --- a/examples/domain-events/events-python/event-test.py +++ b/examples/domain-events/events-python/event-test.py @@ -289,7 +289,7 @@ class virEventLoopPure: def update_timer(self, timerID, interval): for h in self.timers: if h.get_id() == timerID: - h.set_interval(interval); + h.set_interval(interval) self.interrupt() debug("Update timer %d interval %d" % (timerID, interval)) @@ -325,25 +325,25 @@ class virEventLoopPure: if events & libvirt.VIR_EVENT_HANDLE_WRITABLE: ret |= select.POLLOUT if events & libvirt.VIR_EVENT_HANDLE_ERROR: - ret |= select.POLLERR; + ret |= select.POLLERR if events & libvirt.VIR_EVENT_HANDLE_HANGUP: - ret |= select.POLLHUP; + ret |= select.POLLHUP return ret # Convert from poll() event constants, to libvirt events constants def events_from_poll(self, events): - ret = 0; + ret = 0 if events & select.POLLIN: - ret |= libvirt.VIR_EVENT_HANDLE_READABLE; + ret |= libvirt.VIR_EVENT_HANDLE_READABLE if events & select.POLLOUT: - ret |= libvirt.VIR_EVENT_HANDLE_WRITABLE; + ret |= libvirt.VIR_EVENT_HANDLE_WRITABLE if events & select.POLLNVAL: - ret |= libvirt.VIR_EVENT_HANDLE_ERROR; + ret |= libvirt.VIR_EVENT_HANDLE_ERROR if events & select.POLLERR: - ret |= libvirt.VIR_EVENT_HANDLE_ERROR; + ret |= libvirt.VIR_EVENT_HANDLE_ERROR if events & select.POLLHUP: - ret |= libvirt.VIR_EVENT_HANDLE_HANGUP; - return ret; + ret |= libvirt.VIR_EVENT_HANDLE_HANGUP + return ret ########################################################################### @@ -437,8 +437,8 @@ def eventToString(event): "Resumed", "Stopped", "Shutdown", - "PMSuspended" ); - return eventStrings[event]; + "PMSuspended" ) + return eventStrings[event] def detailToString(event, detail): eventStrings = ( diff --git a/python/generator.py b/python/generator.py index ceade6b..02209f9 100755 --- a/python/generator.py +++ b/python/generator.py @@ -615,7 +615,7 @@ def print_function_wrapper(module, name, output, export, include): # Don't delete the function entry in the caller. return 1 - c_call = ""; + c_call = "" format="" format_args="" c_args="" @@ -638,7 +638,7 @@ def print_function_wrapper(module, name, output, export, include): c_args = c_args + " PyObject *pyobj_%s;\n" % (arg[0]) c_convert = c_convert + \ " %s = (%s) Py%s_Get(pyobj_%s);\n" % (arg[0], - arg[1], t, arg[0]); + arg[1], t, arg[0]) else: format_args = format_args + ", &%s" % (arg[0]) if f == 't#': @@ -646,7 +646,7 @@ def print_function_wrapper(module, name, output, export, include): c_args = c_args + " int py_buffsize%d;\n" % num_bufs num_bufs = num_bufs + 1 if c_call != "": - c_call = c_call + ", "; + c_call = c_call + ", " c_call = c_call + "%s" % (arg[0]) else: if skipped_types.has_key(arg[1]): @@ -671,7 +671,7 @@ def print_function_wrapper(module, name, output, export, include): c_call = "\n %s->%s = %s;\n" % (args[0][0], args[1][0], args[1][0]) else: - c_call = "\n %s(%s);\n" % (name, c_call); + c_call = "\n %s(%s);\n" % (name, c_call) ret_convert = " Py_INCREF(Py_None);\n return Py_None;\n" elif py_types.has_key(ret[0]): (f, t, n, c) = py_types[ret[0]] @@ -679,13 +679,13 @@ def print_function_wrapper(module, name, output, export, include): if file == "python_accessor" and ret[2] != None: c_call = "\n c_retval = %s->%s;\n" % (args[0][0], ret[2]) else: - c_call = "\n c_retval = %s(%s);\n" % (name, c_call); + c_call = "\n c_retval = %s(%s);\n" % (name, c_call) ret_convert = " py_retval = libvirt_%sWrap((%s) c_retval);\n" % (n,c) ret_convert = ret_convert + " return py_retval;\n" elif py_return_types.has_key(ret[0]): (f, t, n, c) = py_return_types[ret[0]] c_return = " %s c_retval;\n" % (ret[0]) - c_call = "\n c_retval = %s(%s);\n" % (name, c_call); + c_call = "\n c_retval = %s(%s);\n" % (name, c_call) ret_convert = " py_retval = libvirt_%sWrap((%s) c_retval);\n" % (n,c) ret_convert = ret_convert + " return py_retval;\n" else: @@ -705,31 +705,31 @@ def print_function_wrapper(module, name, output, export, include): include.write("PyObject * ") if module == "libvirt": - include.write("libvirt_%s(PyObject *self, PyObject *args);\n" % (name)); + include.write("libvirt_%s(PyObject *self, PyObject *args);\n" % (name)) export.write(" { (char *)\"%s\", libvirt_%s, METH_VARARGS, NULL },\n" % (name, name)) elif module == "libvirt-lxc": - include.write("libvirt_lxc_%s(PyObject *self, PyObject *args);\n" % (name)); + include.write("libvirt_lxc_%s(PyObject *self, PyObject *args);\n" % (name)) export.write(" { (char *)\"%s\", libvirt_lxc_%s, METH_VARARGS, NULL },\n" % (name, name)) elif module == "libvirt-qemu": - include.write("libvirt_qemu_%s(PyObject *self, PyObject *args);\n" % (name)); + include.write("libvirt_qemu_%s(PyObject *self, PyObject *args);\n" % (name)) export.write(" { (char *)\"%s\", libvirt_qemu_%s, METH_VARARGS, NULL },\n" % (name, name)) if file == "python": # Those have been manually generated if cond != None and cond != "": - include.write("#endif\n"); - export.write("#endif\n"); - output.write("#endif\n"); + include.write("#endif\n") + export.write("#endif\n") + output.write("#endif\n") return 1 if file == "python_accessor" and ret[0] != "void" and ret[2] is None: # Those have been manually generated if cond != None and cond != "": - include.write("#endif\n"); - export.write("#endif\n"); - output.write("#endif\n"); + include.write("#endif\n") + export.write("#endif\n") + output.write("#endif\n") return 1 output.write("PyObject *\n") @@ -756,9 +756,9 @@ def print_function_wrapper(module, name, output, export, include): if c_convert != "": output.write(c_convert + "\n") - output.write(" LIBVIRT_BEGIN_ALLOW_THREADS;"); - output.write(c_call); - output.write(" LIBVIRT_END_ALLOW_THREADS;\n"); + output.write(" LIBVIRT_BEGIN_ALLOW_THREADS;") + output.write(c_call) + output.write(" LIBVIRT_END_ALLOW_THREADS;\n") output.write(ret_convert) output.write("}\n\n") if cond != None and cond != "": @@ -1195,7 +1195,7 @@ def writeDoc(module, name, args, indent, output): if funcs[name][0] is None or funcs[name][0] == "": return val = funcs[name][0] - val = string.replace(val, "NULL", "None"); + val = string.replace(val, "NULL", "None") output.write(indent) output.write('"""') i = string.find(val, "\n") @@ -1261,7 +1261,7 @@ def buildWrappers(module): ctypes_processed[type] = () for name in functions.keys(): - found = 0; + found = 0 (desc, ret, args, file, mod, cond) = functions[name] for type in ctypes: classe = classes_type[type][2] @@ -1331,7 +1331,7 @@ def buildWrappers(module): classes.write("%s" % arg[0]) n = n + 1 classes.write("):\n") - writeDoc(module, name, args, ' ', classes); + writeDoc(module, name, args, ' ', classes) for arg in args: if classes_type.has_key(arg[1]): @@ -1340,19 +1340,19 @@ def buildWrappers(module): classes.write(" else: %s__o = %s%s\n" % (arg[0], arg[0], classes_type[arg[1]][0])) if ret[0] != "void": - classes.write(" ret = "); + classes.write(" ret = ") else: - classes.write(" "); + classes.write(" ") classes.write("libvirtmod.%s(" % name) n = 0 for arg in args: if n != 0: - classes.write(", "); + classes.write(", ") classes.write("%s" % arg[0]) if classes_type.has_key(arg[1]): - classes.write("__o"); + classes.write("__o") n = n + 1 - classes.write(")\n"); + classes.write(")\n") if ret[0] != "void": if classes_type.has_key(ret[0]): @@ -1360,15 +1360,15 @@ def buildWrappers(module): # Raise an exception # if functions_noexcept.has_key(name): - classes.write(" if ret is None:return None\n"); + classes.write(" if ret is None:return None\n") else: classes.write( " if ret is None:raise libvirtError('%s() failed')\n" % (name)) - classes.write(" return "); - classes.write(classes_type[ret[0]][1] % ("ret")); - classes.write("\n"); + classes.write(" return ") + classes.write(classes_type[ret[0]][1] % ("ret")) + classes.write("\n") # For functions returning an integral type there are # several things that we can do, depending on the @@ -1398,7 +1398,7 @@ def buildWrappers(module): else: classes.write(" return ret\n") - classes.write("\n"); + classes.write("\n") for classname in classes_list: if classname == "None": @@ -1441,14 +1441,14 @@ def buildWrappers(module): classes.write(" self._dom = dom\n") classes.write(" self._conn = dom.connect()\n") classes.write(" if _obj != None:self._o = _obj;return\n") - classes.write(" self._o = None\n\n"); + classes.write(" self._o = None\n\n") destruct=None if classes_destructors.has_key(classname): classes.write(" def __del__(self):\n") classes.write(" if self._o != None:\n") classes.write(" libvirtmod.%s(self._o)\n" % - classes_destructors[classname]); - classes.write(" self._o = None\n\n"); + classes_destructors[classname]) + classes.write(" self._o = None\n\n") destruct=classes_destructors[classname] if not class_skip_connect_impl.has_key(classname): @@ -1470,7 +1470,7 @@ def buildWrappers(module): # to avoid double free # if name == destruct: - continue; + continue if file != oldfile: if file == "python_accessor": classes.write(" # accessors for %s\n" % (classname)) @@ -1487,7 +1487,7 @@ def buildWrappers(module): classes.write(", %s" % arg[0]) n = n + 1 classes.write("):\n") - writeDoc(module, name, args, ' ', classes); + writeDoc(module, name, args, ' ', classes) n = 0 for arg in args: if classes_type.has_key(arg[1]): @@ -1498,24 +1498,24 @@ def buildWrappers(module): (arg[0], arg[0], classes_type[arg[1]][0])) n = n + 1 if ret[0] != "void": - classes.write(" ret = "); + classes.write(" ret = ") else: - classes.write(" "); + classes.write(" ") n = 0 classes.write("libvirtmod.%s(" % name) for arg in args: if n != 0: - classes.write(", "); + classes.write(", ") if n != index: classes.write("%s" % arg[0]) if classes_type.has_key(arg[1]): - classes.write("__o"); + classes.write("__o") else: - classes.write("self"); + classes.write("self") if classes_type.has_key(arg[1]): classes.write(classes_type[arg[1]][0]) n = n + 1 - classes.write(")\n"); + classes.write(")\n") if name == "virConnectClose": classes.write(" self._o = None\n") @@ -1528,7 +1528,7 @@ def buildWrappers(module): # if functions_noexcept.has_key(name): classes.write( - " if ret is None:return None\n"); + " if ret is None:return None\n") else: if classname == "virConnect": classes.write( @@ -1566,9 +1566,9 @@ def buildWrappers(module): # # generate the returned class wrapper for the object # - classes.write(" __tmp = "); - classes.write(classes_type[ret[0]][1] % ("ret")); - classes.write("\n"); + classes.write(" __tmp = ") + classes.write(classes_type[ret[0]][1] % ("ret")) + classes.write("\n") # # Sometime one need to keep references of the source @@ -1586,28 +1586,28 @@ def buildWrappers(module): # Post-processing - just before we return. if function_post.has_key(name): classes.write(" %s\n" % - (function_post[name])); + (function_post[name])) # # return the class # - classes.write(" return __tmp\n"); + classes.write(" return __tmp\n") elif converter_type.has_key(ret[0]): # # Raise an exception # if functions_noexcept.has_key(name): classes.write( - " if ret is None:return None"); + " if ret is None:return None") # Post-processing - just before we return. if function_post.has_key(name): classes.write(" %s\n" % - (function_post[name])); + (function_post[name])) - classes.write(" return "); - classes.write(converter_type[ret[0]] % ("ret")); - classes.write("\n"); + classes.write(" return ") + classes.write(converter_type[ret[0]] % ("ret")) + classes.write("\n") # For functions returning an integral type there # are several things that we can do, depending on @@ -1650,7 +1650,7 @@ def buildWrappers(module): # Post-processing - just before we return. if function_post.has_key(name): classes.write(" %s\n" % - (function_post[name])); + (function_post[name])) classes.write (" return ret\n") @@ -1692,7 +1692,7 @@ def buildWrappers(module): # Post-processing - just before we return. if function_post.has_key(name): classes.write(" %s\n" % - (function_post[name])); + (function_post[name])) classes.write (" return ret\n") @@ -1700,11 +1700,11 @@ def buildWrappers(module): # Post-processing - just before we return. if function_post.has_key(name): classes.write(" %s\n" % - (function_post[name])); + (function_post[name])) - classes.write(" return ret\n"); + classes.write(" return ret\n") - classes.write("\n"); + classes.write("\n") # Append "<classname>.py" to class def, iff it exists try: extra = open(os.path.join(srcPref,"libvirt-override-" + classname + ".py"), "r") @@ -1726,7 +1726,7 @@ def buildWrappers(module): items.sort(lambda i1,i2: cmp(long(i1[1]),long(i2[1]))) for name,value in items: classes.write("%s = %s\n" % (name,value)) - classes.write("\n"); + classes.write("\n") classes.close() @@ -1776,7 +1776,7 @@ def qemuBuildWrappers(module): fd.write(" if str(cyg_e).count(\"No module named\"):\n") fd.write(" raise lib_e\n\n") - fd.write("import libvirt\n\n"); + fd.write("import libvirt\n\n") fd.write("#\n# Functions from module %s\n#\n\n" % module) # # Generate functions directly, no classes @@ -1792,12 +1792,12 @@ def qemuBuildWrappers(module): fd.write("%s" % arg[0]) n = n + 1 fd.write("):\n") - writeDoc(module, name, args, ' ', fd); + writeDoc(module, name, args, ' ', fd) if ret[0] != "void": - fd.write(" ret = "); + fd.write(" ret = ") else: - fd.write(" "); + fd.write(" ") fd.write("libvirtmod_qemu.%s(" % name) n = 0 @@ -1808,7 +1808,7 @@ def qemuBuildWrappers(module): conn = arg[0] if n != 0: - fd.write(", "); + fd.write(", ") if arg[1] in ["virDomainPtr", "virConnectPtr"]: # FIXME: This might have problem if the function # has multiple args which are objects. @@ -1816,7 +1816,7 @@ def qemuBuildWrappers(module): else: fd.write("%s" % arg[0]) n = n + 1 - fd.write(")\n"); + fd.write(")\n") if ret[0] != "void": fd.write(" if ret is None: raise libvirt.libvirtError('" + name + "() failed')\n") @@ -1837,7 +1837,7 @@ def qemuBuildWrappers(module): items.sort(lambda i1,i2: cmp(long(i1[1]),long(i2[1]))) for name,value in items: fd.write("%s = %s\n" % (name,value)) - fd.write("\n"); + fd.write("\n") fd.close() @@ -1888,7 +1888,7 @@ def lxcBuildWrappers(module): fd.write(" if str(cyg_e).count(\"No module named\"):\n") fd.write(" raise lib_e\n\n") - fd.write("import libvirt\n\n"); + fd.write("import libvirt\n\n") fd.write("#\n# Functions from module %s\n#\n\n" % module) # # Generate functions directly, no classes @@ -1904,12 +1904,12 @@ def lxcBuildWrappers(module): fd.write("%s" % arg[0]) n = n + 1 fd.write("):\n") - writeDoc(module, name, args, ' ', fd); + writeDoc(module, name, args, ' ', fd) if ret[0] != "void": - fd.write(" ret = "); + fd.write(" ret = ") else: - fd.write(" "); + fd.write(" ") fd.write("libvirtmod_lxc.%s(" % name) n = 0 @@ -1920,7 +1920,7 @@ def lxcBuildWrappers(module): conn = arg[0] if n != 0: - fd.write(", "); + fd.write(", ") if arg[1] in ["virDomainPtr", "virConnectPtr"]: # FIXME: This might have problem if the function # has multiple args which are objects. @@ -1928,7 +1928,7 @@ def lxcBuildWrappers(module): else: fd.write("%s" % arg[0]) n = n + 1 - fd.write(")\n"); + fd.write(")\n") if ret[0] != "void": fd.write(" if ret is None: raise libvirt.libvirtError('" + name + "() failed')\n") @@ -1949,7 +1949,7 @@ def lxcBuildWrappers(module): items.sort(lambda i1,i2: cmp(long(i1[1]),long(i2[1]))) for name,value in items: fd.write("%s = %s\n" % (name,value)) - fd.write("\n"); + fd.write("\n") fd.close() diff --git a/python/libvirt-override-virConnect.py b/python/libvirt-override-virConnect.py index 84d6cc3..121ef6f 100644 --- a/python/libvirt-override-virConnect.py +++ b/python/libvirt-override-virConnect.py @@ -132,7 +132,7 @@ opaque = cbData["opaque"] cb(self, virDomain(self, _obj=dom), oldSrcPath, newSrcPath, devAlias, reason, opaque) - return 0; + return 0 def _dispatchDomainEventTrayChangeCallback(self, dom, devAlias, reason, cbData): """Dispatches event to python user domain trayChange event callbacks @@ -141,7 +141,7 @@ opaque = cbData["opaque"] cb(self, virDomain(self, _obj=dom), devAlias, reason, opaque) - return 0; + return 0 def _dispatchDomainEventPMWakeupCallback(self, dom, reason, cbData): """Dispatches event to python user domain pmwakeup event callbacks @@ -150,7 +150,7 @@ opaque = cbData["opaque"] cb(self, virDomain(self, _obj=dom), reason, opaque) - return 0; + return 0 def _dispatchDomainEventPMSuspendCallback(self, dom, reason, cbData): """Dispatches event to python user domain pmsuspend event callbacks @@ -159,7 +159,7 @@ opaque = cbData["opaque"] cb(self, virDomain(self, _obj=dom), reason, opaque) - return 0; + return 0 def _dispatchDomainEventBalloonChangeCallback(self, dom, actual, cbData): """Dispatches events to python user domain balloon change event callbacks @@ -177,7 +177,7 @@ opaque = cbData["opaque"] cb(self, virDomain(self, _obj=dom), reason, opaque) - return 0; + return 0 def domainEventDeregisterAny(self, callbackID): """Removes a Domain Event Callback. De-registering for a diff --git a/python/tests/create.py b/python/tests/create.py index 95e31a9..815ccc4 100755 --- a/python/tests/create.py +++ b/python/tests/create.py @@ -128,7 +128,7 @@ while i < 30: except: okay = 0 t = -1 - break; + break if t == 0: break -- 1.7.10.4

2 1

[libvirt] [PATCH] Cosmetics: Remove semicolons
by Guido Günther 07 Feb '13

07 Feb '13

It's Python, not C --- python/libvirt-override.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/python/libvirt-override.py b/python/libvirt-override.py index 8427eab..82d7dcb 100644 --- a/python/libvirt-override.py +++ b/python/libvirt-override.py @@ -107,9 +107,9 @@ def getVersion (name = None): Versions numbers are integers: 1000000*major + 1000*minor + release.""" if name is None: - ret = libvirtmod.virGetVersion (); + ret = libvirtmod.virGetVersion () else: - ret = libvirtmod.virGetVersion (name); + ret = libvirtmod.virGetVersion (name) if ret is None: raise libvirtError ("virGetVersion() failed") return ret @@ -132,7 +132,7 @@ def _eventInvokeHandleCallback(watch, fd, event, opaque, opaquecompat=None): callback = opaque[0] opaque = opaque[1] - libvirtmod.virEventInvokeHandleCallback(watch, fd, event, callback, opaque); + libvirtmod.virEventInvokeHandleCallback(watch, fd, event, callback, opaque) # # Invoke an EventTimeout callback @@ -152,7 +152,7 @@ def _eventInvokeTimeoutCallback(timer, opaque, opaquecompat=None): callback = opaque[0] opaque = opaque[1] - libvirtmod.virEventInvokeTimeoutCallback(timer, callback, opaque); + libvirtmod.virEventInvokeTimeoutCallback(timer, callback, opaque) def _dispatchEventHandleCallback(watch, fd, events, cbData): cb = cbData["cb"] -- 1.7.10.4

2 2

[libvirt] Failed to to connect socket to '/var/run/libvirt/libvirt-sock': Connection refused
by Yin Olivia-R63875 07 Feb '13

07 Feb '13

Hi, I tried to build and run libvirt-1.0.1 on FSL PowerPC platform. The connection to '/var/run/libvirt/libvirt-sock' is always refused. # libvirtd -d # export LIBVIRT_DEBUG=1 # export LIBVIRT_LOG_OUTPUTS="1:file:virsh.log" # virsh -c qemu:///system list 2013-01-10 04:55:20.409+0000: 2574: info : libvirt version: 1.0.1 2013-01-10 04:55:20.409+0000: 2574: debug : virLogParseOutputs:1288 : outputs=1:file:virsh.log error: failed to connect to the hypervisor error: Failed to connect socket to '/var/run/libvirt/libvirt-sock': Connection refused Exactly it could work with libvirt-0.10.1. Below are the debug messages with both versions. # cat virsh.log ------------------------- 1). libvirt-1.0.1 ------------------------- <cut> 2013-01-10 06:12:12.107+0000: 2340: debug : do_open:1145 : name "qemu:///system" to URI components: scheme qemu server (null) user (null) port 0 path /system 2013-01-10 06:12:12.107+0000: 2340: debug : do_open:1191 : trying driver 0 (Test) ... 2013-01-10 06:12:12.107+0000: 2340: debug : do_open:1197 : driver 0 Test returned DECLINED 2013-01-10 06:12:12.107+0000: 2340: debug : do_open:1191 : trying driver 1 (OPENVZ) ... 2013-01-10 06:12:12.107+0000: 2340: debug : do_open:1197 : driver 1 OPENVZ returned DECLINED 2013-01-10 06:12:12.107+0000: 2340: debug : do_open:1191 : trying driver 2 (VMWARE) ... 2013-01-10 06:12:12.107+0000: 2340: debug : do_open:1197 : driver 2 VMWARE returned DECLINED 2013-01-10 06:12:12.107+0000: 2340: debug : do_open:1191 : trying driver 3 (VBOX) ... 2013-01-10 06:12:12.107+0000: 2340: debug : do_open:1197 : driver 3 VBOX returned DECLINED 2013-01-10 06:12:12.108+0000: 2340: debug : do_open:1191 : trying driver 4 (remote) ... 2013-01-10 06:12:12.108+0000: 2340: debug : doRemoteOpen:586 : proceeding with name = qemu:///system 2013-01-10 06:12:12.108+0000: 2340: debug : doRemoteOpen:595 : Connecting with transport 1 2013-01-10 06:12:12.108+0000: 2340: debug : doRemoteOpen:671 : Proceeding with sockname /var/run/libvirt/libvirt-sock 2013-01-10 06:12:12.108+0000: 2340: error : virNetSocketNewConnectUNIX:570 : Failed to connect socket to '/var/run/libvirt/libvirt-sock': Connection refused 2013-01-10 06:12:12.108+0000: 2340: debug : virFileClose:72 : Closed fd 7 2013-01-10 06:12:12.108+0000: 2340: debug : virNetClientCloseInternal:698 : client=(nil) wantclose=0 2013-01-10 06:12:12.108+0000: 2340: debug : do_open:1197 : driver 4 remote returned ERROR 2013-01-10 06:12:12.108+0000: 2340: debug : virObjectUnref:135 : OBJECT_UNREF: obj=0x48900648 2013-01-10 06:12:12.108+0000: 2340: debug : virObjectUnref:137 : OBJECT_DISPOSE: obj=0x48900648 2013-01-10 06:12:12.108+0000: 2340: debug : virEventPollAddTimeout:225 : Used 0 timeout slots, adding at least 10 more 2013-01-10 06:12:12.108+0000: 2340: debug : virEventPollInterruptLocked:716 : Interrupting 2013-01-10 06:12:12.108+0000: 2340: debug : virEventPollAddTimeout:248 : EVENT_POLL_ADD_TIMEOUT: timer=1 frequency=0 cb=0x10008624 opa 2013-01-10 06:12:12.108+0000: 2341: debug : virEventPollRunOnce:640 : Poll got 1 event(s) 2013-01-10 06:12:12.108+0000: 2341: debug : virEventPollDispatchTimeouts:425 : Dispatch 1 2013-01-10 06:12:12.108+0000: 2341: debug : virEventPollDispatchTimeouts:448 : EVENT_POLL_DISPATCH_TIMEOUT: timer=1 2013-01-10 06:12:12.108+0000: 2341: debug : virEventPollDispatchHandles:470 : Dispatch 1 2013-01-10 06:12:12.108+0000: 2341: debug : virEventPollDispatchHandles:484 : i=0 w=1 2013-01-10 06:12:12.108+0000: 2341: debug : virEventPollDispatchHandles:498 : EVENT_POLL_DISPATCH_HANDLE: watch=1 events=1 2013-01-10 06:12:12.108+0000: 2341: debug : virEventPollCleanupTimeouts:516 : Cleanup 1 2013-01-10 06:12:12.108+0000: 2341: debug : virEventPollCleanupHandles:564 : Cleanup 1 2013-01-10 06:12:12.108+0000: 2340: debug : virEventPollRemoveTimeout:300 : EVENT_POLL_REMOVE_TIMEOUT: timer=1 2013-01-10 06:12:12.108+0000: 2340: debug : virEventPollInterruptLocked:712 : Skip interrupt, 0 1216382096 <cut> ------------------------- 2). libvirt-0.10.1 ------------------------- <cut> 2013-01-10 06:06:27.275+0000: 2393: debug : do_open:1127 : name "qemu:///system" to URI components: scheme qemu server (null) user (null) port 0 path /system 2013-01-10 06:06:27.275+0000: 2393: debug : do_open:1174 : trying driver 0 (Test) ... 2013-01-10 06:06:27.275+0000: 2393: debug : do_open:1180 : driver 0 Test returned DECLINED 2013-01-10 06:06:27.275+0000: 2393: debug : do_open:1174 : trying driver 1 (OPENVZ) ... 2013-01-10 06:06:27.275+0000: 2393: debug : do_open:1180 : driver 1 OPENVZ returned DECLINED 2013-01-10 06:06:27.275+0000: 2393: debug : do_open:1174 : trying driver 2 (VMWARE) ... 2013-01-10 06:06:27.275+0000: 2393: debug : do_open:1180 : driver 2 VMWARE returned DECLINED 2013-01-10 06:06:27.275+0000: 2393: debug : do_open:1174 : trying driver 3 (VBOX) ... 2013-01-10 06:06:27.275+0000: 2393: debug : do_open:1180 : driver 3 VBOX returned DECLINED 2013-01-10 06:06:27.275+0000: 2393: debug : do_open:1174 : trying driver 4 (remote) ... 2013-01-10 06:06:27.275+0000: 2393: debug : doRemoteOpen:576 : proceeding with name = qemu:///system 2013-01-10 06:06:27.276+0000: 2393: debug : doRemoteOpen:585 : Connecting with transport 1 2013-01-10 06:06:27.276+0000: 2393: debug : doRemoteOpen:661 : Proceeding with sockname /var/run/libvirt/libvirt-sock 2013-01-10 06:06:27.277+0000: 2393: debug : virNetSocketNew:146 : localAddr=0xbff169d4 remoteAddr=0xbff16a58 fd=7 errfd=-1 pid=0 2013-01-10 06:06:27.277+0000: 2393: debug : virObjectNew:110 : OBJECT_NEW: obj=0x48900dc8 classname=virNetSocket 2013-01-10 06:06:27.277+0000: 2393: debug : virNetSocketNew:203 : RPC_SOCKET_NEW: sock=0x48900dc8 fd=7 errfd=-1 pid=0 localAddr=127.0. 2013-01-10 06:06:27.277+0000: 2393: debug : virObjectNew:110 : OBJECT_NEW: obj=0x48900ff8 classname=virNetClient 2013-01-10 06:06:27.277+0000: 2393: debug : virNetClientNew:342 : RPC_CLIENT_NEW: client=0x48900ff8 sock=0x48900dc8 2013-01-10 06:06:27.277+0000: 2393: debug : virObjectRef:168 : OBJECT_REF: obj=0x48900ff8 2013-01-10 06:06:27.277+0000: 2393: debug : virObjectRef:168 : OBJECT_REF: obj=0x48900dc8 2013-01-10 06:06:27.277+0000: 2393: debug : virEventPollInterruptLocked:701 : Interrupting 2013-01-10 06:06:27.277+0000: 2393: debug : virEventPollAddHandle:136 : EVENT_POLL_ADD_HANDLE: watch=2 fd=7 events=1 cb=0xf7bad00 opaq 2013-01-10 06:06:27.277+0000: 2394: debug : virEventPollRunOnce:625 : Poll got 1 event(s) 2013-01-10 06:06:27.277+0000: 2393: debug : virKeepAliveNew:212 : client=0x48900ff8, interval=-1, count=0 <cut> I checked the source codes of function src/rpc/virnetsocket.c and there's no change on function virNetSocketNewConnectUNIX(). Best Regards, Olivia

1 0

[libvirt] [PATCH 0/8 v2] Persistent vHBA support in storage pool
by Osier Yang 06 Feb '13

06 Feb '13

This is the 3rd part to implement NPIV migration support [1]. Part 1: (New version) https://www.redhat.com/archives/libvir-list/2013-February/msg00112.html Part 2: (Already ACKed by Michal) https://www.redhat.com/archives/libvir-list/2013-January/msg00859.html Part 4: (Partly ACKed by John) https://www.redhat.com/archives/libvir-list/2013-January/msg02113.html The patches are based on Part 2. The new XMLs might be too long, might be deserved to have them as sub-elements of <adapter>. But I'd like to see the feedback first. Osier Yang (8): New XML attributes for storage pool source adapter storage: Make the adapter name be consistent with node device driver storage: Move virStorageBackendSCSIGetHostNumber into iscsi backend phyp: Prohibit fc_host adapter for phyp driver util: Add helper to get the scsi host name by iterating over sysfs util: Fix bug of managing vport storage: Add startPool and stopPool for scsi backend storage: Guess the parent if it's not specified for vHBA docs/formatstorage.html.in | 15 ++- docs/schemas/storagepool.rng | 33 +++++- src/conf/storage_conf.c | 123 ++++++++++++++++-- src/conf/storage_conf.h | 23 +++- src/libvirt_private.syms | 4 + src/phyp/phyp_driver.c | 15 ++- src/storage/storage_backend_iscsi.c | 39 ++++++- src/storage/storage_backend_scsi.c | 190 +++++++++++++++++++-------- src/storage/storage_backend_scsi.h | 3 - src/util/virutil.c | 196 +++++++++++++++++++++++++++- src/util/virutil.h | 7 + tests/storagepoolxml2xmlin/pool-scsi.xml | 2 +- tests/storagepoolxml2xmlin/pool-scsi1.xml | 15 ++ tests/storagepoolxml2xmlout/pool-scsi.xml | 2 +- tests/storagepoolxml2xmlout/pool-scsi1.xml | 18 +++ tests/storagepoolxml2xmltest.c | 1 + 16 files changed, 602 insertions(+), 84 deletions(-) create mode 100644 tests/storagepoolxml2xmlin/pool-scsi1.xml create mode 100644 tests/storagepoolxml2xmlout/pool-scsi1.xml [1] https://www.redhat.com/archives/libvir-list/2012-November/msg00826.html Regards, Osier

3 19

[libvirt] [PATCH v3 00/13] documentation improvements, code blocks with syntax highlighting
by Claudio Bley 06 Feb '13

06 Feb '13

Hi. This is version 3 of https://www.redhat.com/archives/libvir-list/2013-January/msg02026.html combined with pre-requisite patches from https://www.redhat.com/archives/libvir-list/2013-January/msg02071.html Summary of the changes: - patch #1 to #4 are adding / fixing missing documentation, which is required so the next patch does not break the build - patch #5 aborts the build when documentation is missing for function arguments or the return value, except for those functions being part of the "ignored_functions" dictionary - patch #11 also adds an exception to syntax rules for the generated SHJS files - patch #12, #13 just add some indentation to make code blocks properly recognized This time, I did use make check and make syntax-check after every patch, so this should be OK. (fingers crossed) Claudio Bley (13): libvirt.h.in: add missing documentation for virConnectCloseFunc libvirt.h.in: fix documentation for virConnectDomainEventBlockJobCallback libvirt.h.in: add missing return doc for virEventRemoveHandleFunc libvirt.h.in: document virConnectDomainEventCallback's return value docs: abort when missing return or argument documentation docs: only generate function argument info for args with a description docs: use div, not table, for notices on opaque types docs: process code blocks similar to markdown docs: add class "description" to div's containing descriptions docs: define style of code blocks inside descriptions docs: syntax highlight code blocks using SHJS libvirt.c: indent code of virDomainGetMemoryParameters's documentation libvirt.c: add 2 spaces of indentation to example code cfg.mk | 2 +- docs/apibuild.py | 18 +++- docs/libvirt.css | 8 ++ docs/newapi.xsl | 209 +++++++++++++++++++++++++----------------- docs/page.xsl | 5 +- docs/sh_c.min.js | 1 + docs/sh_emacs.min.css | 1 + docs/sh_main.min.js | 4 + include/libvirt/libvirt.h.in | 16 +++- src/libvirt.c | 130 +++++++++++++------------- 10 files changed, 241 insertions(+), 153 deletions(-) create mode 100644 docs/sh_c.min.js create mode 100644 docs/sh_emacs.min.css create mode 100644 docs/sh_main.min.js -- 1.7.9.5

2 37

[libvirt] [Patch]Fix bugs of Sheepdog storage driver
by harryxiyou＠gmail.com 06 Feb '13

06 Feb '13

Signed-off-by: Harry Wei <harryxiyou(a)gmail.com> --- src/storage/storage_backend_sheepdog.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/src/storage/storage_backend_sheepdog.c b/src/storage/storage_backend_sheepdog.c index cd18f33..2cbfe01 100644 --- a/src/storage/storage_backend_sheepdog.c +++ b/src/storage/storage_backend_sheepdog.c @@ -168,9 +168,12 @@ virStorageBackendSheepdogCreateVol(virConnectPtr conn ATTRIBUTE_UNUSED, virCommandAddArgFormat(cmd, "%llu", vol->capacity); virStorageBackendSheepdogAddHostArg(cmd, pool); ret = virCommandRun(cmd, NULL); + if (ret < 0) + goto cleanup; - virStorageBackendSheepdogRefreshVol(conn, pool, vol); + ret = virStorageBackendSheepdogRefreshVol(conn, pool, vol); +cleanup: virCommandFree(cmd); return ret; } -- 1.7.0.4

2 1

[libvirt] [PATCH v2 0/6] Add support for qcow3 images
by Ján Tomko 06 Feb '13

06 Feb '13

Add support for creating qcow3 images with or without lazy_refcounts, using them with qemu and creating snapshots (both internal and external). Diff to V1: https://www.redhat.com/archives/libvir-list/2013-January/msg00610.html * only use one bitmap for all features (and one <features> element) * support snapshots * detect which features are supported by qemu-img Ján Tomko (6): storage: refactor qemu-img command line generation util: use helper functions for extracting image headers util: add support for probing qcow3 images qemu: add support for running domains with qcow3 images storage: add support for creating qcow3 images qemu: add qcow3 support to external snapshots docs/formatsnapshot.html.in | 7 + docs/formatstorage.html.in | 14 +- docs/schemas/Makefile.am | 1 + docs/schemas/domaincommon.rng | 1 + docs/schemas/domainsnapshot.rng | 4 + docs/schemas/storagefeatures.rng | 17 +++ docs/schemas/storagevol.rng | 6 +- libvirt.spec.in | 1 + mingw-libvirt.spec.in | 2 + src/conf/snapshot_conf.c | 63 +++++++++ src/conf/snapshot_conf.h | 2 + src/conf/storage_conf.c | 69 ++++++++++ src/conf/storage_conf.h | 4 + src/libvirt_private.syms | 4 + src/qemu/qemu_command.c | 2 +- src/qemu/qemu_driver.c | 24 +++- src/qemu/qemu_hotplug.c | 4 +- src/storage/storage_backend.c | 189 ++++++++++++++++++------- src/storage/storage_backend_fs.c | 6 + src/util/virstoragefile.c | 288 ++++++++++++++++++++++++++------------- src/util/virstoragefile.h | 13 ++ 21 files changed, 565 insertions(+), 156 deletions(-) create mode 100644 docs/schemas/storagefeatures.rng -- 1.7.12.4

2 12

[libvirt] [Patch]Sheepdog storage driver ignore refreshVol func's return value
by harryxiyou 06 Feb '13

06 Feb '13

Hi all, In libvirt/src/storage/storage_backend_sheepdog.c file, func virStorageBackendSheepdogCreateVol calls func virStorageBackendSheepdogRefreshVol to refresh Sheepdog volume infos. But we do not check func virStorageBackendSheepdogRefreshVol's return value. Following patch can fix this bug. Signed-off-by: Harry Wei <harryxiyou(a)gmail.com> Subject: [PATCH] sheepdog driver ignore return value for refresh volume --- src/storage/storage_backend_sheepdog.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/src/storage/storage_backend_sheepdog.c b/src/storage/storage_backend_sheepdog.c index 66d8fb4..e72c944 100644 --- a/src/storage/storage_backend_sheepdog.c +++ b/src/storage/storage_backend_sheepdog.c @@ -168,9 +168,12 @@ virStorageBackendSheepdogCreateVol(virConnectPtr conn ATTRIBUTE_UNUSED, virCommandAddArgFormat(cmd, "%llu", vol->capacity); virStorageBackendSheepdogAddHostArg(cmd, pool); ret = virCommandRun(cmd, NULL); + if (0 > ret) + goto cleanup; - virStorageBackendSheepdogRefreshVol(conn, pool, vol); + ret = virStorageBackendSheepdogRefreshVol(conn, pool, vol); +cleanup: virCommandFree(cmd); return ret; } -- 1.7.0.4 -- Thanks Harry Wei

2 2

[libvirt] [PATCH] build: fix build of HAL node backend
by Eric Blake 06 Feb '13

06 Feb '13

Commit 2025356 missed uses of PCI functions in the older HAL-related code, probably because hal-devel is no longer available in latest Fedora. * src/node_device/node_device_hal.c (gather_pci_cap): Reflect function rename. --- Pushing under the build-breaker rule. src/node_device/node_device_hal.c | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/node_device/node_device_hal.c b/src/node_device/node_device_hal.c index 610df8d..2ecb1de 100644 --- a/src/node_device/node_device_hal.c +++ b/src/node_device/node_device_hal.c @@ -1,7 +1,7 @@ /* * node_device_hal.c: node device enumeration - HAL-based implementation * - * Copyright (C) 2011 Red Hat, Inc. + * Copyright (C) 2011, 2013 Red Hat, Inc. * Copyright (C) 2008 Virtual Iron Software, Inc. * Copyright (C) 2008 David F. Lively * @@ -148,10 +148,12 @@ static int gather_pci_cap(LibHalContext *ctx, const char *udi, (void)virStrToLong_ui(p+1, &p, 16, &d->pci_dev.function); } - if (!pciGetPhysicalFunction(sysfs_path, &d->pci_dev.physical_function)) + if (!virPCIGetPhysicalFunction(sysfs_path, + &d->pci_dev.physical_function)) d->pci_dev.flags |= VIR_NODE_DEV_CAP_FLAG_PCI_PHYSICAL_FUNCTION; - if (!pciGetVirtualFunctions(sysfs_path, &d->pci_dev.virtual_functions, + if (!virPCIGetVirtualFunctions(sysfs_path, + &d->pci_dev.virtual_functions, &d->pci_dev.num_virtual_functions) || d->pci_dev.num_virtual_functions > 0) d->pci_dev.flags |= VIR_NODE_DEV_CAP_FLAG_PCI_VIRTUAL_FUNCTION; -- 1.7.1

2 1

[libvirt] virsh nodeinfo CPU detection questions
by Scott Sullivan 06 Feb '13

06 Feb '13

I have a machine with four AMD Opteron(TM) 6272 processors: http://www.amd.com/us/products/server/processors/6000-series-platform/6200/… I use 'virsh nodeinfo' to determine the amount of physical CPUs, and CPU cores. What values should I be looking at in the output of nodeinfo to determine this? With 1.X libvirts the output values have changed from 0.9.4: 0.9.4: [root@host ~]# virsh nodeinfo CPU model: x86_64 CPU(s): 64 CPU frequency: 2099 MHz CPU socket(s): 4 Core(s) per socket: 8 Thread(s) per core: 2 NUMA cell(s): 1 Memory size: 24713980 kB [root@host28 ~]# 1.0.1: [root@host ~]# virsh nodeinfo CPU model: x86_64 CPU(s): 64 CPU frequency: 2099 MHz CPU socket(s): 1 Core(s) per socket: 8 Thread(s) per core: 2 NUMA cell(s): 4 Memory size: 24713980 KiB [root@host28 ~]# As you can see, the CPU socket and NUMA cells values have changed in these two versions, on the same machine. To get the physical CPU count, is it safe to assume this? Numa cell(s) X CPU Socket(s) == physical CPUs present However, I am not positive what formula I should use to determine the CPU core count. On this processor, it has 16 cores. Would that mean I can do this? Core(s) per socket X Thread(s) per core: == CPU cores Thanks in advance for clarifying.

4 7

[libvirt] [PATCH V2 0/3] Add support for QEMU file descriptor sets
by Stefan Berger 06 Feb '13

06 Feb '13

The following patch series adds initial support for QEMU file descriptor sets implementing support for creating the proper command line. Some devices are using the sets now. Regards, Stefan

2 10

[libvirt] [PATCH 00/11] Resolution to various Coverity warnings
by John Ferlan 05 Feb '13

05 Feb '13

I upgraded to a new version of Coverity last night (6.5.1) since I was informed it resolved the BAD_SIZEOF errors from the TRACE macros. A majority were resolved, except for 3 which just required a couple of changes to avoid. Since I was down to only a few warnings I tried ratcheting up the analysis "aggressiveness-level" from the default of low to medium and high. There many false positives out of those, but I did manage to find a few more leaks and a missing error check in openvz_driver.c. After this series only a couple of warnings exist in the tests area; however, I've seen IRC chatter on vircommand.c and commandtest.c, so I'll patiently wait on that. There are some warnings in a couple of gnulib modules as well as /usr/include/bits/stdio2.h. John Ferlan (11): tlscontext: Make sure to get proper pointer to name keepalive: Resolve Coverity complaint storage: Resolve resource leaks with cmd processing network: Remove conditional settings to resolve resource leak parallels: Need to free memory on error path openvz: Need to error check openvzDomainSetVcpusFlagsInternal() uml: If need to requery, then VIR_FREE(res) rpc: Need to virCommandFree on error path lxc: Need to call usbFreeDevice() qemu_cgroup: Need to call usbFreeDevice() qemu_hotplug: Need to call usbFreeDevice() src/lxc/lxc_cgroup.c | 8 +++++--- src/network/bridge_driver.c | 9 +++------ src/openvz/openvz_driver.c | 9 +++++++-- src/parallels/parallels_utils.c | 4 +++- src/qemu/qemu_cgroup.c | 6 ++++-- src/qemu/qemu_hotplug.c | 7 +++++-- src/rpc/virkeepalive.c | 14 +++++++------- src/rpc/virnetsocket.c | 1 + src/rpc/virnettlscontext.c | 8 +++++--- src/storage/storage_backend_disk.c | 28 +++++++++++++++------------- src/uml/uml_driver.c | 3 ++- 11 files changed, 57 insertions(+), 40 deletions(-) -- 1.7.11.7

3 31

[libvirt] [PATCH] sanitytest.py: Do not rely on system libvirt
by Jiri Denemark 05 Feb '13

05 Feb '13

When running sanitytest.py we should not rely on libvirt library installed on the system. And since we generate a nice wrapper called "run" that sets both PYTHON_PATH and LD_LIBRARY_PATH, we should just use it rather than trying to duplicate it in the Makefile. --- python/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/python/Makefile.am b/python/Makefile.am index ef3c3eb..55c5e41 100644 --- a/python/Makefile.am +++ b/python/Makefile.am @@ -122,7 +122,7 @@ $(libvirtmod_lxc_la_OBJECTS): $(LXC_GENERATED) EXTRA_DIST += sanitytest.py check-local: - $(AM_V_GEN)PYTHONPATH=$(abs_topbuilddir):$(abs_topbuilddir)/.libs $(PYTHON) $(srcdir)/sanitytest.py + $(AM_V_GEN)../run $(PYTHON) $(srcdir)/sanitytest.py install-data-local: $(mkinstalldirs) $(DESTDIR)$(pyexecdir) -- 1.8.1.2

2 2

[libvirt] [PATCH] Fix typo in configure.ac causing $LIBS to gain a copy of $CFLAGS
by Daniel P. Berrange 05 Feb '13

05 Feb '13

From: "Daniel P. Berrange" <berrange(a)redhat.com> The virt-dbus.m4 check for DBus was preserving $LIBS before modifying it. Except it wasn't. It was preserving another copy of $CFLAGS. The result was that after the check completed, $LIBS got polluted with $CFLAGS Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- m4/virt-dbus.m4 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/m4/virt-dbus.m4 b/m4/virt-dbus.m4 index 16cb864..4ef0c82 100644 --- a/m4/virt-dbus.m4 +++ b/m4/virt-dbus.m4 @@ -22,7 +22,7 @@ AC_DEFUN([LIBVIRT_CHECK_DBUS],[ if test "$with_dbus" = "yes" ; then old_CFLAGS="$CFLAGS" - old_LIBS="$CFLAGS" + old_LIBS="$LIBS" CFLAGS="$CFLAGS $DBUS_CFLAGS" LIBS="$LIBS $DBUS_LIBS" AC_CHECK_FUNCS([dbus_watch_get_unix_fd]) -- 1.7.11.7

3 2

[libvirt] [PATCH] tests: reserve more fds for commandtest
by Eric Blake 05 Feb '13

05 Feb '13

Commit 39c77fe triggered random failures, depending on the platform and what other fds leak into the testsuite (for me, it passed on RHEL 6 but failed on Fedora 18). The reason was that we were expecting an fd that fell outside of our reserved range. By reserving a larger range, the test once again passes on all platforms. * tests/commandtest.c (mymain): Reserve enough fds. --- I'll wait a bit for a review, but if I don't get one, I'll push this under the build-breaker rule. tests/commanddata/test3.log | 2 +- tests/commandtest.c | 13 +++++++++++-- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/tests/commanddata/test3.log b/tests/commanddata/test3.log index bd06371..c6da253 100644 --- a/tests/commanddata/test3.log +++ b/tests/commanddata/test3.log @@ -9,6 +9,6 @@ FD:0 FD:1 FD:2 FD:5 -FD:8 +FD:7 DAEMON:no CWD:/tmp diff --git a/tests/commandtest.c b/tests/commandtest.c index f4e335f..93c6333 100644 --- a/tests/commandtest.c +++ b/tests/commandtest.c @@ -1,7 +1,7 @@ /* * commandtest.c: Test the libCommand API * - * Copyright (C) 2010-2012 Red Hat, Inc. + * Copyright (C) 2010-2013 Red Hat, Inc. * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -960,7 +960,10 @@ mymain(void) dup2(fd, 3) < 0 || dup2(fd, 4) < 0 || dup2(fd, 5) < 0 || - (fd > 5 && VIR_CLOSE(fd) < 0)) + dup2(fd, 6) < 0 || + dup2(fd, 7) < 0 || + dup2(fd, 8) < 0 || + (fd > 8 && VIR_CLOSE(fd) < 0)) return EXIT_FAILURE; /* Prime the debug/verbose settings from the env vars, @@ -978,6 +981,12 @@ mymain(void) VIR_FORCE_CLOSE(fd); fd = 5; VIR_FORCE_CLOSE(fd); + fd = 6; + VIR_FORCE_CLOSE(fd); + fd = 7; + VIR_FORCE_CLOSE(fd); + fd = 8; + VIR_FORCE_CLOSE(fd); virEventRegisterDefaultImpl(); if (VIR_ALLOC(test) < 0) { -- 1.8.1

3 3

[libvirt] [PATCH] Fix missing error constants in libvirt python module
by Daniel P. Berrange 05 Feb '13

05 Feb '13

From: "Daniel P. Berrange" <berrange(a)redhat.com> The previous change to the generator, changed too much - only the functions are in 'virerror.c', the constants remained in 'virerror.h' which could not be renamed for API compat reasons. Add a test case to sanity check the generated python bindings Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- python/Makefile.am | 5 +++++ python/generator.py | 4 +++- python/sanitytest.py | 31 +++++++++++++++++++++++++++++++ 3 files changed, 39 insertions(+), 1 deletion(-) create mode 100644 python/sanitytest.py diff --git a/python/Makefile.am b/python/Makefile.am index dd69600..ef3c3eb 100644 --- a/python/Makefile.am +++ b/python/Makefile.am @@ -119,6 +119,11 @@ $(libvirtmod_la_OBJECTS): $(GENERATED) $(libvirtmod_qemu_la_OBJECTS): $(QEMU_GENERATED) $(libvirtmod_lxc_la_OBJECTS): $(LXC_GENERATED) +EXTRA_DIST += sanitytest.py + +check-local: + $(AM_V_GEN)PYTHONPATH=$(abs_topbuilddir):$(abs_topbuilddir)/.libs $(PYTHON) $(srcdir)/sanitytest.py + install-data-local: $(mkinstalldirs) $(DESTDIR)$(pyexecdir) $(INSTALL) -m 0644 libvirt.py $(DESTDIR)$(pyexecdir) diff --git a/python/generator.py b/python/generator.py index 71ca883..ceade6b 100755 --- a/python/generator.py +++ b/python/generator.py @@ -122,8 +122,9 @@ class docParser(xml.sax.handler.ContentHandler): if attrs.has_key('field'): self.function_return_field = attrs['field'] elif tag == 'enum': + # enums come from header files, hence virterror.h if (attrs['file'] == "libvirt" or - attrs['file'] == "virerror"): + attrs['file'] == "virterror"): enum(attrs['type'],attrs['name'],attrs['value']) elif attrs['file'] == "libvirt-lxc": lxc_enum(attrs['type'],attrs['name'],attrs['value']) @@ -134,6 +135,7 @@ class docParser(xml.sax.handler.ContentHandler): if debug: print "end %s" % tag if tag == 'function': + # fuctions come from source files, hence 'virerror.c' if self.function != None: if (self.function_module == "libvirt" or self.function_module == "virevent" or diff --git a/python/sanitytest.py b/python/sanitytest.py new file mode 100644 index 0000000..047450b --- /dev/null +++ b/python/sanitytest.py @@ -0,0 +1,31 @@ +#!/usr/bin/python + +import libvirt + +globals = dir(libvirt) + +# Sanity test that the generator hasn't gone wrong + +# Look for core classes +assert("virConnect" in globals) +assert("virDomain" in globals) +assert("virDomainSnapshot" in globals) +assert("virInterface" in globals) +assert("virNWFilter" in globals) +assert("virNodeDevice" in globals) +assert("virNetwork" in globals) +assert("virSecret" in globals) +assert("virStoragePool" in globals) +assert("virStorageVol" in globals) +assert("virStream" in globals) +assert("VIR_CONNECT_RO" in globals) + +# Error related bits +assert("libvirtError" in globals) +assert("VIR_ERR_AUTH_FAILED" in globals) +assert("virGetLastError" in globals) + +# Some misc methods +assert("virInitialize" in globals) +assert("virEventAddHandle" in globals) +assert("virEventRegisterDefaultImpl" in globals) -- 1.7.11.7

3 2

[libvirt] [PATCH] virDomainSaveXML: Reject domains which name contain '/'
by Christophe Fergeau 05 Feb '13

05 Feb '13

Similarly to 790f912b4 which rejects snapshots names containing, this commit changes virDomainSaveXML to reject domains with a '/' in their name. The domain name is used as a filename, so this leads to unexpected results when used in combination with '..' --- If someone is using domains with '/' in their name, this will cause a regression for them as libvirt will no longer be able to re-write the domain XML and will just fail. However, if someone is (ab)using this, the domain must end up in an already existing directory as libvirt will not create it so this is hopefully unconvenient enough that noone is doing that. If we only want to error out on new domain creation, this may be doable by introducing a virDomainSaveXMLFlags, but will be more invasive. Christophe src/conf/domain_conf.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 85a798d..86641d6 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -14728,6 +14728,14 @@ int virDomainSaveXML(const char *configDir, char *configFile = NULL; int ret = -1; + if (strchr(def->name, '/')) { + virReportError(VIR_ERR_XML_DETAIL, + _("invalid domain name '%s': name can't contain '/'"), + def->name); + goto cleanup; + + } + if ((configFile = virDomainConfigFile(configDir, def->name)) == NULL) goto cleanup; -- 1.8.1

4 4

[libvirt] [PATCH] qemu: don't log failure during QMP add-fd probe
by Eric Blake 05 Feb '13

05 Feb '13

Otherwise, we get a lot of scary (but harmless) noise in the logs: 2013-02-05 15:35:48.555+0000: 8637: error : qemuMonitorJSONCheckError:353 : internal error unable to execute QEMU command 'add-fd': Parameter 'fdset-id' expects an existing fdset-id one for every qemu 1.2 binary that we probe. * src/qemu/qemu_monitor_json.c (qemuMonitorJSONAddFd): During probe, avoid logging failures. --- src/qemu/qemu_monitor_json.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c index 686cee9..a86d90c 100644 --- a/src/qemu/qemu_monitor_json.c +++ b/src/qemu/qemu_monitor_json.c @@ -2660,8 +2660,16 @@ qemuMonitorJSONAddFd(qemuMonitorPtr mon, int fdset, int fd, const char *name) ret = qemuMonitorJSONCommandWithFd(mon, cmd, fd, &reply); - if (ret == 0) + if (ret == 0) { + /* qemu 1.2 lacks the functionality we need; but we have to + * probe to find that out. Don't log errors in that case. */ + if (STREQ_NULLABLE(name, "/dev/null") && + qemuMonitorJSONHasError(reply, "GenericError")) { + ret = -2; + goto cleanup; + } ret = qemuMonitorJSONCheckError(cmd, reply); + } if (ret == 0) { virJSONValuePtr data = virJSONValueObjectGet(reply, "return"); -- 1.8.1

2 2

[libvirt] [PATCH 0/4] Implement basic support for virtio-rng
by Peter Krempa 05 Feb '13

05 Feb '13

This patchset implements very basic functionality that will allow to use the virtio-rng device. I will follow up later with more advanced sections of this support as I have to figure out how hotplug of the qom backend device could work in qemu. I'm posting this so we can settle on the naming scheme and other stuff. Peter Krempa (4): doc: schema: Add basic documentation for the virtual RNG device support conf: Use correct type for device type enum in virDomainDeviceDefFree conf: Add basic support for RNG configuration qemu: Implement support for the RNG device and the random backend docs/formatdomain.html.in | 54 +++++++++++++++ docs/schemas/domaincommon.rng | 31 +++++++++ src/conf/domain_conf.c | 157 +++++++++++++++++++++++++++++++++++++++++- src/conf/domain_conf.h | 36 ++++++++++ src/libvirt_private.syms | 2 + src/qemu/qemu_capabilities.c | 5 +- src/qemu/qemu_capabilities.h | 3 + src/qemu/qemu_command.c | 108 +++++++++++++++++++++++++++++ 8 files changed, 393 insertions(+), 3 deletions(-) -- 1.8.1

2 12

[libvirt] persistent virtual networks
by Gene Czarcinski 05 Feb '13

05 Feb '13

I seem to remember that, if you use net-define, the network will be persistent and, if you use net-create, the network will not be persistent. I am now running libvirt-1.0.2 on Fedora 18. When I use net-define a network from a template and then do a net-list --all, the network is NOT marked as persistent. If I restart libvirtd.service, then the defined networks are persistent. I noticed that the libvirt-1.0.2 announcement included: - network: bridge: Fix regression when defining persistent networks (Peter Krempa) Do I have a bug to report? Gene

3 2

[libvirt] [PATCH] build: Add libcurl dependency to libvirt_driver.la
by Jiri Denemark 05 Feb '13

05 Feb '13

libvirt.c calls curl_global_init() if WITH_CURL is defined and thus it should be linked with libcurl. This fixes link failure in case neither xenapi nor esx driver is enabled (they are the only users of libcurl). --- src/Makefile.am | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index 070a089..f6162df 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -792,9 +792,11 @@ noinst_LTLIBRARIES += libvirt_driver.la libvirt_la_BUILT_LIBADD += libvirt_driver.la libvirt_driver_la_SOURCES = $(DRIVER_SOURCES) -libvirt_driver_la_CFLAGS = $(NUMACTL_CFLAGS) $(GNUTLS_CFLAGS) \ +libvirt_driver_la_CFLAGS = \ + $(NUMACTL_CFLAGS) $(GNUTLS_CFLAGS) $(CURL_CFLAGS) \ -I$(top_srcdir)/src/conf $(AM_CFLAGS) -libvirt_driver_la_LIBADD = $(NUMACTL_LIBS) $(GNUTLS_LIBS) $(DLOPEN_LIBS) +libvirt_driver_la_LIBADD = \ + $(NUMACTL_LIBS) $(GNUTLS_LIBS) $(CURL_LIBS) $(DLOPEN_LIBS) USED_SYM_FILES = $(srcdir)/libvirt_private.syms -- 1.8.1.2

3 5

[libvirt] [PATCH v2] spec: Fix minor changelog issues
by Jiri Denemark 05 Feb '13

05 Feb '13

When a changelog entry references an RPM macro, % needs to be escaped so that it does not appear expanded in package changelog. Fri Mar 4 2009 is incorrect since Mar 4 was Wednesday. Since libvirt-0.6.1 was released on Mar 4 2009, we should change Fri to Wed. --- libvirt.spec.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libvirt.spec.in b/libvirt.spec.in index 8df908d..c2da6ec 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -2309,7 +2309,7 @@ fi * Fri Apr 3 2009 Daniel Veillard <veillard(a)redhat.com> - 0.6.2-1 - release of 0.6.2 -* Fri Mar 4 2009 Daniel Veillard <veillard(a)redhat.com> - 0.6.1-1 +* Wed Mar 4 2009 Daniel Veillard <veillard(a)redhat.com> - 0.6.1-1 - release of 0.6.1 * Sat Jan 31 2009 Daniel Veillard <veillard(a)redhat.com> - 0.6.0-1 @@ -2448,7 +2448,7 @@ fi - it's pkgconfig not pgkconfig ! * Mon Nov 6 2006 Daniel Veillard <veillard(a)redhat.com> 0.1.8-2 -- fixing spec file, added %dist, -devel requires pkgconfig and xen-devel +- fixing spec file, added %%dist, -devel requires pkgconfig and xen-devel - Resolves: rhbz#202320 * Mon Oct 16 2006 Daniel Veillard <veillard(a)redhat.com> 0.1.8-1 -- 1.8.1.2

3 3

[libvirt] [PATCH] fix build erro when building with --without-libvirtd
by Hu Tao 05 Feb '13

05 Feb '13

--- src/driver.h | 4 --- src/libvirt.c | 70 +++++++++++++++++++++++++++++++++++++++++++++++++- src/libvirt_internal.h | 2 -- 3 files changed, 69 insertions(+), 7 deletions(-) diff --git a/src/driver.h b/src/driver.h index 02ddd83..dab7495 100644 --- a/src/driver.h +++ b/src/driver.h @@ -1512,7 +1512,6 @@ struct _virStorageDriver { virDrvStoragePoolIsPersistent poolIsPersistent; }; -# ifdef WITH_LIBVIRTD typedef int (*virDrvStateInitialize) (bool privileged, virStateInhibitCallback callback, @@ -1531,7 +1530,6 @@ struct _virStateDriver { virDrvStateReload reload; virDrvStateStop stop; }; -# endif typedef struct _virDeviceMonitor virDeviceMonitor; @@ -1768,9 +1766,7 @@ int virRegisterStorageDriver(virStorageDriverPtr); int virRegisterDeviceMonitor(virDeviceMonitorPtr); int virRegisterSecretDriver(virSecretDriverPtr); int virRegisterNWFilterDriver(virNWFilterDriverPtr); -# ifdef WITH_LIBVIRTD int virRegisterStateDriver(virStateDriverPtr); -# endif void virDriverModuleInitialize(const char *defmoddir); void *virDriverLoadModule(const char *name); diff --git a/src/libvirt.c b/src/libvirt.c index f81a3de..38e4f6e 100644 --- a/src/libvirt.c +++ b/src/libvirt.c @@ -885,8 +885,76 @@ int virStateStop(void) { return ret; } -#endif +#else /* WITH_LIBVIRTD */ + +/** + * virRegisterStateDriver: + * @driver: pointer to a driver block + * + * Register a virtualization driver + * + * Returns the driver priority or -1 in case of error. + */ +int +virRegisterStateDriver(virStateDriverPtr driver ATTRIBUTE_UNUSED) +{ + return 0; +} + +/** + * virStateInitialize: + * @privileged: set to true if running with root privilege, false otherwise + * @callback: callback to invoke to inhibit shutdown of the daemon + * @opaque: data to pass to @callback + * + * Initialize all virtualization drivers. + * + * Returns 0 if all succeed, -1 upon any failure. + */ +int virStateInitialize(bool privileged ATTRIBUTE_UNUSED, + virStateInhibitCallback callback ATTRIBUTE_UNUSED, + void *opaque ATTRIBUTE_UNUSED) +{ + return 0; +} + +/** + * virStateCleanup: + * + * Run each virtualization driver's cleanup method. + * + * Returns 0 if all succeed, -1 upon any failure. + */ +int virStateCleanup(void) +{ + return 0; +} + +/** + * virStateReload: + * + * Run each virtualization driver's reload method. + * + * Returns 0 if all succeed, -1 upon any failure. + */ +int virStateReload(void) +{ + return 0; +} + +/** + * virStateStop: + * + * Run each virtualization driver's "stop" method. + * + * Returns 0 if successful, -1 on failure + */ +int virStateStop(void) +{ + return 0; +} +#endif /* WITH_LIBVIRTD */ /** diff --git a/src/libvirt_internal.h b/src/libvirt_internal.h index 595d2db..b82f6b9 100644 --- a/src/libvirt_internal.h +++ b/src/libvirt_internal.h @@ -27,7 +27,6 @@ # include "internal.h" -# ifdef WITH_LIBVIRTD typedef void (*virStateInhibitCallback)(bool inhibit, void *opaque); @@ -37,7 +36,6 @@ int virStateInitialize(bool privileged, int virStateCleanup(void); int virStateReload(void); int virStateStop(void); -# endif /* Feature detection. This is a libvirt-private interface for determining * what features are supported by the driver. -- 1.8.0.1.240.ge8a1f5a

4 10

[libvirt] A question about booting from the snapshot image by specifying snapshot id in Libvirt
by harryxiyou 05 Feb '13

05 Feb '13

Hi all, I test libvirt boots QEMU VM from Sheepdog snapshot image by specify snapshot id like following. 1, $ collie vdi list Name Id Size Used Shared Creation time VDI id Copies Tag Alice 1 10 GB 1.3 GB 0.0 MB 2013-02-01 18:59 15d167 2 s testvdi 1 20 MB 20 MB 0.0 MB 2013-02-02 11:45 f348ba 2 name s testvdi 2 20 MB 0.0 MB 20 MB 2013-02-03 17:56 f348bb 2 testvdi 3 20 MB 12 MB 8.0 MB 2013-02-03 17:58 f348bc 2 2, $ cat > sheepdog_vm1.xml <domain type='qemu'> <name>testvm</name> <memory>1048576</memory> <os> <type arch='x86_64'>hvm</type> </os> <devices> <disk type='network'> <source protocol="sheepdog" name="testvdi:1"/> <target dev='hda' bus='ide'/> </disk> <graphics type='vnc' port='-1' autoport='yes'/> </devices> </domain> 3, $ virsh create sheepdog_vm1.xml domain testvm is created ( from sheepdog_vm1.xml） 4, $ virsh destroy testvm domain testvm is deleted 5, $ collie vdi list Name Id Size Used Shared Creation time VDI id Copies Tag Alice 1 10 GB 1.3 GB 0.0 MB 2013-02-01 18:59 15d167 2 s testvdi 1 20 MB 20 MB 0.0 MB 2013-02-02 11:45 f348ba 2 name s testvdi 2 20 MB 0.0 MB 20 MB 2013-02-03 17:56 f348bb 2 s testvdi 3 20 MB 12 MB 8.0 MB 2013-02-03 17:58 f348bc 2 testvdi 4 20 MB 12 MB 8.0 MB 2013-02-04 13:15 f348bd 2 My question is before i boot VM from sheepdog:testvdi:1, my vdi list like Name Id Size Used Shared Creation time VDI id Copies Tag Alice 1 10 GB 1.3 GB 0.0 MB 2013-02-01 18:59 15d167 2 s testvdi 1 20 MB 20 MB 0.0 MB 2013-02-02 11:45 f348ba 2 name s testvdi 2 20 MB 0.0 MB 20 MB 2013-02-03 17:56 f348bb 2 testvdi 3 20 MB 12 MB 8.0 MB 2013-02-03 17:58 f348bc 2 However, after VM is destroied, my vdi list like Name Id Size Used Shared Creation time VDI id Copies Tag Alice 1 10 GB 1.3 GB 0.0 MB 2013-02-01 18:59 15d167 2 s testvdi 1 20 MB 20 MB 0.0 MB 2013-02-02 11:45 f348ba 2 name s testvdi 2 20 MB 0.0 MB 20 MB 2013-02-03 17:56 f348bb 2 s testvdi 3 20 MB 12 MB 8.0 MB 2013-02-03 17:58 f348bc 2 testvdi 4 20 MB 12 MB 8.0 MB 2013-02-04 13:15 f348bd 2 There is another snapshot of testvdi created. I am not clear about why another one is created? I just boot a VM from snapshot testvdi, which id is 1. Could anyone please give me some suggestions? Thanks in advance ;-) -- Thanks Harry Wei

2 2

[libvirt] How to start a snapshot of Sheepdog volume in Libvirt
by harryxiyou 05 Feb '13

05 Feb '13

Hi all, I wanna test start a snapshot of Sheepdog volume in Libvirt. However, i cannot find a test description from https://github.com/collie/sheepdog/wiki/Libvirt. >From http://libvirt.org/formatsnapshot.html, i can find some snapshot operations in Libvirt, which may be different from Sheepdog volume snapshot, right? Now, i have some questions like following. 1, What are the differences between Libvirt snapshot operations and Sheepdog Volume snapshot operations? The object of Libvirt snapshot is a file and Sheepdog volume is a block device, right? 2, Can we use Libvirt XML layout from http://libvirt.org/formatsnapshot.html to create a Sheepdog volume snapshot and start from it? If not, which Libvirt XML form should we use to create&start from this snapshot? 3, Is following XML layout right? <domain type='qemu'> <name>testvm</name> <memory>1048576</memory> <os> <type arch='x86_64'>hvm</type> </os> <devices> <disk type='network'> <source protocol="sheepdog" name="Alice:1"/> <target dev='hda' bus='ide'/> </disk> <graphics type='vnc' port='-1' autoport='yes'/> </devices> </domain> NOTE: Alice:1 is a snapshot of Alice. $ collie vdi list name id size used shared creation time object id -------------------------------------------------------------------- Bob 0 2.0 GB 1.6 GB 0.0 MB 2010-03-23 16:16 80000 Alice 0 256 GB 0.0 MB 0.0 MB 2010-03-23 16:21 c0000 s Alice 1 256 GB 0.0 MB 0.0 MB 2010-03-23 16:16 40000 Could anyone please give me some suggestions? Thanks in advance ;-) -- Thanks Harry Wei

2 2

[libvirt] [PATCH 0/4] FreeBSD: netdev support
by Roman Bogorodskiy 05 Feb '13

05 Feb '13

Add support for some essential netdev functions. Roman Bogorodskiy (4): FreeBSD: implement virNetDevExists() and virNetDevSetName() FreeBSD: implement virNetDevTapCreate() and virNetDevTapDelete(). FreeBSD: implement virNetDevSetMAC(). FreeBSD: implement virNetDevGetMTU(). src/util/virnetdev.c | 113 ++++++++++++++++++++++++++++++++++++-- src/util/virnetdevtap.c | 140 ++++++++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 247 insertions(+), 6 deletions(-) -- 1.8.0

4 36

[libvirt] [PATCH v2 0/2] Add VDI image format
by Martin Kletzander 05 Feb '13

05 Feb '13

This is basically v2 for: https://www.redhat.com/archives/libvir-list/2013-February/msg00151.html Very small series, so there's not much more to say ;) Martin Kletzander (2): Support shifted magic in storage files Add basic support for VDI images src/util/virstoragefile.c | 70 ++++++++++++++++++++++++++++------------------- src/util/virstoragefile.h | 3 +- 2 files changed, 44 insertions(+), 29 deletions(-) -- 1.8.1.2

2 6

[libvirt] [PATCH 00/10] -numa option parsing fixes & improvements
by Eduardo Habkost 04 Feb '13

04 Feb '13

This series contains the following: * Patches 1-7 are multiple bug fixes to the current code * Patch 8 introduce a feature that libvirt requires since a long time, and even tries to use it today (in a way that doesn't work, using the "-numa node,cpus=1,2,3,4" format): having non-contiguous CPU ranges assigned to a NUMA node. The last 2 patches I am sending as RFCs: * Patch 9 makes the "-numa" option deprecated and introduces a "-numa-node" command-line and config file option. * Patch 10 adds a small hack to the (now deprecated) "-numa" option, that makes the "cpus=1,2,3,4" format currently used by libvirt work. Eduardo Habkost (10): vl.c: Fix off-by-one bug when handling "-numa node" argument vl.c: Abort on unknown -numa option type vl.c: Isolate code specific to "-numa node" option type vl.c: Check for NUMA node limit inside numa_node_add() vl.c: Extract -numa "cpus" parsing to separate function vl.c: handle invalid NUMA CPU ranges properly vl.c: numa_add_node(): Validate nodeid before using it vl.c: Support multiple CPU ranges on -numa option vl.c: Introduce QemuOpts-friendly "-numa-node" config option vl.c: Handle legacy "-numa node,cpus=A,B,C,D" format qemu-config.c | 25 +++++++ qemu-options.hx | 50 +++++++++++++- vl.c | 204 ++++++++++++++++++++++++++++++++++++++++++++++---------- 3 files changed, 240 insertions(+), 39 deletions(-) -- 1.7.11.7

3 15

[libvirt] [PATCH] Add basic support for VDI images
by Martin Kletzander 04 Feb '13

04 Feb '13

QEMU is fully capable of handling VDI images and we just refuse to work with them. As qemu-img knows and supports this, there should be no problem with this addition. This is of course, just basic functionality, without searching for any backing files, etc. --- It's very much possible that I missed something when adding this "functionality", I just tested running a machine and creating a volume using 'virsh vol-create-as'. So feel free to point out mymistakes. --- src/util/virstoragefile.c | 9 +++++++-- src/util/virstoragefile.h | 3 ++- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/src/util/virstoragefile.c b/src/util/virstoragefile.c index cdac5b1..33e72c9 100644 --- a/src/util/virstoragefile.c +++ b/src/util/virstoragefile.c @@ -1,7 +1,7 @@ /* * virstoragefile.c: file utility functions for FS storage backend * - * Copyright (C) 2007-2012 Red Hat, Inc. + * Copyright (C) 2007-2013 Red Hat, Inc. * Copyright (C) 2007-2008 Daniel P. Berrange * * This library is free software; you can redistribute it and/or @@ -51,7 +51,7 @@ VIR_ENUM_IMPL(virStorageFileFormat, "raw", "dir", "bochs", "cloop", "cow", "dmg", "iso", "qcow", "qcow2", "qed", "vmdk", "vpc", - "fat", "vhd") + "fat", "vhd", "vdi") enum lv_endian { LV_LITTLE_ENDIAN = 1, /* 1234 */ @@ -193,6 +193,11 @@ static struct FileTypeInfo const fileTypeInfo[] = { -1, 0, 0, 0, 0, 0, NULL }, [VIR_STORAGE_FILE_VHD] = { NULL, NULL, LV_LITTLE_ENDIAN, -1, 0, 0, 0, 0, 0, NULL }, + + /* not fully supported, but qemu knows it, so we should be able to + * handle this at least basically */ + [VIR_STORAGE_FILE_VDI] = { NULL, ".vdi", LV_LITTLE_ENDIAN, + -2, 0, 0, 0, 0, -1, NULL}, }; verify(ARRAY_CARDINALITY(fileTypeInfo) == VIR_STORAGE_FILE_LAST); diff --git a/src/util/virstoragefile.h b/src/util/virstoragefile.h index 618b028..83dc3f2 100644 --- a/src/util/virstoragefile.h +++ b/src/util/virstoragefile.h @@ -1,7 +1,7 @@ /* * virstoragefile.h: file utility functions for FS storage backend * - * Copyright (C) 2007-2009, 2012 Red Hat, Inc. + * Copyright (C) 2007-2009, 2012, 2013 Red Hat, Inc. * Copyright (C) 2007-2008 Daniel P. Berrange * * This library is free software; you can redistribute it and/or @@ -44,6 +44,7 @@ enum virStorageFileFormat { VIR_STORAGE_FILE_VPC, VIR_STORAGE_FILE_FAT, VIR_STORAGE_FILE_VHD, + VIR_STORAGE_FILE_VDI, VIR_STORAGE_FILE_LAST, }; -- 1.8.1.2

2 4

[libvirt] [RFC][PATCH] Growable bitmap implementation
by Stefan Berger 04 Feb '13

04 Feb '13

Add a growable bitmap implementation building on top of the 'regular' bitmap implementation. (no doubt, this could also be done differently...) This patch also adds a test virgbitmaptest.c that is largely a copy of virbitmaptest.c with some minor modifications to test for growth of the bitmap. Signed-off-by: Stefan Berger <stefanb(a)linux.vnet.ibm.com> --- PS: This patch builds on top of a patch with a virBitmapNextClearBit implementation. --- src/Makefile.am | 1 src/libvirt_private.syms | 22 ++ src/util/virbitmap.c | 17 + src/util/virbitmap.h | 6 src/util/virgbitmap.c | 348 ++++++++++++++++++++++++++++++++ src/util/virgbitmap.h | 95 ++++++++ tests/Makefile.am | 5 tests/virgbitmaptest.c | 499 +++++++++++++++++++++++++++++++++++++++++++++++ 8 files changed, 993 insertions(+) Index: libvirt/src/Makefile.am =================================================================== --- libvirt.orig/src/Makefile.am +++ libvirt/src/Makefile.am @@ -71,6 +71,7 @@ UTIL_SOURCES = \ util/virevent.c util/virevent.h \ util/vireventpoll.c util/vireventpoll.h \ util/virfile.c util/virfile.h \ + util/virgbitmap.c util/virgbitmap.h \ util/virhash.c util/virhash.h \ util/virhashcode.c util/virhashcode.h \ util/virhook.c util/virhook.h \ Index: libvirt/src/util/virbitmap.c =================================================================== --- libvirt.orig/src/util/virbitmap.c +++ libvirt/src/util/virbitmap.c @@ -111,6 +111,23 @@ int virBitmapCopy(virBitmapPtr dst, virB return 0; } +/* + * virBitmapCopyResize: + * @dst: Destination bitmap + * @src: Source bitmap + * + * Copy bits from source bitmap @src into destination bitmap @dst + * where the source and destination bitmaps may be of different size. + * Any bits not found in the source bitmap will remain untouched + * in the destination bitmap. + */ +void virBitmapCopyResize(virBitmapPtr dst, virBitmapPtr src) +{ + size_t tocopy = MIN(src->map_len, dst->map_len); + + memcpy(dst->map, src->map, + tocopy * sizeof(src->map[0])); +} /** * virBitmapSetBit: Index: libvirt/src/util/virbitmap.h =================================================================== --- libvirt.orig/src/util/virbitmap.h +++ libvirt/src/util/virbitmap.h @@ -49,6 +49,12 @@ void virBitmapFree(virBitmapPtr bitmap); int virBitmapCopy(virBitmapPtr dst, virBitmapPtr src); /* + * Copy bits from @src to @dst. The bitmap sizes + * need not be the same + */ +void virBitmapCopyResize(virBitmapPtr dst, virBitmapPtr src); + +/* * Set bit position @b in @bitmap */ int virBitmapSetBit(virBitmapPtr bitmap, size_t b) Index: libvirt/src/util/virgbitmap.c =================================================================== --- /dev/null +++ libvirt/src/util/virgbitmap.c @@ -0,0 +1,348 @@ +/* + * virgbitmap.c: Growable bitmap operations + * + * Copyright (C) 2013 IBM Corporation + * + * 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, see + * <http://www.gnu.org/licenses/>. + * + * Author: Stefan Berger <stefanb(a)linux.vnet.ibm.com> + */ + +#include <config.h> + +#include "virgbitmap.h" +#include "viralloc.h" + +struct _virGBitmap { + virBitmapPtr bitmap; +}; + +/** + * virGBitmapNew: + * @size: number of bits + * + * Allocate a growable bitmap capable of initially containing @size bits. + * + * Returns a pointer to the allocated bitmap or NULL if + * memory cannot be allocated. + */ +virGBitmapPtr virGBitmapNew(size_t size) +{ + virGBitmapPtr bitmap; + + if (VIR_ALLOC(bitmap) < 0) + return NULL; + + bitmap->bitmap = virBitmapNew(size); + + if (!bitmap->bitmap) { + virGBitmapFree(bitmap); + return NULL; + } + + return bitmap; +} + +/** + * virGBitmapFree: + * @bitmap: previously allocated bitmap + * + * Free @bitmap previously allocated by virBitmapNew. + */ +void virGBitmapFree(virGBitmapPtr bitmap) +{ + if (bitmap) { + virBitmapFree(bitmap->bitmap); + VIR_FREE(bitmap); + } +} + +/** + * virGBitmapResize: + * @bitmap: previously allocated bitmap + * @new_size: new size of the bitmap + * + * Resize the @bitmap to the given @new_size. Old bits are copied + * into the new + */ +static int virGBitmapResize(virGBitmapPtr bitmap, size_t new_size) +{ + virBitmapPtr bm; + + if (!(bm = virBitmapNew(new_size))) + return -1; + + virBitmapCopyResize(bm, bitmap->bitmap); + + virBitmapFree(bitmap->bitmap); + bitmap->bitmap = bm; + + return 0; +} + +/** + * virGBitmapSetBit: + * @bitmap: Pointer to growable bitmap + * @b: bit position to set + * + * Set bit position @b in @bitmap. Grow the @bitmap if necessary + * filling newly allocated bits with zeros. + * + * Returns 0 on if bit is successfully set, -1 on error. + */ +int virGBitmapSetBit(virGBitmapPtr bitmap, ssize_t b) +{ + if (virBitmapSize(bitmap->bitmap) <= b && + virGBitmapResize(bitmap, + ((unsigned long long)b * 120) / 100) < 0) + return -1; + + return virBitmapSetBit(bitmap->bitmap, b); +} + +/** + * virBitmapGetBit: + * @bitmap: Pointer to bitmap + * @b: bit position to get + * @result: bool pointer to receive bit setting + * + * Get setting of bit position @b in @bitmap and store in @result. + * Note: If the bitmap is not currently large enough, it will grow + * to at least the size of the bit position @b. + * + * On success, @result will contain the setting of @b and 0 is + * returned. On failure, -1 is returned and @result is unchanged. + */ +int virGBitmapGetBit(virGBitmapPtr bitmap, size_t b, bool *result) +{ + if (virBitmapSize(bitmap->bitmap) <= b) { + if (virGBitmapResize(bitmap, + ((unsigned long long)b * 120) / 100) < 0) + return -1; + *result = 0; + return 0; + } + + return virBitmapGetBit(bitmap->bitmap, b, result); +} + +/** + * virGBitmapFormat: + * @bitmap: the bitmap + * + * This function is the counterpart of virGBitmapParse. This function creates + * a human-readable string representing the bits in bitmap. + * + * See virGBitmapParse for the format of @str. + * + * Returns the string on success or NULL otherwise. Caller should call + * VIR_FREE to free the string. + */ +char *virGBitmapFormat(virGBitmapPtr bitmap) +{ + return virBitmapFormat(bitmap->bitmap); +} + +size_t virGBitmapSize(virGBitmapPtr bitmap) +{ + return virBitmapSize(bitmap->bitmap); +} + +/** + * virGBitmapSetAll: + * @bitmap: the bitmap + * + * set all bits in @bitmap. + */ +void virGBitmapSetAll(virGBitmapPtr bitmap) +{ + virBitmapSetAll(bitmap->bitmap); +} + +/** + * virGBitmapClearAll: + * @bitmap: the bitmap + * + * clear all bits in @bitmap. + */ +void virGBitmapClearAll(virGBitmapPtr bitmap) +{ + virBitmapClearAll(bitmap->bitmap); +} + +/** + * virGBitmapIsAllSet: + * @bitmap: the bitmap to check + * + * check if all bits in @bitmap are set. + */ +bool virGBitmapIsAllSet(virGBitmapPtr bitmap) +{ + return virBitmapIsAllSet(bitmap->bitmap); +} + +/** + * virGBitmapParse: + * @str: points to a string representing a human-readable bitmap + * @terminator: character separating the bitmap to parse + * @bitmap: a bitmap created from @str + * @bitmapSize: the upper limit of num of bits in created bitmap + * + * This function is the counterpart of virBitmapFormat. This function creates + * a bitmap, in which bits are set according to the content of @str. + * + * @str is a comma separated string of fields N, which means a number of bit + * to set, and ^N, which means to unset the bit, and N-M for ranges of bits + * to set. + * + * To allow parsing of bitmaps within larger strings it is possible to set + * a termination character in the argument @terminator. When the character + * in @terminator is encountered in @str, the parsing of the bitmap stops. + * Pass 0 as @terminator if it is not needed. Whitespace characters may not + * be used as terminators. + * + * Returns the number of bits set in @bitmap, or -1 in case of error. + */ +int +virGBitmapParse(const char *str, + char terminator, + virGBitmapPtr *bitmap, + size_t bitmapSize) +{ + virGBitmapPtr res; + + if (VIR_ALLOC(res) < 0) + return -1; + + if (virBitmapParse(str, terminator, &res->bitmap, bitmapSize) < 0) { + VIR_FREE(res); + return -1; + } + + *bitmap = res; + + return 0; +} + + +/** + * virGBitmapNewData: + * @data: the data + * @len: length of @data in bytes + * + * Allocate a bitmap from a chunk of data containing bits + * information + * + * Returns a pointer to the allocated bitmap or NULL if + * memory cannot be allocated. + */ +virGBitmapPtr virGBitmapNewData(void *data, int len) +{ + virGBitmapPtr res; + + if (VIR_ALLOC(res) < 0) + return NULL; + + res->bitmap = virBitmapNewData(data, len); + if (!res->bitmap) { + VIR_FREE(res); + return NULL; + } + + return res; +} + +/** + * virGBitmapToData: + * @data: the data + * @len: len of @data in byte + * + * Convert a bitmap to a chunk of data containing bits information. + * Data consists of sequential bytes, with lower bytes containing + * lower bits. + * + * Returns 0 on success, -1 otherwise. + */ +int virGBitmapToData(virGBitmapPtr bitmap, unsigned char **data, int *dataLen) +{ + return virBitmapToData(bitmap->bitmap, data, dataLen); +} + + +/** + * virGBitmapNextSetBit: + * @bitmap: the bitmap + * @pos: the position after which to search for a set bit + * + * Search the first set bit after position @pos in bitmap @bitmap. + * @pos can be -1 to search for the first set bit. Position starts + * at 0. This function will never grow the bitmap. + * + * returns the position of the found bit, or -1 if no bit found. + */ +ssize_t virGBitmapNextSetBit(virGBitmapPtr bitmap, ssize_t pos) +{ + /* never grow since we won't find set bits there */ + return virBitmapNextSetBit(bitmap->bitmap, pos); +} + +/** + * virGBitmapNextClearBit: + * @bitmap: the bitmap + * @pos: the position after which to search for a set bit + * + * Search the first clear bit after position @pos in bitmap @bitmap. + * @pos can be -1 to search for the first set bit. Position starts + * at 0. This function will grow the bitmap if the currently allocated + * bitmap has all bits set. + * + * returns the position of the found bit, or -1 if no bit found. + */ +ssize_t virGBitmapNextClearBit(virGBitmapPtr bitmap, ssize_t pos) +{ + size_t lastpos, newsize, max_bit; + ssize_t res; + + if (pos < 0) + pos = -1; + + if (pos < (ssize_t)virBitmapSize(bitmap->bitmap)) { + res = virBitmapNextClearBit(bitmap->bitmap, pos); + + if (res >= 0) + return res; + } + + max_bit = virBitmapSize(bitmap->bitmap); + + lastpos = max_bit - 1; + if (pos > lastpos) + lastpos = pos; + + newsize = (max_bit > 80) + ? ((unsigned long long)max_bit * 120) / 100 /* 20 % growth */ + : max_bit + 24; + if (virGBitmapResize(bitmap, newsize) < 0) + return -1; + + return virBitmapNextClearBit(bitmap->bitmap, lastpos); +} + +/* Return the number of bits currently set in the map. */ +size_t +virGBitmapCountBits(virGBitmapPtr bitmap) +{ + return virBitmapCountBits(bitmap->bitmap); +} Index: libvirt/src/util/virgbitmap.h =================================================================== --- /dev/null +++ libvirt/src/util/virgbitmap.h @@ -0,0 +1,95 @@ +/* + * virgbitmap.h: Growable bitmap operations + * + * Copyright (C) 2013 IBM Corporation + * + * 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, see + * <http://www.gnu.org/licenses/>. + * + * Derived from virbitmap.h. + * + * Author: Stefan Berger <stefanb(a)linux.vnet.ibm.com> + */ + +#ifndef __GBITMAP_H__ +# define __GBITMAP_H__ + +# include "internal.h" + +# include <sys/types.h> + +# include "virbitmap.h" + +typedef struct _virGBitmap virGBitmap; +typedef virGBitmap *virGBitmapPtr; + +/* + * Allocate a bitmap capable of initially containing @size bits. + */ +virGBitmapPtr virGBitmapNew(size_t size) ATTRIBUTE_RETURN_CHECK; + +/* + * Free previously allocated bitmap + */ +void virGBitmapFree(virGBitmapPtr bitmap); + +/* + * Set bit position @b in @bitmap + */ +int virGBitmapSetBit(virGBitmapPtr bitmap, ssize_t pos) + ATTRIBUTE_NONNULL(1); + +/* + * Get setting of bit position @b in @bitmap and store in @result + */ +int virGBitmapGetBit(virGBitmapPtr bitmap, size_t b, bool *result) + ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(3) ATTRIBUTE_RETURN_CHECK; + +char *virGBitmapFormat(virGBitmapPtr bitmap) + ATTRIBUTE_NONNULL(1); + +int virGBitmapParse(const char *str, + char sep, + virGBitmapPtr *bitmap, + size_t bitmapSize); + +virGBitmapPtr virGBitmapNewData(void *data, int len) ATTRIBUTE_NONNULL(1); + +int virGBitmapToData(virGBitmapPtr bitmap, unsigned char **data, int *dataLen) + ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2); + +size_t virGBitmapSize(virGBitmapPtr bitmap) + ATTRIBUTE_NONNULL(1); + +void virGBitmapSetAll(virGBitmapPtr bitmap) + ATTRIBUTE_NONNULL(1); + +void virGBitmapClearAll(virGBitmapPtr bitmap) + ATTRIBUTE_NONNULL(1); + +bool virGBitmapIsAllSet(virGBitmapPtr bitmap) + ATTRIBUTE_NONNULL(1); + + ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(3); + +ssize_t virGBitmapNextSetBit(virGBitmapPtr bitmap, ssize_t pos) + ATTRIBUTE_NONNULL(1); + +ssize_t virGBitmapNextClearBit(virGBitmapPtr bitmap, ssize_t pos) + ATTRIBUTE_NONNULL(1); + +size_t virGBitmapCountBits(virGBitmapPtr bitmap) + ATTRIBUTE_NONNULL(1); + +#endif Index: libvirt/tests/Makefile.am =================================================================== --- libvirt.orig/tests/Makefile.am +++ libvirt/tests/Makefile.am @@ -96,6 +96,7 @@ test_programs = virshtest sockettest \ virtimetest viruritest virkeyfiletest \ virauthconfigtest \ virbitmaptest \ + virgbitmaptest \ virlockspacetest \ virstringtest \ virportallocatortest \ @@ -649,6 +650,10 @@ virbitmaptest_SOURCES = \ virbitmaptest.c testutils.h testutils.c virbitmaptest_LDADD = $(LDADDS) +virgbitmaptest_SOURCES = \ + virgbitmaptest.c testutils.h testutils.c +virgbitmaptest_LDADD = $(LDADDS) + jsontest_SOURCES = \ jsontest.c testutils.h testutils.c jsontest_LDADD = $(LDADDS) Index: libvirt/tests/virgbitmaptest.c =================================================================== --- /dev/null +++ libvirt/tests/virgbitmaptest.c @@ -0,0 +1,499 @@ +/* + * Copyright (C) 2012 Fujitsu. + * + * 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, see + * <http://www.gnu.org/licenses/>. + * + */ + +#include <config.h> + +#include "testutils.h" + +#include "virgbitmap.h" + +static int test1(const void *data ATTRIBUTE_UNUSED) +{ + virGBitmapPtr bitmap; + int size; + int bit; + bool result; + int ret = -1; + + size = 1024; + bit = 100; + if (!(bitmap = virGBitmapNew(size))) + goto error; + + if (virGBitmapSetBit(bitmap, bit) < 0) + goto error; + + if (virGBitmapGetBit(bitmap, bit, &result) < 0) + goto error; + + if (!result) + goto error; + + if (virGBitmapGetBit(bitmap, bit + 1, &result) < 0) + goto error; + + if (result) + goto error; + + ret = 0; + +error: + virGBitmapFree(bitmap); + return ret; +} + +static int +testBit(virGBitmapPtr bitmap, + unsigned int start, + unsigned int end, + bool expected) +{ + int i; + bool result; + + for (i = start; i <= end; i++) { + if (virGBitmapGetBit(bitmap, i, &result) < 0) + return -1; + if (result == expected) + return 0; + } + + return -1; +} + +static int test2(const void *data ATTRIBUTE_UNUSED) +{ + const char *bitsString1 = "1-32,50,88-99,1021-1023"; + const char *bitsStringAfter = "1-32,50,88-99,1021-1023,1111"; + char *bitsString2 = NULL, *bitsString3 = NULL; + virGBitmapPtr bitmap = NULL; + int ret = -1; + int size = 1025; + + if (virGBitmapParse(bitsString1, 0, &bitmap, size) < 0) + goto error; + + if (testBit(bitmap, 1, 32, true) < 0) + goto error; + if (testBit(bitmap, 50, 50, true) < 0) + goto error; + if (testBit(bitmap, 88, 99, true) < 0) + goto error; + if (testBit(bitmap, 1021, 1023, true) < 0) + goto error; + + if (testBit(bitmap, 0, 0, false) < 0) + goto error; + if (testBit(bitmap, 33, 49, false) < 0) + goto error; + if (testBit(bitmap, 51, 87, false) < 0) + goto error; + if (testBit(bitmap, 100, 1020, false) < 0) + goto error; + + if (virGBitmapCountBits(bitmap) != 48) + goto error; + + if (!(bitsString2 = virGBitmapFormat(bitmap))) + goto error; + if (strcmp(bitsString1, bitsString2)) + goto error; + + if (virGBitmapSetBit(bitmap, 1111) < 0) + goto error; + + if (!(bitsString3 = virGBitmapFormat(bitmap))) + goto error; + if (strcmp(bitsStringAfter, bitsString3)) + goto error; + + size = 1111; + virGBitmapSetAll(bitmap); + if (testBit(bitmap, 0, size - 1, true) < 0) + goto error; + if (virGBitmapCountBits(bitmap) < size) + goto error; + + if (!virGBitmapIsAllSet(bitmap)) + goto error; + + virGBitmapClearAll(bitmap); + if (testBit(bitmap, 0, size - 1, false) < 0) + goto error; + if (virGBitmapCountBits(bitmap) != 0) + goto error; + + ret = 0; + +error: + virGBitmapFree(bitmap); + VIR_FREE(bitsString2); + VIR_FREE(bitsString3); + return ret; +} + +static int test3(const void *data ATTRIBUTE_UNUSED) +{ + virGBitmapPtr bitmap = NULL; + int ret = -1; + int size = 5; + int i; + + if ((bitmap = virGBitmapNew(size)) == NULL) + goto error; + + for (i = 0; i < size * 2; i++) + ignore_value(virGBitmapSetBit(bitmap, i)); + + if (virGBitmapSize(bitmap) < (2 * size)) + goto error; + + if (!virGBitmapIsAllSet(bitmap)) + goto error; + + ret = 0; + +error: + virGBitmapFree(bitmap); + return ret; +} + +/* test for virGBitmapNextSetBit */ +static int test4(const void *data ATTRIBUTE_UNUSED) +{ + const char *bitsString = "0, 2-4, 6-10, 12, 14-18, 20, 22, 25"; + int size = 40; + int bitsPos[] = { + 0, 2, 3, 4, 6, 7, 8, 9, 10, 12, + 14, 15, 16, 17, 18, 20, 22, 25 + }; + int npos = 18; + virGBitmapPtr bitmap = NULL; + int i, j; + + /* 1. zero set */ + + bitmap = virGBitmapNew(size); + if (!bitmap) + goto error; + + if (virGBitmapNextSetBit(bitmap, -1) >= 0) + goto error; + + virGBitmapFree(bitmap); + bitmap = NULL; + + /* 2. partial set */ + + if (virGBitmapParse(bitsString, 0, &bitmap, size) < 0) + goto error; + if (!bitmap) + goto error; + + j = 0; + i = -1; + + while (j < npos) { + i = virGBitmapNextSetBit(bitmap, i); + if (i != bitsPos[j++]) + goto error; + } + + if (virGBitmapNextSetBit(bitmap, i) > 0) + goto error; + + /* 3. full set */ + + i = -1; + virGBitmapSetAll(bitmap); + + for (j = 0; j < size; j++) { + i = virGBitmapNextSetBit(bitmap, i); + if (i != j) + goto error; + } + + if (virGBitmapNextSetBit(bitmap, i) > 0) + goto error; + + virGBitmapFree(bitmap); + return 0; + +error: + virGBitmapFree(bitmap); + return -1; +} + +/* test for virGBitmapNewData/ToData */ +static int test5(const void *v ATTRIBUTE_UNUSED) +{ + char data[] = {0x01, 0x02, 0x00, 0x00, 0x04}; + unsigned char *data2 = NULL; + int len2; + int bits[] = {0, 9, 34}; + virGBitmapPtr bitmap; + int i, j; + int ret = -1; + + bitmap = virGBitmapNewData(data, sizeof(data)); + if (!bitmap) + goto error; + + i = 0; + j = -1; + while (i < sizeof(bits)/sizeof(int) && + (j = virGBitmapNextSetBit(bitmap, j)) >= 0) { + if (j != bits[i++]) + goto error; + } + if (virGBitmapNextSetBit(bitmap, j) > 0) + goto error; + + ignore_value(virGBitmapSetBit(bitmap, 2)); + ignore_value(virGBitmapSetBit(bitmap, 15)); + + if (virGBitmapToData(bitmap, &data2, &len2) < 0) + goto error; + + if (len2 != sizeof(data) || + data2[0] != 0x05 || + data2[1] != 0x82 || + data2[2] != 0x00 || + data2[3] != 0x00 || + data2[4] != 0x04) + goto error; + + ret = 0; +error: + virGBitmapFree(bitmap); + VIR_FREE(data2); + return ret; +} + +/* test for virGBitmapFormat */ +static int test6(const void *v ATTRIBUTE_UNUSED) +{ + virGBitmapPtr bitmap = NULL; + char *str = NULL; + int size = 64; + int ret = -1; + + bitmap = virGBitmapNew(size); + if (!bitmap) + goto error; + + str = virGBitmapFormat(bitmap); + if (!str) + goto error; + + if (!STREQ(str, "")) + goto error; + + VIR_FREE(str); + + ignore_value(virGBitmapSetBit(bitmap, 0)); + str = virGBitmapFormat(bitmap); + if (!str) + goto error; + + if (!STREQ(str, "0")) + goto error; + + VIR_FREE(str); + + ignore_value(virGBitmapSetBit(bitmap, 4)); + ignore_value(virGBitmapSetBit(bitmap, 5)); + str = virGBitmapFormat(bitmap); + if (!str) + goto error; + + if (!STREQ(str, "0,4-5")) + goto error; + + VIR_FREE(str); + + ignore_value(virGBitmapSetBit(bitmap, 6)); + str = virGBitmapFormat(bitmap); + if (!str) + goto error; + + if (!STREQ(str, "0,4-6")) + goto error; + + VIR_FREE(str); + + ignore_value(virGBitmapSetBit(bitmap, 13)); + ignore_value(virGBitmapSetBit(bitmap, 14)); + ignore_value(virGBitmapSetBit(bitmap, 15)); + ignore_value(virGBitmapSetBit(bitmap, 16)); + str = virGBitmapFormat(bitmap); + if (!str) + goto error; + + if (!STREQ(str, "0,4-6,13-16")) + goto error; + + VIR_FREE(str); + + ignore_value(virGBitmapSetBit(bitmap, 62)); + ignore_value(virGBitmapSetBit(bitmap, 63)); + str = virGBitmapFormat(bitmap); + if (!str) + goto error; + + if (!STREQ(str, "0,4-6,13-16,62-63")) + goto error; + + + ret = 0; +error: + virGBitmapFree(bitmap); + VIR_FREE(str); + return ret; +} + +static int test7(const void *v ATTRIBUTE_UNUSED) +{ + virGBitmapPtr bitmap; + size_t i; + size_t maxBit[] = { + 1, 8, 31, 32, 63, 64, 95, 96, 127, 128, 159, 160 + }; + size_t nmaxBit = 12; + + for (i = 0; i < nmaxBit; i++) { + bitmap = virGBitmapNew(maxBit[i]); + if (!bitmap) + goto error; + + if (virGBitmapIsAllSet(bitmap)) + goto error; + + ignore_value(virGBitmapSetBit(bitmap, 1)); + if (virGBitmapIsAllSet(bitmap)) + goto error; + + virGBitmapSetAll(bitmap); + if (!virGBitmapIsAllSet(bitmap)) + goto error; + + virGBitmapFree(bitmap); + } + + return 0; + +error: + virGBitmapFree(bitmap); + return -1; +} + +/* test for virGBitmapNextClearBit */ +static int test8(const void *data ATTRIBUTE_UNUSED) +{ + const char *bitsString = "0, 2-4, 6-10, 12, 14-18, 20, 22, 25, 28-33, 35, " + "41-42, 45-46"; + int size = 48; + int noBitsPos[] = { + 1, 5, 11, 13, 19, 21, 23, 24, + 26, 27, 34, 36, 37, 38, 39, 40, + 43, 44, 47 + }; + int npos = 19; + virGBitmapPtr bitmap = NULL; + int i, j; + + /* 1. zero set */ + + bitmap = virGBitmapNew(size); + if (!bitmap) + goto error; + + if (virGBitmapNextClearBit(bitmap, -1) != 0) + goto error; + + virGBitmapFree(bitmap); + bitmap = NULL; + + /* 2. partial set */ + + if (virGBitmapParse(bitsString, 0, &bitmap, size) < 0) + goto error; + if (!bitmap) + goto error; + + j = 0; + i = -1; + + while (j < npos) { + i = virGBitmapNextClearBit(bitmap, i); + if (i != noBitsPos[j++]) + goto error; + } + + if (virGBitmapNextSetBit(bitmap, i) > 0) + goto error; + + /* 3. full set */ + + i = -1; + virGBitmapSetAll(bitmap); + + for (j = 0; j < size; j++) { + i = virGBitmapNextSetBit(bitmap, i); + if (i != j) + goto error; + } + + if (virGBitmapNextClearBit(bitmap, i) != i + 1) + goto error; + + virGBitmapFree(bitmap); + return 0; + +error: + virGBitmapFree(bitmap); + return -1; +} + +static int +mymain(void) +{ + int ret = 0; + + if (virtTestRun("test1", 1, test1, NULL) < 0) + ret = -1; + if (virtTestRun("test2", 1, test2, NULL) < 0) + ret = -1; + if (virtTestRun("test3", 1, test3, NULL) < 0) + ret = -1; + if (virtTestRun("test4", 1, test4, NULL) < 0) + ret = -1; + if (virtTestRun("test5", 1, test5, NULL) < 0) + ret = -1; + if (virtTestRun("test6", 1, test6, NULL) < 0) + ret = -1; + if (virtTestRun("test7", 1, test7, NULL) < 0) + ret = -1; + if (virtTestRun("test8", 1, test8, NULL) < 0) + ret = -1; + + return ret; +} + +VIRT_TEST_MAIN(mymain) Index: libvirt/src/libvirt_private.syms =================================================================== --- libvirt.orig/src/libvirt_private.syms +++ libvirt/src/libvirt_private.syms @@ -9,6 +9,7 @@ virBitmapClearAll; virBitmapClearBit; virBitmapCopy; +virBitmapCopyResize; virBitmapCountBits; virBitmapEqual; virBitmapFormat; @@ -1390,6 +1391,27 @@ virFileWrapperFdFree; virFileWrapperFdNew; +# virbitmap.h +virGBitmapClearAll; +virGBitmapClearBit; +virGBitmapCopy; +virGBitmapCountBits; +virGBitmapFormat; +virGBitmapFree; +virGBitmapGetBit; +virGBitmapIsAllSet; +virGBitmapNew; +virGBitmapNewData; +virGBitmapNextClearBit; +virGBitmapNextSetBit; +virGBitmapParse; +virGBitmapSetAll; +virGBitmapSetBit; +virGBitmapSize; +virGBitmapString; +virGBitmapToData; + + # virinitctl.h virInitctlSetRunLevel;

3 2

[libvirt] [PATCH] complete virterror->virerror name change
by Serge Hallyn 04 Feb '13

04 Feb '13

Without these two string changes in generator.py, the virGetLastError wrapper does not get created in /usr/share/pyshared/libvirt.py. Noticed when running tests with virt-install. Signed-off-by: Serge Hallyn <serge.hallyn(a)ubuntu.com> --- python/generator.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/python/generator.py b/python/generator.py index 5d27f66..71ca883 100755 --- a/python/generator.py +++ b/python/generator.py @@ -123,7 +123,7 @@ class docParser(xml.sax.handler.ContentHandler): self.function_return_field = attrs['field'] elif tag == 'enum': if (attrs['file'] == "libvirt" or - attrs['file'] == "virterror"): + attrs['file'] == "virerror"): enum(attrs['type'],attrs['name'],attrs['value']) elif attrs['file'] == "libvirt-lxc": lxc_enum(attrs['type'],attrs['name'],attrs['value']) @@ -137,7 +137,7 @@ class docParser(xml.sax.handler.ContentHandler): if self.function != None: if (self.function_module == "libvirt" or self.function_module == "virevent" or - self.function_module == "virterror"): + self.function_module == "virerror"): function(self.function, self.function_descr, self.function_return, self.function_args, self.function_file, self.function_module, -- 1.8.0

4 6

[libvirt] [PATCH 0/9] Glue domain and storage
by Osier Yang 04 Feb '13

04 Feb '13

This is the 4th part to implement NPIV migration support [1]. Part 1: https://www.redhat.com/archives/libvir-list/2013-January/msg00859.html Part 2: (Already ACKed by Michal) https://www.redhat.com/archives/libvir-list/2013-January/msg00859.html Part 3: https://www.redhat.com/archives/libvir-list/2013-January/msg01012.html To achieve the NPIV migration support, Part 2, Part 3 and this set are necessary, Part 1 is optional. However, this set can be reviewd independantly. ============ This introduces new XMLs to specify the disk source with storage like <disk type='volume' device='disk'> <driver name='qemu' type='raw' cache='none'/> <source pool="$pool_name" volume='$vol_name'/> <seclabel relabel='no'/> </source> <target dev='vdb' bus='virtio'/> </disk> And before domain starting, the source represented by storage is translated into the real underlying source. Diff with RFC: * The XMLs are more simpler - only using pool name and volume name to specify disk source. * Support network pool (rbd, and sheepdog) * Support startupPolicy for volume type disk * Support seclabels for volume type disk * Fix bugs on disk source formating Osier Yang (9): rng: Add definition for network disk source Introduce new XMLs to specify disk source using libvirt storage New files to glue domain and storage together Implement translateDiskSourcePool qemu: Translate the source when starting domain Support startupPolicy for 'volume' disk conf: Fix bugs on disk source formating Support seclabels for volume type disk Support network pool for volume disk docs/formatdomain.html.in | 49 +++-- docs/schemas/domaincommon.rng | 111 +++++--- src/Makefile.am | 3 +- src/conf/domain_conf.c | 278 ++++++++++++++------ src/conf/domain_conf.h | 9 + src/conf/domain_storage.c | 44 +++ src/conf/domain_storage.h | 37 +++ src/libvirt_private.syms | 5 + src/qemu/qemu_driver.c | 7 + src/storage/storage_driver.c | 144 ++++++++++ .../qemuxml2argv-disk-source-pool.xml | 33 +++ tests/qemuxml2xmltest.c | 1 + 12 files changed, 573 insertions(+), 148 deletions(-) create mode 100644 src/conf/domain_storage.c create mode 100644 src/conf/domain_storage.h create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-source-pool.xml [1] https://www.redhat.com/archives/libvir-list/2012-November/msg00826.html Osier

3 29

[libvirt] [PATCH 00/17] virsh: Rework string option retrieval
by Peter Krempa 04 Feb '13

04 Feb '13

This patchset fixes retrieval of string arguments in virsh to report sane errors in all the places it's used. A new string option retrieval function is added that supports error reporting and changes appropriate places to use it. Along with that this series cleans up a few places with old code and bad style. *** BLURB HERE *** Peter Krempa (17): virsh-snapshot: Fix coding style and remove dead code virsh-volume: Rename helper function makeCloneXML to vshMakeCloneXML virsh-pool: Rename helper function buildPoolXML to vshBuildPoolXML virsh: Add helper to request string arguments with error reporting virsh-pool: Update pool commands to use vshCommandOptStringReq virsh-volume: Update volume commands to use vshCommandOptStringReq virsh-domain-monitor: Update domain commands to use vshCommandOptStringReq virsh-domain: Update domain commands to use vshCommandOptStringReq virsh-host: Update host commands to use vshCommandOptStringReq virsh-network: Update network commands to use vshCommandOptStringReq virsh-interface: Update interface commands to use vshCommandOptStringReq virsh-nodedev: Update node device commands to use vshCommandOptStringReq virsh-nodedev: Refactor error paths, error messages and whitespace virsh-snapshot: Refactor cmdSnapshotDumpXML virsh-snapshot: Update snapshot commands to use vshCommandOptStringReq virsh-nwfilter: Update nwfilter commands to use vshCommandOptStringReq virsh-secret: Refactor error paths tools/virsh-domain-monitor.c | 44 +++---- tools/virsh-domain.c | 299 +++++++++++++++++-------------------------- tools/virsh-host.c | 9 +- tools/virsh-interface.c | 8 +- tools/virsh-network.c | 19 +-- tools/virsh-nodedev.c | 44 ++++--- tools/virsh-nwfilter.c | 4 +- tools/virsh-pool.c | 56 ++++---- tools/virsh-secret.c | 30 +++-- tools/virsh-snapshot.c | 55 +++----- tools/virsh-volume.c | 73 +++++------ tools/virsh.c | 51 ++++++++ tools/virsh.h | 4 + 13 files changed, 320 insertions(+), 376 deletions(-) -- 1.8.1.1

2 44

[libvirt] RFC: Admin interface for connection monitoring
by Martin Kletzander 04 Feb '13

04 Feb '13

Hello everyone. Trying to create new interface for the libvirt daemon, mainly for connection monitoring, I came across few things I'd like to propose/discuss. This interface will be used to manage active connections of the daemon (list/kill) and other until-now impossible things (e.g. changing logging filters on-the-fly). Connection to this interface will be: - available even when no normal/priority workers are available, - distinguished (or completely separated) from other daemon connections, - (should be) more restricted than other connections. Having the connection available with all the worker threads being blocked/deadlocked creates the possibility of for example listing the connections even when all APIs block. Such manipulations mustn't be possible over the standard connections and that's why the connections should be distinguished. The connection restriction is hard to check, but the permissions for the socket should be less or equal to the rw socket with having no authentication only when rw socket has no authentication. My idea is following: - new 'admin_protocol.x' with specification of new program, - default connection limitation to this interface to only root-owned socket with 700 (authentication optional, see above), so only root on the host can utilize it, - configurable number of admin workers, but with 1 as a default, - splitting usable parts of virsh and reusing them to create virsh-admin binary. More controversial ideas I'd like to hear somebody else's opinion (even more than for the other things): - create a new separate library (libvirt-admin.so) to be used in the client, this library will have it's own virAdminConnect{,Auth}Open(), probably without an URI parameter (or with, but disabled for now, in case we want to enable remote connections later) - it is IMHO pointless to add a driver type for this, but it should definitely be configurable at compile time as well as in config (admin_workers = 0, maybe), - keep the connection handling on the current code and instead of duplicating much of it (so there will be a new service, much like the read-only socket, but for admin API only), - create a new pool of workers just for admin connections (similarly to the priority workers pool), with the dispatching being recognized by the protocol it is created in (remote, qemu, lxc protocols will go to normal/priority workers, whether admin protocol will be dispatched to the admin workers) and of course impossible from other connections than the admin one, which leads me to the next point; - we can either add next flag for admin connection (similarly to the readonly one) or make it future-friendly and change the readonly bool into a virConnectionType enum (for example). I must admit, I'm probably doing something wrong or we have old documentation. Commands like 'make -C src rpcgen' don't work and I don't understand why admin_protocol-structs isn't automatically generated, but I've made it work for now. Have a nice day, Martin

2 1

[libvirt] How to connect to console of domain on PowerPC?
by Yin Olivia-R63875 04 Feb '13

04 Feb '13

Hi, I tried to use libvirt to run KVM/QEMU on Freescale PowerPC platforms. So far there's only one serial device (spapr-vty) defined in QEMU to work as console for IBM PSeries platform. There's no serial device support in QEMU for Freescale PowerPC (ePAPR). libvirt/src/qemu/qemu_command.c /* This function generates the correct '-device' string for character * devices of each architecture. */ char * qemuBuildChrDeviceStr(virDomainChrDefPtr serial, virBitmapPtr qemuCaps, char *os_arch, char *machine) { virBuffer cmd = VIR_BUFFER_INITIALIZER; if (STREQ(os_arch, "ppc64") && STREQ(machine, "pseries")) { if (serial->deviceType == VIR_DOMAIN_CHR_DEVICE_TYPE_SERIAL && serial->source.type == VIR_DOMAIN_CHR_TYPE_PTY && serial->info.type == VIR_DOMAIN_DEVICE_ADDRESS_TYPE_SPAPRVIO) { virBufferAsprintf(&cmd, "spapr-vty,chardev=char%s", serial->info.alias); if (qemuBuildDeviceAddressStr(&cmd, &serial->info, qemuCaps) < 0) goto error; } } else virBufferAsprintf(&cmd, "isa-serial,chardev=char%s,id=%s", serial->info.alias, serial->info.alias); if (virBufferError(&cmd)) { virReportOOMError(); goto error; } return virBufferContentAndReset(&cmd); error: virBufferFreeAndReset(&cmd); return NULL; } We usually connect guest with telnet. For instance, /usr/bin/qemu-system-ppc -name demo -M ppce500v2 -enable-kvm -m 256 -nographic -kernel /media/ram/uImage -initrd /media/ram/ramdisk -append "root=/dev/ram rw console=ttyS0,115200" -serial tcp::4445,server Then to run 'telnet 10.193.20.xxx 4445' could connect the guest. The temporary workaround is not add '-device' string after '-serial' option. diff -Nur libvirt-0.10.1.orig/src/qemu/qemu_command.c libvirt-0.10.1/src/qemu/qemu_command.c --- libvirt-0.10.1.orig/src/qemu/qemu_command.c 2012-08-30 15:35:18.000000000 +0530 +++ libvirt-0.10.1/src/qemu/qemu_command.c 2012-10-05 17:19:32.060368755 +0530 @@ -5501,13 +5501,15 @@ virCommandAddArg(cmd, devstr); VIR_FREE(devstr); - virCommandAddArg(cmd, "-device"); - if (!(devstr = qemuBuildChrDeviceStr(serial, qemuCaps, + if (!STREQ(def->os.arch, "ppc")) { + virCommandAddArg(cmd, "-device"); + if (!(devstr = qemuBuildChrDeviceStr(serial, + qemuCaps, def->os.arch, def->os.machine))) - goto error; - virCommandAddArg(cmd, devstr); - VIR_FREE(devstr); + goto error; + virCommandAddArg(cmd, devstr); + VIR_FREE(devstr); + } } else { virCommandAddArg(cmd, "-serial"); if (!(devstr = qemuBuildChrArgStr(&serial->source, NULL))) Applying the above patch to libvirt, all the other domain control commands could work except 'virsh console domain'. # cat >demo.args <<EOF > /usr/bin/qemu-system-ppc -name demo -M ppce500v2 -enable-kvm -m 256 > -nographic -kernel /media/ram/uImage -initrd /media/ram/ramdisk > -append "root=/dev/ram rw console=ttyS0,115200" -serial > tcp::4445,server -net nic EOF # vi demo.args /usr/bin/qemu-system-ppc -name demo -M ppce500v2 -enable-kvm -m 256 -nographic -kernel /media/ram/uImage -initrd /media/ram/ramdisk -append "root=/dev/ram rw console=ttyS0,115200" -serial tcp::4445,server -net nic # virsh domxml-from-native qemu-argv demo.args >demo.xml # vi demo.xml <domain type='kvm'> <name>demo</name> <uuid>985d7154-83c8-0763-cbac-ecd159eee8a6</uuid> <memory unit='KiB'>262144</memory> <currentMemory unit='KiB'>262144</currentMemory> <vcpu placement='static'>1</vcpu> <os> <type arch='ppc' machine='ppce500v2'>hvm</type> <kernel>/media/ram/uImage</kernel> <initrd>/media/ram/ramdisk</initrd> <cmdline>root=/dev/ram rw console=ttyS0,115200</cmdline> </os> <clock offset='utc'/> <on_poweroff>destroy</on_poweroff> <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> <emulator>/usr/bin/qemu-system-ppc</emulator> <serial type='tcp'> <source mode='bind' host='' service='4445'/> <protocol type='raw'/> <target port='0'/> </serial> <console type='tcp'> <source mode='bind' host='' service='4445'/> <protocol type='raw'/> <target type='serial' port='0'/> </console> <memballoon model='virtio'/> </devices> </domain> # virsh -c qemu:///system define demo.xml # virsh -c qemu:///system start demo But it seemed that can't connect to the console. # virsh -c qemu:///system console demo Connected to domain test Escape character is ^] error: internal error character device (null) is not using a PTY I tried also use '-serial pty' option, /usr/bin/qemu-system-ppc -name test -M ppce500v2 -enable-kvm -m 256 -nographic -kernel /media/ram/uImage -initrd /media/ram/ramdisk -append "root=/dev/ram rw console=ttyS0,115200" -serial pty Then there's no other output after the below message: # virsh -c qemu:///system console demo Connected to domain test Escape character is ^] It seemed not libvirt group issue. I also tried the LXC. It could connect to the console if <init>/bin/sh/</init> instead of <init>/sbin/init</init> Best Regards, Olivia

1 0

[libvirt] [PATCH] rpc: Fix crash on error paths of message dispatching
by Peter Krempa 03 Feb '13

03 Feb '13

When reading and dispatching of a message failed the message was freed but wasn't removed from the message queue. After that when the connection was about to be closed the pointer for the message was still present in the queue and it was passed to virNetMessageFree which tried to call the callback function from an uninitialized pointer. This patch removes the message from the queue before it's freed. * rpc/virnetserverclient.c: virNetServerClientDispatchRead: - avoid use after free of RPC messages --- src/rpc/virnetserverclient.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/rpc/virnetserverclient.c b/src/rpc/virnetserverclient.c index af0560e..446e1e9 100644 --- a/src/rpc/virnetserverclient.c +++ b/src/rpc/virnetserverclient.c @@ -987,6 +987,7 @@ readmore: /* Decode the header so we can use it for routing decisions */ if (virNetMessageDecodeHeader(msg) < 0) { + virNetMessageQueueServe(&client->rx); virNetMessageFree(msg); client->wantClose = true; return; @@ -996,6 +997,7 @@ readmore: * file descriptors */ if (msg->header.type == VIR_NET_CALL_WITH_FDS && virNetMessageDecodeNumFDs(msg) < 0) { + virNetMessageQueueServe(&client->rx); virNetMessageFree(msg); client->wantClose = true; return; /* Error */ @@ -1005,6 +1007,7 @@ readmore: for (i = msg->donefds ; i < msg->nfds ; i++) { int rv; if ((rv = virNetSocketRecvFD(client->sock, &(msg->fds[i]))) < 0) { + virNetMessageQueueServe(&client->rx); virNetMessageFree(msg); client->wantClose = true; return; -- 1.8.1.1

5 9

[libvirt] [Libvirt]How to get libvirt version after git clone?
by harryxiyou 02 Feb '13

02 Feb '13

Hi all, After i clone libvirt git repo, how i could get this libvirt version exactly? $ git clone git://libvirt.org/libvirt.git $ git branch -a * master remotes/origin/HEAD -> origin/master remotes/origin/master remotes/origin/v0.10.2-maint remotes/origin/v0.9.11-maint remotes/origin/v0.9.6-maint I can just see up stuffs but exact current version. Could anyone give me some suggestions? Thanks in advance. -- Thanks Harry Wei

3 3

[libvirt] [Libvirt]Snapshot operations in Libvirt
by harryxiyou 02 Feb '13

02 Feb '13

Hi all, I see our libvirt snapshot XML form like following, which this XML is to create a disk snapshot of just vda on a qemu domain with two disks. <domainsnapshot> <description>Snapshot of OS install and updates</description> <disks> <disk name='/path/to/old'> <source file='/path/to/new'/> </disk> <disk name='vdb' snapshot='no'/> </disks> </domainsnapshot> My understanding about up XML is like this: it creates a snapshot for '/path/to/old', which '/path/to/old' would be the read-only backing file to the new active file '/path/to/new'. I also have some questions about current libvirt snapshot operations like following. 1, Is my up understanding right? Or maybe you have any other suggestions. 2, I wonder whether libvirt *NOW* support start a snapshot and then mount this new storage block, which is based on the snapshot. Please give me some real examples (like Sheepdog volumes) if you can. -- Thanks Harry Wei

2 1

[libvirt] [PATCH] hyperv: Avoid Coverity warning about resource leak in hypervOpen
by Matthias Bolte 02 Feb '13

02 Feb '13

Coverity tagged the esxhypervPrivate pointer a potentially leaked because of the conditional free call. But this is a false positive, there is not actual leak. Avoid the conditial code to make this more obvious to Coverity. --- This patch is meant as a replacement for this patch https://www.redhat.com/archives/libvir-list/2013-January/msg00542.html src/hyperv/hyperv_driver.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/src/hyperv/hyperv_driver.c b/src/hyperv/hyperv_driver.c index 601a85a..0d2eaae 100644 --- a/src/hyperv/hyperv_driver.c +++ b/src/hyperv/hyperv_driver.c @@ -200,14 +200,11 @@ hypervOpen(virConnectPtr conn, virConnectAuthPtr auth, unsigned int flags) } conn->privateData = priv; - + priv = NULL; result = VIR_DRV_OPEN_SUCCESS; cleanup: - if (result == VIR_DRV_OPEN_ERROR) { - hypervFreePrivate(&priv); - } - + hypervFreePrivate(&priv); VIR_FREE(username); VIR_FREE(password); hypervFreeObject(priv, (hypervObject *)computerSystem); -- 1.7.9.5

2 3

[libvirt] [PATCH] esx: Avoid Coverity warning about resource leak in esxOpen
by Matthias Bolte 02 Feb '13

02 Feb '13

Commit 4445e16bfa8056980ac643fabf17186f9e685925 changed the signature of esxConnectToHost and esxConnectToVCenter by replacing the esxPrivate pointer with virConnectPtr. The esxPrivate pointer was then retrieved again from virConnectPtr's privateData. This resulted in a NULL pointer dereference, because the privateData pointer was not yet initialized at the point where esxConnectToHost and esxConnectToVCenter are called. This was fixed in commit b126715a48cd0cbe32ec6468c267cd8cf2961c55 that moved the initialization of privateData before the problematic calls. Coverity tagged the esxPrivate pointer a potentially leaked because of the conditional free call. But this is a false positive, there is not actual leak. Avoid this warning from Coverity by making the call to esxFreePrivate unconditional and changing esxConnectToHost and esxConnectToVCenter back to take a esxPrivate pointer directly. This allows to assign esxPrivate to the virConnectPtr's privateData pointer as one of the last steps in esxOpen making it more obvious that it is not initialized during the earlier steps of esxOpen. --- This patch is meant as a replacement this patch: https://www.redhat.com/archives/libvir-list/2013-January/msg00530.html src/esx/esx_driver.c | 23 ++++++++++------------- 1 file changed, 10 insertions(+), 13 deletions(-) diff --git a/src/esx/esx_driver.c b/src/esx/esx_driver.c index 1366c81..dad10a1 100644 --- a/src/esx/esx_driver.c +++ b/src/esx/esx_driver.c @@ -650,7 +650,8 @@ esxCapsInit(esxPrivate *priv) static int -esxConnectToHost(virConnectPtr conn, +esxConnectToHost(esxPrivate *priv, + virConnectPtr conn, virConnectAuthPtr auth, char **vCenterIpAddress) { @@ -663,7 +664,6 @@ esxConnectToHost(virConnectPtr conn, esxVI_String *propertyNameList = NULL; esxVI_ObjectContent *hostSystem = NULL; esxVI_Boolean inMaintenanceMode = esxVI_Boolean_Undefined; - esxPrivate *priv = conn->privateData; esxVI_ProductVersion expectedProductVersion = STRCASEEQ(conn->uri->scheme, "esx") ? esxVI_ProductVersion_ESX : esxVI_ProductVersion_GSX; @@ -785,7 +785,8 @@ esxConnectToHost(virConnectPtr conn, static int -esxConnectToVCenter(virConnectPtr conn, +esxConnectToVCenter(esxPrivate *priv, + virConnectPtr conn, virConnectAuthPtr auth, const char *hostname, const char *hostSystemIpAddress) @@ -796,7 +797,6 @@ esxConnectToVCenter(virConnectPtr conn, char *unescapedPassword = NULL; char *password = NULL; char *url = NULL; - esxPrivate *priv = conn->privateData; if (hostSystemIpAddress == NULL && (priv->parsedUri->path == NULL || STREQ(priv->parsedUri->path, "/"))) { @@ -1008,8 +1008,6 @@ esxOpen(virConnectPtr conn, virConnectAuthPtr auth, priv->supportsLongMode = esxVI_Boolean_Undefined; priv->usedCpuTimeCounterId = -1; - conn->privateData = priv; - /* * Set the port dependent on the transport protocol if no port is * specified. This allows us to rely on the port parameter being @@ -1036,7 +1034,7 @@ esxOpen(virConnectPtr conn, virConnectAuthPtr auth, if (STRCASEEQ(conn->uri->scheme, "esx") || STRCASEEQ(conn->uri->scheme, "gsx")) { /* Connect to host */ - if (esxConnectToHost(conn, auth, + if (esxConnectToHost(priv, conn, auth, &potentialVCenterIpAddress) < 0) { goto cleanup; } @@ -1075,7 +1073,7 @@ esxOpen(virConnectPtr conn, virConnectAuthPtr auth, } } - if (esxConnectToVCenter(conn, auth, + if (esxConnectToVCenter(priv, conn, auth, vCenterIpAddress, priv->host->ipAddress) < 0) { goto cleanup; @@ -1085,7 +1083,7 @@ esxOpen(virConnectPtr conn, virConnectAuthPtr auth, priv->primary = priv->host; } else { /* VPX */ /* Connect to vCenter */ - if (esxConnectToVCenter(conn, auth, + if (esxConnectToVCenter(priv, conn, auth, conn->uri->server, NULL) < 0) { goto cleanup; @@ -1101,13 +1099,12 @@ esxOpen(virConnectPtr conn, virConnectAuthPtr auth, goto cleanup; } + conn->privateData = priv; + priv = NULL; result = VIR_DRV_OPEN_SUCCESS; cleanup: - if (result == VIR_DRV_OPEN_ERROR) { - esxFreePrivate(&priv); - } - + esxFreePrivate(&priv); VIR_FREE(potentialVCenterIpAddress); return result; -- 1.7.9.5

3 6

[libvirt] [Sheepdog][Libvirt]Test boot VMs from sheepdog volumes in Libvirt
by harryxiyou 02 Feb '13

02 Feb '13

Hi all, We can get "Boot VMs from sheepdog volumes in Libvirt" way from https://github.com/collie/sheepdog/wiki/Libvirt like following. a, prepare a file containing an XML domain description $ cat > sheepdog.xml <domain type='qemu'> <name>testvm</name> <memory>1048576</memory> <os> <type arch='x86_64'>hvm</type> </os> <devices> <disk type='network'> <source protocol="sheepdog" name="testvdi"/> <target dev='hda' bus='ide'/> </disk> <graphics type='vnc' port='-1' autoport='yes'/> </devices> </domain> b, boot from testvdi with virsh $ virsh create sheepdog.xml c, connect to a VNC console of the running VM $ vncviewer localhost I have some following questions about up three steps. 1, Before a or b(up boot step) step, should we have to install our OS into 'testvdi'? That is to say, we have to install OS from os.iso file into 'testvdi', which should use 'qemu-system-x86_64' command to install OS, right? 2, Before this test, shoul we have to build Sheepdog, QEMU, Libvirt environment? 3, This is the storage online management in Libvirt, right? 4, This test just test the codes Morita take a patch named "add network disk support" for Libvirt, which is located here: http://libvirt.org/git/?p=libvirt.git;a=commit;h=036ad5052b43fe9f0d197e89fd… and also test Sheepdog driver for QEMU, right? 5, If i installed a 32bits OS to testvdi, should i modify <os> <type arch='x86_64'>hvm</type> </os> to be <os> <type arch='x86'>hvm</type> </os> , right? 6, The step c (up boot step), which is $ vncviewer localhost Actually, i am not clear about this 'localhost'. Why should we link localhost but other ip addresses? Could anyone please give me some suggestions? Thanks in advance ;-) -- Thanks Harry Wei

2 4

[libvirt] [PATCH] docs: don't ignore virEvent API
by Eric Blake 02 Feb '13

02 Feb '13

Commit 6094ad7b (0.9.3 release) promoted several functions from internal to public, but forgot to fix the documentation generator to provide details about those functions. For an example of what this fixes, look at: file:///path/to/libvirt/docs/html/libvirt-libvirt.html#virEventAddHandle before and after the patch. * docs/apibuild.py (ignored_functions): Don't ignore functions that were turned into official API. * src/util/virevent.c: Fix comments to pass through parser. --- In response to my concerns raised on one of Claudio's patches: https://www.redhat.com/archives/libvir-list/2013-February/msg00048.html docs/apibuild.py | 6 ----- src/util/virevent.c | 78 +++++++++++++++++++++++++++++++++++------------------ 2 files changed, 52 insertions(+), 32 deletions(-) diff --git a/docs/apibuild.py b/docs/apibuild.py index e5cbbe8..2bdbf2d 100755 --- a/docs/apibuild.py +++ b/docs/apibuild.py @@ -64,12 +64,6 @@ ignored_functions = { "virDomainMigratePrepareTunnel3": "private function for tunnelled migration", "virDrvSupportsFeature": "private function for remote access", "DllMain": "specific function for Win32", - "virEventAddHandle": "internal function in virevent.c", - "virEventUpdateHandle": "internal function in virevent.c", - "virEventRemoveHandle": "internal function in virevent.c", - "virEventAddTimeout": "internal function in virevent.c", - "virEventUpdateTimeout": "internal function in virevent.c", - "virEventRemoveTimeout": "internal function in virevent.c", "virTypedParameterArrayValidate": "internal function in virtypedparam.c", "virTypedParameterAssign": "internal function in virtypedparam.c", "virTypedParameterAssignFromStr": "internal function in virtypedparam.c", diff --git a/src/util/virevent.c b/src/util/virevent.c index 6900011..886cb6d 100644 --- a/src/util/virevent.c +++ b/src/util/virevent.c @@ -1,7 +1,7 @@ /* * virevent.c: event loop for monitoring file handles * - * Copyright (C) 2007, 2011 Red Hat, Inc. + * Copyright (C) 2007, 2011, 2013 Red Hat, Inc. * Copyright (C) 2007 Daniel P. Berrange * * This library is free software; you can redistribute it and/or @@ -38,20 +38,25 @@ static virEventUpdateTimeoutFunc updateTimeoutImpl = NULL; static virEventRemoveTimeoutFunc removeTimeoutImpl = NULL; /** - * virEventAddHandle: register a callback for monitoring file handle events + * virEventAddHandle: * * @fd: file handle to monitor for events * @events: bitset of events to watch from virEventHandleType constants * @cb: callback to invoke when an event occurs * @opaque: user data to pass to callback + * @ff: callback to free opaque when handle is removed * - * returns -1 if the file handle cannot be registered, 0 upon success + * Register a callback for monitoring file handle events. + * + * Returns -1 if the file handle cannot be registered, 0 upon success */ -int virEventAddHandle(int fd, - int events, - virEventHandleCallback cb, - void *opaque, - virFreeCallback ff) { +int +virEventAddHandle(int fd, + int events, + virEventHandleCallback cb, + void *opaque, + virFreeCallback ff) +{ if (!addHandleImpl) return -1; @@ -59,25 +64,33 @@ int virEventAddHandle(int fd, } /** - * virEventUpdateHandle: change event set for a monitored file handle + * virEventUpdateHandle: * * @watch: watch whose file handle to update * @events: bitset of events to watch from virEventHandleType constants * + * Change event set for a monitored file handle. + * * Will not fail if fd exists */ -void virEventUpdateHandle(int watch, int events) { +void +virEventUpdateHandle(int watch, int events) +{ updateHandleImpl(watch, events); } /** - * virEventRemoveHandle: unregister a callback from a file handle + * virEventRemoveHandle: * * @watch: watch whose file handle to remove * - * returns -1 if the file handle was not registered, 0 upon success + * Unregister a callback from a file handle. + * + * Returns -1 if the file handle was not registered, 0 upon success. */ -int virEventRemoveHandle(int watch) { +int +virEventRemoveHandle(int watch) +{ if (!removeHandleImpl) return -1; @@ -85,22 +98,27 @@ int virEventRemoveHandle(int watch) { } /** - * virEventAddTimeout: register a callback for a timer event + * virEventAddTimeout: * * @timeout: time between events in milliseconds * @cb: callback to invoke when an event occurs * @opaque: user data to pass to callback + * @ff: callback to free opaque when timeout is removed + * + * Register a callback for a timer event. * * Setting timeout to -1 will disable the timer. Setting the timeout * to zero will cause it to fire on every event loop iteration. * - * returns -1 if the timer cannot be registered, a positive - * integer timer id upon success + * Returns -1 if the timer cannot be registered, a positive + * integer timer id upon success. */ -int virEventAddTimeout(int timeout, - virEventTimeoutCallback cb, - void *opaque, - virFreeCallback ff) { +int +virEventAddTimeout(int timeout, + virEventTimeoutCallback cb, + void *opaque, + virFreeCallback ff) +{ if (!addTimeoutImpl) return -1; @@ -108,28 +126,36 @@ int virEventAddTimeout(int timeout, } /** - * virEventUpdateTimeoutImpl: change frequency for a timer + * virEventUpdateTimeout: * * @timer: timer id to change - * @frequency: time between events in milliseconds + * @timeout: time between events in milliseconds + * + * Change frequency for a timer. * * Setting frequency to -1 will disable the timer. Setting the frequency * to zero will cause it to fire on every event loop iteration. * * Will not fail if timer exists */ -void virEventUpdateTimeout(int timer, int timeout) { +void +virEventUpdateTimeout(int timer, int timeout) +{ updateTimeoutImpl(timer, timeout); } /** - * virEventRemoveTimeout: unregister a callback for a timer + * virEventRemoveTimeout: * * @timer: the timer id to remove * - * returns -1 if the timer was not registered, 0 upon success + * Unregister a callback for a timer. + * + * Returns -1 if the timer was not registered, 0 upon success. */ -int virEventRemoveTimeout(int timer) { +int +virEventRemoveTimeout(int timer) +{ if (!removeTimeoutImpl) return -1; -- 1.8.1

2 2

[libvirt] [Sheepdog][Libvirt]Boot VMs from sheepdog volumes error
by harryxiyou 01 Feb '13

01 Feb '13

Hi all, I wanna boot VMs from sheepdog volumes so i do according to https://github.com/collie/sheepdog/wiki/Libvirt However, some errors happened to me like following. $ ./virsh create os.xml error：create domain from os.xml failure error：(domain_definition):14: Premature end of data in tag domain line 1 (null) ^ $ cat os.xml <domain type='qemu'> <name>testvm</name> <memory>1048576</memory> <os> <type arch='x86_64'>hvm</type> </os> <devices> <disk type='network'> <source protocol="sheepdog" name="testvdi"/> <target dev='hda' bus='ide'/> </disk> <graphics type='vnc' port='-1' autoport='yes'/> </devices> Could anyone give me some help? Thanks. -- Thanks Harry Wei

2 2

[libvirt] [PATCH] maint: update to latest gnulib
by Eric Blake 01 Feb '13

01 Feb '13

CVE-2013-0242 in glibc's regex() can cause a DoS in any daemon that runs a regex search on user input while in a multibyte locale. I'm not sure how hard it would be to trigger such a setup for libvirtd, but rather than risk things, we can avoid the issue: gnulib has worked around the problem, and by updating to the latest gnulib, we can avoid the bug even on platforms where glibc has yet to be patched. * .gnulib: Update to latest, for various fixes, including regex. * bootstrap: Resync from upstream. --- * .gnulib 61c7b1e...a0b25da (45): > regex: avoid infinite configure test > openpty: fix bug where HAVE_OPENPTY wasn't defined > sys_time: port to Solaris 2.6 > regex: test for buffer overrun > regex: fix buffer overrun in regexp matcher > mountlist: don't consider "devtmpfs" as dummy > futimens-tests, utimens-tests: Depend on gettext. > test-getpeername: fix typo > bootstrap: remove the need for a sorted .gitignore > readlinkat: don't depend on gl_FUNC_OPENAT > statat: new module, split out from fstatat > autoupdate > Fix typo in previous change, by including <unistd.h>. > tests: don't assume fd 99 is closed > Fix ChangeLog typo. > stpncpy: port to OS X 10.8 > In intro, say only latest mingw is tested. > unistd: port to recent mingw > Fix typo in comment. > largefile: port better to Mac OS X 10.5 > doc: clarify -Werror > stdint: fix build with Android's Bionic fox x86 > net_if-tests: port to Solaris 7 + GCC 3.4.6 > net_if-tests: port to older Solaris > system-quote-tests: port to older Solaris > c-xvasprintf etc.: fix link errors on older Solaris > locale: port to Solaris 2.6 and 7 + GNU gettext > autoupdate > stdlib: port to Solaris 2.6 > Fix misspellings of "occurred". > autoupdate > autoupdate > doc: update main copyright year > doc: improve ISO 8601 discussion > doc: avoid small caps > regex: conform to strict C > gnulib-tool: fix incompatibility with autopoint 0.18.2 > autoupdate > fprintftime: bring back and reword fwrite comment > autoupdate > stdio: remove now-unnecessary stdio.c > unicodeio: depend on stdio, not ignore-value > fprintftime: depend on stdio, not ignore-value > stdint-tests: Fix expanded-before-required-warning. * modules/stdint-tests (Depends-on): Use AC_REQUIRE. > fwrite: silence __wur only for older glibc versions .gnulib | 2 +- bootstrap | 44 ++++++++++++++++++++++---------------------- 2 files changed, 23 insertions(+), 23 deletions(-) diff --git a/.gnulib b/.gnulib index 61c7b1e..a0b25da 160000 --- a/.gnulib +++ b/.gnulib @@ -1 +1 @@ -Subproject commit 61c7b1e32e11e9e40b4d59ab888a807620befcd3 +Subproject commit a0b25daf001cb1a0352f329e2b5e1640acc88541 diff --git a/bootstrap b/bootstrap index 012907a..bee7765 100755 --- a/bootstrap +++ b/bootstrap @@ -1,6 +1,6 @@ #! /bin/sh # Print a version string. -scriptversion=2012-12-28.10; # UTC +scriptversion=2013-01-20.16; # UTC # Bootstrap this package from checked-out sources. @@ -306,34 +306,34 @@ if test -n "$checkout_only_file" && test ! -r "$checkout_only_file"; then die "Bootstrapping from a non-checked-out distribution is risky." fi -# Ensure that lines starting with ! sort last, per gitignore conventions -# for whitelisting exceptions after a more generic blacklist pattern. -sort_patterns() { - sort -u "$@" | sed '/^!/ { - H - d - } - $ { - P - x - s/^\n// - }' | sed '/^$/d' +# Strip blank and comment lines to leave significant entries. +gitignore_entries() { + sed '/^#/d; /^$/d' "$@" } -# If $STR is not already on a line by itself in $FILE, insert it, -# sorting the new contents of the file and replacing $FILE with the result. -insert_sorted_if_absent() { +# If $STR is not already on a line by itself in $FILE, insert it at the start. +# Entries are inserted at the start of the ignore list to ensure existing +# entries starting with ! are not overridden. Such entries support +# whitelisting exceptions after a more generic blacklist pattern. +insert_if_absent() { file=$1 str=$2 test -f $file || touch $file - echo "$str" | sort_patterns - $file | cmp -s - $file > /dev/null \ - || { echo "$str" | sort_patterns - $file > $file.bak \ - && mv $file.bak $file; } \ - || die "insert_sorted_if_absent $file $str: failed" + test -r $file || die "Error: failed to read ignore file: $file" + duplicate_entries=$(gitignore_entries $file | sort | uniq -d) + if [ "$duplicate_entries" ] ; then + die "Error: Duplicate entries in $file: " $duplicate_entries + fi + linesold=$(gitignore_entries $file | wc -l) + linesnew=$(echo "$str" | gitignore_entries - $file | sort -u | wc -l) + if [ $linesold != $linesnew ] ; then + { echo "$str" | cat - $file > $file.bak && mv $file.bak $file; } \ + || die "insert_if_absent $file $str: failed" + fi } # Adjust $PATTERN for $VC_IGNORE_FILE and insert it with -# insert_sorted_if_absent. +# insert_if_absent. insert_vc_ignore() { vc_ignore_file="$1" pattern="$2" @@ -344,7 +344,7 @@ insert_vc_ignore() { # .gitignore entry. pattern=$(echo "$pattern" | sed s,^,/,);; esac - insert_sorted_if_absent "$vc_ignore_file" "$pattern" + insert_if_absent "$vc_ignore_file" "$pattern" } # Die if there is no AC_CONFIG_AUX_DIR($build_aux) line in configure.ac. -- 1.8.1

2 2

[libvirt] These patches needed to mount the securityfs in containers.
by Daniel J Walsh 01 Feb '13

01 Feb '13

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Simple patch to make sure /sys/kernel/security is mounted inside the container. Systemd attempts to use/mount this file system if it is not present. One of these days I will figure out how to merge patches. securityfs has to be mounted after /sys... Also want to mount it readonly. (Sent patches to wrong list, originally) -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.13 (GNU/Linux) Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/ iEYEARECAAYFAlEL6yUACgkQrlYvE4MpobOTuwCfWkrq/wiPQKPG4y69fIhjDqqr riQAnis3qdRKzRJIpB4PbPGXTgR3nrKt =D+T5 -----END PGP SIGNATURE-----

2 1

[libvirt] This patch adds the label to lxc-enter-namespace
by Daniel J Walsh 01 Feb '13

01 Feb '13

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 (2nd pass) lxc-enter-namespace allows a process from outside a container to start a process inside a container. One problem with the current code is the process running within the container would run with the label of the process that created it. For example if the admin process is running as unconfined_t and executes the following command # virsh -c lxc:/// lxc-enter-namespace --nolabel dan -- /bin/ps -eZ LABEL PID TTY TIME CMD system_u:system_r:svirt_lxc_net_t:s0:c0.c1023 1 pts/0 00:00:00 systemd system_u:system_r:svirt_lxc_net_t:s0:c0.c1023 3 pts/1 00:00:00 sh system_u:system_r:svirt_lxc_net_t:s0:c0.c1023 24 ? 00:00:00 systemd-journal system_u:system_r:svirt_lxc_net_t:s0:c0.c1023 29 ? 00:00:00 dhclient staff_u:unconfined_r:unconfined_t:s0-s0:c0.c1023 47 ? 00:00:00 ps Note the ps command is running as unconfined_t, After this patch, virsh -c lxc:/// lxc-enter-namespace dan -- /bin/ps -eZ LABEL PID TTY TIME CMD system_u:system_r:svirt_lxc_net_t:s0:c0.c1023 1 pts/0 00:00:00 systemd system_u:system_r:svirt_lxc_net_t:s0:c0.c1023 3 pts/1 00:00:00 sh system_u:system_r:svirt_lxc_net_t:s0:c0.c1023 24 ? 00:00:00 systemd-journal system_u:system_r:svirt_lxc_net_t:s0:c0.c1023 32 ? 00:00:00 dhclient system_u:system_r:svirt_lxc_net_t:s0:c0.c1023 38 ? 00:00:00 ps I also add a --nolabel command to virsh, which can go back to the original behaviour. virsh -c lxc:/// lxc-enter-namespace --nolabel dan -- /bin/ps -eZ LABEL PID TTY TIME CMD system_u:system_r:svirt_lxc_net_t:s0:c0.c1023 1 pts/0 00:00:00 systemd system_u:system_r:svirt_lxc_net_t:s0:c0.c1023 3 pts/1 00:00:00 sh system_u:system_r:svirt_lxc_net_t:s0:c0.c1023 24 ? 00:00:00 systemd-journal system_u:system_r:svirt_lxc_net_t:s0:c0.c1023 32 ? 00:00:00 dhclient staff_u:unconfined_r:unconfined_t:s0-s0:c0.c1023 37 ? 00:00:00 ps Everything seems to be working perfectly now. -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.13 (GNU/Linux) Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/ iEYEARECAAYFAlEC320ACgkQrlYvE4MpobPDjwCfTLjGarwDOLA333vE+XVp0Zj2 LYkAn3WGX3h309/kJejbE3uvXnIUCKJV =rwfM -----END PGP SIGNATURE-----

2 2

[libvirt] [PATCH] spec: Fix minor changelog issues
by Jiri Denemark 01 Feb '13

01 Feb '13

When a changelog entry references an RPM macro, % needs to be escaped so that it does not appear expanded in package changelog. Wed Jul 5 2011 is incorrect since Jul 5 was Tuesday. Let's suppose it was a result of incomplete update (Tue -> Wed) and change Jul 5 to Jul 6. --- libvirt.spec.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libvirt.spec.in b/libvirt.spec.in index 8df908d..8b2458d 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -2309,7 +2309,7 @@ fi * Fri Apr 3 2009 Daniel Veillard <veillard(a)redhat.com> - 0.6.2-1 - release of 0.6.2 -* Fri Mar 4 2009 Daniel Veillard <veillard(a)redhat.com> - 0.6.1-1 +* Fri Mar 6 2009 Daniel Veillard <veillard(a)redhat.com> - 0.6.1-1 - release of 0.6.1 * Sat Jan 31 2009 Daniel Veillard <veillard(a)redhat.com> - 0.6.0-1 @@ -2448,7 +2448,7 @@ fi - it's pkgconfig not pgkconfig ! * Mon Nov 6 2006 Daniel Veillard <veillard(a)redhat.com> 0.1.8-2 -- fixing spec file, added %dist, -devel requires pkgconfig and xen-devel +- fixing spec file, added %%dist, -devel requires pkgconfig and xen-devel - Resolves: rhbz#202320 * Mon Oct 16 2006 Daniel Veillard <veillard(a)redhat.com> 0.1.8-1 -- 1.8.1.2

1 1

[libvirt] [PATCH 0/7] documentation improvements - again
by Claudio Bley 01 Feb '13

01 Feb '13

Hi. The first two patches are aimed at avoiding generation of empty argument description lists, which might happen if a function has no documentation for some argument or its return type. This was happening with virTypedParams* functions (see https://www.redhat.com/archives/libvir-list/2013-January/msg01428.html) Patch #3 is just a small cleanup, since a table is not the right thing to use and it looks better in some circumstances. Patch #4 sports processing of code blocks embedded into comments. Basically, it is similar to markdown syntax, except that you only need to indent your code with 2 spaces. Patch #5 prepares for the later patches being able to distinguish between different <pre> blocks. Patch #6 and #7 are pretty much self explanatory, I guess. Note, that SHJS's license is GPLv3. Claudio Bley (7): docs: don't write out empty info attributes for function arguments docs: only generate function argument info for args with a description docs: use a div instead of a 3 column table for undisclosed notices docs: process code blocks similar to markdown docs: add class "description" to div's containing descriptions docs: define style of code blocks inside descriptions docs: syntax highlight code blocks using SHJS docs/apibuild.py | 8 +- docs/libvirt.css | 8 ++ docs/newapi.xsl | 209 +++++++++++++++++++++++++++++-------------------- docs/page.xsl | 5 +- docs/sh_c.min.js | 1 + docs/sh_emacs.min.css | 1 + docs/sh_main.min.js | 4 + 7 files changed, 148 insertions(+), 88 deletions(-) create mode 100644 docs/sh_c.min.js create mode 100644 docs/sh_emacs.min.css create mode 100644 docs/sh_main.min.js -- 1.7.9.5

2 20

[libvirt] Canonical citation for Libvirt
by Lempereur, Brett 01 Feb '13

01 Feb '13

Hi, Is there a canonical paper I can cite for Libvirt in academic publications? The best I've found so far is Bolt, M., Birkenheuer, G., Niehörster, O., & Brinkmann, A. (2010). Non-Intrusive Virtualization Management using Libvirt. Proceedings of the 2nd Design, Automation, and Test in Europe Conference (DATE'10) (pp. 1-6). Dresden, Germany: IEEE. Retrieved from http://ieeexplore.ieee.org/stamp/stamp.jsp?tp=&arnumber=5457142&isnumber=54… A lot of frameworks used in academic work have sort of "standard" citations, people that use the framework tend to cite that paper. The authors get citations, we get cool frameworks, everyone wins. Brett ________________________________ Important Notice: the information in this email and any attachments is for the sole use of the intended recipient(s). If you are not an intended recipient, or a person responsible for delivering it to an intended recipient, you should delete it from your system immediately without disclosing its contents elsewhere and advise the sender by returning the email or by telephoning a number contained in the body of the email. No responsibility is accepted for loss or damage arising from viruses or changes made to this message after it was sent. The views contained in this email are those of the author and not necessarily those of Liverpool John Moores University.

2 1

[libvirt] [Libvirt][Sheepdog]Sheepdog pool/volume storage driver for libvirt problem
by harryxiyou 01 Feb '13

01 Feb '13

Hi Sebastian, Morita and other developers, I have studied Sheepdog pool/volume storage driver for libvirt and i have following questions. Please give me some suggestions. Thanks in advance ;-) 1, In libvirt/src/storage/storage_backend_sheepdog.c, i just find we realized create/delete/resize volume(send these parameters to let libvirtd receive and execute them). I cannot find the operations about snapshot, such as creating/deleting snapshot. I cannot also find the operations about opening/closing cache. 2, In the func create/delete/resize volume, we call func 'virCommandRun(cmd, NULL);' to run these commands, which i think the func send these parameters to daemon libvirtd and libvirtd send these parameters to Sheepdog, then Sheepdog executes them, right? 3, In func "virStorageBackendSheepdogCreateVol", it composes cmd like this "virCommandPtr cmd = virCommandNewArgList(COLLIE, "vdi", "create", vol->name, NULL);" then send create parameters. When Sheepdog receive these parameters, how Sheepdog create this volume? I find Sheepdog create a volume like this. $ qemu-img create sheepdog:Alice 256G 4, What are the essences of func "virStorageBackendSheepdogRefreshPool" and "virStorageBackendSheepdogRefreshVol"? In func "virStorageBackendSheepdogCreateVol", after craete volume operations, we call "virStorageBackendSheepdogRefreshVol". But in func "virStorageBackendSheepdogDeleteVol" and "virStorageBackendSheepdogResizeVol", we do not call "virStorageBackendSheepdogRefreshVol", why? 5, Actually, i am not clear about how QEMU receive these parameters (like create/delete/snapshot, etc) and execute the real jobs? Thanks for anyone's suggestions ;-) -- Thanks Harry Wei

3 8

[libvirt] Release of libvirt-1.0.2
by Daniel Veillard 31 Jan '13

31 Jan '13

As scheduled, I just made the release today, it is tagged in git and tarball and rpms are available at the usual FTP place: ftp://libvirt.org/libvirt/ This is a large release, including over 450 commit, with a lot of code refactoring, improvements and a huge set of fixes a lot of them coming from the cleanup of the Coverity reports. Considering the volume of changes let's schedule the next release (probably 1.0.3) for the end of the month of February. Features: - LXC improvements (Daniel P. Berrange) - S390 architecture improvement (Viktor Mihajlovski) - Power architecture improvement (Li Zhang) - large Coverity report cleanups and associated bug fixes (John Ferlan) - virTypedParams* APIs to helps with those data structures (Jiri Denemark) Documentation: - aesthetical cleanups (Martin Kletzander) - fix missed documentation for virterror functions (Claudio Bley) - util: Fix docs for virBitmapParse (Peter Krempa) - rng: Have colorful *.rng with editor (Osier Yang) - safe{read,write}: Document usage with nonblocking FD (Michal Privoznik) - Generate documentation for virTypedParams* APIs (Jiri Denemark) - event.c source file was renamed as virevent.c (Jiri Denemark) - Add some style and color to the HTML documentation (Claudio Bley) - don't use <i> and <tt> HTML tags (Claudio Bley) - Assign classes to documentation elements (Claudio Bley) - remove extra " (Eric Blake) - maint: typo fix (Eric Blake) - restrict the set of characters for info keys (Claudio Bley) - simplify code (Claudio Bley) - mention git rename detection (Eric Blake) - add some more hacking tips (Eric Blake) - fix typo in isa-serial additions (Laine Stump) - network: fix typos and docs (Guannan Ren) - maint: fix comment typo (Eric Blake) - break longer text into paragraphs in HTML (Claudio Bley) - remove duplicate check in index.add (Claudio Bley) - Add missing flags to migrate documentation (Guido Günther) - Add docs and rng schema for new XML tag sgio (Osier Yang) - Fix the comment grammar (Osier Yang) - Remove the inexistent function in comments (Osier Yang) - fix typo in the word affinities (Martin Kletzander) - Fix documentation for readonly element (Jiri Denemark) - Replace </br> with <br/> in docs/news.html.in (Peter Krempa) Portability: - Make sure we only abort without libcurl if $with_esx = yes (Guido Günther) - build: Fix RPM build errors related to libvirt-lxc API (Viktor Mihajlovski) - build: fix build on BSD (Eric Blake) - build: further fixes for broken if_bridge.h (Eric Blake) - securityselinuxhelper.c: Don't try to include xattr.h if not available (John Ferlan) - build: work around broken kernel header (Eric Blake) - build: avoid m4_expand for RHEL 5 (Eric Blake) - build: move file deleting action from %files list to %install (Yufang Zhang) - build: libvirt-guests files misplaced in specfile (Viktor Mihajlovski) - build: fix mingw rpm build (Eric Blake) - build: fix build with optimization enabled (Eric Blake) - build: make broken -Wlogical-op test be gcc-only (Eric Blake) - util: FreeBSD: stub out CPU affinity functions (Roman Bogorodskiy) - nodeinfo: add FreeBSD support (Roman Bogorodskiy) - build: Check for broken GCC -Wlogical-op in configure (Viktor Mihajlovski) Bug fixes: - conf: Don't format cputune element when not needed (Martin Kletzander) - conf: Fix cpumask leak in virDomainDefFree (Ján Tomko) - qemu: Destroy domain on decompression binary error (Michal Privoznik) - rpc: Fix crash on error paths of message dispatching (Peter Krempa) - vbox: Address false positive for NULL dereference (John Ferlan) - libxl: Fix removing non-persistent domain after save (Jim Fehlig) - libxl: Fix race between destruction of objects (Jim Fehlig) - libxl: Fix races in libxl event code (Jim Fehlig) - libxl: Fix handling of timeouts (Jim Fehlig) - conf: avoid NULL deref for pmsuspended domain state (Eric Blake) - qemu_monitor: Fix tray-open attribute in query-block (Michal Privoznik) - Fix bogus reporting of KVM support for non-native emulators (Daniel P. Berrange) - Move QEMU capabilities initialization later in QEMU startup (Daniel P. Berrange) - Fix performance & reliabilty of QMP probing (Daniel P. Berrange) - qemu: escape ipv6 for rbd network disk hosts (Josh Durgin) - snapshot: fix state after external snapshot of S3 domain (Eric Blake) - python: Fix bindings for virDomainSnapshotGet{Domain,Connect} (Jiri Denemark) - Fix crash free'ing securityDriverNames in QEMU driver (Daniel P. Berrange) - Fix leak of securityDriverNames (Daniel P. Berrange) - Avoid use of free'd memory in auto destroy callback (Daniel P. Berrange) - Ensure nodeinfo struct is initialized to zero (Daniel P. Berrange) - apparmor: Avoid freeing uninitialized pointer (Jiri Denemark) - xen: Actually fix the uninitialized variable (Peter Krempa) - xen: Initialize variable before using (Peter Krempa) - util: Need to add virCommandFree() (John Ferlan) - storage: Need to add virCommandFree() (John Ferlan) - security: Need to add virCommandFree() (John Ferlan) - parallels: Resolve some resource leaks (John Ferlan) - qemu: Re-add driver unlock to qemuDomainSendKey (Viktor Mihajlovski) - conf: Fix usage of virBitmapParse (Peter Krempa) - virbitmaptest: Resolve Coverity errors (John Ferlan) - lxc_process: Avoid passing NULL iface->iname (John Ferlan) - lxc_driver: Need to check for vm before calling virDomainUnlock(vm) (John Ferlan) - tests: Remove VIR_FREE() on static/stack buffer (der.data) (John Ferlan) - Fix nwfilter driver reload/shutdown handling when unprivileged (Daniel P. Berrange) - conf: Check if number of vCPUs fits in the storage variable (Peter Krempa) - tests: Need to initialize 'test' properly on error path (John Ferlan) - virkeepalive: Remove erroneous VIR_FREE(msg) (John Ferlan) - security: Need to initialize 'sens' (John Ferlan) - interface: Need to initialize 'ifaces_list' (John Ferlan) - storage: Need to initialize 'zerobuf' (John Ferlan) - virsh: Need to intialize 'str' (John Ferlan) - lxc: Need to initialize 'dst' (John Ferlan) - virfile: Need to initialize 'looppath' (John Ferlan) - commandtest: Need to initialize 'errbuf' (John Ferlan) - virnetdev: Need to initialize 'pciConfigAddr' (John Ferlan) - virnetsockettest: Need to initialize 'path' (John Ferlan) - virnetserver: Need to initialize 'sigdata' (John Ferlan) - conf: Need to initialize variables before VIR_FREE (John Ferlan) - uml: Avoid resource leak of event in umlInofityEvent (John Ferlan) - selinux: Resolve resource leak using the default disk label (John Ferlan) - util: Need to check child JSON allocation before use (John Ferlan) - parallels: Need to handle virJSONValueObjectGetString error (John Ferlan) - qemu: Reject attempts to create snapshots with names containig '/' (Peter Krempa) - qemu: Don't return success if creation of snapshot save file fails (Peter Krempa) - Fix race condition when destroying guests (Daniel P. Berrange) - storage: Fix lvcreate parameter for backingStore. (Atsushi Kumagai) - virobject: Remove the bogus ! from call to virObjectInitialize() (John Ferlan) - qemu: Check valid activeDev before calling pciDeviceSetUsedBy (John Ferlan) - Followup fix for integer wraparound in port allocator (Daniel P. Berrange) - qemu: Double mutex unlock in qemuDomainModifyDeviceFlags (Viktor Mihajlovski) - fixed xt_physdev warning when defining ip(6)tables rules (Reinier Schoof) - conf: don't fail to parse <boot> when parsing a single device (Laine Stump) - Fix inheritance of virNetClient (Daniel P. Berrange) - Avoid integer wrap on remotePortMax in QEMU driver (Daniel P. Berrange) - python: Avoid freeing uninitialized new_params pointer (Jiri Denemark) - Fix typo in variable name (Guido Günther) - libxl: Fix cleanup on domain start error (Jim Fehlig) - libxl: Check for libxl_ctx_alloc failure (Jim Fehlig) - libxl: Don't free domain death event (Jim Fehlig) - locking: Resolve resource leaks on non error path (John Ferlan) - conf: fix leak in virDomainVcpuPinAdd (Ján Tomko) - conf: fix class_id bitmap leak in virNetworkObj (Ján Tomko) - qemu: fix QEMU_CAPS_NO_ACPI detection (Ján Tomko) - openvz: Need to check 'vm' first before dereferencing 'def' (John Ferlan) - interface: Need to check ifacedef->mac not just ifacedef after strdup() (John Ferlan) - qemu: Don't update count of vCPUs if hot-unplug has failed (Peter Krempa) - libvirt: lxc: don't mkdir when selinux is disabled (Gao feng) - xen: Resolve resource leak with 'cpuset' (John Ferlan) - interface: Resolve resource leak wth 'tmp_iface_objs' (John Ferlan) - storage: Resource resource leak using 'tmp_vols' (John Ferlan) - test: Resource resource leak with 'tmp_vols' (John Ferlan) - rpc: Avoid resource leak of 'socks' if any object append fails (John Ferlan) - util: Resolve resource leak for 'res' in virSetInherit error path. (John Ferlan) - interface: Need to initialize 'add_to_list' (John Ferlan) - lxc: Initialize dst due to potential cleanup usage before setting (John Ferlan) - openvz: Need to initialize 'ret' for kb_per_pages error path (John Ferlan) - parallels: Resolve issues with uninitialized 'ret' value (John Ferlan) - storage: Need to also VIR_FREE(reg) (John Ferlan) - Fix typo LIBCURL_{CFLAGS,LIBS} to CURL_{CFLAGS,LIBS} (Daniel P. Berrange) - Fix build due to previous LXC patch (Daniel P. Berrange) - build: fix incomplete WITH_SASL conversion (Eric Blake) - network: bridge: Fix regression when defining persistent networks (Peter Krempa) - storage: Resolve resource leak using 'vol' buffer (John Ferlan) - phyp: Resolve some file descriptor leaks (John Ferlan) - qemu_agent: Remove agent reference only when disposing it (Michal Privoznik) - libvirt: lxc: fix incorrect parameter of lxcContainerMountProcFuse (Gao feng) - util: Check for NULL 'dev' on input to usbFreeDevice (John Ferlan) - maint: avoid potential promotion issues with [ug]id_t (Eric Blake) - Resolve COPY_PASTE error found by Coverity (John Ferlan) - storage: fix leak in virStorageBackendLogicalMakeVol (Ján Tomko) - cpu: Avoid NULL dereference (John Ferlan) - lxc: Avoid possible NULL dereference on *root prior to opendir(). (John Ferlan) - remote: Avoid calling virAuthConfigLookup() if 'credname' is NULL. (John Ferlan) - vmware: Avoid NULL dereference for 'caps' (John Ferlan) - xen: Avoid possible NULL dereference (John Ferlan) - Fix virLXCPrepareHostDevices method (Daniel P. Berrange) - Only initialize capabilities after setting dir permissions (Daniel P. Berrange) - build: install libvirt sysctl file correctly (Eric Blake) - snapshot: qemu: Fix segfault and vanishing snapshots when redefining (Peter Krempa) - qemu: Detect VGA_QXL capability correctly (Michal Privoznik) - qemu: fix a segfault in qemuProcessWaitForMonitor (Ján Tomko) - parallels: check and handle error for virAsprintf() calls (John Ferlan) - udev: check and handle error for virAsprintf() calls (John Ferlan) - util: fix botched check for new netlink request filters (Laine Stump) - blockjob: fix memleak that prevented block pivot (Eric Blake) - util: fix functions that retrieve SRIOV VF info (Laine Stump) - Fix parsing of arch from domain XML (Daniel P. Berrange) - Fix CPU baseline to not hardcode arch (Daniel P. Berrange) - Fix SELinux security label test (Daniel P. Berrange) - spec: Fix script warning when uninstalling libvirt-client (Cole Robinson) - network: don't require private addresses if dnsmasq uses SO_BINDTODEVICE (Laine Stump) - `apparmor: Fix build (Jiri Denemark) - S390: Fix virSysinfoRead memory corruption (Viktor Mihajlovski) Improvements: - Ignore '.trs' files (Martin Kletzander) - build: Regenerate man pages on version bump (Jiri Denemark) - rng: Change the datatype for volume name for common use (Osier Yang) - rng: Remove the duplicate definition (Osier Yang) - qemu_hotplug: Rework media changing process (Michal Privoznik) - maint: one missed syms file (Eric Blake) - vbox: Adjust the UTF FREE macros (John Ferlan) - virsh: Add --print-xml flag for attach-disk command (Peter Krempa) - libxl: Domain event handler improvements (Jim Fehlig) - libxl: Explicitly remove timeouts (Jim Fehlig) - maint: make it easier to sort syms files (Eric Blake) - qemuDomainSendKey: Relax the qemu driver locking (Michal Privoznik) - node_memory: Add '\n' to help message (Satoru Moriya) - locking: use virStrcpyStatic instead of memcpy (John Ferlan) - Make python objects inherit from 'object' base class (Daniel P. Berrange) - selinux: Properly indent preprocessor directives (Jiri Denemark) - selinux: Only create the selabel_handle once. (Richard W.M. Jones) - parallels_utils: Check return status properly from virCommandRun() (John Ferlan) - test: Add support for thread and core information for the test driver (Peter Krempa) - capabilities: Add additional data to the NUMA topology info (Peter Krempa) - capabilities: Switch CPU data in NUMA topology to a struct (Peter Krempa) - conf: Split out NUMA topology formatting to simplify access to data (Peter Krempa) - schemas: Add schemas for more CPU topology information in the caps XML (Peter Krempa) - schema: Make the cpuset type reusable across schema files (Peter Krempa) - S390: Enhance memballoon handling for virtio-s390 (Viktor Mihajlovski) - qemu_agent: Ignore expected EOFs (Michal Privoznik) - nodeinfo: Use sa_assert() instead of Coverity error tag (John Ferlan) - build: allow virObject to have no parent (Eric Blake) - qemu: Support ram bar size for qxl devices (Alon Levy) - viralloc: Adjust definition of VIR_FREE() for Coverity (John Ferlan) - conf: Improve error messages if parsing of vCPU count fails (Peter Krempa) - virsh-domain: Refactor error paths for cmdCPUStats (Peter Krempa) - fix typos in comments for VIR_DOMAIN_PROCESS_SIGNAL_{PWR,SYS} (Claudio Bley) - storage: Add coverity[dead_error_condition] to avoid error (John Ferlan) - network: Add coverity[leaked_handle] to ignore error (John Ferlan) - remote: Avoid coverity[leaked_storage] message. (John Ferlan) - qemu: Add coverity[negative_returns] tag (John Ferlan) - rpc: Add coverity[dead_error_begin] tag (John Ferlan) - xen: Add coverity[ptr_arith] and [sign_extension] tags (John Ferlan) - nodeinfo: Add coverity[dead_error_begin] and [returned_null] tags (John Ferlan) - lxc: Add coverity[dead_error_begin] tag in switch stmts (John Ferlan) - xend: Address some Coverity false positives (John Ferlan) - security: Use virStrcpy to move the label (John Ferlan) - qemu: Forbid snapshot names starting with '.' (Peter Krempa) - spec: indent %if to make it easier to see conditions (Eric Blake) - Log flags passed to qemuMigrationPrepare{Tunnel,Direct} APIs (Michal Privoznik) - Introduce virTypedParamsClear public API (Jiri Denemark) - virsh: Use virTypedParams* APIs in cpu-stats (Jiri Denemark) - virsh: Use virTypedParams* APIs in node-memory-tune (Jiri Denemark) - virsh: Use virTypedParams* APIs in numatune (Jiri Denemark) - virsh: Use virTypedParams* APIs in memtune (Jiri Denemark) - virsh: Use virTypedParams* APIs in domblkstat (Jiri Denemark) - virsh: Use virTypedParams* APIs in schedinfo (Jiri Denemark) - virsh: Use virTypedParams* APIs in domiftune (Jiri Denemark) - virsh: Use virTypedParams* APIs in blkiotune (Jiri Denemark) - virsh: Use virTypedParams* APIs in blkdeviotune (Jiri Denemark) - Add virTypedParams* APIs (Jiri Denemark) - qemu: Simplify condition with already extracted flag (Peter Krempa) - network: use bandwidth from portgroup when appropriate (Laine Stump) - network: Resolve some issues around vlan copying (John Ferlan) - lock_daemon: Simplify error handling (Peter Krempa) - virsh-volume.c: Switch to C99 initialization of vshCmdOptDef (Michal Privoznik) - virsh-snapshot.c: Switch to C99 initialization of vshCmdOptDef (Michal Privoznik) - virsh-secret.c: Switch to C99 initialization of vshCmdOptDef (Michal Privoznik) - virsh-pool.c: Switch to C99 initialization of vshCmdOptDef (Michal Privoznik) - virsh-nwfilter.c: Switch to C99 initialization of vshCmdOptDef (Michal Privoznik) - virsh-nodedev.c: Switch to C99 initialization of vshCmdOptDef (Michal Privoznik) - virsh-network.c: Switch to C99 initialization of vshCmdOptDef (Michal Privoznik) - virsh-interface.c: Switch to C99 initialization of vshCmdOptDef (Michal Privoznik) - virsh-host.c: Switch to C99 initialization of vshCmdOptDef (Michal Privoznik) - virsh-domain-monitor.c: Switch to C99 initialization of vshCmdOptDef (Michal Privoznik) - virsh-domain.c: Switch to C99 initialization of vshCmdOptDef (Michal Privoznik) - virsh.c: Switch to C99 initialization of vshCmdOptDef (Michal Privoznik) - libvirt.c: fix typo in comment (Claudio Bley) - Move comments after enum members (Claudio Bley) - include virterror_internal.h in threads.h (Hu Tao) - include util.h in cgroup.h (Hu Tao) - call virstateCleanup to do the cleanup before libvirtd exits (Hu Tao) - libxl: Use consistent parameter naming scheme (Jim Fehlig) - libxl: Use consistent style for function definitions (Jim Fehlig) - Convert libxl driver over to use virPortAllocator APIs (Daniel P. Berrange) - Convert QEMU driver over to use virPortAllocator APIs (Daniel P. Berrange) - Add a port allocator class (Daniel P. Berrange) - Convert all rpc classes over to virObjectLockable (Daniel P. Berrange) - Convert virDomainObj, qemuAgent, qemuMonitor, lxcMonitor to virObjectLockable (Daniel P. Berrange) - util: Check for negative indent in virBufferAdd (John Ferlan) - tools: Check return status on virBufferTrim() (John Ferlan) - rpc: Check and message setsockopt() (John Ferlan) - xen: Ignore return status for TCP_NODELAY (John Ferlan) - Add a virObjectLockable class holding a mutex (Daniel P. Berrange) - Allow for multi-level inheritance of virObject classes (Daniel P. Berrange) - Add 'lxc-enter-namespace' command to virsh (Daniel P. Berrange) - build: add new file, for lxc_protocol checking (Eric Blake) - Add implementation of virDomainLxcOpenNamespace to LXC driver (Daniel P. Berrange) - Implement the RPC protocol for the libvirt-lxc.la library (Daniel P. Berrange) - .gitignore: Sort alphabetically (Michal Privoznik) - Add missing stubs to securityselinuxhelper.c (Daniel P. Berrange) - Introduce an LXC specific public API & library (Daniel P. Berrange) - Add a test suite for validating SELinux labelling (Daniel P. Berrange) - Rename HAVE_POLKIT to WITH_POLKIT (Daniel P. Berrange) - Remove unused XMLRPC_REQUIRED var (Daniel P. Berrange) - Convert openwsman check to use LIBVIRT_CHECK_PKG (Daniel P. Berrange) - Convert ssh2 check to use LIBVIRT_CHECK_PKG (Daniel P. Berrange) - Rename HAVE_LIBSSH2 to WITH_SSH2 (Daniel P. Berrange) - Convert curl check over to use LIBVIRT_CHECK_PKG (Daniel P. Berrange) - Rename HAVE_LIBCURL to WITH_CURL (Daniel P. Berrange) - Convert fuse check over to use LIBVIRT_CHECK_PKG (Daniel P. Berrange) - Rename HAVE_FUSE to WITH_FUSE (Daniel P. Berrange) - Rename HAVE_GNUTLS to WITH_GNUTLS (Daniel P. Berrange) - Convert blkid check over to use LIBVIRT_CHECK_PKG (Daniel P. Berrange) - Convert HAVE_LIBBLKID to WITH_BLKID (Daniel P. Berrange) - Convert HAL check to use LIBVIRT_CHECK_PKG (Daniel P. Berrange) - Convert HAVE_HAL to WITH_HAL (Daniel P. Berrange) - Convert udev/pciaccess checks to use LIBVIRT_CHECK_PKG (Daniel P. Berrange) - Convert HAVE_UDEV to WITH_UDEV (Daniel P. Berrange) - Convert avahi check to use LIBVIRT_CHECK_PKG (Daniel P. Berrange) - Convert HAVE_AVAHI to WITH_AVAHI (Daniel P. Berrange) - Convert DBus check to use LIBVIRT_CHECK_PKG (Daniel P. Berrange) - Convert HAVE_DBUS to WITH_DBUS (Daniel P. Berrange) - Convert netcf check to use LIBVIRT_CHECK_PKG (Daniel P. Berrange) - Convert cap-ng check to use LIBVIRT_CHECK_LIB (Daniel P. Berrange) - Convert HAVE_CAPNG to WITH_CAPNG (Daniel P. Berrange) - Convert numactl checks to use LIBVIRT_CHECK_LIB (Daniel P. Berrange) - Convert HAVE_NUMACTL to WITH_NUMACTL (Daniel P. Berrange) - Convert apparmor check to use LIBVIRT_CHECK_LIB (Daniel P. Berrange) - Convert selinux check to use LIBVIRT_CHECK_LIB (Daniel P. Berrange) - Convert HAVE_SELINUX to WITH_SELINUX (Daniel P. Berrange) - qemu: Fix grouping of capabilities strings (Peter Krempa) - network: Report real error if addition of firewall rules fails (Peter Krempa) - virsh: Reformat output of virsh net-list (Peter Krempa) - Convert audit check to use LIBVIRT_CHECK_LIB (Daniel P. Berrange) - Convert HAVE_AUDIT to WITH_AUDIT (Daniel P. Berrange) - Convert sasl check to use LIBVIRT_CHECK_LIB_ALT (Daniel P. Berrange) - Convert HAVE_SASL to WITH_SASL (Daniel P. Berrange) - Convert sanlock check to use LIBVIRT_CHECK_LIB (Daniel P. Berrange) - Convert HAVE_SANLOCK to WITH_SANLOCK (Daniel P. Berrange) - Convert yajl check to use LIBVIRT_CHECK_LIB_ALT (Daniel P. Berrange) - Convert HAVE_YAJL into WITH_YAJL (Daniel P. Berrange) - Add some autoconf helper macros for checking for libraries (Daniel P. Berrange) - build: require avahi instead of avahi-libs on rhel5. (Yufang Zhang) - util: reduce syscalls for virGetDeviceID (Eric Blake) - pass stub driver name instead of pciFindStubDriver (Chunyan Liu) - qemu: add usb-net caps flag (Guannan Ren) - qemu: add usb-serial support (Guannan Ren) - qemu: add usb-serial caps flag (Guannan Ren) - maint: distribute libvirtd.service.in (Eric Blake) - Add RESUME event listener to qemu monitor. (Andres Lagar-Cavilla) - nwfilter: Remove unprivileged code path to set base (John Ferlan) - Make TLS support conditional (Daniel P. Berrange) - qemu: Relax hard RSS limit (Michal Privoznik) - S390: Enable SCLP Console in QEMU driver (J.B. Joret) - S390: Add SCLP console front end support (J.B. Joret) - Rename lxc_protocol.x to lxc_monitor_protocol.x (Daniel P. Berrange) - Add internal APIs for dealing with namespaces (Daniel P. Berrange) - Add a way to return FDs to the RPC caller (Daniel P. Berrange) - Fix receiving of file descriptors from server (Daniel P. Berrange) - Move qemu-XXX commands from virsh-host.c to virsh-domain.c (Daniel P. Berrange) - Ensure we always setup a private mount namespace for LXC controller (Daniel P. Berrange) - Speed up fallback to legacy non-QMP probing (Daniel P. Berrange) - build: Add libxenctrl to LIBXL_LIBS (Jim Fehlig) - build: .service files don't need to be executable (Eric Blake) - build: properly substitute virtlockd.socket (Eric Blake) - build: use common .in replacement mechanism (Eric Blake) - qemu: Check if the shared disk's cdbfilter conflicts with others (Osier Yang) - qemu: set unpriv_sgio when starting domain and attaching disk (Osier Yang) - conf: Parse and format the new XML (Osier Yang) - qemu: Add a hash table for the shared disks (Osier Yang) - util: Prepare helpers for unpriv_sgio setting (Osier Yang) - snapshot: qemu: Allow redefinition of external snapshots (Peter Krempa) - snapshot: qemu: Separate logic blocks with newlines (Peter Krempa) - snapshot: conf: Make virDomainSnapshotIsExternal more reusable (Peter Krempa) - qemu: Implement virDomainOpenChannel API (John Eckersberg) - conf: Add unix socket support to virChrdevOpen (John Eckersberg) - conf: Rename console-specific identifiers to be more generic (John Eckersberg) - conf: Rename virconsole.* to virchrdev.* (John Eckersberg) - api: Add API to tunnel a guest channel via stream (John Eckersberg) - network: fix check for ambiguous lookup (Eric Blake) - Check and handle select() errors from waitsocket(). (John Ferlan) - tests: check and handle error for virAsprintf() calls (John Ferlan) - Check return on mkdir for LOCKSPACE_DIR (John Ferlan) - vmware: silence Coverity warning (John Ferlan) - Install virtlockd.{socket,service} non executable (Guido Günther) - qemu: Don't parse log output when starting up a domain (Michal Privoznik) - build: use autobuild module to make build logs nicer (Eric Blake) - maint: update to latest gnulib (Eric Blake) - sanlock: Chown lease files as well (Michal Privoznik) - python: Adapt to virevent rename (Michal Privoznik) - qemu: Convert some APIs to use qemuDomObjFromDomain (Michal Privoznik) - qemu: Relax locking in DomainHasManagedSaveImage and DomainMonitorCommand (Michal Privoznik) - S390: Re-enable capability probing for virtio devices. (Viktor Mihajlovski) - Sort util files in Makefile.am alphabetically (Daniel P. Berrange) - Rename virterror.c virterror_internal.h to virerror.{c,h} (Daniel P. Berrange) - Rename xml.{c,h} to virxml.{c,h} (Daniel P. Berrange) - Rename uuid.{c,h} to viruuid.{c,h} (Daniel P. Berrange) - Rename util.{c,h} to virutil.{c,h} (Daniel P. Berrange) - Rename threads.{c,h} to virthread.{c,h} (Daniel P. Berrange) - Rename threadpool.{c,h} to virthreadpool.{c,h} (Daniel P. Berrange) - Rename sysinfo.{c,h} to virsysinfo.{c,h} (Daniel P. Berrange) - Rename storage_file.{c,h} to virstoragefile.{c,h} (Daniel P. Berrange) - Rename stats_linux.{c,h} to virstatslinux.{c,h} (Daniel P. Berrange) - Rename sexpr.{c,h} to virsexpr.{c,h} (Daniel P. Berrange) - Merge processinfo.{c,h} into virprocess.{c,h} (Daniel P. Berrange) - Rename pci.{c,h} to virpci.{c,h} (Daniel P. Berrange) - Rename memory.{c,h} to viralloc.{c,h} (Daniel P. Berrange) - Rename logging.{c,h} to virlog.{c,h} (Daniel P. Berrange) - Rename json.{c,h} to virjson.{c,h} (Daniel P. Berrange) - Rename iptables.{c,h} to viriptables.{c,h} (Daniel P. Berrange) - Rename hostusb.{c,h} to virusb.{c,h} (Daniel P. Berrange) - Rename hooks.{c,h} to virhook.{c,h} (Daniel P. Berrange) - Rename event_poll.{c,h} to vireventpoll.{c,h} (Daniel P. Berrange) - Rename event.{c,h} to virevent.{c,h} (Daniel P. Berrange) - Rename ebtables.{c,h} to virebtables.{c,h} (Daniel P. Berrange) - Rename dnsmasq.{c,h} to virdnsmasq.{c,h} (Daniel P. Berrange) - Rename conf.{c,h} to virconf.{c,h} (Daniel P. Berrange) - Rename command.{c,h} to vircommand.{c,h} (Daniel P. Berrange) - Rename buf.{c,h} to virbuffer.{c,h} (Daniel P. Berrange) - Rename bitmap.{c,h} to virbitmap.{c,h} (Daniel P. Berrange) - Rename cgroup.{h,c} to vircgroup.{h,c} (Daniel P. Berrange) - Support all backend serial devices for pSeries guest (Li Zhang) - Remove QEMU_CAPS_NO_ACPI capability for non-x86 platform (Li Zhang) - Set std VGA model as default model for ppc64. (Li Zhang) - Add sysinfo data and enable virSysinfoRead test case for POWER (Li Zhang) - util: add missing error log messages when failing to get netlink VFINFO (Laine Stump) - security: fix #endif comment in security_stack.h (Ján Tomko) - build: use strchr now that we can work around broken gcc (Eric Blake) - Fix arch datatype in vahControl in virt-aa-helper.c (Daniel P. Berrange) - Change string form of VIR_ARCH_ITANIUM back to ia64 (Daniel P. Berrange) - conf: eliminate redundant use of VIR_ALLOC (Martin Kletzander) - Fix libxl driver for virArch changes (Daniel P. Berrange) - Fix test cases for virArch changes (Daniel P. Berrange) - Fix XenAPI driver for virArch changes (Daniel P. Berrange) - Export all symbols from virarch.{c,h} to drivers/tests/etc (Daniel P. Berrange) - Convert QEMU capabilities code to use virArch (Daniel P. Berrange) - spec: Do not install *.py[co] in python examples (Jiri Denemark) - Convert CPU APIs to use virArch (Daniel P. Berrange) - Convert capabilities / domain_conf to use virArch (Daniel P. Berrange) - Convert QEMU command line builder to virArch APIs (Daniel P. Berrange) - Convert nodeGetInfo to virArch APIs (Daniel P. Berrange) - Introduce a set of APIs for managing architectures (Daniel P. Berrange) - build: Fix AUTHORS generation (Jiri Denemark) - network: fix indentation of networkDnsmasqConfContents (Laine Stump) - .gitignore: add tests/sysinfotest (Cole Robinson) - hostusb: Move USB_DEVFS define to hostusb.h to fix the build (Cole Robinson) - daemon: Preface polkit error output with 'polkit:' (Cole Robinson) - Add support for hotplug/unplug of host misc devices in LXC (Daniel P. Berrange) - Add support for hotplug/unplug of host storage devices in LXC (Daniel P. Berrange) - Add support for hotplug/unplug of USB host devices in LXC (Daniel P. Berrange) - Add support for hotplug/unplug of NIC devices in LXC (Daniel P. Berrange) - Add support for hotplug/unplug of disk devices in LXC (Daniel P. Berrange) - Add support for attach/detach/update hostdev devices in config for LXC (Daniel P. Berrange) - Add support for attach/detach/update disk devices in config for LXC (Daniel P. Berrange) - Add support for attach/detach/update net devices in config for LXC (Daniel P. Berrange) - Add basic driver API framework for device attach/detach support in LXC (Daniel P. Berrange) - Add support for misc host device passthrough with LXC (Daniel P. Berrange) - Add support for storage host device passthrough with LXC (Daniel P. Berrange) - Add support for USB host device passthrough with LXC (Daniel P. Berrange) - Add support for disks with LXC (Daniel P. Berrange) - Add support for SELinux labelling of hostdev storage/misc devices (Daniel P. Berrange) - Refactor SELinux security driver hostdev labelling (Daniel P. Berrange) - Allow passing a vroot into security manager hostdev labelling (Daniel P. Berrange) - Skip bulk relabelling of resources in SELinux driver when used with LXC (Daniel P. Berrange) - Refactor LXC NIC creation to allow reuse by hotplug code (Daniel P. Berrange) - Add support for <hostdev mode="capabilities"> (Daniel P. Berrange) - tests: Add tests for sysinfo (Viktor Mihajlovski) - conf: cpu: Break some long lines (Peter Krempa) - conf: cpu: Refactor parsing of vendor_id and fallback attributes (Peter Krempa) - conf: cpu: Fix memory leak when specifying cpu vendor_id manually (Peter Krempa) - conf: cpu: Fix parsing of vendor_id (Ken ICHIKAWA) - Support custom 'svirt_tcg_t' context for TCG based guests (Daniel P. Berrange) - tests: add one -device video device testcase (Guannan Ren) - qemu: use newer -device video device in qemu commandline (Guannan Ren) - conf: add optional attribte primary to video <model> element (Guannan Ren) - qemu: add qemu vga devices caps and one cap to mark them usable (Guannan Ren) Cleanups: - virlog: remove old code comment (Doug Goldstein) - rpc: Revert Coverity tag message (John Ferlan) - rpc: Remove unnecessary calls (John Ferlan) - network: Remove dead code getting, but not using ipdef (John Ferlan) - esx: No need to check for objectSpec (John Ferlan) - parallels: Remove unused JSON fetch of "OS" (John Ferlan) - virsh: Remove unused setting of 'br_node' and 'if_node' (John Ferlan) - util: Remove the unused setting of 'res' for virHashLookup return (John Ferlan) - locking: Remove unnecessary setting of lockspace (John Ferlan) - maint: don't distribute generated .def files (Eric Blake) - spec: remove redundant %if (Eric Blake) - libvirt.h.in: Fix indentation (Michal Privoznik) - Fix wrong indentation for virDomainState (Claudio Bley) - tests: Remove remnants of removing the fake emulator output (John Ferlan) - phyp: Remove deadcode referencing exit_status (John Ferlan) - build: avoid compiler warning (Eric Blake) - maint: formatting cleanups in buf.c (Eric Blake) - conf: minor indentation cleanups (Martin Kletzander) So thanks a lot to everyone who helped in some ways for this release with bug reports, patches, docs, etc! Daniel -- Daniel Veillard | Open Source and Standards, Red Hat veillard(a)redhat.com | libxml Gnome XML XSLT toolkit http://xmlsoft.org/ http://veillard.com/ | virtualization library http://libvirt.org/

2 1

[libvirt] NetworkManager git20121211
by Gene Czarcinski 31 Jan '13

31 Jan '13

I needed some functionality (dynamic dns update) not available in the NetworkManager package available in Fedora 18 so I created my own version based on git20121130. This worked nicely providing the functionality and did not appear to have any bad side effects. Then the NetworkManager git20121211 package appeared in rawhide it is usually better to use a package available from Fedora. So, I got the source rpm and rebuilt it for Fedora 18. This appeared to work fine until I realized that all of the virtual networks did not have the expected IPv4 addresses. Surprisingly, if IPv6 was defined for a network, it was there. After some investigation, I could only see that NetworkManager may be the problem. I downgraded to the git20121130 package and rebooted. The virtual networks were now OK. Any suggestions on how to report this problem? (against what and what release?) I am effectively cross-posting by sending identical messages to the NetworkManager and libvirt mailing lists. Yes, I believe the problem is with NetworkManager but there is a large libvirt impact. Gene

2 3

[libvirt] [PATCH 0/2] more work on qemu add-fd support
by Eric Blake 31 Jan '13

31 Jan '13

As promised, here's my first contribution into what is turning into a joint effort between myself and Stefan to support fd passing in qemu 1.3 and newer. Patch 2 in this series is basically a rewrite of Stefan's patch 1/4, and I tested that the capability was successfully set on qemu 1.3 and clear on qemu 1.2. I'm still wondering what we can do to the testsuite to expose more capability testing of qemu 1.2 and beyond (the existing qemuhelptest.c is hard-coded to -help scraping, which limits its usefulness; qemumonitorjsontest looks like a nice way to replay various QMP sessions, but we'd still need to figure out how to capture appropriate sessions from various qemu versions and replay them in the context of qemuhelptest). Eric Blake (1): qemu: expose qemu 1.3 add-fd monitor command Stefan Berger (1): Add support for QEMU -add-fd support detection src/qemu/qemu_capabilities.c | 22 ++++++++++++- src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_monitor.c | 74 +++++++++++++++++++++++++++++++++++++++++++- src/qemu/qemu_monitor.h | 9 +++--- src/qemu/qemu_monitor_json.c | 73 ++++++++++++++++++++++++++++++++++++++++++- src/qemu/qemu_monitor_json.h | 5 ++- 6 files changed, 176 insertions(+), 8 deletions(-) -- 1.8.1

4 8

[libvirt] [Libvirt]Install Libvirt errors
by harryxiyou 31 Jan '13

31 Jan '13

Hi all, I did following steps to install Libvirt. 1, git clone git://libvirt.org/libvirt.git 2, cd libvirt 3, ./autogen.sh 4, ./configure 5, make 6, sudo make install Therefore, after step 6, "sudo make install", i happened to some errors, which you can find these errors by clicking following link. http://paste.ubuntu.com/1589924/ Could anyone give me some suggestions? Thanks in advance ;-) -- Thanks Harry Wei

3 5

[libvirt] [PATCH] tests: add a comment about our fake qmp
by Eric Blake 31 Jan '13

31 Jan '13

While testing QMP, I used a simple qemu session of 'qemu-kvm -M none -nodefaults -nographic -qmp stdio' for some experiments. But it took me far too long to remember the magic invocation to unlock QMP into accepting normal commands. While I was able to grep libvirt sources and easily find where libvirt expects the normal "QMP" greeting, I could not find the proper reply to that greeting nearby. Reading the testsuite didn't help either, since there we don't emulate the mandatory handshake. But since my grep hit the testsuite, adding a bit of documentation will make it much easier to jog my memory in the future. * tests/qemumonitortestutils.c (QEMU_JSON_GREETING): Mention that the normal counterpart reply is skipped. --- tests/qemumonitortestutils.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tests/qemumonitortestutils.c b/tests/qemumonitortestutils.c index d1b2ab5..7b90c38 100644 --- a/tests/qemumonitortestutils.c +++ b/tests/qemumonitortestutils.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2011-2012 Red Hat, Inc. + * Copyright (C) 2011-2013 Red Hat, Inc. * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -439,6 +439,8 @@ static qemuMonitorCallbacks qemuCallbacks = { }; #define QEMU_JSON_GREETING "{\"QMP\": {\"version\": {\"qemu\": {\"micro\": 1, \"minor\": 0, \"major\": 1}, \"package\": \" (qemu-kvm-1.0.1)\"}, \"capabilities\": []}}" +/* We skip the normal handshake reply of "{\"execute\":\"qmp_capabilities\"}" */ + #define QEMU_TEXT_GREETING "QEMU 1.0,1 monitor - type 'help' for more information" qemuMonitorTestPtr qemuMonitorTestNew(bool json, virCapsPtr caps) -- 1.8.1

2 2

[libvirt] [PATCH] spec: Avoid using makeinstall relic
by Jiri Denemark 31 Jan '13

31 Jan '13

The macro was made to help installing broken packages that did not use DESTDIR correctly by overriding individual path variables (prefix, sysconfdir, ...). Newer rpm provides fixed make_install macro that calls make install with just the correct DESTDIR, however it is not available everywhere (e.g., RHEL 5 does not have it). On the other hand the make_install macro is simple and straightforward enough for us to use its expansion directly. --- libvirt.spec.in | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/libvirt.spec.in b/libvirt.spec.in index 87253c6..8df908d 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -1336,7 +1336,11 @@ gzip -9 ChangeLog %install rm -fr %{buildroot} -%makeinstall SYSTEMD_UNIT_DIR=%{buildroot}%{_unitdir} +# Avoid using makeinstall macro as it changes prefixes rather than setting +# DESTDIR. Newer make_install macro would be better but it's not available +# on RHEL 5, thus we need to expand it here. +make install DESTDIR=%{?buildroot} SYSTEMD_UNIT_DIR=%{_unitdir} + for i in domain-events/events-c dominfo domsuspend hellolibvirt openauth python xml/nwfilter systemtap do (cd examples/$i ; make clean ; rm -rf .deps .libs Makefile Makefile.in) -- 1.8.1.2

2 2

[libvirt] [Libvirt][Sheepdog]How to test network disk support for sheepdog in Libvirt
by harryxiyou 31 Jan '13

31 Jan '13

Hi all, Morita added network disk support for Libvirt, which supported nbd, rbd, sheepdog, and other protocols. Now, i wanna test network disk support for sheepdog solely. I have following questions. Could anyone please give me some suggestions? Thanks in advance. 1, Before this test, whether should i build the environment of sheepdog or other projects (QEMU)? 2, How could i test network disk support of sheepdog in Libvirt? Which steps should i do for it? 3, Network disk support can support online storage management, right? -- Thanks Harry Wei

1 0

[libvirt] [libvirt-php PATCH 0/1] docs/distros.html.in: fix html validity
by stefan.kuhn＠foss-group.ch 31 Jan '13

31 Jan '13

The error is: ### distros.html.tmp:96: element table: validity error : No declaration for attribute align of element table <table align="center" width="75%"> ^ make[2]: *** [distros.html] Error 1 ### Stefan Kuhn (1): docs/distros.html.in: fix html validity error docs/distros.html.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- 1.7.12.4

2 2

[libvirt] libvirt error while start vm with VGA passthrough
by mzawdx wang 31 Jan '13

31 Jan '13

http://docs.redhat.com/docs/en-US/Red_Hat_Enterprise_Linux/6/html/Virtualiz… I have followed the instructions in the RedHat reference above to the best of my ability to understand them. I add the pci multi-port serial io card through virt-manager and it was indeed entered into the virtual machine's configuration file inside the <devices> tag: <hostdev mode='subsystem' type='pci' managed='yes'> <source> <address domain='0x0000' bus='0x00' slot='0x03' function='0x0'/> </source> <address type='pci' domain='0x0000' bus='0x00' slot='0x07' function='0x0'/> </hostdev> However, when I try and start the virtual machine I get this error: Error starting domain: internal error Unable to reset PCI device 0000:00:03.0: no FLR, PM reset or bus reset available Traceback (most recent call last): File "/usr/share/virt-manager/virtManager/asyncjob.py", line 44, in cb_wrapper callback(asyncjob, *args, **kwargs) File "/usr/share/virt-manager/virtManager/asyncjob.py", line 65, in tmpcb callback(*args, **kwargs) File "/usr/share/virt-manager/virtManager/domain.py", line 1050, in startup self._backend.create() File "/usr/lib64/python2.6/site-packages/libvirt.py", line 511, in create if ret == -1: raise libvirtError ('virDomainCreate() failed', dom=self) libvirtError: internal error Unable to reset PCI device 0000:00:03.0: no FLR, PM reset or bus reset available The steps I followed were: 1. Check VT-D extensions available and enabled in BIOS - yes 2. Restart virtual host - yes 3. Identify device - yes <address domain='0x000' bus='0x00' slot='0x03' function='0x0'/> 4. Add device to virtual machine configuration - yes . . . <hostdev mode='subsystem' type='pci' managed='yes'> <source> <address domain='0x0000' bus='0x00' slot='0x03' function='0x0'/> </source> <address type='pci' domain='0x0000' bus='0x00' slot='0x07' function='0x0'/> </hostdev> <memballoon model='virtio'> <address type='pci' domain='0x0000' bus='0x00' slot='0x06' function='0x0'/> </memballoon> </devices> </domain> 5. Start virtual machine - fails Am I making any obvious errors?

2 1

[libvirt] [libvirt-php PATCH 0/2] *** Add libvirt_domain_migrate_to_uri2() for virDomainMigrateToURI2() ***
by stefan.kuhn＠foss-group.ch 31 Jan '13

31 Jan '13

*** Please add new function libvirt_domain_migrate_to_uri2 for libirts virDomainMigrateToURI2(). *** Stefan Kuhn (2): Implement libvirt_domain_migrate_to_uri2 for virDomainMigrateToURI2 Document new funct. libvirt_domain_migrate_to_uri2 .../functions/libvirt-domain-get-job-info.xml | 1 + .../functions/libvirt-domain-migrate-to-uri.xml | 5 +- .../functions/libvirt-domain-migrate-to-uri2.xml | 134 +++++++++++++++++++++ .../libvirt/functions/libvirt-domain-migrate.xml | 3 +- doc/source/libvirt/versions.xml | 1 + src/libvirt-php.c | 53 ++++++++ src/libvirt-php.h | 1 + 7 files changed, 195 insertions(+), 3 deletions(-) create mode 100644 doc/source/libvirt/functions/libvirt-domain-migrate-to-uri2.xml -- 1.7.12.4

3 5

[libvirt] [PATCH] apibuild.py: fix TypeError raised in except clause
by Claudio Bley 31 Jan '13

31 Jan '13

When an exception happened inside the try clause in serialize_function, a new exception was raised in the except clause subsequently: Traceback (most recent call last): File "./apibuild.py", line 2529, in <module> rebuild("libvirt") File "./apibuild.py", line 2513, in rebuild builder.serialize() File "./apibuild.py", line 2467, in serialize self.serialize_function(output, function) File "./apibuild.py", line 2208, in serialize_function self.warning("Failed to save function %s info: " % name, `id.info`) TypeError: warning() takes exactly 2 arguments (3 given) Use the correct number of arguments for self.warning and print the original exception to stderr. Signed-off-by: Claudio Bley <cbley(a)av-test.de> --- docs/apibuild.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/docs/apibuild.py b/docs/apibuild.py index 91dabf8..2d72936 100755 --- a/docs/apibuild.py +++ b/docs/apibuild.py @@ -2198,7 +2198,8 @@ class docBuilder: output.write(" <arg name='%s' type='%s' info='%s'/>\n" % (param[1], param[0], escape(param[2]))) self.indexString(name, param[2]) except: - self.warning("Failed to save function %s info: " % name, `id.info`) + print >>sys.stderr, "Exception:", sys.exc_info()[1] + self.warning("Failed to save function %s info: %s" % (name, `id.info`)) output.write(" </%s>\n" % (id.type)) def serialize_exports(self, output, file): -- 1.7.9.5

2 2

[libvirt] [PATCH v2 0/7] documentation improvements
by Claudio Bley 31 Jan '13

31 Jan '13

Hi. Version 2 of this series incorporates the following changes: - patch #1 fail if documentation is missing - reword subject line of patch #3 as suggessted by Eric Incidently, patch #1 truthfully makes the build fail because of missing documentation. Go figure :) I'll submit a single patch with a fix shortly. Claudio Bley (7): docs: abort when missing return or argument documention docs: only generate function argument info for args with a description docs: use div, not table, for notices on opaque types docs: process code blocks similar to markdown docs: add class "description" to div's containing descriptions docs: define style of code blocks inside descriptions docs: syntax highlight code blocks using SHJS docs/apibuild.py | 15 +++- docs/libvirt.css | 8 ++ docs/newapi.xsl | 209 +++++++++++++++++++++++++++++-------------------- docs/page.xsl | 5 +- docs/sh_c.min.js | 1 + docs/sh_emacs.min.css | 1 + docs/sh_main.min.js | 4 + 7 files changed, 157 insertions(+), 86 deletions(-) create mode 100644 docs/sh_c.min.js create mode 100644 docs/sh_emacs.min.css create mode 100644 docs/sh_main.min.js -- 1.7.9.5

2 12

[libvirt] [PATCH] Enforce return check on virAsprintf() calls
by John Ferlan 30 Jan '13

30 Jan '13

Way back when I started making changes for Coverity messages my first set were to a bunch of CHECKED_RETURN errors. In particular virAsprintf() had a few callers that Coverity noted didn't check their return (although some did check if the buffer being printed to was NULL or not). It was suggested at the time as a further patch an ATTRIBUTE_RETURN_CHECK should be added to virAsprintf(), see: https://www.redhat.com/archives/libvir-list/2013-January/msg00120.html This patch does that and fixes two more instances not found by Coverity that failed the check. --- src/util/virutil.h | 3 ++- src/xen/xend_internal.c | 6 ++---- tests/networkxml2conftest.c | 5 +++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/util/virutil.h b/src/util/virutil.h index 5a08c81..c386d24 100644 --- a/src/util/virutil.h +++ b/src/util/virutil.h @@ -200,7 +200,8 @@ int virParseNumber(const char **str); int virParseVersionString(const char *str, unsigned long *version, bool allowMissing); int virAsprintf(char **strp, const char *fmt, ...) - ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_FMT_PRINTF(2, 3); + ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_FMT_PRINTF(2, 3) + ATTRIBUTE_RETURN_CHECK; int virVasprintf(char **strp, const char *fmt, va_list list) ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_FMT_PRINTF(2, 0); char *virStrncpy(char *dest, const char *src, size_t n, size_t destbytes) diff --git a/src/xen/xend_internal.c b/src/xen/xend_internal.c index b03b7bc..3036cbb 100644 --- a/src/xen/xend_internal.c +++ b/src/xen/xend_internal.c @@ -2738,10 +2738,8 @@ xenDaemonAttachDeviceFlags(virDomainPtr domain, const char *xml, virDevicePCIAddress PCIAddr; PCIAddr = dev->data.hostdev->source.subsys.u.pci; - virAsprintf(&target, "PCI device: %.4x:%.2x:%.2x", PCIAddr.domain, - PCIAddr.bus, PCIAddr.slot); - - if (target == NULL) { + if (virAsprintf(&target, "PCI device: %.4x:%.2x:%.2x", + PCIAddr.domain, PCIAddr.bus, PCIAddr.slot) < 0) { virReportOOMError(); goto cleanup; } diff --git a/tests/networkxml2conftest.c b/tests/networkxml2conftest.c index 3979540..fd24f74 100644 --- a/tests/networkxml2conftest.c +++ b/tests/networkxml2conftest.c @@ -102,8 +102,9 @@ testDnsmasqLeaseFileName(const char *netname) { char *leasefile; - virAsprintf(&leasefile, "/var/lib/libvirt/dnsmasq/%s.leases", - netname); + if (virAsprintf(&leasefile, "/var/lib/libvirt/dnsmasq/%s.leases", + netname) < 0) + return NULL; return leasefile; } -- 1.7.11.7

2 1

[libvirt] Libvirt support for windows
by varun bhatnagar 30 Jan '13

30 Jan '13

Hi, I want to use libvirt for windows but when i try to launch virsh it gives an error message saying "*error: invalid argument in transport methods unix, ssh and ext are not supported under Windows"* The version which I downloaded is libvirt-0.8.8.exe. I want to connect to two virtualization techniques --- *Virtualbox* and *VMWare* If libvirt is not supported on windows then is there any other tool or API which supports multiple virtualization technology? Thanks in advance..!!!!

1 0

[libvirt] [PATCH V1 0/4] [RFC] Add support for QEMU file descriptor sets (part 1)
by Stefan Berger 30 Jan '13

30 Jan '13

The following patch series adds initial support for QEMU file descriptor sets implementing support for creating the proper command line. What's missing is currently the monitor support removing the sets once QEMU has started. So these patches are posted for RFC purposes... Regards, Stefan

3 12

[libvirt] [PATCH] tests: Don't build securityselinuxlabeltest without qemu
by Jiri Denemark 30 Jan '13

30 Jan '13

Sources for securityselinuxlabeltest are only defined if qemu driver is enabled so we should not try to build the test if qemu driver is disabled. --- tests/Makefile.am | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tests/Makefile.am b/tests/Makefile.am index 9da0b4a..0194db2 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -108,10 +108,12 @@ endif if WITH_SECDRIVER_SELINUX test_programs += securityselinuxtest +if WITH_QEMU if WITH_ATTR test_programs += securityselinuxlabeltest endif endif +endif if WITH_DRIVER_MODULES test_programs += virdrivermoduletest -- 1.8.1.2

2 1

[libvirt] [PATCH] util: Fix mask for 172.16.0.0 private address range
by Jiri Denemark 30 Jan '13

30 Jan '13

https://bugzilla.redhat.com/show_bug.cgi?id=905708 Only the first 12 bits should be set in the mask for this range. All addresses between 172.16.0.0 and 172.31.255.255 are private. --- src/util/virsocketaddr.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/util/virsocketaddr.c b/src/util/virsocketaddr.c index 7bc43a9..3dfa3fb 100644 --- a/src/util/virsocketaddr.c +++ b/src/util/virsocketaddr.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2012 Red Hat, Inc. + * Copyright (C) 2009-2013 Red Hat, Inc. * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -199,7 +199,7 @@ virSocketAddrEqual(const virSocketAddrPtr s1, const virSocketAddrPtr s2) * * Return true if this address is in its family's defined * "private/local" address space. For IPv4, private addresses are in - * the range of 192.168.0.0/16, 172.16.0.0/16, or 10.0.0.0/8. For + * the range of 192.168.0.0/16, 172.16.0.0/12, or 10.0.0.0/8. For * IPv6, local addresses are in the range of FC00::/7 or FEC0::/10 * (that last one is deprecated, but still in use). * @@ -215,7 +215,7 @@ virSocketAddrIsPrivate(const virSocketAddrPtr addr) val = ntohl(addr->data.inet4.sin_addr.s_addr); return ((val & 0xFFFF0000) == ((192L << 24) + (168 << 16)) || - (val & 0xFFFF0000) == ((172L << 24) + (16 << 16)) || + (val & 0xFFF00000) == ((172L << 24) + (16 << 16)) || (val & 0xFF000000) == ((10L << 24))); case AF_INET6: -- 1.8.1.2

2 2

[libvirt] [PATCH 0/2] documentation fixes for virConnectClose and virConnectDomainEventBlockJobCallback
by Claudio Bley 30 Jan '13

30 Jan '13

Hi. This series fixes some documentation glitches that broke the build when rejecting missing documentation in apibuild.py. See https://www.redhat.com/archives/libvir-list/2013-January/msg02020.html Claudio Bley (2): libvirt.h.in: add missing documentation for virConnectCloseFunc libvirt.h.in: fix documentation for virConnectDomainEventBlockJobCallback include/libvirt/libvirt.h.in | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) -- 1.7.9.5

1 4