- Devel - libvirt List Archives

[libvirt] [PATCH] bhyve: add console support through nmdm device
by Roman Bogorodskiy 17 Mar '14

17 Mar '14

Some additional info on nmdm devices that probably doesn't fit commit message. Man page: http://www.freebsd.org/cgi/man.cgi?query=nmdm&sektion=4 To use this device, we pass device name like '/dev/nmdmNA' to bhyve. Device is created automatically when bhyve accesses it. The pair device name is always '/dev/nmdmNB' which is used to provide console support. Even though this patch doesn't directly depend on virFDStreamOpenPTY() addition patch: https://www.redhat.com/archives/libvir-list/2014-March/msg00582.html it's not much useful without it because of mangled console output. Roman Bogorodskiy (1): bhyve: add console support through nmdm device src/bhyve/bhyve_command.c | 34 ++++++++++++++++++++++ src/bhyve/bhyve_driver.c | 69 ++++++++++++++++++++++++++++++++++++++++++++ src/conf/domain_audit.c | 1 + src/conf/domain_conf.c | 12 +++++++- src/conf/domain_conf.h | 1 + src/qemu/qemu_monitor_json.c | 1 + 6 files changed, 117 insertions(+), 1 deletion(-) -- 1.8.4.2

2 3

[libvirt] [PATCH 1/2] bhyve: add support for virtio block devices
by Roman Bogorodskiy 17 Mar '14

17 Mar '14

--- src/bhyve/bhyve_command.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/src/bhyve/bhyve_command.c b/src/bhyve/bhyve_command.c index b9df6d0..2ec97fc 100644 --- a/src/bhyve/bhyve_command.c +++ b/src/bhyve/bhyve_command.c @@ -216,6 +216,7 @@ static int bhyveBuildDiskArgStr(const virDomainDef *def, virCommandPtr cmd) { virDomainDiskDefPtr disk; + const char *bus_type; if (def->ndisks != 1) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", @@ -225,7 +226,14 @@ bhyveBuildDiskArgStr(const virDomainDef *def, virCommandPtr cmd) disk = def->disks[0]; - if (disk->bus != VIR_DOMAIN_DISK_BUS_SATA) { + switch (disk->bus) { + case VIR_DOMAIN_DISK_BUS_SATA: + bus_type = "ahci-hd"; + break; + case VIR_DOMAIN_DISK_BUS_VIRTIO: + bus_type = "virtio-blk"; + break; + default: virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("unsupported disk bus type")); return -1; @@ -244,7 +252,7 @@ bhyveBuildDiskArgStr(const virDomainDef *def, virCommandPtr cmd) } virCommandAddArg(cmd, "-s"); - virCommandAddArgFormat(cmd, "2:0,ahci-hd,%s", disk->src); + virCommandAddArgFormat(cmd, "2:0,%s,%s", bus_type, disk->src); return 0; } -- 1.8.4.2

2 5

[libvirt] [PATCH] Enforce attribute check of the virRegister functions
by Pavel Hrdina 17 Mar '14

17 Mar '14

Signed-off-by: Pavel Hrdina <phrdina(a)redhat.com> --- src/driver.h | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/driver.h b/src/driver.h index fbfaac4..d106d59 100644 --- a/src/driver.h +++ b/src/driver.h @@ -2132,15 +2132,15 @@ struct _virNWFilterDriver { * TODO: also need ways to (des)activate a given driver * lookup based on the URI given in a virConnectOpen(ReadOnly) */ -int virRegisterDriver(virDriverPtr); -int virRegisterNetworkDriver(virNetworkDriverPtr); -int virRegisterInterfaceDriver(virInterfaceDriverPtr); -int virRegisterStorageDriver(virStorageDriverPtr); -int virRegisterNodeDeviceDriver(virNodeDeviceDriverPtr); -int virRegisterSecretDriver(virSecretDriverPtr); -int virRegisterNWFilterDriver(virNWFilterDriverPtr); +int virRegisterDriver(virDriverPtr) ATTRIBUTE_RETURN_CHECK; +int virRegisterNetworkDriver(virNetworkDriverPtr) ATTRIBUTE_RETURN_CHECK; +int virRegisterInterfaceDriver(virInterfaceDriverPtr) ATTRIBUTE_RETURN_CHECK; +int virRegisterStorageDriver(virStorageDriverPtr) ATTRIBUTE_RETURN_CHECK; +int virRegisterNodeDeviceDriver(virNodeDeviceDriverPtr) ATTRIBUTE_RETURN_CHECK; +int virRegisterSecretDriver(virSecretDriverPtr) ATTRIBUTE_RETURN_CHECK; +int virRegisterNWFilterDriver(virNWFilterDriverPtr) ATTRIBUTE_RETURN_CHECK; # ifdef WITH_LIBVIRTD -int virRegisterStateDriver(virStateDriverPtr); +int virRegisterStateDriver(virStateDriverPtr) ATTRIBUTE_RETURN_CHECK; # endif void virDriverModuleInitialize(const char *defmoddir); void *virDriverLoadModule(const char *name); -- 1.8.3.1

2 2

[libvirt] [PATCH v3 0/2] Introduce max_anonymous_clients
by Michal Privoznik 17 Mar '14

17 Mar '14

https://bugzilla.redhat.com/show_bug.cgi?id=981729 So far we can limit how many clients are connected, how many are waiting in accept() line but we could not control the count of accepted but not authenticated yet. diff to v2: -Dan's suggestions worked in Michal Privoznik (2): virNetServer: Introduce unauth clients counter daemon: Introduce max_anonymous_clients daemon/libvirtd-config.c | 4 +- daemon/libvirtd-config.h | 1 + daemon/libvirtd.aug | 1 + daemon/libvirtd.c | 1 + daemon/libvirtd.conf | 6 ++- daemon/remote.c | 21 +++++---- daemon/test_libvirtd.aug.in | 3 +- src/locking/lock_daemon.c | 2 +- src/lxc/lxc_controller.c | 2 +- src/rpc/virnetserver.c | 108 ++++++++++++++++++++++++++++++++++++++++---- src/rpc/virnetserver.h | 4 ++ 11 files changed, 130 insertions(+), 23 deletions(-) -- 1.9.0

2 7

[libvirt] [PATCH] bhyve: implement nodeGetInfo()
by Roman Bogorodskiy 17 Mar '14

17 Mar '14

Add bhyveNodeGetInfo() which is a simple wrapper around nodeGetInfo() from src/nodeinfo.c. --- src/bhyve/bhyve_driver.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/src/bhyve/bhyve_driver.c b/src/bhyve/bhyve_driver.c index 9dbb299..cb790de 100644 --- a/src/bhyve/bhyve_driver.c +++ b/src/bhyve/bhyve_driver.c @@ -601,6 +601,16 @@ bhyveNodeGetMemoryStats(virConnectPtr conn, } static int +bhyveNodeGetInfo(virConnectPtr conn, + virNodeInfoPtr nodeinfo) +{ + if (virNodeGetInfoEnsureACL(conn) < 0) + return -1; + + return nodeGetInfo(nodeinfo); +} + +static int bhyveStateCleanup(void) { VIR_DEBUG("bhyve state cleanup"); @@ -703,6 +713,7 @@ static virDriver bhyveDriver = { .domainIsPersistent = bhyveDomainIsPersistent, /* 1.2.2 */ .nodeGetCPUStats = bhyveNodeGetCPUStats, /* 1.2.2 */ .nodeGetMemoryStats = bhyveNodeGetMemoryStats, /* 1.2.2 */ + .nodeGetInfo = bhyveNodeGetInfo, /* 1.2.3 */ }; -- 1.8.4.2

2 2

[libvirt] [PATCH] Add parameter to wait for lock in file locking APIs
by Nehal J Wani 17 Mar '14

17 Mar '14

Our current pidfile acquire APis (virPidFileAcquire) simply return -1 upon failure to acquire a lock. This patch adds a parameter 'bool waitForLock' which instructs the APIs if we want to make it block and wait for the lock or not. --- Based on Daniel's comments on: https://www.redhat.com/archives/libvir-list/2014-March/msg00841.html daemon/libvirtd.c | 2 +- src/locking/lock_daemon.c | 4 ++-- src/util/virfile.c | 14 +++++++++----- src/util/virfile.h | 2 +- src/util/virlockspace.c | 6 +++--- src/util/virpidfile.c | 6 ++++-- src/util/virpidfile.h | 2 ++ 7 files changed, 22 insertions(+), 14 deletions(-) diff --git a/daemon/libvirtd.c b/daemon/libvirtd.c index a471b3b..27c4fff 100644 --- a/daemon/libvirtd.c +++ b/daemon/libvirtd.c @@ -1369,7 +1369,7 @@ int main(int argc, char **argv) { umask(old_umask); /* Try to claim the pidfile, exiting if we can't */ - if ((pid_file_fd = virPidFileAcquirePath(pid_file, getpid())) < 0) { + if ((pid_file_fd = virPidFileAcquirePath(pid_file, false, getpid())) < 0) { ret = VIR_DAEMON_ERR_PIDFILE; goto cleanup; } diff --git a/src/locking/lock_daemon.c b/src/locking/lock_daemon.c index e047751..7dc4292 100644 --- a/src/locking/lock_daemon.c +++ b/src/locking/lock_daemon.c @@ -1020,7 +1020,7 @@ virLockDaemonPostExecRestart(const char *state_file, /* Re-claim PID file now as we will not be daemonizing */ if (pid_file && - (*pid_file_fd = virPidFileAcquirePath(pid_file, getpid())) < 0) + (*pid_file_fd = virPidFileAcquirePath(pid_file, false, getpid())) < 0) goto cleanup; if (!(lockDaemon = virLockDaemonNewPostExecRestart(object, privileged))) @@ -1382,7 +1382,7 @@ int main(int argc, char **argv) { } /* If we have a pidfile set, claim it now, exiting if already taken */ - if ((pid_file_fd = virPidFileAcquirePath(pid_file, getpid())) < 0) { + if ((pid_file_fd = virPidFileAcquirePath(pid_file, false, getpid())) < 0) { ret = VIR_LOCK_DAEMON_ERR_PIDFILE; goto cleanup; } diff --git a/src/util/virfile.c b/src/util/virfile.c index 6da564b..a4a4827 100644 --- a/src/util/virfile.c +++ b/src/util/virfile.c @@ -339,13 +339,14 @@ virFileWrapperFdFree(virFileWrapperFdPtr wfd) * @shared: type of lock to acquire * @start: byte offset to start lock * @len: length of lock (0 to acquire entire remaining file from @start) + * @waitForLock: wait for previously held lock or not * * Attempt to acquire a lock on the file @fd. If @shared * is true, then a shared lock will be acquired, * otherwise an exclusive lock will be acquired. If * the lock cannot be acquired, an error will be - * returned. This will not wait to acquire the lock if - * another process already holds it. + * returned. If @waitForLock is true, this will wait + * for the lock if another process has already acquired it. * * The lock will be released when @fd is closed. The lock * will also be released if *any* other open file descriptor @@ -356,7 +357,7 @@ virFileWrapperFdFree(virFileWrapperFdPtr wfd) * * Returns 0 on success, or -errno otherwise */ -int virFileLock(int fd, bool shared, off_t start, off_t len) +int virFileLock(int fd, bool shared, off_t start, off_t len, bool waitForLock) { struct flock fl = { .l_type = shared ? F_RDLCK : F_WRLCK, @@ -365,7 +366,9 @@ int virFileLock(int fd, bool shared, off_t start, off_t len) .l_len = len, }; - if (fcntl(fd, F_SETLK, &fl) < 0) + int cmd = waitForLock ? F_SETLKW : F_SETLK; + + if (fcntl(fd, cmd, &fl) < 0) return -errno; return 0; @@ -402,7 +405,8 @@ int virFileUnlock(int fd, off_t start, off_t len) int virFileLock(int fd ATTRIBUTE_UNUSED, bool shared ATTRIBUTE_UNUSED, off_t start ATTRIBUTE_UNUSED, - off_t len ATTRIBUTE_UNUSED) + off_t len ATTRIBUTE_UNUSED, + bool waitForLock ATTRIBUTE_UNUSED) { return -ENOSYS; } diff --git a/src/util/virfile.h b/src/util/virfile.h index 20baf6f..302b74f 100644 --- a/src/util/virfile.h +++ b/src/util/virfile.h @@ -97,7 +97,7 @@ int virFileWrapperFdClose(virFileWrapperFdPtr dfd); void virFileWrapperFdFree(virFileWrapperFdPtr dfd); -int virFileLock(int fd, bool shared, off_t start, off_t len); +int virFileLock(int fd, bool shared, off_t start, off_t len, bool waitForLock); int virFileUnlock(int fd, off_t start, off_t len); typedef int (*virFileRewriteFunc)(int fd, void *opaque); diff --git a/src/util/virlockspace.c b/src/util/virlockspace.c index 90a39bb..a187e1e 100644 --- a/src/util/virlockspace.c +++ b/src/util/virlockspace.c @@ -82,7 +82,7 @@ static void virLockSpaceResourceFree(virLockSpaceResourcePtr res) if (res->flags & VIR_LOCK_SPACE_ACQUIRE_SHARED) { /* We must upgrade to an exclusive lock to ensure * no one else still has it before trying to delete */ - if (virFileLock(res->fd, false, 0, 1) < 0) { + if (virFileLock(res->fd, false, 0, 1, false) < 0) { VIR_DEBUG("Could not upgrade shared lease to exclusive, not deleting"); } else { if (unlink(res->path) < 0 && @@ -155,7 +155,7 @@ virLockSpaceResourceNew(virLockSpacePtr lockspace, goto error; } - if (virFileLock(res->fd, shared, 0, 1) < 0) { + if (virFileLock(res->fd, shared, 0, 1, false) < 0) { if (errno == EACCES || errno == EAGAIN) { virReportError(VIR_ERR_RESOURCE_BUSY, _("Lockspace resource '%s' is locked"), @@ -202,7 +202,7 @@ virLockSpaceResourceNew(virLockSpacePtr lockspace, goto error; } - if (virFileLock(res->fd, shared, 0, 1) < 0) { + if (virFileLock(res->fd, shared, 0, 1, false) < 0) { if (errno == EACCES || errno == EAGAIN) { virReportError(VIR_ERR_RESOURCE_BUSY, _("Lockspace resource '%s' is locked"), diff --git a/src/util/virpidfile.c b/src/util/virpidfile.c index 298d57c..28db24c 100644 --- a/src/util/virpidfile.c +++ b/src/util/virpidfile.c @@ -372,6 +372,7 @@ cleanup: } int virPidFileAcquirePath(const char *path, + bool waitForLock, pid_t pid) { int fd = -1; @@ -405,7 +406,7 @@ int virPidFileAcquirePath(const char *path, return -1; } - if (virFileLock(fd, false, 0, 1) < 0) { + if (virFileLock(fd, false, 0, 1, waitForLock) < 0) { virReportSystemError(errno, _("Failed to acquire pid file '%s'"), path); @@ -448,6 +449,7 @@ int virPidFileAcquirePath(const char *path, int virPidFileAcquire(const char *dir, const char *name, + bool waitForLock, pid_t pid) { int rc = 0; @@ -463,7 +465,7 @@ int virPidFileAcquire(const char *dir, goto cleanup; } - rc = virPidFileAcquirePath(pidfile, pid); + rc = virPidFileAcquirePath(pidfile, waitForLock, pid); cleanup: VIR_FREE(pidfile); diff --git a/src/util/virpidfile.h b/src/util/virpidfile.h index 3194a89..2720206 100644 --- a/src/util/virpidfile.h +++ b/src/util/virpidfile.h @@ -56,9 +56,11 @@ int virPidFileDelete(const char *dir, int virPidFileAcquirePath(const char *path, + bool waitForLock, pid_t pid) ATTRIBUTE_RETURN_CHECK; int virPidFileAcquire(const char *dir, const char *name, + bool waitForLock, pid_t pid) ATTRIBUTE_RETURN_CHECK; int virPidFileReleasePath(const char *path, -- 1.7.1

3 2

[libvirt] get information about weighted instances
by sahid 17 Mar '14

17 Mar '14

Greetings, There is a new field I would like to add in the return of the command "vcpuinfo" to get the current "cpu shares" of a domain. The aim is to help managing weighted instances. Avoiding to look at the domain xml to compare instances. VCPU: 0 CPU: 3 State: running CPU time: 4811.3s CPU Affinity: yyyy CPU Shares: 2048 I would like to know if this solution make sens for the community? and if yes I could be work on it. The real aim at the end of this is to add the ability to weight instances in real time, like we can do with the command "vcpupin". Does it makes sense? Best, Sahid.

2 1

[libvirt] [PATCH] Fix mistakes in checking return values
by Daniel P. Berrange 17 Mar '14

17 Mar '14

Thre was a syntax error in checking virRegisterStateDriver in the remote driver, and bogus checking of a void return type of virDomainConfNWFilterRegister in nwfilter. Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- src/nwfilter/nwfilter_driver.c | 3 +-- src/remote/remote_driver.c | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) Pushed as a build break fix. diff --git a/src/nwfilter/nwfilter_driver.c b/src/nwfilter/nwfilter_driver.c index 228794d..8ce2b7d 100644 --- a/src/nwfilter/nwfilter_driver.c +++ b/src/nwfilter/nwfilter_driver.c @@ -720,7 +720,6 @@ int nwfilterRegister(void) { return -1; if (virRegisterStateDriver(&stateDriver) < 0) return -1; - if (virDomainConfNWFilterRegister(&domainNWFilterDriver) < 0) - return -1; + virDomainConfNWFilterRegister(&domainNWFilterDriver); return 0; } diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c index c9711bb..e85f34d 100644 --- a/src/remote/remote_driver.c +++ b/src/remote/remote_driver.c @@ -7840,7 +7840,7 @@ remoteRegister(void) if (virRegisterNWFilterDriver(&nwfilter_driver) < 0) return -1; #ifdef WITH_LIBVIRTD - if (virRegisterStateDriver(&state_driver) == -1) < 0) + if (virRegisterStateDriver(&state_driver) < 0) return -1; #endif -- 1.8.5.3

1 0

[libvirt] [PATCH] spec: move some dirs into appropriate subpackages
by Michael Chapman 17 Mar '14

17 Mar '14

This commit moves a few directories into more appropriate subpackages. In a few cases a directory is owned by two subpackages, however this is OK as long as the permissions and ownership for the directory are consistent between them. - %{_sysconfdir}/libvirt/qemu/ Used by the qemu and network drivers. When building with separate driver modules, this directory is only owned by l-d-d-network. l-d-d-qemu has a hard dependency on l-d-d-network, which means this directory is created with the correct permissions and ownership, however it's clearer if both subpackages own the directory independently. - %{_sysconfdir}/libvirt/nwfilter/ Used by the nwfilter driver only. This directory is currently always owned by libvirt-daemon. This commit moves it into l-d-d-nwfilter when building with separate driver modules. - %{_localstatedir}/run/libvirt/network/ Used by the network and nwfilter drivers. When building without separate driver modules, this directory is should be owned by libvirt-daemon only if either of these drivers are enabled. When building with separate driver modules, this directory should be owned by l-d-d-nwfilter in addition to l-d-d-network. - %{_datadir}/libvirt/networks/ and %{_datadir}/libvirt/networks/default.xml Used only by the %post scriptlet in libvirt-daemon-config-network. Signed-off-by: Michael Chapman <mike(a)very.puzzling.org> --- libvirt.spec.in | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/libvirt.spec.in b/libvirt.spec.in index 014fe5d..ac71db0 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -1837,10 +1837,6 @@ exit 0 %dir %attr(0700, root, root) %{_sysconfdir}/libvirt/ - %if %{with_nwfilter} -%dir %attr(0700, root, root) %{_sysconfdir}/libvirt/nwfilter/ - %endif - %if %{with_systemd} %{_unitdir}/libvirtd.service %{_unitdir}/virtlockd.service @@ -1903,16 +1899,21 @@ exit 0 %{_mandir}/man8/virtlockd.8* %if ! %{with_driver_modules} - %if %{with_network} + %if %{with_network} || %{with_qemu} %dir %attr(0700, root, root) %{_sysconfdir}/libvirt/qemu/ + %endif + %if %{with_network} || %{with_nwfilter} +%ghost %dir %{_localstatedir}/run/libvirt/network/ + %endif + %if %{with_network} %dir %attr(0700, root, root) %{_sysconfdir}/libvirt/qemu/networks/ %dir %attr(0700, root, root) %{_sysconfdir}/libvirt/qemu/networks/autostart -%dir %{_datadir}/libvirt/networks/ -%{_datadir}/libvirt/networks/default.xml -%ghost %dir %{_localstatedir}/run/libvirt/network/ %dir %attr(0700, root, root) %{_localstatedir}/lib/libvirt/network/ %dir %attr(0755, root, root) %{_localstatedir}/lib/libvirt/dnsmasq/ %endif + %if %{with_nwfilter} +%dir %attr(0700, root, root) %{_sysconfdir}/libvirt/nwfilter/ + %endif %if %{with_storage_disk} %attr(0755, root, root) %{_libexecdir}/libvirt_parthelper %endif @@ -1958,6 +1959,8 @@ exit 0 %if %{with_network} %files daemon-config-network %defattr(-, root, root) +%dir %{_datadir}/libvirt/networks/ +%{_datadir}/libvirt/networks/default.xml %endif %if %{with_nwfilter} @@ -1979,8 +1982,6 @@ exit 0 %dir %attr(0700, root, root) %{_sysconfdir}/libvirt/qemu/ %dir %attr(0700, root, root) %{_sysconfdir}/libvirt/qemu/networks/ %dir %attr(0700, root, root) %{_sysconfdir}/libvirt/qemu/networks/autostart -%dir %{_datadir}/libvirt/networks/ -%{_datadir}/libvirt/networks/default.xml %ghost %dir %{_localstatedir}/run/libvirt/network/ %dir %attr(0700, root, root) %{_localstatedir}/lib/libvirt/network/ %dir %attr(0755, root, root) %{_localstatedir}/lib/libvirt/dnsmasq/ @@ -1996,6 +1997,8 @@ exit 0 %if %{with_nwfilter} %files daemon-driver-nwfilter %defattr(-, root, root) +%dir %attr(0700, root, root) %{_sysconfdir}/libvirt/nwfilter/ +%ghost %dir %{_localstatedir}/run/libvirt/network/ %{_libdir}/%{name}/connection-driver/libvirt_driver_nwfilter.so %endif @@ -2015,6 +2018,7 @@ exit 0 %if %{with_qemu} %files daemon-driver-qemu %defattr(-, root, root) +%dir %attr(0700, root, root) %{_sysconfdir}/libvirt/qemu/ %dir %attr(0700, root, root) %{_localstatedir}/log/libvirt/qemu/ %config(noreplace) %{_sysconfdir}/libvirt/qemu.conf %config(noreplace) %{_sysconfdir}/libvirt/qemu-lockd.conf -- 1.8.5.3

2 1

[libvirt] [PATCH 1/1] Fix issue found by coverity and cleanup
by Pavel Hrdina 17 Mar '14

17 Mar '14

Coverity found an issue in lxc_driver and uml_driver that we don't check the return value of register functions. I've also updated all other places and unify the way we check the return value. Signed-off-by: Pavel Hrdina <phrdina(a)redhat.com> --- src/bhyve/bhyve_driver.c | 6 ++++-- src/interface/interface_backend_netcf.c | 3 ++- src/lxc/lxc_driver.c | 6 ++++-- src/network/bridge_driver.c | 3 ++- src/nwfilter/nwfilter_driver.c | 9 ++++++--- src/qemu/qemu_driver.c | 6 ++++-- src/remote/remote_driver.c | 24 ++++++++++++++++-------- src/secret/secret_driver.c | 6 ++++-- src/storage/storage_driver.c | 3 ++- src/uml/uml_driver.c | 6 ++++-- 10 files changed, 48 insertions(+), 24 deletions(-) diff --git a/src/bhyve/bhyve_driver.c b/src/bhyve/bhyve_driver.c index 9dbb299..f1ed510 100644 --- a/src/bhyve/bhyve_driver.c +++ b/src/bhyve/bhyve_driver.c @@ -715,7 +715,9 @@ static virStateDriver bhyveStateDriver = { int bhyveRegister(void) { - virRegisterDriver(&bhyveDriver); - virRegisterStateDriver(&bhyveStateDriver); + if (virRegisterDriver(&bhyveDriver) < 0) + return -1; + if (virRegisterStateDriver(&bhyveStateDriver) < 0) + return -1; return 0; } diff --git a/src/interface/interface_backend_netcf.c b/src/interface/interface_backend_netcf.c index b4c1fe9..98ce83b 100644 --- a/src/interface/interface_backend_netcf.c +++ b/src/interface/interface_backend_netcf.c @@ -1194,6 +1194,7 @@ int netcfIfaceRegister(void) { _("failed to register netcf interface driver")); return -1; } - virRegisterStateDriver(&interfaceStateDriver); + if (virRegisterStateDriver(&interfaceStateDriver) < 0) + return -1; return 0; } diff --git a/src/lxc/lxc_driver.c b/src/lxc/lxc_driver.c index 0ab1ba2..27c27d8 100644 --- a/src/lxc/lxc_driver.c +++ b/src/lxc/lxc_driver.c @@ -5767,7 +5767,9 @@ static virStateDriver lxcStateDriver = { int lxcRegister(void) { - virRegisterDriver(&lxcDriver); - virRegisterStateDriver(&lxcStateDriver); + if (virRegisterDriver(&lxcDriver) < 0) + return -1; + if (virRegisterStateDriver(&lxcStateDriver) < 0) + return -1; return 0; } diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c index c797f8f..181541e 100644 --- a/src/network/bridge_driver.c +++ b/src/network/bridge_driver.c @@ -3232,7 +3232,8 @@ static virStateDriver networkStateDriver = { int networkRegister(void) { if (virRegisterNetworkDriver(&networkDriver) < 0) return -1; - virRegisterStateDriver(&networkStateDriver); + if (virRegisterStateDriver(&networkStateDriver) < 0) + return -1; return 0; } diff --git a/src/nwfilter/nwfilter_driver.c b/src/nwfilter/nwfilter_driver.c index 2e89d07..228794d 100644 --- a/src/nwfilter/nwfilter_driver.c +++ b/src/nwfilter/nwfilter_driver.c @@ -716,8 +716,11 @@ static virDomainConfNWFilterDriver domainNWFilterDriver = { int nwfilterRegister(void) { - virRegisterNWFilterDriver(&nwfilterDriver); - virRegisterStateDriver(&stateDriver); - virDomainConfNWFilterRegister(&domainNWFilterDriver); + if (virRegisterNWFilterDriver(&nwfilterDriver) < 0) + return -1; + if (virRegisterStateDriver(&stateDriver) < 0) + return -1; + if (virDomainConfNWFilterRegister(&domainNWFilterDriver) < 0) + return -1; return 0; } diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 89f443f..fc382a5 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -16796,7 +16796,9 @@ static virStateDriver qemuStateDriver = { }; int qemuRegister(void) { - virRegisterDriver(&qemuDriver); - virRegisterStateDriver(&qemuStateDriver); + if (virRegisterDriver(&qemuDriver) < 0) + return -1; + if (virRegisterStateDriver(&qemuStateDriver) < 0) + return -1; return 0; } diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c index 955465a..c9711bb 100644 --- a/src/remote/remote_driver.c +++ b/src/remote/remote_driver.c @@ -7825,15 +7825,23 @@ remoteRegister(void) { remoteDriver = &remote_driver; - if (virRegisterDriver(&remote_driver) == -1) return -1; - if (virRegisterNetworkDriver(&network_driver) == -1) return -1; - if (virRegisterInterfaceDriver(&interface_driver) == -1) return -1; - if (virRegisterStorageDriver(&storage_driver) == -1) return -1; - if (virRegisterNodeDeviceDriver(&node_device_driver) == -1) return -1; - if (virRegisterSecretDriver(&secret_driver) == -1) return -1; - if (virRegisterNWFilterDriver(&nwfilter_driver) == -1) return -1; + if (virRegisterDriver(&remote_driver) < 0) + return -1; + if (virRegisterNetworkDriver(&network_driver) < 0) + return -1; + if (virRegisterInterfaceDriver(&interface_driver) < 0) + return -1; + if (virRegisterStorageDriver(&storage_driver) < 0) + return -1; + if (virRegisterNodeDeviceDriver(&node_device_driver) < 0) + return -1; + if (virRegisterSecretDriver(&secret_driver) < 0) + return -1; + if (virRegisterNWFilterDriver(&nwfilter_driver) < 0) + return -1; #ifdef WITH_LIBVIRTD - if (virRegisterStateDriver(&state_driver) == -1) return -1; + if (virRegisterStateDriver(&state_driver) == -1) < 0) + return -1; #endif return 0; diff --git a/src/secret/secret_driver.c b/src/secret/secret_driver.c index 9f7f946..5cb6391 100644 --- a/src/secret/secret_driver.c +++ b/src/secret/secret_driver.c @@ -1194,7 +1194,9 @@ static virStateDriver stateDriver = { int secretRegister(void) { - virRegisterSecretDriver(&secretDriver); - virRegisterStateDriver(&stateDriver); + if (virRegisterSecretDriver(&secretDriver) < 0) + return -1; + if (virRegisterStateDriver(&stateDriver) < 0) + return -1; return 0; } diff --git a/src/storage/storage_driver.c b/src/storage/storage_driver.c index 7dbff6c..466ceba 100644 --- a/src/storage/storage_driver.c +++ b/src/storage/storage_driver.c @@ -2696,7 +2696,8 @@ int storageRegister(void) { if (virRegisterStorageDriver(&storageDriver) < 0) return -1; - virRegisterStateDriver(&stateDriver); + if (virRegisterStateDriver(&stateDriver) < 0) + return -1; return 0; } diff --git a/src/uml/uml_driver.c b/src/uml/uml_driver.c index 3496e52..8ddf181 100644 --- a/src/uml/uml_driver.c +++ b/src/uml/uml_driver.c @@ -2909,7 +2909,9 @@ static virStateDriver umlStateDriver = { }; int umlRegister(void) { - virRegisterDriver(&umlDriver); - virRegisterStateDriver(&umlStateDriver); + if (virRegisterDriver(&umlDriver) < 0) + return -1; + if (virRegisterStateDriver(&umlStateDriver) < 0) + return -1; return 0; } -- 1.8.3.1

2 3

Re: [libvirt] Zombie process after open libvirt connection
by Carlos Rodrigues 17 Mar '14

17 Mar '14

The zimbie processes is from perl. What is your perl and libvirt version? Em 17/03/2014 12:37, Michal Privoznik <mprivozn(a)redhat.com> escreveu: > > On 17.03.2014 12:13, Carlos Rodrigues wrote: > > Hell Michal, > > > > Thank you for your answer, but this doesn't fix my problem. > > > > Run your fixed script and we get the same behavior: > > > > $ perl test-chldhandle-bug-fixed.pl > > init... pid=29713 > > while... > > fork 1 > > end... pid=29716 > > receive chld > > fork 2 > > end... pid=29717 > > receive chld > > 2014-03-17 11:10:37.234+0000: 29713: info : libvirt version: 1.0.5.7, package: 2.fc19 (Fedora Project, 2013-11-17-23:21:57, buildvm-18.phx2.fedoraproject.org) > > 2014-03-17 11:10:37.234+0000: 29713: warning : virNetTLSContextCheckCertificate:1099 : Certificate check failed Certificate [session] owner does not match the hostname 10.10.4.249 > > connection open > > fork 3 > > end... pid=29827 > > fork 4 > > end... pid=29930 > > go next... > > > > > > I'm not a perl expert, but I don't think it's a libvirt bug anyhow. > Moreover, I don't see any zombies: > > $ perl test-chldhandle-bug-fixed.pl & sleep 5 && echo && ps axf | grep > perl && echo > [1] 11239 > init... pid=11239 > while... > fork 1 > end... pid=11241 > receive chld > fork 2 > end... pid=11242 > receive chld > connection open > > 11239 pts/18 S 0:00 | \_ perl test-chldhandle-bug-fixed.pl > 11245 pts/18 S+ 0:00 | \_ grep --colour=auto perl > > fork 3 > end... pid=11246 > receive chld > fork 4 > end... pid=11247 > receive chld > go next... > > btw: with older version I'm seeing this: > > 11399 pts/18 S 0:00 | \_ perl test-chldhandle-bug.pl > 11401 pts/18 Z 0:00 | | \_ [perl] <defunct> > 11402 pts/18 Z 0:00 | | \_ [perl] <defunct> > 11405 pts/18 S+ 0:00 | \_ grep --colour=auto perl > > What zombies are you seeing? Perl ones or libvirt or ..,? > > Michal

1 0

[libvirt] RFC: viridentitytest Failure on CentOS 6.5?
by Nehal J Wani 17 Mar '14

17 Mar '14

I followed the following steps to build a clean development version of libvirt from source. Can't seem to understand what is wrong. (Entire buildLog has been attached): ➜ /tmp cat /etc/issue CentOS release 6.5 (Final) Kernel \r on an \m ➜ /tmp sestatus SELinux status: enabled SELinuxfs mount: /selinux Current mode: enforcing Mode from config file: enforcing Policy version: 24 Policy from config file: targeted ➜ /tmp git clone git://libvirt.org/libvirt.git Initialized empty Git repository in /tmp/libvirt/.git/ remote: Counting objects: 138935, done. remote: Compressing objects: 100% (21143/21143), done. remote: Total 138935 (delta 117282), reused 138935 (delta 117282) Receiving objects: 100% (138935/138935), 137.72 MiB | 559 KiB/s, done. Resolving deltas: 100% (117282/117282), done. ➜ /tmp cd libvirt ➜ libvirt git:(master) ./autogen.sh --system Running ./configure with --prefix=/usr --sysconfdir=/etc --localstatedir=/var --libdir=/usr/lib64 .. .. Now type 'make' to compile libvirt. ➜ libvirt git:(master) make .. .. make[1]: Leaving directory `/tmp/libvirt' ➜ libvirt git:(master) ✗ cd tests ➜ tests git:(master) ✗ ./viridentitytest /tmp/libvirt/tests/.libs/libsecurityselinuxhelper.so: No such file or directory ➜ tests git:(master) ✗ -- Nehal J Wani

1 0

[libvirt] [PATCH] virlog: add log lock in virLogSetDefaultPriority
by Wangrui (K) 17 Mar '14

17 Mar '14

When the global variable virLogDefaultPriority is modified, it will be better to have a lock. Signed-off-by: Zhou Yimin <zhouyimin(a)huawei.com> --- src/util/virlog.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/util/virlog.c b/src/util/virlog.c index 68af0f3..ba370e2 100644 --- a/src/util/virlog.c +++ b/src/util/virlog.c @@ -498,7 +498,10 @@ virLogSetDefaultPriority(virLogPriority priority) if (virLogInitialize() < 0) return -1; + virLogLock(); virLogDefaultPriority = priority; + virLogUnlock(); + return 0; } -- 1.7.12.4

3 2

[libvirt] [PATCH] Avoid warning message from libxl driver on non-Xen kernels
by Daniel P. Berrange 17 Mar '14

17 Mar '14

The libxl driver reads /proc/xen/capabilities to see if it is on a Dom0 kernel. If that file does not even exist though, an error is logged. Check for the file existance before trying to read its contents to avoid the log message. Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- src/libxl/libxl_driver.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/libxl/libxl_driver.c b/src/libxl/libxl_driver.c index ae7342a..445a61a 100644 --- a/src/libxl/libxl_driver.c +++ b/src/libxl/libxl_driver.c @@ -970,6 +970,10 @@ libxlDriverShouldLoad(bool privileged) return ret; } + if (!virFileExists("/proc/xen/capabilities")) { + VIR_INFO("Disabling driver as /proc/xen/capabilities does not exist"); + return false; + } /* * Don't load if not running on a Xen control domain (dom0). It is not * sufficient to check for the file to exist as any guest can mount -- 1.8.5.3

3 2

[libvirt] [PATCH] Fix leak of iterator in nwfilter instantiate code
by Daniel P. Berrange 17 Mar '14

17 Mar '14

The ebiptablesCreateRuleInstanceIterate creates a virNWFilterVarCombIterPtr instance and iterates over it. Unfortunately in doing so, it discards the original pointer. At the end of the method it will thus effectively do virNWFilterVarCombIterFree(NULL), which means it will leak the iterator. Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- src/nwfilter/nwfilter_ebiptables_driver.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/nwfilter/nwfilter_ebiptables_driver.c b/src/nwfilter/nwfilter_ebiptables_driver.c index 57c0476..9dbd3ff 100644 --- a/src/nwfilter/nwfilter_ebiptables_driver.c +++ b/src/nwfilter/nwfilter_ebiptables_driver.c @@ -2865,14 +2865,14 @@ ebiptablesCreateRuleInstanceIterate( virNWFilterRuleInstPtr res) { int rc = 0; - virNWFilterVarCombIterPtr vciter; + virNWFilterVarCombIterPtr vciter, tmp; /* rule->vars holds all the variables names that this rule will access. * iterate over all combinations of the variables' values and instantiate * the filtering rule with each combination. */ - vciter = virNWFilterVarCombIterCreate(vars, - rule->varAccess, rule->nVarAccess); + tmp = vciter = virNWFilterVarCombIterCreate(vars, + rule->varAccess, rule->nVarAccess); if (!vciter) return -1; @@ -2881,12 +2881,12 @@ ebiptablesCreateRuleInstanceIterate( nwfilter, rule, ifname, - vciter, + tmp, res); if (rc < 0) break; - vciter = virNWFilterVarCombIterNext(vciter); - } while (vciter != NULL); + tmp = virNWFilterVarCombIterNext(tmp); + } while (tmp != NULL); virNWFilterVarCombIterFree(vciter); -- 1.8.5.3

2 3

[libvirt] [PATCH v5 0/3] support dumping guest memory in compressed format
by qiaonuohan＠cn.fujitsu.com 17 Mar '14

17 Mar '14

dumping guest's memroy is introduced without compression supported, and this is a freature regression of 'virsh dump --memory-only'. This patchset is used to add support in libvirt side to make qemu dump guest's memory in kdump-compressed format and please refer the following address to see implementation of the qemu side, the lastest version of qemu side is v9(ready for being queued). http://lists.nongnu.org/archive/html/qemu-devel/2014-02/msg03016.html ChangLog: Changes from v4 to v5: 1. modify some restriction check Changes from v3 to v4: 1. dropping patch "add dump_memory_format in qemu.conf" 2. fix to follow some conventions Changes from v2 to v3: 1. address Jiri Denemark's comment about adding a new public API instead of changing an old one. Changes from v1 to v2: 1. address Daniel P. Berrange's comment about using a new parameter to replace flags like VIR_DUMP_COMPRESS_ZLIB. qiaonuohan (3): add new virDomainCoreDumpWithFormat API add qemu support to virDomainCoreDumpWithFormat API allow "virsh dump --memory-only" specify dump format include/libvirt/libvirt.h.in | 31 ++++++++++++++ src/driver.h | 7 ++++ src/libvirt.c | 97 ++++++++++++++++++++++++++++++++++++++++++++ src/libvirt_public.syms | 5 +++ src/qemu/qemu_driver.c | 49 ++++++++++++++++++---- src/qemu/qemu_monitor.c | 7 ++-- src/qemu/qemu_monitor.h | 3 +- src/qemu/qemu_monitor_json.c | 4 +- src/qemu/qemu_monitor_json.h | 3 +- src/remote/remote_driver.c | 1 + src/remote/remote_protocol.x | 15 ++++++- src/remote_protocol-structs | 7 ++++ src/test/test_driver.c | 20 +++++++-- tests/qemumonitorjsontest.c | 2 +- tools/virsh-domain.c | 45 +++++++++++++++++++- 15 files changed, 275 insertions(+), 21 deletions(-) -- 1.8.5.3

4 22

[libvirt] [PATCH v6 0/4] support dumping guest memory in compressed format
by qiaonuohan＠cn.fujitsu.com 17 Mar '14

17 Mar '14

dumping guest's memory is introduced without compression supported, but now qemu can dump guest's memory in kdump-compressed format. This patchset is used to add support in libvirt side to let qemu do the dump in compressed format and please refer the following address to see implementation of the qemu side, the lastest version of qemu side is v9. http://lists.nongnu.org/archive/html/qemu-devel/2014-02/msg03016.html ChangLog: Changes from v5 to v6: 1. add qemuMonitorGetDumpGuestMemoryCapability API to check the available dump format Changes from v4 to v5: 1. modify some restriction check Changes from v3 to v4: 1. dropping patch "add dump_memory_format in qemu.conf" 2. fix to follow some conventions Changes from v2 to v3: 1. address Jiri Denemark's comment about adding a new public API instead of changing an old one. Changes from v1 to v2: 1. address Daniel P. Berrange's comment about using a new parameter to replace flags like VIR_DUMP_COMPRESS_ZLIB. qiaonuohan (4): add new virDomainCoreDumpWithFormat API qemu: add qemuMonitorGetDumpGuestMemoryCapability qemu: add support for virDomainCoreDumpWithFormat API allow "virsh dump --memory-only" specify dump format include/libvirt/libvirt.h.in | 8 ++++ src/driver.h | 7 ++++ src/libvirt.c | 92 ++++++++++++++++++++++++++++++++++++++++++++ src/libvirt_public.syms | 5 +++ src/qemu/qemu_driver.c | 50 +++++++++++++++++++----- src/qemu/qemu_monitor.c | 27 +++++++++++-- src/qemu/qemu_monitor.h | 6 ++- src/qemu/qemu_monitor_json.c | 86 ++++++++++++++++++++++++++++++++++++++--- src/qemu/qemu_monitor_json.h | 6 ++- src/remote/remote_driver.c | 1 + src/remote/remote_protocol.x | 15 +++++++- src/remote_protocol-structs | 7 ++++ src/test/test_driver.c | 21 ++++++++-- tests/qemumonitorjsontest.c | 2 +- tools/virsh-domain.c | 30 +++++++++++++-- tools/virsh.pod | 6 +++ 16 files changed, 342 insertions(+), 27 deletions(-) -- 1.8.5.3

2 5

[libvirt] [PATCH v2 0/5] Expose FSFreeze/FSThaw within the guest as API
by Tomoki Sekiyama 15 Mar '14

15 Mar '14

Hello, This is patchset v2 to add FSFreeze/FSThaw API for custom disk snapshotting. Changes to v1: * added quiesced status tracking to avoid double fsfreeze in qemu driver * removed unused 'mountPoint' argument * use "@acl: domain:write" in remote driver * rebased to master (v1: http://www.redhat.com/archives/libvir-list/2013-November/msg00610.html ) === Description === Currently FSFreeze and FSThaw are supported by qemu guest agent and they are used internally in snapshot-create command with --quiesce option. However, when users want to utilize the native snapshot feature of storage devices (such as LVM over iSCSI, enterprise storage appliances, etc.), they need to issue fsfreeze command separately from libvirt-driven snapshots. (OpenStack cinder provides these storages' snapshot feature, but it cannot quiesce the guest filesystems automatically for now.) Although virDomainQemuGuestAgent() API could be used for this purpose, it is only for debugging and is not supported officially. This patchset adds virDomainFSFreeze()/virDomainFSThaw() APIs and virsh domfsfreeze/domfsthaw commands to enable the users to freeze and thaw domain's filesystems cleanly. The APIs have flags option currently unsupported for future extension. --- Tomoki Sekiyama (5): Introduce virDomainFSFreeze() and virDomainFSThaw() public API remote: Implement virDomainFSFreeze and virDomainFSThaw qemu: Track domain quiesced status qemu: Implement virDomainFSFreeze and virDomainFSThaw virsh: Expose new virDomainFSFreeze and virDomainFSThaw API include/libvirt/libvirt.h.in | 6 ++ src/driver.h | 10 ++++ src/libvirt.c | 70 +++++++++++++++++++++++++ src/libvirt_public.syms | 5 ++ src/qemu/qemu_domain.h | 2 + src/qemu/qemu_driver.c | 119 ++++++++++++++++++++++++++++++++++++++---- src/remote/remote_driver.c | 2 + src/remote/remote_protocol.x | 23 ++++++++ src/remote_protocol-structs | 9 +++ src/rpc/gendispatch.pl | 2 + tools/virsh-domain.c | 92 ++++++++++++++++++++++++++++++++ tools/virsh.pod | 15 +++++ 12 files changed, 344 insertions(+), 11 deletions(-)

2 12

[libvirt] [PATCH] libvirt-tck: Ignore SIGPIPE in 051-daemon-hook.t
by Mike Latimer 14 Mar '14

14 Mar '14

This test completes successfully, but results in a return code of 141 due to a broken pipe when restarting libvirtd. This patch just masks the SIGPIPE and undefines $tck to avoid the 141 return code. If there is a way to reestablish the tck connection after the restart, that would be a better solution. --- scripts/hooks/051-daemon-hook.t | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/scripts/hooks/051-daemon-hook.t b/scripts/hooks/051-daemon-hook.t index 165cf4e..a6c3d03 100644 --- a/scripts/hooks/051-daemon-hook.t +++ b/scripts/hooks/051-daemon-hook.t @@ -163,5 +163,10 @@ SKIP: { ok(`service libvirtd status` =~ /running/, "libvirtd is running"); $hook->cleanup(); + + # Restarting libvirtd broke the tck connection, so ignore sigpipe and + # undefine $tck to avoid a return code of 141 + $SIG{PIPE} = 'IGNORE'; + undef $tck; }; -- 1.8.4.5

2 4

[libvirt] [PATCH v2 1/3] qemu: XMLToNative: Don't show -S
by Cole Robinson 14 Mar '14

14 Mar '14

-S causes qemu to start in the paused state. Since XML2Native is intended to generate something that users can run directly, this will trip them up. --- v2: s/forXMLToArgv/standalone/g src/qemu/qemu_command.c | 8 ++++++-- src/qemu/qemu_command.h | 3 ++- src/qemu/qemu_driver.c | 6 ++++-- src/qemu/qemu_process.c | 2 +- tests/qemuxml2argvtest.c | 2 +- tests/qemuxmlnstest.c | 2 +- 6 files changed, 15 insertions(+), 8 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index aa1a3db..3e6a172 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -7711,7 +7711,8 @@ qemuBuildCommandLine(virConnectPtr conn, int migrateFd, virDomainSnapshotObjPtr snapshot, enum virNetDevVPortProfileOp vmop, - qemuBuildCommandLineCallbacksPtr callbacks) + qemuBuildCommandLineCallbacksPtr callbacks, + bool standalone) { virErrorPtr originalError = NULL; size_t i, j; @@ -7820,7 +7821,10 @@ qemuBuildCommandLine(virConnectPtr conn, virCommandAddArg(cmd, def->name); } } - virCommandAddArg(cmd, "-S"); /* freeze CPU */ + + if (!standalone) + virCommandAddArg(cmd, "-S"); /* freeze CPU */ + if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_ENABLE_FIPS)) virCommandAddArg(cmd, "-enable-fips"); diff --git a/src/qemu/qemu_command.h b/src/qemu/qemu_command.h index ebb0b1d..50dc4a0 100644 --- a/src/qemu/qemu_command.h +++ b/src/qemu/qemu_command.h @@ -76,7 +76,8 @@ virCommandPtr qemuBuildCommandLine(virConnectPtr conn, int migrateFd, virDomainSnapshotObjPtr current_snapshot, enum virNetDevVPortProfileOp vmop, - qemuBuildCommandLineCallbacksPtr callbacks) + qemuBuildCommandLineCallbacksPtr callbacks, + bool forXMLToArgv) ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(11); /* Generate '-device' string for chardev device */ diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index ba470a1..a01739c 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -5956,8 +5956,10 @@ static char *qemuConnectDomainXMLToNative(virConnectPtr conn, if (!(cmd = qemuBuildCommandLine(conn, driver, def, &monConfig, monitor_json, qemuCaps, - NULL, -1, NULL, VIR_NETDEV_VPORT_PROFILE_OP_NO_OP, - &buildCommandLineCallbacks))) + NULL, -1, NULL, + VIR_NETDEV_VPORT_PROFILE_OP_NO_OP, + &buildCommandLineCallbacks, + true))) goto cleanup; ret = virCommandToString(cmd); diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 809ab37..35ad62a 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -3856,7 +3856,7 @@ int qemuProcessStart(virConnectPtr conn, if (!(cmd = qemuBuildCommandLine(conn, driver, vm->def, priv->monConfig, priv->monJSON, priv->qemuCaps, migrateFrom, stdin_fd, snapshot, vmop, - &buildCommandLineCallbacks))) + &buildCommandLineCallbacks, false))) goto cleanup; /* now that we know it is about to start call the hook if present */ diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 5d6a64b..8d7d9e5 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -357,7 +357,7 @@ static int testCompareXMLToArgvFiles(const char *xml, (flags & FLAG_JSON), extraFlags, migrateFrom, migrateFd, NULL, VIR_NETDEV_VPORT_PROFILE_OP_NO_OP, - &testCallbacks))) { + &testCallbacks, false))) { if (!virtTestOOMActive() && (flags & FLAG_EXPECT_FAILURE)) { ret = 0; diff --git a/tests/qemuxmlnstest.c b/tests/qemuxmlnstest.c index 20a5ccd..81d496e 100644 --- a/tests/qemuxmlnstest.c +++ b/tests/qemuxmlnstest.c @@ -119,7 +119,7 @@ static int testCompareXMLToArgvFiles(const char *xml, vmdef, &monitor_chr, json, extraFlags, migrateFrom, migrateFd, NULL, VIR_NETDEV_VPORT_PROFILE_OP_NO_OP, - &testCallbacks))) + &testCallbacks, false))) goto fail; if (!virtTestOOMActive()) { -- 1.8.5.3

2 4

[libvirt] [PATCH v3] qemu: cleanup tap devices on FreeBSD
by Roman Bogorodskiy 14 Mar '14

14 Mar '14

We have to explicitly destroy TAP devices on FreeBSD because they're not freed after being closed, otherwise we end up with orphaned TAP devices after destroying a domain. --- src/qemu/qemu_process.c | 14 ++++++++++++-- src/util/virnetdevtap.h | 6 ++++++ 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index ffa939a..d1acafc 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -4373,7 +4373,10 @@ void qemuProcessStop(virQEMUDriverPtr driver, def = vm->def; for (i = 0; i < def->nnets; i++) { virDomainNetDefPtr net = def->nets[i]; - if (virDomainNetGetActualType(net) == VIR_DOMAIN_NET_TYPE_DIRECT) { + vport = virDomainNetGetActualVirtPortProfile(net); + + switch (virDomainNetGetActualType(net)) { + case VIR_DOMAIN_NET_TYPE_DIRECT: ignore_value(virNetDevMacVLanDeleteWithVPortProfile( net->ifname, &net->mac, virDomainNetGetActualDirectDev(net), @@ -4381,11 +4384,18 @@ void qemuProcessStop(virQEMUDriverPtr driver, virDomainNetGetActualVirtPortProfile(net), cfg->stateDir)); VIR_FREE(net->ifname); + break; + case VIR_DOMAIN_NET_TYPE_BRIDGE: + case VIR_DOMAIN_NET_TYPE_NETWORK: +#ifdef VIR_NETDEV_TAP_REQUIRE_MANUAL_CLEANUP + if (!(vport && vport->virtPortType == VIR_NETDEV_VPORT_PROFILE_OPENVSWITCH)) + ignore_value(virNetDevTapDelete(net->ifname)); +#endif + break; } /* release the physical device (or any other resources used by * this interface in the network driver */ - vport = virDomainNetGetActualVirtPortProfile(net); if (vport && vport->virtPortType == VIR_NETDEV_VPORT_PROFILE_OPENVSWITCH) ignore_value(virNetDevOpenvswitchRemovePort( virDomainNetGetActualBridgeName(net), diff --git a/src/util/virnetdevtap.h b/src/util/virnetdevtap.h index a762b31..1e5bd19 100644 --- a/src/util/virnetdevtap.h +++ b/src/util/virnetdevtap.h @@ -27,6 +27,12 @@ # include "virnetdevvportprofile.h" # include "virnetdevvlan.h" +# ifdef __FreeBSD__ +/* This should be defined on OSes that don't automatically + * cleanup released devices */ +# define VIR_NETDEV_TAP_REQUIRE_MANUAL_CLEANUP 1 +# endif + int virNetDevTapCreate(char **ifname, int *tapfd, int tapfdSize, -- 1.8.4.3

2 1

[libvirt] [PATCH 1/3] qemu: XMLToNative: Don't show -S
by Cole Robinson 14 Mar '14

14 Mar '14

-S causes qemu to start in the paused state. Since XML2Native is intended to generate something that users can run directly, this will trip them up. --- src/qemu/qemu_command.c | 8 ++++++-- src/qemu/qemu_command.h | 3 ++- src/qemu/qemu_driver.c | 6 ++++-- src/qemu/qemu_process.c | 2 +- tests/qemuxml2argvtest.c | 2 +- tests/qemuxmlnstest.c | 2 +- 6 files changed, 15 insertions(+), 8 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index aa1a3db..755a72a 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -7711,7 +7711,8 @@ qemuBuildCommandLine(virConnectPtr conn, int migrateFd, virDomainSnapshotObjPtr snapshot, enum virNetDevVPortProfileOp vmop, - qemuBuildCommandLineCallbacksPtr callbacks) + qemuBuildCommandLineCallbacksPtr callbacks, + bool forXMLToArgv) { virErrorPtr originalError = NULL; size_t i, j; @@ -7820,7 +7821,10 @@ qemuBuildCommandLine(virConnectPtr conn, virCommandAddArg(cmd, def->name); } } - virCommandAddArg(cmd, "-S"); /* freeze CPU */ + + if (!forXMLToArgv) + virCommandAddArg(cmd, "-S"); /* freeze CPU */ + if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_ENABLE_FIPS)) virCommandAddArg(cmd, "-enable-fips"); diff --git a/src/qemu/qemu_command.h b/src/qemu/qemu_command.h index ebb0b1d..50dc4a0 100644 --- a/src/qemu/qemu_command.h +++ b/src/qemu/qemu_command.h @@ -76,7 +76,8 @@ virCommandPtr qemuBuildCommandLine(virConnectPtr conn, int migrateFd, virDomainSnapshotObjPtr current_snapshot, enum virNetDevVPortProfileOp vmop, - qemuBuildCommandLineCallbacksPtr callbacks) + qemuBuildCommandLineCallbacksPtr callbacks, + bool forXMLToArgv) ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(11); /* Generate '-device' string for chardev device */ diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index ba470a1..a01739c 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -5956,8 +5956,10 @@ static char *qemuConnectDomainXMLToNative(virConnectPtr conn, if (!(cmd = qemuBuildCommandLine(conn, driver, def, &monConfig, monitor_json, qemuCaps, - NULL, -1, NULL, VIR_NETDEV_VPORT_PROFILE_OP_NO_OP, - &buildCommandLineCallbacks))) + NULL, -1, NULL, + VIR_NETDEV_VPORT_PROFILE_OP_NO_OP, + &buildCommandLineCallbacks, + true))) goto cleanup; ret = virCommandToString(cmd); diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 809ab37..35ad62a 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -3856,7 +3856,7 @@ int qemuProcessStart(virConnectPtr conn, if (!(cmd = qemuBuildCommandLine(conn, driver, vm->def, priv->monConfig, priv->monJSON, priv->qemuCaps, migrateFrom, stdin_fd, snapshot, vmop, - &buildCommandLineCallbacks))) + &buildCommandLineCallbacks, false))) goto cleanup; /* now that we know it is about to start call the hook if present */ diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 5d6a64b..8d7d9e5 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -357,7 +357,7 @@ static int testCompareXMLToArgvFiles(const char *xml, (flags & FLAG_JSON), extraFlags, migrateFrom, migrateFd, NULL, VIR_NETDEV_VPORT_PROFILE_OP_NO_OP, - &testCallbacks))) { + &testCallbacks, false))) { if (!virtTestOOMActive() && (flags & FLAG_EXPECT_FAILURE)) { ret = 0; diff --git a/tests/qemuxmlnstest.c b/tests/qemuxmlnstest.c index 20a5ccd..81d496e 100644 --- a/tests/qemuxmlnstest.c +++ b/tests/qemuxmlnstest.c @@ -119,7 +119,7 @@ static int testCompareXMLToArgvFiles(const char *xml, vmdef, &monitor_chr, json, extraFlags, migrateFrom, migrateFd, NULL, VIR_NETDEV_VPORT_PROFILE_OP_NO_OP, - &testCallbacks))) + &testCallbacks, false))) goto fail; if (!virtTestOOMActive()) { -- 1.8.5.3

5 12

[libvirt] [PATCH] Fix build with qemu driver disabled
by Roman Bogorodskiy 14 Mar '14

14 Mar '14

Do not include test_libvirt_lockd.aug when configured without qemu driver. https://bugzilla.redhat.com/show_bug.cgi?id=1071777 --- src/Makefile.am | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index 25d0370..e5cbad0 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1757,7 +1757,9 @@ if WITH_QEMU test_libvirt_lockd.aug: locking/test_libvirt_lockd.aug.in \ locking/qemu-lockd.conf $(AUG_GENTEST) $(AM_V_GEN)$(AUG_GENTEST) locking/qemu-lockd.conf $< $@ -endif WITH_QEMU +else ! WITH_QEMU +test_libvirt_lockd.aug: +endif ! WITH_QEMU test_virtlockd.aug: locking/test_virtlockd.aug.in \ locking/virtlockd.conf $(AUG_GENTEST) @@ -2122,12 +2124,12 @@ lockd_la_LIBADD = ../gnulib/lib/libgnu.la \ libvirt-net-rpc-client.la \ $(NULL) augeas_DATA += locking/libvirt_lockd.aug -augeastest_DATA += test_libvirt_lockd.aug -CLEANFILES += test_libvirt_lockd.aug if WITH_DTRACE_PROBES lockd_la_LIBADD += libvirt_probes.lo endif WITH_DTRACE_PROBES if WITH_QEMU +augeastest_DATA += test_libvirt_lockd.aug +CLEANFILES += test_libvirt_lockd.aug nodist_conf_DATA += locking/qemu-lockd.conf BUILT_SOURCES += locking/qemu-lockd.conf DISTCLEANFILES += locking/qemu-lockd.conf -- 1.8.4.2

2 1

[libvirt] [PATCH] openvzRegister: Check for error return
by John Ferlan 14 Mar '14

14 Mar '14

A recent change to openvz_driver.c caused Coverity to make additional comparisons and find that the openvzRegister() was not checking the status of virRegisterDriver() call like other callers and thus generated a CHECKED_RETURN condition Signed-off-by: John Ferlan <jferlan(a)redhat.com> --- src/openvz/openvz_driver.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/openvz/openvz_driver.c b/src/openvz/openvz_driver.c index 393f397..c10fa05 100644 --- a/src/openvz/openvz_driver.c +++ b/src/openvz/openvz_driver.c @@ -2239,6 +2239,7 @@ static virDriver openvzDriver = { }; int openvzRegister(void) { - virRegisterDriver(&openvzDriver); + if (virRegisterDriver(&openvzDriver) < 0) + return -1; return 0; } -- 1.8.5.3

2 1

[libvirt] [PATCH 0/6] eliminate hardcoded indent from all XML - PART 2
by Laine Stump 14 Mar '14

14 Mar '14

This is a followup to https://www.redhat.com/archives/libvir-list/2014-March/msg00350.html Eric had ACKed all of those patches, but pointed out some omissions. The first patch of this series should be squashed into 1/9 of the previous series (which I haven't yet pushed), and the others are new. The final patch adds a syntax-check rule to keep new hardcoded spacing from creeping in. (I'm still pondering the idea of giving virBuffer a "pretty print" mode. It would certainly make it more difficult to mess up indentation). Laine Stump (6): squash this into domain conf XML "eliminate hardcoded indent" patch virsh: eliminate hardcoded indentation in xml generated for commands qemu: eliminate hardcoded indent from migration cookie xml util: eliminate hardcoded indent in virConnectSysInfo formatting qemu: elmininate hardcoded indent in capabilities cache XML build: detect/prohibit hardcoded XML indent in syntax-check cfg.mk | 7 ++++- src/conf/domain_conf.c | 2 +- src/lxc/lxc_domain.c | 4 +-- src/qemu/qemu_capabilities.c | 20 ++++++------ src/qemu/qemu_domain.c | 45 ++++++++++++++++----------- src/qemu/qemu_migration.c | 49 ++++++++++++++++++------------ src/util/virsysinfo.c | 72 ++++++++++++++++++++++++-------------------- tools/virsh-domain.c | 43 ++++++++++++++------------ tools/virsh-pool.c | 40 +++++++++++++++--------- tools/virsh-snapshot.c | 24 +++++++++------ tools/virsh-volume.c | 26 ++++++++++------ 11 files changed, 196 insertions(+), 136 deletions(-) -- 1.8.5.3

2 13

[libvirt] [PATCH] nwfilter: Add ARP src/dst IP mask for ebtables ARP
by Stefan Berger 13 Mar '14

13 Mar '14

From: Stefan Berger <stefanb(a)linux.vnet.ibm.com> Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=862887 Add a netmask for the source and destination IP address for the ebtables --arp-ip-src and --arp-ip-dst options. Extend the XML parser with support for XML attributes for these netmasks similar to already supported netmasks. Extend the documentation. Signed-off-by: Stefan Berger <stefanb(a)linux.vnet.ibm.com> --- docs/formatnwfilter.html.in | 10 ++++++++++ src/conf/nwfilter_conf.c | 12 ++++++++++++ src/conf/nwfilter_conf.h | 2 ++ src/nwfilter/nwfilter_ebiptables_driver.c | 28 ++++++++++++++++++++++++---- 4 files changed, 48 insertions(+), 4 deletions(-) diff --git a/docs/formatnwfilter.html.in b/docs/formatnwfilter.html.in index 5c06bf2..fb3a326 100644 --- a/docs/formatnwfilter.html.in +++ b/docs/formatnwfilter.html.in @@ -990,11 +990,21 @@ <td>Source IP address in ARP/RARP packet</td> </tr> <tr> + <td>arpsrcipmask <span class="since">(Since 1.2.3)</span></td> + <td>IP_MASK</td> + <td>Source IP mask</td> + </tr> + <tr> <td>arpdstipaddr</td> <td>IP_ADDR</td> <td>Destination IP address in ARP/RARP packet</td> </tr> <tr> + <td>arpdstipmask <span class="since">(Since 1.2.3)</span></td> + <td>IP_MASK</td> + <td>Destination IP mask</td> + </tr> + <tr> <td>comment <span class="since">(Since 0.8.5)</span></td> <td>STRING</td> <td>text with max. 256 characters</td> diff --git a/src/conf/nwfilter_conf.c b/src/conf/nwfilter_conf.c index d25e0cc..73e668f 100644 --- a/src/conf/nwfilter_conf.c +++ b/src/conf/nwfilter_conf.c @@ -173,7 +173,9 @@ static const char dstmacmask_str[] = "dstmacmask"; static const char arpsrcmacaddr_str[] = "arpsrcmacaddr"; static const char arpdstmacaddr_str[] = "arpdstmacaddr"; static const char arpsrcipaddr_str[] = "arpsrcipaddr"; +static const char arpsrcipmask_str[] = "arpsrcipmask"; static const char arpdstipaddr_str[] = "arpdstipaddr"; +static const char arpdstipmask_str[] = "arpdstipmask"; static const char srcipaddr_str[] = "srcipaddr"; static const char srcipmask_str[] = "srcipmask"; static const char dstipaddr_str[] = "dstipaddr"; @@ -198,7 +200,9 @@ static const char ipsetflags_str[] = "ipsetflags"; #define ARPSRCMACADDR arpsrcmacaddr_str #define ARPDSTMACADDR arpdstmacaddr_str #define ARPSRCIPADDR arpsrcipaddr_str +#define ARPSRCIPMASK arpsrcipmask_str #define ARPDSTIPADDR arpdstipaddr_str +#define ARPDSTIPMASK arpdstipmask_str #define SRCIPADDR srcipaddr_str #define SRCIPMASK srcipmask_str #define DSTIPADDR dstipaddr_str @@ -1302,10 +1306,18 @@ static const virXMLAttr2Struct arpAttributes[] = { .datatype = DATATYPE_IPADDR, .dataIdx = offsetof(virNWFilterRuleDef, p.arpHdrFilter.dataARPSrcIPAddr), }, { + .name = ARPSRCIPMASK, + .datatype = DATATYPE_IPMASK, + .dataIdx = offsetof(virNWFilterRuleDef, p.arpHdrFilter.dataARPSrcIPMask), + }, { .name = ARPDSTIPADDR, .datatype = DATATYPE_IPADDR, .dataIdx = offsetof(virNWFilterRuleDef, p.arpHdrFilter.dataARPDstIPAddr), }, { + .name = ARPDSTIPMASK, + .datatype = DATATYPE_IPMASK, + .dataIdx = offsetof(virNWFilterRuleDef, p.arpHdrFilter.dataARPDstIPMask), + }, { .name = "gratuitous", .datatype = DATATYPE_BOOLEAN, .dataIdx = offsetof(virNWFilterRuleDef, p.arpHdrFilter.dataGratuitousARP), diff --git a/src/conf/nwfilter_conf.h b/src/conf/nwfilter_conf.h index 8c59330..071343e 100644 --- a/src/conf/nwfilter_conf.h +++ b/src/conf/nwfilter_conf.h @@ -209,8 +209,10 @@ struct _arpHdrFilterDef { nwItemDesc dataOpcode; nwItemDesc dataARPSrcMACAddr; nwItemDesc dataARPSrcIPAddr; + nwItemDesc dataARPSrcIPMask; nwItemDesc dataARPDstMACAddr; nwItemDesc dataARPDstIPAddr; + nwItemDesc dataARPDstIPMask; nwItemDesc dataGratuitousARP; nwItemDesc dataComment; }; diff --git a/src/nwfilter/nwfilter_ebiptables_driver.c b/src/nwfilter/nwfilter_ebiptables_driver.c index bea9535..a4b38e7 100644 --- a/src/nwfilter/nwfilter_ebiptables_driver.c +++ b/src/nwfilter/nwfilter_ebiptables_driver.c @@ -2059,6 +2059,7 @@ ebtablesCreateRuleInstance(char chainPrefix, { char macaddr[VIR_MAC_STRING_BUFLEN], ipaddr[INET_ADDRSTRLEN], + ipmask[INET_ADDRSTRLEN], ipv6addr[INET6_ADDRSTRLEN], number[MAX(INT_BUFSIZE_BOUND(uint32_t), INT_BUFSIZE_BOUND(int))], @@ -2066,6 +2067,7 @@ ebtablesCreateRuleInstance(char chainPrefix, char chain[MAX_CHAINNAME_LENGTH]; virBuffer buf = VIR_BUFFER_INITIALIZER; const char *target; + bool hasMask; if (!ebtables_cmd_path) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", @@ -2269,11 +2271,20 @@ ebtablesCreateRuleInstance(char chainPrefix, &rule->p.arpHdrFilter.dataARPSrcIPAddr) < 0) goto err_exit; + if (HAS_ENTRY_ITEM(&rule->p.arpHdrFilter.dataARPSrcIPMask)) { + if (printDataType(vars, + ipmask, sizeof(ipmask), + &rule->p.arpHdrFilter.dataARPSrcIPMask) < 0) + goto err_exit; + hasMask = true; + } + virBufferAsprintf(&buf, - " %s %s %s", + " %s %s %s/%s", reverse ? "--arp-ip-dst" : "--arp-ip-src", ENTRY_GET_NEG_SIGN(&rule->p.arpHdrFilter.dataARPSrcIPAddr), - ipaddr); + ipaddr, + hasMask ? ipmask : "32"); } if (HAS_ENTRY_ITEM(&rule->p.arpHdrFilter.dataARPDstIPAddr)) { @@ -2282,11 +2293,20 @@ ebtablesCreateRuleInstance(char chainPrefix, &rule->p.arpHdrFilter.dataARPDstIPAddr) < 0) goto err_exit; + if (HAS_ENTRY_ITEM(&rule->p.arpHdrFilter.dataARPDstIPMask)) { + if (printDataType(vars, + ipmask, sizeof(ipmask), + &rule->p.arpHdrFilter.dataARPDstIPMask) < 0) + goto err_exit; + hasMask = true; + } + virBufferAsprintf(&buf, - " %s %s %s", + " %s %s %s/%s", reverse ? "--arp-ip-src" : "--arp-ip-dst", ENTRY_GET_NEG_SIGN(&rule->p.arpHdrFilter.dataARPDstIPAddr), - ipaddr); + ipaddr, + hasMask ? ipmask : "32"); } if (HAS_ENTRY_ITEM(&rule->p.arpHdrFilter.dataARPSrcMACAddr)) { -- 1.8.1.4

2 2

[libvirt] [PATCH] nwfilter: Fix rule priority problem
by Stefan Berger 13 Mar '14

13 Mar '14

From: Stefan Berger <stefanb(a)linux.vnet.ibm.com> Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1072292 Fix a problem related to rule priorities that did not allow to have rules applied that had a higher priority than the chain they were in. In this case the chain did not exist yet when the rule was instantiated. The solution is to adjust the priority of rules if the priority of the chain is of higher value. That way the chain will be created before the rule. Signed-off-by: Stefan Berger <stefanb(a)linux.vnet.ibm.com> --- src/nwfilter/nwfilter_ebiptables_driver.c | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/src/nwfilter/nwfilter_ebiptables_driver.c b/src/nwfilter/nwfilter_ebiptables_driver.c index 9d6cc90..59e07f6 100644 --- a/src/nwfilter/nwfilter_ebiptables_driver.c +++ b/src/nwfilter/nwfilter_ebiptables_driver.c @@ -3736,7 +3736,6 @@ ebiptablesApplyNewRules(const char *ifname, } } - /* cleanup whatever may exist */ if (ebtables_cmd_path) { NWFILTER_SET_EBTABLES_SHELLVAR(&buf); @@ -3770,6 +3769,23 @@ ebiptablesApplyNewRules(const char *ifname, NWFILTER_SET_EBTABLES_SHELLVAR(&buf); + /* walk the list of rules and increase the priority + * of rules in case the chain priority is of higher value; + * this preserves the order of the rules and ensures that + * the chain will be created before the chain's rules + * are created; don't adjust rules in the root chain + * example: a rule of priority -510 will be adjusted to + * priority -500 and the chain with priority -500 will + * then be created before it. + */ + for (i = 0; i < nruleInstances; i++) { + if (inst[i]->chainPriority > inst[i]->priority && + !strstr("root", inst[i]->neededProtocolChain)) { + + inst[i]->priority = inst[i]->chainPriority; + } + } + /* process ebtables commands; interleave commands from filters with commands for creating and connecting ebtables chains */ j = 0; -- 1.8.1.4

2 2

[libvirt] [PATCH] hostdev: add virObject field to virHostdevManager struct
by Jim Fehlig 13 Mar '14

13 Mar '14

Commit 6b306d66 converted virHostdevManager to a virObject, but missed adding a virObject field to the virHostdevManager struct. Result is memory corruption when taking a reference on an instance of the object, where atomic inc is done on the stateDir field. Later use of stateDir crashes libvirtd. Signed-off-by: Jim Fehlig <jfehlig(a)suse.com> --- src/util/virhostdev.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/util/virhostdev.h b/src/util/virhostdev.h index ade7e2f..a56a2b5 100644 --- a/src/util/virhostdev.h +++ b/src/util/virhostdev.h @@ -45,6 +45,8 @@ typedef enum { typedef struct _virHostdevManager virHostdevManager; typedef virHostdevManager *virHostdevManagerPtr; struct _virHostdevManager { + virObject parent; + char *stateDir; virPCIDeviceListPtr activePCIHostdevs; -- 1.8.1.4

2 2

[libvirt] How to build libvirt installation environment on ARM64?
by Chenqun (kuhn) 13 Mar '14

13 Mar '14

Hi all, The libvirt can be used for ARM64? If it can be used for ARM64, what resources are needed for setup ? How to build libvirt installation environment on ARM64? I got some resource as follow: 1.ARM64 hardware is based Cortex-A57 fastmodel 2.Host and Guest kernel is linux 3.13.0 3.ARM64 filesystem from linaro releases (http://releases.linaro.org/latest/openembedded/aarch64/) 4.Qemu 1.6.50 5.Libvirt-1.2.0 My configure shell as follow： export PKG_CONFIG=/usr/local/bin/pkg-config export PKG_CONFIG_SYSROOT_DIR=/home/aarch64 export PKG_CONFIG_PATH=/home/aarch64/usr/lib/pkgconfig ./configure --target=aarch64 \ --prefix=/home/chenq/libvirt/install \ --host=aarch64-linux-gnu \ --libdir=/home/aarch64 CC=aarch64-linux-gnu-gcc \ LIBXML_CFLAGS="/home/aarch64/usr/lib" CFLAGS="/home/aarch64/usr/include/libfdt" LDFLAGS="/home/aarch64/lib" Then configure error as follow： … checking for DEVMAPPER... no checking for dm_task_run in -ldevmapper... no checking libdevmapper.h usability... no checking libdevmapper.h presence... no checking for libdevmapper.h... no configure: error: You must install device-mapper-devel/libdevmapper >= 1.0.0 to compile libvirt I think this only one error is found. The libvirt depends on a lot of other libs,it will be find more similar errors. So, how to create a friendly environment to compile and install libvirt on ARM64 ? Thanks, --Kuhn

2 3

[libvirt] [PATCH 0/4] Fix capitalization of abbreviations
by Daniel P. Berrange 13 Mar '14

13 Mar '14

Complete the cleanup of bogus capitalization of Pci/Scsi/Usb Daniel P. Berrange (4): Replace Scsi with SCSI throughout Replace Usb with USB throughout Replace Pci with PCI throughout Add syntax check to validate capitalization of abbreviations cfg.mk | 8 +++++ src/conf/device_conf.c | 4 +-- src/conf/device_conf.h | 6 ++-- src/conf/domain_conf.c | 70 +++++++++++++++++++------------------- src/conf/domain_conf.h | 30 ++++++++-------- src/conf/node_device_conf.c | 28 +++++++-------- src/conf/node_device_conf.h | 2 +- src/libvirt_private.syms | 10 +++--- src/libxl/libxl_conf.c | 8 ++--- src/libxl/libxl_conf.h | 2 +- src/libxl/libxl_driver.c | 4 +-- src/lxc/lxc_cgroup.c | 6 ++-- src/lxc/lxc_cgroup.h | 4 +-- src/lxc/lxc_driver.c | 6 ++-- src/lxc/lxc_hostdev.c | 6 ++-- src/lxc/lxc_hostdev.h | 2 +- src/lxc/lxc_process.c | 2 +- src/network/bridge_driver.c | 2 +- src/node_device/node_device_udev.c | 4 +-- src/qemu/qemu_capabilities.c | 58 +++++++++++++++---------------- src/qemu/qemu_cgroup.c | 10 +++--- src/qemu/qemu_command.c | 30 ++++++++-------- src/qemu/qemu_command.h | 2 +- src/qemu/qemu_hostdev.c | 2 +- src/qemu/qemu_hotplug.c | 2 +- src/qemu/qemu_monitor_text.c | 10 +++--- src/util/virhostdev.c | 2 +- src/vmx/vmx.c | 2 +- src/xen/xen_driver.c | 10 +++--- tests/virpcimock.c | 16 ++++----- 30 files changed, 178 insertions(+), 170 deletions(-) -- 1.8.5.3

2 5

[libvirt] [PATCH v3] Add helper program to create custom leases
by Nehal J Wani 13 Mar '14

13 Mar '14

Introduce helper program to catch events from dnsmasq and maintain a custom lease file per network. It supports dhcpv4 and dhcpv6. The file is saved as "<interface-name>.status". Each lease contains the following info: <expiry-time (epoch time)> <mac> <iaid> <ip-address> <hostname> <clientid> Example of custom leases file content: [ { "iaid": "1221229", "ip-address": "2001:db8:ca2:2:1::95", "mac-address": "52:54:00:12:a2:6d", "hostname": "Fedora20", "client-id": "00:04:1a:c1:d9:6b:5a:0a:e2:bc:f8:4b:1e:37:2e:38:22:55", "expiry-time": 1393244216 }, { "ip-address": "192.168.150.208", "mac-address": "52:54:00:11:56:b3", "hostname": "Wani-PC", "client-id": "01:52:54:00:11:56:b3", "expiry-time": 1393244248 } ] src/Makefile.am: * Add options to compile the helper program src/network/bridge_driver.c: * Introduce networkDnsmasqLeaseFileNameCustom() * Invoke helper program along with dnsmasq * Delete the .status file when corresponding n/w is destroyed. src/util/leaseshelper.c * Helper program to create the custom lease file --- v3: * Improved file handling, removed redundant copying, introduced --help and --version v2: * Changed format to JSON * Refer: https://www.redhat.com/archives/libvir-list/2014-January/msg01234.html v1: * Refer: https://www.redhat.com/archives/libvir-list/2014-January/msg00626.html src/Makefile.am | 16 +++ src/network/bridge_driver.c | 19 +++ src/util/leaseshelper.c | 303 +++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 338 insertions(+), 0 deletions(-) create mode 100644 src/util/leaseshelper.c diff --git a/src/Makefile.am b/src/Makefile.am index 6d21e5d..b8e1993 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -849,6 +849,9 @@ STORAGE_HELPER_DISK_SOURCES = \ UTIL_IO_HELPER_SOURCES = \ util/iohelper.c +UTIL_LEASES_HELPER_SOURCES = \ + util/leaseshelper.c + # Network filters NWFILTER_DRIVER_SOURCES = \ nwfilter/nwfilter_driver.h nwfilter/nwfilter_driver.c \ @@ -2444,6 +2447,19 @@ libvirt_iohelper_CFLAGS = \ $(AM_CFLAGS) \ $(PIE_CFLAGS) \ $(NULL) + +libexec_PROGRAMS += libvirt_leaseshelper +libvirt_leaseshelper_SOURCES = $(UTIL_LEASES_HELPER_SOURCES) +libvirt_leaseshelper_LDADD = \ + libvirt_util.la \ + ../gnulib/lib/libgnu.la +if WITH_DTRACE_PROBES +libvirt_leaseshelper_LDADD += libvirt_probes.lo +endif WITH_DTRACE_PROBES + +libvirt_leaseshelper_CFLAGS = \ + $(PIE_CFLAGS) \ + $(NULL) endif WITH_LIBVIRTD if WITH_STORAGE_DISK diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c index a6c719d..9fb750f 100644 --- a/src/network/bridge_driver.c +++ b/src/network/bridge_driver.c @@ -205,6 +205,16 @@ networkDnsmasqLeaseFileNameFunc networkDnsmasqLeaseFileName = networkDnsmasqLeaseFileNameDefault; static char * +networkDnsmasqLeaseFileNameCustom(const char *bridge) +{ + char *leasefile; + + ignore_value(virAsprintf(&leasefile, "%s/%s.status", + driverState->dnsmasqStateDir, bridge)); + return leasefile; +} + +static char * networkDnsmasqConfigFileName(const char *netname) { char *conffile; @@ -240,6 +250,7 @@ networkRemoveInactive(virNetworkDriverStatePtr driver, virNetworkObjPtr net) { char *leasefile = NULL; + char *customleasefile = NULL; char *radvdconfigfile = NULL; char *configfile = NULL; char *radvdpidbase = NULL; @@ -258,6 +269,9 @@ networkRemoveInactive(virNetworkDriverStatePtr driver, if (!(leasefile = networkDnsmasqLeaseFileName(def->name))) goto cleanup; + if (!(customleasefile = networkDnsmasqLeaseFileNameCustom(def->bridge))) + goto cleanup; + if (!(radvdconfigfile = networkRadvdConfigFileName(def->name))) goto cleanup; @@ -274,6 +288,7 @@ networkRemoveInactive(virNetworkDriverStatePtr driver, /* dnsmasq */ dnsmasqDelete(dctx); unlink(leasefile); + unlink(customleasefile); unlink(configfile); /* radvd */ @@ -1117,6 +1132,10 @@ networkBuildDhcpDaemonCommandLine(virNetworkObjPtr network, cmd = virCommandNew(dnsmasqCapsGetBinaryPath(caps)); virCommandAddArgFormat(cmd, "--conf-file=%s", configfile); + + /* This helper is used to create custom leases file for libvirt */ + virCommandAddArgFormat(cmd, "--dhcp-script=%s", LIBEXECDIR "/libvirt_leaseshelper"); + *cmdout = cmd; ret = 0; cleanup: diff --git a/src/util/leaseshelper.c b/src/util/leaseshelper.c new file mode 100644 index 0000000..bd8110f --- /dev/null +++ b/src/util/leaseshelper.c @@ -0,0 +1,303 @@ +/* + * leasehelper.c: Helper program to create custom leases file + * + * Copyright (C) 2014 Red Hat, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library. If not, see + * <http://www.gnu.org/licenses/>. + * + * Author: Nehal J Wani <nehaljw.kkd1(a)gmail.com> + */ + +#include <config.h> + +#include <stdio.h> +#include <stdlib.h> +#include <sys/stat.h> + +#include "virutil.h" +#include "virthread.h" +#include "virfile.h" +#include "virbuffer.h" +#include "virstring.h" +#include "virerror.h" +#include "viralloc.h" +#include "virjson.h" +#include "configmake.h" + +#define VIR_FROM_THIS VIR_FROM_NETWORK + +/** + * VIR_NETWORK_DHCP_LEASE_FILE_SIZE_MAX: + * + * Macro providing the upper limit on the size of leases file + */ +#define VIR_NETWORK_DHCP_LEASE_FILE_SIZE_MAX (2 * 1024 * 1024) + +static const char *program_name; + +/* Display version information. */ +static void +helperVersion(const char *argv0) +{ + printf("%s (%s) %s\n", argv0, PACKAGE_NAME, PACKAGE_VERSION); +} + +ATTRIBUTE_NORETURN static void +usage(int status) +{ + if (status) { + fprintf(stderr, _("%s: try --help for more details\n"), program_name); + } else { + printf(_("Usage: %s ACTION MAC|CLIENTID IP HOSTNAME\n" + " or: %s ACTION MAC|CLIENTID IP\n"), + program_name, program_name); + } + exit(status); +} + +static int +customLeaseRewriteFile(int fd, void *opaque) +{ + char **data = opaque; + + if (safewrite(fd, *data, strlen(*data)) < 0) + return -1; + + return 0; +} + +int +main(int argc, char **argv) +{ + char *lease_entries = NULL; + char *custom_lease_file = NULL; + const char *ip = NULL; + const char *mac = NULL; + const char *action = NULL; + const char *iaid = virGetEnvAllowSUID("DNSMASQ_IAID"); + const char *clientid = virGetEnvAllowSUID("DNSMASQ_CLIENT_ID"); + const char *interface = virGetEnvAllowSUID("DNSMASQ_INTERFACE"); + const char *exptime = virGetEnvAllowSUID("DNSMASQ_LEASE_EXPIRES"); + const char *hostname = virGetEnvAllowSUID("DNSMASQ_SUPPLIED_HOSTNAME"); + const char *leases_str = NULL; + long long expirytime = 0; + size_t i = 0; + int rv = EXIT_FAILURE; + int size = 0; + int custom_lease_file_len = 0; + bool add = false; + bool delete = false; + virJSONValuePtr lease_new = NULL; + virJSONValuePtr lease_tmp = NULL; + virJSONValuePtr leases_array = NULL; + virJSONValuePtr leases_array_new = NULL; + + virSetErrorFunc(NULL, NULL); + virSetErrorLogPriorityFunc(NULL); + + program_name = argv[0]; + + if (setlocale(LC_ALL, "") == NULL || + bindtextdomain(PACKAGE, LOCALEDIR) == NULL || + textdomain(PACKAGE) == NULL) { + fprintf(stderr, _("%s: initialization failed\n"), program_name); + exit(EXIT_FAILURE); + } + + if (virThreadInitialize() < 0 || + virErrorInitialize() < 0) { + fprintf(stderr, _("%s: initialization failed\n"), program_name); + exit(EXIT_FAILURE); + } + + /* Doesn't hurt to check */ + if (argc > 1) { + if(STREQ(argv[1], "--help")) + usage(EXIT_SUCCESS); + + if (STREQ(argv[1], "--version")) { + helperVersion(argv[0]); + exit(EXIT_SUCCESS); + } + } + + if (argc != 4 && argc != 5) { + /* Refer man page of dnsmasq --dhcp-script for more details */ + usage(EXIT_FAILURE); + } + + /* Make sure dnsmasq knows the interface. The interface name is not known + * when dnsmasq (re)starts and throws 'del' events for expired leases. + * So, if any old lease has expired, it will be automatically removed the + * next time this program is invoked */ + if (!interface) + goto cleanup; + + ip = argv[3]; + mac = argv[2]; + action = argv[1]; + + /* In case hostname is known, it is the 5th argument */ + if (argc == 5) + hostname = argv[4]; + + if (virAsprintf(&custom_lease_file, "%s/%s.status", LOCALSTATEDIR + "/lib/libvirt/dnsmasq/", interface) < 0) + goto cleanup; + + /* Check if it is an IPv6 lease */ + if (virGetEnvAllowSUID("DNSMASQ_IAID")) { + mac = virGetEnvAllowSUID("DNSMASQ_MAC"); + clientid=argv[2]; + } + + /* Since interfaces can be hot plugged, we need to make sure that the + * corresponding custom lease file exists. If not, 'touch' it */ + if (virFileTouch(custom_lease_file, 0644) < 0) + goto cleanup; + + /* Read entire contents */ + if ((custom_lease_file_len = virFileReadAll(custom_lease_file, + VIR_NETWORK_DHCP_LEASE_FILE_SIZE_MAX, + &lease_entries)) < 0) { + goto cleanup; + } + + if (STREQ(action, "add") || STREQ(action, "old") || STREQ(action, "del")) { + if (mac || STREQ(action, "del")) { + /* Delete the corresponding lease */ + delete = true; + if (STREQ(action, "add") || STREQ(action, "old")) { + add = true; + /* Create new lease */ + if (!(lease_new = virJSONValueNewObject())) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("failed to create json")); + goto cleanup; + } + + if (virStrToLong_ll(exptime, NULL, 10, &expirytime) < 0) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Unable to convert lease expiry time to long long: %s"), + exptime); + goto cleanup; + } + + if ((iaid && virJSONValueObjectAppendString(lease_new, "iaid", + iaid) < 0) || + (ip && virJSONValueObjectAppendString(lease_new, "ip-address", + ip) < 0) || + (mac && virJSONValueObjectAppendString(lease_new, "mac-address", + mac) < 0) || + (hostname && virJSONValueObjectAppendString(lease_new, "hostname", + hostname) < 0) || + (clientid && virJSONValueObjectAppendString(lease_new, "client-id", + clientid) < 0) || + (expirytime && virJSONValueObjectAppendNumberLong(lease_new, "expiry-time", + expirytime) < 0)) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("failed to create json")); + goto cleanup; + } + } + } + } + else { + fprintf(stderr, _("Unsupported action: %s\n"), action); + exit(EXIT_FAILURE); + } + + /* Check for previous leases */ + if (custom_lease_file_len) { + if (!(leases_array = virJSONValueFromString(lease_entries))) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("invalid json in file: %s"), custom_lease_file); + goto cleanup; + } + + if ((size = virJSONValueArraySize(leases_array)) < 0) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("couldn't fetch array of leases")); + goto cleanup; + } + } + + if (!(leases_array_new = virJSONValueNewArray())) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("failed to create json")); + goto cleanup; + } + + for (i = 0; i < size; i++) { + const char *ip_tmp = NULL; + long long exptime_tmp = -1; + + if (!(lease_tmp = virJSONValueArrayGet(leases_array, i))) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("failed to parse json")); + goto cleanup; + } + + if (!(ip_tmp = virJSONValueObjectGetString(lease_tmp, "ip-address")) || + (virJSONValueObjectGetNumberLong(lease_tmp, "expiry-time", &exptime_tmp) < 0)) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("failed to parse json")); + goto cleanup; + } + + /* Check whether lease has expired or not */ + if (exptime_tmp < (long long) time(NULL)) + continue; + + /* Check whether lease has to be included or not */ + if (delete && STREQ(ip_tmp, ip)) + continue; + + /* Add old lease to new array */ + if (virJSONValueArrayAppend(leases_array_new, lease_tmp) < 0) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("failed to create json")); + goto cleanup; + } + } + + if (add) { + if (virJSONValueArrayAppend(leases_array_new, lease_new) < 0) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("failed to create json")); + goto cleanup; + } + } + + if (!(leases_str = virJSONValueToString(leases_array_new, true))) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("empty json array")); + goto cleanup; + } + + /* Write to file */ + if (virFileRewrite(custom_lease_file, 0644, + customLeaseRewriteFile, &leases_str) < 0) + goto cleanup; + + rv = EXIT_SUCCESS; + +cleanup: + VIR_FREE(custom_lease_file); + virJSONValueFree(lease_new); + virJSONValueFree(leases_array); + virJSONValueFree(leases_array_new); + return rv; +} -- 1.7.1

2 5

[libvirt] [PATCH] hotplug:Fix log mistake in qemuMonitorAddNetdev
by Wangrui (K) 13 Mar '14

13 Mar '14

>From 81de0ce710bad91a2df18247e681b5a83872b8d5 Mon Sep 17 00:00:00 2001 From: Wang Rui <moon.wangrui(a)huawei.com> Date: Thu, 13 Mar 2014 17:05:03 +0000 Subject: [PATCH] hotplug:Fix log mistake in qemuMonitorAddNetdev VIR_DEBUG in qemuMonitorAddNetdev should print vhostfdSize Signed-off-by: Wang Rui <moon.wangrui(a)huawei.com> --- src/qemu/qemu_monitor.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c index e4707b7..b2af0ae 100644 --- a/src/qemu/qemu_monitor.c +++ b/src/qemu/qemu_monitor.c @@ -2781,7 +2781,7 @@ int qemuMonitorAddNetdev(qemuMonitorPtr mon, VIR_DEBUG("mon=%p netdevstr=%s tapfd=%p tapfdName=%p tapfdSize=%d" "vhostfd=%p vhostfdName=%p vhostfdSize=%d", mon, netdevstr, tapfd, tapfdName, tapfdSize, - vhostfd, vhostfdName, tapfdSize); + vhostfd, vhostfdName, vhostfdSize); if (!mon) { virReportError(VIR_ERR_INVALID_ARG, "%s", -- 1.8.3.4

2 1

[libvirt] [PATCH] Make ABI stability issue easier to debug
by Jiri Denemark 13 Mar '14

13 Mar '14

When ABI stability check fails, we only log the error message describing the incompatibility. Let's log both XMLs in case of an error to make it easier to analyze where and why the stability check failed. Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- src/conf/domain_conf.c | 125 ++++++++++++++++++++++++++++--------------------- 1 file changed, 72 insertions(+), 53 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index e1b0115..a528257 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -13866,13 +13866,16 @@ virDomainDefCheckABIStability(virDomainDefPtr src, virDomainDefPtr dst) { size_t i; + virErrorPtr err; + char *strSrc; + char *strDst; if (src->virtType != dst->virtType) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("Target domain virt type %s does not match source %s"), virDomainVirtTypeToString(dst->virtType), virDomainVirtTypeToString(src->virtType)); - return false; + goto error; } if (memcmp(src->uuid, dst->uuid, VIR_UUID_BUFLEN) != 0) { @@ -13883,7 +13886,7 @@ virDomainDefCheckABIStability(virDomainDefPtr src, virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("Target domain uuid %s does not match source %s"), uuiddst, uuidsrc); - return false; + goto error; } /* Not strictly ABI related, but we want to make sure domains @@ -13894,60 +13897,60 @@ virDomainDefCheckABIStability(virDomainDefPtr src, virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("Target domain name '%s' does not match source '%s'"), dst->name, src->name); - return false; + goto error; } if (src->mem.max_balloon != dst->mem.max_balloon) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("Target domain max memory %lld does not match source %lld"), dst->mem.max_balloon, src->mem.max_balloon); - return false; + goto error; } if (src->mem.cur_balloon != dst->mem.cur_balloon) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("Target domain current memory %lld does not match source %lld"), dst->mem.cur_balloon, src->mem.cur_balloon); - return false; + goto error; } if (src->mem.hugepage_backed != dst->mem.hugepage_backed) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("Target domain huge page backing %d does not match source %d"), dst->mem.hugepage_backed, src->mem.hugepage_backed); - return false; + goto error; } if (src->vcpus != dst->vcpus) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("Target domain vCPU count %d does not match source %d"), dst->vcpus, src->vcpus); - return false; + goto error; } if (src->maxvcpus != dst->maxvcpus) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("Target domain vCPU max %d does not match source %d"), dst->maxvcpus, src->maxvcpus); - return false; + goto error; } if (STRNEQ(src->os.type, dst->os.type)) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("Target domain OS type %s does not match source %s"), dst->os.type, src->os.type); - return false; + goto error; } if (src->os.arch != dst->os.arch){ virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("Target domain architecture %s does not match source %s"), virArchToString(dst->os.arch), virArchToString(src->os.arch)); - return false; + goto error; } if (STRNEQ_NULLABLE(src->os.machine, dst->os.machine)) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("Target domain OS type %s does not match source %s"), dst->os.machine, src->os.machine); - return false; + goto error; } if (src->os.smbios_mode != dst->os.smbios_mode) { @@ -13955,203 +13958,203 @@ virDomainDefCheckABIStability(virDomainDefPtr src, _("Target domain SMBIOS mode %s does not match source %s"), virDomainSmbiosModeTypeToString(dst->os.smbios_mode), virDomainSmbiosModeTypeToString(src->os.smbios_mode)); - return false; + goto error; } if (!virDomainDefFeaturesCheckABIStability(src, dst)) - return false; + goto error; if (src->clock.ntimers != dst->clock.ntimers) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("Target domain timers do not match source")); - return false; + goto error; } for (i = 0; i < src->clock.ntimers; i++) { if (!virDomainTimerDefCheckABIStability(src->clock.timers[i], dst->clock.timers[i])) - return false; + goto error; } if (!virCPUDefIsEqual(src->cpu, dst->cpu)) - return false; + goto error; if (!virSysinfoIsEqual(src->sysinfo, dst->sysinfo)) - return false; + goto error; if (src->ndisks != dst->ndisks) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("Target domain disk count %zu does not match source %zu"), dst->ndisks, src->ndisks); - return false; + goto error; } for (i = 0; i < src->ndisks; i++) if (!virDomainDiskDefCheckABIStability(src->disks[i], dst->disks[i])) - return false; + goto error; if (src->ncontrollers != dst->ncontrollers) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("Target domain controller count %zu " "does not match source %zu"), dst->ncontrollers, src->ncontrollers); - return false; + goto error; } for (i = 0; i < src->ncontrollers; i++) if (!virDomainControllerDefCheckABIStability(src->controllers[i], dst->controllers[i])) - return false; + goto error; if (src->nfss != dst->nfss) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("Target domain filesystem count %zu " "does not match source %zu"), dst->nfss, src->nfss); - return false; + goto error; } for (i = 0; i < src->nfss; i++) if (!virDomainFsDefCheckABIStability(src->fss[i], dst->fss[i])) - return false; + goto error; if (src->nnets != dst->nnets) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("Target domain net card count %zu " "does not match source %zu"), dst->nnets, src->nnets); - return false; + goto error; } for (i = 0; i < src->nnets; i++) if (!virDomainNetDefCheckABIStability(src->nets[i], dst->nets[i])) - return false; + goto error; if (src->ninputs != dst->ninputs) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("Target domain input device count %zu " "does not match source %zu"), dst->ninputs, src->ninputs); - return false; + goto error; } for (i = 0; i < src->ninputs; i++) if (!virDomainInputDefCheckABIStability(src->inputs[i], dst->inputs[i])) - return false; + goto error; if (src->nsounds != dst->nsounds) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("Target domain sound card count %zu " "does not match source %zu"), dst->nsounds, src->nsounds); - return false; + goto error; } for (i = 0; i < src->nsounds; i++) if (!virDomainSoundDefCheckABIStability(src->sounds[i], dst->sounds[i])) - return false; + goto error; if (src->nvideos != dst->nvideos) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("Target domain video card count %zu " "does not match source %zu"), dst->nvideos, src->nvideos); - return false; + goto error; } for (i = 0; i < src->nvideos; i++) if (!virDomainVideoDefCheckABIStability(src->videos[i], dst->videos[i])) - return false; + goto error; if (src->nhostdevs != dst->nhostdevs) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("Target domain host device count %zu " "does not match source %zu"), dst->nhostdevs, src->nhostdevs); - return false; + goto error; } for (i = 0; i < src->nhostdevs; i++) if (!virDomainHostdevDefCheckABIStability(src->hostdevs[i], dst->hostdevs[i])) - return false; + goto error; if (src->nsmartcards != dst->nsmartcards) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("Target domain smartcard count %zu " "does not match source %zu"), dst->nsmartcards, src->nsmartcards); - return false; + goto error; } for (i = 0; i < src->nsmartcards; i++) if (!virDomainSmartcardDefCheckABIStability(src->smartcards[i], dst->smartcards[i])) - return false; + goto error; if (src->nserials != dst->nserials) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("Target domain serial port count %zu " "does not match source %zu"), dst->nserials, src->nserials); - return false; + goto error; } for (i = 0; i < src->nserials; i++) if (!virDomainSerialDefCheckABIStability(src->serials[i], dst->serials[i])) - return false; + goto error; if (src->nparallels != dst->nparallels) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("Target domain parallel port count %zu " "does not match source %zu"), dst->nparallels, src->nparallels); - return false; + goto error; } for (i = 0; i < src->nparallels; i++) if (!virDomainParallelDefCheckABIStability(src->parallels[i], dst->parallels[i])) - return false; + goto error; if (src->nchannels != dst->nchannels) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("Target domain channel count %zu " "does not match source %zu"), dst->nchannels, src->nchannels); - return false; + goto error; } for (i = 0; i < src->nchannels; i++) if (!virDomainChannelDefCheckABIStability(src->channels[i], dst->channels[i])) - return false; + goto error; if (src->nconsoles != dst->nconsoles) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("Target domain console count %zu " "does not match source %zu"), dst->nconsoles, src->nconsoles); - return false; + goto error; } for (i = 0; i < src->nconsoles; i++) if (!virDomainConsoleDefCheckABIStability(src->consoles[i], dst->consoles[i])) - return false; + goto error; if (src->nhubs != dst->nhubs) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("Target domain hub device count %zu " "does not match source %zu"), dst->nhubs, src->nhubs); - return false; + goto error; } for (i = 0; i < src->nhubs; i++) if (!virDomainHubDefCheckABIStability(src->hubs[i], dst->hubs[i])) - return false; + goto error; if ((!src->redirfilter && dst->redirfilter) || (src->redirfilter && !dst->redirfilter)) { @@ -14159,13 +14162,13 @@ virDomainDefCheckABIStability(virDomainDefPtr src, _("Target domain USB redirection filter count %d " "does not match source %d"), dst->redirfilter ? 1 : 0, src->redirfilter ? 1 : 0); - return false; + goto error; } if (src->redirfilter && !virDomainRedirFilterDefCheckABIStability(src->redirfilter, dst->redirfilter)) - return false; + goto error; if ((!src->watchdog && dst->watchdog) || (src->watchdog && !dst->watchdog)) { @@ -14173,12 +14176,12 @@ virDomainDefCheckABIStability(virDomainDefPtr src, _("Target domain watchdog count %d " "does not match source %d"), dst->watchdog ? 1 : 0, src->watchdog ? 1 : 0); - return false; + goto error; } if (src->watchdog && !virDomainWatchdogDefCheckABIStability(src->watchdog, dst->watchdog)) - return false; + goto error; if ((!src->memballoon && dst->memballoon) || (src->memballoon && !dst->memballoon)) { @@ -14186,21 +14189,37 @@ virDomainDefCheckABIStability(virDomainDefPtr src, _("Target domain memory balloon count %d " "does not match source %d"), dst->memballoon ? 1 : 0, src->memballoon ? 1 : 0); - return false; + goto error; } if (src->memballoon && !virDomainMemballoonDefCheckABIStability(src->memballoon, dst->memballoon)) - return false; + goto error; if (!virDomainRNGDefCheckABIStability(src->rng, dst->rng)) - return false; + goto error; if (!virDomainPanicCheckABIStability(src->panic, dst->panic)) - return false; + goto error; return true; + +error: + err = virSaveLastError(); + + strSrc = virDomainDefFormat(src, 0); + strDst = virDomainDefFormat(dst, 0); + VIR_DEBUG("XMLs that failed stability check were: src=\"%s\", dst=\"%s\"", + NULLSTR(strSrc), NULLSTR(strDst)); + VIR_FREE(strSrc); + VIR_FREE(strDst); + + if (err) { + virSetError(err); + virFreeError(err); + } + return false; } -- 1.9.0

2 2

[libvirt] [PATCH 0/7] Test parsing of iscsiadm output
by Ján Tomko 13 Mar '14

13 Mar '14

Introduce virCommandSetMockOutputFile for faking output of asynchronous commands and use it to test parsing of iscsiadm output in virStorageBackendISCSISession and virStorageBackendISCSIScanTargets Ján Tomko (7): Change virStorageBackendISCSISession 'probe' arg to bool Introduce virStoragePoolSourceDeviceClear Use size_t for ndevice in pool source definition Introduce vircommandpriv.h for functions used by tests Add virCommandSetMockOutputFile Add test for virStorageBackendISCSISession Add a test for virStorageBackendISCSIScanTargets src/Makefile.am | 5 +- src/conf/storage_conf.c | 36 ++--- src/conf/storage_conf.h | 3 +- src/libvirt_private.syms | 2 + src/storage/storage_backend_iscsi.c | 14 +- src/storage/storage_backend_iscsipriv.h | 36 +++++ src/util/vircommand.c | 35 ++++- src/util/vircommand.h | 2 - src/util/vircommandpriv.h | 29 ++++ tests/Makefile.am | 14 +- tests/storageiscsidata/iscsiadm_sendtargets | 6 + tests/storageiscsidata/iscsiadm_session | 6 + tests/storageiscsidata/iscsiadm_session_nonflash | 6 + tests/storageiscsitest.c | 186 +++++++++++++++++++++++ tests/virkmodtest.c | 2 +- tests/virnetdevbandwidthtest.c | 2 +- 16 files changed, 350 insertions(+), 34 deletions(-) create mode 100644 src/storage/storage_backend_iscsipriv.h create mode 100644 src/util/vircommandpriv.h create mode 100644 tests/storageiscsidata/iscsiadm_sendtargets create mode 100644 tests/storageiscsidata/iscsiadm_session create mode 100644 tests/storageiscsidata/iscsiadm_session_nonflash create mode 100644 tests/storageiscsitest.c -- 1.8.3.2

2 16

[libvirt] [PATCH] qemu: Forbid "sgio" support for SCSI generic host device
by Osier Yang 13 Mar '14

13 Mar '14

The kernel didn't support the unprivileged SGIO for SCSI generic device finally, and since it's unknow whether the way to support unprivileged SGIO for SCSI generic device will be similar as for SCSI block device or not, even it's simliar (I.e. via sysfs, for SCSI block device, it's /sys/dev/block/8\:0/queue/unpriv_sgio, for example), the file name might be different, So it's better not guess what it should be like currently. This patch removes the related code (mainly about the "shareable" checking on the "sgio" setting, it's not supported at all, why we leave checking code there? :-), and error out if "sgio" is specified in the domain config. --- src/qemu/qemu_conf.c | 87 ++++++++++++---------------------------------------- 1 file changed, 20 insertions(+), 67 deletions(-) diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c index 2c397b0..ad6348d 100644 --- a/src/qemu/qemu_conf.c +++ b/src/qemu/qemu_conf.c @@ -739,12 +739,8 @@ qemuCheckSharedDevice(virHashTablePtr sharedDevices, virDomainDeviceDefPtr dev) { virDomainDiskDefPtr disk = NULL; - virDomainHostdevDefPtr hostdev = NULL; char *sysfs_path = NULL; char *key = NULL; - char *hostdev_name = NULL; - char *hostdev_path = NULL; - char *device_path = NULL; int val; int ret = 0; @@ -756,27 +752,11 @@ qemuCheckSharedDevice(virHashTablePtr sharedDevices, */ if (disk->device != VIR_DOMAIN_DISK_DEVICE_LUN) return 0; - - device_path = disk->src; - } else if (dev->type == VIR_DOMAIN_DEVICE_HOSTDEV) { - hostdev = dev->data.hostdev; - - if (!(hostdev_name = virSCSIDeviceGetDevName(NULL, - hostdev->source.subsys.u.scsi.adapter, - hostdev->source.subsys.u.scsi.bus, - hostdev->source.subsys.u.scsi.target, - hostdev->source.subsys.u.scsi.unit))) - goto cleanup; - - if (virAsprintf(&hostdev_path, "/dev/%s", hostdev_name) < 0) - goto cleanup; - - device_path = hostdev_path; } else { return 0; } - if (!(sysfs_path = virGetUnprivSGIOSysfsPath(device_path, NULL))) { + if (!(sysfs_path = virGetUnprivSGIOSysfsPath(disk->src, NULL))) { ret = -1; goto cleanup; } @@ -787,7 +767,7 @@ qemuCheckSharedDevice(virHashTablePtr sharedDevices, if (!virFileExists(sysfs_path)) goto cleanup; - if (!(key = qemuGetSharedDeviceKey(device_path))) { + if (!(key = qemuGetSharedDeviceKey(disk->src))) { ret = -1; goto cleanup; } @@ -798,7 +778,7 @@ qemuCheckSharedDevice(virHashTablePtr sharedDevices, if (!(virHashLookup(sharedDevices, key))) goto cleanup; - if (virGetDeviceUnprivSGIO(device_path, NULL, &val) < 0) { + if (virGetDeviceUnprivSGIO(disk->src, NULL, &val) < 0) { ret = -1; goto cleanup; } @@ -810,36 +790,25 @@ qemuCheckSharedDevice(virHashTablePtr sharedDevices, disk->sgio == VIR_DOMAIN_DEVICE_SGIO_UNFILTERED)) goto cleanup; - if (dev->type == VIR_DOMAIN_DEVICE_DISK) { - if (disk->type == VIR_DOMAIN_DISK_TYPE_VOLUME) { - virReportError(VIR_ERR_OPERATION_INVALID, - _("sgio of shared disk 'pool=%s' 'volume=%s' conflicts " - "with other active domains"), - disk->srcpool->pool, - disk->srcpool->volume); - } else { - virReportError(VIR_ERR_OPERATION_INVALID, - _("sgio of shared disk '%s' conflicts with other " - "active domains"), disk->src); - } + if (disk->type == VIR_DOMAIN_DISK_TYPE_VOLUME) { + virReportError(VIR_ERR_OPERATION_INVALID, + _("sgio of shared disk 'pool=%s' 'volume=%s' conflicts " + "with other active domains"), + disk->srcpool->pool, + disk->srcpool->volume); } else { virReportError(VIR_ERR_OPERATION_INVALID, - _("sgio of shared scsi host device '%s-%d-%d-%d' conflicts " - "with other active domains"), - hostdev->source.subsys.u.scsi.adapter, - hostdev->source.subsys.u.scsi.bus, - hostdev->source.subsys.u.scsi.target, - hostdev->source.subsys.u.scsi.unit); + _("sgio of shared disk '%s' conflicts with other " + "active domains"), disk->src); } ret = -1; cleanup: - VIR_FREE(hostdev_name); - VIR_FREE(hostdev_path); VIR_FREE(sysfs_path); VIR_FREE(key); return ret; } + bool qemuSharedDeviceEntryDomainExists(qemuSharedDeviceEntryPtr entry, const char *name, @@ -1116,8 +1085,6 @@ qemuSetUnprivSGIO(virDomainDeviceDefPtr dev) virDomainHostdevDefPtr hostdev = NULL; char *sysfs_path = NULL; char *path = NULL; - char *hostdev_name = NULL; - char *hostdev_path = NULL; int val = -1; int ret = 0; @@ -1135,22 +1102,15 @@ qemuSetUnprivSGIO(virDomainDeviceDefPtr dev) } else if (dev->type == VIR_DOMAIN_DEVICE_HOSTDEV) { hostdev = dev->data.hostdev; - if (!hostdev->shareable || - !(hostdev->mode == VIR_DOMAIN_HOSTDEV_MODE_SUBSYS && - hostdev->source.subsys.type == VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_SCSI)) - return 0; - - if (!(hostdev_name = virSCSIDeviceGetDevName(NULL, - hostdev->source.subsys.u.scsi.adapter, - hostdev->source.subsys.u.scsi.bus, - hostdev->source.subsys.u.scsi.target, - hostdev->source.subsys.u.scsi.unit))) - goto cleanup; - - if (virAsprintf(&hostdev_path, "/dev/%s", hostdev_name) < 0) + if (hostdev->source.subsys.u.scsi.sgio) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("'sgio' is not supported for SCSI " + "generic device yet ")); + ret = -1; goto cleanup; + } - path = hostdev_path; + return 0; } else { return 0; } @@ -1162,12 +1122,7 @@ qemuSetUnprivSGIO(virDomainDeviceDefPtr dev) } /* By default, filter the SG_IO commands, i.e. set unpriv_sgio to 0. */ - - if (dev->type == VIR_DOMAIN_DEVICE_DISK) - val = (disk->sgio == VIR_DOMAIN_DEVICE_SGIO_UNFILTERED); - else - val = (hostdev->source.subsys.u.scsi.sgio == - VIR_DOMAIN_DEVICE_SGIO_UNFILTERED); + val = (disk->sgio == VIR_DOMAIN_DEVICE_SGIO_UNFILTERED); /* Do not do anything if unpriv_sgio is not supported by the kernel and the * whitelist is enabled. But if requesting unfiltered access, always call @@ -1179,8 +1134,6 @@ qemuSetUnprivSGIO(virDomainDeviceDefPtr dev) cleanup: VIR_FREE(sysfs_path); - VIR_FREE(hostdev_name); - VIR_FREE(hostdev_path); return ret; } -- 1.8.1.4

2 5

[libvirt] [PATCH] docs: add VMmanager to web apps
by Martin Kletzander 13 Mar '14

13 Mar '14

This is a request for adding a VMmanager application as requested and described by Ksenya Phil. Signed-off-by: Ksenya Phil <philka2003(a)mail.ru> Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- docs/apps.html.in | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/docs/apps.html.in b/docs/apps.html.in index 7b581db..86e45fc 100644 --- a/docs/apps.html.in +++ b/docs/apps.html.in @@ -393,6 +393,15 @@ with FreeIPA for Kerberos authentication, and in the future, certificate management. </dd> + <dt><a href="http://ispsystem.com/en/software/vmmanager">VMmanager</a></dt> + <dd> + VMmanager is a software solution for virtualization management + that can be used both for hosting virtual machines and + building a cloud. VMmanager can manage not only one server, + but a large cluster of hypervisors. It delivers a number of + functions, such as live migration that allows for load + balancing between cluster nodes, monitoring CPU, memory. + </dd> </dl> <h2><a name="mobile">Mobile applications</a></h2> -- 1.9.0

2 2

[libvirt] [PATCH v14 00/49] write separate module for hostdev passthrough
by Chunyan Liu 13 Mar '14

13 Mar '14

These patches implements a separate module for hostdev passthrough so that it could be shared by different drivers and can maintain a global state of a host device. Patch 1: fix memory leak in virscsi.c Patch 2: improve virHostdevManager to use virOject wrapper and keep reference Patches 3~7: switch existing qemu and lxc driver to use virHostdevManager's lists, so that to maintain a global state of every host device. Patches 8~45 are to extract general code from qemu_hostdev.c piece by piece, make them reusable common APIs. Patches 46: unit test for the virhostdev common library Patches 47: add a hostdev backend type for xen Patches 48: add pci passthrough to libxl driver based on the common library Patches 49: change lxc to use common library APIs --- changes to v13: * change virHostdevManager, use virObject and keep reference, solve 'free' problem * add .hostdevMgr to qemu/lxc/libxl driver, get virHostdevManager in StateInitialize for once and keep reference, instead of getting it every time virHostdevManager is used. * fix v13 3/49 "qemu-reuse-hostdev-interfaces-to-avoid-duplicate.patch": update qemuPrepareHostUSBDevices parameters to specify hostdevs and nhostdevs, so that could be reused in qemu_hotplug. * rebase left patches Chunyan Liu (49): virscsi: fix memory leak virhostdev: use virObject to virHostdevManager to keep reference update qemuPrepareHostUSBDevices parameters to keep consistency qemu: reuse hostdev interfaces to avoid duplicate qemu: remove functions used internally only from qemu_hostdev.h qemu: use general virhostdev lists instead of its own lxc: use general virhostdev lists instead of its own qemu_hostdev: move cfg->relaxedACS as a flag qemu_hostdev: move ColdBoot as a flag qemu_hostdev: move netconfig file location to virhostdev stateDir extract general code from qemuPrepareHostdevPCIDevices rename qemu*NetConfigRestore/Replace to virHostdevNetConfigRestore/Replace rename qemuGet*PciHostDeviceList to virHostdevGet*PciHostDeviceList pass driver name as a parameter to virHostdevPrepareHostdevPCIDevices extract general code from qemuDomainReAttachHostdevDevices pass driver name as a parameter to virHostdevReAttachPCIDevices rename qemuReAttachPciDevice to virHostdevReAttachPciDevice move virHostdevPrepare(ReAttach)PCIDevices to virhostdev.c extract general code from qemuUpdateActivePciHostdevs extract general code from qemuUpdateActiveUsbHostdevs extract general code from qemuUpdateActiveScsiHostdevs pass driver_name as parameter of virHostdevUpdate*Hostdevs functions move virHostdevUpdate* functions to virhostdev.c extract general code from qemuPrepareHostUSBDevices rename qemu*USBDevices to virHostdev*USBDevices pass driver name to virHostdevPrepareUSBDevices move virHostdevPrepareHostUSBDevices to virhostdev.c extract general code from qemuPrepareHostSCSIDevices pass driver name as parameter to virHostdevPrepareSCSIDevices move virHostdevPrepareHostSCSIDevices to virhostdev.c extract general code from qemuDomainReAttachHostUsbDevices pass driver name as paramter to virHostdevReAttachUsbHostdevs move virHostdevReAttachUsbHostdevs to virhostdev.c extract general code from qemuDomainReAttachHostScsiDevices pass driver name as parameter to virHostdevReAttachScciHostdevs move virHostdevReAttachHostScsiDevices to virhostdev.c extract general code of NodeDeviceDetach extract general code of NodeDeviceReAttach extract general code of NodeDeviceReset move virHostdevNodeDevice* to virhostdev.c improve parameter name to let it more meaningful rename some function names to keep consistency improve virHostdevUpdate* parameters to make it more widely used add 3 wrapper functions for prepare/reattach/update domain hostdevs add parameter checks to common interfaces add unit test for new virhostdev common library change lxc_hostdev.c to use virhostdev common library APIs add hostdev pci backend type for xen add pci passthrough to libxl driver .gitignore | 1 + docs/schemas/domaincommon.rng | 1 + src/conf/domain_conf.c | 3 +- src/conf/domain_conf.h | 1 + src/libvirt_private.syms | 15 + src/libxl/libxl_conf.c | 63 ++ src/libxl/libxl_conf.h | 7 +- src/libxl/libxl_domain.c | 9 + src/libxl/libxl_driver.c | 454 +++++++++++- src/lxc/lxc_conf.h | 5 +- src/lxc/lxc_driver.c | 12 +- src/lxc/lxc_hostdev.c | 307 +------- src/qemu/qemu_command.c | 3 +- src/qemu/qemu_conf.h | 9 +- src/qemu/qemu_driver.c | 76 +- src/qemu/qemu_hostdev.c | 1203 ++----------------------------- src/qemu/qemu_hostdev.h | 29 +- src/qemu/qemu_hotplug.c | 78 +- src/qemu/qemu_process.c | 8 +- src/util/virhostdev.c | 1565 ++++++++++++++++++++++++++++++++++++++++- src/util/virhostdev.h | 96 +++ src/util/virscsi.c | 13 +- tests/Makefile.am | 5 + tests/virhostdevtest.c | 507 +++++++++++++ 24 files changed, 2832 insertions(+), 1638 deletions(-) create mode 100644 tests/virhostdevtest.c -- 1.9.0

5 104

[libvirt] libvirt: [PATCH] libxl: Check for control_d string to decide about dom0
by Stefan Bader 13 Mar '14

13 Mar '14

I have been looking into a bug report (see BugLink) which reported libvirt to fail starting inside a Xen guest. Upon further investigation I found that some tools that help monitoring Xen guests will mount xenfs to /proc/xen. This will create a capabilities files there even if the guest is not dom0. However it will return nothing when reading from it. Ian, just to sanity check myself. I looked at the xenfs code and to me there only seem to be those two outcomes (either "control_d" for running in dom0 or notrhing if not). With the following patch applied, libvirt starts up correctly in the normal guests (with xenfs mounted) without initializing libxl. And also in dom0 where it still enables the libxl driver (if the xl toolstack is selected). -Stefan >From f11949caca6dfe1a802472a2a6d4fe760115ccc6 Mon Sep 17 00:00:00 2001 From: Stefan Bader <stefan.bader(a)canonical.com> Date: Wed, 12 Mar 2014 11:37:16 +0100 Subject: [PATCH] libxl: Check for control_d string to decide about dom0 As soon as any guest mounts xenfs to /proc/xen, there is a capabilities file in that directory. However it returns nothing when reading from it. Change the test to actually check the contents of the file. BugLink: http://bugs.launchpad.net/bugs/1248025 Signed-off-by: Stefan Bader <stefan.bader(a)canonical.com> --- src/libxl/libxl_driver.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/src/libxl/libxl_driver.c b/src/libxl/libxl_driver.c index 65d80a2..844e828 100644 --- a/src/libxl/libxl_driver.c +++ b/src/libxl/libxl_driver.c @@ -944,6 +944,7 @@ libxlDriverShouldLoad(bool privileged) bool ret = false; virCommandPtr cmd; int status; + char *output = NULL; /* Don't load if non-root */ if (!privileged) { @@ -951,8 +952,17 @@ libxlDriverShouldLoad(bool privileged) return ret; } - /* Don't load if not running on a Xen control domain (dom0) */ - if (!virFileExists("/proc/xen/capabilities")) { + /* + * Don't load if not running on a Xen control domain (dom0). It is not + * sufficient to check for the file to exist as any guest can mount + * xenfs to /proc/xen. + */ + status = virFileReadAll("/proc/xen/capabilities", 10. &output); + if (status >= 0) { + status = strncmp(output, "control_d", 9); + } + VIR_FREE(output); + if (status) { VIR_INFO("No Xen capabilities detected, probably not running " "in a Xen Dom0. Disabling libxenlight driver"); -- 1.7.9.5

4 4

[libvirt] [PATCH] Fix Invalid write in virCryptoHashString()
by Nehal J Wani 12 Mar '14

12 Mar '14

While running vircryptotest, it was found that valgrind pointed out the following error: ==27453== Invalid write of size 1 ==27453== at 0x4C7D7C9: virCryptoHashString (vircrypto.c:76) ==27453== by 0x401C4E: testCryptoHash (vircryptotest.c:41) ==27453== by 0x402A11: virtTestRun (testutils.c:199) ==27453== by 0x401AD5: mymain (vircryptotest.c:76) ==27453== by 0x40318D: virtTestMain (testutils.c:782) ==27453== by 0x3E6CE1ED1C: (below main) (libc-start.c:226) ==27453== Address 0x51f0541 is 0 bytes after a block of size 65 alloc'd ==27453== at 0x4A0577B: calloc (vg_replace_malloc.c:593) ==27453== by 0x4C69F2E: virAllocN (viralloc.c:189) ==27453== by 0x4C7D76B: virCryptoHashString (vircrypto.c:69) ==27453== by 0x401C4E: testCryptoHash (vircryptotest.c:41) ==27453== by 0x402A11: virtTestRun (testutils.c:199) ==27453== by 0x401AD5: mymain (vircryptotest.c:76) ==27453== by 0x40318D: virtTestMain (testutils.c:782) ==27453== by 0x3E6CE1ED1C: (below main) (libc-start.c:226) ==27453== ...and many more --- The errors go away, if I either do: Line 76: (*output)[hashstrlen - 1] = '\0'; or Line 61: if (VIR_ALLOC_N(*output, hashstrlen + 1) < 0) But the second one seems less harmful, as anyway we are going to free that memory. src/util/vircrypto.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/util/vircrypto.c b/src/util/vircrypto.c index 3af3aa3..aa2b0c8 100644 --- a/src/util/vircrypto.c +++ b/src/util/vircrypto.c @@ -66,7 +66,7 @@ virCryptoHashString(virCryptoHash hash, return -1; } - if (VIR_ALLOC_N(*output, hashstrlen) < 0) + if (VIR_ALLOC_N(*output, hashstrlen + 1) < 0) return -1; for (i = 0; i < hashinfo[hash].hashlen; i++) { -- 1.7.1

2 1

[libvirt] [PATCH] Fix type mismatch of virNetDev*NetConfig on non-Linux
by Ján Tomko 12 Mar '14

12 Mar '14

Commit b4bbaee changed char* to const char*, but omitted the non-Linux version. --- Pushed as a build breaker fix. src/util/virnetdev.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/util/virnetdev.c b/src/util/virnetdev.c index 9d8b7cf..55781b2 100644 --- a/src/util/virnetdev.c +++ b/src/util/virnetdev.c @@ -1802,11 +1802,11 @@ virNetDevLinkDump(const char *ifname ATTRIBUTE_UNUSED, } int -virNetDevReplaceNetConfig(char *linkdev ATTRIBUTE_UNUSED, +virNetDevReplaceNetConfig(const char *linkdev ATTRIBUTE_UNUSED, int vf ATTRIBUTE_UNUSED, const virMacAddr *macaddress ATTRIBUTE_UNUSED, int vlanid ATTRIBUTE_UNUSED, - char *stateDir ATTRIBUTE_UNUSED) + const char *stateDir ATTRIBUTE_UNUSED) { virReportSystemError(ENOSYS, "%s", _("Unable to replace net config on this platform")); @@ -1815,9 +1815,9 @@ virNetDevReplaceNetConfig(char *linkdev ATTRIBUTE_UNUSED, } int -virNetDevRestoreNetConfig(char *linkdev ATTRIBUTE_UNUSED, +virNetDevRestoreNetConfig(const char *linkdev ATTRIBUTE_UNUSED, int vf ATTRIBUTE_UNUSED, - char *stateDir ATTRIBUTE_UNUSED) + const char *stateDir ATTRIBUTE_UNUSED) { virReportSystemError(ENOSYS, "%s", _("Unable to restore net config on this platform")); -- 1.8.3.2

1 0

[libvirt] [PATCH] Load CPU map from builddir when run uninstalled
by Jiri Denemark 12 Mar '14

12 Mar '14

When libvirtd is run from a build directory without being installed, it should not depend on files from a libvirt package installed in the system. Not only because there may not be any libvirt installed at all. We already do a good job for plugins but cpu_map.xml was still loaded from the system. The Makefile.am change is necessary to make this all work from VPATH builds since libvirtd has no idea where to find libvirt sources. It only knows the path from which it was started, i.e, a builddir. https://bugzilla.redhat.com/show_bug.cgi?id=1074327 Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- daemon/libvirtd.c | 7 ++++++- src/Makefile.am | 4 ++++ src/cpu/cpu_map.c | 3 +++ 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/daemon/libvirtd.c b/daemon/libvirtd.c index 72f0e81..d91e1e9 100644 --- a/daemon/libvirtd.c +++ b/daemon/libvirtd.c @@ -103,6 +103,7 @@ #include "configmake.h" #include "virdbus.h" +#include "cpu/cpu_map.h" #if WITH_SASL virNetSASLContextPtr saslCtxt = NULL; @@ -1155,13 +1156,16 @@ int main(int argc, char **argv) { if (strstr(argv[0], "lt-libvirtd") || strstr(argv[0], "/daemon/.libs/libvirtd")) { char *tmp = strrchr(argv[0], '/'); + char *cpumap; if (!tmp) { fprintf(stderr, _("%s: cannot identify driver directory\n"), argv[0]); exit(EXIT_FAILURE); } *tmp = '\0'; char *driverdir; - if (virAsprintfQuiet(&driverdir, "%s/../../src/.libs", argv[0]) < 0) { + if (virAsprintfQuiet(&driverdir, "%s/../../src/.libs", argv[0]) < 0 || + virAsprintfQuiet(&cpumap, "%s/../../src/cpu/cpu_map.xml", + argv[0]) < 0) { fprintf(stderr, _("%s: initialization failed\n"), argv[0]); exit(EXIT_FAILURE); } @@ -1174,6 +1178,7 @@ int main(int argc, char **argv) { #ifdef WITH_DRIVER_MODULES virDriverModuleInitialize(driverdir); #endif + cpuMapOverride(cpumap); *tmp = '/'; /* Must not free 'driverdir' - it is still used */ } diff --git a/src/Makefile.am b/src/Makefile.am index 25d0370..306880b 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -977,6 +977,10 @@ libvirt_la_BUILT_LIBADD += libvirt_cpu.la libvirt_cpu_la_CFLAGS = \ -I$(top_srcdir)/src/conf $(AM_CFLAGS) libvirt_cpu_la_SOURCES = $(CPU_SOURCES) +libvirt_cpu_la_DEPENDENCIES = $(abs_builddir)/cpu/cpu_map.xml + +$(abs_builddir)/cpu/cpu_map.xml: + $(AM_V_GEN)ln -s $(srcdir)/cpu/cpu_map.xml $@ if WITH_VMX noinst_LTLIBRARIES += libvirt_vmx.la diff --git a/src/cpu/cpu_map.c b/src/cpu/cpu_map.c index 7c2bdec..f6c63d4 100644 --- a/src/cpu/cpu_map.c +++ b/src/cpu/cpu_map.c @@ -28,6 +28,7 @@ #include "cpu_map.h" #include "configmake.h" #include "virstring.h" +#include "virlog.h" #define VIR_FROM_THIS VIR_FROM_CPU @@ -86,6 +87,8 @@ int cpuMapLoad(const char *arch, int element; const char *mapfile = (cpumap ? cpumap : CPUMAPFILE); + VIR_DEBUG("Loading CPU map from %s", mapfile); + if (arch == NULL) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("undefined hardware architecture")); -- 1.9.0

3 4

[libvirt] [PATCH] nwfilter: Add missing goto err_exit in error path
by Stefan Berger 12 Mar '14

12 Mar '14

From: Stefan Berger <stefanb(a)linux.vnet.ibm.com> https://bugzilla.redhat.com/show_bug.cgi?id=1071095 Add a missing goto err_exit in the error path where an unsupported value is assigned to the CTRL_IP_LEARNING key. Signed-off-by: Stefan Berger <stefanb(a)linux.vnet.ibm.com> --- src/nwfilter/nwfilter_gentech_driver.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/nwfilter/nwfilter_gentech_driver.c b/src/nwfilter/nwfilter_gentech_driver.c index e576dc4..5c3b25e 100644 --- a/src/nwfilter/nwfilter_gentech_driver.c +++ b/src/nwfilter/nwfilter_gentech_driver.c @@ -732,6 +732,7 @@ virNWFilterInstantiate(const unsigned char *vmuuid ATTRIBUTE_UNUSED, _("filter '%s' " "learning value '%s' invalid."), filter->name, learning); + goto err_exit; } } else goto err_unresolvable_vars; -- 1.8.1.4

2 2

[libvirt] libvirtError: this function is not supported by the connection driver: virInterfaceDefineXML
by Sijo Jose 12 Mar '14

12 Mar '14

Hi, Could anyone help I'm getting the following error when I tried to add a new network interface. DETAILS Connection --------------------------- import libvirt conn = libvirt.open('qemu:///system') Interface XML ---------------------- <interface type="bridge" name="br0"> <start mode="onboot"/> <mtu size="1500"/> <protocol family="ipv4"> <dhcp/> </protocol> <bridge stp="off" delay="0.01"> <interface type="ethernet" name="eth0"> <mac address="ab:bb:cc:dd:ee:ff"/> </interface> <interface type="ethernet" name="eth1"/> </bridge> </interface> In [96]: conn.interfaceDefineXML(interfacexml,0) ---------------------------------------------------------------------------libvirtError Traceback (most recent call last)/home/saju/<ipython-input-96-0536ffe3fa23> in <module>()----> 1 conn.interfaceDefineXML(br1xml,0) /usr/lib/python2.7/dist-packages/libvirt.pyc in interfaceDefineXML(self, xml, flags) 2750 libvirtd. """ 2751 ret = libvirtmod.virInterfaceDefineXML(self._o, xml, flags)-> 2752 if ret is None:raise libvirtError('virInterfaceDefineXML() failed', conn=self) 2753 __tmp = virInterface(self, _obj=ret) 2754 return __tmp libvirtError: this function is not supported by the connection driver: virInterfaceDefineXML Regards Sijo Jose

1 0

[libvirt] [PATCH] qemu.conf: Mention virtlockd in @lock_manager description
by Michal Privoznik 12 Mar '14

12 Mar '14

When I played with virtlockd I was stunned by lacking documentation. My frustration got bigger when I had to read the patches to get the correct value to set in qemu.conf. Moreover, from pure libvirt-pride I'm changing commented value from sanlock to lockd. We want to favor our own implementation after all. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/qemu/qemu.conf | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/qemu/qemu.conf b/src/qemu/qemu.conf index e436084..f0e802f 100644 --- a/src/qemu/qemu.conf +++ b/src/qemu/qemu.conf @@ -402,11 +402,13 @@ #allow_disk_format_probing = 1 -# To enable 'Sanlock' project based locking of the file -# content (to prevent two VMs writing to the same -# disk), uncomment this +# In order to prevent accidentally starting two domains that +# share one writable disk, libvirt offers two approaches for +# locking files. The first one is sanlock, the other one, +# virtlockd, is then our own implementation. Accepted values +# are "sanlock" and "lockd". # -#lock_manager = "sanlock" +#lock_manager = "lockd" -- 1.9.0

3 4

[libvirt] [PATCH] qemu: don't munge user input during block commit
by Eric Blake 12 Mar '14

12 Mar '14

While investigating https://bugzilla.redhat.com/show_bug.cgi?id=1061827 I noticed that we pass user input unscathed for block-pull, but always pass a canonical absolute name through for block-commit. [Note that we probably _ought_ to validate that the user's request for block-pull actually matches the backing chain, the way we already do for block-commit - but that's a separate issue. Further note that the ability to pass user input through unscathed allows backdoors such as specifying a backing image that is a network URI such as a gluster disk, instead of forcing things to the local file system; which is an area still under active investigation on whether libvirt needs to behave differently for network disks.] Since qemu may write the name that the user passed in as the backing file, a user may have a reason to want a relative file name passed through to qemu, and always munging things to absolute prevents that. Put another way, if you have the backing chain: [A] <- [B(back=./A)] <- [C(back=./B)] and commit B into A (virsh blockcommit $dom vda --base A --top B), the metadata of C will have to be re-written. But should it be rewritten as [C(back=./A)] or as [C(back=/path/to/A)]? Still up in the air is whether qemu's decision should be based on whether B and/or C had relative paths, or on whether the --base and/or --top arguments to the command were relative paths; but if we always pass a canonical name, we've prevented the spelling of the command arguments from being part of the hueristics that qemu uses. I also audited the code, and verified that we never call qemuMonitorBlockCommit() with a NULL base, either before or after the change to qemu_driver.c. * src/qemu/qemu_driver.c (qemuDomainBlockCommit): Preserve user's spelling, since absolute vs. relative matters to qemu. * src/qemu/qemu_monitor.h (qemuMonitorBlockCommit): Base is never null. * src/qemu/qemu_monitor.c (qemuMonitorBlockCommit): Likewise. * src/qemu/qemu_monitor_json.h (qemuMonitorJSONBlockCommit): Likewise. * src/qemu/qemu_monitor_json.c (qemuMonitorJSONBlockCommit): Likewise. Signed-off-by: Eric Blake <eblake(a)redhat.com> --- I was _hoping_ that this would solve the mentioned bugzilla. But even with this applied, qemu still ended up writing an absolute backing file name into the active file in the backing chain, so that bug has been reassigned back to qemu - it probably has to do with the fact that libvirt always spawns qemu with -drive pointing to an absolute name, which is unrelated to what this patch fixes. Therefore, I'm a little bit hesitant to apply this patch, but wanted to post it for review anyway. src/qemu/qemu_driver.c | 11 ++++++++--- src/qemu/qemu_monitor.c | 4 ++-- src/qemu/qemu_monitor.h | 3 ++- src/qemu/qemu_monitor_json.c | 2 +- src/qemu/qemu_monitor_json.h | 5 +++-- 5 files changed, 16 insertions(+), 9 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 9aad2dc..31adf78 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -15383,10 +15383,15 @@ qemuDomainBlockCommit(virDomainPtr dom, const char *path, const char *base, VIR_DISK_CHAIN_READ_WRITE) < 0)) goto endjob; - /* Start the commit operation. */ + /* Start the commit operation. Pass the user's original spelling, + * if any, through to qemu, since qemu behaves differently + * depending on whether the input was specified as relative or + * absolute (that is, our absolute top_canon may do the wrong + * thing if the user specified a name). */ qemuDomainObjEnterMonitor(driver, vm); - ret = qemuMonitorBlockCommit(priv->mon, device, top_canon, base_canon, - bandwidth); + ret = qemuMonitorBlockCommit(priv->mon, device, + top ? top : top_canon, + base ? base : base_canon, bandwidth); qemuDomainObjExitMonitor(driver, vm); endjob: diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c index a2769db..e4707b7 100644 --- a/src/qemu/qemu_monitor.c +++ b/src/qemu/qemu_monitor.c @@ -1,7 +1,7 @@ /* * qemu_monitor.c: interaction with QEMU monitor console * - * Copyright (C) 2006-2013 Red Hat, Inc. + * Copyright (C) 2006-2014 Red Hat, Inc. * Copyright (C) 2006 Daniel P. Berrange * * This library is free software; you can redistribute it and/or @@ -3188,7 +3188,7 @@ qemuMonitorBlockCommit(qemuMonitorPtr mon, const char *device, unsigned long long speed; VIR_DEBUG("mon=%p, device=%s, top=%s, base=%s, bandwidth=%ld", - mon, device, NULLSTR(top), NULLSTR(base), bandwidth); + mon, device, top, base, bandwidth); /* Convert bandwidth MiB to bytes - unfortunately the JSON QMP protocol is * limited to LLONG_MAX also for unsigned values */ diff --git a/src/qemu/qemu_monitor.h b/src/qemu/qemu_monitor.h index eabf000..7bb465b 100644 --- a/src/qemu/qemu_monitor.h +++ b/src/qemu/qemu_monitor.h @@ -647,7 +647,8 @@ int qemuMonitorBlockCommit(qemuMonitorPtr mon, const char *top, const char *base, unsigned long bandwidth) - ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(3); + ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(3) + ATTRIBUTE_NONNULL(4); int qemuMonitorArbitraryCommand(qemuMonitorPtr mon, const char *cmd, diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c index ee3ae15..40d6d1a 100644 --- a/src/qemu/qemu_monitor_json.c +++ b/src/qemu/qemu_monitor_json.c @@ -3307,7 +3307,7 @@ qemuMonitorJSONBlockCommit(qemuMonitorPtr mon, const char *device, "s:device", device, "U:speed", speed, "s:top", top, - base ? "s:base" : NULL, base, + "s:base", base, NULL); if (!cmd) return -1; diff --git a/src/qemu/qemu_monitor_json.h b/src/qemu/qemu_monitor_json.h index a93c51e..ef71588 100644 --- a/src/qemu/qemu_monitor_json.h +++ b/src/qemu/qemu_monitor_json.h @@ -1,7 +1,7 @@ /* * qemu_monitor_json.h: interaction with QEMU monitor console * - * Copyright (C) 2006-2009, 2011-2013 Red Hat, Inc. + * Copyright (C) 2006-2009, 2011-2014 Red Hat, Inc. * Copyright (C) 2006 Daniel P. Berrange * * This library is free software; you can redistribute it and/or @@ -258,7 +258,8 @@ int qemuMonitorJSONBlockCommit(qemuMonitorPtr mon, const char *top, const char *base, unsigned long long bandwidth) - ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(3); + ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(3) + ATTRIBUTE_NONNULL(4); int qemuMonitorJSONArbitraryCommand(qemuMonitorPtr mon, const char *cmd_str, -- 1.8.5.3

2 2

[libvirt] [PATCH] iptables: don't log command probe failures
by Eric Blake 12 Mar '14

12 Mar '14

Commit b9dd878f caused a regression in iptables interaction by logging non-zero status at a higher level than VIR_INFO. Revert that portion of the commit, as well as adding a comment explaining why we check the status ourselves. Reported by Nehal J Wani. * src/util/viriptables.c (virIpTablesOnceInit): Undo log regression. Signed-off-by: Eric Blake <eblake(a)redhat.com> --- src/util/viriptables.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/util/viriptables.c b/src/util/viriptables.c index 9e03cc4..45f7789 100644 --- a/src/util/viriptables.c +++ b/src/util/viriptables.c @@ -60,6 +60,7 @@ static int virIpTablesOnceInit(void) { virCommandPtr cmd; + int status; #if HAVE_FIREWALLD firewall_cmd_path = virFindFileInPath("firewall-cmd"); @@ -70,7 +71,8 @@ virIpTablesOnceInit(void) cmd = virCommandNew(firewall_cmd_path); virCommandAddArgList(cmd, "--state", NULL); - if (virCommandRun(cmd, NULL) < 0) { + /* don't log non-zero status */ + if (virCommandRun(cmd, &status) < 0 || status != 0) { VIR_INFO("firewall-cmd found but disabled for iptables"); VIR_FREE(firewall_cmd_path); firewall_cmd_path = NULL; @@ -87,7 +89,8 @@ virIpTablesOnceInit(void) cmd = virCommandNew(IPTABLES_PATH); virCommandAddArgList(cmd, "-w", "-L", "-n", NULL); - if (virCommandRun(cmd, NULL) < 0) { + /* don't log non-zero status */ + if (virCommandRun(cmd, &status) < 0 || status != 0) { VIR_INFO("xtables locking not supported by your iptables"); } else { VIR_INFO("using xtables locking for iptables"); -- 1.8.5.3

2 2

[libvirt] [PATCH] build: work around FreeBSD stdlib.h bug
by Eric Blake 12 Mar '14

12 Mar '14

POSIX requires that <stdlib.h> expose WIFEXITED and friends, but FreeBSD and others fail to comply. We can work around it manually by including <sys/wait.h>, or we can work around it automatically by using gnulib's system-posix module. * bootstrap.conf (gnulib_modules): Add system-posix. Signed-off-by: Eric Blake <eblake(a)redhat.com> --- I'll wait for a review on this one - we don't use system(), and it feels a little bit odd to list the system() module merely for its side effect of a fixed <stdlib.h>. The alternative is to continue using <sys/wait.h> everywhere that we use WIFEXITED and friends. bootstrap.conf | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/bootstrap.conf b/bootstrap.conf index d24a714..bc6ce80 100644 --- a/bootstrap.conf +++ b/bootstrap.conf @@ -1,6 +1,6 @@ # Bootstrap configuration. -# Copyright (C) 2010-2013 Red Hat, Inc. +# Copyright (C) 2010-2014 Red Hat, Inc. # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public @@ -112,6 +112,7 @@ strerror_r-posix strptime strsep strtok_r +system-posix sys_stat sys_wait termios -- 1.8.5.3

3 7

[libvirt] [PATCH v3] nwfilter: Deactivate iptables MAC address check where needed
by Stefan Berger 11 Mar '14

11 Mar '14

From: Stefan Berger <stefanb(a)linux.vnet.ibm.com> Recent Linux iptables (3.11.7) refuses to create iptables MAC address check rules using -m mac --mac-source <addr> where previous versions still allowed it. So we now need to deactivate the filtering rules for when the incoming traffic is filtered before it is sent into the VM. Those are typically the chains that start with FO-* or start with FP-* when they are being built. Adapt the documentation to reflect the fact that srcmacaddr, when used in iptables rules, should be regarded as deprecated due to the above mentioned problems. Signed-off-by: Stefan Berger <stefanb(a)linux.vnet.ibm.com> --- docs/formatnwfilter.html.in | 54 +++++++++++-------------------- src/nwfilter/nwfilter_ebiptables_driver.c | 29 ++++++++++------- 2 files changed, 36 insertions(+), 47 deletions(-) diff --git a/docs/formatnwfilter.html.in b/docs/formatnwfilter.html.in index 4b95fce..5c06bf2 100644 --- a/docs/formatnwfilter.html.in +++ b/docs/formatnwfilter.html.in @@ -1209,7 +1209,9 @@ <tr> <td>srcmacaddr</td> <td>MAC_ADDR</td> - <td>MAC address of sender</td> + <td>MAC address of sender; this option is deprecated and + MAC address filtering using for example the mac protocol + above should be used</td> </tr> <tr> <td>srcipaddr</td> @@ -1320,22 +1322,9 @@ <tr> <td>srcmacaddr</td> <td>MAC_ADDR</td> - <td>MAC address of sender</td> - </tr> - <tr> - <td>srcmacmask</td> - <td>MAC_MASK</td> - <td>Mask applied to MAC address of sender</td> - </tr> - <tr> - <td>dstmacaddr</td> - <td>MAC_ADDR</td> - <td>MAC address of destination</td> - </tr> - <tr> - <td>dstmacmask</td> - <td>MAC_MASK</td> - <td>Mask applied to MAC address of destination</td> + <td>MAC address of sender; this option is deprecated and + MAC address filtering using for example the mac protocol + above should be used</td> </tr> <tr> <td>srcipaddr</td> @@ -1429,22 +1418,9 @@ <tr> <td>srcmacaddr</td> <td>MAC_ADDR</td> - <td>MAC address of sender</td> - </tr> - <tr> - <td>srcmacmask</td> - <td>MAC_MASK</td> - <td>Mask applied to MAC address of sender</td> - </tr> - <tr> - <td>dstmacaddr</td> - <td>MAC_ADDR</td> - <td>MAC address of destination</td> - </tr> - <tr> - <td>dstmacmask</td> - <td>MAC_MASK</td> - <td>Mask applied to MAC address of destination</td> + <td>MAC address of sender; this option is deprecated and + MAC address filtering using for example the mac protocol + above should be used</td> </tr> <tr> <td>srcipaddr</td> @@ -1529,7 +1505,9 @@ <tr> <td>srcmacaddr</td> <td>MAC_ADDR</td> - <td>MAC address of sender</td> + <td>MAC address of sender; this option is deprecated and + MAC address filtering using for example the mac protocol + above should be used</td> </tr> <tr> <td>srcipaddr</td> @@ -1640,7 +1618,9 @@ <tr> <td>srcmacaddr</td> <td>MAC_ADDR</td> - <td>MAC address of sender</td> + <td>MAC address of sender; this option is deprecated and + MAC address filtering using for example the mac protocol + above should be used</td> </tr> <tr> <td>srcipaddr</td> @@ -1735,7 +1715,9 @@ <tr> <td>srcmacaddr</td> <td>MAC_ADDR</td> - <td>MAC address of sender</td> + <td>MAC address of sender; this option is deprecated and + MAC address filtering using for example the mac protocol + above should be used</td> </tr> <tr> <td>srcipaddr</td> diff --git a/src/nwfilter/nwfilter_ebiptables_driver.c b/src/nwfilter/nwfilter_ebiptables_driver.c index 352c08f..bea9535 100644 --- a/src/nwfilter/nwfilter_ebiptables_driver.c +++ b/src/nwfilter/nwfilter_ebiptables_driver.c @@ -972,7 +972,7 @@ static int iptablesHandleSrcMacAddr(virBufferPtr buf, virNWFilterVarCombIterPtr vars, nwItemDescPtr srcMacAddr, - bool directionIn, + const char *chain, bool directionIn, bool *srcmacskipped) { char macaddr[VIR_MAC_STRING_BUFLEN]; @@ -984,6 +984,14 @@ iptablesHandleSrcMacAddr(virBufferPtr buf, return 0; } + /* recent Linux iptables does not allow this filtering rule to be + * applied to the FP-/FO- chains + */ + if (chain[1] == CHAINPREFIX_HOST_OUT_TEMP) { + *srcmacskipped = true; + return 0; + } + if (printDataType(vars, macaddr, sizeof(macaddr), srcMacAddr) < 0) @@ -1366,7 +1374,7 @@ _iptablesCreateRuleInstance(bool directionIn, if (iptablesHandleSrcMacAddr(&buf, vars, &rule->p.tcpHdrFilter.dataSrcMACAddr, - directionIn, + chain, directionIn, &srcMacSkipped) < 0) goto err_exit; @@ -1421,7 +1429,7 @@ _iptablesCreateRuleInstance(bool directionIn, if (iptablesHandleSrcMacAddr(&buf, vars, &rule->p.udpHdrFilter.dataSrcMACAddr, - directionIn, + chain, directionIn, &srcMacSkipped) < 0) goto err_exit; @@ -1454,7 +1462,7 @@ _iptablesCreateRuleInstance(bool directionIn, if (iptablesHandleSrcMacAddr(&buf, vars, &rule->p.udpliteHdrFilter.dataSrcMACAddr, - directionIn, + chain, directionIn, &srcMacSkipped) < 0) goto err_exit; @@ -1482,7 +1490,7 @@ _iptablesCreateRuleInstance(bool directionIn, if (iptablesHandleSrcMacAddr(&buf, vars, &rule->p.espHdrFilter.dataSrcMACAddr, - directionIn, + chain, directionIn, &srcMacSkipped) < 0) goto err_exit; @@ -1506,11 +1514,10 @@ _iptablesCreateRuleInstance(bool directionIn, virBufferAddLit(&buf, " -p ah"); bufUsed = virBufferUse(&buf); - if (iptablesHandleSrcMacAddr(&buf, vars, &rule->p.ahHdrFilter.dataSrcMACAddr, - directionIn, + chain, directionIn, &srcMacSkipped) < 0) goto err_exit; @@ -1538,7 +1545,7 @@ _iptablesCreateRuleInstance(bool directionIn, if (iptablesHandleSrcMacAddr(&buf, vars, &rule->p.sctpHdrFilter.dataSrcMACAddr, - directionIn, + chain, directionIn, &srcMacSkipped) < 0) goto err_exit; @@ -1574,7 +1581,7 @@ _iptablesCreateRuleInstance(bool directionIn, if (iptablesHandleSrcMacAddr(&buf, vars, &rule->p.icmpHdrFilter.dataSrcMACAddr, - directionIn, + chain, directionIn, &srcMacSkipped) < 0) goto err_exit; @@ -1636,7 +1643,7 @@ _iptablesCreateRuleInstance(bool directionIn, if (iptablesHandleSrcMacAddr(&buf, vars, &rule->p.igmpHdrFilter.dataSrcMACAddr, - directionIn, + chain, directionIn, &srcMacSkipped) < 0) goto err_exit; @@ -1664,7 +1671,7 @@ _iptablesCreateRuleInstance(bool directionIn, if (iptablesHandleSrcMacAddr(&buf, vars, &rule->p.allHdrFilter.dataSrcMACAddr, - directionIn, + chain, directionIn, &srcMacSkipped) < 0) goto err_exit; -- 1.8.1.4

1 0

[libvirt] Get disk size for disk type="network"
by Qiang Fu 11 Mar '14

11 Mar '14

Hi, In the output of "virsh dumpxml" command the disk section is as follows: <disk type='network' device='disk'> <driver name='qemu' type='raw' cache='writeback'/> <auth username='svl-cc1-cinder-user'> <secret type='ceph' uuid='e80afa94-a64c-486c-9e34-d55e85f26406'/> </auth> <source protocol='rbd' name='svl-cc1-cinder-volume-1/volume-0a4cdeab-863d-4394-845f-008b993bc4e9'> <host name='10.34.114.211' port='6789'/> <host name='10.34.114.212' port='6789'/> <host name='10.34.114.213' port='6789'/> </source> <target dev='vda' bus='virtio'/> <serial>0a4cdeab-863d-4394-845f-008b993bc4e9</serial> <alias name='virtio-disk0'/> <address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x0'/> </disk> In this case how can I use libvirt to get the disk/volume size information? Thanks, Bruce

2 2

[libvirt] [PATCH] libxl: support sexpr in native to XML conversion
by Jim Fehlig 11 Mar '14

11 Mar '14

Supporting sexpr in connectDomainXMLFromNative in the libxl driver adds flexibility for users importing legacy Xen configuration into libvirt. E.g. this patch allows importing previous xend-managed domains from /var/lib/xend/domains/<dom-uuid>/config.sxp into the libvirt libxl driver. Signed-off-by: Jim Fehlig <jfehlig(a)suse.com> --- src/libxl/libxl_driver.c | 40 +++++++++++++++++++++++++++------------- 1 file changed, 27 insertions(+), 13 deletions(-) diff --git a/src/libxl/libxl_driver.c b/src/libxl/libxl_driver.c index a79efcb..65d80a2 100644 --- a/src/libxl/libxl_driver.c +++ b/src/libxl/libxl_driver.c @@ -46,6 +46,7 @@ #include "libxl_driver.h" #include "libxl_conf.h" #include "xen_xm.h" +#include "xen_sxpr.h" #include "virtypedparam.h" #include "viruri.h" #include "virstring.h" @@ -62,6 +63,7 @@ #define LIBXL_DOM_REQ_HALT 4 #define LIBXL_CONFIG_FORMAT_XM "xen-xm" +#define LIBXL_CONFIG_FORMAT_SEXPR "xen-sxpr" /* Number of Xen scheduler parameters */ #define XEN_SCHED_CREDIT_NPARAM 2 @@ -2867,8 +2869,9 @@ libxlDomainGetXMLDesc(virDomainPtr dom, unsigned int flags) } static char * -libxlConnectDomainXMLFromNative(virConnectPtr conn, const char * nativeFormat, - const char * nativeConfig, +libxlConnectDomainXMLFromNative(virConnectPtr conn, + const char *nativeFormat, + const char *nativeConfig, unsigned int flags) { libxlDriverPrivatePtr driver = conn->privateData; @@ -2882,22 +2885,33 @@ libxlConnectDomainXMLFromNative(virConnectPtr conn, const char * nativeFormat, if (virConnectDomainXMLFromNativeEnsureACL(conn) < 0) goto cleanup; - if (STRNEQ(nativeFormat, LIBXL_CONFIG_FORMAT_XM)) { + if (STREQ(nativeFormat, LIBXL_CONFIG_FORMAT_XM)) { + if (!(conf = virConfReadMem(nativeConfig, strlen(nativeConfig), 0))) + goto cleanup; + + if (!(def = xenParseXM(conf, + cfg->verInfo->xen_version_major, + cfg->caps))) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("parsing xm config failed")); + goto cleanup; + } + } else if (STREQ(nativeFormat, LIBXL_CONFIG_FORMAT_SEXPR)) { + /* only support latest xend config format */ + if (!(def = xenParseSxprString(nativeConfig, + XEND_CONFIG_VERSION_3_1_0, + NULL, + -1))) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("parsing sxpr config failed")); + goto cleanup; + } + } else { virReportError(VIR_ERR_INVALID_ARG, _("unsupported config type %s"), nativeFormat); goto cleanup; } - if (!(conf = virConfReadMem(nativeConfig, strlen(nativeConfig), 0))) - goto cleanup; - - if (!(def = xenParseXM(conf, - cfg->verInfo->xen_version_major, - cfg->caps))) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("parsing xm config failed")); - goto cleanup; - } - xml = virDomainDefFormat(def, VIR_DOMAIN_XML_INACTIVE); cleanup: -- 1.8.1.4

2 2

[libvirt] [PATCH] storage: Fix bugs in VIR_APPEND_ELEMENT series
by John Ferlan 11 Mar '14

11 Mar '14

>From commit id 'd53bbfd1' Found one core and one possible memory leak. Core seen during local virt-test/tp_libvirt run for the vol_create_from test. The memory leak was seen by inspection during a review of all VIR_APPEND_ELEMENT changes In storage_backend_disk/virStorageBackendDiskMakeDataVol(), the 'vol' needs to be kept around since it's used later, so use the _COPY macro. This caused a segv in libvirtd: Program received signal SIGSEGV, Segmentation fault. [Switching to Thread 0x7fffe87c3700 (LWP 6919)] virStorageBackendDiskMakeDataVol (vol=0x0, groups=0x7fffc8000d70, pool=0x7fffc8002460) at storage/storage_backend_disk.c:66 66 if (vol->target.path == NULL) { In storage_backend_rbd/virStorageBackendRBDRefreshPool() there's a failure path where the 'vol' needs to go through virStorageVolDefFree() since it wouldn't be appended. Signed-off-by: John Ferlan <jferlan(a)redhat.com> --- src/storage/storage_backend_disk.c | 3 ++- src/storage/storage_backend_rbd.c | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/storage/storage_backend_disk.c b/src/storage/storage_backend_disk.c index b261773..2b6011b 100644 --- a/src/storage/storage_backend_disk.c +++ b/src/storage/storage_backend_disk.c @@ -57,7 +57,8 @@ virStorageBackendDiskMakeDataVol(virStoragePoolObjPtr pool, */ tmp = strrchr(groups[0], '/'); if (VIR_STRDUP(vol->name, tmp ? tmp + 1 : groups[0]) < 0 || - VIR_APPEND_ELEMENT(pool->volumes.objs, pool->volumes.count, vol) < 0) { + VIR_APPEND_ELEMENT_COPY(pool->volumes.objs, + pool->volumes.count, vol) < 0) { virStorageVolDefFree(vol); return -1; } diff --git a/src/storage/storage_backend_rbd.c b/src/storage/storage_backend_rbd.c index bc52474..d78dbe4 100644 --- a/src/storage/storage_backend_rbd.c +++ b/src/storage/storage_backend_rbd.c @@ -401,6 +401,7 @@ static int virStorageBackendRBDRefreshPool(virConnectPtr conn, } if (VIR_APPEND_ELEMENT(pool->volumes.objs, pool->volumes.count, vol) < 0) { + virStorageVolDefFree(vol); virStoragePoolObjClearVols(pool); goto cleanup; } -- 1.8.5.3

2 1

[libvirt] [PATCH v2] nwfilter: Deactivate iptables MAC address check where needed
by Stefan Berger 11 Mar '14

11 Mar '14

From: Stefan Berger <stefanb(a)linux.vnet.ibm.com> Recent Linux iptables (3.11.7) refuses to create iptables MAC address check rules using -m mac --mac-source <addr> where previous versions still allowed it. So we now need to deactivate the filtering rules for when the incoming traffic is filtered before it is sent into the VM. Those are typically the chains that start with FO-* or start with FP-* when they are being built. Adapt the documentation to reflect the fact that srcmacaddr, when used in iptables rules, should be regarded as deprecated due to the above mentioned problems. Signed-off-by: Stefan Berger <stefanb(a)linux.vnet.ibm.com> --- docs/formatnwfilter.html.in | 42 +++++-------------------------- src/nwfilter/nwfilter_ebiptables_driver.c | 29 +++++++++++++-------- 2 files changed, 24 insertions(+), 47 deletions(-) diff --git a/docs/formatnwfilter.html.in b/docs/formatnwfilter.html.in index 4b95fce..ee23d8e 100644 --- a/docs/formatnwfilter.html.in +++ b/docs/formatnwfilter.html.in @@ -1209,7 +1209,7 @@ <tr> <td>srcmacaddr</td> <td>MAC_ADDR</td> - <td>MAC address of sender</td> + <td>MAC address of sender; this option is deprecated</td> </tr> <tr> <td>srcipaddr</td> @@ -1320,22 +1320,7 @@ <tr> <td>srcmacaddr</td> <td>MAC_ADDR</td> - <td>MAC address of sender</td> - </tr> - <tr> - <td>srcmacmask</td> - <td>MAC_MASK</td> - <td>Mask applied to MAC address of sender</td> - </tr> - <tr> - <td>dstmacaddr</td> - <td>MAC_ADDR</td> - <td>MAC address of destination</td> - </tr> - <tr> - <td>dstmacmask</td> - <td>MAC_MASK</td> - <td>Mask applied to MAC address of destination</td> + <td>MAC address of sender; this option is deprecated</td> </tr> <tr> <td>srcipaddr</td> @@ -1429,22 +1414,7 @@ <tr> <td>srcmacaddr</td> <td>MAC_ADDR</td> - <td>MAC address of sender</td> - </tr> - <tr> - <td>srcmacmask</td> - <td>MAC_MASK</td> - <td>Mask applied to MAC address of sender</td> - </tr> - <tr> - <td>dstmacaddr</td> - <td>MAC_ADDR</td> - <td>MAC address of destination</td> - </tr> - <tr> - <td>dstmacmask</td> - <td>MAC_MASK</td> - <td>Mask applied to MAC address of destination</td> + <td>MAC address of sender; this option is deprecated</td> </tr> <tr> <td>srcipaddr</td> @@ -1529,7 +1499,7 @@ <tr> <td>srcmacaddr</td> <td>MAC_ADDR</td> - <td>MAC address of sender</td> + <td>MAC address of sender; this option is deprecated</td> </tr> <tr> <td>srcipaddr</td> @@ -1640,7 +1610,7 @@ <tr> <td>srcmacaddr</td> <td>MAC_ADDR</td> - <td>MAC address of sender</td> + <td>MAC address of sender; this option is deprecated</td> </tr> <tr> <td>srcipaddr</td> @@ -1735,7 +1705,7 @@ <tr> <td>srcmacaddr</td> <td>MAC_ADDR</td> - <td>MAC address of sender</td> + <td>MAC address of sender; this option is deprecated</td> </tr> <tr> <td>srcipaddr</td> diff --git a/src/nwfilter/nwfilter_ebiptables_driver.c b/src/nwfilter/nwfilter_ebiptables_driver.c index 352c08f..ae20bf0 100644 --- a/src/nwfilter/nwfilter_ebiptables_driver.c +++ b/src/nwfilter/nwfilter_ebiptables_driver.c @@ -972,7 +972,7 @@ static int iptablesHandleSrcMacAddr(virBufferPtr buf, virNWFilterVarCombIterPtr vars, nwItemDescPtr srcMacAddr, - bool directionIn, + const char *chain, bool directionIn, bool *srcmacskipped) { char macaddr[VIR_MAC_STRING_BUFLEN]; @@ -984,6 +984,14 @@ iptablesHandleSrcMacAddr(virBufferPtr buf, return 0; } + /* recent Linux iptables does not allow this filteirng rule to be + * applied to all FO-* chains + */ + if (chain[1] == CHAINPREFIX_HOST_OUT_TEMP) { + *srcmacskipped = true; + return 0; + } + if (printDataType(vars, macaddr, sizeof(macaddr), srcMacAddr) < 0) @@ -1366,7 +1374,7 @@ _iptablesCreateRuleInstance(bool directionIn, if (iptablesHandleSrcMacAddr(&buf, vars, &rule->p.tcpHdrFilter.dataSrcMACAddr, - directionIn, + chain, directionIn, &srcMacSkipped) < 0) goto err_exit; @@ -1421,7 +1429,7 @@ _iptablesCreateRuleInstance(bool directionIn, if (iptablesHandleSrcMacAddr(&buf, vars, &rule->p.udpHdrFilter.dataSrcMACAddr, - directionIn, + chain, directionIn, &srcMacSkipped) < 0) goto err_exit; @@ -1454,7 +1462,7 @@ _iptablesCreateRuleInstance(bool directionIn, if (iptablesHandleSrcMacAddr(&buf, vars, &rule->p.udpliteHdrFilter.dataSrcMACAddr, - directionIn, + chain, directionIn, &srcMacSkipped) < 0) goto err_exit; @@ -1482,7 +1490,7 @@ _iptablesCreateRuleInstance(bool directionIn, if (iptablesHandleSrcMacAddr(&buf, vars, &rule->p.espHdrFilter.dataSrcMACAddr, - directionIn, + chain, directionIn, &srcMacSkipped) < 0) goto err_exit; @@ -1506,11 +1514,10 @@ _iptablesCreateRuleInstance(bool directionIn, virBufferAddLit(&buf, " -p ah"); bufUsed = virBufferUse(&buf); - if (iptablesHandleSrcMacAddr(&buf, vars, &rule->p.ahHdrFilter.dataSrcMACAddr, - directionIn, + chain, directionIn, &srcMacSkipped) < 0) goto err_exit; @@ -1538,7 +1545,7 @@ _iptablesCreateRuleInstance(bool directionIn, if (iptablesHandleSrcMacAddr(&buf, vars, &rule->p.sctpHdrFilter.dataSrcMACAddr, - directionIn, + chain, directionIn, &srcMacSkipped) < 0) goto err_exit; @@ -1574,7 +1581,7 @@ _iptablesCreateRuleInstance(bool directionIn, if (iptablesHandleSrcMacAddr(&buf, vars, &rule->p.icmpHdrFilter.dataSrcMACAddr, - directionIn, + chain, directionIn, &srcMacSkipped) < 0) goto err_exit; @@ -1636,7 +1643,7 @@ _iptablesCreateRuleInstance(bool directionIn, if (iptablesHandleSrcMacAddr(&buf, vars, &rule->p.igmpHdrFilter.dataSrcMACAddr, - directionIn, + chain, directionIn, &srcMacSkipped) < 0) goto err_exit; @@ -1664,7 +1671,7 @@ _iptablesCreateRuleInstance(bool directionIn, if (iptablesHandleSrcMacAddr(&buf, vars, &rule->p.allHdrFilter.dataSrcMACAddr, - directionIn, + chain, directionIn, &srcMacSkipped) < 0) goto err_exit; -- 1.8.1.4

2 1

[libvirt] Google Summer of Code 2014 - Rewriting Virtual-Box Driver
by prashanth sunder 11 Mar '14

11 Mar '14

Hello, I am applying for the project idea "Rewriting Virtual-Box Driver" suggested by Michal Privoznik(mprivozn(a)redhat.com) in the "Qemu" ideas page ( http://wiki.qemu.org/Google_Summer_of_Code_2014) In the short span of time that I had after my discussion with Mr. Privoznik, the current Virtual Box driver code is not structured very well(lot of #ifdef's in the current code) and very hard to read. Since libvirt has to support all versions of Virtual Box, the current code decides on what code to compile based on the value of the macro VBOX_API_VERSION that is checked during ./configure. The only thing after discussion that we were able to come up with is putting version specific code under particular files and only compile the those necessary files during "make" For instance, if a function X() supports version A, B, C we will have function X() in vbox_A.c just for version A, function X() in vbox_B.c just for version B and so on. Any other suggestions than the above mentioned one which can be used to fix the problem?? Regards, Prashanth Sunder

2 1

[libvirt] [PATCH] Fix sec label setup when attaching to QEMU processes
by Daniel P. Berrange 11 Mar '14

11 Mar '14

When attaching to a QEMU process, the def->seclabels array is going to be empty. The qemuProcessAttach method must thus populate it with data for the security drivers. Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- src/qemu/qemu_process.c | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 1f00840..7d41c93 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -4479,6 +4479,7 @@ int qemuProcessAttach(virConnectPtr conn ATTRIBUTE_UNUSED, virDomainPausedReason reason; virSecurityLabelPtr seclabel = NULL; virSecurityLabelDefPtr seclabeldef = NULL; + bool seclabelgen = false; virSecurityManagerPtr* sec_managers = NULL; const char *model; virQEMUDriverConfigPtr cfg = virQEMUDriverGetConfig(driver); @@ -4529,10 +4530,16 @@ int qemuProcessAttach(virConnectPtr conn ATTRIBUTE_UNUSED, goto error; for (i = 0; sec_managers[i]; i++) { + seclabelgen = false; + VIR_ERROR("Iter %zu", i); model = virSecurityManagerGetModel(sec_managers[i]); seclabeldef = virDomainDefGetSecurityLabelDef(vm->def, model); - if (seclabeldef == NULL) - goto error; + VIR_ERROR("model %s def %p", model, seclabeldef); + if (seclabeldef == NULL) { + if (!(seclabeldef = virDomainDefGenSecurityLabelDef(model))) + goto error; + seclabelgen = true; + } seclabeldef->type = VIR_DOMAIN_SECLABEL_STATIC; if (VIR_ALLOC(seclabel) < 0) goto error; @@ -4546,6 +4553,12 @@ int qemuProcessAttach(virConnectPtr conn ATTRIBUTE_UNUSED, if (VIR_STRDUP(seclabeldef->label, seclabel->label) < 0) goto error; VIR_FREE(seclabel); + + if (seclabelgen) { + if (VIR_APPEND_ELEMENT(vm->def->seclabels, vm->def->nseclabels, seclabeldef) < 0) + goto error; + seclabelgen = false; + } } VIR_DEBUG("Creating domain log file"); @@ -4692,6 +4705,8 @@ error: VIR_FORCE_CLOSE(logfile); VIR_FREE(seclabel); VIR_FREE(sec_managers); + if (seclabelgen) + virSecurityLabelDefFree(seclabeldef); virDomainChrSourceDefFree(monConfig); virObjectUnref(cfg); virObjectUnref(caps); -- 1.8.5.3

2 2

[libvirt] Suspending access to opened/active /dev/nodes during application runtime
by Lukasz Pawelczyk 11 Mar '14

11 Mar '14

Problem: Has anyone thought about a mechanism to limit/remove an access to a device during an application runtime? Meaning we have an application that has an open file descriptor to some /dev/node and depending on *something* it gains or looses the access to it gracefully (with or without a notification, but without any fatal consequences). Example: LXC. Imagine we have 2 separate containers. Both running full operating systems. Specifically with 2 X servers. Both running concurrently of course. Both need the same input devices (e.g. we have just one mouse). This creates a security problem when we want to have completely separate environments. One container is active (being displayed on a monitor and controlled with a mouse) while the other container runs evtest /dev/input/something and grabs the secret password user typed in the other. Solutions: The complete solution would comprise of 2 parts: - a mechanism that would allow to temporally "hide" a device from an open file descriptor. - a mechanism for deciding whether application/process/namespace should have an access to a specific device at a specific moment Let's focus on the first problem only, as it would need to be solved first anyway. I haven't found anything that would allow me to do it. There are a lot mechanisms that make it possible to restrict an access during open(): - DAC - ACL (controlled by hand or with uaccess) - LSM (in general) - device cgroups But all of those can't do a thing when the device is already opened and an application has a file descriptor. I don't see such mechanism in kernel sources either. I do imagine that it would not be possible for every device to handle such a thing (dri comes to mind) without breaking something (graphics card state in dri example). But there is class of simple input/output devices that would handle this without problems. I did implement some proof-of-concept solution for an evdev driver by allowing or disallowing events that go to evdev_client structure using some arbitrary condition. But this is far from a generic solution. My proof-of-concept is somewhat similar to this (I just found it): http://www.spinics.net/lists/linux-input/msg25547.html Though a little bit wider in scope. But neither is flawless nor generic. Has anyone had any thoughts about a similar problem? -- Regards Havner

4 5

[libvirt] How to apply for Google Summer of Code
by Stefan Hajnoczi 11 Mar '14

11 Mar '14

Dear students, Applications for Google Summer of Code opened on Monday, 10th of March and will continue until Friday, 21st of March. The common question we are getting is "How do I apply?" :). Here is the application checklist: 1. Choose a project idea and get in touch with the mentor. The project ideas and mentors are listed here: http://qemu-project.org/Google_Summer_of_Code_2014 2. Put together a rough project plan (design + schedule) that breaks down the solution you are proposing. You can email a draft to your mentor for feedback or ask for clarifications about the project idea. 3. Go to http://google-melange.com/, log in and submit your application form for QEMU. The application template is here: https://www.google-melange.com/gsoc/org2/google/gsoc2014/qemu Remember the deadline for applications Friday, 21st of March. You can reach mentors on #qemu-gsoc on irc.oftc.net or via email. Stefan

1 0

[libvirt] [PATCH v2 0/3] Add caching of QEMU probed capabilities
by Daniel P. Berrange 11 Mar '14

11 Mar '14

A followup to https://www.redhat.com/archives/libvir-list/2014-March/msg00297.html Probing capabilities takes 200-300ms per binary and we have as many as 26 binaries. This noticably slows down libvirtd startup. It does not look like performance of probing QEMU can be improved, so this series introduces caching of the capabilities information. So the first time libvirtd starts it'll be slow, but thereafter it is fast. The cache is invalidated any time the QEMU binary timestamp changes or the libvirtd binary or driver module timestamp changes. In v2: - Store timestamps in XML file instead of non-portable utimes() - Use ctime instead of mtime since the latter can be faked by package managers to go backwards in time. Daniel P. Berrange (3): Add helper APIs to track if libvirtd or loadable modules have changed Change QEMU capabilities cache to check ctime instead of mtime Cache result of QEMU capabilities extraction daemon/libvirtd.c | 2 + src/driver.c | 2 + src/libvirt_private.syms | 2 + src/qemu/qemu_capabilities.c | 442 +++++++++++++++++++++++++++++++++++++++++-- src/qemu/qemu_capabilities.h | 2 + src/qemu/qemu_driver.c | 1 + src/util/virutil.c | 23 +++ src/util/virutil.h | 4 + 8 files changed, 467 insertions(+), 11 deletions(-) -- 1.8.5.3

3 8

[libvirt] [PATCH] tests: Distribute securityselinuxhelperdata
by Jiri Denemark 11 Mar '14

11 Mar '14

Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- Notes: Pushed as a build-breaker since 'make distcheck' fails without this patch. tests/Makefile.am | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/Makefile.am b/tests/Makefile.am index 5c1f420..3267ad3 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -97,6 +97,7 @@ EXTRA_DIST = \ qemuxml2xmloutdata \ qemuxmlnsdata \ secretxml2xmlin \ + securityselinuxhelperdata \ securityselinuxlabeldata \ schematestutils.sh \ sexpr2xmldata \ -- 1.9.0

1 0

[libvirt] [PATCH] BZ1072677: Avoid freeing of 0 file descriptor
by Stefan Berger 11 Mar '14

11 Mar '14

From: Stefan Berger <stefanb(a)linux.vnet.ibm.com> Avoid the freeing of an array of zero file descriptors in case of error. Introduce a macro VIR_INIT_N_FD to initialize such an array's elements to -1. Signed-off-by: Stefan Berger <stefanb(a)linux.vnet.ibm.com> --- src/qemu/qemu_hotplug.c | 14 +++++++++++--- src/util/virfile.h | 12 ++++++++++++ 2 files changed, 23 insertions(+), 3 deletions(-) diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index 6703c92..b295db2 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -874,9 +874,12 @@ int qemuDomainAttachNetDevice(virConnectPtr conn, tapfdSize = vhostfdSize = net->driver.virtio.queues; if (!tapfdSize) tapfdSize = vhostfdSize = 1; - if (VIR_ALLOC_N(tapfd, tapfdSize) < 0 || - VIR_ALLOC_N(vhostfd, vhostfdSize) < 0) + if (VIR_ALLOC_N(tapfd, tapfdSize) < 0) goto cleanup; + VIR_INIT_N_FD(tapfd, tapfdSize); + if (VIR_ALLOC_N(vhostfd, vhostfdSize) < 0) + goto cleanup; + VIR_INIT_N_FD(vhostfd, vhostfdSize); if (qemuNetworkIfaceConnect(vm->def, conn, driver, net, priv->qemuCaps, tapfd, &tapfdSize) < 0) goto cleanup; @@ -885,8 +888,12 @@ int qemuDomainAttachNetDevice(virConnectPtr conn, goto cleanup; } else if (actualType == VIR_DOMAIN_NET_TYPE_DIRECT) { tapfdSize = vhostfdSize = 1; - if (VIR_ALLOC(tapfd) < 0 || VIR_ALLOC(vhostfd) < 0) + if (VIR_ALLOC(tapfd) < 0) + goto cleanup; + *tapfd = -1; + if (VIR_ALLOC(vhostfd) < 0) goto cleanup; + *vhostfd = -1; if ((tapfd[0] = qemuPhysIfaceConnect(vm->def, driver, net, priv->qemuCaps, VIR_NETDEV_VPORT_PROFILE_OP_CREATE)) < 0) @@ -898,6 +905,7 @@ int qemuDomainAttachNetDevice(virConnectPtr conn, vhostfdSize = 1; if (VIR_ALLOC(vhostfd) < 0) goto cleanup; + *vhostfd = -1; if (qemuOpenVhostNet(vm->def, net, priv->qemuCaps, vhostfd, &vhostfdSize) < 0) goto cleanup; } diff --git a/src/util/virfile.h b/src/util/virfile.h index 20baf6f..802cf01 100644 --- a/src/util/virfile.h +++ b/src/util/virfile.h @@ -75,6 +75,18 @@ FILE *virFileFdopen(int *fdptr, const char *mode) ATTRIBUTE_RETURN_CHECK; VIR_FILE_CLOSE_PRESERVE_ERRNO | \ VIR_FILE_CLOSE_DONT_LOG)) +static inline void vir_init_n_int(int *ptr, int count, int value) +{ + int i; + + for (i = 0; i < count; i++) + ptr[i] = value; +} + +/* Initialize an array of file descriptors to -1 */ +# define VIR_INIT_N_FD(ptr, count) \ + vir_init_n_int(ptr, count, -1) + /* Opaque type for managing a wrapper around a fd. */ struct _virFileWrapperFd; -- 1.8.1.4

3 5

[libvirt] [PATCH v2] qemu: cleanup tap devices on FreeBSD
by Roman Bogorodskiy 11 Mar '14

11 Mar '14

We have to explicitly destroy TAP devices on FreeBSD because they're not freed after being closed, otherwise we end up with orphaned TAP devices after destroying a domain. --- src/qemu/qemu_process.c | 7 +++++++ src/util/virnetdevtap.h | 6 ++++++ 2 files changed, 13 insertions(+) diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index ffa939a..6806539 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -61,6 +61,7 @@ #include "viruuid.h" #include "virprocess.h" #include "virtime.h" +#include "virnetdevbridge.h" #include "virnetdevtap.h" #include "virbitmap.h" #include "viratomic.h" @@ -4381,6 +4382,12 @@ void qemuProcessStop(virQEMUDriverPtr driver, virDomainNetGetActualVirtPortProfile(net), cfg->stateDir)); VIR_FREE(net->ifname); +#ifdef VIR_NETDEV_TAP_REQUIRE_MANUAL_CLEANUP + } else if (virDomainNetGetActualType(net) == VIR_DOMAIN_NET_TYPE_BRIDGE) { + ignore_value(virNetDevBridgeRemovePort(virDomainNetGetActualBridgeName(net), + net->ifname)); + ignore_value(virNetDevTapDelete(net->ifname)); +#endif } /* release the physical device (or any other resources used by * this interface in the network driver diff --git a/src/util/virnetdevtap.h b/src/util/virnetdevtap.h index a762b31..1e5bd19 100644 --- a/src/util/virnetdevtap.h +++ b/src/util/virnetdevtap.h @@ -27,6 +27,12 @@ # include "virnetdevvportprofile.h" # include "virnetdevvlan.h" +# ifdef __FreeBSD__ +/* This should be defined on OSes that don't automatically + * cleanup released devices */ +# define VIR_NETDEV_TAP_REQUIRE_MANUAL_CLEANUP 1 +# endif + int virNetDevTapCreate(char **ifname, int *tapfd, int tapfdSize, -- 1.8.4.3

2 2

[libvirt] [PATCH] datatypes: Fix comments
by Michael Chapman 11 Mar '14

11 Mar '14

- As of commit 2ff4c137, all virGet*() functions in datatypes.c always return pointers to new objects. Objects are not cached in a per-connection hashtable. - Fix variable names in comments for all vir*Dispose() functions in datatypes.c. - Add comments for virGetStream(), virStreamDispose(), virGetDomainSnapshot(), virDomainSnapshotDispose(). Signed-off-by: Michael Chapman <mike(a)very.puzzling.org> --- src/datatypes.c | 126 +++++++++++++++++++++++++++++++++----------------------- 1 file changed, 74 insertions(+), 52 deletions(-) diff --git a/src/datatypes.c b/src/datatypes.c index 20752cd..6f98aed 100644 --- a/src/datatypes.c +++ b/src/datatypes.c @@ -96,9 +96,9 @@ VIR_ONCE_GLOBAL_INIT(virDataTypes) /** * virGetConnect: * - * Allocates a new hypervisor connection structure + * Allocates a new hypervisor connection object. * - * Returns a new pointer or NULL in case of error. + * Returns a pointer to the connection object, or NULL on error. */ virConnectPtr virGetConnect(void) @@ -126,7 +126,7 @@ error: /** * virConnectDispose: - * @conn: the hypervisor connection to release + * @obj: the hypervisor connection to release * * Unconditionally release all memory associated with a connection. * The connection object must not be used once this method returns. @@ -196,12 +196,10 @@ virConnectCloseCallbackDataDispose(void *obj) * @name: pointer to the domain name * @uuid: pointer to the uuid * - * Lookup if the domain is already registered for that connection, - * if yes return a new pointer to it, if no allocate a new structure, - * and register it in the table. In any case a corresponding call to - * virObjectUnref() is needed to not leak data. + * Allocates a new domain object. When the object is no longer needed, + * virObjectUnref() must be called in order to not leak data. * - * Returns a pointer to the domain, or NULL in case of failure + * Returns a pointer to the domain object, or NULL on error. */ virDomainPtr virGetDomain(virConnectPtr conn, const char *name, const unsigned char *uuid) @@ -234,7 +232,7 @@ error: /** * virDomainDispose: - * @domain: the domain to release + * @obj: the domain to release * * Unconditionally release all memory associated with a domain. * The domain object must not be used once this method returns. @@ -262,12 +260,10 @@ virDomainDispose(void *obj) * @name: pointer to the network name * @uuid: pointer to the uuid * - * Lookup if the network is already registered for that connection, - * if yes return a new pointer to it, if no allocate a new structure, - * and register it in the table. In any case a corresponding call to - * virObjectUnref() is needed to not leak data. + * Allocates a new network object. When the object is no longer needed, + * virObjectUnref() must be called in order to not leak data. * - * Returns a pointer to the network, or NULL in case of failure + * Returns a pointer to the network object, or NULL on error. */ virNetworkPtr virGetNetwork(virConnectPtr conn, const char *name, const unsigned char *uuid) @@ -299,7 +295,7 @@ error: /** * virNetworkDispose: - * @network: the network to release + * @obj: the network to release * * Unconditionally release all memory associated with a network. * The network object must not be used once this method returns. @@ -327,13 +323,10 @@ virNetworkDispose(void *obj) * @name: pointer to the interface name * @mac: pointer to the mac * - * Lookup if the interface is already registered for that connection, - * if yes return a new pointer to it (possibly updating the MAC - * address), if no allocate a new structure, and register it in the - * table. In any case a corresponding call to virObjectUnref() is - * needed to not leak data. + * Allocates a new interface object. When the object is no longer needed, + * virObjectUnref() must be called in order to not leak data. * - * Returns a pointer to the interface, or NULL in case of failure + * Returns a pointer to the interface object, or NULL on error. */ virInterfacePtr virGetInterface(virConnectPtr conn, const char *name, const char *mac) @@ -368,7 +361,7 @@ error: /** * virInterfaceDispose: - * @interface: the interface to release + * @obj: the interface to release * * Unconditionally release all memory associated with an interface. * The interface object must not be used once this method returns. @@ -396,12 +389,10 @@ virInterfaceDispose(void *obj) * @privateData: pointer to driver specific private data * @freeFunc: private data cleanup function pointer specfic to driver * - * Lookup if the storage pool is already registered for that connection, - * if yes return a new pointer to it, if no allocate a new structure, - * and register it in the table. In any case a corresponding call to - * virObjectUnref() is needed to not leak data. + * Allocates a new storage pool object. When the object is no longer needed, + * virObjectUnref() must be called in order to not leak data. * - * Returns a pointer to the storage pool, or NULL in case of failure + * Returns a pointer to the storage pool object, or NULL on error. */ virStoragePoolPtr virGetStoragePool(virConnectPtr conn, const char *name, @@ -440,7 +431,7 @@ error: /** * virStoragePoolDispose: - * @pool: the pool to release + * @obj: the storage pool to release * * Unconditionally release all memory associated with a pool. * The pool object must not be used once this method returns. @@ -475,12 +466,10 @@ virStoragePoolDispose(void *obj) * @privateData: pointer to driver specific private data * @freeFunc: private data cleanup function pointer specfic to driver * - * Lookup if the storage vol is already registered for that connection, - * if yes return a new pointer to it, if no allocate a new structure, - * and register it in the table. In any case a corresponding call to - * virObjectUnref() is needed to not leak data. + * Allocates a new storage volume object. When the object is no longer needed, + * virObjectUnref() must be called in order to not leak data. * - * Returns a pointer to the storage vol, or NULL in case of failure + * Returns a pointer to the storage volume object, or NULL on error. */ virStorageVolPtr virGetStorageVol(virConnectPtr conn, const char *pool, const char *name, @@ -520,7 +509,7 @@ error: /** * virStorageVolDispose: - * @vol: the vol to release + * @obj: the storage volume to release * * Unconditionally release all memory associated with a volume. * The volume object must not be used once this method returns. @@ -550,12 +539,10 @@ virStorageVolDispose(void *obj) * @conn: the hypervisor connection * @name: device name (unique on node) * - * Lookup if the device is already registered for that connection, - * if yes return a new pointer to it, if no allocate a new structure, - * and register it in the table. In any case a corresponding call to - * virObjectUnref() is needed to not leak data. + * Allocates a new node device object. When the object is no longer needed, + * virObjectUnref() must be called in order to not leak data. * - * Returns a pointer to the node device, or NULL in case of failure + * Returns a pointer to the node device object, or NULL on error. */ virNodeDevicePtr virGetNodeDevice(virConnectPtr conn, const char *name) @@ -585,7 +572,7 @@ error: /** * virNodeDeviceDispose: - * @dev: the dev to release + * @obj: the node device to release * * Unconditionally release all memory associated with a device. * The device object must not be used once this method returns. @@ -611,12 +598,10 @@ virNodeDeviceDispose(void *obj) * @conn: the hypervisor connection * @uuid: secret UUID * - * Lookup if the secret is already registered for that connection, if so return - * a pointer to it, otherwise allocate a new structure, and register it in the - * table. In any case a corresponding call to virObjectUnref() is needed to not - * leak data. + * Allocates a new secret object. When the object is no longer needed, + * virObjectUnref() must be called in order to not leak data. * - * Returns a pointer to the secret, or NULL in case of failure + * Returns a pointer to the secret object, or NULL on error. */ virSecretPtr virGetSecret(virConnectPtr conn, const unsigned char *uuid, @@ -650,7 +635,7 @@ error: /** * virSecretDispose: - * @secret: the secret to release + * @obj: the secret to release * * Unconditionally release all memory associated with a secret. * The secret object must not be used once this method returns. @@ -672,6 +657,15 @@ virSecretDispose(void *obj) } +/** + * virGetStream: + * @conn: the hypervisor connection + * + * Allocates a new stream object. When the object is no longer needed, + * virObjectUnref() must be called in order to not leak data. + * + * Returns a pointer to the stream object, or NULL on error. + */ virStreamPtr virGetStream(virConnectPtr conn) { @@ -688,6 +682,16 @@ virGetStream(virConnectPtr conn) return ret; } +/** + * virStreamDispose: + * @obj: the stream to release + * + * Unconditionally release all memory associated with a stream. + * The stream object must not be used once this method returns. + * + * It will also unreference the associated connection object, + * which may also be released if its ref count hits zero. + */ static void virStreamDispose(void *obj) { @@ -704,12 +708,10 @@ virStreamDispose(void *obj) * @name: pointer to the network filter pool name * @uuid: pointer to the uuid * - * Lookup if the network filter is already registered for that connection, - * if yes return a new pointer to it, if no allocate a new structure, - * and register it in the table. In any case a corresponding call to - * virObjectUnref() is needed to not leak data. + * Allocates a new network filter object. When the object is no longer needed, + * virObjectUnref() must be called in order to not leak data. * - * Returns a pointer to the network, or NULL in case of failure + * Returns a pointer to the network filter object, or NULL on error. */ virNWFilterPtr virGetNWFilter(virConnectPtr conn, const char *name, @@ -744,7 +746,7 @@ error: /** * virNWFilterDispose: - * @nwfilter: the nwfilter to release + * @obj: the network filter to release * * Unconditionally release all memory associated with a nwfilter. * The nwfilter object must not be used once this method returns. @@ -766,6 +768,16 @@ virNWFilterDispose(void *obj) } +/** + * virGetDomainSnapshot: + * @domain: the domain to snapshot + * @name: pointer to the domain snapshot name + * + * Allocates a new domain snapshot object. When the object is no longer needed, + * virObjectUnref() must be called in order to not leak data. + * + * Returns a pointer to the domain snapshot object, or NULL on error. + */ virDomainSnapshotPtr virGetDomainSnapshot(virDomainPtr domain, const char *name) { @@ -792,6 +804,16 @@ error: } +/** + * virDomainSnapshotDispose: + * @obj: the domain snapshot to release + * + * Unconditionally release all memory associated with a snapshot. + * The snapshot object must not be used once this method returns. + * + * It will also unreference the associated connection object, + * which may also be released if its ref count hits zero. + */ static void virDomainSnapshotDispose(void *obj) { -- 1.8.5.3

1 0

[libvirt] [PATCH] datatypes: Fix comments
by Michael Chapman 11 Mar '14

11 Mar '14

- As of commit 2ff4c137, all virGet*() functions in datatypes.c always return pointers to new objects. Objects are not cached in a per-connection hashtable. - As of commit 46ec5f85, the conn.lock mutex does not need to be held when calling any vir*Dispose() function in datatypes.c (via virObjectUnref()). - Add comments for virGetStream(), virStreamDispose(), virGetDomainSnapshot(), virDomainSnapshotDispose(). Signed-off-by: Michael Chapman <mike(a)very.puzzling.org> --- src/datatypes.c | 174 ++++++++++++++++++++++++++++++++------------------------ 1 file changed, 99 insertions(+), 75 deletions(-) diff --git a/src/datatypes.c b/src/datatypes.c index 73f17e7..aafa54b 100644 --- a/src/datatypes.c +++ b/src/datatypes.c @@ -96,9 +96,8 @@ VIR_ONCE_GLOBAL_INIT(virDataTypes) /** * virGetConnect: * - * Allocates a new hypervisor connection structure - * - * Returns a new pointer or NULL in case of error. + * Allocates and returns a pointer to a new hypervisor connection object. + * Returns NULL on error. */ virConnectPtr virGetConnect(void) @@ -129,9 +128,7 @@ error: * @conn: the hypervisor connection to release * * Unconditionally release all memory associated with a connection. - * The conn.lock mutex must be held prior to calling this, and will - * be released prior to this returning. The connection obj must not - * be used once this method returns. + * The connection object must not be used once this method returns. */ static void virConnectDispose(void *obj) @@ -198,12 +195,12 @@ virConnectCloseCallbackDataDispose(void *obj) * @name: pointer to the domain name * @uuid: pointer to the uuid * - * Lookup if the domain is already registered for that connection, - * if yes return a new pointer to it, if no allocate a new structure, - * and register it in the table. In any case a corresponding call to - * virObjectUnref() is needed to not leak data. + * Allocates and returns a pointer to a new domain object. + * Returns NULL on error. * - * Returns a pointer to the domain, or NULL in case of failure + * The domain object holds a reference to the hypervisor connection. + * When the domain object is no longer needed, virObjectUnref() must be + * called in order to not leak data. */ virDomainPtr virGetDomain(virConnectPtr conn, const char *name, const unsigned char *uuid) @@ -239,9 +236,7 @@ error: * @domain: the domain to release * * Unconditionally release all memory associated with a domain. - * The conn.lock mutex must be held prior to calling this, and will - * be released prior to this returning. The domain obj must not - * be used once this method returns. + * The domain object must not be used once this method returns. * * It will also unreference the associated connection object, * which may also be released if its ref count hits zero. @@ -266,12 +261,12 @@ virDomainDispose(void *obj) * @name: pointer to the network name * @uuid: pointer to the uuid * - * Lookup if the network is already registered for that connection, - * if yes return a new pointer to it, if no allocate a new structure, - * and register it in the table. In any case a corresponding call to - * virObjectUnref() is needed to not leak data. + * Allocates and returns a pointer to a new network object. + * Returns NULL on error. * - * Returns a pointer to the network, or NULL in case of failure + * The network object holds a reference to the hypervisor connection. + * When the network object is no longer needed, virObjectUnref() must be + * called in order to not leak data. */ virNetworkPtr virGetNetwork(virConnectPtr conn, const char *name, const unsigned char *uuid) @@ -306,9 +301,7 @@ error: * @network: the network to release * * Unconditionally release all memory associated with a network. - * The conn.lock mutex must be held prior to calling this, and will - * be released prior to this returning. The network obj must not - * be used once this method returns. + * The network object must not be used once this method returns. * * It will also unreference the associated connection object, * which may also be released if its ref count hits zero. @@ -333,13 +326,12 @@ virNetworkDispose(void *obj) * @name: pointer to the interface name * @mac: pointer to the mac * - * Lookup if the interface is already registered for that connection, - * if yes return a new pointer to it (possibly updating the MAC - * address), if no allocate a new structure, and register it in the - * table. In any case a corresponding call to virObjectUnref() is - * needed to not leak data. + * Allocates and returns a pointer to a new interface object. + * Returns NULL on error. * - * Returns a pointer to the interface, or NULL in case of failure + * The interface object holds a reference to the hypervisor connection. + * When the interface object is no longer needed, virObjectUnref() must be + * called in order to not leak data. */ virInterfacePtr virGetInterface(virConnectPtr conn, const char *name, const char *mac) @@ -377,9 +369,7 @@ error: * @interface: the interface to release * * Unconditionally release all memory associated with an interface. - * The conn.lock mutex must be held prior to calling this, and will - * be released prior to this returning. The interface obj must not - * be used once this method returns. + * The interface object must not be used once this method returns. * * It will also unreference the associated connection object, * which may also be released if its ref count hits zero. @@ -404,12 +394,12 @@ virInterfaceDispose(void *obj) * @privateData: pointer to driver specific private data * @freeFunc: private data cleanup function pointer specfic to driver * - * Lookup if the storage pool is already registered for that connection, - * if yes return a new pointer to it, if no allocate a new structure, - * and register it in the table. In any case a corresponding call to - * virObjectUnref() is needed to not leak data. + * Allocates and returns a pointer to a new storage pool object. + * Returns NULL on error. * - * Returns a pointer to the storage pool, or NULL in case of failure + * The pool object holds a reference to the hypervisor connection. + * When the pool object is no longer needed, virObjectUnref() must be + * called in order to not leak data. */ virStoragePoolPtr virGetStoragePool(virConnectPtr conn, const char *name, @@ -451,9 +441,7 @@ error: * @pool: the pool to release * * Unconditionally release all memory associated with a pool. - * The conn.lock mutex must be held prior to calling this, and will - * be released prior to this returning. The pool obj must not - * be used once this method returns. + * The pool object must not be used once this method returns. * * It will also unreference the associated connection object, * which may also be released if its ref count hits zero. @@ -485,12 +473,12 @@ virStoragePoolDispose(void *obj) * @privateData: pointer to driver specific private data * @freeFunc: private data cleanup function pointer specfic to driver * - * Lookup if the storage vol is already registered for that connection, - * if yes return a new pointer to it, if no allocate a new structure, - * and register it in the table. In any case a corresponding call to - * virObjectUnref() is needed to not leak data. + * Allocates and returns a pointer to a new storage volume object. + * Returns NULL on error. * - * Returns a pointer to the storage vol, or NULL in case of failure + * The volume object holds a reference to the hypervisor connection. + * When the volume object is no longer needed, virObjectUnref() must be + * called in order to not leak data. */ virStorageVolPtr virGetStorageVol(virConnectPtr conn, const char *pool, const char *name, @@ -532,10 +520,8 @@ error: * virStorageVolDispose: * @vol: the vol to release * - * Unconditionally release all memory associated with a vol. - * The conn.lock mutex must be held prior to calling this, and will - * be released prior to this returning. The vol obj must not - * be used once this method returns. + * Unconditionally release all memory associated with a volume. + * The volume object must not be used once this method returns. * * It will also unreference the associated connection object, * which may also be released if its ref count hits zero. @@ -562,12 +548,12 @@ virStorageVolDispose(void *obj) * @conn: the hypervisor connection * @name: device name (unique on node) * - * Lookup if the device is already registered for that connection, - * if yes return a new pointer to it, if no allocate a new structure, - * and register it in the table. In any case a corresponding call to - * virObjectUnref() is needed to not leak data. + * Allocates and returns a pointer to a new node device object. + * Returns NULL on error. * - * Returns a pointer to the node device, or NULL in case of failure + * The device object holds a reference to the hypervisor connection. + * When the device object is no longer needed, virObjectUnref() must be + * called in order to not leak data. */ virNodeDevicePtr virGetNodeDevice(virConnectPtr conn, const char *name) @@ -599,10 +585,8 @@ error: * virNodeDeviceDispose: * @dev: the dev to release * - * Unconditionally release all memory associated with a dev. - * The conn.lock mutex must be held prior to calling this, and will - * be released prior to this returning. The dev obj must not - * be used once this method returns. + * Unconditionally release all memory associated with a device. + * The device object must not be used once this method returns. * * It will also unreference the associated connection object, * which may also be released if its ref count hits zero. @@ -625,12 +609,12 @@ virNodeDeviceDispose(void *obj) * @conn: the hypervisor connection * @uuid: secret UUID * - * Lookup if the secret is already registered for that connection, if so return - * a pointer to it, otherwise allocate a new structure, and register it in the - * table. In any case a corresponding call to virObjectUnref() is needed to not - * leak data. + * Allocates and returns a pointer to a new secret object. + * Returns NULL on error. * - * Returns a pointer to the secret, or NULL in case of failure + * The secret object holds a reference to the hypervisor connection. + * When the secret object is no longer needed, virObjectUnref() must be + * called in order to not leak data. */ virSecretPtr virGetSecret(virConnectPtr conn, const unsigned char *uuid, @@ -666,12 +650,11 @@ error: * virSecretDispose: * @secret: the secret to release * - * Unconditionally release all memory associated with a secret. The conn.lock - * mutex must be held prior to calling this, and will be released prior to this - * returning. The secret obj must not be used once this method returns. + * Unconditionally release all memory associated with a secret. + * The secret object must not be used once this method returns. * - * It will also unreference the associated connection object, which may also be - * released if its ref count hits zero. + * It will also unreference the associated connection object, + * which may also be released if its ref count hits zero. */ static void virSecretDispose(void *obj) @@ -687,6 +670,17 @@ virSecretDispose(void *obj) } +/** + * virGetStream: + * @conn: the hypervisor connection + * + * Allocates and returns a pointer to a new stream object. + * Returns NULL on error. + * + * The secret object holds a reference to the hypervisor connection. + * When the secret object is no longer needed, virObjectUnref() must be + * called in order to not leak data. + */ virStreamPtr virGetStream(virConnectPtr conn) { @@ -703,6 +697,16 @@ virGetStream(virConnectPtr conn) return ret; } +/** + * virStreamDispose: + * @stream: the stream to release + * + * Unconditionally release all memory associated with a stream. + * The stream object must not be used once this method returns. + * + * It will also unreference the associated connection object, + * which may also be released if its ref count hits zero. + */ static void virStreamDispose(void *obj) { @@ -719,12 +723,12 @@ virStreamDispose(void *obj) * @name: pointer to the network filter pool name * @uuid: pointer to the uuid * - * Lookup if the network filter is already registered for that connection, - * if yes return a new pointer to it, if no allocate a new structure, - * and register it in the table. In any case a corresponding call to - * virObjectUnref() is needed to not leak data. + * Allocates and returns a pointer to a new nwfilter object. + * Returns NULL on error. * - * Returns a pointer to the network, or NULL in case of failure + * The nwfilter object holds a reference to the hypervisor connection. + * When the nwfilter object is no longer needed, virObjectUnref() must be + * called in order to not leak data. */ virNWFilterPtr virGetNWFilter(virConnectPtr conn, const char *name, @@ -762,9 +766,7 @@ error: * @nwfilter: the nwfilter to release * * Unconditionally release all memory associated with a nwfilter. - * The conn.lock mutex must be held prior to calling this, and will - * be released prior to this returning. The nwfilter obj must not - * be used once this method returns. + * The nwfilter object must not be used once this method returns. * * It will also unreference the associated connection object, * which may also be released if its ref count hits zero. @@ -783,6 +785,18 @@ virNWFilterDispose(void *obj) } +/** + * virGetDomainSnapshot: + * @conn: the hypervisor connection + * @name: pointer to the domain snapshot name + * + * Allocates and returns a pointer to a new domain snapshot object. + * Returns NULL on error. + * + * The snapshot object holds a reference to the hypervisor connection. + * When the snapshot object is no longer needed, virObjectUnref() must be + * called in order to not leak data. + */ virDomainSnapshotPtr virGetDomainSnapshot(virDomainPtr domain, const char *name) { @@ -809,6 +823,16 @@ error: } +/** + * virDomainSnapshotDispose: + * @snapshot: the snapshot to release + * + * Unconditionally release all memory associated with a snapshot. + * The snapshot object must not be used once this method returns. + * + * It will also unreference the associated connection object, + * which may also be released if its ref count hits zero. + */ static void virDomainSnapshotDispose(void *obj) { -- 1.8.5.3

2 3

[libvirt] [PATCH] nwfilter: Deactivate iptables MAC address check where needed
by Stefan Berger 10 Mar '14

10 Mar '14

From: Stefan Berger <stefanb(a)linux.vnet.ibm.com> Recent Linux iptables (3.11.7) refuses to create iptables MAC address check rules using -m mac --mac-source <addr> where previous versions still allowed it. So we now need to deactivate the filtering rules for when the incoming traffic is filtered before it is sent into the VM. Those are typically the chains that start with FO-* or start with FP-* when they are being built. Adapt the documentation to reflect the fact that srcmacaddr, when used in iptables rules, should be regarded as deprecated due to the above mentioned problems. Signed-off-by: Stefan Berger <stefanb(a)linux.vnet.ibm.com> --- docs/formatnwfilter.html.in | 42 +++++-------------------------- src/nwfilter/nwfilter_ebiptables_driver.c | 29 +++++++++++++-------- 2 files changed, 24 insertions(+), 47 deletions(-) diff --git a/docs/formatnwfilter.html.in b/docs/formatnwfilter.html.in index 4b95fce..ee23d8e 100644 --- a/docs/formatnwfilter.html.in +++ b/docs/formatnwfilter.html.in @@ -1209,7 +1209,7 @@ <tr> <td>srcmacaddr</td> <td>MAC_ADDR</td> - <td>MAC address of sender</td> + <td>MAC address of sender; this option is deprecated</td> </tr> <tr> <td>srcipaddr</td> @@ -1320,22 +1320,7 @@ <tr> <td>srcmacaddr</td> <td>MAC_ADDR</td> - <td>MAC address of sender</td> - </tr> - <tr> - <td>srcmacmask</td> - <td>MAC_MASK</td> - <td>Mask applied to MAC address of sender</td> - </tr> - <tr> - <td>dstmacaddr</td> - <td>MAC_ADDR</td> - <td>MAC address of destination</td> - </tr> - <tr> - <td>dstmacmask</td> - <td>MAC_MASK</td> - <td>Mask applied to MAC address of destination</td> + <td>MAC address of sender; this option is deprecated</td> </tr> <tr> <td>srcipaddr</td> @@ -1429,22 +1414,7 @@ <tr> <td>srcmacaddr</td> <td>MAC_ADDR</td> - <td>MAC address of sender</td> - </tr> - <tr> - <td>srcmacmask</td> - <td>MAC_MASK</td> - <td>Mask applied to MAC address of sender</td> - </tr> - <tr> - <td>dstmacaddr</td> - <td>MAC_ADDR</td> - <td>MAC address of destination</td> - </tr> - <tr> - <td>dstmacmask</td> - <td>MAC_MASK</td> - <td>Mask applied to MAC address of destination</td> + <td>MAC address of sender; this option is deprecated</td> </tr> <tr> <td>srcipaddr</td> @@ -1529,7 +1499,7 @@ <tr> <td>srcmacaddr</td> <td>MAC_ADDR</td> - <td>MAC address of sender</td> + <td>MAC address of sender; this option is deprecated</td> </tr> <tr> <td>srcipaddr</td> @@ -1640,7 +1610,7 @@ <tr> <td>srcmacaddr</td> <td>MAC_ADDR</td> - <td>MAC address of sender</td> + <td>MAC address of sender; this option is deprecated</td> </tr> <tr> <td>srcipaddr</td> @@ -1735,7 +1705,7 @@ <tr> <td>srcmacaddr</td> <td>MAC_ADDR</td> - <td>MAC address of sender</td> + <td>MAC address of sender; this option is deprecated</td> </tr> <tr> <td>srcipaddr</td> diff --git a/src/nwfilter/nwfilter_ebiptables_driver.c b/src/nwfilter/nwfilter_ebiptables_driver.c index 9d6cc90..ebc3505 100644 --- a/src/nwfilter/nwfilter_ebiptables_driver.c +++ b/src/nwfilter/nwfilter_ebiptables_driver.c @@ -972,7 +972,7 @@ static int iptablesHandleSrcMacAddr(virBufferPtr buf, virNWFilterVarCombIterPtr vars, nwItemDescPtr srcMacAddr, - bool directionIn, + const char *chain, bool directionIn, bool *srcmacskipped) { char macaddr[VIR_MAC_STRING_BUFLEN]; @@ -984,6 +984,14 @@ iptablesHandleSrcMacAddr(virBufferPtr buf, return 0; } + /* recent Linux iptables does not allow this filteirng rule to be + * applied to all FO-* chains + */ + if (chain[1] == CHAINPREFIX_HOST_OUT_TEMP ) { + *srcmacskipped = true; + return 0; + } + if (printDataType(vars, macaddr, sizeof(macaddr), srcMacAddr) < 0) @@ -1366,7 +1374,7 @@ _iptablesCreateRuleInstance(bool directionIn, if (iptablesHandleSrcMacAddr(&buf, vars, &rule->p.tcpHdrFilter.dataSrcMACAddr, - directionIn, + chain, directionIn, &srcMacSkipped) < 0) goto err_exit; @@ -1421,7 +1429,7 @@ _iptablesCreateRuleInstance(bool directionIn, if (iptablesHandleSrcMacAddr(&buf, vars, &rule->p.udpHdrFilter.dataSrcMACAddr, - directionIn, + chain, directionIn, &srcMacSkipped) < 0) goto err_exit; @@ -1454,7 +1462,7 @@ _iptablesCreateRuleInstance(bool directionIn, if (iptablesHandleSrcMacAddr(&buf, vars, &rule->p.udpliteHdrFilter.dataSrcMACAddr, - directionIn, + chain, directionIn, &srcMacSkipped) < 0) goto err_exit; @@ -1482,7 +1490,7 @@ _iptablesCreateRuleInstance(bool directionIn, if (iptablesHandleSrcMacAddr(&buf, vars, &rule->p.espHdrFilter.dataSrcMACAddr, - directionIn, + chain, directionIn, &srcMacSkipped) < 0) goto err_exit; @@ -1506,11 +1514,10 @@ _iptablesCreateRuleInstance(bool directionIn, virBufferAddLit(&buf, " -p ah"); bufUsed = virBufferUse(&buf); - if (iptablesHandleSrcMacAddr(&buf, vars, &rule->p.ahHdrFilter.dataSrcMACAddr, - directionIn, + chain, directionIn, &srcMacSkipped) < 0) goto err_exit; @@ -1538,7 +1545,7 @@ _iptablesCreateRuleInstance(bool directionIn, if (iptablesHandleSrcMacAddr(&buf, vars, &rule->p.sctpHdrFilter.dataSrcMACAddr, - directionIn, + chain, directionIn, &srcMacSkipped) < 0) goto err_exit; @@ -1574,7 +1581,7 @@ _iptablesCreateRuleInstance(bool directionIn, if (iptablesHandleSrcMacAddr(&buf, vars, &rule->p.icmpHdrFilter.dataSrcMACAddr, - directionIn, + chain, directionIn, &srcMacSkipped) < 0) goto err_exit; @@ -1636,7 +1643,7 @@ _iptablesCreateRuleInstance(bool directionIn, if (iptablesHandleSrcMacAddr(&buf, vars, &rule->p.igmpHdrFilter.dataSrcMACAddr, - directionIn, + chain, directionIn, &srcMacSkipped) < 0) goto err_exit; @@ -1664,7 +1671,7 @@ _iptablesCreateRuleInstance(bool directionIn, if (iptablesHandleSrcMacAddr(&buf, vars, &rule->p.allHdrFilter.dataSrcMACAddr, - directionIn, + chain, directionIn, &srcMacSkipped) < 0) goto err_exit; -- 1.8.1.4

2 2

[libvirt] [PATCH 1/3] no_mac_source
by Stefan Berger 10 Mar '14

10 Mar '14

From: Stefan Berger <stefanb(a)linux.vnet.ibm.com> Subject nwfilter: Deactivate iptables MAC address check where needed Recent Linux iptables (3.11.7) refuses to create iptables MAC address check rules using -m mac --mac-source <addr> where previous versions still allowed it. So we now need to deactivate the filtering rules for when the incoming traffic is filtered before it is sent into the VM. Those are typically the chains that start with FO-* or start with FP-* when they are being built. Adapt the documentation to reflect the fact that srcmacaddr, when used in iptables rules, should be regarded as deprecated due to the above mentioned problems. Signed-off-by: Stefan Berger <stefanb(a)linux.vnet.ibm.com> --- docs/formatnwfilter.html.in | 42 +++++-------------------------- src/nwfilter/nwfilter_ebiptables_driver.c | 29 +++++++++++++-------- 2 files changed, 24 insertions(+), 47 deletions(-) diff --git a/docs/formatnwfilter.html.in b/docs/formatnwfilter.html.in index 4b95fce..ee23d8e 100644 --- a/docs/formatnwfilter.html.in +++ b/docs/formatnwfilter.html.in @@ -1209,7 +1209,7 @@ <tr> <td>srcmacaddr</td> <td>MAC_ADDR</td> - <td>MAC address of sender</td> + <td>MAC address of sender; this option is deprecated</td> </tr> <tr> <td>srcipaddr</td> @@ -1320,22 +1320,7 @@ <tr> <td>srcmacaddr</td> <td>MAC_ADDR</td> - <td>MAC address of sender</td> - </tr> - <tr> - <td>srcmacmask</td> - <td>MAC_MASK</td> - <td>Mask applied to MAC address of sender</td> - </tr> - <tr> - <td>dstmacaddr</td> - <td>MAC_ADDR</td> - <td>MAC address of destination</td> - </tr> - <tr> - <td>dstmacmask</td> - <td>MAC_MASK</td> - <td>Mask applied to MAC address of destination</td> + <td>MAC address of sender; this option is deprecated</td> </tr> <tr> <td>srcipaddr</td> @@ -1429,22 +1414,7 @@ <tr> <td>srcmacaddr</td> <td>MAC_ADDR</td> - <td>MAC address of sender</td> - </tr> - <tr> - <td>srcmacmask</td> - <td>MAC_MASK</td> - <td>Mask applied to MAC address of sender</td> - </tr> - <tr> - <td>dstmacaddr</td> - <td>MAC_ADDR</td> - <td>MAC address of destination</td> - </tr> - <tr> - <td>dstmacmask</td> - <td>MAC_MASK</td> - <td>Mask applied to MAC address of destination</td> + <td>MAC address of sender; this option is deprecated</td> </tr> <tr> <td>srcipaddr</td> @@ -1529,7 +1499,7 @@ <tr> <td>srcmacaddr</td> <td>MAC_ADDR</td> - <td>MAC address of sender</td> + <td>MAC address of sender; this option is deprecated</td> </tr> <tr> <td>srcipaddr</td> @@ -1640,7 +1610,7 @@ <tr> <td>srcmacaddr</td> <td>MAC_ADDR</td> - <td>MAC address of sender</td> + <td>MAC address of sender; this option is deprecated</td> </tr> <tr> <td>srcipaddr</td> @@ -1735,7 +1705,7 @@ <tr> <td>srcmacaddr</td> <td>MAC_ADDR</td> - <td>MAC address of sender</td> + <td>MAC address of sender; this option is deprecated</td> </tr> <tr> <td>srcipaddr</td> diff --git a/src/nwfilter/nwfilter_ebiptables_driver.c b/src/nwfilter/nwfilter_ebiptables_driver.c index 9d6cc90..ebc3505 100644 --- a/src/nwfilter/nwfilter_ebiptables_driver.c +++ b/src/nwfilter/nwfilter_ebiptables_driver.c @@ -972,7 +972,7 @@ static int iptablesHandleSrcMacAddr(virBufferPtr buf, virNWFilterVarCombIterPtr vars, nwItemDescPtr srcMacAddr, - bool directionIn, + const char *chain, bool directionIn, bool *srcmacskipped) { char macaddr[VIR_MAC_STRING_BUFLEN]; @@ -984,6 +984,14 @@ iptablesHandleSrcMacAddr(virBufferPtr buf, return 0; } + /* recent Linux iptables does not allow this filteirng rule to be + * applied to all FO-* chains + */ + if (chain[1] == CHAINPREFIX_HOST_OUT_TEMP ) { + *srcmacskipped = true; + return 0; + } + if (printDataType(vars, macaddr, sizeof(macaddr), srcMacAddr) < 0) @@ -1366,7 +1374,7 @@ _iptablesCreateRuleInstance(bool directionIn, if (iptablesHandleSrcMacAddr(&buf, vars, &rule->p.tcpHdrFilter.dataSrcMACAddr, - directionIn, + chain, directionIn, &srcMacSkipped) < 0) goto err_exit; @@ -1421,7 +1429,7 @@ _iptablesCreateRuleInstance(bool directionIn, if (iptablesHandleSrcMacAddr(&buf, vars, &rule->p.udpHdrFilter.dataSrcMACAddr, - directionIn, + chain, directionIn, &srcMacSkipped) < 0) goto err_exit; @@ -1454,7 +1462,7 @@ _iptablesCreateRuleInstance(bool directionIn, if (iptablesHandleSrcMacAddr(&buf, vars, &rule->p.udpliteHdrFilter.dataSrcMACAddr, - directionIn, + chain, directionIn, &srcMacSkipped) < 0) goto err_exit; @@ -1482,7 +1490,7 @@ _iptablesCreateRuleInstance(bool directionIn, if (iptablesHandleSrcMacAddr(&buf, vars, &rule->p.espHdrFilter.dataSrcMACAddr, - directionIn, + chain, directionIn, &srcMacSkipped) < 0) goto err_exit; @@ -1506,11 +1514,10 @@ _iptablesCreateRuleInstance(bool directionIn, virBufferAddLit(&buf, " -p ah"); bufUsed = virBufferUse(&buf); - if (iptablesHandleSrcMacAddr(&buf, vars, &rule->p.ahHdrFilter.dataSrcMACAddr, - directionIn, + chain, directionIn, &srcMacSkipped) < 0) goto err_exit; @@ -1538,7 +1545,7 @@ _iptablesCreateRuleInstance(bool directionIn, if (iptablesHandleSrcMacAddr(&buf, vars, &rule->p.sctpHdrFilter.dataSrcMACAddr, - directionIn, + chain, directionIn, &srcMacSkipped) < 0) goto err_exit; @@ -1574,7 +1581,7 @@ _iptablesCreateRuleInstance(bool directionIn, if (iptablesHandleSrcMacAddr(&buf, vars, &rule->p.icmpHdrFilter.dataSrcMACAddr, - directionIn, + chain, directionIn, &srcMacSkipped) < 0) goto err_exit; @@ -1636,7 +1643,7 @@ _iptablesCreateRuleInstance(bool directionIn, if (iptablesHandleSrcMacAddr(&buf, vars, &rule->p.igmpHdrFilter.dataSrcMACAddr, - directionIn, + chain, directionIn, &srcMacSkipped) < 0) goto err_exit; @@ -1664,7 +1671,7 @@ _iptablesCreateRuleInstance(bool directionIn, if (iptablesHandleSrcMacAddr(&buf, vars, &rule->p.allHdrFilter.dataSrcMACAddr, - directionIn, + chain, directionIn, &srcMacSkipped) < 0) goto err_exit; -- 1.8.1.4

2 1

[libvirt] Unable to start Nehalem VM on Nehalem host
by Ruben Kerkhof 10 Mar '14

10 Mar '14

Hi list, I'm trying to debug a strange issue I have, and I'd appreciate some help. I've upgraded libvirt to 1.2.2, on Scientific Linux, with qemu-kvm-0.12.1.2-2.415.el6_5.3 Here’s my analysis so far: I figured out that libvirt uses HMP to get the list of models from qemu-kvm by running qemu-kvm -cpu ?model -nodefconfig. This returns the following: x86 Opteron_G5 AMD Opteron 63xx class CPU x86 Opteron_G4 AMD Opteron 62xx class CPU x86 Opteron_G3 AMD Opteron 23xx (Gen 3 Class Opteron) x86 Opteron_G2 AMD Opteron 22xx (Gen 2 Class Opteron) x86 Opteron_G1 AMD Opteron 240 (Gen 1 Class Opteron) x86 Haswell Intel Core Processor (Haswell) x86 SandyBridge Intel Xeon E312xx (Sandy Bridge) x86 Westmere Westmere E56xx/L56xx/X56xx (Nehalem-C) x86 Nehalem Intel Core i7 9xx (Nehalem Class Core i7) x86 Penryn Intel Core 2 Duo P9xxx (Penryn Class Core 2) x86 Conroe Intel Celeron_4x0 (Conroe/Merom Class Core 2) x86 cpu64-rhel5 QEMU Virtual CPU version (cpu64-rhel5) x86 cpu64-rhel6 QEMU Virtual CPU version (cpu64-rhel6) x86 n270 Intel(R) Atom(TM) CPU N270 @ 1.60GHz x86 athlon QEMU Virtual CPU version 0.12.1 x86 pentium3 x86 pentium2 x86 pentium x86 486 x86 coreduo Genuine Intel(R) CPU T2600 @ 2.16GHz x86 qemu32 QEMU Virtual CPU version 0.12.1 x86 kvm64 Common KVM processor x86 core2duo Intel(R) Core(TM)2 Duo CPU T7700 @ 2.40GHz x86 phenom AMD Phenom(tm) 9550 Quad-Core Processor x86 qemu64 QEMU Virtual CPU version 0.12.1 The comment describing the function parsing this list states that the output is expected to be as follows: /* Format: * <arch> <model> * qemu-0.13 encloses some model names in []: * <arch> [<model>] */ static int virQEMUCapsParseX86Models(const char *output, virQEMUCapsPtr qemuCaps) { but this function doesn’t strip the rest of the line, so the models array becomes: Breakpoint 1, x86Decode (cpu=0x7fffd82a8460, data=0x7fffd8272d00, models=0x7fffd82b7440, nmodels=25, preferred=0x7fffd82a81f0 "Nehalem", flags=0) at cpu/cpu_x86.c:1487 1487 { (gdb) p models $1 = (const char **) 0x7fffd82b7440 (gdb) p *models $2 = 0x7fffd82ba240 "Opteron_G5 AMD Opteron 63xx class CPU", ' ' <repeats 22 times> (gdb) p *models@25 $3 = {0x7fffd82ba240 "Opteron_G5 AMD Opteron 63xx class CPU", ' ' <repeats 22 times>, 0x7fffd82c8c30 "Opteron_G4 AMD Opteron 62xx class CPU", ' ' <repeats 22 times>, 0x7fffd8169e00 "Opteron_G3 AMD Opteron 23xx (Gen 3 Class Opteron) ", 0x7fffd8169cb0 "Opteron_G2 AMD Opteron 22xx (Gen 2 Class Opteron) ", 0x7fffd8169b60 "Opteron_G1 AMD Opteron 240 (Gen 1 Class Opteron)", ' ' <repeats 11 times>, 0x7fffd8169a10 "Haswell Intel Core Processor (Haswell)", ' ' <repeats 18 times>, 0x7fffd81697e0 "SandyBridge Intel Xeon E312xx (Sandy Bridge)", ' ' <repeats 16 times>, 0x7fffd8169690 "Westmere Westmere E56xx/L56xx/X56xx (Nehalem-C) ", 0x7fffd8169460 "Nehalem Intel Core i7 9xx (Nehalem Class Core i7) ", 0x7fffd81693f0 "Penryn Intel Core 2 Duo P9xxx (Penryn Class Core 2) ", 0x7fffd8169310 "Conroe Intel Celeron_4x0 (Conroe/Merom Class Core 2) ", 0x7fffd8169230 "cpu64-rhel5 QEMU Virtual CPU version (cpu64-rhel5) ", 0x7fffd8169150 "cpu64-rhel6 QEMU Virtual CPU version (cpu64-rhel6) ", 0x7fffd82ba2b0 "n270 Intel(R) Atom(TM) CPU N270 @ 1.60GHz ", 0x7fffd81690e0 "athlon QEMU Virtual CPU version 0.12.1", ' ' <repeats 17 times>, 0x7fffd8169000 "pentium3", ' ' <repeats 50 times>, 0x7fffd8168f90 "pentium2", ' ' <repeats 50 times>, 0x7fffd8168eb0 "pentium", ' ' <repeats 50 times>, 0x7fffd82a8760 "486", ' ' <repeats 50 times>, 0x7fffd8168e40 "coreduo Genuine Intel(R) CPU", ' ' <repeats 11 times>, "T2600 @ 2.16GHz ", 0x7fffd8168d60 "qemu32 QEMU Virtual CPU version 0.12.1", ' ' <repeats 17 times>, 0x7fffd82bb150 "kvm64 Common KVM processor", ' ' <repeats 28 times>, 0x7fffd8168cf0 "core2duo Intel(R) Core(TM)2 Duo CPU T7700 @ 2.40GHz ", 0x7fffd8168c10 "phenom AMD Phenom(tm) 9550 Quad-Core Processor ", 0x7fffd8168b30 "qemu64 QEMU Virtual CPU version 0.12.1", ' ' <repeats 17 times>} cpuModellsAllowed then does a strcmp between “Nehalem” and "Nehalem Intel Core i7 9xx (Nehalem Class Core i7)” which fails, and the vm fails to start with: 2014-03-10 14:56:16.917+0000: 8328: info : qemuDomainDefineXML:6231 : Creating domain '530df8bd-7b64-4553-b4f4-18922e1327bf' 2014-03-10 14:56:17.114+0000: 8329: warning : x86Decode:1515 : Preferred CPU model Nehalem not allowed by hypervisor; closest supported model will be used 2014-03-10 14:56:17.114+0000: 8329: error : x86Decode:1571 : internal error: Cannot find suitable CPU model for given data Kind regards, Ruben Kerkhof

2 2

[libvirt] [PATCH] virSecurityDACSetSecurityImageLabel: Unmark @def as unused
by Michal Privoznik 10 Mar '14

10 Mar '14

The @def is clearly used just a few lines below. There's no need to use ATTRIBUTE_UNUSED for it. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/security/security_dac.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/security/security_dac.c b/src/security/security_dac.c index 09b5e57..85e6eec 100644 --- a/src/security/security_dac.c +++ b/src/security/security_dac.c @@ -342,25 +342,25 @@ virSecurityDACSetSecurityFileLabel(virDomainDiskDefPtr disk ATTRIBUTE_UNUSED, static int virSecurityDACSetSecurityImageLabel(virSecurityManagerPtr mgr, - virDomainDefPtr def ATTRIBUTE_UNUSED, + virDomainDefPtr def, virDomainDiskDefPtr disk) { void *params[2]; virSecurityDACDataPtr priv = virSecurityManagerGetPrivateData(mgr); if (!priv->dynamicOwnership) return 0; if (disk->type == VIR_DOMAIN_DISK_TYPE_NETWORK) return 0; params[0] = mgr; params[1] = def; return virDomainDiskDefForeachPath(disk, false, virSecurityDACSetSecurityFileLabel, params); } -- 1.9.0

2 1

[libvirt] [PATCH 0/7] Remove overhead of disabled logging calls
by Daniel P. Berrange 10 Mar '14

10 Mar '14

Looking at the performance of the libvirtd event loop when used with libvirt sandbox and apps which do lots of I/O I discovered that a huge amount of time was being spent in our logging APIs making the event loop quite poor at dealing with frequently firing poll events for small data sizes. To track this down I created the following short demo program which simulates a libvirtd event loop thread, watching 500 FDs (eg 500 QEMU or LXC console or monitor FDs). In the test no logging outputs are enabled, so ideally the log overhead would be near zero. Running the demo for 51200 iterations initially took 1 minute 40 seconds. oprofile traces show that in this test run the logging APIs were totally dominant in CPU time, over the work done in the event loop. Note the demo program's FD handler doesn't actually do any work, so this is showing the worst case behaviour, but it is none-the-less a good illustration of the loggin overhead. After refactoring the logging code, the overhead of logging calls when no outputs are enabled is reduced to a single function call which does 2 integer comparisons without any mutex locks. The demo program now completes in 3.3 seconds. IOW, 97% of the original CPU time for the demo was consumed by the logging APIs ! The main feature we loose in this series is the global logging buffer. This ring buffer currently collects all log mesages regardless of log filter settings, and dumps them to stderr upon crash of libvirtd. As the amount of logging code in libvirt has grown, the signal/noise ratio of data in the global log buffer has gone down significantly. Whenever libvirtd crashes, my first reaction to ask the reporter to reproduce with a specifically tailored set of log filters set. Thus, IMHO, the global log buffer is no longer a compelling enough feature to justify its significant performance overhead. Rather than remove it entirely though, I've changed it in two parts. The first patch removes the overhead of it, but leaves a more tailored verson of it still present. This removes the contribution it makes to performance overheads. The last patch, which is not performance relevant, simply deletes the rest of the global log buffer entirely. I'm mostly ambivalent on whether to apply patch 7 or not. IMHO the global log buffer is mostly useless once patch 1 is applied, but if people think it is worth keeping it, patch 7 can be dropped and I won't mind. The demo program used is $ cat demo.c #include <libvirt/libvirt.h> #include <unistd.h> #include <stdio.h> static void ignore(int handle, int fd, int events, void *opaque) { // nada } #define STEPS (1024 * 5) #define ITERATIONS (STEPS * 10) #define NFILES 500 int main(int argc, char **argv) { int fds[NFILES][2]; int i; virEventRegisterDefaultImpl(); for (i = 0 ; i < NFILES ; i++) { char c = '0'; if (pipe(fds[i]) < 0) { perror("pipe"); return -1; } if (write(fds[i][1], &c, 1) < 0) return -1; virEventAddHandle(fds[i][0], VIR_EVENT_HANDLE_READABLE, ignore, NULL, NULL); } for (i = 0 ; i < ITERATIONS ; i++) { if (!(i % STEPS)) fprintf(stderr, "."); virEventRunDefaultImpl(); } return 0; } Simply compile & run it with no args $ gcc -Wall `pkg-config --cflags --libs libvirt` -o demo demo.c $ time ./demo .......... real 1m39.981s user 1m34.894s sys 0m4.851s Now make it use the newly compiled libvirt version $ export LD_LIBRARY_PATH=`pwd`/src/.libs $ time ./demo .......... real 0m3.316s user 0m2.896s sys 0m0.412s 97% execution time removed ! Daniel P. Berrange (7): Reduce performance overhead of the global log buffer Refactor code that skips logging of error messages Move dtrace probe macros into separate header file Turn virLogSource into a struct instead of an enum Add virLogSource variables to all source files Switch to filtering based on log source name instead of filename Remove global log buffer feature entirely daemon/libvirtd-config.c | 5 +- daemon/libvirtd-config.h | 1 - daemon/libvirtd.aug | 1 - daemon/libvirtd.c | 5 +- daemon/libvirtd.conf | 7 - daemon/libvirtd.h | 1 - daemon/remote.c | 3 + daemon/stream.c | 2 + daemon/test_libvirtd.aug.in | 1 - docs/apibuild.py | 30 +++ docs/logging.html.in | 10 - src/access/viraccessdriverpolkit.c | 3 + src/access/viraccessmanager.c | 3 + src/bhyve/bhyve_command.c | 2 + src/bhyve/bhyve_driver.c | 2 + src/bhyve/bhyve_process.c | 2 + src/conf/domain_audit.c | 2 + src/conf/domain_conf.c | 2 + src/conf/domain_event.c | 1 + src/conf/network_event.c | 2 + src/conf/nwfilter_params.c | 2 + src/conf/object_event.c | 2 + src/conf/secret_conf.c | 2 + src/conf/snapshot_conf.c | 2 + src/conf/storage_conf.c | 1 - src/conf/virchrdev.c | 2 + src/cpu/cpu.c | 2 + src/cpu/cpu_powerpc.c | 2 + src/cpu/cpu_x86.c | 2 + src/datatypes.c | 2 + src/driver.c | 2 + src/esx/esx_device_monitor.c | 1 - src/esx/esx_driver.c | 2 + src/esx/esx_interface_driver.c | 2 - src/esx/esx_network_driver.c | 2 - src/esx/esx_nwfilter_driver.c | 2 - src/esx/esx_secret_driver.c | 2 - src/esx/esx_storage_backend_iscsi.c | 2 - src/esx/esx_storage_backend_vmfs.c | 2 + src/esx/esx_util.c | 2 +- src/esx/esx_vi.c | 2 +- src/esx/esx_vi_methods.c | 1 - src/esx/esx_vi_types.c | 2 +- src/fdstream.c | 2 + src/hyperv/hyperv_device_monitor.c | 2 - src/hyperv/hyperv_driver.c | 3 +- src/hyperv/hyperv_interface_driver.c | 2 - src/hyperv/hyperv_network_driver.c | 2 - src/hyperv/hyperv_nwfilter_driver.c | 2 - src/hyperv/hyperv_secret_driver.c | 2 - src/hyperv/hyperv_storage_driver.c | 2 - src/hyperv/hyperv_util.c | 2 +- src/hyperv/hyperv_wmi.c | 2 - src/interface/interface_backend_netcf.c | 2 + src/internal.h | 74 ------ src/libvirt-lxc.c | 2 + src/libvirt-qemu.c | 2 + src/libvirt.c | 2 + src/libxl/libxl_conf.c | 2 + src/libxl/libxl_domain.c | 1 + src/libxl/libxl_driver.c | 2 + src/locking/domain_lock.c | 2 + src/locking/lock_daemon.c | 4 +- src/locking/lock_daemon_config.c | 4 +- src/locking/lock_daemon_config.h | 1 - src/locking/lock_daemon_dispatch.c | 5 +- src/locking/lock_driver_lockd.c | 2 + src/locking/lock_driver_nop.c | 2 + src/locking/lock_driver_sanlock.c | 2 + src/locking/lock_manager.c | 2 + src/locking/test_virtlockd.aug.in | 2 - src/locking/virtlockd.aug | 1 - src/locking/virtlockd.conf | 7 - src/lxc/lxc_cgroup.c | 2 + src/lxc/lxc_conf.c | 2 + src/lxc/lxc_container.c | 2 + src/lxc/lxc_controller.c | 2 + src/lxc/lxc_domain.c | 2 + src/lxc/lxc_driver.c | 1 + src/lxc/lxc_fuse.c | 1 - src/lxc/lxc_hostdev.c | 2 + src/lxc/lxc_monitor.c | 2 + src/lxc/lxc_native.c | 1 + src/lxc/lxc_process.c | 2 + src/network/bridge_driver.c | 2 + src/network/bridge_driver_linux.c | 3 + src/network/bridge_driver_platform.h | 1 - src/node_device/node_device_driver.c | 2 - src/node_device/node_device_hal.c | 2 + src/node_device/node_device_linux_sysfs.c | 2 + src/node_device/node_device_udev.c | 4 +- src/nodeinfo.c | 1 - src/nwfilter/nwfilter_dhcpsnoop.c | 2 + src/nwfilter/nwfilter_driver.c | 2 + src/nwfilter/nwfilter_ebiptables_driver.c | 2 + src/nwfilter/nwfilter_gentech_driver.c | 1 + src/nwfilter/nwfilter_learnipaddr.c | 2 + src/openvz/openvz_driver.c | 2 + src/parallels/parallels_driver.c | 2 + src/phyp/phyp_driver.c | 3 + src/qemu/qemu_agent.c | 2 + src/qemu/qemu_bridge_filter.c | 1 - src/qemu/qemu_capabilities.c | 4 +- src/qemu/qemu_cgroup.c | 2 + src/qemu/qemu_command.c | 2 + src/qemu/qemu_conf.c | 2 + src/qemu/qemu_domain.c | 2 + src/qemu/qemu_driver.c | 2 + src/qemu/qemu_hostdev.c | 2 + src/qemu/qemu_hotplug.c | 3 + src/qemu/qemu_migration.c | 2 + src/qemu/qemu_monitor.c | 3 + src/qemu/qemu_monitor_json.c | 3 + src/qemu/qemu_monitor_text.c | 3 + src/qemu/qemu_process.c | 2 + src/remote/remote_driver.c | 2 + src/rpc/virkeepalive.c | 3 + src/rpc/virnetclient.c | 3 + src/rpc/virnetclientprogram.c | 2 + src/rpc/virnetclientstream.c | 2 + src/rpc/virnetmessage.c | 2 + src/rpc/virnetsaslcontext.c | 2 + src/rpc/virnetserver.c | 47 +--- src/rpc/virnetserverclient.c | 3 + src/rpc/virnetservermdns.c | 2 + src/rpc/virnetserverprogram.c | 2 + src/rpc/virnetsocket.c | 2 + src/rpc/virnetsshsession.c | 2 + src/rpc/virnettlscontext.c | 3 + src/secret/secret_driver.c | 2 + src/security/security_apparmor.c | 3 + src/security/security_dac.c | 3 + src/security/security_driver.c | 2 + src/security/security_manager.c | 1 + src/security/security_selinux.c | 2 + src/storage/storage_backend.c | 2 + src/storage/storage_backend_disk.c | 2 + src/storage/storage_backend_fs.c | 2 + src/storage/storage_backend_gluster.c | 2 + src/storage/storage_backend_iscsi.c | 2 + src/storage/storage_backend_logical.c | 2 + src/storage/storage_backend_mpath.c | 2 + src/storage/storage_backend_rbd.c | 2 + src/storage/storage_backend_scsi.c | 2 + src/storage/storage_backend_sheepdog.c | 1 - src/storage/storage_driver.c | 2 + src/test/test_driver.c | 2 + src/uml/uml_conf.c | 1 + src/uml/uml_driver.c | 2 + src/util/viralloc.c | 2 + src/util/virarch.c | 2 + src/util/viraudit.c | 9 +- src/util/viraudit.h | 10 +- src/util/virauth.c | 2 + src/util/virauthconfig.c | 1 + src/util/vircgroup.c | 2 + src/util/virclosecallbacks.c | 2 + src/util/vircommand.c | 2 + src/util/virconf.c | 2 + src/util/virdbus.c | 2 + src/util/virdnsmasq.c | 3 + src/util/virebtables.c | 2 + src/util/virerror.c | 16 +- src/util/virevent.c | 2 + src/util/vireventpoll.c | 3 + src/util/virfile.c | 2 + src/util/virhash.c | 2 + src/util/virhook.c | 2 + src/util/viridentity.c | 1 + src/util/viriptables.c | 2 + src/util/virjson.c | 1 + src/util/virkeyfile.c | 2 + src/util/virlockspace.c | 2 + src/util/virlog.c | 379 ++++-------------------------- src/util/virlog.h | 49 ++-- src/util/virnetdev.c | 2 + src/util/virnetdevmacvlan.c | 1 + src/util/virnetdevtap.c | 2 + src/util/virnetdevveth.c | 2 + src/util/virnetdevvportprofile.c | 2 + src/util/virnetlink.c | 2 + src/util/virnodesuspend.c | 2 + src/util/virnuma.c | 2 + src/util/virobject.c | 3 + src/util/virpci.c | 2 + src/util/virpidfile.c | 2 + src/util/virprobe.h | 100 ++++++++ src/util/virprocess.c | 2 + src/util/virrandom.c | 2 + src/util/virscsi.c | 1 - src/util/virstoragefile.c | 2 + src/util/virstring.c | 2 + src/util/virsysinfo.c | 1 - src/util/virsystemd.c | 1 + src/util/virusb.c | 2 + src/util/virutil.c | 2 + src/util/viruuid.c | 2 + src/vbox/vbox_MSCOMGlue.c | 2 + src/vbox/vbox_XPCOMCGlue.c | 1 + src/vbox/vbox_driver.c | 1 + src/vbox/vbox_tmpl.c | 3 + src/vmx/vmx.c | 2 + src/xen/xen_driver.c | 3 + src/xen/xen_hypervisor.c | 2 + src/xen/xen_inotify.c | 2 + src/xen/xend_internal.c | 2 + src/xen/xm_internal.c | 2 + src/xen/xs_internal.c | 2 + src/xenapi/xenapi_utils.c | 2 + src/xenxs/xen_sxpr.c | 2 + tests/domainconftest.c | 2 + tests/eventtest.c | 2 + tests/fdstreamtest.c | 2 + tests/libvirtdconftest.c | 2 + tests/qemumonitortestutils.c | 2 + tests/securityselinuxlabeltest.c | 2 + tests/securityselinuxtest.c | 2 + tests/sockettest.c | 2 + tests/testutils.c | 4 +- tests/virauthconfigtest.c | 2 + tests/vircgrouptest.c | 2 + tests/virdbustest.c | 2 + tests/virdrivermoduletest.c | 2 + tests/virhashtest.c | 2 + tests/viridentitytest.c | 1 + tests/virkeycodetest.c | 1 + tests/virkeyfiletest.c | 1 + tests/virlockspacetest.c | 2 + tests/virnetmessagetest.c | 2 + tests/virnetsockettest.c | 2 + tests/virnettlscontexttest.c | 2 + tests/virnettlshelpers.c | 2 + tests/virnettlssessiontest.c | 2 + tests/virportallocatortest.c | 1 + tests/virstoragetest.c | 2 + tests/virstringtest.c | 2 + tests/virsystemdtest.c | 2 + tests/virtimetest.c | 2 + tests/viruritest.c | 2 + tools/virsh-console.c | 2 + 240 files changed, 637 insertions(+), 563 deletions(-) create mode 100644 src/util/virprobe.h -- 1.8.5.3

4 26

[libvirt] limit downtime during life migration from xl/virsh
by Olaf Hering 10 Mar '14

10 Mar '14

During live migration of VMs from one host to another the VM is suspended for an unpredictable amount of time. The actual downtime depends on how many new pages will be dirty and the band width to the destination host. Since VM memory size grows faster than transfer rates the currently available tuneables will cause troubles for workloads within the VM which can not handle large timejumps. I have already written code to tweak the inner loop doing the actual migration work in libxc. But the patchset exposes the details of the loop to the cmdline, as such it is not portable nor is it a friendly UI for the hostadmin. Here is my proposal for a new option for virsh and 2 new options for xl: [xl | virsh --live] --max-suspend-time N --timeout N VM host --max-suspend-time N: as the name suggests, the VM downtime must not be longer than specified. The code doing the migration has to estimate the transfer speed. If the VM is about to be suspended, it has to check if the remaining dirty pages can be transfered within the required timeframe. If not, the migration is aborted, the VM continues to run on the src host, the new VM on the dst host is destroyed and an error is returned. --timeout N: if a VM is busy and its workload causes many new dirty pages the migrate command would take forever. This option is supposed to stop the migration attempt if the number of new dirty pages is too high. It would change the semantics of "virsh migrate --timeout n", which currently forces a suspend (according to the help text). I'm not sure if its acceptable to add this option just for the libxl (and maybe xend) target in libvirt, until someone steps up to do also the kvm part. For Xen it would be added for xl only, obviously. Olaf

3 4

[libvirt] QEMU participating in Outreach Program for Women
by Stefan Hajnoczi 10 Mar '14

10 Mar '14

I am delighted to announce that we are participating in Outreach Program for Women! The same QEMU, KVM, and libvirt project ideas are shared with Google Summer of Code. Outreach Program for Women was started by GNOME specifically for women who want to start contributing to open source. It has since grown to include other organizations and we are able to take part this summer! If you would like to apply or know someone who might be interested in a 12-week, paid, open source gig from May 19 to August 18, take a look at our wiki: http://qemu-project.org/Outreach_Program_for_Women_Summer_2014 The application period starts today (March 10th) and the deadline is March 19th. Join the #qemu-gsoc IRC channel on irc.oftc.net to chat with mentors or ask questions. Also see the official OPW page for an overview of how it works: https://wiki.gnome.org/OutreachProgramForWomen/ Stefan

1 0

[libvirt] [PATCH 0/8] Misc ebtables cleanup patches
by Daniel P. Berrange 10 Mar '14

10 Mar '14

In doing some work on the firewall code in libvirt I came across lots of cruft which could usefully be cleaned up.. Daniel P. Berrange (8): Remove many decls from bridge driver platform header Remove decl of method which doesn't exist in virebtables.h Make ebtablesForwardPolicyReject static Remove unused variables from ebtablesContext Remove data structure holding list of ebtables rules Remove worthless ebtRules data structure Remove unused ebtablesRemoveForwardPolicyReject method Remove broken error reporting in QEMU mac filtering src/Makefile.am | 4 +- src/network/bridge_driver_linux.c | 42 ++++--- src/network/bridge_driver_nop.c | 42 ------- src/network/bridge_driver_platform.h | 22 ---- src/qemu/qemu_bridge_filter.c | 104 ---------------- src/qemu/qemu_bridge_filter.h | 37 ------ src/qemu/qemu_command.c | 11 +- src/qemu/qemu_conf.c | 1 - src/qemu/qemu_driver.c | 7 +- src/qemu/qemu_hotplug.c | 11 +- src/qemu/qemu_process.c | 10 +- src/util/virebtables.c | 233 +++-------------------------------- src/util/virebtables.h | 24 ---- 13 files changed, 60 insertions(+), 488 deletions(-) delete mode 100644 src/qemu/qemu_bridge_filter.c delete mode 100644 src/qemu/qemu_bridge_filter.h -- 1.8.5.3

2 9

[libvirt] [PATCH] libvirt-tck: Update hook syntax for libvirt 0.9.0+
by Mike Latimer 10 Mar '14

10 Mar '14

Starting with libvirt 0.9.0+, hook scripts can be called from several new locations. These locations must also be reflected in the expected logs of the hook tests. The final test in 052-domain-hook.t intentionally produces a failed start, which should show the first stage in the startup hook process, followed by all the stages in the destroy process. In addition to the above changes, libvirtd init scripts can return daemon status in several different ways (due to distribution differences, sysvinit vs. systemd, etc). This patch allows for 'running|active', and 'stopped|unused|inactive' responses which the hook tests rely on. --- lib/Sys/Virt/TCK/Hooks.pm | 17 ++++++++++++----- scripts/hooks/051-daemon-hook.t | 2 +- scripts/hooks/052-domain-hook.t | 6 +++--- 3 files changed, 16 insertions(+), 9 deletions(-) diff --git a/lib/Sys/Virt/TCK/Hooks.pm b/lib/Sys/Virt/TCK/Hooks.pm index 75f98e9..2ae2c2a 100644 --- a/lib/Sys/Virt/TCK/Hooks.pm +++ b/lib/Sys/Virt/TCK/Hooks.pm @@ -73,10 +73,10 @@ sub libvirtd_status { my $status = `service libvirtd status`; my $_ = $status; - if (/running/) { - $self->{libvirtd_status} = 'running'; - } elsif (/stopped/) { + if (/stopped|unused|inactive/) { $self->{libvirtd_status} = 'stopped'; + } elsif (/running|active/) { + $self->{libvirtd_status} = 'running'; } return $self; @@ -146,13 +146,20 @@ sub expect_log { } elsif ($self->{type} eq 'qemu' or $self->{type} eq 'lxc') { if ($domain_state eq &Sys::Virt::Domain::STATE_RUNNING) { if ($action eq 'destroy') { - $expect_log = "$hook $domain_name stopped end -"; + $expect_log = "$hook $domain_name stopped end -\n". + "$hook $domain_name release end -"; } else { die "hooks testing doesn't support $action running domain"; } } elsif ($domain_state eq &Sys::Virt::Domain::STATE_SHUTOFF) { if ($action eq 'start') { - $expect_log = "$hook $domain_name start begin -"; + $expect_log = "$hook $domain_name prepare begin -\n". + "$hook $domain_name start begin -\n". + "$hook $domain_name started begin -"; + } elsif ($action eq 'failstart') { + $expect_log = "$hook $domain_name prepare begin -\n". + "$hook $domain_name stopped end -\n". + "$hook $domain_name release end -"; } else { die "hooks testing doesn't support $action shutoff domain"; } diff --git a/scripts/hooks/051-daemon-hook.t b/scripts/hooks/051-daemon-hook.t index d9cfb3a..165cf4e 100644 --- a/scripts/hooks/051-daemon-hook.t +++ b/scripts/hooks/051-daemon-hook.t @@ -85,7 +85,7 @@ SKIP: { ok($hook->compare_log(), "$hook->{name} is invoked correctly while $hook->{action} libvirtd"); diag "check if libvirtd is stopped"; - ok(`service libvirtd status` =~ /stopped/, "libvirtd is stopped"); + ok(`service libvirtd status` =~ /stopped|unused|inactive/, "libvirtd is stopped"); # start libvirtd $hook->action('start'); diff --git a/scripts/hooks/052-domain-hook.t b/scripts/hooks/052-domain-hook.t index e3b55ec..90b8a48 100644 --- a/scripts/hooks/052-domain-hook.t +++ b/scripts/hooks/052-domain-hook.t @@ -90,7 +90,7 @@ SKIP: { ok(-f "$hook->{name}", "$hook->{name} is invoked"); my $actual_log_data = slurp($hook->{log_name}); - diag "acutal log: $hook->{log_name} '$actual_log_data'"; + diag "actual log: $hook->{log_name} '$actual_log_data'"; diag "expect log:\n $hook->{expect_log}"; @@ -147,7 +147,7 @@ SKIP: { $hook->domain_name($domain_name); $hook->domain_state($domain_state); - $hook->action('start'); + $hook->action('failstart'); $hook->expect_log(); diag "start $domain_name"; @@ -170,7 +170,7 @@ SKIP: { diag "expect log:\n $hook->{expect_log}"; diag "check if the actual log is same with expected log"; - ok($hook->compare_log, "$hook->{name} is invoked correctly while start $domain_name"); + ok($hook->compare_log, "$hook->{name} is invoked correctly while failing to start $domain_name"); # undefine domain diag "undefine $domain_name"; -- 1.8.4.5

3 4

[libvirt] [PATCH v2] qemu: Advertise <drivediscard/> in capabilities if 'discard' is supported.
by Richard W.M. Jones 10 Mar '14

10 Mar '14

The capabilities will have a <drivediscard/> feature if you are allowed to use the qemu attribute: <driver name='qemu' ... discard='unmap|ignore' /> The new capabilities XML looks like this: <capabilities> ... <guest> <os_type>hvm</os_type> ... <features> <drivediscard/> </features> </guest> </capabilities> --- src/conf/capabilities.c | 3 ++- src/qemu/qemu_capabilities.c | 4 ++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/conf/capabilities.c b/src/conf/capabilities.c index c1c4ab8..ff5912a 100644 --- a/src/conf/capabilities.c +++ b/src/conf/capabilities.c @@ -947,7 +947,8 @@ virCapabilitiesFormatXML(virCapsPtr caps) STREQ(caps->guests[i]->features[j]->name, "nonpae") || STREQ(caps->guests[i]->features[j]->name, "ia64_be") || STREQ(caps->guests[i]->features[j]->name, "cpuselection") || - STREQ(caps->guests[i]->features[j]->name, "deviceboot")) { + STREQ(caps->guests[i]->features[j]->name, "deviceboot") || + STREQ(caps->guests[i]->features[j]->name, "drivediscard")) { virBufferAsprintf(&xml, " <%s/>\n", caps->guests[i]->features[j]->name); } else { diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index cae25e0..b755fb2 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -778,6 +778,10 @@ virQEMUCapsInitGuest(virCapsPtr caps, !virCapabilitiesAddGuestFeature(guest, "deviceboot", 1, 0)) goto error; + if (virQEMUCapsGet(qemubinCaps, QEMU_CAPS_DRIVE_DISCARD) && + !virCapabilitiesAddGuestFeature(guest, "drivediscard", 0, 0)) + goto error; + if (virCapabilitiesAddGuestDomain(guest, "qemu", NULL, -- 1.8.5.3

1 1

[libvirt] [PATCH] qemu: Advertise <qcow2discard/> in capabilities if discard works for qcow2 backing files.
by Richard W.M. Jones 10 Mar '14

10 Mar '14

Qemu since 1.5 supports discard. However until qemu 1.6 it didn't work for qcow2 files. Ref: http://wiki.qemu.org/ChangeLog/1.5 http://wiki.qemu.org/ChangeLog/1.6 If qemu >= 1.6, add this to guest capabilities: <features> <drivediscard/> <qcow2discard/> <--- </features> --- src/conf/capabilities.c | 3 ++- src/qemu/qemu_capabilities.c | 13 +++++++++++++ src/qemu/qemu_capabilities.h | 1 + tests/qemucapabilitiesdata/caps_1.6.0-1.caps | 1 + tests/qemucapabilitiesdata/caps_1.6.50-1.caps | 1 + 5 files changed, 18 insertions(+), 1 deletion(-) diff --git a/src/conf/capabilities.c b/src/conf/capabilities.c index ff5912a..08c9b73 100644 --- a/src/conf/capabilities.c +++ b/src/conf/capabilities.c @@ -948,7 +948,8 @@ virCapabilitiesFormatXML(virCapsPtr caps) STREQ(caps->guests[i]->features[j]->name, "ia64_be") || STREQ(caps->guests[i]->features[j]->name, "cpuselection") || STREQ(caps->guests[i]->features[j]->name, "deviceboot") || - STREQ(caps->guests[i]->features[j]->name, "drivediscard")) { + STREQ(caps->guests[i]->features[j]->name, "drivediscard") || + STREQ(caps->guests[i]->features[j]->name, "qcow2discard")) { virBufferAsprintf(&xml, " <%s/>\n", caps->guests[i]->features[j]->name); } else { diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index b755fb2..b527690 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -251,6 +251,7 @@ VIR_ENUM_IMPL(virQEMUCaps, QEMU_CAPS_LAST, "spiceport", "usb-kbd", /* 165 */ + "qcow2-discard", ); struct _virQEMUCaps { @@ -782,6 +783,10 @@ virQEMUCapsInitGuest(virCapsPtr caps, !virCapabilitiesAddGuestFeature(guest, "drivediscard", 0, 0)) goto error; + if (virQEMUCapsGet(qemubinCaps, QEMU_CAPS_QCOW2_DISCARD) && + !virCapabilitiesAddGuestFeature(guest, "qcow2discard", 0, 0)) + goto error; + if (virCapabilitiesAddGuestDomain(guest, "qemu", NULL, @@ -1113,6 +1118,10 @@ virQEMUCapsComputeCmdFlags(const char *help, if (strstr(help, "-machine")) virQEMUCapsSet(qemuCaps, QEMU_CAPS_MACHINE_OPT); + /* discard option works for qcow2 backing files since 1.6 */ + if (qemuCaps->version >= 1006000) + virQEMUCapsSet(qemuCaps, QEMU_CAPS_QCOW2_DISCARD); + /* USB option is supported v1.3.0 onwards */ if (qemuCaps->version >= 1003000) virQEMUCapsSet(qemuCaps, QEMU_CAPS_MACHINE_USB_OPT); @@ -2569,6 +2578,10 @@ virQEMUCapsInitQMPMonitor(virQEMUCapsPtr qemuCaps, if (virQEMUCapsInitArchQMPBasic(qemuCaps, mon) < 0) goto cleanup; + /* discard option works for qcow2 backing files since 1.6 */ + if (qemuCaps->version >= 1006000) + virQEMUCapsSet(qemuCaps, QEMU_CAPS_QCOW2_DISCARD); + /* USB option is supported v1.3.0 onwards */ if (qemuCaps->version >= 1003000) virQEMUCapsSet(qemuCaps, QEMU_CAPS_MACHINE_USB_OPT); diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index b5445e7..a0ce506 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -204,6 +204,7 @@ enum virQEMUCapsFlags { QEMU_CAPS_SPICE_FILE_XFER_DISABLE = 163, /* -spice disable-agent-file-xfer */ QEMU_CAPS_CHARDEV_SPICEPORT = 164, /* -chardev spiceport */ QEMU_CAPS_DEVICE_USB_KBD = 165, /* -device usb-kbd */ + QEMU_CAPS_QCOW2_DISCARD = 166, /* discard works for qcow2 backing files */ QEMU_CAPS_LAST, /* this must always be the last item */ }; diff --git a/tests/qemucapabilitiesdata/caps_1.6.0-1.caps b/tests/qemucapabilitiesdata/caps_1.6.0-1.caps index 597f873..0ab5e22 100644 --- a/tests/qemucapabilitiesdata/caps_1.6.0-1.caps +++ b/tests/qemucapabilitiesdata/caps_1.6.0-1.caps @@ -142,4 +142,5 @@ <flag name='spice-file-xfer-disable'/> <flag name='spiceport'/> <flag name='usb-kbd'/> + <flag name='qcow2-discard'/> </qemuCaps> diff --git a/tests/qemucapabilitiesdata/caps_1.6.50-1.caps b/tests/qemucapabilitiesdata/caps_1.6.50-1.caps index 0c1dd87..d5cca41 100644 --- a/tests/qemucapabilitiesdata/caps_1.6.50-1.caps +++ b/tests/qemucapabilitiesdata/caps_1.6.50-1.caps @@ -140,4 +140,5 @@ <flag name='spice-file-xfer-disable'/> <flag name='spiceport'/> <flag name='usb-kbd'/> + <flag name='qcow2-discard'/> </qemuCaps> -- 1.8.5.3

1 1

[libvirt] [PATCH] Change file names in comments to match the files they are in
by Ján Tomko 10 Mar '14

10 Mar '14

Some of these are leftovers from renaming the files, others are just typos. Also introduce an ugly awk script to enforce this. --- cfg.mk | 25 +++++++++++++++++++++++++ daemon/libvirtd-config.c | 2 +- daemon/libvirtd-config.h | 2 +- src/bhyve/bhyve_command.c | 2 +- src/bhyve/bhyve_command.h | 2 +- src/conf/domain_audit.h | 2 +- src/datatypes.c | 2 +- src/hyperv/hyperv_wmi.c | 2 +- src/interface/interface_backend_netcf.c | 4 ++-- src/locking/domain_lock.h | 2 +- src/locking/lock_daemon_config.c | 2 +- src/lxc/lxc_hostdev.c | 2 +- src/lxc/lxc_hostdev.h | 2 +- src/network/bridge_driver.h | 2 +- src/network/bridge_driver_platform.h | 2 +- src/node_device/node_device_driver.c | 2 +- src/node_device/node_device_driver.h | 2 +- src/nodeinfo.h | 2 +- src/openvz/openvz_conf.h | 2 +- src/openvz/openvz_util.c | 2 +- src/openvz/openvz_util.h | 2 +- src/parallels/parallels_driver.h | 2 +- src/parallels/parallels_network.c | 2 +- src/qemu/qemu_agent.c | 2 +- src/qemu/qemu_domain.c | 2 +- src/qemu/qemu_driver.h | 2 +- src/qemu/qemu_hotplug.c | 2 +- src/remote/remote_driver.h | 2 +- src/rpc/virnetservermdns.h | 2 +- src/storage/storage_backend_mpath.h | 2 +- src/storage/storage_backend_sheepdog.h | 2 +- src/test/test_driver.c | 2 +- src/test/test_driver.h | 2 +- src/uml/uml_conf.h | 2 +- src/util/viratomic.c | 2 +- src/util/virbitmap.c | 2 +- src/util/virebtables.h | 2 +- src/util/virerror.h | 2 +- src/util/vireventpoll.h | 2 +- src/util/viruuid.c | 2 +- src/util/virxml.h | 2 +- src/xen/xen_driver.h | 2 +- src/xen/xen_hypervisor.c | 2 +- src/xen/xen_hypervisor.h | 2 +- src/xen/xen_inotify.c | 2 +- src/xen/xen_inotify.h | 2 +- src/xen/xm_internal.c | 2 +- src/xenapi/xenapi_driver.h | 2 +- tests/testutils.h | 2 +- tools/virsh-interface.h | 2 +- tools/virsh-network.h | 2 +- tools/virt-host-validate.c | 2 +- 52 files changed, 77 insertions(+), 52 deletions(-) diff --git a/cfg.mk b/cfg.mk index 2a8957a..c5f99aa 100644 --- a/cfg.mk +++ b/cfg.mk @@ -863,6 +863,31 @@ sc_prohibit_atoi: halt='Use virStrToLong* instead of atoi, atol, atof, atoq, atoll' \ $(_sc_search_regexp) +# Don't +sc_prohibit_wrong_filename_in_comment: + @fail=0; \ + awk 'BEGIN { \ + fail=0; \ + } FNR < 3 { \ + n=match($$0, /[[:space:]][^[:space:]]*[.][ch][[:space:]:]/); \ + if (n > 0) { \ + A=substr($$0, RSTART+1, RLENGTH-2); \ + n=split(FILENAME, arr, "/"); \ + if (A != arr[n]) { \ + print "in " FILENAME ": " A " mentioned in comments "; \ + fail=1; \ + } \ + } \ + } END { \ + if (fail == 1) { \ + exit 1; \ + } \ + }' $$($(VC_LIST_EXCEPT) | grep '\.[ch]$$') || fail=1; \ + if test $$fail -eq 1; then \ + { echo '$(ME): The file name in comments must match the actual ' \ + 'file name' 1>&2; exit 1; } \ + fi; + # We don't use this feature of maint.mk. prev_version_file = /dev/null diff --git a/daemon/libvirtd-config.c b/daemon/libvirtd-config.c index c816fda..856a038 100644 --- a/daemon/libvirtd-config.c +++ b/daemon/libvirtd-config.c @@ -1,5 +1,5 @@ /* - * libvirtd.c: daemon start of day, guest process & i/o management + * libvirtd-config.c: daemon start of day, guest process & i/o management * * Copyright (C) 2006-2012 Red Hat, Inc. * Copyright (C) 2006 Daniel P. Berrange diff --git a/daemon/libvirtd-config.h b/daemon/libvirtd-config.h index a24d5d2..0829273 100644 --- a/daemon/libvirtd-config.h +++ b/daemon/libvirtd-config.h @@ -1,5 +1,5 @@ /* - * libvirtd.c: daemon start of day, guest process & i/o management + * libvirtd-config.h: daemon start of day, guest process & i/o management * * Copyright (C) 2006-2012 Red Hat, Inc. * Copyright (C) 2006 Daniel P. Berrange diff --git a/src/bhyve/bhyve_command.c b/src/bhyve/bhyve_command.c index 1fcc0f2..a19daac 100644 --- a/src/bhyve/bhyve_command.c +++ b/src/bhyve/bhyve_command.c @@ -1,5 +1,5 @@ /* - * bhyve_process.c: bhyve command generation + * bhyve_command.c: bhyve command generation * * Copyright (C) 2014 Roman Bogorodskiy * diff --git a/src/bhyve/bhyve_command.h b/src/bhyve/bhyve_command.h index 8326971..66d934d 100644 --- a/src/bhyve/bhyve_command.h +++ b/src/bhyve/bhyve_command.h @@ -1,5 +1,5 @@ /* - * bhyve_process.c: bhyve command generation + * bhyve_command.h: bhyve command generation * * Copyright (C) 2014 Roman Bogorodskiy * diff --git a/src/conf/domain_audit.h b/src/conf/domain_audit.h index 9486216..70b09e5 100644 --- a/src/conf/domain_audit.h +++ b/src/conf/domain_audit.h @@ -1,5 +1,5 @@ /* - * domain_audit.c: Domain audit management + * domain_audit.h: Domain audit management * * Copyright (C) 2006-2011 Red Hat, Inc. * Copyright (C) 2006 Daniel P. Berrange diff --git a/src/datatypes.c b/src/datatypes.c index 33d941d..20752cd 100644 --- a/src/datatypes.c +++ b/src/datatypes.c @@ -1,5 +1,5 @@ /* - * datatypes.h: management of structs for public data types + * datatypes.c: management of structs for public data types * * Copyright (C) 2006-2014 Red Hat, Inc. * diff --git a/src/hyperv/hyperv_wmi.c b/src/hyperv/hyperv_wmi.c index 39eed0c..a603bad 100644 --- a/src/hyperv/hyperv_wmi.c +++ b/src/hyperv/hyperv_wmi.c @@ -1,6 +1,6 @@ /* - * hyperv_wmi.h: general WMI over WSMAN related functions and structures for + * hyperv_wmi.c: general WMI over WSMAN related functions and structures for * managing Microsoft Hyper-V hosts * * Copyright (C) 2011 Matthias Bolte <matthias.bolte(a)googlemail.com> diff --git a/src/interface/interface_backend_netcf.c b/src/interface/interface_backend_netcf.c index c525ca9..b4c1fe9 100644 --- a/src/interface/interface_backend_netcf.c +++ b/src/interface/interface_backend_netcf.c @@ -1,6 +1,6 @@ /* - * interface_driver.c: backend driver methods to handle physical - * interface configuration using the netcf library. + * interface_backend_netcf.c: backend driver methods to handle physical + * interface configuration using the netcf library. * * Copyright (C) 2006-2013 Red Hat, Inc. * diff --git a/src/locking/domain_lock.h b/src/locking/domain_lock.h index eefe6cd..a9b19c8 100644 --- a/src/locking/domain_lock.h +++ b/src/locking/domain_lock.h @@ -1,5 +1,5 @@ /* - * domain_lock.c: Locking for domain lifecycle operations + * domain_lock.h: Locking for domain lifecycle operations * * Copyright (C) 2010-2011 Red Hat, Inc. * diff --git a/src/locking/lock_daemon_config.c b/src/locking/lock_daemon_config.c index 8e632f5..68cd9e9 100644 --- a/src/locking/lock_daemon_config.c +++ b/src/locking/lock_daemon_config.c @@ -1,5 +1,5 @@ /* - * lock_daemon_config.h: virtlockd config file handling + * lock_daemon_config.c: virtlockd config file handling * * Copyright (C) 2006-2012 Red Hat, Inc. * Copyright (C) 2006 Daniel P. Berrange diff --git a/src/lxc/lxc_hostdev.c b/src/lxc/lxc_hostdev.c index b7248df..c3ecc48 100644 --- a/src/lxc/lxc_hostdev.c +++ b/src/lxc/lxc_hostdev.c @@ -1,5 +1,5 @@ /* - * virLXC_hostdev.c: VIRLXC hostdev management + * lxc_hostdev.c: VIRLXC hostdev management * * Copyright (C) 2006-2007, 2009-2012 Red Hat, Inc. * Copyright (C) 2006 Daniel P. Berrange diff --git a/src/lxc/lxc_hostdev.h b/src/lxc/lxc_hostdev.h index 41bb178..cf89a99 100644 --- a/src/lxc/lxc_hostdev.h +++ b/src/lxc/lxc_hostdev.h @@ -1,5 +1,5 @@ /* - * virLXC_hostdev.h: VIRLXC hostdev management + * lxc_hostdev.h: VIRLXC hostdev management * * Copyright (C) 2006-2007, 2009-2010 Red Hat, Inc. * Copyright (C) 2006 Daniel P. Berrange diff --git a/src/network/bridge_driver.h b/src/network/bridge_driver.h index 1c2a4a7..decc08f 100644 --- a/src/network/bridge_driver.h +++ b/src/network/bridge_driver.h @@ -1,5 +1,5 @@ /* - * network_driver.h: core driver methods for managing networks + * bridge_driver.h: core driver methods for managing networks * * Copyright (C) 2006-2013 Red Hat, Inc. * Copyright (C) 2006 Daniel P. Berrange diff --git a/src/network/bridge_driver_platform.h b/src/network/bridge_driver_platform.h index 82d96f6..22f3aae 100644 --- a/src/network/bridge_driver_platform.h +++ b/src/network/bridge_driver_platform.h @@ -1,5 +1,5 @@ /* - * bridge_driver.h: platform specific routines for bridge driver + * bridge_driver_platform.h: platform specific routines for bridge driver * * Copyright (C) 2006-2013 Red Hat, Inc. * Copyright (C) 2006 Daniel P. Berrange diff --git a/src/node_device/node_device_driver.c b/src/node_device/node_device_driver.c index d5a92cd..55b3eb3 100644 --- a/src/node_device/node_device_driver.c +++ b/src/node_device/node_device_driver.c @@ -1,5 +1,5 @@ /* - * node_device.c: node device enumeration + * node_device_driver.c: node device enumeration * * Copyright (C) 2010-2013 Red Hat, Inc. * Copyright (C) 2008 Virtual Iron Software, Inc. diff --git a/src/node_device/node_device_driver.h b/src/node_device/node_device_driver.h index 0f62c83..e238ff8 100644 --- a/src/node_device/node_device_driver.h +++ b/src/node_device/node_device_driver.h @@ -1,5 +1,5 @@ /* - * node_device.h: node device enumeration + * node_device_driver.h: node device enumeration * * Copyright (C) 2008 Virtual Iron Software, Inc. * Copyright (C) 2008 David F. Lively diff --git a/src/nodeinfo.h b/src/nodeinfo.h index 413fddd..c81fcbb 100644 --- a/src/nodeinfo.h +++ b/src/nodeinfo.h @@ -1,5 +1,5 @@ /* - * nodeinfo.c: Helper routines for OS specific node information + * nodeinfo.h: Helper routines for OS specific node information * * Copyright (C) 2006-2008, 2011-2012 Red Hat, Inc. * Copyright (C) 2006 Daniel P. Berrange diff --git a/src/openvz/openvz_conf.h b/src/openvz/openvz_conf.h index 47b5123..a7de7d2 100644 --- a/src/openvz/openvz_conf.h +++ b/src/openvz/openvz_conf.h @@ -1,5 +1,5 @@ /* - * openvz_config.h: config information for OpenVZ VPSs + * openvz_conf.h: config information for OpenVZ VPSs * * Copyright (C) 2010 Red Hat, Inc. * Copyright (C) 2006, 2007 Binary Karma. diff --git a/src/openvz/openvz_util.c b/src/openvz/openvz_util.c index 8920d14..3113751 100644 --- a/src/openvz/openvz_util.c +++ b/src/openvz/openvz_util.c @@ -1,5 +1,5 @@ /* - * openvz_driver.c: core driver methods for managing OpenVZ VEs + * openvz_util.c: core driver methods for managing OpenVZ VEs * * Copyright (C) 2013 Red Hat, Inc. * Copyright (C) 2012 Guido Günther diff --git a/src/openvz/openvz_util.h b/src/openvz/openvz_util.h index 680e507..0c8d55a 100644 --- a/src/openvz/openvz_util.h +++ b/src/openvz/openvz_util.h @@ -1,5 +1,5 @@ /* - * openvz_driver.h: common util functions for managing openvz VPEs + * openvz_util.h: common util functions for managing openvz VPEs * * Copyright (C) 2012 Guido Günther * diff --git a/src/parallels/parallels_driver.h b/src/parallels/parallels_driver.h index a503abe..babe5c0 100644 --- a/src/parallels/parallels_driver.h +++ b/src/parallels/parallels_driver.h @@ -1,5 +1,5 @@ /* - * parallels_driver.c: core driver functions for managing + * parallels_driver.h: core driver functions for managing * Parallels Cloud Server hosts * * Copyright (C) 2012 Parallels, Inc. diff --git a/src/parallels/parallels_network.c b/src/parallels/parallels_network.c index 63daf53..432f0cc 100644 --- a/src/parallels/parallels_network.c +++ b/src/parallels/parallels_network.c @@ -1,5 +1,5 @@ /* - * parallels_storage.c: core privconn functions for managing + * parallels_network.c: core privconn functions for managing * Parallels Cloud Server hosts * * Copyright (C) 2013 Red Hat, Inc. diff --git a/src/qemu/qemu_agent.c b/src/qemu/qemu_agent.c index 4a3820c..553bff9 100644 --- a/src/qemu/qemu_agent.c +++ b/src/qemu/qemu_agent.c @@ -1,5 +1,5 @@ /* - * qemu_agent.h: interaction with QEMU guest agent + * qemu_agent.c: interaction with QEMU guest agent * * Copyright (C) 2006-2013 Red Hat, Inc. * Copyright (C) 2006 Daniel P. Berrange diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index bad63c5..c321eda 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -1,5 +1,5 @@ /* - * qemu_domain.h: QEMU domain private state + * qemu_domain.c: QEMU domain private state * * Copyright (C) 2006-2013 Red Hat, Inc. * Copyright (C) 2006 Daniel P. Berrange diff --git a/src/qemu/qemu_driver.h b/src/qemu/qemu_driver.h index 84f74c4..df7533a 100644 --- a/src/qemu/qemu_driver.h +++ b/src/qemu/qemu_driver.h @@ -1,5 +1,5 @@ /* - * driver.h: core driver methods for managing qemu guests + * qemu_driver.h: core driver methods for managing qemu guests * * Copyright (C) 2006, 2007 Red Hat, Inc. * Copyright (C) 2006 Daniel P. Berrange diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index 6703c92..dd72a79 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -1,5 +1,5 @@ /* - * qemu_hotplug.h: QEMU device hotplug management + * qemu_hotplug.c: QEMU device hotplug management * * Copyright (C) 2006-2014 Red Hat, Inc. * Copyright (C) 2006 Daniel P. Berrange diff --git a/src/remote/remote_driver.h b/src/remote/remote_driver.h index 912f0f8..4033a3c 100644 --- a/src/remote/remote_driver.h +++ b/src/remote/remote_driver.h @@ -1,5 +1,5 @@ /* - * remote_internal.h: driver to provide access to libvirtd running + * remote_driver.h: driver to provide access to libvirtd running * on a remote machine * * Copyright (C) 2006-2007, 2010 Red Hat, Inc. diff --git a/src/rpc/virnetservermdns.h b/src/rpc/virnetservermdns.h index a1c19c1..e91b264 100644 --- a/src/rpc/virnetservermdns.h +++ b/src/rpc/virnetservermdns.h @@ -1,5 +1,5 @@ /* - * virnetservermdns.c: advertise server sockets + * virnetservermdns.h: advertise server sockets * * Copyright (C) 2011 Red Hat, Inc. * Copyright (C) 2007 Daniel P. Berrange diff --git a/src/storage/storage_backend_mpath.h b/src/storage/storage_backend_mpath.h index d7f20f3..b666645 100644 --- a/src/storage/storage_backend_mpath.h +++ b/src/storage/storage_backend_mpath.h @@ -1,5 +1,5 @@ /* - * storage_backend_scsi.h: storage backend for SCSI handling + * storage_backend_mpath.h: storage backend for multipath handling * * Copyright (C) 2009-2009 Red Hat, Inc. * Copyright (C) 2009-2008 Dave Allan diff --git a/src/storage/storage_backend_sheepdog.h b/src/storage/storage_backend_sheepdog.h index bc114ff..b0d8440 100644 --- a/src/storage/storage_backend_sheepdog.h +++ b/src/storage/storage_backend_sheepdog.h @@ -1,5 +1,5 @@ /* - * storage_backend_sheepog.h: storage backend for Sheepdog handling + * storage_backend_sheepdog.h: storage backend for Sheepdog handling * * Copyright (C) 2012 Wido den Hollander * Copyright (C) 2012 Frank Spijkerman diff --git a/src/test/test_driver.c b/src/test/test_driver.c index 6806ffd..27295db 100644 --- a/src/test/test_driver.c +++ b/src/test/test_driver.c @@ -1,5 +1,5 @@ /* - * test.c: A "mock" hypervisor for use by application unit tests + * test_driver.c: A "mock" hypervisor for use by application unit tests * * Copyright (C) 2006-2014 Red Hat, Inc. * Copyright (C) 2006 Daniel P. Berrange diff --git a/src/test/test_driver.h b/src/test/test_driver.h index b9bf566..df74433 100644 --- a/src/test/test_driver.h +++ b/src/test/test_driver.h @@ -1,5 +1,5 @@ /* - * test.h: A "mock" hypervisor for use by application unit tests + * test_driver.h: A "mock" hypervisor for use by application unit tests * * Copyright (C) 2006-2006 Red Hat, Inc. * Copyright (C) 2006 Daniel P. Berrange diff --git a/src/uml/uml_conf.h b/src/uml/uml_conf.h index a914be0..05e19ff 100644 --- a/src/uml/uml_conf.h +++ b/src/uml/uml_conf.h @@ -1,5 +1,5 @@ /* - * config.h: VM configuration management + * uml_conf.h: VM configuration management * * Copyright (C) 2006, 2007, 2010 Red Hat, Inc. * Copyright (C) 2006 Daniel P. Berrange diff --git a/src/util/viratomic.c b/src/util/viratomic.c index 160a20b..278a749 100644 --- a/src/util/viratomic.c +++ b/src/util/viratomic.c @@ -1,5 +1,5 @@ /* - * viratomic.h: atomic integer operations + * viratomic.c: atomic integer operations * * Copyright (C) 2012 Red Hat, Inc. * diff --git a/src/util/virbitmap.c b/src/util/virbitmap.c index 870c8fe..775262d 100644 --- a/src/util/virbitmap.c +++ b/src/util/virbitmap.c @@ -1,5 +1,5 @@ /* - * virbitmap.h: Simple bitmap operations + * virbitmap.c: Simple bitmap operations * * Copyright (C) 2010-2013 Red Hat, Inc. * Copyright (C) 2010 Novell, Inc. diff --git a/src/util/virebtables.h b/src/util/virebtables.h index c0d443d..2b6f1dd 100644 --- a/src/util/virebtables.h +++ b/src/util/virebtables.h @@ -1,5 +1,5 @@ /* - * virebtables.c: Helper APIs for managing ebtables + * virebtables.h: Helper APIs for managing ebtables * * Copyright (C) 2007-2008, 2013 Red Hat, Inc. * Copyright (C) 2009 IBM Corp. diff --git a/src/util/virerror.h b/src/util/virerror.h index 5ae4eb5..2de04f4 100644 --- a/src/util/virerror.h +++ b/src/util/virerror.h @@ -1,5 +1,5 @@ /* - * virerror.c: error handling and reporting code for libvirt + * virerror.h: error handling and reporting code for libvirt * * Copyright (C) 2006-2014 Red Hat, Inc. * diff --git a/src/util/vireventpoll.h b/src/util/vireventpoll.h index c46ab80..8844c9c 100644 --- a/src/util/vireventpoll.h +++ b/src/util/vireventpoll.h @@ -1,5 +1,5 @@ /* - * vireventpool.h: Poll based event loop for monitoring file handles + * vireventpoll.h: Poll based event loop for monitoring file handles * * Copyright (C) 2007 Daniel P. Berrange * Copyright (C) 2007 Red Hat, Inc. diff --git a/src/util/viruuid.c b/src/util/viruuid.c index c5fa9a8..48f5e2e 100644 --- a/src/util/viruuid.c +++ b/src/util/viruuid.c @@ -1,5 +1,5 @@ /* - * viruuid.h: helper APIs for dealing with UUIDs + * viruuid.c: helper APIs for dealing with UUIDs * * Copyright (C) 2007-2013 Red Hat, Inc. * diff --git a/src/util/virxml.h b/src/util/virxml.h index d967a2e..781b3bf 100644 --- a/src/util/virxml.h +++ b/src/util/virxml.h @@ -1,5 +1,5 @@ /* - * virxml.c: helper APIs for dealing with XML documents + * virxml.h: helper APIs for dealing with XML documents * * Copyright (C) 2005, 2007-2012 Red Hat, Inc. * diff --git a/src/xen/xen_driver.h b/src/xen/xen_driver.h index b8c1c27..1ed870d 100644 --- a/src/xen/xen_driver.h +++ b/src/xen/xen_driver.h @@ -1,5 +1,5 @@ /* - * xen_unified.c: Unified Xen driver. + * xen_driver.h: Unified Xen driver. * * Copyright (C) 2007, 2010-2011 Red Hat, Inc. * diff --git a/src/xen/xen_hypervisor.c b/src/xen/xen_hypervisor.c index f9c7b40..d24db06 100644 --- a/src/xen/xen_hypervisor.c +++ b/src/xen/xen_hypervisor.c @@ -1,5 +1,5 @@ /* - * xen_internal.c: direct access to Xen hypervisor level + * xen_hypervisor.c: direct access to Xen hypervisor level * * Copyright (C) 2005-2013 Red Hat, Inc. * diff --git a/src/xen/xen_hypervisor.h b/src/xen/xen_hypervisor.h index 6aeab79..2990e51 100644 --- a/src/xen/xen_hypervisor.h +++ b/src/xen/xen_hypervisor.h @@ -1,5 +1,5 @@ /* - * xen_internal.h: internal API for direct access to Xen hypervisor level + * xen_hypervisor.h: internal API for direct access to Xen hypervisor level * * Copyright (C) 2005, 2010-2011 Red Hat, Inc. * diff --git a/src/xen/xen_inotify.c b/src/xen/xen_inotify.c index 2e9787f..c9718bd 100644 --- a/src/xen/xen_inotify.c +++ b/src/xen/xen_inotify.c @@ -1,5 +1,5 @@ /* - * xen_inofify.c: Xen notification of xml file activity in the + * xen_inotify.c: Xen notification of xml file activity in the * following dirs: * /etc/xen * /var/lib/xend/domains diff --git a/src/xen/xen_inotify.h b/src/xen/xen_inotify.h index 6055c88..8a9370d 100644 --- a/src/xen/xen_inotify.h +++ b/src/xen/xen_inotify.h @@ -1,5 +1,5 @@ /* - * xen_inofify.h: Xen notification of xml files + * xen_inotify.h: Xen notification of xml files * * Copyright (C) 2011 Red Hat, Inc. * Copyright (C) 2008 VirtualIron diff --git a/src/xen/xm_internal.c b/src/xen/xm_internal.c index d9a3502..5d078e7 100644 --- a/src/xen/xm_internal.c +++ b/src/xen/xm_internal.c @@ -1,5 +1,5 @@ /* - * xm_internal.h: helper routines for dealing with inactive domains + * xm_internal.c: helper routines for dealing with inactive domains * * Copyright (C) 2006-2007, 2009-2013 Red Hat, Inc. * Copyright (C) 2006 Daniel P. Berrange diff --git a/src/xenapi/xenapi_driver.h b/src/xenapi/xenapi_driver.h index 30a8f1e..0925731 100644 --- a/src/xenapi/xenapi_driver.h +++ b/src/xenapi/xenapi_driver.h @@ -1,5 +1,5 @@ /* - * xenapi_driver.h.c: Xen API driver header file to be included in libvirt.c. + * xenapi_driver.h: Xen API driver header file to be included in libvirt.c. * Copyright (C) 2009, 2010 Citrix Ltd. * * This library is free software; you can redistribute it and/or diff --git a/tests/testutils.h b/tests/testutils.h index fa37246..e89492b 100644 --- a/tests/testutils.h +++ b/tests/testutils.h @@ -1,5 +1,5 @@ /* - * utils.c: test utils + * testutils.h: test utils * * Copyright (C) 2005, 2008-2013 Red Hat, Inc. * diff --git a/tools/virsh-interface.h b/tools/virsh-interface.h index 2544f7e..6272aab 100644 --- a/tools/virsh-interface.h +++ b/tools/virsh-interface.h @@ -1,5 +1,5 @@ /* - * virsh-interface.c: Commands to manage host interface + * virsh-interface.h: Commands to manage host interface * * Copyright (C) 2005, 2007-2012 Red Hat, Inc. * diff --git a/tools/virsh-network.h b/tools/virsh-network.h index 7178fde..3beeeb9 100644 --- a/tools/virsh-network.h +++ b/tools/virsh-network.h @@ -1,5 +1,5 @@ /* - * virsh-network.c: Commands to manage network + * virsh-network.h: Commands to manage network * * Copyright (C) 2005, 2007-2012 Red Hat, Inc. * diff --git a/tools/virt-host-validate.c b/tools/virt-host-validate.c index d3cf19c..a8c2075 100644 --- a/tools/virt-host-validate.c +++ b/tools/virt-host-validate.c @@ -1,5 +1,5 @@ /* - * virt-host-check.c: Sanity check a hypervisor host + * virt-host-validate.c: Sanity check a hypervisor host * * Copyright (C) 2012 Red Hat, Inc. * -- 1.8.3.2

3 3

[libvirt] Seeking for advice on 'virsh console' problems debugging
by Roman Bogorodskiy 10 Mar '14

10 Mar '14

Hi, I've been trying to understand why 'virsh console' doesn't work on FreeBSD for some time and now I feel like I got stuck. Background of the problem. Some time ago I started implementing console support for the bhyve driver. I initially implemented it using nmdm(4) device: http://www.freebsd.org/cgi/man.cgi?query=nmdm&sektion=4&manpath=FreeBSD+10.… But 'virsh console' didn't work on it and exited immediately. I though that it could be nmdm compatibility issue and decided to go with the plan /dev/pts devices. But I got the same problem with it. So I decided to try use console with qemu driver. And... I got the same problem. After some investigation, I spotted this block in tools/virsh-console.c:376 while (!con->quit) { if (virCondWait(&con->cond, &con->lock) < 0) { VIR_ERROR(_("unable to wait on console condition")); goto cleanup; } } The strange thing is that it doesn't look con->lock mutex before waiting. FreeBSD man page for pthread_cond_wait() says that it errors in that situation: [EPERM] The specified mutex was not locked by the calling thread. I replaced VIR_ERROR with virReportSystemError and it returns EPERM indeed. So I've added virMutexLock() before calling virCondWait() and it partially solved the problem for me -- 'virsh console' stopped exiting immediately. Actually, it started output for guest, but it's badly formatted: it includes lots and lots of whitespaces. Input doesn't work properly (cannot type in sensible stuff). Here's a sample output, even libvirt messages are badly formatted (I added some debug prints along the way). http://people.freebsd.org/~novel/misc/ttyweirdness.png So, e.g. dmesg output for the guest looks almost the same. Looks like there's something wrong with the terminal settings, but how could that be debugged? PS Worth to mention that 'cu' worked all the time for me on these devices (both created by bhyve and qemu). Roman Bogorodskiy

2 8

[libvirt] [PATCH] Wildcard ignore tests/*test instead of listing every one
by Daniel P. Berrange 10 Mar '14

10 Mar '14

There is a forever growing list of test cases. It is just not worth listing each one individually when a wildcard can do the job. Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- .gitignore | 73 +------------------------------------------------------------- 1 file changed, 1 insertion(+), 72 deletions(-) diff --git a/.gitignore b/.gitignore index cb60734..efbce50 100644 --- a/.gitignore +++ b/.gitignore @@ -145,85 +145,14 @@ /tests/*.log /tests/*.pid /tests/*.trs -/tests/*xml2*test /tests/commandhelper -/tests/commandtest -/tests/conftest -/tests/cputest -/tests/domainconftest -/tests/domainsnapshotxml2xmltest -/tests/esxutilstest -/tests/eventtest -/tests/fchosttest -/tests/fdstreamtest -/tests/hashtest -/tests/jsontest -/tests/libvirtdconftest -/tests/lxcconf2xmltest -/tests/metadatatest -/tests/networkxml2argvtest -/tests/nodeinfotest -/tests/nwfilterxml2xmltest -/tests/objecteventtest +/tests/*test /tests/object-locking /tests/object-locking-files.txt /tests/object-locking.cm[ix] -/tests/openvzutilstest -/tests/qemuagenttest -/tests/qemuargv2xmltest -/tests/qemucapabilitiestest -/tests/qemuhelptest -/tests/qemuhotplugtest -/tests/qemumonitorjsontest -/tests/qemumonitortest -/tests/qemuxmlnstest -/tests/qparamtest /tests/reconnect -/tests/secaatest -/tests/seclabeltest -/tests/securityselinuxlabeltest -/tests/securityselinuxtest -/tests/sexpr2xmltest -/tests/shunloadtest -/tests/sockettest /tests/ssh -/tests/statstest -/tests/storagebackendsheepdogtest -/tests/sysinfotest /tests/test_conf -/tests/utiltest -/tests/viratomictest -/tests/virauthconfigtest -/tests/virbitmaptest -/tests/virbuftest -/tests/vircapstest -/tests/vircgrouptest -/tests/virdbustest -/tests/virdrivermoduletest -/tests/virendiantest -/tests/virfiletest -/tests/virhashtest -/tests/viridentitytest -/tests/virkeycodetest -/tests/virkeyfiletest -/tests/virkmodtest -/tests/virlockspacetest -/tests/virlogtest -/tests/virnet*test -/tests/virpcitest -/tests/virportallocatortest -/tests/virscsitest -/tests/virshtest -/tests/virstoragetest -/tests/virstringtest -/tests/virsystemdtest -/tests/virtimetest -/tests/viruritest -/tests/virusbtest -/tests/vmwarevertest -/tests/vmx2xmltest -/tests/xencapstest -/tests/xmconfigtest /tools/*.[18] /tools/libvirt-guests.init /tools/libvirt-guests.service -- 1.8.5.3

4 4

[libvirt] [PATCH] Add a mutex to serialize updates to firewall
by Daniel P. Berrange 10 Mar '14

10 Mar '14

For https://bugzilla.redhat.com/show_bug.cgi?id=1066801 The nwfilter conf update mutex previously serialized updates to the internal data structures for firewall rules, and updates to the firewall itself. The latter was recently turned into a read/write lock, and filter instantiation allowed to proceed in parallel. It was believed that this was ok, since each filter is created on a seperate iptables/ebtables chain. It turns out that there is a sutle lock ordering problem on virNWFilterObjPtr instances. __virNWFilterInstantiateFilter will hold a lock on the virNWFilterObjPtr it is instantiating. This in turn invokes virNWFilterInstantiate which then invokes virNWFilterDetermineMissingVarsRec which then invokes virNWFilterObjFindByName. This iterates over every single virNWFilterObjPtr in the list, locking them and checking their name. So if 2 or more threads try to instantiate a filter in parallel, they'll all hold 1 lock at the top level in the __virNWFilterInstantiateFilter method which will cause the other thread to deadlock in virNWFilterObjFindByName. The fix is to add an exclusive mutex to serialize the execution of __virNWFilterInstantiateFilter. Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- src/nwfilter/nwfilter_driver.c | 6 ++++-- src/nwfilter/nwfilter_gentech_driver.c | 34 ++++++++++++++++++++++++++++++++-- src/nwfilter/nwfilter_gentech_driver.h | 2 +- 3 files changed, 37 insertions(+), 5 deletions(-) diff --git a/src/nwfilter/nwfilter_driver.c b/src/nwfilter/nwfilter_driver.c index 5908df7..2e89d07 100644 --- a/src/nwfilter/nwfilter_driver.c +++ b/src/nwfilter/nwfilter_driver.c @@ -200,7 +200,8 @@ nwfilterStateInitialize(bool privileged, if (virNWFilterDHCPSnoopInit() < 0) goto err_exit_learnshutdown; - virNWFilterTechDriversInit(privileged); + if (virNWFilterTechDriversInit(privileged) < 0) + goto err_dhcpsnoop_shutdown; if (virNWFilterConfLayerInit(virNWFilterDomainFWUpdateCB, driverState) < 0) @@ -251,6 +252,7 @@ error: err_techdrivers_shutdown: virNWFilterTechDriversShutdown(); +err_dhcpsnoop_shutdown: virNWFilterDHCPSnoopShutdown(); err_exit_learnshutdown: virNWFilterLearnShutdown(); @@ -327,10 +329,10 @@ nwfilterStateCleanup(void) { if (driverState->privileged) { virNWFilterConfLayerShutdown(); - virNWFilterTechDriversShutdown(); virNWFilterDHCPSnoopShutdown(); virNWFilterLearnShutdown(); virNWFilterIPAddrMapShutdown(); + virNWFilterTechDriversShutdown(); nwfilterDriverLock(driverState); diff --git a/src/nwfilter/nwfilter_gentech_driver.c b/src/nwfilter/nwfilter_gentech_driver.c index 8c5cd57..5144dce 100644 --- a/src/nwfilter/nwfilter_gentech_driver.c +++ b/src/nwfilter/nwfilter_gentech_driver.c @@ -55,15 +55,34 @@ static virNWFilterTechDriverPtr filter_tech_drivers[] = { NULL }; +/* Serializes instantiation of filters. This is neccessary + * to avoid lock ordering deadlocks. eg __virNWFilterInstantiateFilter + * will hold a lock on a virNWFilterObjPtr. This in turn invokes + * virNWFilterInstantiate which invokes virNWFilterDetermineMissingVarsRec + * which invokes virNWFilterObjFindByName. This iterates over every single + * virNWFilterObjPtr in the list. So if 2 threads try to instantiate a + * filter in parallel, they'll both hold 1 lock at the top level in + * __virNWFilterInstantiateFilter which will cause the other thread + * to dead lock in virNWFilterObjFindByName. + * + * XXX better long term solution is to make virNWFilterObjList use a + * hash table as is done for virDomainObjList. You can then get + * lockless lookup of objects by name. + */ +static virMutex updateMutex; -void virNWFilterTechDriversInit(bool privileged) { +int virNWFilterTechDriversInit(bool privileged) { size_t i = 0; VIR_DEBUG("Initializing NWFilter technology drivers"); + if (virMutexInitRecursive(&updateMutex) < 0) + return -1; + while (filter_tech_drivers[i]) { if (!(filter_tech_drivers[i]->flags & TECHDRV_FLAG_INITIALIZED)) filter_tech_drivers[i]->init(privileged); i++; } + return 0; } @@ -74,6 +93,7 @@ void virNWFilterTechDriversShutdown(void) { filter_tech_drivers[i]->shutdown(); i++; } + virMutexDestroy(&updateMutex); } @@ -935,6 +955,8 @@ _virNWFilterInstantiateFilter(virNWFilterDriverStatePtr driver, int ifindex; int rc; + virMutexLock(&updateMutex); + /* after grabbing the filter update lock check for the interface; if it's not there anymore its filters will be or are being removed (while holding the lock) and we don't want to build new ones */ @@ -962,6 +984,8 @@ _virNWFilterInstantiateFilter(virNWFilterDriverStatePtr driver, foundNewFilter); cleanup: + virMutexUnlock(&updateMutex); + return rc; } @@ -981,6 +1005,7 @@ virNWFilterInstantiateFilterLate(virNWFilterDriverStatePtr driver, bool foundNewFilter = false; virNWFilterReadLockFilterUpdates(); + virMutexLock(&updateMutex); rc = __virNWFilterInstantiateFilter(driver, vmuuid, @@ -1006,6 +1031,7 @@ virNWFilterInstantiateFilterLate(virNWFilterDriverStatePtr driver, } virNWFilterUnlockFilterUpdates(); + virMutexUnlock(&updateMutex); return rc; } @@ -1129,7 +1155,11 @@ _virNWFilterTeardownFilter(const char *ifname) int virNWFilterTeardownFilter(const virDomainNetDef *net) { - return _virNWFilterTeardownFilter(net->ifname); + int ret; + virMutexLock(&updateMutex); + ret = _virNWFilterTeardownFilter(net->ifname); + virMutexUnlock(&updateMutex); + return ret; } diff --git a/src/nwfilter/nwfilter_gentech_driver.h b/src/nwfilter/nwfilter_gentech_driver.h index f4789e1..d72e040 100644 --- a/src/nwfilter/nwfilter_gentech_driver.h +++ b/src/nwfilter/nwfilter_gentech_driver.h @@ -31,7 +31,7 @@ virNWFilterTechDriverPtr virNWFilterTechDriverForName(const char *name); int virNWFilterRuleInstAddData(virNWFilterRuleInstPtr res, void *data); -void virNWFilterTechDriversInit(bool privileged); +int virNWFilterTechDriversInit(bool privileged); void virNWFilterTechDriversShutdown(void); enum instCase { -- 1.8.5.3

2 2

[libvirt] [PATCH] Fix locking in virsh console
by Roman Bogorodskiy 10 Mar '14

10 Mar '14

While I'm still fighting with console on FreeBSD, I decided to sumbit that fix as it seems to be useful on its own. With that change I'm able to run virsh on FreeBSD to connect to libvirtd on Linux and get console working properly there. Roman Bogorodskiy (1): Fix locking in virsh console tools/virsh-console.c | 5 +++++ 1 file changed, 5 insertions(+) -- 1.8.4.2

2 3

[libvirt] How to detect if qemu supports discard?
by Richard W.M. Jones 10 Mar '14

10 Mar '14

from src/qemu/qemu_command.c: if (disk->discard) { if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_DRIVE_DISCARD)) { virBufferAsprintf(&opt, ",discard=%s", virDomainDiskDiscardTypeToString(disk->discard)); } else { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("discard is not supported by this QEMU binary")); goto error; } } However there appears to be no way to tell programmatically if the qemu binary supports discard (ie. via libvirt). Therefore libguestfs can never know when it is safe to use this option in the XML. Rich. -- Richard Jones, Virtualization Group, Red Hat http://people.redhat.com/~rjones libguestfs lets you edit virtual machines. Supports shell scripting, bindings from many languages. http://libguestfs.org

3 2

[libvirt] [bug-report] libvirtd can't be connected by using the master branch with lots of VMs
by Wangpan 10 Mar '14

10 Mar '14

bug address: https://bugzilla.redhat.com/show_bug.cgi?id=1066801 I can reproduce it at master/v1.2.1-maint/v1.1.4-maint/v1.1.3.4 release branches everytime, but cann't reproduce it at v1.2.1，so I believe this bug is imported by the maintain patches after v1.2.1 release. Steps to Reproduce: 1.create many VMs(40 in my env) on the host 2.kill -9 `pid of libvirtd` 3.start libvirtd by using service libvirt-bin start Actual results: virsh version/list command is hung there without any responses Expected results: virsh version/list return the correct things Additional info: if there are few VMs(1 vm in my env), the virsh version command is OK Thanks in advance! 2014-03-07 Wangpan

2 4

[libvirt] [PATCH 0/4] Add keepalive support in virsh
by Martin Kletzander 10 Mar '14

10 Mar '14

*** BLURB *** Martin Kletzander (4): virsh: Sort options alphabetically virsh: Add keepalive in new vshConnect function virsh: Prohibit virConnectOpen* functions in virsh [DO_NOT_APPLY_UPSTREAM] virsh: add connection monitoring into vshWatchJob cfg.mk | 8 ++- tests/virsh-optparse | 3 +- tools/virsh-domain.c | 21 +++++--- tools/virsh.c | 141 +++++++++++++++++++++++++++++++++++++-------------- tools/virsh.h | 7 +++ tools/virsh.pod | 38 +++++++------- 6 files changed, 152 insertions(+), 66 deletions(-) -- 1.9.0

2 9

[libvirt] [PATCH] tests: Fix SELinux tests in VPATH build
by Jiri Denemark 10 Mar '14

10 Mar '14

Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- Pushed as a build-breaker. Notes: abs_builddir is used in more places in tests/securityselinuxhelper.c but since the path they are used in does not exist in abs_srcdir either, I guess it doesn't really matter what prefix is used there. tests/securityselinuxhelper.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/securityselinuxhelper.c b/tests/securityselinuxhelper.c index 703381c..dbc4c29 100644 --- a/tests/securityselinuxhelper.c +++ b/tests/securityselinuxhelper.c @@ -278,7 +278,7 @@ const char *selinux_virtual_domain_context_path(void) if (realis_selinux_enabled()) return realselinux_virtual_domain_context_path(); - return abs_builddir "/securityselinuxhelperdata/virtual_domain_context"; + return abs_srcdir "/securityselinuxhelperdata/virtual_domain_context"; } const char *selinux_virtual_image_context_path(void) @@ -288,7 +288,7 @@ const char *selinux_virtual_image_context_path(void) if (realis_selinux_enabled()) return realselinux_virtual_image_context_path(); - return abs_builddir "/securityselinuxhelperdata/virtual_image_context"; + return abs_srcdir "/securityselinuxhelperdata/virtual_image_context"; } #ifdef HAVE_SELINUX_LXC_CONTEXTS_PATH @@ -299,7 +299,7 @@ const char *selinux_lxc_contexts_path(void) if (realis_selinux_enabled()) return realselinux_lxc_contexts_path(); - return abs_builddir "/securityselinuxhelperdata/lxc_contexts"; + return abs_srcdir "/securityselinuxhelperdata/lxc_contexts"; } #endif -- 1.9.0

1 0

[libvirt] virDomainGetMaxVcpus does not work as expected
by Claudio Bley 10 Mar '14

10 Mar '14

Hi. When calling virDomainGetMaxVcpus (http://libvirt.org/html/libvirt-libvirt.html#virDomainGetMaxVcpus) on an inactive domain, I receive this error: scala> res2.getMaxVcpus() libvirt: Domain Config error : Requested operation is not valid: domain is not running org.libvirt.LibvirtException: Requested operation is not valid: domain is not running at org.libvirt.ErrorHandler.processError(ErrorHandler.java:31) at org.libvirt.ErrorHandler.processError(ErrorHandler.java:46) at org.libvirt.Domain.getMaxVcpus(Domain.java:571) at .<init>(<console>:13) ... (this is from Java, but that doesn't matter) The docs say: > If the guest is inactive, this is basically the same as > virConnectGetMaxVcpus(). If the guest is running this will reflect > the maximum number of virtual CPUs the guest was booted with. But, apparently, all the driver implementations for virDomainGetMaxVcpus forward to <driver>DomainGetVcpusFlags(.., VIR_DOMAIN_AFFECT_LIVE | VIR_DOMAIN_VCPU_MAXIMUM). _______________________________,~~~~~~~~~~~~~~~~~~~~~~ $ git grep --show-function 'GetVcpusFlags.*AFFECT_LIVE' src/esx/esx_driver.c=esxDomainGetMaxVcpus(virDomainPtr domain) src/esx/esx_driver.c: return esxDomainGetVcpusFlags(domain, (VIR_DOMAIN_AFFECT_LIVE | src/openvz/openvz_driver.c=static int openvzDomainGetMaxVcpus(virDomainPtr dom) src/openvz/openvz_driver.c: return openvzDomainGetVcpusFlags(dom, (VIR_DOMAIN_AFFECT_LIVE | src/qemu/qemu_driver.c=qemuDomainGetMaxVcpus(virDomainPtr dom) src/qemu/qemu_driver.c: return qemuDomainGetVcpusFlags(dom, (VIR_DOMAIN_AFFECT_LIVE | src/test/test_driver.c=testDomainGetMaxVcpus(virDomainPtr domain) src/test/test_driver.c: return testDomainGetVcpusFlags(domain, (VIR_DOMAIN_AFFECT_LIVE | src/vbox/vbox_tmpl.c=vboxDomainGetMaxVcpus(virDomainPtr dom) src/vbox/vbox_tmpl.c: return vboxDomainGetVcpusFlags(dom, (VIR_DOMAIN_AFFECT_LIVE | AFAICS, this was introduced with commit 50c51f13e2af04afac46e181c4ed62581545a488 Author: Eric Blake <eblake(a)redhat.com> Date: Mon Sep 27 16:37:53 2010 -0600 vcpu: make old API trivially wrap to new API Whereas the function's contract was documented earlier by commit b412cfadb502c76df095c2c4548c27abf7c4873f Author: Daniel Veillard <veillard(a)redhat.com> Date: Thu Mar 8 08:31:07 2007 +0000 To be honest, I'm not sure whether this worked as described at some time in the past _at all_. How to fix this? Change the documentation or the flag? Claudio

5 11

[libvirt] [PATCH] qemu: Advertize <drivediscard/> in capabilities if 'discard' is supported.
by Richard W.M. Jones 09 Mar '14

09 Mar '14

The capabilities will have a <drivediscard/> feature if you are allowed to use the qemu attribute: <driver name='qemu' ... discard='unmap|ignore' /> The new capabilities XML looks like this: <capabiltiies> ... <guest> <os_type>hvm</os_type> ... <features> <drivediscard/> </features> </guest> </capabiltiies> --- src/conf/capabilities.c | 3 ++- src/qemu/qemu_capabilities.c | 4 ++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/conf/capabilities.c b/src/conf/capabilities.c index c1c4ab8..ff5912a 100644 --- a/src/conf/capabilities.c +++ b/src/conf/capabilities.c @@ -947,7 +947,8 @@ virCapabilitiesFormatXML(virCapsPtr caps) STREQ(caps->guests[i]->features[j]->name, "nonpae") || STREQ(caps->guests[i]->features[j]->name, "ia64_be") || STREQ(caps->guests[i]->features[j]->name, "cpuselection") || - STREQ(caps->guests[i]->features[j]->name, "deviceboot")) { + STREQ(caps->guests[i]->features[j]->name, "deviceboot") || + STREQ(caps->guests[i]->features[j]->name, "drivediscard")) { virBufferAsprintf(&xml, " <%s/>\n", caps->guests[i]->features[j]->name); } else { diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index cae25e0..b755fb2 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -778,6 +778,10 @@ virQEMUCapsInitGuest(virCapsPtr caps, !virCapabilitiesAddGuestFeature(guest, "deviceboot", 1, 0)) goto error; + if (virQEMUCapsGet(qemubinCaps, QEMU_CAPS_DRIVE_DISCARD) && + !virCapabilitiesAddGuestFeature(guest, "drivediscard", 0, 0)) + goto error; + if (virCapabilitiesAddGuestDomain(guest, "qemu", NULL, -- 1.8.5.3

1 1

[libvirt] [PATCH 00/13] Utilize more of VIR_(APPEND|INSERT|DELETE)_ELEMENT
by Michal Privoznik 07 Mar '14

07 Mar '14

2 26

[libvirt] Suspending access to opened/active /dev/nodes during application runtime
by Lukasz Pawelczyk 07 Mar '14

07 Mar '14

Problem: Has anyone thought about a mechanism to limit/remove an access to a device during an application runtime? Meaning we have an application that has an open file descriptor to some /dev/node and depending on *something* it gains or looses the access to it gracefully (with or without a notification, but without any fatal consequences). Example: LXC. Imagine we have 2 separate containers. Both running full operating systems. Specifically with 2 X servers. Both running concurrently of course. Both need the same input devices (e.g. we have just one mouse). This creates a security problem when we want to have completely separate environments. One container is active (being displayed on a monitor and controlled with a mouse) while the other container runs evtest /dev/input/something and grabs the secret password user typed in the other. Solutions: The complete solution would comprise of 2 parts: - a mechanism that would allow to temporally "hide" a device from an open file descriptor. - a mechanism for deciding whether application/process/namespace should have an access to a specific device at a specific moment Let's focus on the first problem only, as it would need to be solved first anyway. I haven't found anything that would allow me to do it. There are a lot mechanisms that make it possible to restrict an access during open(): - DAC - ACL (controlled by hand or with uaccess) - LSM (in general) - device cgroups But all of those can't do a thing when the device is already opened and an application has a file descriptor. I don't see such mechanism in kernel sources either. I do imagine that it would not be possible for every device to handle such a thing (dri comes to mind) without breaking something (graphics card state in dri example). But there is class of simple input/output devices that would handle this without problems. I did implement some proof-of-concept solution for an evdev driver by allowing or disallowing events that go to evdev_client structure using some arbitrary condition. But this is far from a generic solution. My proof-of-concept is somewhat similar to this (I just found it): http://www.spinics.net/lists/linux-input/msg25547.html Though a little bit wider in scope. But neither is flawless nor generic. Has anyone had any thoughts about a similar problem? -- Regards Havner

2 3

[libvirt] Release of libvirt-1.2.2
by Daniel Veillard 07 Mar '14

07 Mar '14

As planned I have tagged libvirt-1.2.2 in git and it seem the git tree finally updated despite the horrible network I get in china ATM, the tarballs may finally arrive at some time too at the usual place after working around the local infrastructure flaws... : ftp://libvirt.org/libvirt/ I am also pushing a libvirt-python-1.2.2 update at: ftp://libvirt.org/libvirt/libvirt/ since fedpkg upload libvirt-1.2.2.tar.gz failed to progress further than 7% using eithe Cable or ADSL, i assume someone lese will push those to Fedora build system. This is a rather large release with a few new features including beginning of support for the BSD hypervisor, and a lot of significant improvements in various place like linux containers, network storage, Xen drivers, internals etc ... Also of note the fixes for the LXC security bug CVE-2013-6456: Features: - bhyve: add a basic driver (Roman Bogorodskiy) - add LXC from native conversion tool (Cédric Bosdonnat) - vbox: add support for v4.2.20+ and v4.3.4+ (Jean-Baptiste Rouault) - Introduce Libvirt Wireshark dissector (Yuto KAWAMURA) Security: - CVE-2013-6456: Avoid unsafe use of /proc/$PID/root in LXC hotunplug code (Daniel P. Berrange) - CVE-2013-6456: Avoid unsafe use of /proc/$PID/root in LXC chardev hostdev hotplug (Daniel P. Berrange) - CVE-2013-6456: Avoid unsafe use of /proc/$PID/root in LXC block hostdev hotplug (Daniel P. Berrange) - CVE-2013-6456: Avoid unsafe use of /proc/$PID/root in LXC USB hotplug (Daniel P. Berrange) - CVE-2013-6456: Avoid unsafe use of /proc/$PID/root in LXC disk hotplug (Daniel P. Berrange) - CVE-2013-6456: Avoid unsafe use of /proc/$PID/root in LXC shutdown/reboot code (Eric Blake) Documentation: - bhyve: add basic documentation (Roman Bogorodskiy) - Add docs about use of systemd journal for logging (Daniel P. Berrange) - Auto-generate the table of contents in logging doc (Daniel P. Berrange) - Fix heading level in logging docs (Daniel P. Berrange) - Document the keyboard as a valid input type (Ján Tomko) - bandwidth: Adjust documentation (John Ferlan) - remove <auth> from secret XML format (Ján Tomko) - LXC: added some doc on domxml-from-native with mention of limitations (Cédric Bosdonnat) - libxl: fix libxlDoDomainSave documentation (Jim Fehlig) - grammar fixes in formatdomain (Chen Hanxiao) - maint: fix grammar in conf file (Eric Blake) - Fix minor typo in governance doc (Justin Clift) - Write up the project governance process (Daniel P. Berrange) - man: shm-merge-across-nodes is optional (Ján Tomko) - docs/page.xls: remove unnecessary namespace attribute (Pavel Hrdina) - add a permalink to html headers (Dan Kenigsberg) - storage: Add document for possible problem on volume detection (Osier Yang) - Add "note" for node-memory-tune (Osier Yang) - Improve the document for nodesuspend (Osier Yang) - refer to the correct event ID for DomainEventIOErrorReasonCallback (Claudio Bley) - Add sample output of Wireshark dissector (Yuto KAWAMURA) - Add missing space in <clock> documentation (Christophe Fergeau) Portability: - build: skip virportallocatortest on cygwin (Eric Blake) - build: ignore cygwin toolchain droppings (Eric Blake) - build: avoid ld_preload tests on mingw (Eric Blake) - build: fix cgroups on non-Linux (Eric Blake) - build: fix build on 32-bit hosts (Eric Blake) - maint: update to latest gnulib, for older autoconf (Eric Blake) - Fix build of portallocator on mingw (Ján Tomko) - lxc: Don't shadow global symbol "link" (Peter Krempa) - storage: Fix build with older compilers afeter gluster snapshot series (Peter Krempa) - spec: add missing dep of libvirt-daemon-config-network (Thierry Parmentelat) - spec: require libvirt-daemon-driver-interface only when built (Thierry Parmentelat) - Fixed build with clang. (Cédric Bosdonnat) - Rename 'index' in virCapabilitiesGetCpusForNode (Ján Tomko) - qemuxml2argvmock: Mock time() on non-linux platforms too (Michal Privoznik) - build: Fix 'make rpm' in VPATH with wireshark (Martin Kletzander) - Remove windows thread implementation in favour of pthreads (Daniel P. Berrange) - Fix pthread_sigmask check for mingw32 without winpthreads (Daniel P. Berrange) - Skip check-augeas-lockd when QEMU is disabled (Daniel P. Berrange) - maint: add configure checks for BSD CPU affinity (Roman Bogorodskiy) - BSD: implement virProcess{Get,Set}Affinity (Roman Bogorodskiy) - tests: Fix PCI test data filenames for Windows (Matthias Bolte) - wireshark: Fix VPATH build (Jiri Denemark) - Honour prefix in wireshark install dir (Daniel P. Berrange) - Use AC_PATH_PROG to search for dmidecode (Roman Bogorodskiy) Bug fixes: - bhyve: defined domains should be persistent (Roman Bogorodskiy) - Fix journald PRIORITY values (Daniel P. Berrange) - spec: Fix braces around macros (Peter Krempa) - spec: Use correct versions of libgfapi in RHEL builds (Peter Krempa) - network: unplug bandwidth and call networkRunHook only when appropriate (Laine Stump) - network: don't even call networkRunHook if there is no network (Laine Stump) - Fix memory leak in virSCSIDeviceListDel() (Nehal J Wani) - libxl: queue domain event earlier in shutdown handler (Jim Fehlig) - virsh: mark CPU usage field names as translatable (Ján Tomko) - virsh: initialize str to NULL to solve a build issue (Chen Hanxiao) - virsh: Don't leak buffer if GetFDs fails in cmdCreate (Ján Tomko) - libvirt-guests: Wait for libvirtd to initialize (Michal Privoznik) - virSystemdCreateMachine: Set dependencies for slices (Michal Privoznik) - Ignore additional fields in iscsiadm output (Ján Tomko) - libxl: always use libxlVmCleanupJob in shutdown thread (Jim Fehlig) - qemu: adjust maxmem/maxvcpu computation (Eric Blake) - Fix multiple bugs in LXC domainMemoryStats driver (Daniel P. Berrange) - Fix misspelled cpuacct.usage_percpu in cgroup mock. (Thorsten Behrens) - virsh: fix memleak when starting a guest with invalid fd (Jincheng Miao) - networkRunHook: Run hook only if possible (Michal Privoznik) - bridge_driver.h: Fix build --without-network (Michal Privoznik) - Fix conflicting types of virInitctlSetRunLevel (Ján Tomko) - Fix reset of cgroup when detaching USB device from LXC guests (Daniel P. Berrange) - Fix path used for USB device attach with LXC (Daniel P. Berrange) - Don't block use of USB with containers (Daniel P. Berrange) - storage: gluster: Don't leak private data when storage file init fails (Peter Krempa) - storage: handle NULL return from virGetStorageVol (Michael Chapman) - Fix leaks in vircapstest (Ján Tomko) - AppArmor: Fix the place where the template should be installed (Cédric Bosdonnat) - Libvirt lose sheepdogs volumes on pool refresh or restart. When restarting sheepdog pool, all volumes are missing. This patch add automatically all volume from the added pool. (Joel SIMOES) - maint: fix line numbers in check-aclrules reports (Yuri Myasoedov) - qemu: Use correct permissions when determining the image chain (Peter Krempa) - virpci: Resolve coverity issues (John Ferlan) - qemu: keep pre-migration domain state after failed migration (Martin Kletzander) - qemu: Fix crash in virDomainMemoryStats with old qemu (Jiri Denemark) - network: disallow <bandwidth>/<mac> for bridged/macvtap/hostdev networks (Laine Stump) - Honor blacklist for modprobe command (John Ferlan) - qemu: be sure we're using the updated value of backend during hotplug (Laine Stump) - Resolve Coverity dead_error_begin (John Ferlan) - qemu: Fix the error message for scsi host device's shareable checking (Osier Yang) - xen: fix parsing xend http response (Jim Fehlig) - storage: Fix the memory leak (Osier Yang) - Fix buffer size in linuxNodeGetCPUstats (Bing Bu Cao) - util: Correct the NUMA node range checking (Osier Yang) - qemu: Avoid crash in qemuDiskGetActualType (Peter Krempa) - linuxNodeGetCPUStats: Correctly handle cpu prefix (Bing Bu Cao) - qemu: snapshot: Forbid snapshots when backing is a scsi passthrough disk (Peter Krempa) - qemu: snapshot: Avoid libvirtd crash when qemu crashes while snapshotting (Peter Krempa) - lxc: Fix coverity (Martin Kletzander) - qemu: Don't detach devices if passthrough doesn't work (Jincheng Miao) - pci: Fix failure paths in detach (Jiri Denemark) - virSecuritySELinuxSetFileconHelper: Don't fail on read-only NFS (Michal Privoznik) - Fix possible memory leak in virsh-domain-monitor.c in cmdDomblklist (Pavel Hrdina) Improvements: - virsh: add --all flag to 'event' command (Eric Blake) - virsh: support remaining domain events (Eric Blake) - bhyve: support domain undefine (Roman Bogorodskiy) - Add comments describing the different log sources (Daniel P. Berrange) - Include error domain and code in log messages from errors (Daniel P. Berrange) - Send virLogMetadata fields onto the journal (Daniel P. Berrange) - qemu: Enable 'host-passthrough' cpu mode for arm (Oleg Strikov) - domblkstat: Produce error message that at least sounds like English (Michal Privoznik) - virDomainBlockStats(Flags): Produce saner error message on empty disk path (Michal Privoznik) - tests: avoid littering /tmp (Eric Blake) - sanlock: Truncate domain names longer than SANLK_NAME_LEN (Jiri Denemark) - maint: Fix minor typo (unkown) (Yuri Chornoivan) - libxl: Recognise ARM architectures (Ian Campbell) - virsh: Honour -q in domblklist, vcpupin and emulatorpin (Michal Privoznik) - spec: make systemd_daemon usage configurable (Eric Blake) - spec: require device-mapper-devel for storage-disk (Eric Blake) - spec: explicitly avoid bhyve on Linux (Eric Blake) - build: use --with-systemd-daemon as configure option (Eric Blake) - virNetDevVethCreate: Serialize callers (Michal Privoznik) - network: include plugged interface XML in "plugged" network hook (Laine Stump) - conf: output actual netdev status in <interface> XML (Laine Stump) - conf: new function virDomainActualNetDefContentsFormat (Laine Stump) - conf: re-situate <bandwidth> element in <interface> (Laine Stump) - conf: make virDomainNetDefFormat a public function (Laine Stump) - conf: handle null pointer in virNetDevVlanFormat (Laine Stump) - conf: clarify what is returned for actual bandwidth and vlan (Laine Stump) - rbd: Set timeout options for librados (Wido den Hollander) - rbd: Include return statuses from librados/librbd in logging (Wido den Hollander) - virsh: kill over-engineered asprintf failure recovery (Eric Blake) - virsh: use more compact VIR_ENUM_IMPL (Eric Blake) - libxl: handle on_crash coredump actions (Jim Fehlig) - libxl: add dump dir to libxlDriverConfig object (Jim Fehlig) - libxl: honor domain lifecycle event configuration (Jim Fehlig) - Ensure systemd cgroup ownership is delegated to container with userns (Richard Weinberger) - bhyve: implement node information reporting (Roman Bogorodskiy) - Add virStringReplace method for substring replacement (Daniel P. Berrange) - Add virStringSearch method for regex matching (Manuel VIVES) - virNetServerRun: Notify systemd that we're accepting clients (Michal Privoznik) - Add a stub for virCgroupGetDomainTotalCpuStats (Ján Tomko) - maint: update to latest gnulib (Eric Blake) - virsh: add net-event command (Eric Blake) - virsh: add event command, for lifecycle events (Eric Blake) - virsh: common code for waiting for an event (Eric Blake) - virsh: common code for parsing --seconds (Eric Blake) - libxl: queue shutdown event on domain shutdown (Jim Fehlig) - Rename virDomainGetRootFilesystem to virDomainGetFilesystemForTarget (Daniel P. Berrange) - Introduce new OOM testing support (Daniel P. Berrange) - Add unit test for virCgroupGetPercpuStats. (Thorsten Behrens) - Add unit test for virCgroupGetMemoryUsage. (Thorsten Behrens) - Add unit test for virCgroupGetBlkioIo*Serviced (Thorsten Behrens) - Widening API change - accept empty path for virDomainBlockStats (Thorsten Behrens) - Implement lxcDomainBlockStats* for lxc driver (Thorsten Behrens) - Implement domainGetCPUStats for lxc driver. (Thorsten Behrens) - Make qemuGetDomainTotalCPUStats a virCgroup function. (Thorsten Behrens) - Implement domainMemoryStats API slot for LXC driver. (Thorsten Behrens) - Add util virCgroupGetBlkioIo*Serviced methods. (Thorsten Behrens) - lxc: Add destroy support for suspended domains (Richard Weinberger) - libxl: use job functions in libxlDomainSetSchedulerParametersFlags (Jim Fehlig) - libxl: use job functions in libxlDomainSetAutostart (Jim Fehlig) - libxl: use job functions in device attach and detach functions (Jim Fehlig) - libxl: use job functions in vcpu set and pin functions (Jim Fehlig) - libxl: use job functions in libxlDomainCoreDump (Jim Fehlig) - libxl: use job functions in domain save operations (Jim Fehlig) - libxl: use job functions when cleaning up a domain (Jim Fehlig) - libxl: use job functions in libxlDomain{Suspend,Resume} (Jim Fehlig) - libxl: use job functions in libxlDomainSetMemoryFlags (Jim Fehlig) - libxl: use job functions in libxlVmStart (Jim Fehlig) - libxl: Add job support to libxl driver (Jim Fehlig) - libxl: remove libxlVmReap function (Jim Fehlig) - libxl: always set vm id to -1 on shutdown (Jim Fehlig) - qemu: Use virtio network device for aarch64/virt (Oleg Strikov) - Add a default USB keyboard and USB mouse for PPC64 (Li Zhang) - xen: format xen config for USB keyboard (Li Zhang) - qemu: format qemu command line for USB keyboard (Li Zhang) - qemu: Add USB keyboard capability (Li Zhang) - conf: Remove the implicit PS2 devices for non-X86 platforms (Li Zhang) - conf: Add keyboard input device type (Li Zhang) - conf: Add one interface to add default input devices (Li Zhang) - network: Taint networks that are using hook script (Michal Privoznik) - network: Introduce network hooks (Michal Privoznik) - network_conf: Expose virNetworkDefFormatInternal (Michal Privoznik) - Add helper for running code in separate namespaces (Daniel P. Berrange) - Add virFileMakeParentPath helper function (Daniel P. Berrange) - Move check for cgroup devices ACL upfront in LXC hotplug (Daniel P. Berrange) - Disks are always block devices, never character devices (Daniel P. Berrange) - Record hotplugged USB device in LXC live guest config (Daniel P. Berrange) - qemu: Implement VIR_DOMAIN_TAINT_HOOK (Michal Privoznik) - virDomainTaintFlags: Introduce VIR_DOMAIN_TAINT_HOOK (Michal Privoznik) - Add tests for secret XML parsing (Ján Tomko) - Forgot to add lxcconf2xmldata to dist. (Cédric Bosdonnat) - Support IPv6 in port allocator (Ján Tomko) - Split out bind() from virPortAllocatorAcquire (Ján Tomko) - qemu: snapshot: Add support for external active snapshots on gluster (Peter Krempa) - qemu: snapshot: Use new APIs to detect presence of existing storage files (Peter Krempa) - qemu: Switch snapshot deletion to the new API functions (Peter Krempa) - storage: Add storage file backends for gluster (Peter Krempa) - storage: add file functions for local and block files (Peter Krempa) - storage: Add file storage APIs in the default storage driver (Peter Krempa) - conf: Move qemuSnapshotDiskGetActualType to virDomainSnapshotDiskGetActualType (Peter Krempa) - conf: Move qemuDiskGetActualType to virDomainDiskGetActualType (Peter Krempa) - spec: add missing dep of libvirt-daemon-config-nwfilter (Eric Blake) - lxc from native: removed now remaining useless line (Cédric Bosdonnat) - Fix stream related spelling mistakes (Philipp Hahn) - LXC from native: convert blkio throttle config (Cédric Bosdonnat) - LXC from native: map vlan network type (Cédric Bosdonnat) - LXC from native: map block filesystems (Cédric Bosdonnat) - LXC from native: map lxc.arch to /domain/os/type@arch (Cédric Bosdonnat) - LXC from native: add lxc.cgroup.blkio.* mapping (Cédric Bosdonnat) - LXC from native: map lxc.cgroup.cpuset.* (Cédric Bosdonnat) - LXC from native: map lxc.cgroup.cpu.* (Cédric Bosdonnat) - LXC from native: migrate memory tuning (Cédric Bosdonnat) - LXC from native: convert lxc.id_map into <idmap> (Cédric Bosdonnat) - LXC from native: convert macvlan network configuration (Cédric Bosdonnat) - LXC from native: convert lxc.tty to console devices (Cédric Bosdonnat) - LXC from native: convert phys network types to net hostdev devices (Cédric Bosdonnat) - LXC from native: migrate veth network configuration (Cédric Bosdonnat) - LXC from native: implement no network conversion (Cédric Bosdonnat) - LXC from native: migrate fstab and lxc.mount.entry (Cédric Bosdonnat) - LXC from native: import rootfs (Cédric Bosdonnat) - LXC driver: started implementing connectDomainXMLFromNative (Cédric Bosdonnat) - Improve virConf parse to handle LXC config format (Cédric Bosdonnat) - event: pass reason for PM events (Eric Blake) - event: convert remaining domain events to new style (Eric Blake) - event: client RPC protocol tweaks for domain lifecycle events (Eric Blake) - event: prepare client to track domain callbackID (Eric Blake) - event: server RPC protocol tweaks for domain lifecycle events (Eric Blake) - event: dynamically manage server-side RPC domain events (Eric Blake) - qemu: Implement a stub cpuArchDriver.baseline() handler for aarch64 (Oleg Strikov) - libxl: register for domain events immediately after creation (Jim Fehlig) - libxl: rename libxlCreateDomEvents to libxlDomEventsRegister (Jim Fehlig) - vircapstest: Introduce virCapabilitiesGetCpusForNodemask test (Pradipta Kr. Banerjee) - Handle non-sequential NUMA node numbers (Pradipta Kr. Banerjee) - storage: gluster: Set volume metadata in a separate function (Peter Krempa) - qemu: introduce spiceport chardev backend (Martin Kletzander) - qemu: remove pointless condition (Martin Kletzander) - qemu: rework '-serial none' (Martin Kletzander) - conf: introduce spiceport chardev backend (Martin Kletzander) - rbd: Use rbd_create3 to create RBD format 2 images by default (Wido den Hollander) - build: correctly check for SOICGIFVLAN GET_VLAN_VID_CMD command (Laine Stump) - virNetworkLoadState: Disallow mangled 'floor' element (Michal Privoznik) - networkStartNetwork: Be more verbose (Michal Privoznik) - qemu: hyperv: Add support for timer enlightenments (Peter Krempa) - conf: Enforce supported options for certain timers (Peter Krempa) - schema: Fix guest timer specification schema according to the docs (Peter Krempa) - apparmor: Improve profiles (Felix Geyer) - Add glusterfs to VIR_CONNECT_LIST_STORAGE_POOLS_FILTERS_POOL_TYPE (Christophe Fergeau) - libxl: remove unneeded locking of driver when restoring (Jim Fehlig) - libxl: improve subprocess handling (Jim Fehlig) - libxl: handle domain shutdown events in a thread (Jim Fehlig) - libxl: remove list of timer registrations from libxlDomainObjPrivate (Jim Fehlig) - libxl: fix leaking libxlDomainObjPrivate (Jim Fehlig) - qemu_driver: Introduce <filesystem/> support in device attach/detach (Matthieu Coudron) - virDomainHostdev{Insert,Delete}: Replace VIR_REALLOC_N by VIR_{APPEND,DELETE}_ELEMENT (Matthieu Coudron) - qemuxml2argvtest: Set timezone (Michal Privoznik) - virsh: only report filled values in nodecpustats (Ján Tomko) - BSD: implement nodeGetCPUStats (Roman Bogorodskiy) - qemu: blockjob: Print correct file name in error message (Peter Krempa) - maint: Change the text of the NULLSTR() macro to "<null>" (Peter Krempa) - qemuxml2argvtest: Test localtime clock basis (Michal Privoznik) - qemuBuildClockArgStr: Allow localtime clock basis (Michal Privoznik) - Generate a valid imagelabel even for type 'none' (Ján Tomko) - event: move event filtering to daemon (regression fix) (Eric Blake) - rpm: create libvirt-wireshark sub-package (Eric Blake) - tests: Add test for new virkmod functions (John Ferlan) - utils: Introduce functions for kernel module manipulation (John Ferlan) - network: change default of forwardPlainNames to 'yes' (Laine Stump) - network: only prevent forwarding of DNS requests for unqualified names (Laine Stump) - virnetdevbandwidthtest: Link with libxml2 (Michal Privoznik) - spice: don't force user to specify spicevmc channel (Martin Kletzander) - virnetdevbandwidthtest: Introduce some more tests (Michal Privoznik) - virnetdevbandwidthtest: fix hard coded /sbin/tc (Cédric Bosdonnat) - Push nwfilter update locking up to top level (Daniel P. Berrange) - Add a read/write lock implementation (Daniel P. Berrange) - tests: Modify the scsi util tests (Osier Yang) - util: Accept test data path for scsi device's sg_path (Osier Yang) - tests: Add tests for scsi utils (Osier Yang) - util: Add one argument for several scsi utils (Osier Yang) - qemu: Don't fail if the SCSI host device is shareable between domains (Osier Yang) - virnetdevbandwidthtest: Introduce testVirNetDevBandwidthSet (Michal Privoznik) - virCommand: Introduce virCommandSetDryRun (Michal Privoznik) - snapshot: Add support for specifying snapshot disk backing type (Peter Krempa) - tests: Add more tests for virConnectBaselineCPU (Jiri Denemark) - cpu: Try to use source CPU model in virConnectBaselineCPU (Jiri Denemark) - cpu: Fix VIR_CONNECT_BASELINE_CPU_EXPAND_FEATURES (Jiri Denemark) - tests: Better support for VIR_CONNECT_BASELINE_CPU_EXPAND_FEATURES (Jiri Denemark) - Reword error message for oversized cpu time fields (Ján Tomko) - Simplify linuxNodeGetCPUStats (Ján Tomko) - Add hw random number generator (/dev/hwrng) to cgroup ACL (Pradipta Kr. Banerjee) - tests: Introduce virnetdevbandwidthtest (Michal Privoznik) - Add test for linuxNodeGetCPUStats (Ján Tomko) - Move test-local declarations to nodeinfopriv.h (Ján Tomko) - qemu: Enable 'host-passthrough' cpu mode for aarch64 (Oleg Strikov) - Block info query: Add check for transient domain (John Ferlan) - maint: update to latest gnulib, for mingw improvements (Eric Blake) - util: Add "shareable" field for virSCSIDevice struct (Osier Yang) - storage: Fix autostart of pool with "fc_host" type adapter (Osier Yang) - api: require write permission for guest agent interaction (Eric Blake) - virtlockd: make re-exec more robust (Michael Chapman) - build: add $(prefix) to SYSTEMD_UNIT_DIR (Laine Stump) - spice: expose the QEMU disable file transfer option (Francesco Romani) - spice: detect if qemu can disable file transfer (Francesco Romani) - lxc: allow to setup throttle blkio cgroup through virsh (Gao feng) - Add test for transient disk support in VMX files (Wout Mertens) - Make syntax check notice assignments w/o surrounding spaces. (Thorsten Behrens) - maint: align whitespaces with project conventions. (Thorsten Behrens) - virpcitest: Test virPCIDeviceDetach failure (Jiri Denemark) - virpcimock: Add PCI driver which always fails (Jiri Denemark) - virpcitest: More tests for device detach and reattach (Jiri Denemark) - virpcimock: Mock /sys/bus/pci/drivers_probe (Jiri Denemark) - pci: Publish some internal code for virpcitest (Jiri Denemark) - virpcitest: Show PCI device tested by each test (Jiri Denemark) - pci: Make reattach work for unbound devices (Jiri Denemark) - qemu: allow to setup throttle blkio cgroup through virsh (Gao feng) - virsh: add setting throttle blkio cgroup option to blkiotune (Gao feng) - blkio: Setting throttle blkio cgroup for domain (Gao feng) - domain: introduce xml elements for throttle blkio cgroup (Gao feng) - maint: replace remaining virLib*Error with better names (Eric Blake) - maint: simplify driver registration at startup (Eric Blake) - maint: clean up error reporting in migration (Eric Blake) - maint: don't lose error on canceled migration (Eric Blake) - maint: avoid nested use of virConnect{Ref,Close} (Eric Blake) - maint: don't leave garbage on early API exit (Eric Blake) - qemu: Change the default unix monitor timeout (Martin Kletzander) - storage: Sheepdog: Separate creating of the volume from building (Peter Krempa) - storage: RBD: Separate creating of the volume from building (Peter Krempa) - storage: Support deletion of volumes on gluster pools (Peter Krempa) - conf: Always use VIR_ERR_CONFIG_UNSUPPORTED on enumFromString() failures (Christophe Fergeau) Cleanups: - build-sys: Removed unused variable from configure.ac (Christophe Fergeau) - qemu: remove memset params array to zero in qemuDomainGetPercpuStats (Gao feng) - util: Fix the indention (Osier Yang) - virsh: Fix the string breaking style (Osier Yang) thanks everybody for the help with those release, be it with patches, bug reports, reviews, documentation, localizations, etc... Daniel -- Daniel Veillard | Open Source and Standards, Red Hat veillard(a)redhat.com | libxml Gnome XML XSLT toolkit http://xmlsoft.org/ http://veillard.com/ | virtualization library http://libvirt.org/

4 6

[libvirt] [PATCH] virscsi: Introduce virSCSIDeviceUsedByInfoFree
by John Ferlan 07 Mar '14

07 Mar '14

This resolves a Coverity RESOURCE_LEAK issue introduced by commit id 'de6fa535' where the virSCSIDeviceSetUsedBy() didn't VIR_FREE the 'copy' or possibly VIR_STRDUP()'d values. Signed-off-by: John Ferlan <jferlan(a)redhat.com> --- src/util/virscsi.c | 26 +++++++++++++++----------- 1 file changed, 15 insertions(+), 11 deletions(-) diff --git a/src/util/virscsi.c b/src/util/virscsi.c index 69eae24..66e3161 100644 --- a/src/util/virscsi.c +++ b/src/util/virscsi.c @@ -268,6 +268,14 @@ cleanup: return ret; } +static void +virSCSIDeviceUsedByInfoFree(virUsedByInfoPtr used_by) +{ + VIR_FREE(used_by->drvname); + VIR_FREE(used_by->domname); + VIR_FREE(used_by); +} + void virSCSIDeviceFree(virSCSIDevicePtr dev) { @@ -279,11 +287,8 @@ virSCSIDeviceFree(virSCSIDevicePtr dev) VIR_FREE(dev->id); VIR_FREE(dev->name); VIR_FREE(dev->sg_path); - for (i = 0; i < dev->n_used_by; i++) { - VIR_FREE(dev->used_by[i]->drvname); - VIR_FREE(dev->used_by[i]->domname); - VIR_FREE(dev->used_by[i]); - } + for (i = 0; i < dev->n_used_by; i++) + virSCSIDeviceUsedByInfoFree(dev->used_by[i]); VIR_FREE(dev->used_by); VIR_FREE(dev); } @@ -296,10 +301,11 @@ virSCSIDeviceSetUsedBy(virSCSIDevicePtr dev, virUsedByInfoPtr copy; if (VIR_ALLOC(copy) < 0) return -1; - if (VIR_STRDUP(copy->drvname, drvname) < 0) - return -1; - if (VIR_STRDUP(copy->domname, domname) < 0) + if (VIR_STRDUP(copy->drvname, drvname) < 0 || + VIR_STRDUP(copy->domname, domname) < 0) { + virSCSIDeviceUsedByInfoFree(copy); return -1; + } return VIR_APPEND_ELEMENT(dev->used_by, dev->n_used_by, copy); } @@ -449,9 +455,7 @@ virSCSIDeviceListDel(virSCSIDeviceListPtr list, if (STREQ_NULLABLE(dev->used_by[i]->drvname, drvname) && STREQ_NULLABLE(dev->used_by[i]->domname, domname)) { if (dev->n_used_by > 1) { - VIR_FREE(dev->used_by[i]->drvname); - VIR_FREE(dev->used_by[i]->domname); - VIR_FREE(dev->used_by[i]); + virSCSIDeviceUsedByInfoFree(dev->used_by[i]); VIR_DELETE_ELEMENT(dev->used_by, i, dev->n_used_by); } else { tmp = virSCSIDeviceListSteal(list, dev); -- 1.8.5.3

3 3

[libvirt] [PATCH] add option to enforce minimal pagesize for hugetlbfs backed guests
by Marcelo Tosatti 07 Mar '14

07 Mar '14

Require a minimal pagesize for hugetlbfs backed guests. Fail guest initialization if hugetlbfs mount is configured with smaller page size. Signed-off-by: Marcelo Tosatti <mtosatti(a)redhat.com> diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index fd02864..e28d182 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -632,6 +632,10 @@ <dt><code>hugepages</code></dt> <dd>This tells the hypervisor that the guest should have its memory allocated using hugepages instead of the normal native page size.</dd> + <dt><code>pagesize</code></dt> + <dd>This tells the hypervisor that the guest should refuse to start + in case of failure to allocate guest memory with hugepages equal + to or larger than the specified size</dd> <dt><code>nosharepages</code></dt> <dd>Instructs hypervisor to disable shared pages (memory merge, KSM) for this domain. <span class="since">Since 1.0.6</span></dd> diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 28e24f9..babb745 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -11274,6 +11274,10 @@ virDomainDefParseXML(xmlDocPtr xml, &def->mem.swap_hard_limit, false) < 0) goto error; + if (virDomainParseMemory("./memoryBacking/hugepages/pagesize[1]", ctxt, + &def->mem.page_size, false) < 0) + goto error; + n = virXPathULong("string(./vcpu[1])", ctxt, &count); if (n == -2) { virReportError(VIR_ERR_XML_ERROR, "%s", diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index d8f2e49..03a900d 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -1984,6 +1984,7 @@ struct _virDomainDef { unsigned long long soft_limit; /* in kibibytes */ unsigned long long min_guarantee; /* in kibibytes */ unsigned long long swap_hard_limit; /* in kibibytes */ + unsigned long long page_size; /* in kibibytes */ } mem; unsigned short vcpus; unsigned short maxvcpus; diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 8bcd98e..cd5e1c8 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -3570,6 +3570,33 @@ cleanup: return ret; } +#ifdef __linux__ + +#include <sys/vfs.h> + +#define HUGETLBFS_MAGIC 0x958458f6 + +static long gethugepagesize(const char *path) +{ + struct statfs fs; + int ret; + + do { + ret = statfs(path, &fs); + } while (ret != 0 && errno == EINTR); + + if (ret != 0) { + perror(path); + return 0; + } + + if (fs.f_type != HUGETLBFS_MAGIC) + return 0; + + return fs.f_bsize; +} +#endif + int qemuProcessStart(virConnectPtr conn, virQEMUDriverPtr driver, @@ -3712,6 +3739,31 @@ int qemuProcessStart(virConnectPtr conn, "%s", _("Unable to set huge path in security driver")); goto cleanup; } + + if (vm->def->mem.page_size) { +#ifdef __linux__ + unsigned long hpagesize = gethugepagesize(cfg->hugepagePath); + + if (!hpagesize) { + virReportError(VIR_ERR_INTERNAL_ERROR, + "%s", _("Unable to stat hugepage path")); + goto cleanup; + } + + hpagesize /= 1024; + + if (hpagesize < vm->def->mem.page_size) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Error: hugetlbfs page size=%ld < pagesize=%lld"), + hpagesize, vm->def->mem.page_size); + goto cleanup; + } +#else + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + "%s", _("pagesize option unsupported")); + goto cleanup; +#endif + } } /* Ensure no historical cgroup for this VM is lying around bogus

3 2

[libvirt] [PATCH] libvirt-tck: prefer kvm if multiple domain types exist
by Mike Latimer 07 Mar '14

07 Mar '14

When matching capabilities of a guest, if multiple domain types exist (for example, 'qemu' and 'kvm') the order in which they are returned can change. To avoid unpredictable test results, this patch prefers kvm if that domain type exists. If not, the behavior matches what existed before, and the first domain type is returned. --- lib/Sys/Virt/TCK.pm | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/lib/Sys/Virt/TCK.pm b/lib/Sys/Virt/TCK.pm index b2c16e7..56547c6 100644 --- a/lib/Sys/Virt/TCK.pm +++ b/lib/Sys/Virt/TCK.pm @@ -502,7 +502,17 @@ sub match_kernel { my @domains = $caps->guest_domain_types($i); next unless int(@domains); - return ($domains[0], + # Prefer kvm if multiple domain types are returned + my $domain; + if (int(@domains) gt 1) { + for (my $j = 0 ; $j < int(@domains) ; $j++) { + $domain = "kvm" if ($domains[$j] eq "kvm"); + } + } + # If kvm was not found, default to the first one + $domain = $domains[0] if (!defined($domain)); + + return ($domain, $caps->guest_domain_emulator($i, $domains[0]), $caps->guest_domain_loader($i, $domains[0])); } -- 1.8.4.5

2 2

[libvirt] [PATCH 0/4] Fix for virIdentityGetSystem when SELinux is disabled
by Michael Chapman 07 Mar '14

07 Mar '14

If SELinux is compiled into libvirt but it is disabled on the host, libvirtd logs: error : virIdentityGetSystem:173 : Unable to lookup SELinux process context: Invalid argument on each and every client connection. This patch series adds a runtime check for SELinux to this function. I've added security_disable() to securityselinuxhelper so virIdentityGetSystem can be tested twice, once with SELinux enabled and once with it disabled. A few other libselinux functions have also been added, so now securityselinuxlabeltest and securityselinuxtest do not need to be skipped even when SELinux isn't enabled on the test system. Michael Chapman (4): tests: Flesh out securityselinuxhelper tests: SELinux tests do not need to be skipped virIdentityGetSystem: don't fail if SELinux is disabled tests: Test virIdentityGetSystem src/util/viridentity.c | 18 ++- tests/Makefile.am | 4 + tests/securityselinuxhelper.c | 162 ++++++++++++++++++++- tests/securityselinuxhelperdata/lxc_contexts | 5 + .../virtual_domain_context | 2 + .../virtual_image_context | 2 + tests/securityselinuxlabeltest.c | 3 - tests/securityselinuxtest.c | 3 - tests/viridentitytest.c | 75 +++++++++- 9 files changed, 254 insertions(+), 20 deletions(-) create mode 100644 tests/securityselinuxhelperdata/lxc_contexts create mode 100644 tests/securityselinuxhelperdata/virtual_domain_context create mode 100644 tests/securityselinuxhelperdata/virtual_image_context -- 1.8.5.3

2 5

[libvirt] Looking for project ideas and mentors for Google Summer of Code 2014
by Stefan Hajnoczi 07 Mar '14

07 Mar '14

KVM & libvirt: you are welcome to join the QEMU umbrella organization like last year. What is GSoC? Google Summer of Code 2014 (GSoC) provides funding for students to work on open source projects for 12-weeks over the summer. Open source organizations apply to participate and those accepted receive funding for one or more students. How we are participating QEMU has participated, together with KVM and libvirt, in past years and I would like to continue that tradition this year. We now need to collect a list of project ideas on our wiki. We also need mentors to volunteer. http://qemu-project.org/Google_Summer_of_Code_2014 Project ideas Please post project ideas on the wiki page below. Project ideas should be suitable as a 12-week project that a student fluent in C/Python/etc can complete. No prior knowledge of QEMU/KVM/libvirt internals can be assumed. http://qemu-project.org/Google_Summer_of_Code_2014 Mentors Please add your name to project ideas you are willing to mentor. In order to mentor you must be an established contributor (regularly contribute patches). You must be willing to spend about 5 hours per week from May 19 to August 18. I have CCed the 8 most active committers since QEMU 1.5.0 but everyone is invited. Official timeline: https://www.google-melange.com/gsoc/events/google/gsoc2014 Stefan

8 16

[libvirt] [PATCH 1/9] conf: eliminate hardcoded indent from all xml
by Laine Stump 07 Mar '14

07 Mar '14

Many of the domain xml format functions (including all of the device format functions) had hard-coded spaces, which made for incorrect indentation when those functions were called in a different context (for example, commit 2122cf39 added <interface> XML into the document provided to a network hook script, and in this case it should have been indented by 2 spaces, but was instead indented by 6 spaces). In that patch I mentioned doing a followup patch to make the device xml formatters more consistent. After doing that patch, it felt incomplete to not give the same treatment to the entire directory. The one downside to this series is that it may create merge conflicts during backports, but fortunately the conflicts should all be fairly easy to resolve. Laine Stump (9): conf: eliminate hardcoded indent from domain xml conf: eliminate hardcoded indent from domain snapshot xml conf: eliminate hardcoded indent from network xml conf: eliminate outmoded/odd indent method from interface xml conf: eliminate hardcoded indentation in nwfilter xml conf: eliminate hardcoded indentation in capabilities xml conf: eliminate hardcoded indentation in node device xml conf: eliminate hardcoded indent in volume/pool xml conf: eliminate hardcoded indentation in all remaining xml src/conf/capabilities.c | 183 ++++++----- src/conf/cpu_conf.c | 11 +- src/conf/domain_conf.c | 599 +++++++++++++++++++---------------- src/conf/interface_conf.c | 137 ++++---- src/conf/netdev_bandwidth_conf.c | 6 +- src/conf/netdev_vlan_conf.c | 6 +- src/conf/netdev_vport_profile_conf.c | 6 +- src/conf/network_conf.c | 8 +- src/conf/node_device_conf.c | 207 ++++++------ src/conf/nwfilter_conf.c | 94 ++---- src/conf/nwfilter_params.c | 6 +- src/conf/secret_conf.c | 20 +- src/conf/snapshot_conf.c | 48 +-- src/conf/storage_conf.c | 174 +++++----- src/conf/storage_encryption_conf.c | 6 +- 15 files changed, 811 insertions(+), 700 deletions(-) -- 1.8.5.3

2 22

[libvirt] Python-libvirt in a virtual environment.
by Sijo Jose 07 Mar '14

07 Mar '14

Hi, Could you guide me to install libvirt in a virtual environment..? OR How python-libvirt could be used within a virtual environment after installing it, in the system. Regards Sijo

3 4

[libvirt] [PATCH] spec: Let translations be properly updated
by Jiri Denemark 06 Mar '14

06 Mar '14

Libvirt tarball contains po/stamp-po file which prevents any po/*.gmo file to be regenerated even if a corresponding po/*.po file is newer. By removing the stamp-po file, all *.gmo files are properly updated if required. This allows downstreams to provide patches that update translations. Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- libvirt.spec.in | 1 + 1 file changed, 1 insertion(+) diff --git a/libvirt.spec.in b/libvirt.spec.in index 014fe5d..23374e7 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -1421,6 +1421,7 @@ driver autoreconf -if %endif +rm -f po/stamp-po %configure %{?_without_xen} \ %{?_without_qemu} \ %{?_without_openvz} \ -- 1.9.0

2 4

[libvirt] [PATCH v2 1/5] Introduce virDomainFSFreeze() and virDomainFSThaw() public API
by Tomoki Sekiyama 06 Mar '14

06 Mar '14

These will freeze and thaw filesystems within guest. The APIs take flags arguments which are currently not used, for future extensions. Signed-off-by: Tomoki Sekiyama <tomoki.sekiyama(a)hds.com> --- include/libvirt/libvirt.h.in | 6 ++++ src/driver.h | 10 ++++++ src/libvirt.c | 70 ++++++++++++++++++++++++++++++++++++++++++ src/libvirt_public.syms | 5 +++ 4 files changed, 91 insertions(+) diff --git a/include/libvirt/libvirt.h.in b/include/libvirt/libvirt.h.in index 295d551..22f373b 100644 --- a/include/libvirt/libvirt.h.in +++ b/include/libvirt/libvirt.h.in @@ -5245,6 +5245,12 @@ int virDomainFSTrim(virDomainPtr dom, unsigned long long minimum, unsigned int flags); +int virDomainFSFreeze(virDomainPtr dom, + unsigned int flags); + +int virDomainFSThaw(virDomainPtr dom, + unsigned int flags); + /** * virSchedParameterType: * diff --git a/src/driver.h b/src/driver.h index fbfaac4..7e6aec0 100644 --- a/src/driver.h +++ b/src/driver.h @@ -1130,6 +1130,14 @@ typedef int unsigned int flags, int cancelled); +typedef int +(*virDrvDomainFSFreeze)(virDomainPtr dom, + unsigned int flags); + +typedef int +(*virDrvDomainFSThaw)(virDomainPtr dom, + unsigned int flags); + typedef struct _virDriver virDriver; typedef virDriver *virDriverPtr; @@ -1341,6 +1349,8 @@ struct _virDriver { virDrvDomainMigrateFinish3Params domainMigrateFinish3Params; virDrvDomainMigrateConfirm3Params domainMigrateConfirm3Params; virDrvConnectGetCPUModelNames connectGetCPUModelNames; + virDrvDomainFSFreeze domainFSFreeze; + virDrvDomainFSThaw domainFSThaw; }; diff --git a/src/libvirt.c b/src/libvirt.c index a385935..84c9783 100644 --- a/src/libvirt.c +++ b/src/libvirt.c @@ -20552,3 +20552,73 @@ error: virDispatchError(dom->conn); return -1; } + +/** + * virDomainFSFreeze: + * @dom: a domain object + * @flags: extra flags, not used yet, so callers should always pass 0 + * + * Freeze filesystems within the guest (hence guest agent may be + * required depending on hypervisor used). + * + * Returns 0 on success, -1 otherwise. + */ +int +virDomainFSFreeze(virDomainPtr dom, + unsigned int flags) +{ + VIR_DOMAIN_DEBUG(dom, "flags=%x", flags); + + virResetLastError(); + + virCheckDomainReturn(dom, -1); + virCheckReadOnlyGoto(dom->conn->flags, error); + + if (dom->conn->driver->domainFSFreeze) { + int ret = dom->conn->driver->domainFSFreeze(dom, flags); + if (ret < 0) + goto error; + return ret; + } + + virReportUnsupportedError(); + +error: + virDispatchError(dom->conn); + return -1; +} + +/** + * virDomainFSThaw: + * @dom: a domain object + * @flags: extra flags, not used yet, so callers should always pass 0 + * + * Thaw the frozen filesystems within the guest (hence guest agent + * may be required depending on hypervisor used). + * + * Returns 0 on success, -1 otherwise. + */ +int +virDomainFSThaw(virDomainPtr dom, + unsigned int flags) +{ + VIR_DOMAIN_DEBUG(dom, "flags=%x", flags); + + virResetLastError(); + + virCheckDomainReturn(dom, -1); + virCheckReadOnlyGoto(dom->conn->flags, error); + + if (dom->conn->driver->domainFSThaw) { + int ret = dom->conn->driver->domainFSThaw(dom, flags); + if (ret < 0) + goto error; + return ret; + } + + virReportUnsupportedError(); + +error: + virDispatchError(dom->conn); + return -1; +} diff --git a/src/libvirt_public.syms b/src/libvirt_public.syms index 6ed6ce6..9e49a9d 100644 --- a/src/libvirt_public.syms +++ b/src/libvirt_public.syms @@ -645,5 +645,10 @@ LIBVIRT_1.2.1 { virConnectNetworkEventDeregisterAny; } LIBVIRT_1.1.3; +LIBVIRT_1.2.3 { + global: + virDomainFSFreeze; + virDomainFSThaw; +} LIBVIRT_1.2.1; # .... define new API here using predicted next version number ....

1 0

[libvirt] [RFC][PATCH 0/2] Fix zero cpu shares handling
by Ján Tomko 06 Mar '14

06 Mar '14

Hello, This series tries to fix the behavior of <cputune><shares>0</shares></cputune> (means default shares of 1024) and virsh schedinfo --set cpu_shares=0 (means minimum of 2) If 0 was explicitly specified, treat it as a valid value (which will get converted to 2 by the kernel) Re-read the shares value to reflect the cpu shares in live XML. In v1, I've tried to change the schedinfo behavior instead, but I have not found a way to reset the value to the kernel default (which is currently 1024 - see ROOT_TASK_GROUP_LOAD in kernel/sched/sched.h in Linux source) other than writing it to the cgroup fs. Partially fixes https://bugzilla.redhat.com/show_bug.cgi?id=998431 Ján Tomko (2): Treat zero cpu shares as a valid value Show the real cpu shares value in live xml src/conf/domain_conf.c | 12 +++++++----- src/conf/domain_conf.h | 1 + src/lxc/lxc_cgroup.c | 13 ++++++++++--- src/lxc/lxc_driver.c | 8 +++++++- src/lxc/lxc_native.c | 8 +++++--- src/qemu/qemu_cgroup.c | 12 +++++++++--- src/qemu/qemu_driver.c | 13 +++++++++++-- src/vmx/vmx.c | 1 + 8 files changed, 51 insertions(+), 17 deletions(-) -- 1.8.3.2

2 7

[libvirt] [PATCH v2] qemu: Reject unsupported tuning in session mode
by Martin Kletzander 06 Mar '14

06 Mar '14

When domain is started with setting that cannot be done, i.e. those that require cgroups, there is no error reported and it succeeds without any message whatsoever. When setting with API, virsh, an error is reported, but only due to the fact that no cgroups are mounted (priv->cgroup == NULL). Given the above it seems reasonable to reject such unsupported settings. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1023366 Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- Notes: v2: - Allow CPU pinning since setting affinity should still work. - Remove bogus 'cfg = ...' in SetBlockIoTune. src/qemu/qemu_command.c | 26 ++++++++++++++++++ src/qemu/qemu_driver.c | 73 ++++++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 98 insertions(+), 1 deletion(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 18d0a64..611d21d 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -7762,6 +7762,32 @@ qemuBuildCommandLine(virConnectPtr conn, emulator = def->emulator; + if (!cfg->privileged) { + /* If we have no cgroups than we can have no tunings that + * require them */ + + if (def->mem.hard_limit || def->mem.soft_limit || + def->mem.min_guarantee || def->mem.swap_hard_limit) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("Memory tuning is not available in session mode")); + goto error; + } + + if (def->blkio.weight || def->blkio.ndevices) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("Block I/O tuning is not available in session mode")); + goto error; + } + + if (def->cputune.shares || def->cputune.period || + def->cputune.quota || def->cputune.emulator_period || + def->cputune.emulator_quota) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("CPU tuning is not available in session mode")); + goto error; + } + } + for (i = 0; i < def->ngraphics; ++i) { switch (def->graphics[i]->type) { case VIR_DOMAIN_GRAPHICS_TYPE_SDL: diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 4fbcb27..1e50572 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -7434,6 +7434,8 @@ static char *qemuDomainGetSchedulerType(virDomainPtr dom, char *ret = NULL; virDomainObjPtr vm = NULL; qemuDomainObjPrivatePtr priv; + virQEMUDriverPtr driver = dom->conn->privateData; + virQEMUDriverConfigPtr cfg = NULL; if (!(vm = qemuDomObjFromDomain(dom))) goto cleanup; @@ -7443,6 +7445,13 @@ static char *qemuDomainGetSchedulerType(virDomainPtr dom, if (virDomainGetSchedulerTypeEnsureACL(dom->conn, vm->def) < 0) goto cleanup; + cfg = virQEMUDriverGetConfig(driver); + if (!cfg->privileged) { + virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s", + _("CPU tuning is not available in session mode")); + goto cleanup; + } + /* Domain not running, thus no cgroups - return defaults */ if (!virDomainObjIsActive(vm)) { if (nparams) @@ -7469,6 +7478,7 @@ static char *qemuDomainGetSchedulerType(virDomainPtr dom, cleanup: if (vm) virObjectUnlock(vm); + virObjectUnref(cfg); return ret; } @@ -7683,6 +7693,12 @@ qemuDomainSetBlkioParameters(virDomainPtr dom, if (virDomainSetBlkioParametersEnsureACL(dom->conn, vm->def, flags) < 0) goto cleanup; + if (!cfg->privileged) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("Block I/O tuning is not available in session mode")); + goto cleanup; + } + if (!(caps = virQEMUDriverGetCapabilities(driver, false))) goto cleanup; @@ -7863,6 +7879,7 @@ qemuDomainGetBlkioParameters(virDomainPtr dom, int ret = -1; virCapsPtr caps = NULL; qemuDomainObjPrivatePtr priv; + virQEMUDriverConfigPtr cfg = NULL; virCheckFlags(VIR_DOMAIN_AFFECT_LIVE | VIR_DOMAIN_AFFECT_CONFIG | @@ -7881,6 +7898,13 @@ qemuDomainGetBlkioParameters(virDomainPtr dom, if (virDomainGetBlkioParametersEnsureACL(dom->conn, vm->def) < 0) goto cleanup; + cfg = virQEMUDriverGetConfig(driver); + if (!cfg->privileged) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("Block I/O tuning is not available in session mode")); + goto cleanup; + } + if (!(caps = virQEMUDriverGetCapabilities(driver, false))) goto cleanup; @@ -8269,6 +8293,7 @@ cleanup: if (vm) virObjectUnlock(vm); virObjectUnref(caps); + virObjectUnref(cfg); return ret; } @@ -8316,6 +8341,12 @@ qemuDomainSetMemoryParameters(virDomainPtr dom, if (virDomainSetMemoryParametersEnsureACL(dom->conn, vm->def, flags) < 0) goto cleanup; + if (!cfg->privileged) { + virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s", + _("Memory tuning is not available in session mode")); + goto cleanup; + } + if (!(caps = virQEMUDriverGetCapabilities(driver, false))) goto cleanup; @@ -8423,6 +8454,7 @@ qemuDomainGetMemoryParameters(virDomainPtr dom, int ret = -1; virCapsPtr caps = NULL; qemuDomainObjPrivatePtr priv; + virQEMUDriverConfigPtr cfg = NULL; virCheckFlags(VIR_DOMAIN_AFFECT_LIVE | VIR_DOMAIN_AFFECT_CONFIG | @@ -8439,6 +8471,13 @@ qemuDomainGetMemoryParameters(virDomainPtr dom, if (virDomainGetMemoryParametersEnsureACL(dom->conn, vm->def) < 0) goto cleanup; + cfg = virQEMUDriverGetConfig(driver); + if (!cfg->privileged) { + virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s", + _("Memory tuning is not available in session mode")); + goto cleanup; + } + if (!(caps = virQEMUDriverGetCapabilities(driver, false))) goto cleanup; @@ -8550,6 +8589,7 @@ cleanup: if (vm) virObjectUnlock(vm); virObjectUnref(caps); + virObjectUnref(cfg); return ret; } @@ -8975,6 +9015,13 @@ qemuDomainSetSchedulerParametersFlags(virDomainPtr dom, if (virDomainSetSchedulerParametersFlagsEnsureACL(dom->conn, vm->def, flags) < 0) goto cleanup; + cfg = virQEMUDriverGetConfig(driver); + if (!cfg->privileged) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("CPU tuning is not available in session mode")); + goto cleanup; + } + if (!(caps = virQEMUDriverGetCapabilities(driver, false))) goto cleanup; @@ -9210,6 +9257,7 @@ qemuDomainGetSchedulerParametersFlags(virDomainPtr dom, virDomainDefPtr persistentDef; virCapsPtr caps = NULL; qemuDomainObjPrivatePtr priv; + virQEMUDriverConfigPtr cfg = NULL; virCheckFlags(VIR_DOMAIN_AFFECT_LIVE | VIR_DOMAIN_AFFECT_CONFIG | @@ -9226,6 +9274,13 @@ qemuDomainGetSchedulerParametersFlags(virDomainPtr dom, if (virDomainGetSchedulerParametersFlagsEnsureACL(dom->conn, vm->def) < 0) goto cleanup; + cfg = virQEMUDriverGetConfig(driver); + if (!cfg->privileged) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("CPU tuning is not available in session mode")); + goto cleanup; + } + if (*nparams > 1) cpu_bw_status = virCgroupSupportsCpuBW(priv->cgroup); @@ -9320,6 +9375,7 @@ cleanup: if (vm) virObjectUnlock(vm); virObjectUnref(caps); + virObjectUnref(cfg); return ret; } @@ -15521,11 +15577,17 @@ qemuDomainSetBlockIoTune(virDomainPtr dom, if (virDomainSetBlockIoTuneEnsureACL(dom->conn, vm->def, flags) < 0) goto cleanup; + cfg = virQEMUDriverGetConfig(driver); + if (!cfg->privileged) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("Block I/O tuning is not available in session mode")); + goto cleanup; + } + if (qemuDomainObjBeginJob(driver, vm, QEMU_JOB_MODIFY) < 0) goto cleanup; priv = vm->privateData; - cfg = virQEMUDriverGetConfig(driver); if (!(caps = virQEMUDriverGetCapabilities(driver, false))) goto endjob; @@ -15668,6 +15730,7 @@ qemuDomainGetBlockIoTune(virDomainPtr dom, int ret = -1; size_t i; virCapsPtr caps = NULL; + virQEMUDriverConfigPtr cfg = NULL; virCheckFlags(VIR_DOMAIN_AFFECT_LIVE | VIR_DOMAIN_AFFECT_CONFIG | @@ -15682,6 +15745,13 @@ qemuDomainGetBlockIoTune(virDomainPtr dom, if (virDomainGetBlockIoTuneEnsureACL(dom->conn, vm->def) < 0) goto cleanup; + cfg = virQEMUDriverGetConfig(driver); + if (!cfg->privileged) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("Block I/O tuning is not available in session mode")); + goto cleanup; + } + if (!(caps = virQEMUDriverGetCapabilities(driver, false))) goto cleanup; @@ -15784,6 +15854,7 @@ cleanup: if (vm) virObjectUnlock(vm); virObjectUnref(caps); + virObjectUnref(cfg); return ret; } -- 1.9.0

2 4

[libvirt] virDomainShutdown() API failed with error '-1'
by Panday Ritesh Sharma (rpanday) 06 Mar '14

06 Mar '14

Hi Team, We are calling virDomainShutdown() API for shutting the VM. Sometime we see, this API is failing because of 'unknown' reason. It took almost 15 secs to bringdown the VM and at last failed. And the domain goes into shut off state. You can find the time stamp in below log. Could you please let us know in which case this API can fail, how to fix/debug this issue ? We are running 1.0.2 libvirtd version. =========== 20.53.48.532818176: Shuting down domain... 20.54.03.539286528: Failure of libvirt library call: Code: internal error Context: None Message: An error occurred, but the cause is unknown Level: ERROR 20.54.03.539291392: virDomainShutdown() call returned error -1 for CP—3 ============ =========== [host:/var/log/libvirt/qemu]$ virsh list --all Id Name State ---------------------------------------------------- - CP--3 shut off =========== ============ [host:/var/log/libvirt/qemu]$ [host:/var/log/libvirt/qemu]$ libvirtd --version libvirtd (libvirt) 1.0.2 [host:/var/log/libvirt/qemu]$ ============ Regards Ritesh Sharma

1 0

[libvirt] [PATCH 0/4] Add caching of QEMU probed capabilities
by Daniel P. Berrange 06 Mar '14

06 Mar '14

Probing capabilities takes 200-300ms per binary and we have as many as 26 binaries. This noticably slows down libvirtd startup. It does not look like performance of probing QEMU can be improved, so this series introduces caching of the capabilities information. So the first time libvirtd starts it'll be slow, but thereafter it is fast. The cache is invalidated any time the QEMU binary timestamp changes or the libvirtd binary or driver module timestamp changes. Daniel P. Berrange (4): Add helper APIs for generating cryptographic hashes Convert lock driver plugins to use new crypto APIs Cache result of QEMU capabilities extraction Refresh qemu capabilities if libvirtd binary changes .gitignore | 1 + daemon/libvirtd.c | 2 + include/libvirt/virterror.h | 1 + po/POTFILES.in | 1 + src/Makefile.am | 1 + src/driver.c | 2 + src/libvirt_private.syms | 6 + src/locking/lock_driver_lockd.c | 32 +-- src/locking/lock_driver_sanlock.c | 42 +--- src/qemu/qemu_capabilities.c | 418 +++++++++++++++++++++++++++++++++++++- src/qemu/qemu_capabilities.h | 2 + src/qemu/qemu_driver.c | 1 + src/util/vircrypto.c | 80 ++++++++ src/util/vircrypto.h | 40 ++++ src/util/virerror.c | 1 + src/util/virutil.c | 23 +++ src/util/virutil.h | 4 + tests/Makefile.am | 5 + tests/vircryptotest.c | 90 ++++++++ 19 files changed, 682 insertions(+), 70 deletions(-) create mode 100644 src/util/vircrypto.c create mode 100644 src/util/vircrypto.h create mode 100644 tests/vircryptotest.c -- 1.8.5.3

3 12