- Devel - libvirt List Archives

[libvirt] [PATCH] Workaround for broken kernel autofs mounts
by Daniel P. Berrange 01 Nov '11

01 Nov '11

From: "Daniel P. Berrange" <berrange(a)redhat.com> The kernel automounter is mostly broken wrt to containers. Most notably if you start a new filesystem namespace and then attempt to unmount any autofs filesystem, it will typically fail with a wierd error message like Failed to unmount '/.oldroot/sys/kernel/security':Too many levels of symbolic links Atttempting to detach the autofs mount mount using umount2(MNT_DETACH) will also fail with the same error. Therefore if we get any error on unmount()ing a filesystem from the old root FS when starting a container, we must immediately break out and detach the entire old root filesystem (ignoring any mounts below it). This has the effect of making the old root filesystem inaccessible to anything inside the container, but at the cost that the mounts live on in the kernel until the container exits. Given that SystemD uses autofs by default, we need LXC to be robust this scenario and thus this tradeoff is worthwhile. * src/lxc/lxc_container.c: Detach root filesystem if any umount operation fails. --- src/lxc/lxc_container.c | 49 ++++++++++++++++++++++++++++++++++++---------- 1 files changed, 38 insertions(+), 11 deletions(-) diff --git a/src/lxc/lxc_container.c b/src/lxc/lxc_container.c index 63284e5..fbd5267 100644 --- a/src/lxc/lxc_container.c +++ b/src/lxc/lxc_container.c @@ -860,6 +860,9 @@ static int lxcContainerUnmountOldFS(void) FILE *procmnt; int i; char mntbuf[1024]; + int saveErrno; + const char *failedUmount = NULL; + int ret = -1; if (!(procmnt = setmntent("/proc/mounts", "r"))) { virReportSystemError(errno, "%s", @@ -872,17 +875,15 @@ static int lxcContainerUnmountOldFS(void) continue; if (VIR_REALLOC_N(mounts, nmounts+1) < 0) { - endmntent(procmnt); virReportOOMError(); - return -1; + goto cleanup; } if (!(mounts[nmounts++] = strdup(mntent.mnt_dir))) { - endmntent(procmnt); virReportOOMError(); - return -1; + goto cleanup; } + VIR_DEBUG("Grabbed %s", mntent.mnt_dir); } - endmntent(procmnt); if (mounts) qsort(mounts, nmounts, sizeof(mounts[0]), @@ -891,16 +892,42 @@ static int lxcContainerUnmountOldFS(void) for (i = 0 ; i < nmounts ; i++) { VIR_DEBUG("Umount %s", mounts[i]); if (umount(mounts[i]) < 0) { - virReportSystemError(errno, - _("Failed to unmount '%s'"), - mounts[i]); - return -1; + char ebuf[1024]; + failedUmount = mounts[i]; + saveErrno = errno; + VIR_WARN(_("Failed to unmount '%s', trying to detach root '%s': %s"), + failedUmount, mounts[nmounts-1], + virStrerror(errno, ebuf, sizeof(ebuf))); + break; } - VIR_FREE(mounts[i]); } + + if (failedUmount) { + /* This detaches the old root filesystem */ + if (umount2(mounts[nmounts-1], MNT_DETACH) < 0) { + virReportSystemError(saveErrno, + _("Failed to unmount '%s' and could not detach old root '%s'"), + failedUmount, mounts[nmounts-1]); + goto cleanup; + } + /* This unmounts the tmpfs on which the old root filesystem was hosted */ + if (umount(mounts[nmounts-1]) < 0) { + virReportSystemError(saveErrno, + _("Failed to unmount '%s' and could not unmount old root '%s'"), + failedUmount, mounts[nmounts-1]); + goto cleanup; + } + } + + ret = 0; + +cleanup: + for (i = 0 ; i < nmounts ; i++) + VIR_FREE(mounts[i]); + endmntent(procmnt); VIR_FREE(mounts); - return 0; + return ret; } -- 1.7.6.4

2 1

[libvirt] [PATCH 1/3] Create /var/lib/libvirt/filesystems for LXC trees
by Daniel P. Berrange 01 Nov '11

01 Nov '11

From: "Daniel P. Berrange" <berrange(a)redhat.com> We already have a /var/lib/libvirt/images for OS install images. We need a separate /var/lib/libvirt/filesystems for OS install trees, since SELinux labelling will be different * libvirt.spec.in: Add /var/lib/libvirt/filesystems * src/Makefile.am: Create /var/lib/libvirt/filesystems --- libvirt.spec.in | 1 + src/Makefile.am | 2 ++ 2 files changed, 3 insertions(+), 0 deletions(-) diff --git a/libvirt.spec.in b/libvirt.spec.in index 262cfed..261f34c 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -1001,6 +1001,7 @@ rm -f $RPM_BUILD_ROOT%{_sysconfdir}/sysctl.d/libvirtd %dir %{_localstatedir}/run/libvirt/ %dir %attr(0711, root, root) %{_localstatedir}/lib/libvirt/images/ +%dir %attr(0711, root, root) %{_localstatedir}/lib/libvirt/filesystems/ %dir %attr(0711, root, root) %{_localstatedir}/lib/libvirt/boot/ %dir %attr(0711, root, root) %{_localstatedir}/cache/libvirt/ diff --git a/src/Makefile.am b/src/Makefile.am index 5cbe1ac..c36664b 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1522,6 +1522,7 @@ EXTRA_DIST += $(SECURITY_DRIVER_APPARMOR_HELPER_SOURCES) install-data-local: $(MKDIR_P) "$(DESTDIR)$(localstatedir)/cache/libvirt" $(MKDIR_P) "$(DESTDIR)$(localstatedir)/lib/libvirt/images" + $(MKDIR_P) "$(DESTDIR)$(localstatedir)/lib/libvirt/filesystems" $(MKDIR_P) "$(DESTDIR)$(localstatedir)/lib/libvirt/boot" if HAVE_SANLOCK $(MKDIR_P) "$(DESTDIR)$(localstatedir)/lib/libvirt/sanlock" @@ -1567,6 +1568,7 @@ endif uninstall-local:: rmdir "$(DESTDIR)$(localstatedir)/cache/libvirt" ||: rmdir "$(DESTDIR)$(localstatedir)/lib/libvirt/images" ||: + rmdir "$(DESTDIR)$(localstatedir)/lib/libvirt/filesystems" ||: rmdir "$(DESTDIR)$(localstatedir)/lib/libvirt/boot" ||: if HAVE_SANLOCK rmdir "$(DESTDIR)$(localstatedir)/lib/libvirt/sanlock" ||: -- 1.7.6.4

2 5

[libvirt] Coverity automatic detection
by Alex Jia 01 Nov '11

01 Nov '11

This email is automatically generated. The test result is based on the following git commit: c85013b Fix storage pool source comparison to avoid comparing with self Analysis summary report: ------------------------ Files analyzed : 232 Total LoC input to cov-analyze : 326003 Functions analyzed : 7884 Paths analyzed : 892728 New defects found : 45 Total 7 ATOMICITY 2 DEADCODE 7 FORWARD_NULL 13 LOCK 2 NEGATIVE_RETURNS 1 NULL_RETURNS 1 RETURN_LOCAL 12 REVERSE_INULL Exceeded path limit of 5000 paths in 0.13% of functions (normally up to 5% of functions encounter this limitation) For details, please see attachment. Regards, Alex

1 0

[libvirt] [PATCH] Fix storage pool source comparison to avoid comparing with self
by Daniel P. Berrange 01 Nov '11

01 Nov '11

From: "Daniel P. Berrange" <berrange(a)redhat.com> If we are comparing storage pools we must skip comparing with ourself, so that re-defining an existing pool works * conf/storage_conf.c: Skip self when comparing --- src/conf/storage_conf.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/src/conf/storage_conf.c b/src/conf/storage_conf.c index e893b2d..eb39198 100644 --- a/src/conf/storage_conf.c +++ b/src/conf/storage_conf.c @@ -1730,6 +1730,10 @@ int virStoragePoolSourceFindDuplicate(virStoragePoolObjListPtr pools, if (def->type != pool->def->type) continue; + /* Don't mach against ourself if re-defining existing pool ! */ + if (STREQ(pool->def->name, def->name)) + continue; + virStoragePoolObjLock(pool); switch (pool->def->type) { -- 1.7.6.4

3 3

[libvirt] [libvirt-glib] Generate docs
by Zeeshan Ali (Khattak) 01 Nov '11

01 Nov '11

From: "Zeeshan Ali (Khattak)" <zeeshanak(a)gnome.org> This patch adds gtk-doc-based documentation. The generated docs aren't very complete (or even correct) but this is a good start. --- Makefile.am | 2 +- configure.ac | 6 + docs/Makefile.am | 1 + docs/libvirt-gconfig/Libvirt-gconfig-docs.xml | 36 +++ docs/libvirt-gconfig/Libvirt-gconfig-sections.txt | 166 +++++++++++++ docs/libvirt-gconfig/Makefile.am | 44 ++++ docs/libvirt-glib/Libvirt-glib-docs.xml | 28 +++ docs/libvirt-glib/Libvirt-glib-sections.txt | 22 ++ docs/libvirt-glib/Makefile.am | 44 ++++ docs/libvirt-gobject/Libvirt-gobject-docs.xml | 37 +++ docs/libvirt-gobject/Libvirt-gobject-sections.txt | 244 ++++++++++++++++++++ docs/libvirt-gobject/Makefile.am | 44 ++++ gtk-doc.make | 256 +++++++++++++++++++++ 13 files changed, 929 insertions(+), 1 deletions(-) create mode 100644 docs/Makefile.am create mode 100644 docs/libvirt-gconfig/Libvirt-gconfig-docs.xml create mode 100644 docs/libvirt-gconfig/Libvirt-gconfig-sections.txt create mode 100644 docs/libvirt-gconfig/Makefile.am create mode 100644 docs/libvirt-glib/Libvirt-glib-docs.xml create mode 100644 docs/libvirt-glib/Libvirt-glib-overrides.txt create mode 100644 docs/libvirt-glib/Libvirt-glib-sections.txt create mode 100644 docs/libvirt-glib/Libvirt-glib.types create mode 100644 docs/libvirt-glib/Makefile.am create mode 100644 docs/libvirt-gobject/Libvirt-gobject-docs.xml create mode 100644 docs/libvirt-gobject/Libvirt-gobject-sections.txt create mode 100644 docs/libvirt-gobject/Makefile.am create mode 100644 gtk-doc.make diff --git a/Makefile.am b/Makefile.am index 8d082c0..cecffd6 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,5 +1,5 @@ -SUBDIRS = libvirt-glib libvirt-gconfig libvirt-gobject python vapi examples +SUBDIRS = libvirt-glib libvirt-gconfig libvirt-gobject python vapi examples docs ACLOCAL_AMFLAGS = -I m4 diff --git a/configure.ac b/configure.ac index c474f0b..8b90b81 100644 --- a/configure.ac +++ b/configure.ac @@ -50,6 +50,8 @@ PKG_CHECK_MODULES(GOBJECT2, gobject-2.0 >= $GLIB2_REQUIRED) PKG_CHECK_MODULES(GIO2, gio-2.0 >= $GLIB2_REQUIRED) PKG_CHECK_MODULES(LIBXML2, libxml-2.0 >= $LIBXML2_REQUIRED) +GTK_DOC_CHECK([1.10],[--flavour no-tmpl]) + dnl Extra link-time flags for Cygwin. dnl Copied from libxml2 configure.in, but I removed mingw changes dnl for now since I'm not supporting mingw at present. - RWMJ @@ -223,6 +225,10 @@ AC_OUTPUT(Makefile examples/Makefile python/Makefile vapi/Makefile + docs/Makefile + docs/libvirt-glib/Makefile + docs/libvirt-gobject/Makefile + docs/libvirt-gconfig/Makefile libvirt-glib-1.0.pc libvirt-gconfig-1.0.pc libvirt-gobject-1.0.pc diff --git a/docs/Makefile.am b/docs/Makefile.am new file mode 100644 index 0000000..f8e9b25 --- /dev/null +++ b/docs/Makefile.am @@ -0,0 +1 @@ +SUBDIRS = libvirt-glib libvirt-gobject libvirt-gconfig diff --git a/docs/libvirt-gconfig/Libvirt-gconfig-docs.xml b/docs/libvirt-gconfig/Libvirt-gconfig-docs.xml new file mode 100644 index 0000000..9719734 --- /dev/null +++ b/docs/libvirt-gconfig/Libvirt-gconfig-docs.xml @@ -0,0 +1,36 @@ +<?xml version="1.0"?> +<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" + "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" +[ + <!ENTITY % local.common.attrib "xmlns:xi CDATA #FIXED 'http://www.w3.org/2003/XInclude'"> +]> +<book id="index"> + <bookinfo> + <title>Libvirt-gconfig Reference Manual</title> + </bookinfo> + + <chapter> + <title>Libvirt-gconfig</title> + <xi:include href="xml/libvirt-gconfig-object.xml"/> + <xi:include href="xml/libvirt-gconfig-domain.xml"/> + <xi:include href="xml/libvirt-gconfig-domain-snapshot.xml"/> + <xi:include href="xml/libvirt-gconfig-interface.xml"/> + <xi:include href="xml/libvirt-gconfig-network-filter.xml"/> + <xi:include href="xml/libvirt-gconfig-network.xml"/> + <xi:include href="xml/libvirt-gconfig-node-device.xml"/> + <xi:include href="xml/libvirt-gconfig-secret.xml"/> + <xi:include href="xml/libvirt-gconfig-storage-pool.xml"/> + <xi:include href="xml/libvirt-gconfig-storage-vol.xml"/> + <xi:include href="xml/libvirt-gconfig-capabilities.xml"/> + </chapter> + <chapter id="object-tree"> + <title>Object Hierarchy</title> + <xi:include href="xml/tree_index.sgml"/> + </chapter> + <index id="api-index-full"> + <title>API Index</title> + <xi:include href="xml/api-index-full.xml"><xi:fallback /></xi:include> + </index> + + <xi:include href="xml/annotation-glossary.xml"><xi:fallback /></xi:include> +</book> diff --git a/docs/libvirt-gconfig/Libvirt-gconfig-sections.txt b/docs/libvirt-gconfig/Libvirt-gconfig-sections.txt new file mode 100644 index 0000000..e2dcc5f --- /dev/null +++ b/docs/libvirt-gconfig/Libvirt-gconfig-sections.txt @@ -0,0 +1,166 @@ +<SECTION> +<FILE>libvirt-gconfig-object</FILE> +<TITLE>GVirConfigObject</TITLE> +gvir_config_object_validate +gvir_config_object_get_doc +gvir_config_object_get_schema +<SUBSECTION Standard> +GVIR_TYPE_OBJECT +GVIR_OBJECT +GVIR_OBJECT_CLASS +GVIR_IS_OBJECT +GVIR_IS_OBJECT_CLASS +GVIR_OBJECT_GET_CLASS +<SUBSECTION Private> +GVirConfigObjectPrivate +</SECTION> + +<SECTION> +<FILE>libvirt-gconfig-domain</FILE> +<TITLE>GVirConfigDomain</TITLE> +gvir_config_domain_new +<SUBSECTION Standard> +GVIR_TYPE_DOMAIN +GVIR_DOMAIN +GVIR_DOMAIN_CLASS +GVIR_IS_DOMAIN +GVIR_IS_DOMAIN_CLASS +GVIR_DOMAIN_GET_CLASS +<SUBSECTION Private> +GVirConfigDomainPrivate +</SECTION> + +<SECTION> +<FILE>libvirt-gconfig-domain-snapshot</FILE> +<TITLE>GVirConfigDomainSnapshot</TITLE> +gvir_config_domain_snapshot_new +<SUBSECTION Standard> +GVIR_TYPE_DOMAIN_SNAPSHOT +GVIR_DOMAIN_SNAPSHOT +GVIR_DOMAIN_SNAPSHOT_CLASS +GVIR_IS_DOMAIN_SNAPSHOT +GVIR_IS_DOMAIN_SNAPSHOT_CLASS +GVIR_DOMAIN_SNAPSHOT_GET_CLASS +<SUBSECTION Private> +GVirConfigDomainSnapshotPrivate +</SECTION> + +<SECTION> +<FILE>libvirt-gconfig-interface</FILE> +<TITLE>GVirConfigInterface</TITLE> +gvir_config_interface_new +<SUBSECTION Standard> +GVIR_TYPE_INTERFACE +GVIR_INTERFACE +GVIR_INTERFACE_CLASS +GVIR_IS_INTERFACE +GVIR_IS_INTERFACE_CLASS +GVIR_INTERFACE_GET_CLASS +<SUBSECTION Private> +GVirConfigInterfacePrivate +</SECTION> + +<SECTION> +<FILE>libvirt-gconfig-network-filter</FILE> +<TITLE>GVirConfigNetworkFilter</TITLE> +gvir_config_network_filter_new +<SUBSECTION Standard> +GVIR_TYPE_NETWORK_FILTER +GVIR_NETWORK_FILTER +GVIR_NETWORK_FILTER_CLASS +GVIR_IS_NETWORK_FILTER +GVIR_IS_NETWORK_FILTER_CLASS +GVIR_NETWORK_FILTER_GET_CLASS +<SUBSECTION Private> +GVirConfigNetworkFilterPrivate +</SECTION> + +<SECTION> +<FILE>libvirt-gconfig-network</FILE> +<TITLE>GVirConfigNetwork</TITLE> +gvir_config_network_new +<SUBSECTION Standard> +GVIR_TYPE_NETWORK +GVIR_NETWORK +GVIR_NETWORK_CLASS +GVIR_IS_NETWORK +GVIR_IS_NETWORK_CLASS +GVIR_NETWORK_GET_CLASS +<SUBSECTION Private> +GVirConfigNetworkPrivate +</SECTION> + +<SECTION> +<FILE>libvirt-gconfig-node-device</FILE> +<TITLE>GVirConfigNodeDevice</TITLE> +gvir_config_node_device_new +<SUBSECTION Standard> +GVIR_TYPE_NODE_DEVICE +GVIR_NODE_DEVICE +GVIR_NODE_DEVICE_CLASS +GVIR_IS_NODE_DEVICE +GVIR_IS_NODE_DEVICE_CLASS +GVIR_NODE_DEVICE_GET_CLASS +<SUBSECTION Private> +GVirConfigNodeDevicePrivate +</SECTION> + +<SECTION> +<FILE>libvirt-gconfig-secret</FILE> +<TITLE>GVirConfigSecret</TITLE> +gvir_config_secret_get_new +<SUBSECTION Standard> +GVIR_TYPE_SECRET +GVIR_SECRET +GVIR_SECRET_CLASS +GVIR_IS_SECRET +GVIR_IS_SECRET_CLASS +GVIR_SECRET_GET_CLASS +<SUBSECTION Private> +GVirConfigSecretPrivate +</SECTION> + +<SECTION> +<FILE>libvirt-gconfig-storage-pool</FILE> +<TITLE>GVirConfigStoragePool</TITLE> +gvir_config_storage_pool_new +<SUBSECTION Standard> +GVIR_TYPE_STORAGE_POOL +GVIR_STORAGE_POOL +GVIR_STORAGE_POOL_CLASS +GVIR_IS_STORAGE_POOL +GVIR_IS_STORAGE_POOL_CLASS +GVIR_STORAGE_POOL_GET_CLASS +<SUBSECTION Private> +GVirConfigStoragePoolPrivate +</SECTION> + +<SECTION> +<FILE>libvirt-gconfig-storage-vol</FILE> +<TITLE>GVirConfigStorageVol</TITLE> +gvir_config_storage_vol_new +<SUBSECTION Standard> +GVIR_TYPE_STORAGE_VOL +GVIR_STORAGE_VOL +GVIR_STORAGE_VOL_CLASS +GVIR_IS_STORAGE_VOL +GVIR_IS_STORAGE_VOL_CLASS +GVIR_STORAGE_VOL_GET_CLASS +<SUBSECTION Private> +GVirConfigStorageVolPrivate +</SECTION> + +<SECTION> +<FILE>libvirt-gconfig-capabilities</FILE> +<TITLE>GVirConfigCapabilities</TITLE> +gvir_config_capabilities_new +<SUBSECTION Standard> +GVIR_TYPE_CAPABILITIES +GVIR_CAPABILITIES +GVIR_CAPABILITIES_CLASS +GVIR_IS_CAPABILITIES +GVIR_IS_CAPABILITIES_CLASS +GVIR_CAPABILITIES_GET_CLASS +<SUBSECTION Private> +GVirConfigCapabilitiesPrivate +</SECTION> diff --git a/docs/libvirt-gconfig/Makefile.am b/docs/libvirt-gconfig/Makefile.am new file mode 100644 index 0000000..de5bc82 --- /dev/null +++ b/docs/libvirt-gconfig/Makefile.am @@ -0,0 +1,44 @@ + +DOC_MODULE=Libvirt-gconfig + +DOC_MAIN_SGML_FILE=$(DOC_MODULE)-docs.xml + +# Must not use $(top_srcdir) since gtkdoc-scan runs +# from the srcdir already, not the builddir +DOC_SOURCE_DIR=../../libvirt-gconfig + +SCANGOBJ_OPTIONS= + +SCAN_OPTIONS= + +MKDB_OPTIONS=--sgml-mode --output-format=xml + +MKTMPL_OPTIONS= + +MKHTML_OPTIONS= + +FIXXREF_OPTIONS= + +HFILE_GLOB=$(top_srcdir)/libvirt-gconfig/*.h +CFILE_GLOB=$(top_srcdir)/libvirt-gconfig/*.c + +IGNORE_HFILES= + +HTML_IMAGES= + +content_files= + +expand_content_files= + +GTKDOC_CFLAGS= \ + $(LIBXML_CFLAGS) \ + $(GOBJECT_CFLAGS)\ + $(GIO_CFLAGS) +GTKDOC_LIBS = \ + $(LIBXML_LIBS) \ + $(GOBJECT_LIBS) \ + $(GIO_LIBS) \ + $(top_builddir)/libvirt-gconfig/libvirt-gconfig-1.0.la + +include $(top_srcdir)/gtk-doc.make + diff --git a/docs/libvirt-glib/Libvirt-glib-docs.xml b/docs/libvirt-glib/Libvirt-glib-docs.xml new file mode 100644 index 0000000..5b6a873 --- /dev/null +++ b/docs/libvirt-glib/Libvirt-glib-docs.xml @@ -0,0 +1,28 @@ +<?xml version="1.0"?> +<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" + "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" +[ + <!ENTITY % local.common.attrib "xmlns:xi CDATA #FIXED 'http://www.w3.org/2003/XInclude'"> +]> +<book id="index"> + <bookinfo> + <title>Libvirt-glib Reference Manual</title> + </bookinfo> + + <chapter> + <title>Libvirt-glib</title> + <xi:include href="xml/libvirt-glib-main.xml"/> + <xi:include href="xml/libvirt-glib-error.xml"/> + <xi:include href="xml/libvirt-glib-event.xml"/> + </chapter> + <chapter id="object-tree"> + <title>Object Hierarchy</title> + <xi:include href="xml/tree_index.sgml"/> + </chapter> + <index id="api-index-full"> + <title>API Index</title> + <xi:include href="xml/api-index-full.xml"><xi:fallback /></xi:include> + </index> + + <xi:include href="xml/annotation-glossary.xml"><xi:fallback /></xi:include> +</book> diff --git a/docs/libvirt-glib/Libvirt-glib-overrides.txt b/docs/libvirt-glib/Libvirt-glib-overrides.txt new file mode 100644 index 0000000..e69de29 diff --git a/docs/libvirt-glib/Libvirt-glib-sections.txt b/docs/libvirt-glib/Libvirt-glib-sections.txt new file mode 100644 index 0000000..506a2ba --- /dev/null +++ b/docs/libvirt-glib/Libvirt-glib-sections.txt @@ -0,0 +1,22 @@ +<SECTION> +<FILE>libvirt-glib-main</FILE> +<TITLE>Initialization</TITLE> +gvir_init +gvir_init_check +</SECTION> + +<SECTION> +<FILE>libvirt-glib-event</FILE> +<TITLE>Event Handling</TITLE> +gvir_event_register +</SECTION> + +<SECTION> +<FILE>libvirt-glib-error</FILE> +<TITLE>Error Handling</TITLE> +gvir_error_new +gvir_error_new_literal +gvir_error_new_valist +</SECTION> + + diff --git a/docs/libvirt-glib/Libvirt-glib.types b/docs/libvirt-glib/Libvirt-glib.types new file mode 100644 index 0000000..e69de29 diff --git a/docs/libvirt-glib/Makefile.am b/docs/libvirt-glib/Makefile.am new file mode 100644 index 0000000..01190d1 --- /dev/null +++ b/docs/libvirt-glib/Makefile.am @@ -0,0 +1,44 @@ + +DOC_MODULE=Libvirt-glib + +DOC_MAIN_SGML_FILE=$(DOC_MODULE)-docs.xml + +# Must not use $(top_srcdir) since gtkdoc-scan runs +# from the srcdir already, not the builddir +DOC_SOURCE_DIR=../../libvirt-glib + +SCANGOBJ_OPTIONS= + +SCAN_OPTIONS= + +MKDB_OPTIONS=--sgml-mode --output-format=xml + +MKTMPL_OPTIONS= + +MKHTML_OPTIONS= + +FIXXREF_OPTIONS= + +HFILE_GLOB=$(top_srcdir)/libvirt-glib/*.h +CFILE_GLOB=$(top_srcdir)/libvirt-glib/*.c + +IGNORE_HFILES= + +HTML_IMAGES= + +content_files= + +expand_content_files= + +GTKDOC_CFLAGS= \ + $(LIBXML_CFLAGS) \ + $(GOBJECT_CFLAGS)\ + $(GIO_CFLAGS) +GTKDOC_LIBS = \ + $(LIBXML_LIBS) \ + $(GOBJECT_LIBS) \ + $(GIO_LIBS) \ + $(top_builddir)/libvirt-glib/libvirt-glib-1.0.la + +include $(top_srcdir)/gtk-doc.make + diff --git a/docs/libvirt-gobject/Libvirt-gobject-docs.xml b/docs/libvirt-gobject/Libvirt-gobject-docs.xml new file mode 100644 index 0000000..40e6cd0 --- /dev/null +++ b/docs/libvirt-gobject/Libvirt-gobject-docs.xml @@ -0,0 +1,37 @@ +<?xml version="1.0"?> +<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" + "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" +[ + <!ENTITY % local.common.attrib "xmlns:xi CDATA #FIXED 'http://www.w3.org/2003/XInclude'"> +]> +<book id="index"> + <bookinfo> + <title>Libvirt-gobject Reference Manual</title> + </bookinfo> + + <chapter> + <title>Libvirt-gobject</title> + <xi:include href="xml/libvirt-gobject-connection.xml"/> + <xi:include href="xml/libvirt-gobject-domain.xml"/> + <xi:include href="xml/libvirt-gobject-domain-snapshot.xml"/> + <xi:include href="xml/libvirt-gobject-interface.xml"/> + <xi:include href="xml/libvirt-gobject-manager.xml"/> + <xi:include href="xml/libvirt-gobject-network-filter.xml"/> + <xi:include href="xml/libvirt-gobject-network.xml"/> + <xi:include href="xml/libvirt-gobject-node-device.xml"/> + <xi:include href="xml/libvirt-gobject-secret.xml"/> + <xi:include href="xml/libvirt-gobject-storage-pool.xml"/> + <xi:include href="xml/libvirt-gobject-storage-vol.xml"/> + <xi:include href="xml/libvirt-gobject-stream.xml"/> + </chapter> + <chapter id="object-tree"> + <title>Object Hierarchy</title> + <xi:include href="xml/tree_index.sgml"/> + </chapter> + <index id="api-index-full"> + <title>API Index</title> + <xi:include href="xml/api-index-full.xml"><xi:fallback /></xi:include> + </index> + + <xi:include href="xml/annotation-glossary.xml"><xi:fallback /></xi:include> +</book> diff --git a/docs/libvirt-gobject/Libvirt-gobject-sections.txt b/docs/libvirt-gobject/Libvirt-gobject-sections.txt new file mode 100644 index 0000000..b6baf2e --- /dev/null +++ b/docs/libvirt-gobject/Libvirt-gobject-sections.txt @@ -0,0 +1,244 @@ +<SECTION> +<FILE>libvirt-gobject-connection</FILE> +<TITLE>GVirConnection</TITLE> +gvir_connection_new +gvir_connection_open +gvir_connection_open_async +gvir_connection_open_finish +gvir_connection_is_open +gvir_connection_close +gvir_connection_fetch_domains +gvir_connection_fetch_domains_async +gvir_connection_fetch_domains_finish +gvir_connection_get_uri +gvir_connection_get_domains +gvir_connection_get_domain +gvir_connection_find_domain_by_id +gvir_connection_find_domain_by_name +gvir_connection_create_domain +gvir_connection_fetch_storage_pools +gvir_connection_fetch_storage_pools_async +gvir_connection_fetch_storage_pools_finish +gvir_connection_get_storage_pools +gvir_connection_get_storage_pool +gvir_connection_find_storage_pool_by_name +gvir_connection_create_storage_pool +gvir_connection_get_stream +<SUBSECTION Standard> +GVIR_TYPE_CONNECTION +GVIR_CONNECTION +GVIR_CONNECTION_CLASS +GVIR_IS_CONNECTION +GVIR_IS_CONNECTION_CLASS +GVIR_CONNECTION_GET_CLASS +<SUBSECTION Private> +GVirConnectionPrivate +</SECTION> + +<SECTION> +<FILE>libvirt-gobject-domain</FILE> +<TITLE>GVirDomain</TITLE> +GVirDomainState +GVirDomainInfo +gvir_domain_get_name +gvir_domain_get_uuid +gvir_domain_get_id +gvir_domain_start +gvir_domain_resume +gvir_domain_stop +gvir_domain_delete +gvir_domain_shutdown +gvir_domain_reboot +gvir_domain_get_info +gvir_domain_get_config +gvir_domain_screenshot +<SUBSECTION Standard> +GVIR_TYPE_DOMAIN +GVIR_DOMAIN +GVIR_DOMAIN_CLASS +GVIR_IS_DOMAIN +GVIR_IS_DOMAIN_CLASS +GVIR_DOMAIN_GET_CLASS +<SUBSECTION Private> +GVirDomainPrivate +</SECTION> + +<SECTION> +<FILE>libvirt-gobject-domain-snapshot</FILE> +<TITLE>GVirDomainSnapshot</TITLE> +gvir_domain_snapshot_get_name +gvir_domain_snapshot_get_config +<SUBSECTION Standard> +GVIR_TYPE_DOMAIN_SNAPSHOT +GVIR_DOMAIN_SNAPSHOT +GVIR_DOMAIN_SNAPSHOT_CLASS +GVIR_IS_DOMAIN_SNAPSHOT +GVIR_IS_DOMAIN_SNAPSHOT_CLASS +GVIR_DOMAIN_SNAPSHOT_GET_CLASS +<SUBSECTION Private> +GVirDomainSnapshotPrivate +</SECTION> + +<SECTION> +<FILE>libvirt-gobject-interface</FILE> +<TITLE>GVirInterface</TITLE> +gvir_interface_get_name +gvir_interface_get_config +<SUBSECTION Standard> +GVIR_TYPE_INTERFACE +GVIR_INTERFACE +GVIR_INTERFACE_CLASS +GVIR_IS_INTERFACE +GVIR_IS_INTERFACE_CLASS +GVIR_INTERFACE_GET_CLASS +<SUBSECTION Private> +GVirInterfacePrivate +</SECTION> + +<SECTION> +<FILE>libvirt-gobject-manager</FILE> +<TITLE>GVirManager</TITLE> +gvir_manager_new +gvir_manager_add_connection +gvir_manager_remove_connection +gvir_manager_get_connections +gvir_manager_find_connection_by_uri +<SUBSECTION Standard> +GVIR_TYPE_MANAGER +GVIR_MANAGER +GVIR_MANAGER_CLASS +GVIR_IS_MANAGER +GVIR_IS_MANAGER_CLASS +GVIR_MANAGER_GET_CLASS +<SUBSECTION Private> +GVirManagerPrivate +</SECTION> + +<SECTION> +<FILE>libvirt-gobject-network-filter</FILE> +<TITLE>GVirNetworkFilter</TITLE> +gvir_network_filter_get_name +gvir_network_filter_get_uuid +gvir_network_filter_get_config +<SUBSECTION Standard> +GVIR_TYPE_NETWORK_FILTER +GVIR_NETWORK_FILTER +GVIR_NETWORK_FILTER_CLASS +GVIR_IS_NETWORK_FILTER +GVIR_IS_NETWORK_FILTER_CLASS +GVIR_NETWORK_FILTER_GET_CLASS +<SUBSECTION Private> +GVirNetworkFilterPrivate +</SECTION> + +<SECTION> +<FILE>libvirt-gobject-network</FILE> +<TITLE>GVirNetwork</TITLE> +gvir_network_get_name +gvir_network_get_uuid +gvir_network_get_config +<SUBSECTION Standard> +GVIR_TYPE_NETWORK +GVIR_NETWORK +GVIR_NETWORK_CLASS +GVIR_IS_NETWORK +GVIR_IS_NETWORK_CLASS +GVIR_NETWORK_GET_CLASS +<SUBSECTION Private> +GVirNetworkPrivate +</SECTION> + +<SECTION> +<FILE>libvirt-gobject-node-device</FILE> +<TITLE>GVirNodeDevice</TITLE> +gvir_node_device_get_name +gvir_node_device_get_config +<SUBSECTION Standard> +GVIR_TYPE_NODE_DEVICE +GVIR_NODE_DEVICE +GVIR_NODE_DEVICE_CLASS +GVIR_IS_NODE_DEVICE +GVIR_IS_NODE_DEVICE_CLASS +GVIR_NODE_DEVICE_GET_CLASS +<SUBSECTION Private> +GVirNodeDevicePrivate +</SECTION> + +<SECTION> +<FILE>libvirt-gobject-secret</FILE> +<TITLE>GVirSecret</TITLE> +gvir_secret_get_name +gvir_secret_get_uuid +gvir_secret_get_config +<SUBSECTION Standard> +GVIR_TYPE_SECRET +GVIR_SECRET +GVIR_SECRET_CLASS +GVIR_IS_SECRET +GVIR_IS_SECRET_CLASS +GVIR_SECRET_GET_CLASS +<SUBSECTION Private> +GVirSecretPrivate +</SECTION> + +<SECTION> +<FILE>libvirt-gobject-storage-pool</FILE> +<TITLE>GVirStoragePool</TITLE> +gvir_storage_pool_get_name +gvir_storage_pool_get_uuid +gvir_storage_pool_get_config +gvir_storage_pool_refresh +gvir_storage_pool_refresh_async +gvir_storage_pool_refresh_finish +gvir_storage_pool_get_volumes +gvir_storage_pool_get_volume +gvir_storage_pool_create_volume +gvir_storage_pool_build +gvir_storage_pool_build_async +gvir_storage_pool_build_finish +gvir_storage_pool_start +gvir_storage_pool_start_async +gvir_storage_pool_start_finish +<SUBSECTION Standard> +GVIR_TYPE_STORAGE_POOL +GVIR_STORAGE_POOL +GVIR_STORAGE_POOL_CLASS +GVIR_IS_STORAGE_POOL +GVIR_IS_STORAGE_POOL_CLASS +GVIR_STORAGE_POOL_GET_CLASS +<SUBSECTION Private> +GVirStoragePoolPrivate +</SECTION> + +<SECTION> +<FILE>libvirt-gobject-storage-vol</FILE> +<TITLE>GVirStorageVol</TITLE> +gvir_storage_vol_get_name +gvir_storage_vol_get_path +gvir_storage_vol_get_config +<SUBSECTION Standard> +GVIR_TYPE_STORAGE_VOL +GVIR_STORAGE_VOL +GVIR_STORAGE_VOL_CLASS +GVIR_IS_STORAGE_VOL +GVIR_IS_STORAGE_VOL_CLASS +GVIR_STORAGE_VOL_GET_CLASS +<SUBSECTION Private> +GVirStorageVolPrivate +</SECTION> + +<SECTION> +<FILE>libvirt-gobject-stream</FILE> +<TITLE>GVirStream</TITLE> +gvir_stream_get_name +gvir_stream_get_config +<SUBSECTION Standard> +GVIR_TYPE_STREAM +GVIR_STREAM +GVIR_STREAM_CLASS +GVIR_IS_STREAM +GVIR_IS_STREAM_CLASS +GVIR_STREAM_GET_CLASS +<SUBSECTION Private> +GVirStreamPrivate +</SECTION> diff --git a/docs/libvirt-gobject/Makefile.am b/docs/libvirt-gobject/Makefile.am new file mode 100644 index 0000000..26f3ce4 --- /dev/null +++ b/docs/libvirt-gobject/Makefile.am @@ -0,0 +1,44 @@ + +DOC_MODULE=Libvirt-gobject + +DOC_MAIN_SGML_FILE=$(DOC_MODULE)-docs.xml + +# Must not use $(top_srcdir) since gtkdoc-scan runs +# from the srcdir already, not the builddir +DOC_SOURCE_DIR=../../libvirt-gobject + +SCANGOBJ_OPTIONS= + +SCAN_OPTIONS= + +MKDB_OPTIONS=--sgml-mode --output-format=xml + +MKTMPL_OPTIONS= + +MKHTML_OPTIONS= + +FIXXREF_OPTIONS= + +HFILE_GLOB=$(top_srcdir)/libvirt-gobject/*.h +CFILE_GLOB=$(top_srcdir)/libvirt-gobject/*.c + +IGNORE_HFILES= + +HTML_IMAGES= + +content_files= + +expand_content_files= + +GTKDOC_CFLAGS= \ + $(LIBXML_CFLAGS) \ + $(GOBJECT_CFLAGS)\ + $(GIO_CFLAGS) +GTKDOC_LIBS = \ + $(LIBXML_LIBS) \ + $(GOBJECT_LIBS) \ + $(GIO_LIBS) \ + $(top_builddir)/libvirt-gobject/libvirt-gobject-1.0.la + +include $(top_srcdir)/gtk-doc.make + diff --git a/gtk-doc.make b/gtk-doc.make new file mode 100644 index 0000000..9841de4 --- /dev/null +++ b/gtk-doc.make @@ -0,0 +1,256 @@ +# -*- mode: makefile -*- + +#################################### +# Everything below here is generic # +#################################### + +if GTK_DOC_USE_LIBTOOL +GTKDOC_CC = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(INCLUDES) $(GTKDOC_DEPS_CFLAGS) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +GTKDOC_LD = $(LIBTOOL) --tag=CC --mode=link $(CC) $(GTKDOC_DEPS_LIBS) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) +GTKDOC_RUN = $(LIBTOOL) --mode=execute +else +GTKDOC_CC = $(CC) $(INCLUDES) $(GTKDOC_DEPS_CFLAGS) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +GTKDOC_LD = $(CC) $(GTKDOC_DEPS_LIBS) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) +GTKDOC_RUN = +endif + +# We set GPATH here; this gives us semantics for GNU make +# which are more like other make's VPATH, when it comes to +# whether a source that is a target of one rule is then +# searched for in VPATH/GPATH. +# +GPATH = $(srcdir) + +TARGET_DIR=$(HTML_DIR)/$(DOC_MODULE) + +SETUP_FILES = \ + $(content_files) \ + $(DOC_MAIN_SGML_FILE) \ + $(DOC_MODULE)-sections.txt \ + $(DOC_MODULE)-overrides.txt + +EXTRA_DIST = \ + $(HTML_IMAGES) \ + $(SETUP_FILES) + +DOC_STAMPS=setup-build.stamp scan-build.stamp sgml-build.stamp \ + html-build.stamp pdf-build.stamp \ + sgml.stamp html.stamp pdf.stamp + +SCANOBJ_FILES = \ + $(DOC_MODULE).args \ + $(DOC_MODULE).hierarchy \ + $(DOC_MODULE).interfaces \ + $(DOC_MODULE).prerequisites \ + $(DOC_MODULE).signals + +REPORT_FILES = \ + $(DOC_MODULE)-undocumented.txt \ + $(DOC_MODULE)-undeclared.txt \ + $(DOC_MODULE)-unused.txt + +CLEANFILES = $(SCANOBJ_FILES) $(REPORT_FILES) $(DOC_STAMPS) + +if ENABLE_GTK_DOC +if GTK_DOC_BUILD_HTML +HTML_BUILD_STAMP=html-build.stamp +else +HTML_BUILD_STAMP= +endif +if GTK_DOC_BUILD_PDF +PDF_BUILD_STAMP=pdf-build.stamp +else +PDF_BUILD_STAMP= +endif + +all-local: $(HTML_BUILD_STAMP) $(PDF_BUILD_STAMP) +else +all-local: +endif + +docs: $(HTML_BUILD_STAMP) $(PDF_BUILD_STAMP) + +$(REPORT_FILES): sgml-build.stamp + +#### setup #### + +setup-build.stamp: + -@if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \ + echo ' DOC Preparing build'; \ + files=`echo $(SETUP_FILES) $(expand_content_files) $(DOC_MODULE).types`; \ + if test "x$$files" != "x" ; then \ + for file in $$files ; do \ + test -f $(abs_srcdir)/$$file && \ + cp -pu $(abs_srcdir)/$$file $(abs_builddir)/ || true; \ + done; \ + fi; \ + fi + @touch setup-build.stamp + + +#### scan #### + +scan-build.stamp: $(HFILE_GLOB) $(CFILE_GLOB) + @echo ' DOC Scanning header files' + @_source_dir='' ; \ + for i in $(DOC_SOURCE_DIR) ; do \ + _source_dir="$${_source_dir} --source-dir=$$i" ; \ + done ; \ + gtkdoc-scan --module=$(DOC_MODULE) --ignore-headers="$(IGNORE_HFILES)" $${_source_dir} $(SCAN_OPTIONS) $(EXTRA_HFILES) + @if grep -l '^..*$$' $(DOC_MODULE).types > /dev/null 2>&1 ; then \ + echo " DOC Introspecting gobjects"; \ + scanobj_options=""; \ + gtkdoc-scangobj 2>&1 --help | grep >/dev/null "\-\-verbose"; \ + if test "$(?)" = "0"; then \ + if test "x$(V)" = "x1"; then \ + scanobj_options="--verbose"; \ + fi; \ + fi; \ + CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" RUN="$(GTKDOC_RUN)" CFLAGS="$(GTKDOC_CFLAGS) $(CFLAGS)" LDFLAGS="$(GTKDOC_LIBS) $(LDFLAGS)" \ + gtkdoc-scangobj $(SCANGOBJ_OPTIONS) $$scanobj_options --module=$(DOC_MODULE); \ + else \ + for i in $(SCANOBJ_FILES) ; do \ + test -f $$i || touch $$i ; \ + done \ + fi + @touch scan-build.stamp + +$(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt: scan-build.stamp + @true + +#### xml #### + +sgml-build.stamp: setup-build.stamp $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt $(expand_content_files) + @echo ' DOC Building XML' + @_source_dir='' ; \ + for i in $(DOC_SOURCE_DIR) ; do \ + _source_dir="$${_source_dir} --source-dir=$$i" ; \ + done ; \ + gtkdoc-mkdb --module=$(DOC_MODULE) --output-format=xml --expand-content-files="$(expand_content_files)" --main-sgml-file=$(DOC_MAIN_SGML_FILE) $${_source_dir} $(MKDB_OPTIONS) + @touch sgml-build.stamp + +sgml.stamp: sgml-build.stamp + @true + +#### html #### + +html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) + @echo ' DOC Building HTML' + @rm -rf html + @mkdir html + @mkhtml_options=""; \ + gtkdoc-mkhtml 2>&1 --help | grep >/dev/null "\-\-verbose"; \ + if test "$(?)" = "0"; then \ + if test "x$(V)" = "x1"; then \ + mkhtml_options="$$mkhtml_options --verbose"; \ + fi; \ + fi; \ + gtkdoc-mkhtml 2>&1 --help | grep >/dev/null "\-\-path"; \ + if test "$(?)" = "0"; then \ + mkhtml_options="$$mkhtml_options --path=\"$(abs_srcdir)\""; \ + fi; \ + cd html && gtkdoc-mkhtml $$mkhtml_options $(MKHTML_OPTIONS) $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE) + -@test "x$(HTML_IMAGES)" = "x" || \ + for file in $(HTML_IMAGES) ; do \ + if test -f $(abs_srcdir)/$$file ; then \ + cp $(abs_srcdir)/$$file $(abs_builddir)/html; \ + fi; \ + if test -f $(abs_builddir)/$$file ; then \ + cp $(abs_builddir)/$$file $(abs_builddir)/html; \ + fi; \ + done; + @echo ' DOC Fixing cross-references' + @gtkdoc-fixxref --module=$(DOC_MODULE) --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS) + @touch html-build.stamp + +#### pdf #### + +pdf-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) + @echo ' DOC Building PDF' + @rm -f $(DOC_MODULE).pdf + @mkpdf_options=""; \ + gtkdoc-mkpdf 2>&1 --help | grep >/dev/null "\-\-verbose"; \ + if test "$(?)" = "0"; then \ + if test "x$(V)" = "x1"; then \ + mkpdf_options="$$mkpdf_options --verbose"; \ + fi; \ + fi; \ + if test "x$(HTML_IMAGES)" != "x"; then \ + for img in $(HTML_IMAGES); do \ + part=`dirname $$img`; \ + echo $$mkpdf_options | grep >/dev/null "\-\-imgdir=$$part "; \ + if test $$? != 0; then \ + mkpdf_options="$$mkpdf_options --imgdir=$$part"; \ + fi; \ + done; \ + fi; \ + gtkdoc-mkpdf --path="$(abs_srcdir)" $$mkpdf_options $(DOC_MODULE) $(DOC_MAIN_SGML_FILE) $(MKPDF_OPTIONS) + @touch pdf-build.stamp + +############## + +clean-local: + @rm -f *~ *.bak + @rm -rf .libs + +distclean-local: + @rm -rf xml html $(REPORT_FILES) $(DOC_MODULE).pdf \ + $(DOC_MODULE)-decl-list.txt $(DOC_MODULE)-decl.txt + @if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \ + rm -f $(SETUP_FILES) $(expand_content_files) $(DOC_MODULE).types; \ + fi + +maintainer-clean-local: clean + @rm -rf xml html + +install-data-local: + @installfiles=`echo $(builddir)/html/*`; \ + if test "$$installfiles" = '$(builddir)/html/*'; \ + then echo 1>&2 'Nothing to install' ; \ + else \ + if test -n "$(DOC_MODULE_VERSION)"; then \ + installdir="$(DESTDIR)$(TARGET_DIR)-$(DOC_MODULE_VERSION)"; \ + else \ + installdir="$(DESTDIR)$(TARGET_DIR)"; \ + fi; \ + $(mkinstalldirs) $${installdir} ; \ + for i in $$installfiles; do \ + echo ' $(INSTALL_DATA) '$$i ; \ + $(INSTALL_DATA) $$i $${installdir}; \ + done; \ + if test -n "$(DOC_MODULE_VERSION)"; then \ + mv -f $${installdir}/$(DOC_MODULE).devhelp2 \ + $${installdir}/$(DOC_MODULE)-$(DOC_MODULE_VERSION).devhelp2; \ + fi; \ + $(GTKDOC_REBASE) --relative --dest-dir=$(DESTDIR) --html-dir=$${installdir}; \ + fi + +uninstall-local: + @if test -n "$(DOC_MODULE_VERSION)"; then \ + installdir="$(DESTDIR)$(TARGET_DIR)-$(DOC_MODULE_VERSION)"; \ + else \ + installdir="$(DESTDIR)$(TARGET_DIR)"; \ + fi; \ + rm -rf $${installdir} + +# +# Require gtk-doc when making dist +# +if ENABLE_GTK_DOC +dist-check-gtkdoc: +else +dist-check-gtkdoc: + @echo "*** gtk-doc must be installed and enabled in order to make dist" + @false +endif + +dist-hook: dist-check-gtkdoc dist-hook-local + @mkdir $(distdir)/html + @cp ./html/* $(distdir)/html + @-cp ./$(DOC_MODULE).pdf $(distdir)/ + @-cp ./$(DOC_MODULE).types $(distdir)/ + @-cp ./$(DOC_MODULE)-sections.txt $(distdir)/ + @cd $(distdir) && rm -f $(DISTCLEANFILES) + @$(GTKDOC_REBASE) --online --relative --html-dir=$(distdir)/html + +.PHONY : dist-hook-local docs -- 1.7.7

2 1

[libvirt] [libvirt[]PATCH v2] Fix URI alias prefix matching
by Wen Ruo Lv 01 Nov '11

01 Nov '11

With /etc/libvirt/libvirt.conf below: uri_aliases = [ "hail=qemu:///system", "sleet=qemu+ssh://root 9 115 122 57/system", "sam=qemu+unix:///system?socket=/var/run/libvirt/libvirt-sock", ] Issue "virsh -c hailly" results in matching "hail=qemu:///system" Fix URI alias prefix matching when connecting Signed-off-by: Wen Ruo Lv <lvroyce(a)linux.vnet.ibm.com> --- src/libvirt.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/libvirt.c b/src/libvirt.c index e9d1a29..54e283f 100644 --- a/src/libvirt.c +++ b/src/libvirt.c @@ -1022,7 +1022,7 @@ virConnectOpenFindURIAliasMatch(virConfValuePtr value, const char *alias, char * return -1; } - if (STREQLEN(entry->str, alias, offset-entry->str)) { + if (STREQLEN(entry->str, alias, strlen(alias))) { VIR_DEBUG("Resolved alias '%s' to '%s'", alias, offset+1); if (!(*uri = strdup(offset+1))) { -- 1.7.4.1

3 2

[libvirt] [PATCH] qemu: plug memory leak
by ajia＠redhat.com 01 Nov '11

01 Nov '11

From: Alex Jia <ajia(a)redhat.com> Detected by Coverity. Leak introduced in commit 6cabc0b. * src/qemu/qemu_command.c: Clean up on failure. Signed-off-by: Alex Jia <ajia(a)redhat.com> --- src/qemu/qemu_command.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 0936492..02958cb 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -4995,6 +4995,7 @@ qemuBuildCommandLine(virConnectPtr conn, } if (sound->model == VIR_DOMAIN_SOUND_MODEL_ICH6) { + VIR_FREE(modstr); qemuReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("this QEMU binary lacks hda support")); goto error; -- 1.7.1

3 4

[libvirt] [PATCH 0/2] V2 Modify generic ethernet interface so it will work when sVirt is enabled with qemu
by Tyler Coumbes 01 Nov '11

01 Nov '11

Version 2 of https://www.redhat.com/archives/libvir-list/2011-September/msg00795.html. Instead of creating a new library for the TAP functions and refactoring code to there I have only refactored the actual TAP creation in util/bridge.c. This simplifies the patch and achieves the same goal. AUTHORS | 1 + src/libvirt_bridge.syms | 2 + src/qemu/qemu_command.c | 79 ++++++++++++++++++++++++++++++-- src/qemu/qemu_command.h | 4 ++ src/qemu/qemu_hotplug.c | 15 ++++++ src/qemu/qemu_process.c | 13 +++++ src/util/bridge.c | 116 +++++++++++++++++++++++++++++++---------------- src/util/bridge.h | 9 ++++ 8 files changed, 196 insertions(+), 43 deletions(-)

2 7

[libvirt] [PATCH v4 0/2] add blkio.weight_device support
by Hu Tao 31 Oct '11

31 Oct '11

This series adds support for blkio.weight_device. changes from v3: - fix some memory leaks - don't store major/minor, do the convertion from device path to major/minor only when enforcing the weight_device limits - use virStrToLong_i instead of atoi - use c_isdigit instead of isdigit - fix some typos Hu Tao (2): Add VIR_TYPED_PARAM_STRING add interface for blkio.weight_device daemon/remote.c | 34 +++++++- include/libvirt/libvirt.h.in | 34 +++++++- src/conf/domain_conf.c | 129 ++++++++++++++++++++++++++- src/conf/domain_conf.h | 16 ++++ src/libvirt.c | 38 ++++++++ src/libvirt_private.syms | 2 + src/qemu/qemu_cgroup.c | 22 +++++ src/qemu/qemu_driver.c | 199 +++++++++++++++++++++++++++++++++++++++-- src/remote/remote_driver.c | 30 ++++++- src/remote/remote_protocol.x | 2 + src/remote_protocol-structs | 2 + src/rpc/gendispatch.pl | 2 +- src/util/cgroup.c | 33 +++++++ src/util/cgroup.h | 3 + src/util/util.c | 15 +++ src/util/util.h | 2 + tools/virsh.c | 69 +++++++++++++-- tools/virsh.pod | 5 +- 18 files changed, 608 insertions(+), 29 deletions(-) -- 1.7.3.1

4 9

Re: [libvirt] [RFC PATCH v3 3/4] qemu: pass virConnectPtr into Domain{Attach, Detach}*
by Daniel P. Berrange 31 Oct '11

31 Oct '11

On Thu, Oct 20, 2011 at 11:01:26AM -0700, Josh Durgin wrote: > From: Sage Weil <sage(a)newdream.net> > > The qemu RBD driver needs access to the conn in order to get the secret > needed for connecting to the ceph cluster. > > Signed-off-by: Sage Weil <sage(a)newdream.net> > --- > src/qemu/qemu_command.c | 5 +++-- > src/qemu/qemu_command.h | 3 ++- > src/qemu/qemu_driver.c | 17 ++++++++--------- > src/qemu/qemu_hotplug.c | 15 +++++++++------ > src/qemu/qemu_hotplug.h | 9 ++++++--- > 5 files changed, 28 insertions(+), 21 deletions(-) Trivial, ACK Daniel -- |: http://berrange.com -o- http://www.flickr.com/photos/dberrange/ :| |: http://libvirt.org -o- http://virt-manager.org :| |: http://autobuild.org -o- http://search.cpan.org/~danberr/ :| |: http://entangle-photo.org -o- http://live.gnome.org/gtk-vnc :|

2 1

[libvirt] [PATCH] doc: Correct the default werror policy
by Osier Yang 31 Oct '11

31 Oct '11

<quote> @item werror=@var{action},rerror=@var{action} Specify which @var{action} to take on write and read errors. Valid actions are: "ignore" (ignore the error and try to continue), "stop" (pause QEMU), "report" (report the error to the guest), "enospc" (pause QEMU only if the host disk is full; report the error to the guest otherwise). The default setting is @option{werror=enospc} and @option{rerror=report}. @item readonly </quote> libvirt doesn't set any default value for "(r)error_policy", the original doc should mean QEMU sets "report" as the default value for "werror", but it's not true, QEMU uses "enospc" as the default. And it's better to document "(r)error_policy" are only supported by QEMU. --- docs/formatdomain.html.in | 20 +++++++++----------- 1 files changed, 9 insertions(+), 11 deletions(-) diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index dc6b152..e98e709 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -1011,19 +1011,17 @@ The optional <code>error_policy</code> attribute controls how the hypervisor will behave on a disk read or write error, possible values are "stop", "report", "ignore", and - "enospace".<span class="since">Since 0.8.0, "report" since - 0.9.7</span> The default setting of error_policy is "report". - There is also an - optional <code>rerror_policy</code> that controls behavior - for read errors only. <span class="since">Since - 0.9.7</span>. If no rerror_policy is given, error_policy - is used for both read and write errors. If rerror_policy - is given, it overrides the <code>error_policy</code> for - read errors. Also note that "enospace" is not a valid + "enospace".<span class="since">Since 0.8.0 (QEMU and KVM only), + "report" since 0.9.7</span>. QEMU sets error_policy as "enospc" + by default. There is also an optional <code>rerror_policy</code> + that controls behavior for read errors only. <span class="since"> + Since 0.9.7 (QEMU and KVM only)</span>. If no rerror_policy is + given, error_policy is used for both read and write errors. If + rerror_policy is given, it overrides the <code>error_policy</code> + for read errors. Also note that "enospace" is not a valid policy for read errors, so if <code>error_policy</code> is set to "enospace" and no <code>rerror_policy</code> is - given, the read error policy will be left at its default, - which is "report". + given, QEMU will set the read error policy as "report" by default. </li> <li> The optional <code>io</code> attribute controls specific -- 1.7.6

3 3

[libvirt] building failed
by Wen Congyang 31 Oct '11

31 Oct '11

When I try to build libvirt, I meet the following error messages: ============================== Generating internals/rpc.html.tmp Validating internals/rpc.html GEN libvirt-api.xml GEN html/index.html GEN devhelp/libvirt.devhelp convert -rotate 90 libvirt-net-logical.fig libvirt-net-logical.png make[1]: convert: Command not found make[1]: *** [libvirt-net-logical.png] Error 127 ============================== The command convert does not exist. Which package should I install? PS: I find another command fig2dev can convert *.fig to *.png. Thanks Wen Congyang

5 9

[libvirt] [PATCH] Fix URI alias prefix matching
by Wen Ruo Lv (none) 31 Oct '11

31 Oct '11

From: lvroyce <lvroyce(a)lvroyce-ThinkPad-T420.(none)> URI alias always do prefix matching,because we count length of entry according to config file entry, which should be the given alias' length. e.g.: /etc/libvirt/libvirt.conf uri_aliases = [ "hail=qemu:///system", "sleet=qemu+ssh://root@9.115.122.57/system", "sam=qemu+unix:///system?socket=/var/run/libvirt/libvirt-sock", ] when issue "virsh -c hailly" it will match "hail=qemu:///system" Signed-off-by: Wen Ruo Lv <lvroyce(a)lvroyce-ThinkPad-T420.(none)> --- src/libvirt.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/libvirt.c b/src/libvirt.c index e9d1a29..54e283f 100644 --- a/src/libvirt.c +++ b/src/libvirt.c @@ -1022,7 +1022,7 @@ virConnectOpenFindURIAliasMatch(virConfValuePtr value, const char *alias, char * return -1; } - if (STREQLEN(entry->str, alias, offset-entry->str)) { + if (STREQLEN(entry->str, alias, strlen(alias))) { VIR_DEBUG("Resolved alias '%s' to '%s'", alias, offset+1); if (!(*uri = strdup(offset+1))) { -- 1.7.4.1

2 1

[libvirt] [PATCH] python: Fix documentation of virStream recv
by Matthias Bolte 31 Oct '11

31 Oct '11

This was fixed in be757a3f7baf93b for libvirt.c. --- I'm pushing this one under the trivial rule. python/libvirt-override-virStream.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/python/libvirt-override-virStream.py b/python/libvirt-override-virStream.py index 92e6fb1..ff53a16 100644 --- a/python/libvirt-override-virStream.py +++ b/python/libvirt-override-virStream.py @@ -90,7 +90,7 @@ "nonblocking stream") def recv(self, nbytes): - """Write a series of bytes to the stream. This method may + """Reads a series of bytes from the stream. This method may block the calling application for an arbitrary amount of time. -- 1.7.4.1

1 0

[libvirt] [PATCH] startupPolicty: Minor cleanups
by Michal Privoznik 31 Oct '11

31 Oct '11

This patch does some cleanups to my previous startupPolicy patchset. --- daemon/remote.c | 2 ++ src/conf/domain_conf.c | 2 +- src/qemu/qemu_domain.c | 20 +++++++++----------- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/daemon/remote.c b/daemon/remote.c index 9d70163..f736e5f 100644 --- a/daemon/remote.c +++ b/daemon/remote.c @@ -496,6 +496,8 @@ static int remoteRelayDomainEventDiskChange(virConnectPtr conn ATTRIBUTE_UNUSED, return 0; mem_error: + VIR_FREE(oldSrcPath_p); + VIR_FREE(newSrcPath_p); virReportOOMError(); return -1; } diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 557d0b9..8f72d37 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -2657,7 +2657,7 @@ virDomainDiskDefParseXML(virCapsPtr caps, if (startupPolicy) { int i; - if ((i = virDomainStartupPolicyTypeFromString(startupPolicy)) < 0) { + if ((i = virDomainStartupPolicyTypeFromString(startupPolicy)) <= 0) { virDomainReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("unknown startupPolicy value '%s'"), startupPolicy); diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 198ebcc..572ea7d 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -1617,9 +1617,8 @@ qemuDomainCheckDiskPresence(struct qemud_driver *driver, { int ret = -1; int i; - int accessRet; virDomainDiskDefPtr disk; - char uuid[VIR_UUID_STRING_BUFLEN] ATTRIBUTE_UNUSED; + char uuid[VIR_UUID_STRING_BUFLEN]; virDomainEventPtr event = NULL; virUUIDFormat(vm->def->uuid, uuid); @@ -1630,11 +1629,10 @@ qemuDomainCheckDiskPresence(struct qemud_driver *driver, if (!disk->startupPolicy || !disk->src) continue; - if ((accessRet = virFileAccessibleAs(disk->src, F_OK, - driver->user, - driver->group)) >= 0) { - /* disk accessible or virFileAccessibleAs() - * terminated with signal*/ + if (virFileAccessibleAs(disk->src, F_OK, + driver->user, + driver->group) >= 0) { + /* disk accessible */ continue; } @@ -1643,7 +1641,7 @@ qemuDomainCheckDiskPresence(struct qemud_driver *driver, break; case VIR_DOMAIN_STARTUP_POLICY_MANDATORY: - virReportSystemError(-accessRet, + virReportSystemError(errno, _("cannot access file '%s'"), disk->src); goto cleanup; @@ -1651,7 +1649,7 @@ qemuDomainCheckDiskPresence(struct qemud_driver *driver, case VIR_DOMAIN_STARTUP_POLICY_REQUISITE: if (!start_with_state) { - virReportSystemError(-accessRet, + virReportSystemError(errno, _("cannot access file '%s'"), disk->src); goto cleanup; @@ -1664,8 +1662,8 @@ qemuDomainCheckDiskPresence(struct qemud_driver *driver, break; } - VIR_DEBUG("Droping disk '%s' on domain '%s' (UUID '%s') " - "due to not accessible source '%s'", + VIR_DEBUG("Dropping disk '%s' on domain '%s' (UUID '%s') " + "due to inaccessible source '%s'", disk->dst, vm->def->name, uuid, disk->src); event = virDomainEventDiskChangeNewFromObj(vm, disk->src, NULL, disk->info.alias, -- 1.7.3.4

2 2

[libvirt] [PATCH V4 0/4] Support for multiple IP addresses using lists
by Stefan Berger 31 Oct '11

31 Oct '11

This patch series builds on the previously posted patch series https://www.redhat.com/archives/libvir-list/2011-October/msg00912.html and introduces the capability to assign a list to a variable and have multiple rules instantiated, one for each item in the list. This means, that if for example a variable like IP has been assigned a list of values IP = [1.2.3.4, 5.6.7.8, 10.0.0.1] it will instantiate 3 rules, which in turn allows us to build filters that can evaluate multiple possible values per field, i.e., allow the filtering for multiple IP addresses (per interface). It would then need David Steven's patch for support of 'RETURN' (and 'CONTINUE') target(s). v4: - following Daniel Berrange's comments - changed (default) behavior of iterator v3: - following Daniel Berrange's comment regarding how a list of items should be represented in the XML v2: - reimplementation of iterator - other nits Regards, Stefan

2 12

[libvirt] how can I get these packages?
by chang liu 31 Oct '11

31 Oct '11

I wanna to build the rpm package, but it tells me that I need to install this packages, and I could not found them all. Who can tell me where can I get it? The packages are : xhtml1-dtds augeas libpciaccess-devel yajl-devel libpcap-devel avahi-devel parted-devel device-mapper-devel netcf-devel.

3 3

[libvirt] [PATCH] storage: add lvchange operation while lvremove fails.
by zituan＠taobao.com 31 Oct '11

31 Oct '11

From: Chang Liu <lingjiao.lc(a)taobao.com> We found an issue that virStorageBackendLogicalDeleteVol() could not remove the lv with notificaton "could not remove open logical volume.", in such situation, we should disable the lv first, then delete it. this patch fix it. *src/storage/storage_backend_logical.c (virStorageBackendLogicalDeleteVol):lvremove fail, lvchange the volume and then lvremove it second. Signed-off-by: Chang Liu <lingjiao.lc(a)taobao.com> --- configure.ac | 4 ++++ src/storage/storage_backend_logical.c | 14 ++++++++++++-- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index 5753c08..6092c47 100644 --- a/configure.ac +++ b/configure.ac @@ -1691,6 +1691,7 @@ if test "$with_storage_lvm" = "yes" || test "$with_storage_lvm" = "check"; then AC_PATH_PROG([PVREMOVE], [pvremove], [], [$PATH:/sbin:/usr/sbin]) AC_PATH_PROG([VGREMOVE], [vgremove], [], [$PATH:/sbin:/usr/sbin]) AC_PATH_PROG([LVREMOVE], [lvremove], [], [$PATH:/sbin:/usr/sbin]) + AC_PATH_PROG([LVCHANGE], [lvchange], [], [$PATH:/sbin:/usr/sbin]) AC_PATH_PROG([VGCHANGE], [vgchange], [], [$PATH:/sbin:/usr/sbin]) AC_PATH_PROG([VGSCAN], [vgscan], [], [$PATH:/sbin:/usr/sbin]) AC_PATH_PROG([PVS], [pvs], [], [$PATH:/sbin:/usr/sbin]) @@ -1704,6 +1705,7 @@ if test "$with_storage_lvm" = "yes" || test "$with_storage_lvm" = "check"; then if test -z "$PVREMOVE" ; then AC_MSG_ERROR([We need pvremove for LVM storage driver]) ; fi if test -z "$VGREMOVE" ; then AC_MSG_ERROR([We need vgremove for LVM storage driver]) ; fi if test -z "$LVREMOVE" ; then AC_MSG_ERROR([We need lvremove for LVM storage driver]) ; fi + if test -z "$LVCHANGE" ; then AC_MSG_ERROR([We need lvchange for LVM storage driver]) ; fi if test -z "$VGCHANGE" ; then AC_MSG_ERROR([We need vgchange for LVM storage driver]) ; fi if test -z "$VGSCAN" ; then AC_MSG_ERROR([We need vgscan for LVM storage driver]) ; fi if test -z "$PVS" ; then AC_MSG_ERROR([We need pvs for LVM storage driver]) ; fi @@ -1716,6 +1718,7 @@ if test "$with_storage_lvm" = "yes" || test "$with_storage_lvm" = "check"; then if test -z "$PVREMOVE" ; then with_storage_lvm=no ; fi if test -z "$VGREMOVE" ; then with_storage_lvm=no ; fi if test -z "$LVREMOVE" ; then with_storage_lvm=no ; fi + if test -z "$LVCHANGE" ; then with_storage_lvm=no ; fi if test -z "$VGCHANGE" ; then with_storage_lvm=no ; fi if test -z "$VGSCAN" ; then with_storage_lvm=no ; fi if test -z "$PVS" ; then with_storage_lvm=no ; fi @@ -1733,6 +1736,7 @@ if test "$with_storage_lvm" = "yes" || test "$with_storage_lvm" = "check"; then AC_DEFINE_UNQUOTED([PVREMOVE],["$PVREMOVE"],[Location of pvremove program]) AC_DEFINE_UNQUOTED([VGREMOVE],["$VGREMOVE"],[Location of vgremove program]) AC_DEFINE_UNQUOTED([LVREMOVE],["$LVREMOVE"],[Location of lvremove program]) + AC_DEFINE_UNQUOTED([LVCHANGE],["$LVCHANGE"],[Location of lvchange program]) AC_DEFINE_UNQUOTED([VGCHANGE],["$VGCHANGE"],[Location of vgchange program]) AC_DEFINE_UNQUOTED([VGSCAN],["$VGSCAN"],[Location of vgscan program]) AC_DEFINE_UNQUOTED([PVS],["$PVS"],[Location of pvs program]) diff --git a/src/storage/storage_backend_logical.c b/src/storage/storage_backend_logical.c index 3c3e736..4a2acf1 100644 --- a/src/storage/storage_backend_logical.c +++ b/src/storage/storage_backend_logical.c @@ -772,13 +772,23 @@ virStorageBackendLogicalDeleteVol(virConnectPtr conn ATTRIBUTE_UNUSED, LVREMOVE, "-f", vol->target.path, NULL }; + const char *lvchange_cmd[] = { + LVCHANGE, "-a", "n", vol->target.path, NULL + }; + virCheckFlags(0, -1); virFileWaitForDevices(); if (virRun(cmdargv, NULL) < 0) - return -1; - + { + if(virRun(lvchange_cmd, NULL) < 0) + return -1; + else{ + if(virRun(cmdargv,NULL) < 0) + return -1; + } + } return 0; } -- 1.7.6.2

2 1

[libvirt] [PATCH] storage: add lvchange operation while lvremove fails.
by chang liu 30 Oct '11

30 Oct '11

We found an issue that virStorageBackendLogicalDeleteVol() could not remove the lv with notificaton "could not remove open logical volume.", in such situation, we should disable the lv first, then delete it. this patch fix it. *src/storage/storage_backend_logical.c (virStorageBackendLogicalDeleteVol):lvremove fail, lvchange the volume and then lvremove it second. Signed-off-by: Chang Liu <lingjiao.lc(a)taobao.com> --- configure.ac | 4 ++++ src/storage/storage_backend_logical.c | 14 ++++++++++++-- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index 5753c08..6092c47 100644 --- a/configure.ac +++ b/configure.ac @@ -1691,6 +1691,7 @@ if test "$with_storage_lvm" = "yes" || test "$with_storage_lvm" = "check"; then AC_PATH_PROG([PVREMOVE], [pvremove], [], [$PATH:/sbin:/usr/sbin]) AC_PATH_PROG([VGREMOVE], [vgremove], [], [$PATH:/sbin:/usr/sbin]) AC_PATH_PROG([LVREMOVE], [lvremove], [], [$PATH:/sbin:/usr/sbin]) + AC_PATH_PROG([LVCHANGE], [lvchange], [], [$PATH:/sbin:/usr/sbin]) AC_PATH_PROG([VGCHANGE], [vgchange], [], [$PATH:/sbin:/usr/sbin]) AC_PATH_PROG([VGSCAN], [vgscan], [], [$PATH:/sbin:/usr/sbin]) AC_PATH_PROG([PVS], [pvs], [], [$PATH:/sbin:/usr/sbin]) @@ -1704,6 +1705,7 @@ if test "$with_storage_lvm" = "yes" || test "$with_storage_lvm" = "check"; then if test -z "$PVREMOVE" ; then AC_MSG_ERROR([We need pvremove for LVM storage driver]) ; fi if test -z "$VGREMOVE" ; then AC_MSG_ERROR([We need vgremove for LVM storage driver]) ; fi if test -z "$LVREMOVE" ; then AC_MSG_ERROR([We need lvremove for LVM storage driver]) ; fi + if test -z "$LVCHANGE" ; then AC_MSG_ERROR([We need lvchange for LVM storage driver]) ; fi if test -z "$VGCHANGE" ; then AC_MSG_ERROR([We need vgchange for LVM storage driver]) ; fi if test -z "$VGSCAN" ; then AC_MSG_ERROR([We need vgscan for LVM storage driver]) ; fi if test -z "$PVS" ; then AC_MSG_ERROR([We need pvs for LVM storage driver]) ; fi @@ -1716,6 +1718,7 @@ if test "$with_storage_lvm" = "yes" || test "$with_storage_lvm" = "check"; then if test -z "$PVREMOVE" ; then with_storage_lvm=no ; fi if test -z "$VGREMOVE" ; then with_storage_lvm=no ; fi if test -z "$LVREMOVE" ; then with_storage_lvm=no ; fi + if test -z "$LVCHANGE" ; then with_storage_lvm=no ; fi if test -z "$VGCHANGE" ; then with_storage_lvm=no ; fi if test -z "$VGSCAN" ; then with_storage_lvm=no ; fi if test -z "$PVS" ; then with_storage_lvm=no ; fi @@ -1733,6 +1736,7 @@ if test "$with_storage_lvm" = "yes" || test "$with_storage_lvm" = "check"; then AC_DEFINE_UNQUOTED([PVREMOVE],["$PVREMOVE"],[Location of pvremove program]) AC_DEFINE_UNQUOTED([VGREMOVE],["$VGREMOVE"],[Location of vgremove program]) AC_DEFINE_UNQUOTED([LVREMOVE],["$LVREMOVE"],[Location of lvremove program]) + AC_DEFINE_UNQUOTED([LVCHANGE],["$LVCHANGE"],[Location of lvchange program]) AC_DEFINE_UNQUOTED([VGCHANGE],["$VGCHANGE"],[Location of vgchange program]) AC_DEFINE_UNQUOTED([VGSCAN],["$VGSCAN"],[Location of vgscan program]) AC_DEFINE_UNQUOTED([PVS],["$PVS"],[Location of pvs program]) diff --git a/src/storage/storage_backend_logical.c b/src/storage/storage_backend_logical.c index 3c3e736..4a2acf1 100644 --- a/src/storage/storage_backend_logical.c +++ b/src/storage/storage_backend_logical.c @@ -772,13 +772,23 @@ virStorageBackendLogicalDeleteVol(virConnectPtr conn ATTRIBUTE_UNUSED, LVREMOVE, "-f", vol->target.path, NULL }; + const char *lvchange_cmd[] = { + LVCHANGE, "-a", "n", vol->target.path, NULL + }; + virCheckFlags(0, -1); virFileWaitForDevices(); if (virRun(cmdargv, NULL) < 0) - return -1; - + { + if(virRun(lvchange_cmd, NULL) < 0) + return -1; + else{ + if(virRun(cmdargv,NULL) < 0) + return -1; + } + } return 0; } -- 1.7.6.2

1 0

[libvirt] [PATCH v4] pci address conflict when virtio disk with drive type
by Xu He Jie 30 Oct '11

30 Oct '11

When using the xml as below: ------------------------------------------------------ <devices> <emulator>/home/soulxu/data/work-code/qemu-kvm/x86_64-softmmu/qemu-system-x86_64</emulator> <disk type='file' device='disk'> <driver name='qemu' type='qcow2'/> <source file='/home/soulxu/data/VM/images/linux.img'/> <target dev='vda' bus='virtio'/> <address type='drive' controller='0' bus='0' unit='0'/> </disk> <input type='mouse' bus='ps2'/> <graphics type='vnc' port='-1' autoport='yes'/> <video> <model type='cirrus' vram='9216' heads='1'/> <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/> </video> <memballoon model='virtio'> <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/> </memballoon> </devices> ------------------------------------------------------ Then can't startup qemu, the error message as below: virsh # start test-vm error: Failed to start domain test-vm error: internal error process exited while connecting to monitor: qemu-system-x86_64: -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3: PCI: slot 3 function 0 not available for virtio-balloon-pci, in use by virtio-blk-pci qemu-system-x86_64: -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3: Device 'virtio-balloon-pci' could not be initialized So adding check for bus type and address type. Only the address of pci type support by virtio bus. Signed-off-by: Xu He Jie <xuhj(a)linux.vnet.ibm.com> --- src/qemu/qemu_command.c | 14 ++++++++++---- 1 files changed, 10 insertions(+), 4 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 0c5bfab..07eaece 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -1319,15 +1319,21 @@ qemuAssignDevicePCISlots(virDomainDefPtr def, qemuDomainPCIAddressSetPtr addrs) goto error; } - /* Disks (VirtIO only for now */ + /* Disks (VirtIO only for now) */ for (i = 0; i < def->ndisks ; i++) { - if (def->disks[i]->info.type != VIR_DOMAIN_DEVICE_ADDRESS_TYPE_NONE) - continue; - /* Only VirtIO disks use PCI addrs */ if (def->disks[i]->bus != VIR_DOMAIN_DISK_BUS_VIRTIO) continue; + if (def->disks[i]->info.type == VIR_DOMAIN_DEVICE_ADDRESS_TYPE_PCI) + continue; + + if (def->disks[i]->info.type != VIR_DOMAIN_DEVICE_ADDRESS_TYPE_NONE) { + qemuReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("virtio only support device address type 'PCI'")); + goto error; + } + if (qemuDomainPCIAddressSetNextAddr(addrs, &def->disks[i]->info) < 0) goto error; } -- 1.7.5.4

2 2

[libvirt] [PATCH] qemu: Restore the original states of PCI device when restarting daemon
by Osier Yang 30 Oct '11

30 Oct '11

To support "managed" mode of host PCI device, we record the original states (unbind_from_stub, remove_slot, and reprobe) so that could reattach the device to host with original driver. But there is no XML for theses attrs, and thus after daemon is restarted, we lose the original states. It's easy to reproduce: 1) virsh start domain 2) virsh attach-device dom hostpci.xml (in 'managed' mode) 3) service libvirtd restart 4) virsh destroy domain You will see the device won't be bound to the original driver if there was one. This patch is to solve the problem by introducing internal XML (won't be dumped to user, only dumped to status XML). The XML is: <origstates> <unbind/> <remove_slot/> <reprobe/> </origstates> A new struct "virDomainHostdevOrigStates" is introduced for the XML, and the according members are updated when preparing the PCI device. And function "qemuUpdateActivePciHostdevs" is modified to honor the original states. Use of qemuGetPciHostDeviceList is removed in function "qemuUpdateActivePciHostdevs", and the "managed" value of the device config is honored by the change. This fixes another problem alongside: qemuGetPciHostDeviceList set the device as "managed" force regardless of whether the device is configured as "managed='yes'" or not in XML, which is not right. --- src/conf/domain_conf.c | 79 +++++++++++++++++++++++++++++++++++++++++----- src/conf/domain_conf.h | 26 +++++++++++++++ src/libvirt_private.syms | 6 +++ src/qemu/qemu_hostdev.c | 79 ++++++++++++++++++++++++++++++++++++---------- src/util/pci.c | 36 +++++++++++++++++++++ src/util/pci.h | 9 +++++ 6 files changed, 210 insertions(+), 25 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 5959593..4ccf381 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -59,8 +59,12 @@ verify(VIR_DOMAIN_VIRT_LAST <= 32); /* Private flags used internally by virDomainSaveStatus and * virDomainLoadStatus. */ typedef enum { - VIR_DOMAIN_XML_INTERNAL_STATUS = (1<<16), /* dump internal domain status information */ - VIR_DOMAIN_XML_INTERNAL_ACTUAL_NET = (1<<17), /* dump/parse <actual> element */ + /* dump internal domain status information */ + VIR_DOMAIN_XML_INTERNAL_STATUS = (1<<16), + /* dump/parse <actual> element */ + VIR_DOMAIN_XML_INTERNAL_ACTUAL_NET = (1<<17), + /* dump/parse original states of host PCI device */ + VIR_DOMAIN_XML_INTERNAL_PCI_ORIG_STATES = (1<<18), } virDomainXMLInternalFlags; VIR_ENUM_IMPL(virDomainTaint, VIR_DOMAIN_TAINT_LAST, @@ -5437,13 +5441,47 @@ out: return ret; } +/* The internal XML for host PCI device's original states: + * + * <origstates> + * <unbind/> + * <removeslot/> + * <reprobe/> + * </origstates> + */ +static int +virDomainHostdevSubsysPciOrigStatesDefParseXML(const xmlNodePtr node, + virDomainHostdevOrigStatesPtr def) +{ + xmlNodePtr cur; + cur = node->children; + + while (cur != NULL) { + if (cur->type == XML_ELEMENT_NODE) { + if (xmlStrEqual(cur->name, BAD_CAST "unbind")) { + def->states.pci.unbind_from_stub = 1; + } else if (xmlStrEqual(cur->name, BAD_CAST "removeslot")) { + def->states.pci.remove_slot = 1; + } else if (xmlStrEqual(cur->name, BAD_CAST "reprobe")) { + def->states.pci.reprobe = 1; + } else { + virDomainReportError(VIR_ERR_INTERNAL_ERROR, + _("unsupported element '%s' of 'origstates'"), + cur->name); + return -1; + } + } + cur = cur->next; + } + + return 0; +} static int virDomainHostdevSubsysPciDefParseXML(const xmlNodePtr node, virDomainHostdevDefPtr def, unsigned int flags) { - int ret = -1; xmlNodePtr cur; @@ -5470,6 +5508,11 @@ virDomainHostdevSubsysPciDefParseXML(const xmlNodePtr node, goto out; } def->info.type = VIR_DOMAIN_DEVICE_ADDRESS_TYPE_PCI; + } else if ((flags & VIR_DOMAIN_XML_INTERNAL_PCI_ORIG_STATES) && + xmlStrEqual(cur->name, BAD_CAST "origstates")) { + virDomainHostdevOrigStatesPtr states = &def->origstates; + if (virDomainHostdevSubsysPciOrigStatesDefParseXML(cur, states) < 0) + goto out; } else { virDomainReportError(VIR_ERR_INTERNAL_ERROR, _("unknown pci source type '%s'"), @@ -10445,7 +10488,9 @@ virDomainHostdevDefFormat(virBufferPtr buf, } type = virDomainHostdevSubsysTypeToString(def->source.subsys.type); - if (!type || (def->source.subsys.type != VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_USB && def->source.subsys.type != VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_PCI) ) { + if (!type || + (def->source.subsys.type != VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_USB && + def->source.subsys.type != VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_PCI)) { virDomainReportError(VIR_ERR_INTERNAL_ERROR, _("unexpected hostdev type %d"), def->source.subsys.type); @@ -10474,6 +10519,20 @@ virDomainHostdevDefFormat(virBufferPtr buf, def->source.subsys.u.pci.bus, def->source.subsys.u.pci.slot, def->source.subsys.u.pci.function); + + if ((flags & VIR_DOMAIN_XML_INTERNAL_PCI_ORIG_STATES) && + (def->origstates.states.pci.unbind_from_stub || + def->origstates.states.pci.remove_slot || + def->origstates.states.pci.reprobe)) { + virBufferAddLit(buf, " <origstates>\n"); + if (def->origstates.states.pci.unbind_from_stub) + virBufferAddLit(buf, " <unbind/>\n"); + if (def->origstates.states.pci.remove_slot) + virBufferAddLit(buf, " <removeslot/>\n"); + if (def->origstates.states.pci.reprobe) + virBufferAddLit(buf, " <reprobe/>\n"); + virBufferAddLit(buf, " </origstates>\n"); + } } virBufferAddLit(buf, " </source>\n"); @@ -10554,7 +10613,8 @@ virDomainHubDefFormat(virBufferPtr buf, VIR_DOMAIN_XML_UPDATE_CPU) verify(((VIR_DOMAIN_XML_INTERNAL_STATUS | - VIR_DOMAIN_XML_INTERNAL_ACTUAL_NET) + VIR_DOMAIN_XML_INTERNAL_ACTUAL_NET | + VIR_DOMAIN_XML_INTERNAL_PCI_ORIG_STATES) & DUMPXML_FLAGS) == 0); /* This internal version can accept VIR_DOMAIN_XML_INTERNAL_*, @@ -10574,7 +10634,8 @@ virDomainDefFormatInternal(virDomainDefPtr def, virCheckFlags(DUMPXML_FLAGS | VIR_DOMAIN_XML_INTERNAL_STATUS | - VIR_DOMAIN_XML_INTERNAL_ACTUAL_NET, + VIR_DOMAIN_XML_INTERNAL_ACTUAL_NET | + VIR_DOMAIN_XML_INTERNAL_PCI_ORIG_STATES, -1); if (!(type = virDomainVirtTypeToString(def->virtType))) { @@ -11150,7 +11211,8 @@ int virDomainSaveStatus(virCapsPtr caps, { unsigned int flags = (VIR_DOMAIN_XML_SECURE | VIR_DOMAIN_XML_INTERNAL_STATUS | - VIR_DOMAIN_XML_INTERNAL_ACTUAL_NET); + VIR_DOMAIN_XML_INTERNAL_ACTUAL_NET | + VIR_DOMAIN_XML_INTERNAL_PCI_ORIG_STATES); int ret = -1; char *xml; @@ -11249,7 +11311,8 @@ static virDomainObjPtr virDomainLoadStatus(virCapsPtr caps, if (!(obj = virDomainObjParseFile(caps, statusFile, expectedVirtTypes, VIR_DOMAIN_XML_INTERNAL_STATUS | - VIR_DOMAIN_XML_INTERNAL_ACTUAL_NET))) + VIR_DOMAIN_XML_INTERNAL_ACTUAL_NET | + VIR_DOMAIN_XML_INTERNAL_PCI_ORIG_STATES))) goto error; virUUIDFormat(obj->def->uuid, uuidstr); diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index 2119b5a..c5eda75 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -153,6 +153,31 @@ struct _virDomainDeviceInfo { } master; }; +typedef struct _virDomainHostdevOrigStates virDomainHostdevOrigStates; +typedef virDomainHostdevOrigStates *virDomainHostdevOrigStatesPtr; +struct _virDomainHostdevOrigStates { + union { + struct { + /* Does the device need to ubind from stub when + * reattaching to host? + */ + unsigned int unbind_from_stub : 1; + + /* Does it need to use remove_slot when reattaching + * the device to host? + */ + unsigned int remove_slot : 1; + + /* Does it need to reprobe driver for the device when + * reattaching to host? + */ + unsigned int reprobe :1; + } pci; + + /* Perhaps 'usb' in future */ + } states; +}; + typedef struct _virDomainLeaseDef virDomainLeaseDef; typedef virDomainLeaseDef *virDomainLeaseDefPtr; struct _virDomainLeaseDef { @@ -995,6 +1020,7 @@ struct _virDomainHostdevDef { int bootIndex; virDomainDeviceInfo info; /* Guest address */ int rombar; /* enum virDomainPciRombarMode */ + virDomainHostdevOrigStates origstates; }; enum virDomainRedirdevBus { diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index dedbd16..b85dabf 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -882,6 +882,9 @@ pciDettachDevice; pciDeviceFileIterate; pciDeviceGetManaged; pciDeviceGetName; +pciDeviceGetRemoveSlot; +pciDeviceGetReprobe; +pciDeviceGetUnbindFromStub; pciDeviceGetUsedBy; pciDeviceIsAssignable; pciDeviceIsVirtualFunction; @@ -896,6 +899,9 @@ pciDeviceListSteal; pciDeviceNetName; pciDeviceReAttachInit; pciDeviceSetManaged; +pciDeviceSetRemoveSlot; +pciDeviceSetReprobe; +pciDeviceSetUnbindFromStub; pciDeviceSetUsedBy; pciFreeDevice; pciGetDevice; diff --git a/src/qemu/qemu_hostdev.c b/src/qemu/qemu_hostdev.c index 1fb373e..9137388 100644 --- a/src/qemu/qemu_hostdev.c +++ b/src/qemu/qemu_hostdev.c @@ -116,33 +116,46 @@ qemuGetActivePciHostDeviceList(struct qemud_driver *driver, int qemuUpdateActivePciHostdevs(struct qemud_driver *driver, virDomainDefPtr def) { - pciDeviceList *pcidevs; - int ret = -1; + virDomainHostdevDefPtr hostdev = NULL; + int i; if (!def->nhostdevs) return 0; - if (!(pcidevs = qemuGetPciHostDeviceList(def->hostdevs, def->nhostdevs))) - return -1; + for (i = 0; i < def->nhostdevs; i++) { + pciDevice *dev = NULL; + hostdev = def->hostdevs[i]; + + if (hostdev->mode != VIR_DOMAIN_HOSTDEV_MODE_SUBSYS) + continue; + if (hostdev->source.subsys.type != VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_PCI) + continue; + + dev = pciGetDevice(hostdev->source.subsys.u.pci.domain, + hostdev->source.subsys.u.pci.bus, + hostdev->source.subsys.u.pci.slot, + hostdev->source.subsys.u.pci.function); + + if (!dev) + return -1; + + pciDeviceSetManaged(dev, hostdev->managed); + pciDeviceSetUsedBy(dev, def->name); + + /* Setup the original states for the PCI device */ + pciDeviceSetUnbindFromStub(dev, hostdev->origstates.states.pci.unbind_from_stub); + pciDeviceSetRemoveSlot(dev, hostdev->origstates.states.pci.remove_slot); + pciDeviceSetReprobe(dev, hostdev->origstates.states.pci.reprobe); - while (pciDeviceListCount(pcidevs) > 0) { - pciDevice *dev = pciDeviceListGet(pcidevs, 0); - pciDeviceListSteal(pcidevs, dev); if (pciDeviceListAdd(driver->activePciHostdevs, dev) < 0) { pciFreeDevice(dev); - goto cleanup; + return -1; } } - ret = 0; - -cleanup: - pciDeviceListFree(pcidevs); - return ret; + return 0; } - - int qemuPrepareHostdevPCIDevices(struct qemud_driver *driver, const char *name, virDomainHostdevDefPtr *hostdevs, @@ -155,7 +168,7 @@ int qemuPrepareHostdevPCIDevices(struct qemud_driver *driver, if (!(pcidevs = qemuGetPciHostDeviceList(hostdevs, nhostdevs))) return -1; - /* We have to use 6 loops here. *All* devices must + /* We have to use 7 loops here. *All* devices must * be detached before we reset any of them, because * in some cases you have to reset the whole PCI, * which impacts all devices on it. Also, all devices @@ -232,7 +245,39 @@ int qemuPrepareHostdevPCIDevices(struct qemud_driver *driver, pciDeviceSetUsedBy(activeDev, name); } - /* Loop 6: Now steal all the devices from pcidevs */ + /* Loop 6: Now set the original states for hostdev def */ + for (i = 0; i < nhostdevs; i++) { + pciDevice *dev; + pciDevice *pcidev; + virDomainHostdevDefPtr hostdev = hostdevs[i]; + + if (hostdev->mode != VIR_DOMAIN_HOSTDEV_MODE_SUBSYS) + continue; + if (hostdev->source.subsys.type != VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_PCI) + continue; + + dev = pciGetDevice(hostdev->source.subsys.u.pci.domain, + hostdev->source.subsys.u.pci.bus, + hostdev->source.subsys.u.pci.slot, + hostdev->source.subsys.u.pci.function); + + /* original states "unbind_from_stub", "remove_slot", + * "reprobe" were already set by pciDettachDevice in + * loop 2. + */ + if ((pcidev = pciDeviceListFind(pcidevs, dev))) { + hostdev->origstates.states.pci.unbind_from_stub = + pciDeviceGetUnbindFromStub(pcidev); + hostdev->origstates.states.pci.remove_slot = + pciDeviceGetRemoveSlot(pcidev); + hostdev->origstates.states.pci.reprobe = + pciDeviceGetReprobe(pcidev); + } + + pciFreeDevice(dev); + } + + /* Loop 7: Now steal all the devices from pcidevs */ while (pciDeviceListCount(pcidevs) > 0) { pciDevice *dev = pciDeviceListGet(pcidevs, 0); pciDeviceListSteal(pcidevs, dev); diff --git a/src/util/pci.c b/src/util/pci.c index 33b4b0e..b835979 100644 --- a/src/util/pci.c +++ b/src/util/pci.c @@ -1394,6 +1394,42 @@ unsigned pciDeviceGetManaged(pciDevice *dev) return dev->managed; } +unsigned +pciDeviceGetUnbindFromStub(pciDevice *dev) +{ + return dev->unbind_from_stub; +} + +void +pciDeviceSetUnbindFromStub(pciDevice *dev, unsigned unbind) +{ + dev->unbind_from_stub = !!unbind; +} + +unsigned +pciDeviceGetRemoveSlot(pciDevice *dev) +{ + return dev->remove_slot; +} + +void +pciDeviceSetRemoveSlot(pciDevice *dev, unsigned remove_slot) +{ + dev->remove_slot = !!remove_slot; +} + +unsigned +pciDeviceGetReprobe(pciDevice *dev) +{ + return dev->reprobe; +} + +void +pciDeviceSetReprobe(pciDevice *dev, unsigned reprobe) +{ + dev->reprobe = !!reprobe; +} + void pciDeviceSetUsedBy(pciDevice *dev, const char *name) { diff --git a/src/util/pci.h b/src/util/pci.h index ab29c0b..76e37e3 100644 --- a/src/util/pci.h +++ b/src/util/pci.h @@ -51,6 +51,15 @@ unsigned pciDeviceGetManaged(pciDevice *dev); void pciDeviceSetUsedBy(pciDevice *dev, const char *used_by); const char *pciDeviceGetUsedBy(pciDevice *dev); +unsigned pciDeviceGetUnbindFromStub(pciDevice *dev); +void pciDeviceSetUnbindFromStub(pciDevice *dev, + unsigned unbind); +unsigned pciDeviceGetRemoveSlot(pciDevice *dev); +void pciDeviceSetRemoveSlot(pciDevice *dev, + unsigned remove_slot); +unsigned pciDeviceGetReprobe(pciDevice *dev); +void pciDeviceSetReprobe(pciDevice *dev, + unsigned reprobe); void pciDeviceReAttachInit(pciDevice *dev); pciDeviceList *pciDeviceListNew (void); -- 1.7.6

2 2

[libvirt] [PATCH] vbox: Add support for VirtualBox 4.1
by Matthias Bolte 29 Oct '11

29 Oct '11

Deal with the incompatible changes in the VirtualBox 4.1 API. INetworkAdapter has its different AttachTo* method replaced by a settable attachmentType property. The maximum number of network adapters is now requestable per chipset type. The OpenMedium method got a bool parameter to request opening a medium under a new IID. --- This patch is compile-tested only and was created by fixing compile errors and looking at the changelog between VirtualBox 4.0 and 4.1. As I currently don't have VirtualBox 4.1 installed and don't have time to upgrade my system and test this, it would be nice if someone with VirtualBox 4.1 at hand could runtime test this patch. The new vbox_CAPI_v4_1.h header file hase been edited out of this patch. The full patch is attached packed. src/Makefile.am | 3 +- src/vbox/vbox_CAPI_v4_1.h | 7882 +++++++++++++++++++++++++++++++++++++++++++++ src/vbox/vbox_V4_1.c | 13 + src/vbox/vbox_driver.c | 8 + src/vbox/vbox_tmpl.c | 88 +- 5 files changed, 7983 insertions(+), 11 deletions(-) create mode 100644 src/vbox/vbox_CAPI_v4_1.h create mode 100644 src/vbox/vbox_V4_1.c diff --git a/src/Makefile.am b/src/Makefile.am index 2555f81..7f4b43c 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -339,7 +339,8 @@ VBOX_DRIVER_SOURCES = \ vbox/vbox_V3_0.c vbox/vbox_CAPI_v3_0.h \ vbox/vbox_V3_1.c vbox/vbox_CAPI_v3_1.h \ vbox/vbox_V3_2.c vbox/vbox_CAPI_v3_2.h \ - vbox/vbox_V4_0.c vbox/vbox_CAPI_v4_0.h + vbox/vbox_V4_0.c vbox/vbox_CAPI_v4_0.h \ + vbox/vbox_V4_1.c vbox/vbox_CAPI_v4_1.h VBOX_DRIVER_EXTRA_DIST = \ vbox/vbox_tmpl.c vbox/README \ diff --git a/src/vbox/vbox_V4_1.c b/src/vbox/vbox_V4_1.c new file mode 100644 index 0000000..00fab09 --- /dev/null +++ b/src/vbox/vbox_V4_1.c @@ -0,0 +1,13 @@ +/** @file vbox_V4_0.c + * C file to include support for multiple versions of VirtualBox + * at runtime. + */ + +#include <config.h> + +/** The API Version */ +#define VBOX_API_VERSION 4001 +/** Version specific prefix. */ +#define NAME(name) vbox41##name + +#include "vbox_tmpl.c" diff --git a/src/vbox/vbox_driver.c b/src/vbox/vbox_driver.c index 430ab40..3d208e8 100644 --- a/src/vbox/vbox_driver.c +++ b/src/vbox/vbox_driver.c @@ -60,6 +60,9 @@ extern virStorageDriver vbox32StorageDriver; extern virDriver vbox40Driver; extern virNetworkDriver vbox40NetworkDriver; extern virStorageDriver vbox40StorageDriver; +extern virDriver vbox41Driver; +extern virNetworkDriver vbox41NetworkDriver; +extern virStorageDriver vbox41StorageDriver; static virDriver vboxDriverDummy; @@ -122,6 +125,11 @@ int vboxRegister(void) { driver = &vbox40Driver; networkDriver = &vbox40NetworkDriver; storageDriver = &vbox40StorageDriver; + } else if (uVersion >= 4000051 && uVersion < 4001051) { + VIR_DEBUG("VirtualBox API version: 4.1"); + driver = &vbox41Driver; + networkDriver = &vbox41NetworkDriver; + storageDriver = &vbox41StorageDriver; } else { VIR_DEBUG("Unsupport VirtualBox API version"); } diff --git a/src/vbox/vbox_tmpl.c b/src/vbox/vbox_tmpl.c index bc19b63..a956684 100644 --- a/src/vbox/vbox_tmpl.c +++ b/src/vbox/vbox_tmpl.c @@ -68,6 +68,8 @@ # include "vbox_CAPI_v3_2.h" #elif VBOX_API_VERSION == 4000 # include "vbox_CAPI_v4_0.h" +#elif VBOX_API_VERSION == 4001 +# include "vbox_CAPI_v4_1.h" #else # error "Unsupport VBOX_API_VERSION" #endif @@ -2207,6 +2209,9 @@ static char *vboxDomainGetXMLDesc(virDomainPtr dom, unsigned int flags) { #endif /* VBOX_API_VERSION >= 4000 */ IAudioAdapter *audioAdapter = NULL; IUSBController *USBController = NULL; +#if VBOX_API_VERSION >= 4001 + PRUint32 chipsetType = ChipsetType_Null; +#endif /* VBOX_API_VERSION >= 4001 */ ISystemProperties *systemProperties = NULL; @@ -2218,11 +2223,19 @@ static char *vboxDomainGetXMLDesc(virDomainPtr dom, unsigned int flags) { machine->vtbl->GetMemorySize(machine, &memorySize); def->mem.cur_balloon = memorySize * 1024; +#if VBOX_API_VERSION >= 4001 + machine->vtbl->GetChipsetType(machine, &chipsetType); +#endif /* VBOX_API_VERSION >= 4001 */ + data->vboxObj->vtbl->GetSystemProperties(data->vboxObj, &systemProperties); if (systemProperties) { systemProperties->vtbl->GetMaxGuestRAM(systemProperties, &maxMemorySize); systemProperties->vtbl->GetMaxBootPosition(systemProperties, &maxBootPosition); +#if VBOX_API_VERSION < 4001 systemProperties->vtbl->GetNetworkAdapterCount(systemProperties, &netAdpCnt); +#else /* VBOX_API_VERSION >= 4000 */ + systemProperties->vtbl->GetMaxNetworkAdapters(systemProperties, chipsetType, &netAdpCnt); +#endif /* VBOX_API_VERSION >= 4000 */ systemProperties->vtbl->GetSerialPortCount(systemProperties, &serialPortCount); systemProperties->vtbl->GetParallelPortCount(systemProperties, &parallelPortCount); VBOX_RELEASE(systemProperties); @@ -2826,7 +2839,11 @@ static char *vboxDomainGetXMLDesc(virDomainPtr dom, unsigned int flags) { def->nets[netAdpIncCnt]->type = VIR_DOMAIN_NET_TYPE_BRIDGE; +#if VBOX_API_VERSION < 4001 adapter->vtbl->GetHostInterface(adapter, &hostIntUtf16); +#else /* VBOX_API_VERSION >= 4001 */ + adapter->vtbl->GetBridgedInterface(adapter, &hostIntUtf16); +#endif /* VBOX_API_VERSION >= 4001 */ VBOX_UTF16_TO_UTF8(hostIntUtf16, &hostInt); def->nets[netAdpIncCnt]->data.bridge.brname = strdup(hostInt); @@ -2854,7 +2871,11 @@ static char *vboxDomainGetXMLDesc(virDomainPtr dom, unsigned int flags) { def->nets[netAdpIncCnt]->type = VIR_DOMAIN_NET_TYPE_NETWORK; +#if VBOX_API_VERSION < 4001 adapter->vtbl->GetHostInterface(adapter, &hostIntUtf16); +#else /* VBOX_API_VERSION >= 4001 */ + adapter->vtbl->GetHostOnlyInterface(adapter, &hostIntUtf16); +#endif /* VBOX_API_VERSION >= 4001 */ VBOX_UTF16_TO_UTF8(hostIntUtf16, &hostInt); def->nets[netAdpIncCnt]->data.network.name = strdup(hostInt); @@ -4072,12 +4093,18 @@ vboxAttachDrives(virDomainDefPtr def, vboxGlobalData *data, IMachine *machine) } else { rc = 0; } -# else /* VBOX_API_VERSION >= 4000 */ +# elif VBOX_API_VERSION == 4000 rc = data->vboxObj->vtbl->OpenMedium(data->vboxObj, mediumFileUtf16, deviceType, accessMode, &medium); -# endif /* VBOX_API_VERSION >= 4000 */ +# elif VBOX_API_VERSION >= 4001 + rc = data->vboxObj->vtbl->OpenMedium(data->vboxObj, + mediumFileUtf16, + deviceType, accessMode, + false, + &medium); +# endif /* VBOX_API_VERSION >= 4001 */ VBOX_UTF16_FREE(mediumEmpty); } @@ -4206,13 +4233,25 @@ static void vboxAttachNetwork(virDomainDefPtr def, vboxGlobalData *data, IMachine *machine) { ISystemProperties *systemProperties = NULL; +#if VBOX_API_VERSION >= 4001 + PRUint32 chipsetType = ChipsetType_Null; +#endif /* VBOX_API_VERSION >= 4001 */ PRUint32 networkAdapterCount = 0; int i = 0; +#if VBOX_API_VERSION >= 4001 + machine->vtbl->GetChipsetType(machine, &chipsetType); +#endif /* VBOX_API_VERSION >= 4001 */ + data->vboxObj->vtbl->GetSystemProperties(data->vboxObj, &systemProperties); if (systemProperties) { +#if VBOX_API_VERSION < 4001 systemProperties->vtbl->GetNetworkAdapterCount(systemProperties, &networkAdapterCount); +#else /* VBOX_API_VERSION >= 4000 */ + systemProperties->vtbl->GetMaxNetworkAdapters(systemProperties, chipsetType, + &networkAdapterCount); +#endif /* VBOX_API_VERSION >= 4000 */ VBOX_RELEASE(systemProperties); systemProperties = NULL; } @@ -4285,19 +4324,31 @@ vboxAttachNetwork(virDomainDefPtr def, vboxGlobalData *data, IMachine *machine) PRUnichar *hostInterface = NULL; /* Bridged Network */ +#if VBOX_API_VERSION < 4001 adapter->vtbl->AttachToBridgedInterface(adapter); +#else /* VBOX_API_VERSION >= 4001 */ + adapter->vtbl->SetAttachmentType(adapter, NetworkAttachmentType_Bridged); +#endif /* VBOX_API_VERSION >= 4001 */ if (def->nets[i]->data.bridge.brname) { VBOX_UTF8_TO_UTF16(def->nets[i]->data.bridge.brname, &hostInterface); +#if VBOX_API_VERSION < 4001 adapter->vtbl->SetHostInterface(adapter, hostInterface); +#else /* VBOX_API_VERSION >= 4001 */ + adapter->vtbl->SetBridgedInterface(adapter, hostInterface); +#endif /* VBOX_API_VERSION >= 4001 */ VBOX_UTF16_FREE(hostInterface); } } else if (def->nets[i]->type == VIR_DOMAIN_NET_TYPE_INTERNAL) { PRUnichar *internalNetwork = NULL; /* Internal Network */ +#if VBOX_API_VERSION < 4001 adapter->vtbl->AttachToInternalNetwork(adapter); +#else /* VBOX_API_VERSION >= 4001 */ + adapter->vtbl->SetAttachmentType(adapter, NetworkAttachmentType_Internal); +#endif /* VBOX_API_VERSION >= 4001 */ if (def->nets[i]->data.internal.name) { VBOX_UTF8_TO_UTF16(def->nets[i]->data.internal.name, @@ -4311,22 +4362,38 @@ vboxAttachNetwork(virDomainDefPtr def, vboxGlobalData *data, IMachine *machine) * on *nix and mac, on windows you can create and configure * as many as you want) */ +#if VBOX_API_VERSION < 4001 adapter->vtbl->AttachToHostOnlyInterface(adapter); +#else /* VBOX_API_VERSION >= 4001 */ + adapter->vtbl->SetAttachmentType(adapter, NetworkAttachmentType_HostOnly); +#endif /* VBOX_API_VERSION >= 4001 */ if (def->nets[i]->data.network.name) { VBOX_UTF8_TO_UTF16(def->nets[i]->data.network.name, &hostInterface); +#if VBOX_API_VERSION < 4001 adapter->vtbl->SetHostInterface(adapter, hostInterface); +#else /* VBOX_API_VERSION >= 4001 */ + adapter->vtbl->SetHostOnlyInterface(adapter, hostInterface); +#endif /* VBOX_API_VERSION >= 4001 */ VBOX_UTF16_FREE(hostInterface); } } else if (def->nets[i]->type == VIR_DOMAIN_NET_TYPE_USER) { /* NAT */ +#if VBOX_API_VERSION < 4001 adapter->vtbl->AttachToNAT(adapter); +#else /* VBOX_API_VERSION >= 4001 */ + adapter->vtbl->SetAttachmentType(adapter, NetworkAttachmentType_NAT); +#endif /* VBOX_API_VERSION >= 4001 */ } else { /* else always default to NAT if we don't understand * what option is been passed to us */ +#if VBOX_API_VERSION < 4001 adapter->vtbl->AttachToNAT(adapter); +#else /* VBOX_API_VERSION >= 4001 */ + adapter->vtbl->SetAttachmentType(adapter, NetworkAttachmentType_NAT); +#endif /* VBOX_API_VERSION >= 4001 */ } VBOX_UTF8_TO_UTF16(macaddrvbox, &MACAddress); @@ -6534,9 +6601,10 @@ cleanup: return ret; } -#if VBOX_API_VERSION == 2002 || VBOX_API_VERSION == 4000 +#if VBOX_API_VERSION <= 2002 || VBOX_API_VERSION >= 4000 /* No Callback support for VirtualBox 2.2.* series */ -#else /* !(VBOX_API_VERSION == 2002) && !(VBOX_API_VERSION == 4000) */ + /* No Callback support for VirtualBox 4.* series */ +#else /* !(VBOX_API_VERSION == 2002 || VBOX_API_VERSION >= 4000) */ /* Functions needed for Callbacks */ static nsresult PR_COM_METHOD @@ -7098,7 +7166,7 @@ static int vboxDomainEventDeregisterAny(virConnectPtr conn, return ret; } -#endif /* !(VBOX_API_VERSION == 2002) && !(VBOX_API_VERSION == 4000) */ +#endif /* !(VBOX_API_VERSION == 2002 || VBOX_API_VERSION >= 4000) */ /** * The Network Functions here on @@ -8774,7 +8842,7 @@ static char *vboxStorageVolGetPath(virStorageVolPtr vol) { return ret; } -#if VBOX_API_VERSION == 4000 +#if VBOX_API_VERSION >= 4000 static char * vboxDomainScreenshot(virDomainPtr dom, virStreamPtr st, @@ -8898,7 +8966,7 @@ endjob: vboxIIDUnalloc(&iid); return ret; } -#endif /* VBOX_API_VERSION == 4000 */ +#endif /* VBOX_API_VERSION >= 4000 */ /** * Function Tables @@ -8950,10 +9018,10 @@ virDriver NAME(Driver) = { .domainUpdateDeviceFlags = vboxDomainUpdateDeviceFlags, /* 0.8.0 */ .nodeGetCellsFreeMemory = nodeGetCellsFreeMemory, /* 0.6.5 */ .nodeGetFreeMemory = nodeGetFreeMemory, /* 0.6.5 */ -#if VBOX_API_VERSION == 4000 +#if VBOX_API_VERSION >= 4000 .domainScreenshot = vboxDomainScreenshot, /* 0.9.2 */ #endif -#if VBOX_API_VERSION != 2002 && VBOX_API_VERSION != 4000 +#if VBOX_API_VERSION > 2002 && VBOX_API_VERSION < 4000 .domainEventRegister = vboxDomainEventRegister, /* 0.7.0 */ .domainEventDeregister = vboxDomainEventDeregister, /* 0.7.0 */ #endif @@ -8962,7 +9030,7 @@ virDriver NAME(Driver) = { .domainIsActive = vboxDomainIsActive, /* 0.7.3 */ .domainIsPersistent = vboxDomainIsPersistent, /* 0.7.3 */ .domainIsUpdated = vboxDomainIsUpdated, /* 0.8.6 */ -#if VBOX_API_VERSION != 2002 && VBOX_API_VERSION != 4000 +#if VBOX_API_VERSION > 2002 && VBOX_API_VERSION < 4000 .domainEventRegisterAny = vboxDomainEventRegisterAny, /* 0.8.0 */ .domainEventDeregisterAny = vboxDomainEventDeregisterAny, /* 0.8.0 */ #endif -- 1.7.4.1

2 2

[libvirt] [PATCH] vbox: Support shared folders
by Matthias Bolte 29 Oct '11

29 Oct '11

Shared folders are handled as filesystems and can also be hotplugged. --- Currently this just maps shared folder to a filesystem element with type mount. The filesystem element has an accessmode attribute that is not useful for VirtualBox. Als the target element only has a dir attribute, but VirtualBox shares doen't support that, you can only give them a name. <filesystem type='mount' accessmode='passthrough'> <source dir='/tmp'/> <target dir='foobar'/> <readonly/> </filesystem> I wonder if we should add a shared folder type like this: <filesystem type='sharedfolder'> <source dir='/tmp'/> <target name='foobar'/> <readonly/> </filesystem> Or is this to specific to VirtualBox? VirtualBox 4.0 added the automount option that automatically mounts a shared folder in the guest. On Windows it is mounted to a free drive letter on Linux it's mounted to /media/<prefix>_<shared-folder-name>. The <prefix> is a global configuration option in VirtualBox. I wonder if and how to expose that in libvirt. Matthias docs/drvvbox.html.in | 5 ++ src/vbox/vbox_tmpl.c | 140 ++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 145 insertions(+), 0 deletions(-) diff --git a/docs/drvvbox.html.in b/docs/drvvbox.html.in index ef55757..1fcafde 100644 --- a/docs/drvvbox.html.in +++ b/docs/drvvbox.html.in @@ -61,6 +61,11 @@ vbox+ssh://user@example.com/session (remote access, SSH tunnelled) <target dev='fda'/> </disk> + <filesystem type='mount'> + <source dir='/home/user/stuff'/> + <target dir='my-shared-folder'/> + </filesystem> +  <interface type='bridge'> <source bridge='eth0'/> diff --git a/src/vbox/vbox_tmpl.c b/src/vbox/vbox_tmpl.c index 2986f5a..13c324f 100644 --- a/src/vbox/vbox_tmpl.c +++ b/src/vbox/vbox_tmpl.c @@ -2249,6 +2249,7 @@ static char *vboxDomainGetXMLDesc(virDomainPtr dom, int flags) { /* Not supported by libvirt yet */ } else if (device == DeviceType_SharedFolder) { /* Not supported by libvirt yet */ + /* Can VirtualBox really boot from a shared folder? */ } } @@ -2752,6 +2753,67 @@ static char *vboxDomainGetXMLDesc(virDomainPtr dom, int flags) { #endif /* VBOX_API_VERSION >= 3001 */ + /* shared folders */ + vboxArray sharedFolders = VBOX_ARRAY_INITIALIZER; + + def->nfss = 0; + + vboxArrayGet(&sharedFolders, machine, + machine->vtbl->GetSharedFolders); + + if (sharedFolders.count > 0) { + if (VIR_ALLOC_N(def->fss, sharedFolders.count) < 0) { + virReportOOMError(); + goto sharedFoldersCleanup; + } + + for (i = 0; i < sharedFolders.count; i++) { + ISharedFolder *sharedFolder = sharedFolders.items[i]; + PRUnichar *nameUtf16 = NULL; + char *name = NULL; + PRUnichar *hostPathUtf16 = NULL; + char *hostPath = NULL; + PRBool writable = PR_FALSE; + + if (VIR_ALLOC(def->fss[i]) < 0) { + virReportOOMError(); + goto sharedFoldersCleanup; + } + + def->fss[i]->type = VIR_DOMAIN_FS_TYPE_MOUNT; + + sharedFolder->vtbl->GetHostPath(sharedFolder, &hostPathUtf16); + VBOX_UTF16_TO_UTF8(hostPathUtf16, &hostPath); + def->fss[i]->src = strdup(hostPath); + VBOX_UTF8_FREE(hostPath); + VBOX_UTF16_FREE(hostPathUtf16); + + if (def->fss[i]->src == NULL) { + virReportOOMError(); + goto sharedFoldersCleanup; + } + + sharedFolder->vtbl->GetName(sharedFolder, &nameUtf16); + VBOX_UTF16_TO_UTF8(nameUtf16, &name); + def->fss[i]->dst = strdup(name); + VBOX_UTF8_FREE(name); + VBOX_UTF16_FREE(nameUtf16); + + if (def->fss[i]->dst == NULL) { + virReportOOMError(); + goto sharedFoldersCleanup; + } + + sharedFolder->vtbl->GetWritable(sharedFolder, &writable); + def->fss[i]->readonly = !writable; + + ++def->nfss; + } + } + +sharedFoldersCleanup: + vboxArrayRelease(&sharedFolders); + /* dump network cards if present */ def->nnets = 0; /* Get which network cards are enabled */ @@ -4790,6 +4852,38 @@ vboxAttachUSB(virDomainDefPtr def, vboxGlobalData *data, IMachine *machine) } } +static void +vboxAttachSharedFolder(virDomainDefPtr def, vboxGlobalData *data, IMachine *machine) +{ + int i; + PRUnichar *nameUtf16; + PRUnichar *hostPathUtf16; + PRBool writable; + + if (def->nfss == 0) + return; + + for (i = 0; i < def->nfss; i++) { + if (def->fss[i]->type != VIR_DOMAIN_FS_TYPE_MOUNT) + continue; + + VBOX_UTF8_TO_UTF16(def->fss[i]->dst, &nameUtf16); + VBOX_UTF8_TO_UTF16(def->fss[i]->src, &hostPathUtf16); + writable = !def->fss[i]->readonly; + +#if VBOX_API_VERSION < 4000 + machine->vtbl->CreateSharedFolder(machine, nameUtf16, hostPathUtf16, + writable); +#else /* VBOX_API_VERSION >= 4000 */ + machine->vtbl->CreateSharedFolder(machine, nameUtf16, hostPathUtf16, + writable, PR_FALSE); +#endif /* VBOX_API_VERSION >= 4000 */ + + VBOX_UTF16_FREE(nameUtf16); + VBOX_UTF16_FREE(hostPathUtf16); + } +} + static virDomainPtr vboxDomainDefineXML(virConnectPtr conn, const char *xml) { VBOX_OBJECT_CHECK(conn, virDomainPtr, NULL); IMachine *machine = NULL; @@ -4927,6 +5021,7 @@ static virDomainPtr vboxDomainDefineXML(virConnectPtr conn, const char *xml) { vboxAttachVideo(def, machine); vboxAttachDisplay(def, data, machine); vboxAttachUSB(def, data, machine); + vboxAttachSharedFolder(def, data, machine); /* Save the machine settings made till now and close the * session. also free up the mchiid variable used. @@ -5271,6 +5366,34 @@ static int vboxDomainAttachDeviceImpl(virDomainPtr dom, if (dev->data.hostdev->source.subsys.type == VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_USB) { } } + } else if (dev->type == VIR_DOMAIN_DEVICE_FS && + dev->data.fs->type == VIR_DOMAIN_FS_TYPE_MOUNT) { + PRUnichar *nameUtf16; + PRUnichar *hostPathUtf16; + PRBool writable; + + VBOX_UTF8_TO_UTF16(dev->data.fs->dst, &nameUtf16); + VBOX_UTF8_TO_UTF16(dev->data.fs->src, &hostPathUtf16); + writable = !dev->data.fs->readonly; + +#if VBOX_API_VERSION < 4000 + rc = machine->vtbl->CreateSharedFolder(machine, nameUtf16, hostPathUtf16, + writable); +#else /* VBOX_API_VERSION >= 4000 */ + rc = machine->vtbl->CreateSharedFolder(machine, nameUtf16, hostPathUtf16, + writable, PR_FALSE); +#endif /* VBOX_API_VERSION >= 4000 */ + + if (NS_FAILED(rc)) { + vboxError(VIR_ERR_INTERNAL_ERROR, + _("could not attach shared folder '%s', rc=%08x"), + dev->data.fs->dst, (unsigned)rc); + } else { + ret = 0; + } + + VBOX_UTF16_FREE(nameUtf16); + VBOX_UTF16_FREE(hostPathUtf16); } machine->vtbl->SaveSettings(machine); VBOX_RELEASE(machine); @@ -5425,6 +5548,23 @@ static int vboxDomainDetachDevice(virDomainPtr dom, const char *xml) { if (dev->data.hostdev->source.subsys.type == VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_USB) { } } + } else if (dev->type == VIR_DOMAIN_DEVICE_FS && + dev->data.fs->type == VIR_DOMAIN_FS_TYPE_MOUNT) { + PRUnichar *nameUtf16; + + VBOX_UTF8_TO_UTF16(dev->data.fs->dst, &nameUtf16); + + rc = machine->vtbl->RemoveSharedFolder(machine, nameUtf16); + + if (NS_FAILED(rc)) { + vboxError(VIR_ERR_INTERNAL_ERROR, + _("could not detach shared folder '%s', rc=%08x"), + dev->data.fs->dst, (unsigned)rc); + } else { + ret = 0; + } + + VBOX_UTF16_FREE(nameUtf16); } machine->vtbl->SaveSettings(machine); VBOX_RELEASE(machine); -- 1.7.0.4

2 2

[libvirt] [PATCH] xenapi: Improve error reporting in xenapiOpen once again
by Matthias Bolte 29 Oct '11

29 Oct '11

privP->session->error_description is a list and in order to get the complete error message all parts of the list should be concatenated. xenapiSessionErrorHandler does this when its third parameter is NULL. The current code discards all but the first part of the error message resulting in a potentially incomplete error message. This partly reverts 006be75ee214f9b4, that tried to avoid reporting a (null) in the error message. The actual problem is more general in returnErrorFromSession that might return NULL if there is no error. Make sure that returnErrorFromSession return non-NULL always. Also don't skip the last error message part. --- src/xenapi/xenapi_driver.c | 5 +---- src/xenapi/xenapi_utils.c | 4 +++- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/xenapi/xenapi_driver.c b/src/xenapi/xenapi_driver.c index 97da1d1..77bf82d 100644 --- a/src/xenapi/xenapi_driver.c +++ b/src/xenapi/xenapi_driver.c @@ -193,10 +193,7 @@ xenapiOpen (virConnectPtr conn, virConnectAuthPtr auth, return VIR_DRV_OPEN_SUCCESS; } - xenapiSessionErrorHandler(conn, VIR_ERR_AUTH_FAILED, - *privP->session->error_description != NULL ? - *privP->session->error_description : - _("unknown error")); + xenapiSessionErrorHandler(conn, VIR_ERR_AUTH_FAILED, NULL); error: VIR_FREE(username); diff --git a/src/xenapi/xenapi_utils.c b/src/xenapi/xenapi_utils.c index 342ae5b..79fd946 100644 --- a/src/xenapi/xenapi_utils.c +++ b/src/xenapi/xenapi_utils.c @@ -272,12 +272,14 @@ returnErrorFromSession(xen_session *session) { int i; virBuffer buf = VIR_BUFFER_INITIALIZER; - for (i = 0; i < session->error_description_count - 1; i++) { + for (i = 0; i < session->error_description_count; i++) { if (!i) virBufferEscapeString(&buf, "%s", session->error_description[i]); else virBufferEscapeString(&buf, " : %s", session->error_description[i]); } + if (virBufferUse(&buf) < 1) + virBufferAdd(&buf, _("unknown error"), -1); return virBufferContentAndReset(&buf); } -- 1.7.4.1

2 2

[libvirt] [PATCH] util: Fix virUUIDGeneratePseudoRandomBytes
by Ryota Ozaki 29 Oct '11

29 Oct '11

It forgets to move a pointer to a buffer for UUID and as a result fills only the first byte of the buffer. --- src/util/uuid.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/util/uuid.c b/src/util/uuid.c index 0df3ebc..823a2b9 100644 --- a/src/util/uuid.c +++ b/src/util/uuid.c @@ -80,7 +80,7 @@ virUUIDGeneratePseudoRandomBytes(unsigned char *buf, int buflen) { while (buflen > 0) { - *buf = virRandom(256); + *buf++ = virRandom(256); buflen--; } -- 1.7.4.1

2 2