- Devel - libvirt List Archives

[libvirt] [PATCH] LXC: workaround machined uncleaned data with containers running systemd.
by Cédric Bosdonnat 28 Sep '13

28 Sep '13

The problem is described by [0] but its effect on libvirt is that starting a container with a full distro running systemd after having stopped it simply fails. The container cleanup now calls the machined Terminate function to make sure that everything is in order for the next run. [0]: https://bugs.freedesktop.org/show_bug.cgi?id=68370 --- src/Makefile.am | 4 +++- src/lxc/lxc_process.c | 8 ++++++++ src/util/virsystemd.c | 55 +++++++++++++++++++++++++++++++++++++++++++++++++++ src/util/virsystemd.h | 4 ++++ 4 files changed, 70 insertions(+), 1 deletion(-) diff --git a/src/Makefile.am b/src/Makefile.am index 4375ef7..211b42e 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1170,7 +1170,9 @@ EXTRA_DIST += qemu/qemu.conf qemu/libvirtd_qemu.aug \ if WITH_LXC noinst_LTLIBRARIES += libvirt_driver_lxc_impl.la libvirt_driver_lxc_la_SOURCES = -libvirt_driver_lxc_la_LIBADD = libvirt_driver_lxc_impl.la +libvirt_driver_lxc_la_LIBADD = \ + libvirt_driver_lxc_impl.la \ + libvirt_util.la if WITH_DRIVER_MODULES mod_LTLIBRARIES += libvirt_driver_lxc.la libvirt_driver_lxc_la_LIBADD += ../gnulib/lib/libgnu.la diff --git a/src/lxc/lxc_process.c b/src/lxc/lxc_process.c index 4835bd5..f92c613 100644 --- a/src/lxc/lxc_process.c +++ b/src/lxc/lxc_process.c @@ -50,6 +50,7 @@ #include "virstring.h" #include "viratomic.h" #include "virprocess.h" +#include "virsystemd.h" #define VIR_FROM_THIS VIR_FROM_LXC @@ -210,6 +211,13 @@ static void virLXCProcessCleanup(virLXCDriverPtr driver, virCgroupFree(&priv->cgroup); } + /* Get machined to terminate the machine as it may not have cleaned it + * properly. See https://bugs.freedesktop.org/show_bug.cgi?id=68370 for + * the bug we are working around here. + */ + virSystemdTerminateMachine(vm->def->name, "lxc", true); + + /* now that we know it's stopped call the hook if present */ if (virHookPresent(VIR_HOOK_DRIVER_LXC)) { char *xml = virDomainDefFormat(vm->def, 0); diff --git a/src/util/virsystemd.c b/src/util/virsystemd.c index e72b7f0..3320e53 100644 --- a/src/util/virsystemd.c +++ b/src/util/virsystemd.c @@ -242,3 +242,58 @@ cleanup: VIR_FREE(slicename); return ret; } + +int virSystemdTerminateMachine(const char *name, + const char *drivername, + bool privileged) +{ + int ret; + DBusConnection *conn; + char *machinename = NULL; + char *username = NULL; + + ret = virDBusIsServiceEnabled("org.freedesktop.machine1"); + if (ret < 0) + return ret; + + conn = virDBusGetSystemBus(); + + ret = -1; + if (privileged) { + if (virAsprintf(&machinename, "%s-%s", drivername, name) < 0) + goto cleanup; + } else { + if (!(username = virGetUserName(geteuid()))) + goto cleanup; + if (virAsprintf(&machinename, "%s-%s-%s", username, drivername, name) < 0) + goto cleanup; + } + + /* + * The systemd DBus API we're invoking has the + * following signature + * + * TerminateMachine(in s name); + * + * @name a host unique name for the machine. shows up + * in 'ps' listing & similar + */ + + VIR_DEBUG("Attempting to terminate machine via systemd"); + if (virDBusCallMethod(conn, + NULL, + "org.freedesktop.machine1", + "/org/freedesktop/machine1", + "org.freedesktop.machine1.Manager", + "TerminateMachine", + "s", + machinename) < 0) + goto cleanup; + + ret = 0; + +cleanup: + VIR_FREE(username); + VIR_FREE(machinename); + return ret; +} diff --git a/src/util/virsystemd.h b/src/util/virsystemd.h index 414ae5a..6c9c6df 100644 --- a/src/util/virsystemd.h +++ b/src/util/virsystemd.h @@ -38,4 +38,8 @@ int virSystemdCreateMachine(const char *name, bool iscontainer, const char *partition); +int virSystemdTerminateMachine(const char *name, + const char *drivername, + bool privileged); + #endif /* __VIR_SYSTEMD_H__ */ -- 1.8.4

2 1

[libvirt] [PATCH] fchosttest: Run the test only under linux
by Michal Privoznik 28 Sep '13

28 Sep '13

Currently, we have functions to handle fc_host implemented just for linux. On all other platforms an error is thrown. It makes no sense to run the test on those platforms then. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- tests/fchosttest.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/tests/fchosttest.c b/tests/fchosttest.c index 05ff20b..46bd784 100644 --- a/tests/fchosttest.c +++ b/tests/fchosttest.c @@ -163,6 +163,11 @@ mymain(void) { int ret = 0; +#ifndef __linux__ + fputs("Not compiled under linux, skipping this test\n", stderr); + return EXIT_AM_SKIP; +#endif + if (virAsprintf(&fchost_prefix, "%s/%s", abs_srcdir, "fchostdata/fc_host/") < 0) { ret = -1; -- 1.8.1.5

3 2

[libvirt] [PATCH 0/2] Fix a few memory leaks in libvirtd
by Jiri Denemark 27 Sep '13

27 Sep '13

Jiri Denemark (2): qemu: Don't leak reference to virQEMUDriverConfigPtr qemu: Free all driver data in qemuStateCleanup src/qemu/qemu_driver.c | 2 ++ src/qemu/qemu_process.c | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) -- 1.8.3.2

2 4

[libvirt] [PATCH] build: Fix VPATH build error for locking daemon
by Viktor Mihajlovski 27 Sep '13

27 Sep '13

Removed superfluous/wrong srcdir prefix. Signed-off-by: Viktor Mihajlovski <mihajlov(a)linux.vnet.ibm.com> --- src/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Makefile.am b/src/Makefile.am index 4057eda..09311b7 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -196,7 +196,7 @@ BUILT_SOURCES += $(LOCK_PROTOCOL_GENERATED) MAINTAINERCLEANFILES += $(LOCK_PROTOCOL_GENERATED) LOCK_DAEMON_GENERATED = \ - $(srcdir)/locking/lock_daemon_dispatch_stubs.h + locking/lock_daemon_dispatch_stubs.h $(NULL) BUILT_SOURCES += $(LOCK_DAEMON_GENERATED) -- 1.7.9.5

2 1

[libvirt] [PATCH]lxc: don't start container when no root fs found
by Chen Hanxiao 27 Sep '13

27 Sep '13

From: Chen Hanxiao <chenhanxiao(a)cn.fujitsu.com> Currently, if we don't explicitly add root fs for container, libvirt will add one for us implicitly with "/" as src. It would be not safe. Unless user asked for it, we should not assume this. Signed-off-by: Chen Hanxiao <chenhanxiao(a)cn.fujitsu.com> --- src/lxc/lxc_process.c | 29 +++++++---------------------- 1 file changed, 7 insertions(+), 22 deletions(-) diff --git a/src/lxc/lxc_process.c b/src/lxc/lxc_process.c index 4835bd5..4f4a906 100644 --- a/src/lxc/lxc_process.c +++ b/src/lxc/lxc_process.c @@ -911,29 +911,14 @@ virLXCProcessEnsureRootFS(virDomainObjPtr vm) { virDomainFSDefPtr root = virDomainGetRootFilesystem(vm->def); - if (root) + if (root) { return 0; - - if (VIR_ALLOC(root) < 0) - goto error; - - root->type = VIR_DOMAIN_FS_TYPE_MOUNT; - - if (VIR_STRDUP(root->src, "/") < 0 || - VIR_STRDUP(root->dst, "/") < 0) - goto error; - - if (VIR_INSERT_ELEMENT(vm->def->fss, - 0, - vm->def->nfss, - root) < 0) - goto error; - - return 0; - -error: - virDomainFSDefFree(root); - return -1; + } else { + errno = EINVAL; + virReportSystemError(errno, "%s", + _("No root fs found for container")); + return -1; + } } /** -- 1.8.2.1

2 2

[libvirt] [PATCHv2] util: recognize SMB/CIFS filesystems as shared
by Laine Stump 27 Sep '13

27 Sep '13

This should resolve: https://bugzilla.redhat.com/show_bug.cgi?id=1012085 libvirt previously recognized NFS, GFS2, OCFS2, and AFS filesystems as "shared", and thus eligible for exceptions to certain rules/actions about chowning image files before handing them off to a guest. This patch widens the definition of "shared filesystem" to include SMB and CIFS filesystems (aka "Windows file sharing"); both of these use the same protocol, but different drivers so there are different magic numbers for each. --- Change from V1 - also check for CIFS_SUPER_MAGIC, not just SMB_SUPER_MAGIC. src/util/virstoragefile.c | 16 +++++++++++++++- src/util/virstoragefile.h | 2 ++ 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/src/util/virstoragefile.c b/src/util/virstoragefile.c index 0b9cec3..48d5fbb 100644 --- a/src/util/virstoragefile.c +++ b/src/util/virstoragefile.c @@ -1241,6 +1241,12 @@ cleanup: # ifndef AFS_FS_MAGIC # define AFS_FS_MAGIC 0x6B414653 # endif +# ifndef SMB_SUPER_MAGIC +# define SMB_SUPER_MAGIC 0x517B +# endif +# ifndef CIFS_SUPER_MAGIC +# define CIFS_SUPER_MAGIC 0xFF534D42 +# endif int virStorageFileIsSharedFSType(const char *path, @@ -1304,6 +1310,12 @@ int virStorageFileIsSharedFSType(const char *path, if ((fstypes & VIR_STORAGE_FILE_SHFS_AFS) && (sb.f_type == AFS_FS_MAGIC)) return 1; + if ((fstypes & VIR_STORAGE_FILE_SHFS_SMB) && + (sb.f_type == SMB_SUPER_MAGIC)) + return 1; + if ((fstypes & VIR_STORAGE_FILE_SHFS_CIFS) && + (sb.f_type == CIFS_SUPER_MAGIC)) + return 1; return 0; } @@ -1322,7 +1334,9 @@ int virStorageFileIsSharedFS(const char *path) VIR_STORAGE_FILE_SHFS_NFS | VIR_STORAGE_FILE_SHFS_GFS2 | VIR_STORAGE_FILE_SHFS_OCFS | - VIR_STORAGE_FILE_SHFS_AFS); + VIR_STORAGE_FILE_SHFS_AFS | + VIR_STORAGE_FILE_SHFS_SMB | + VIR_STORAGE_FILE_SHFS_CIFS); } int virStorageFileIsClusterFS(const char *path) diff --git a/src/util/virstoragefile.h b/src/util/virstoragefile.h index 1f89839..d5effa4 100644 --- a/src/util/virstoragefile.h +++ b/src/util/virstoragefile.h @@ -112,6 +112,8 @@ enum { VIR_STORAGE_FILE_SHFS_GFS2 = (1 << 1), VIR_STORAGE_FILE_SHFS_OCFS = (1 << 2), VIR_STORAGE_FILE_SHFS_AFS = (1 << 3), + VIR_STORAGE_FILE_SHFS_SMB = (1 << 4), + VIR_STORAGE_FILE_SHFS_CIFS = (1 << 5), }; int virStorageFileIsSharedFS(const char *path); -- 1.7.11.7

2 1

[libvirt] [PATCH] build: fix testsuite building under cygwin
by Eric Blake 27 Sep '13

27 Sep '13

Similar to commit 8f34f19. * tests/Makefile.am (virnetserverclienttest_CFLAGS): Add XDR_CFLAGS. Signed-off-by: Eric Blake <eblake(a)redhat.com> --- Pushing under the build-breaker rule. tests/Makefile.am | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/Makefile.am b/tests/Makefile.am index 777758f..1a7ff4b 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -639,6 +639,7 @@ virnetsockettest_LDADD = $(LDADDS) virnetserverclienttest_SOURCES = \ virnetserverclienttest.c \ testutils.h testutils.c +virnetserverclienttest_CFLAGS = $(XDR_CFLAGS) $(AM_CFLAGS) virnetserverclienttest_LDADD = $(LDADDS) virnetserverclientmock_la_SOURCES = \ -- 1.8.3.1

1 0

[libvirt] [PATCH] rpc: Increase bound limit for virDomainGetJobStats
by Jiri Denemark 27 Sep '13

27 Sep '13

https://bugzilla.redhat.com/show_bug.cgi?id=1012818 Commit 6d7d0b1869ed293e3208d11f375cecea0129dfc5 (in 1.1.2) added bounds checking to virDomainGetJobStats. But even at that time the API was able to return 20 parameters while the limit was set to 16. Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- src/remote/remote_protocol.x | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/remote/remote_protocol.x b/src/remote/remote_protocol.x index 8d17bad..810eeca 100644 --- a/src/remote/remote_protocol.x +++ b/src/remote/remote_protocol.x @@ -230,7 +230,7 @@ const REMOTE_NODE_MEMORY_PARAMETERS_MAX = 64; const REMOTE_DOMAIN_MIGRATE_PARAM_LIST_MAX = 64; /* Upper limit on number of job stats */ -const REMOTE_DOMAIN_JOB_STATS_MAX = 16; +const REMOTE_DOMAIN_JOB_STATS_MAX = 64; /* Upper limit on number of CPU models */ const REMOTE_CONNECT_CPU_MODELS_MAX = 8192; -- 1.8.3.2

2 2

[libvirt] [PATCH] qemu_migrate: Fix assign the same port when migrating concurrently
by Wangyufei (A) 27 Sep '13

27 Sep '13

From: WangYufei <james.wangyufei(a)huawei.com> Date: Fri, 27 Sep 2013 11:53:57 +0800 Subject: [PATCH] qemu_migrate: Fix assign the same port when migrating concurrently When we migrate vms concurrently, there's a chance that libvirtd on destination assign the same port for different migrations, which will lead to migration failed during migration prepare phase on destination. So we change the port increase to atomic operation to solve the problem. Signed-off-by: WangYufei <james.wangyufei(a)huawei.com> --- src/qemu/qemu_migration.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index 3a1aab7..0f496f4 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -57,6 +57,7 @@ #include "virhook.h" #include "virstring.h" #include "virtypedparam.h" +#include "viratomic.h" #define VIR_FROM_THIS VIR_FROM_QEMU @@ -2521,7 +2522,7 @@ qemuMigrationPrepareDirect(virQEMUDriverPtr driver, * to be a correct hostname which refers to the target machine). */ if (uri_in == NULL) { - this_port = QEMUD_MIGRATION_FIRST_PORT + port++; + this_port = QEMUD_MIGRATION_FIRST_PORT + virAtomicIntInc(&port); if (port == QEMUD_MIGRATION_NUM_PORTS) port = 0; /* Get hostname */ @@ -2578,7 +2579,7 @@ qemuMigrationPrepareDirect(virQEMUDriverPtr driver, if (uri->port == 0) { /* Generate a port */ - this_port = QEMUD_MIGRATION_FIRST_PORT + port++; + this_port = QEMUD_MIGRATION_FIRST_PORT + virAtomicIntInc(&port); if (port == QEMUD_MIGRATION_NUM_PORTS) port = 0; -- 1.7.3.1.msysgit.0 Best Regards, -WangYufei

3 3

[libvirt] [libvirt-designer 1/2] Fix typo in error message
by Christophe Fergeau 27 Sep '13

27 Sep '13

--- Pushed under the trivial rule libvirt-designer/libvirt-designer-main.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libvirt-designer/libvirt-designer-main.h b/libvirt-designer/libvirt-designer-main.h index 5e82f8a..9341754 100644 --- a/libvirt-designer/libvirt-designer-main.h +++ b/libvirt-designer/libvirt-designer-main.h @@ -21,7 +21,7 @@ */ #if !defined(__LIBVIRT_DESIGNER_H__) && !defined(LIBVIRT_DESIGNER_BUILD) -#error "Only <libvirt-gdesigner/libvirt-gdesigner.h> can be included directly." +#error "Only <libvirt-designer/libvirt-designer.h> can be included directly." #endif #include <osinfo/osinfo.h> -- 1.8.3.1

2 2