- Devel - libvirt List Archives

[libvirt] [PATCH v1 0/4] Time setting and getting in qemu guests
by Michal Privoznik 14 Feb '14

14 Feb '14

This can be used all, but 'virsh domtime --sync $dom' is dependent on this qemu patch: http://lists.nongnu.org/archive/html/qemu-devel/2014-01/msg04293.html Anyway, once all the patches are merged, users can simply do: virsh resume $dom virsh domtime --sync $dom and their guest time won't be off after the resume. Michal Privoznik (4): Introduce virDomain{Get,Set}Time APIs remote: Implement remote{Get,Set}Time virsh: Expose virDomain{Get,Set}Time qemu: Implement virDomain{Get,Set}Time daemon/remote.c | 35 +++++++++++ include/libvirt/libvirt.h.in | 13 +++++ src/access/viraccessperm.c | 2 +- src/access/viraccessperm.h | 6 ++ src/driver.h | 13 +++++ src/libvirt.c | 91 +++++++++++++++++++++++++++++ src/libvirt_public.syms | 6 ++ src/qemu/qemu_agent.c | 81 ++++++++++++++++++++++++++ src/qemu/qemu_agent.h | 6 ++ src/qemu/qemu_driver.c | 135 +++++++++++++++++++++++++++++++++++++++++++ src/remote/remote_driver.c | 32 ++++++++++ src/remote/remote_protocol.x | 31 +++++++++- src/remote_protocol-structs | 16 +++++ tools/virsh-domain-monitor.c | 126 ++++++++++++++++++++++++++++++++++++++++ tools/virsh.pod | 16 +++++ 15 files changed, 607 insertions(+), 2 deletions(-) -- 1.8.5.3

5 18

[libvirt] [PATCH 0/2] Test secret XML parsing and formatting
by Ján Tomko 14 Feb '14

14 Feb '14

Ján Tomko (2): docs: remove <auth> from secret XML format Add tests for secret XML parsing docs/formatsecret.html.in | 2 - tests/Makefile.am | 12 ++- tests/secretschematest | 10 +++ tests/secretxml2xmlin/ephemeral-usage-volume.xml | 7 ++ tests/secretxml2xmlin/usage-ceph.xml | 7 ++ tests/secretxml2xmlin/usage-iscsi.xml | 7 ++ tests/secretxml2xmlin/usage-volume.xml | 7 ++ tests/secretxml2xmltest.c | 98 ++++++++++++++++++++++++ 8 files changed, 147 insertions(+), 3 deletions(-) create mode 100755 tests/secretschematest create mode 100644 tests/secretxml2xmlin/ephemeral-usage-volume.xml create mode 100644 tests/secretxml2xmlin/usage-ceph.xml create mode 100644 tests/secretxml2xmlin/usage-iscsi.xml create mode 100644 tests/secretxml2xmlin/usage-volume.xml create mode 100644 tests/secretxml2xmltest.c -- 1.8.3.2

2 4

[libvirt] [PATCH glib] Fix symfile checks in VPATH build
by Daniel P. Berrange 14 Feb '14

14 Feb '14

The check-symfile and check-symsorting rules were not taking $(srcdir) into account when accessing the symfile paths. Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- build-aux/check-symsorting.pl | 3 +-- libvirt-gconfig/Makefile.am | 4 ++-- libvirt-glib/Makefile.am | 4 ++-- libvirt-gobject/Makefile.am | 4 ++-- 4 files changed, 7 insertions(+), 8 deletions(-) Pushed as a build-breaker fix. diff --git a/build-aux/check-symsorting.pl b/build-aux/check-symsorting.pl index 470247c..31b6059 100755 --- a/build-aux/check-symsorting.pl +++ b/build-aux/check-symsorting.pl @@ -19,10 +19,9 @@ use strict; use warnings; -die "syntax: $0 SRCDIR SYMFILE..." unless int(@ARGV) >= 2; +die "syntax: $0 SYMFILE..." unless int(@ARGV) >= 1; my $ret = 0; -my $srcdir = shift; my $incomment = 0; my $name; foreach my $symfile (@ARGV) { diff --git a/libvirt-gconfig/Makefile.am b/libvirt-gconfig/Makefile.am index e32d222..d328ca7 100644 --- a/libvirt-gconfig/Makefile.am +++ b/libvirt-gconfig/Makefile.am @@ -224,14 +224,14 @@ libvirt-gconfig-enum-types.c: $(GCONFIG_HEADER_FILES) libvirt-gconfig-enum-types # rule for libosvirt-gconfig.la. However, checking symbols relies on Linux ELF layout if WITH_LINUX check-symfile: libvirt-gconfig.sym libvirt-gconfig-1.0.la - $(AM_V_GEN)$(PERL) $(top_srcdir)/build-aux/check-symfile.pl libvirt-gconfig.sym \ + $(AM_V_GEN)$(PERL) $(top_srcdir)/build-aux/check-symfile.pl $(srcdir)/libvirt-gconfig.sym \ .libs/libvirt-gconfig-1.0.so else ! WITH_LINUX check-symfile: endif ! WITH_LINUX check-symsorting: $(AM_V_GEN)$(PERL) $(top_srcdir)/build-aux/check-symsorting.pl \ - $(srcdir) libvirt-gconfig.sym + $(srcdir)/libvirt-gconfig.sym check-local: check-symfile check-symsorting -include $(INTROSPECTION_MAKEFILE) diff --git a/libvirt-glib/Makefile.am b/libvirt-glib/Makefile.am index 15b9917..a48cfbb 100644 --- a/libvirt-glib/Makefile.am +++ b/libvirt-glib/Makefile.am @@ -41,14 +41,14 @@ libvirt_glib_1_0_la_LDFLAGS = \ # rule for libosvirt-glib.la. However, checking symbols relies on Linux ELF layout if WITH_LINUX check-symfile: libvirt-glib.sym libvirt-glib-1.0.la - $(AM_V_GEN)$(PERL) $(top_srcdir)/build-aux/check-symfile.pl libvirt-glib.sym \ + $(AM_V_GEN)$(PERL) $(top_srcdir)/build-aux/check-symfile.pl $(srcdir)/libvirt-glib.sym \ .libs/libvirt-glib-1.0.so else ! WITH_LINUX check-symfile: endif ! WITH_LINUX check-symsorting: $(AM_V_GEN)$(PERL) $(top_srcdir)/build-aux/check-symsorting.pl \ - $(srcdir) libvirt-glib.sym + $(srcdir)/libvirt-glib.sym check-local: check-symfile check-symsorting -include $(INTROSPECTION_MAKEFILE) diff --git a/libvirt-gobject/Makefile.am b/libvirt-gobject/Makefile.am index b6b2a5d..516c10f 100644 --- a/libvirt-gobject/Makefile.am +++ b/libvirt-gobject/Makefile.am @@ -124,14 +124,14 @@ CLEANFILES = $(BUILT_SOURCES) # rule for libosvirt-gobject.la. However, checking symbols relies on Linux ELF layout if WITH_LINUX check-symfile: libvirt-gobject.sym libvirt-gobject-1.0.la - $(AM_V_GEN)$(PERL) $(top_srcdir)/build-aux/check-symfile.pl libvirt-gobject.sym \ + $(AM_V_GEN)$(PERL) $(top_srcdir)/build-aux/check-symfile.pl $(srcdir)/libvirt-gobject.sym \ .libs/libvirt-gobject-1.0.so else ! WITH_LINUX check-symfile: endif ! WITH_LINUX check-symsorting: $(AM_V_GEN)$(PERL) $(top_srcdir)/build-aux/check-symsorting.pl \ - $(srcdir) libvirt-gobject.sym + $(srcdir)/libvirt-gobject.sym check-local: check-symfile check-symsorting -include $(INTROSPECTION_MAKEFILE) -- 1.8.5.3

1 0

[libvirt] [PATCH] Forgot to add lxcconf2xmldata to dist.
by Cédric Bosdonnat 14 Feb '14

14 Feb '14

--- tests/Makefile.am | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/Makefile.am b/tests/Makefile.am index 0718a69..9bb61ca 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -72,6 +72,7 @@ EXTRA_DIST = \ domainsnapshotxml2xmlout \ fchostdata \ interfaceschemadata \ + lxcconf2xmldata \ lxcxml2xmldata \ lxcxml2xmloutdata \ networkschematest \ -- 1.8.5.2

2 1

[libvirt] [PATCH] lxc: Add virCgroupSetOwner()
by Daniel P. Berrange 14 Feb '14

14 Feb '14

From: Richard Weinberger <richard(a)nod.at> Add a new helper function to change the permissions of a control group. This function is needed for user namespaces, we need to chmod() the cgroup to the initial uid/gid such that systemd is allowed to use the cgroup. Only the systemd controller is made accessible to the container. Others must remain read-only since it is generally not safe to delegate resource controller write access to unprivileged processes. Signed-off-by: Richard Weinberger <richard(a)nod.at> --- src/libvirt_private.syms | 1 + src/lxc/lxc_cgroup.c | 9 ++++++++ src/util/vircgroup.c | 54 ++++++++++++++++++++++++++++++++++++++++++++++++ src/util/vircgroup.h | 5 +++++ 4 files changed, 69 insertions(+) diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 0b28bac..cfa9f75 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -1056,6 +1056,7 @@ virCgroupSetMemory; virCgroupSetMemoryHardLimit; virCgroupSetMemorySoftLimit; virCgroupSetMemSwapHardLimit; +virCgroupSetOwner; virCgroupSupportsCpuBW; diff --git a/src/lxc/lxc_cgroup.c b/src/lxc/lxc_cgroup.c index cc0d5e8..0d0d9c0 100644 --- a/src/lxc/lxc_cgroup.c +++ b/src/lxc/lxc_cgroup.c @@ -484,6 +484,15 @@ virCgroupPtr virLXCCgroupCreate(virDomainDefPtr def) &cgroup) < 0) goto cleanup; + /* setup control group permissions for user namespace */ + if (def->idmap.uidmap) { + if (virCgroupSetOwner(cgroup, + def->idmap.uidmap[0].target, + def->idmap.gidmap[0].target, + (1 << VIR_CGROUP_CONTROLLER_SYSTEMD))) + goto cleanup; + } + cleanup: return cgroup; } diff --git a/src/util/vircgroup.c b/src/util/vircgroup.c index a6d60c5..2dc6986 100644 --- a/src/util/vircgroup.c +++ b/src/util/vircgroup.c @@ -3253,6 +3253,60 @@ cleanup: } +int virCgroupSetOwner(virCgroupPtr cgroup, + uid_t uid, + gid_t gid, + int controllers) +{ + size_t i; + + for (i = 0; i < VIR_CGROUP_CONTROLLER_LAST; i++) { + char *base, *entry; + DIR *dh; + struct dirent *de; + + if (!((1 << i) & controllers)) + continue; + + if (!cgroup->controllers[i].mountPoint) + continue; + + if (virAsprintf(&base, "%s%s", cgroup->controllers[i].mountPoint, + cgroup->controllers[i].placement) < 0) { + virReportOOMError(); + return -1; + } + + dh = opendir(base); + while ((de = readdir(dh)) != NULL) { + if (STREQ(de->d_name, ".") || + STREQ(de->d_name, "..")) + continue; + + if (virAsprintf(&entry, "%s/%s", base, de->d_name) < 0) { + VIR_FREE(base); + virReportOOMError(); + } + + if (chown(entry, uid, gid) < 0) + virReportSystemError(errno, _("cannot chown '%s' to (%u, %u)"), + entry, uid, gid); + + VIR_FREE(entry); + } + closedir(dh); + + if (chown(base, uid, gid) < 0) + virReportSystemError(errno, _("cannot chown '%s' to (%u, %u)"), + base, uid, gid); + + VIR_FREE(base); + } + + return 0; +} + + /** * virCgroupSupportsCpuBW(): * Check whether the host supports CFS bandwidth. diff --git a/src/util/vircgroup.h b/src/util/vircgroup.h index a70eb18..38d94f3 100644 --- a/src/util/vircgroup.h +++ b/src/util/vircgroup.h @@ -225,4 +225,9 @@ int virCgroupIsolateMount(virCgroupPtr group, bool virCgroupSupportsCpuBW(virCgroupPtr cgroup); +int virCgroupSetOwner(virCgroupPtr cgroup, + uid_t uid, + gid_t gid, + int controllers); + #endif /* __VIR_CGROUP_H__ */ -- 1.8.5.3

6 15

[libvirt] [PATCHv3 0/2] Support IPv6 in port allocator
by Ján Tomko 14 Feb '14

14 Feb '14

v1: Support IPv6 in port allocator https://www.redhat.com/archives/libvir-list/2013-October/msg00007.html v2: https://www.redhat.com/archives/libvir-list/2013-October/msg01313.html bind to v4 and v6 separately v3: fix the embarrasing bug of hardcoding AF_INET anyway added a test that mocks a v4-only system even on systems with IPv6 compiled in Ján Tomko (2): Split out bind() from virPortAllocatorAcquire Support IPv6 in port allocator src/util/virportallocator.c | 106 +++++++++++++++++++++++++++++++------------ tests/virportallocatortest.c | 68 +++++++++++++++++++++++++-- 2 files changed, 143 insertions(+), 31 deletions(-) -- 1.8.3.2

3 5

[libvirt] Destroying a suspended LXC domain
by Richard Weinberger 14 Feb '14

14 Feb '14

Hi! If we suspend a LXC domain libvirt freezes all tasks in the cgroup using the process freezer. Upon destroy libvirt tries to kill all tasks using SIGTERM and later SIGKILL, but as they are frozen the tasks are unkillable. This seems to confuse libvirt, all tasks remain but libvirt forgets the domain. Here a small example: ---cut--- lxc-host1:/etc # /opt/libvirt-dev/bin/virsh domstate my3rdcontainer paused lxc-host1:/etc # /opt/libvirt-dev/bin/virsh destroy my3rdcontainer error: Failed to destroy domain my3rdcontainer error: internal error: Some processes refused to die lxc-host1:/etc # ps fax ... 2118 ? Dsl 0:00 /opt/libvirt-dev/lib/libvirt_lxc --name my3rdcontainer --console 19 --security=none --handshake 22 --backgr 2128 ? Ds 0:00 \_ /sbin/init 2152 ? Ds 0:00 \_ /usr/lib/systemd/systemd-journald 2171 ? Ds 0:00 \_ /bin/dbus-daemon --system --address=systemd: --nofork --nopidfile --systemd-activation 2174 ? Ds 0:00 \_ /usr/lib/systemd/systemd-logind 2189 ? Dsl 0:00 \_ /usr/sbin/rsyslogd -n 2778 ? Ds 0:00 \_ /usr/sbin/cron -n 2782 pts/0 Ds+ 0:00 \_ /sbin/agetty --noclear -s console 115200 38400 9600 2786 ? Ds 0:00 \_ /usr/sbin/sshd -D ... ---cut--- I can think of three options to deal with that. a) Refuse to destroy a suspended LXC domain b) Implicitly resume it upon destroy c) Send a SIGKILL to each task and then thaw all tasks using the process freezer. If the task is woken up the it sees immediately the pending SIGKILL and dies. I'd vote for c) because I want to destroy a LXC domain without resuming it. I.e. I want to kill it to avoid any further IO from the already suspended domain. What do you think? I'd volunteer for a patch. :) Thanks, //richard

4 3

[libvirt] [PATCH] [RFC] lxc: Remove !priv->cgroup case
by Richard Weinberger 14 Feb '14

14 Feb '14

Currently we enforce that every container has a cgroup. So we can delete these two !priv->cgroup branches. Signed-off-by: Richard Weinberger <richard(a)nod.at> --- Hi! Maybe I miss something but I think we can delete these two !priv->cgroup branches. If virLXCCgroupCreate() returns NULL the LXC controller exists. Thanks, //richard --- src/lxc/lxc_process.c | 30 +++++++++--------------------- 1 file changed, 9 insertions(+), 21 deletions(-) diff --git a/src/lxc/lxc_process.c b/src/lxc/lxc_process.c index ed729f6..f75d353 100644 --- a/src/lxc/lxc_process.c +++ b/src/lxc/lxc_process.c @@ -203,10 +203,8 @@ static void virLXCProcessCleanup(virLXCDriverPtr driver, virDomainConfVMNWFilterTeardown(vm); - if (priv->cgroup) { - virCgroupRemove(priv->cgroup); - virCgroupFree(&priv->cgroup); - } + virCgroupRemove(priv->cgroup); + 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 @@ -697,23 +695,13 @@ int virLXCProcessStop(virLXCDriverPtr driver, VIR_FREE(vm->def->seclabels[0]->imagelabel); } - if (priv->cgroup) { - rc = virCgroupKillPainfully(priv->cgroup); - if (rc < 0) - return -1; - if (rc > 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("Some processes refused to die")); - return -1; - } - } else { - /* If cgroup doesn't exist, just try cleaning up the - * libvirt_lxc process */ - if (virProcessKillPainfully(vm->pid, true) < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("Processes %d refused to die"), (int)vm->pid); - return -1; - } + rc = virCgroupKillPainfully(priv->cgroup); + if (rc < 0) + return -1; + if (rc > 0) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("Some processes refused to die")); + return -1; } virLXCProcessCleanup(driver, vm, reason); -- 1.8.4.5

2 2

[libvirt] [PATCH] lxc: Don't shadow global symbol "link"
by Peter Krempa 14 Feb '14

14 Feb '14

Yet another variable name frowned upon by older compilers. Introduced in commit b73c029d. --- src/lxc/lxc_native.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/src/lxc/lxc_native.c b/src/lxc/lxc_native.c index 2cf479d..663e29c 100644 --- a/src/lxc/lxc_native.c +++ b/src/lxc/lxc_native.c @@ -334,7 +334,7 @@ lxcFstabWalkCallback(const char* name, virConfValuePtr value, void * data) static virDomainNetDefPtr lxcCreateNetDef(const char *type, - const char *link, + const char *linkdev, const char *mac, const char *flag, const char *macvlanmode) @@ -357,18 +357,18 @@ lxcCreateNetDef(const char *type, net->mac = macAddr; if (STREQ(type, "veth")) { - if (!link) + if (!linkdev) goto error; net->type = VIR_DOMAIN_NET_TYPE_BRIDGE; - if (VIR_STRDUP(net->data.bridge.brname, link) < 0) + if (VIR_STRDUP(net->data.bridge.brname, linkdev) < 0) goto error; } else if (STREQ(type, "macvlan")) { net->type = VIR_DOMAIN_NET_TYPE_DIRECT; - if (!link || VIR_STRDUP(net->data.direct.linkdev, link) < 0) + if (!linkdev || VIR_STRDUP(net->data.direct.linkdev, linkdev) < 0) goto error; if (!macvlanmode || STREQ(macvlanmode, "private")) @@ -411,7 +411,7 @@ lxcCreateHostdevDef(int mode, int type, const char *data) static int lxcAddNetworkDefinition(virDomainDefPtr def, const char *type, - const char *link, + const char *linkdev, const char *mac, const char *flag, const char *macvlanmode, @@ -428,14 +428,14 @@ lxcAddNetworkDefinition(virDomainDefPtr def, isPhys = STREQ(type, "phys"); isVlan = STREQ(type, "vlan"); if (type != NULL && (isPhys || isVlan)) { - if (!link) { + if (!linkdev) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("Missing 'link' attribute for NIC")); goto error; } if (!(hostdev = lxcCreateHostdevDef(VIR_DOMAIN_HOSTDEV_MODE_CAPABILITIES, VIR_DOMAIN_HOSTDEV_CAPS_TYPE_NET, - link))) + linkdev))) goto error; /* This still requires the user to manually setup the vlan interface @@ -443,7 +443,7 @@ lxcAddNetworkDefinition(virDomainDefPtr def, if (isVlan && vlanid) { VIR_FREE(hostdev->source.caps.u.net.iface); if (virAsprintf(&hostdev->source.caps.u.net.iface, - "%s.%s", link, vlanid) < 0) + "%s.%s", linkdev, vlanid) < 0) goto error; } @@ -451,7 +451,7 @@ lxcAddNetworkDefinition(virDomainDefPtr def, goto error; def->hostdevs[def->nhostdevs - 1] = hostdev; } else { - if (!(net = lxcCreateNetDef(type, link, mac, flag, macvlanmode))) + if (!(net = lxcCreateNetDef(type, linkdev, mac, flag, macvlanmode))) goto error; if (VIR_EXPAND_N(def->nets, def->nnets, 1) < 0) -- 1.8.5.3

2 2

[libvirt] [PATCHv6 0/8] Gluster snapshot series
by Peter Krempa 14 Feb '14

14 Feb '14

This version was tweaked according to Dan's and Eric's feedback. Peter Krempa (8): conf: Move qemuDiskGetActualType to virDomainDiskGetActualType conf: Move qemuSnapshotDiskGetActualType to virDomainSnapshotDiskGetActualType storage: Add file storage APIs in the default storage driver storage: add file functions for local and block files storage: Add storage file backends for gluster qemu: Switch snapshot deletion to the new API functions qemu: snapshot: Use new APIs to detect presence of existing storage files qemu: snapshot: Add support for external active snapshots on gluster cfg.mk | 1 + docs/formatsnapshot.html.in | 5 +- src/conf/domain_conf.c | 10 ++ src/conf/domain_conf.h | 1 + src/conf/snapshot_conf.c | 7 ++ src/conf/snapshot_conf.h | 2 + src/libvirt_private.syms | 2 + src/qemu/qemu_command.c | 8 +- src/qemu/qemu_command.h | 9 ++ src/qemu/qemu_conf.c | 17 --- src/qemu/qemu_conf.h | 4 - src/qemu/qemu_driver.c | 198 ++++++++++++++++++++++++++-------- src/storage/storage_backend.c | 44 ++++++++ src/storage/storage_backend.h | 41 +++++++ src/storage/storage_backend_fs.c | 48 +++++++++ src/storage/storage_backend_fs.h | 2 + src/storage/storage_backend_gluster.c | 139 ++++++++++++++++++++++++ src/storage/storage_backend_gluster.h | 1 + src/storage/storage_driver.c | 145 +++++++++++++++++++++++++ src/storage/storage_driver.h | 32 +++++- tests/Makefile.am | 3 + 21 files changed, 644 insertions(+), 75 deletions(-) -- 1.8.5.3

3 19