- Devel - libvirt List Archives

[libvirt] [PATCH] maint: tweak use of <a> in HACKING
by Eric Blake 10 Jul '13

10 Jul '13

The previous handling of <a> tags led to some less-than-ideal layout in HACKING (most noticeable on a mid-sentence reference to the valgrind home page). * docs/hacking.html.in: Slight tweaks to <a> tags. * docs/hacking1.xsl: Move <a> handling... * docs/hacking2.xsl: ...here. * HACKING: Regenerate. Signed-off-by: Eric Blake <eblake(a)redhat.com> --- HACKING | 24 +++++++----------------- docs/hacking.html.in | 4 ++-- docs/hacking1.xsl | 10 ++++++++++ docs/hacking2.xsl | 8 -------- 4 files changed, 19 insertions(+), 27 deletions(-) diff --git a/HACKING b/HACKING index a310faa..271ff6c 100644 --- a/HACKING +++ b/HACKING @@ -103,11 +103,8 @@ and run the tests: make syntax-check make -C tests valgrind - - - Valgrind - http://valgrind.org/is a test that checks for memory management issues, such as leaks or use of -uninitialized variables. +Valgrind <http://valgrind.org/> is a test that checks for memory management +issues, such as leaks or use of uninitialized variables. If you encounter any failing tests, the VIR_TEST_DEBUG environment variable may provide extra information to debug the failures. Larger values of @@ -186,11 +183,8 @@ In this instance, it is acceptible to modify the "tests/.valgrind.supp" file in order to add a suppression filter. The filter should be unique enough to not suppress real leaks, but it should be generic enough to cover multiple code paths. The format of the entry can be found in the documentation found at -the - - Valgrind home page. - http://valgrind.org/The following trace was added to "tests/.valgrind.supp" in order to suppress -the warning: +the Valgrind home page <http://valgrind.org/>. The following trace was added +to "tests/.valgrind.supp" in order to suppress the warning: { dlInitMemoryLeak1 @@ -211,10 +205,8 @@ feature or changing the output of a program. There is more on this subject, including lots of links to background reading -on the subject, on - - Richard Jones' guide to working with open source projects - http://et.redhat.com/~rjones/how-to-supply-code-to-open-source-projects/ +on the subject, on Richard Jones' guide to working with open source projects +<http://et.redhat.com/~rjones/how-to-supply-code-to-open-source-projects/>. Code indentation @@ -893,9 +885,7 @@ logic would be better pulled out into a helper function. Although libvirt does not encourage the Linux kernel wind/unwind style of multiple labels, there's a good general discussion of the issue archived at - - KernelTrap - http://kerneltrap.org/node/553/2131 +KernelTrap <http://kerneltrap.org/node/553/2131> When using goto, please use one of these standard labels if it makes sense: diff --git a/docs/hacking.html.in b/docs/hacking.html.in index 904b846..41c8d48 100644 --- a/docs/hacking.html.in +++ b/docs/hacking.html.in @@ -211,7 +211,7 @@ not suppress real leaks, but it should be generic enough to cover multiple code paths. The format of the entry can be found in the documentation found at the - <a href="http://valgrind.org/">Valgrind home page.</a> + <a href="http://valgrind.org/">Valgrind home page</a>. The following trace was added to <code>tests/.valgrind.supp</code> in order to suppress the warning: </p> @@ -236,7 +236,7 @@ There is more on this subject, including lots of links to background reading on the subject, on <a href="http://et.redhat.com/~rjones/how-to-supply-code-to-open-source-projects/"> - Richard Jones' guide to working with open source projects</a> + Richard Jones' guide to working with open source projects</a>. </p> diff --git a/docs/hacking1.xsl b/docs/hacking1.xsl index cdeb3a4..e70b45d 100644 --- a/docs/hacking1.xsl +++ b/docs/hacking1.xsl @@ -27,4 +27,14 @@ <xsl:template match="html:i">'<xsl:apply-templates/>'</xsl:template> <xsl:template match="html:code">"<xsl:apply-templates/>"</xsl:template> + +<xsl:template match="html:a"> +<xsl:text> </xsl:text><xsl:apply-templates/> +<xsl:if test="@href"> + <xsl:text> <</xsl:text><xsl:value-of select="@href"/> + <xsl:text>></xsl:text> +</xsl:if> +</xsl:template> + + </xsl:stylesheet> diff --git a/docs/hacking2.xsl b/docs/hacking2.xsl index 72fa9d3..1c9271f 100644 --- a/docs/hacking2.xsl +++ b/docs/hacking2.xsl @@ -138,12 +138,4 @@ from docs/hacking.html.in! </xsl:template> - -<xsl:template match="html:a"> -<xsl:value-of select="$newline"/><xsl:value-of select="$newline"/> -<xsl:text> </xsl:text><xsl:apply-templates/> -<xsl:value-of select="$newline"/> -<xsl:text> </xsl:text><xsl:value-of select="@href"/> -</xsl:template> - </xsl:stylesheet> -- 1.8.1.4

2 2

[libvirt] ANNOUNCE: libvirt-sandbox "Owami Desert" release 0.2.1
by Daniel P. Berrange 10 Jul '13

10 Jul '13

I pleased to announce the a new public release of libvirt-sandbox, version 0.2.1, is now available for download ftp://libvirt.org/libvirt/sandbox/ The packages are GPG signed with Key fingerprint: DAF3 A6FD B26B 6291 2D0E 8E3F BE86 EBB4 1510 4FDF (4096R) The libvirt-sandbox package provides an API layer on top of libvirt-gobject which facilitates the cration of application sandboxes using virtualization technology. An application sandbox is a virtual machine or container that runs a single application binary, directly from the host OS filesystem. In other words there is no separate guest operating system install to build or manager. At this point in time libvirt-sandbox can create sandboxes using either LXC or KVM, and should in theory be extendable to any libvirt driver. This release has focused entirely on improving the virt-sandbox-service tool Changed in this release: - Requires libvirt-glib >= 0.1.7 - ABI change: Removed GVirSandboxCleaner class - Don't add link in /var/log/journal for image based containers - Don't hold open libvirt connection when displaying service sandbox consoles - Record container UUID in config for service sandboxes - Add missing RPMs deps - Allow custom mounts to be specified to virt-sandbox-service - Fix misc bugs in sandbox creation/deletion - Use 'guest bind' for configuring image based service sandboxes - Allow NIC MAC address to be chosen - Include systemd-initctl.socket in service sandboxes by default to allow libvirt initiated graceful shutdown Thanks to everyone who contributed to this release Regards, Daniel -- |: http://berrange.com -o- http://www.flickr.com/photos/dberrange/ :| |: http://libvirt.org -o- http://virt-manager.org :| |: http://autobuild.org -o- http://search.cpan.org/~danberr/ :| |: http://entangle-photo.org -o- http://live.gnome.org/gtk-vnc :|

1 0

[libvirt] [PATCH] maint: fix typo in qemu error message
by Eric Blake 10 Jul '13

10 Jul '13

Introduced in commit d47eff88. * src/qemu/qemu_driver.c (qemuDomainSetVcpusFlags): Fix spelling. Signed-off-by: Eric Blake <eblake(a)redhat.com> --- Pushed under the trivial rule. src/qemu/qemu_driver.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 1b9ba41..16aa43f 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -4133,7 +4133,7 @@ qemuDomainSetVcpusFlags(virDomainPtr dom, unsigned int nvcpus, if (flags & VIR_DOMAIN_VCPU_GUEST) { if (flags & VIR_DOMAIN_AFFECT_CONFIG) { virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s", - _("chainging of maximum vCPU count isn't supported " + _("changing of maximum vCPU count isn't supported " "via guest agent")); goto endjob; } -- 1.8.1.4

1 0

[libvirt] [PATCH glib] Add support for reading/writing UUID attribute in domain config
by Daniel P. Berrange 10 Jul '13

10 Jul '13

From: "Daniel P. Berrange" <berrange(a)redhat.com> Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- libvirt-gconfig/libvirt-gconfig-domain.c | 33 ++++++++++++++++++++++++++++++++ libvirt-gconfig/libvirt-gconfig-domain.h | 2 ++ 2 files changed, 35 insertions(+) diff --git a/libvirt-gconfig/libvirt-gconfig-domain.c b/libvirt-gconfig/libvirt-gconfig-domain.c index eb97cd5..3c28a4a 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain.c +++ b/libvirt-gconfig/libvirt-gconfig-domain.c @@ -39,6 +39,7 @@ G_DEFINE_TYPE(GVirConfigDomain, gvir_config_domain, GVIR_CONFIG_TYPE_OBJECT); enum { PROP_0, PROP_NAME, + PROP_UUID, PROP_TITLE, PROP_DESCRIPTION, PROP_MEMORY, @@ -58,6 +59,9 @@ static void gvir_config_domain_get_property(GObject *object, case PROP_NAME: g_value_set_string(value, gvir_config_domain_get_name(domain)); break; + case PROP_UUID: + g_value_set_string(value, gvir_config_domain_get_uuid(domain)); + break; case PROP_TITLE: g_value_set_string(value, gvir_config_domain_get_title(domain)); break; @@ -93,6 +97,9 @@ static void gvir_config_domain_set_property(GObject *object, case PROP_NAME: gvir_config_domain_set_name(domain, g_value_get_string(value)); break; + case PROP_UUID: + gvir_config_domain_set_uuid(domain, g_value_get_string(value)); + break; case PROP_TITLE: gvir_config_domain_set_title(domain, g_value_get_string(value)); break; @@ -135,6 +142,14 @@ static void gvir_config_domain_class_init(GVirConfigDomainClass *klass) G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); g_object_class_install_property(object_class, + PROP_UUID, + g_param_spec_string("uuid", + "UUID", + "Domain UUID", + NULL, + G_PARAM_READWRITE | + G_PARAM_STATIC_STRINGS)); + g_object_class_install_property(object_class, PROP_TITLE, g_param_spec_string("title", "Title", @@ -247,6 +262,12 @@ const char *gvir_config_domain_get_name(GVirConfigDomain *domain) "name"); } +const char *gvir_config_domain_get_uuid(GVirConfigDomain *domain) +{ + return gvir_config_object_get_node_content(GVIR_CONFIG_OBJECT(domain), + "uuid"); +} + const char *gvir_config_domain_get_title(GVirConfigDomain *domain) { return gvir_config_object_get_node_content(GVIR_CONFIG_OBJECT(domain), @@ -266,6 +287,18 @@ void gvir_config_domain_set_name(GVirConfigDomain *domain, const char *name) } /** + * gvir_config_domain_set_uuid: + * @domain: a #GVirConfigDomain + * @uuid: (allow-none): + */ +void gvir_config_domain_set_uuid(GVirConfigDomain *domain, const char *uuid) +{ + gvir_config_object_set_node_content(GVIR_CONFIG_OBJECT(domain), + "uuid", uuid); + g_object_notify(G_OBJECT(domain), "uuid"); +} + +/** * gvir_config_domain_set_title: * @domain: a #GVirConfigDomain * @title: (allow-none): title of the domain diff --git a/libvirt-gconfig/libvirt-gconfig-domain.h b/libvirt-gconfig/libvirt-gconfig-domain.h index 4951cf1..6e85374 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain.h +++ b/libvirt-gconfig/libvirt-gconfig-domain.h @@ -105,6 +105,8 @@ GVirConfigDomainVirtType gvir_config_domain_get_virt_type(GVirConfigDomain *doma void gvir_config_domain_set_virt_type(GVirConfigDomain *domain, GVirConfigDomainVirtType type); const char *gvir_config_domain_get_name(GVirConfigDomain *domain); void gvir_config_domain_set_name(GVirConfigDomain *domain, const char *name); +const char *gvir_config_domain_get_uuid(GVirConfigDomain *domain); +void gvir_config_domain_set_uuid(GVirConfigDomain *domain, const char *uuid); const char *gvir_config_domain_get_description(GVirConfigDomain *domain); void gvir_config_domain_set_description(GVirConfigDomain *domain, const char *description); guint64 gvir_config_domain_get_memory(GVirConfigDomain *domain); -- 1.8.3.1

2 1

[libvirt] [PATCH] daemon: Fix command example in libvirtd.sasl
by Cole Robinson 10 Jul '13

10 Jul '13

sasldblistusers2 doesn't have a '-a' option --- daemon/libvirtd.sasl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/daemon/libvirtd.sasl b/daemon/libvirtd.sasl index bfa056f..5e2528d 100644 --- a/daemon/libvirtd.sasl +++ b/daemon/libvirtd.sasl @@ -27,5 +27,5 @@ mech_list: digest-md5 # If using digest-md5 for username/passwds, then this is the file # containing the passwds. Use 'saslpasswd2 -a libvirt [username]' -# to add entries, and 'sasldblistusers2 -a libvirt' to browse it +# to add entries, and 'sasldblistusers2 -f [sasldb_path]' to browse it sasldb_path: /etc/libvirt/passwd.db -- 1.8.3.1

2 2

[libvirt] [PATCH] LXC: Ensure security context is set when mounting images
by Daniel P. Berrange 10 Jul '13

10 Jul '13

From: "Daniel P. Berrange" <berrange(a)redhat.com> When setting up filesystems backed by block devices or file images, the SELinux mount options must be used to ensure the correct context is set Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- src/lxc/lxc_container.c | 36 +++++++++++++++++++++--------------- 1 file changed, 21 insertions(+), 15 deletions(-) diff --git a/src/lxc/lxc_container.c b/src/lxc/lxc_container.c index 389c336..84069c0 100644 --- a/src/lxc/lxc_container.c +++ b/src/lxc/lxc_container.c @@ -109,7 +109,8 @@ struct __lxc_child_argv { }; static int lxcContainerMountFSBlock(virDomainFSDefPtr fs, - const char *srcprefix); + const char *srcprefix, + const char *sec_mount_options); /* @@ -546,7 +547,8 @@ cleanup: static int lxcContainerPrepareRoot(virDomainDefPtr def, - virDomainFSDefPtr root) + virDomainFSDefPtr root, + const char *sec_mount_options) { char *dst; char *tmp; @@ -578,7 +580,7 @@ static int lxcContainerPrepareRoot(virDomainDefPtr def, tmp = root->dst; root->dst = dst; - if (lxcContainerMountFSBlock(root, "") < 0) { + if (lxcContainerMountFSBlock(root, "", sec_mount_options) < 0) { root->dst = tmp; VIR_FREE(dst); return -1; @@ -1084,7 +1086,8 @@ lxcContainerMountDetectFilesystem(const char *src ATTRIBUTE_UNUSED, */ static int lxcContainerMountFSBlockAuto(virDomainFSDefPtr fs, int fsflags, - const char *src) + const char *src, + const char *sec_mount_options) { FILE *fp = NULL; int ret = -1; @@ -1161,8 +1164,9 @@ retry: STREQ(type, "*")) gotStar = true; - VIR_DEBUG("Trying mount %s with %s", src, type); - if (mount(src, fs->dst, type, fsflags, NULL) < 0) { + VIR_DEBUG("Trying mount '%s' on '%s' with '%s' opts '%s'", + src, fs->dst, type, sec_mount_options); + if (mount(src, fs->dst, type, fsflags, sec_mount_options) < 0) { /* These errnos indicate a bogus filesystem type for * the image we have, so skip to the next type */ @@ -1212,7 +1216,8 @@ cleanup: * probing for filesystem type */ static int lxcContainerMountFSBlockHelper(virDomainFSDefPtr fs, - const char *src) + const char *src, + const char *sec_mount_options) { int fsflags = 0; int ret = -1; @@ -1232,9 +1237,9 @@ static int lxcContainerMountFSBlockHelper(virDomainFSDefPtr fs, goto cleanup; if (format) { - VIR_DEBUG("Mount '%s' on '%s' with detected format '%s'", - src, fs->dst, format); - if (mount(src, fs->dst, format, fsflags, NULL) < 0) { + VIR_DEBUG("Mount '%s' on '%s' with detected format '%s' opts '%s'", + src, fs->dst, format, sec_mount_options); + if (mount(src, fs->dst, format, fsflags, sec_mount_options) < 0) { virReportSystemError(errno, _("Failed to mount device %s to %s as %s"), src, fs->dst, format); @@ -1242,7 +1247,7 @@ static int lxcContainerMountFSBlockHelper(virDomainFSDefPtr fs, } ret = 0; } else { - ret = lxcContainerMountFSBlockAuto(fs, fsflags, src); + ret = lxcContainerMountFSBlockAuto(fs, fsflags, src, sec_mount_options); } cleanup: @@ -1252,7 +1257,8 @@ cleanup: static int lxcContainerMountFSBlock(virDomainFSDefPtr fs, - const char *srcprefix) + const char *srcprefix, + const char *sec_mount_options) { char *src = NULL; int ret = -1; @@ -1262,7 +1268,7 @@ static int lxcContainerMountFSBlock(virDomainFSDefPtr fs, goto cleanup; } - ret = lxcContainerMountFSBlockHelper(fs, src); + ret = lxcContainerMountFSBlockHelper(fs, src, sec_mount_options); VIR_DEBUG("Done mounting filesystem ret=%d", ret); @@ -1324,7 +1330,7 @@ static int lxcContainerMountFS(virDomainFSDefPtr fs, return -1; break; case VIR_DOMAIN_FS_TYPE_BLOCK: - if (lxcContainerMountFSBlock(fs, "/.oldroot") < 0) + if (lxcContainerMountFSBlock(fs, "/.oldroot", sec_mount_options) < 0) return -1; break; case VIR_DOMAIN_FS_TYPE_RAM: @@ -1801,7 +1807,7 @@ static int lxcContainerSetupPivotRoot(virDomainDefPtr vmDef, goto cleanup; /* Ensure the root filesystem is mounted */ - if (lxcContainerPrepareRoot(vmDef, root) < 0) + if (lxcContainerPrepareRoot(vmDef, root, sec_mount_options) < 0) goto cleanup; /* Gives us a private root, leaving all parent OS mounts on /.oldroot */ -- 1.8.3.1

2 1

[libvirt] libvirt: xen error
by varun bhatnagar 10 Jul '13

10 Jul '13

Hi, I am trying to install xen and provide libvrit support to it but while installing at some point of time it tries to connect to GIT repository and creates a clone but I am behind firewall and it is getting timed out.... :( I am pasting a screenshot below. Can anyone of you please help me out with this one. // Varun

4 4

[libvirt] Load Test leads to Libvirt crash
by SHREE DUTH AWASTHI 10 Jul '13

10 Jul '13

Hi All, Can you please help us in solving this issue. Version used : libvirt-0.10.2 Note: We could reproduce the same crash using the latest libvirt version 1.0.5 Your inputs would be of great help to us. Please find the backtrace below (gdb) bt #0 0x00007f91aac6551b in remoteClientCloseFunc (client=<value optimized out>, reason=1, opaque=0x1cd0170) at remote/remote_driver.c:340 #1 0x00007f91aac86f32 in virNetClientCloseLocked (client=0x1cd0990) at rpc/virnetclient.c:688 #2 0x00007f91aac89881 in virNetClientIncomingEvent (sock=0x1cd0b50, events=9, opaque=0x1cd0990) at rpc/virnetclient.c:1859 #3 0x00007f91aab8fab5 in virEventPollDispatchHandles () at util/event_poll.c:485 #4 virEventPollRunOnce () at util/event_poll.c:632 #5 0x00007f91aab8e6e5 in virEventRunDefaultImpl () at util/event.c:247 #6 0x000000000040dd72 in ?? () #7 0x00007f91aaba1f36 in virThreadHelper (data=<value optimized out>) at util/threads-pthread.c:161 #8 0x00007f91a8d3b6ea in start_thread () from /lib64/libpthread.so.0 #9 0x00007f91a80fcabd in clone () from /lib64/libc.so.6 (gdb) Thanking you in anticipation. Thanks and Regards, Shree Duth Awasthi.

2 2

[libvirt] [PATCH] LXC: Fix some error reporting in filesystem setup
by Daniel P. Berrange 09 Jul '13

09 Jul '13

From: "Daniel P. Berrange" <berrange(a)redhat.com> A couple of places in LXC setup for filesystems did not do a "goto cleanup" after reporting errors. While fixing this, also add in many more debug statements to aid troubleshooting Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- src/lxc/lxc_container.c | 23 ++++++++++++++++++----- src/lxc/lxc_controller.c | 6 ++++++ 2 files changed, 24 insertions(+), 5 deletions(-) diff --git a/src/lxc/lxc_container.c b/src/lxc/lxc_container.c index 595c0f2..389c336 100644 --- a/src/lxc/lxc_container.c +++ b/src/lxc/lxc_container.c @@ -551,6 +551,8 @@ static int lxcContainerPrepareRoot(virDomainDefPtr def, char *dst; char *tmp; + VIR_DEBUG("Prepare root %d", root->type); + if (root->type == VIR_DOMAIN_FS_TYPE_MOUNT) return 0; @@ -1230,7 +1232,8 @@ static int lxcContainerMountFSBlockHelper(virDomainFSDefPtr fs, goto cleanup; if (format) { - VIR_DEBUG("Mount %s with detected format %s", src, format); + VIR_DEBUG("Mount '%s' on '%s' with detected format '%s'", + src, fs->dst, format); if (mount(src, fs->dst, format, fsflags, NULL) < 0) { virReportSystemError(errno, _("Failed to mount device %s to %s as %s"), @@ -1339,12 +1342,12 @@ static int lxcContainerMountFS(virDomainFSDefPtr fs, virReportError(VIR_ERR_INTERNAL_ERROR, _("Unexpected filesystem type %s"), virDomainFSTypeToString(fs->type)); - break; + return -1; default: virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("Cannot mount filesystem type %s"), virDomainFSTypeToString(fs->type)); - break; + return -1; } return 0; } @@ -1885,18 +1888,26 @@ static int lxcContainerResolveSymlinks(virDomainDefPtr vmDef) char *newroot; size_t i; + VIR_DEBUG("Resolving filesystem symlinks"); for (i = 0; i < vmDef->nfss; i++) { + VIR_DEBUG("Res %zu", i); virDomainFSDefPtr fs = vmDef->fss[i]; - if (!fs->src) + if (!fs->src) { + VIR_DEBUG("Skip"); continue; - if (virFileResolveAllLinks(fs->src, &newroot) < 0) + } + VIR_DEBUG("Resolving '%s'", fs->src); + if (virFileResolveAllLinks(fs->src, &newroot) < 0) { + VIR_DEBUG("Failed to resolve symlink at %s", fs->src); return -1; + } VIR_DEBUG("Resolved '%s' to %s", fs->src, newroot); VIR_FREE(fs->src); fs->src = newroot; } + VIR_DEBUG("Resolved all filesystem symlinks"); return 0; } @@ -2020,9 +2031,11 @@ static int lxcContainerChild(void *data) goto cleanup; } + VIR_DEBUG("Resolve t"); if (lxcContainerResolveSymlinks(vmDef) < 0) goto cleanup; + VIR_DEBUG("Setting up pivot"); if (lxcContainerSetupPivotRoot(vmDef, root, argv->ttyPaths, argv->nttyPaths, argv->securityDriver) < 0) diff --git a/src/lxc/lxc_controller.c b/src/lxc/lxc_controller.c index ef35c05..831dff8 100644 --- a/src/lxc/lxc_controller.c +++ b/src/lxc/lxc_controller.c @@ -450,6 +450,8 @@ static int virLXCControllerSetupLoopDevices(virLXCControllerPtr ctrl) size_t i; int ret = -1; + VIR_DEBUG("Setting up loop devices for filesystems"); + for (i = 0; i < ctrl->def->nfss; i++) { virDomainFSDefPtr fs = ctrl->def->fss[i]; int fd; @@ -492,9 +494,12 @@ static int virLXCControllerSetupLoopDevices(virLXCControllerPtr ctrl) virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("fs driver %s is not supported"), virDomainFSDriverTypeTypeToString(fs->fsdriver)); + goto cleanup; } } + VIR_DEBUG("Setting up loop devices for disks"); + for (i = 0; i < ctrl->def->ndisks; i++) { virDomainDiskDefPtr disk = ctrl->def->disks[i]; int fd; @@ -548,6 +553,7 @@ static int virLXCControllerSetupLoopDevices(virLXCControllerPtr ctrl) virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("disk driver %s is not supported"), disk->driverName); + goto cleanup; } } -- 1.8.3.1

2 1

[libvirt] [PATCH] LXC: Set default driver for image backed filesystems
by Daniel P. Berrange 09 Jul '13

09 Jul '13

From: "Daniel P. Berrange" <berrange(a)redhat.com> If no explicit driver is set for an image backed filesystem, set it to use the loop driver (if raw) or nbd driver (if non-raw) Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- src/lxc/lxc_controller.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/lxc/lxc_controller.c b/src/lxc/lxc_controller.c index 568227f..ef35c05 100644 --- a/src/lxc/lxc_controller.c +++ b/src/lxc/lxc_controller.c @@ -457,6 +457,14 @@ static int virLXCControllerSetupLoopDevices(virLXCControllerPtr ctrl) if (fs->type != VIR_DOMAIN_FS_TYPE_FILE) continue; + if (fs->fsdriver == VIR_DOMAIN_FS_DRIVER_TYPE_DEFAULT) { + if (fs->format == VIR_STORAGE_FILE_RAW || + fs->format == VIR_STORAGE_FILE_NONE) + fs->fsdriver = VIR_DOMAIN_FS_DRIVER_TYPE_LOOP; + else + fs->fsdriver = VIR_DOMAIN_FS_DRIVER_TYPE_NBD; + } + if (fs->fsdriver == VIR_DOMAIN_FS_DRIVER_TYPE_LOOP) { if (fs->format != VIR_STORAGE_FILE_RAW && fs->format != VIR_STORAGE_FILE_NONE) { -- 1.8.3.1

2 1