- Devel - libvirt List Archives

[libvirt] [PATCH] Fix handling of DBus errors emitted by the bus itself
by Daniel P. Berrange 24 Jul '13

24 Jul '13

From: "Daniel P. Berrange" <berrange(a)redhat.com> Current code for handling dbus errors only works for errors received from the remote application itself. We must also handle errors emitted by the bus itself, for example, when it fails to spawn the target service. Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- src/util/virdbus.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/util/virdbus.c b/src/util/virdbus.c index ee99f7f..e3d172e 100644 --- a/src/util/virdbus.c +++ b/src/util/virdbus.c @@ -1129,9 +1129,8 @@ int virDBusCallMethod(DBusConnection *conn, call, VIR_DBUS_METHOD_CALL_TIMEOUT_MILLIS, &error))) { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("Cannot send to %s.%s on path %s with interface %s: %s"), - destination, member, path, interface, NULLSTR(error.message)); + virReportDBusServiceError(error.message ? error.message : "unknown error", + error.name); goto cleanup; } -- 1.8.1.4

2 1

[libvirt] KVM Forum 2013 Call for Participation - Extended to August 4th
by Anthony Liguori 24 Jul '13

24 Jul '13

We have received numerous requests to extend the CFP deadline and so we are happy to announce that the CFP deadline has been moved by two weeks to August 4th. ================================================================= KVM Forum 2013: Call For Participation October 21-23, 2013 - Edinburgh International Conference Centre - Edinburgh, UK (All submissions must be received before midnight July 21, 2013) ================================================================= KVM is an industry leading open source hypervisor that provides an ideal platform for datacenter virtualization, virtual desktop infrastructure, and cloud computing. Once again, it's time to bring together the community of developers and users that define the KVM ecosystem for our annual technical conference. We will discuss the current state of affairs and plan for the future of KVM, its surrounding infrastructure, and management tools. The oVirt Workshop will run in parallel with the KVM Forum again, bringing in a community focused on enterprise datacenter virtualization management built on KVM. For topics which overlap we will have shared sessions. So mark your calendar and join us in advancing KVM. http://events.linuxfoundation.org/events/kvm-forum/ Once again we are colocated with The Linux Foundation's LinuxCon Europe. KVM Forum attendees will be able to attend oVirt Workshop sessions and are eligible to attend LinuxCon Europe for a discounted rate. http://events.linuxfoundation.org/events/kvm-forum/register We invite you to lead part of the discussion by submitting a speaking proposal for KVM Forum 2013. http://events.linuxfoundation.org/cfp Suggested topics: KVM/Kernel - Scaling and performance - Nested virtualization - I/O improvements - VFIO, device assignment, SR-IOV - Driver domains - Time keeping - Resource management (cpu, memory, i/o) - Memory management (page sharing, swapping, huge pages, etc) - Network virtualization - Security - Architecture ports QEMU - Device model improvements - New devices and chipsets - Scaling and performance - Desktop virtualization - Spice - Increasing robustness and hardening - Security model - Management interfaces - QMP protocol and implementation - Image formats - Firmware (SeaBIOS, OVMF, UEFI, etc) - Live migration - Live snapshots and merging - Fault tolerance, high availability, continuous backup - Real-time guest support Virtio - Speeding up existing devices - Alternatives - Virtio on non-Linux or non-virtualized Management infrastructure - oVirt (shared track w/ oVirt Workshop) - Libvirt - KVM autotest - OpenStack - Network virtualization management - Enterprise storage management Cloud computing - Scalable storage - Virtual networking - Security - Provisioning SUBMISSION REQUIREMENTS Abstracts due: July 21, 2013 Notification: August 1, 2013 Please submit a short abstract (~150 words) describing your presentation proposal. In your submission please note how long your talk will take. Slots vary in length up to 45 minutes. Also include in your proposal the proposal type -- one of: - technical talk - end-user talk - birds of a feather (BOF) session Submit your proposal here: http://events.linuxfoundation.org/cfp You will receive a notification whether or not your presentation proposal was accepted by Aug 1st. END-USER COLLABORATION One of the big challenges as developers is to know what, where and how people actually use our software. We will reserve a few slots for end users talking about their deployment challenges and achievements. If you are using KVM in production you are encouraged submit a speaking proposal. Simply mark it as an end-user collaboration proposal. As an end user, this is a unique opportunity to get your input to developers. BOF SESSION We will reserve some slots in the evening after the main conference tracks, for birds of a feather (BOF) sessions. These sessions will be less formal than presentation tracks and targetted for people who would like to discuss specific issues with other developers and/or users. If you are interested in getting developers and/or uses together to discuss a specific problem, please submit a BOF proposal. HOTEL / TRAVEL The KVM Forum 2013 will be held in Edinburgh, UK at the Edinburgh International Conference Centre. http://events.linuxfoundation.org/events/kvm-forum/hotel Thank you for your interest in KVM. We're looking forward to your submissions and seeing you at the KVM Forum 2013 in October! Thanks, -your KVM Forum 2013 Program Committee Please contact us with any questions or comments. KVM-Forum-2013-PC(a)redhat.com

1 0

[libvirt] [PATCH] qemu: Take error path if acquiring of job fails in qemuDomainSaveInternal
by Peter Krempa 24 Jul '13

24 Jul '13

Due to a goto statement missed when refactoring in 2771f8b74c1bf50d1fa when acquiring of a domain job failed the error path was not taken. This resulted into a crash afterwards as a extra reference was removed from a domain object leading to it being freed. An attempt to list the domains afterwards leaded to a crash of the daemon afterwards. https://bugzilla.redhat.com/show_bug.cgi?id=928672 --- Sorry for breaking that in the first place :/ src/qemu/qemu_driver.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 0af76a5..96f87cd 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -2987,8 +2987,8 @@ qemuDomainSaveInternal(virQEMUDriverPtr driver, virDomainPtr dom, if (!qemuMigrationIsAllowed(driver, vm, vm->def, false, false)) goto cleanup; - if (qemuDomainObjBeginAsyncJob(driver, vm, - QEMU_ASYNC_JOB_SAVE) < 0) + if (qemuDomainObjBeginAsyncJob(driver, vm, QEMU_ASYNC_JOB_SAVE) < 0) + goto cleanup; memset(&priv->job.info, 0, sizeof(priv->job.info)); priv->job.info.type = VIR_DOMAIN_JOB_UNBOUNDED; -- 1.8.3.2

2 2

[libvirt] [PATCH] build: fix make rpm failure
by Laine Stump 23 Jul '13

23 Jul '13

util/virdbuspriv.h needed to be added to UTIL_SOURCES in the makefile. --- Pushed under build breaker rule. src/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Makefile.am b/src/Makefile.am index 0eb3cb5..84372cb 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -86,7 +86,7 @@ UTIL_SOURCES = \ util/virclosecallbacks.c util/virclosecallbacks.h \ util/vircommand.c util/vircommand.h \ util/virconf.c util/virconf.h \ - util/virdbus.c util/virdbus.h \ + util/virdbus.c util/virdbus.h util/virdbuspriv.h \ util/virdnsmasq.c util/virdnsmasq.h \ util/virebtables.c util/virebtables.h \ util/virendian.h \ -- 1.7.11.7

1 0

[libvirt] [PATCH] bridge driver: use more general function names
by Roman Bogorodskiy 23 Jul '13

23 Jul '13

Continue preparation for extracting platform-specific parts from bridge_driver: s/Iptables/Firewall/ for firewall related function names. --- src/network/bridge_driver.c | 70 ++++++++++++++++++++++----------------------- 1 file changed, 35 insertions(+), 35 deletions(-) diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c index 8b50659..0bb57ea 100644 --- a/src/network/bridge_driver.c +++ b/src/network/bridge_driver.c @@ -116,7 +116,7 @@ static int networkStartNetworkExternal(virNetworkDriverStatePtr driver, static int networkShutdownNetworkExternal(virNetworkDriverStatePtr driver, virNetworkObjPtr network); -static void networkReloadIptablesRules(virNetworkDriverStatePtr driver); +static void networkReloadFirewallRules(virNetworkDriverStatePtr driver); static void networkRefreshDaemons(virNetworkDriverStatePtr driver); static int networkPlugBandwidth(virNetworkObjPtr net, @@ -337,7 +337,7 @@ firewalld_dbus_filter_bridge(DBusConnection *connection ATTRIBUTE_UNUSED, "Reloaded")) { VIR_DEBUG("Reload in bridge_driver because of firewalld."); - networkReloadIptablesRules(_driverState); + networkReloadFirewallRules(_driverState); } return DBUS_HANDLER_RESULT_NOT_YET_HANDLED; @@ -428,7 +428,7 @@ networkStateInitialize(bool privileged, goto error; networkFindActiveConfigs(driverState); - networkReloadIptablesRules(driverState); + networkReloadFirewallRules(driverState); networkRefreshDaemons(driverState); networkAutostartConfigs(driverState); @@ -490,7 +490,7 @@ networkStateReload(void) { virNetworkLoadAllConfigs(&driverState->networks, driverState->networkConfigDir, driverState->networkAutostartDir); - networkReloadIptablesRules(driverState); + networkReloadFirewallRules(driverState); networkRefreshDaemons(driverState); networkAutostartConfigs(driverState); networkDriverUnlock(driverState); @@ -1508,7 +1508,7 @@ networkRefreshDaemons(virNetworkDriverStatePtr driver) } static int -networkAddMasqueradingIptablesRules(virNetworkObjPtr network, +networkAddMasqueradingFirewallRules(virNetworkObjPtr network, virNetworkIpDefPtr ipdef) { int prefix = virNetworkIpDefPrefix(ipdef); @@ -1650,7 +1650,7 @@ networkAddMasqueradingIptablesRules(virNetworkObjPtr network, } static void -networkRemoveMasqueradingIptablesRules(virNetworkObjPtr network, +networkRemoveMasqueradingFirewallRules(virNetworkObjPtr network, virNetworkIpDefPtr ipdef) { int prefix = virNetworkIpDefPrefix(ipdef); @@ -1688,7 +1688,7 @@ networkRemoveMasqueradingIptablesRules(virNetworkObjPtr network, } static int -networkAddRoutingIptablesRules(virNetworkObjPtr network, +networkAddRoutingFirewallRules(virNetworkObjPtr network, virNetworkIpDefPtr ipdef) { int prefix = virNetworkIpDefPrefix(ipdef); @@ -1735,7 +1735,7 @@ routeerr1: } static void -networkRemoveRoutingIptablesRules(virNetworkObjPtr network, +networkRemoveRoutingFirewallRules(virNetworkObjPtr network, virNetworkIpDefPtr ipdef) { int prefix = virNetworkIpDefPrefix(ipdef); @@ -1857,7 +1857,7 @@ networkRemoveGeneralIp6tablesRules(virNetworkObjPtr network) } static int -networkAddGeneralIptablesRules(virNetworkObjPtr network) +networkAddGeneralFirewallRules(virNetworkObjPtr network) { size_t i; virNetworkIpDefPtr ipv4def; @@ -1979,7 +1979,7 @@ err1: } static void -networkRemoveGeneralIptablesRules(virNetworkObjPtr network) +networkRemoveGeneralFirewallRules(virNetworkObjPtr network) { size_t i; virNetworkIpDefPtr ipv4def; @@ -2009,7 +2009,7 @@ networkRemoveGeneralIptablesRules(virNetworkObjPtr network) } static int -networkAddIpSpecificIptablesRules(virNetworkObjPtr network, +networkAddIpSpecificFirewallRules(virNetworkObjPtr network, virNetworkIpDefPtr ipdef) { /* NB: in the case of IPv6, routing rules are added when the @@ -2018,46 +2018,46 @@ networkAddIpSpecificIptablesRules(virNetworkObjPtr network, if (network->def->forward.type == VIR_NETWORK_FORWARD_NAT) { if (VIR_SOCKET_ADDR_IS_FAMILY(&ipdef->address, AF_INET)) - return networkAddMasqueradingIptablesRules(network, ipdef); + return networkAddMasqueradingFirewallRules(network, ipdef); else if (VIR_SOCKET_ADDR_IS_FAMILY(&ipdef->address, AF_INET6)) - return networkAddRoutingIptablesRules(network, ipdef); + return networkAddRoutingFirewallRules(network, ipdef); } else if (network->def->forward.type == VIR_NETWORK_FORWARD_ROUTE) { - return networkAddRoutingIptablesRules(network, ipdef); + return networkAddRoutingFirewallRules(network, ipdef); } return 0; } static void -networkRemoveIpSpecificIptablesRules(virNetworkObjPtr network, +networkRemoveIpSpecificFirewallRules(virNetworkObjPtr network, virNetworkIpDefPtr ipdef) { if (network->def->forward.type == VIR_NETWORK_FORWARD_NAT) { if (VIR_SOCKET_ADDR_IS_FAMILY(&ipdef->address, AF_INET)) - networkRemoveMasqueradingIptablesRules(network, ipdef); + networkRemoveMasqueradingFirewallRules(network, ipdef); else if (VIR_SOCKET_ADDR_IS_FAMILY(&ipdef->address, AF_INET6)) - networkRemoveRoutingIptablesRules(network, ipdef); + networkRemoveRoutingFirewallRules(network, ipdef); } else if (network->def->forward.type == VIR_NETWORK_FORWARD_ROUTE) { - networkRemoveRoutingIptablesRules(network, ipdef); + networkRemoveRoutingFirewallRules(network, ipdef); } } /* Add all rules for all ip addresses (and general rules) on a network */ static int -networkAddIptablesRules(virNetworkObjPtr network) +networkAddFirewallRules(virNetworkObjPtr network) { size_t i, j; virNetworkIpDefPtr ipdef; virErrorPtr orig_error; /* Add "once per network" rules */ - if (networkAddGeneralIptablesRules(network) < 0) + if (networkAddGeneralFirewallRules(network) < 0) return -1; for (i = 0; (ipdef = virNetworkDefGetIpByIndex(network->def, AF_UNSPEC, i)); i++) { /* Add address-specific iptables rules */ - if (networkAddIpSpecificIptablesRules(network, ipdef) < 0) { + if (networkAddIpSpecificFirewallRules(network, ipdef) < 0) { goto err; } } @@ -2067,15 +2067,15 @@ err: /* store the previous error message before attempting removal of rules */ orig_error = virSaveLastError(); - /* The final failed call to networkAddIpSpecificIptablesRules will + /* The final failed call to networkAddIpSpecificFirewallRules will * have removed any rules it created, but we need to remove those * added for previous IP addresses. */ for (j = 0; j < i; j++) { if ((ipdef = virNetworkDefGetIpByIndex(network->def, AF_UNSPEC, j))) - networkRemoveIpSpecificIptablesRules(network, ipdef); + networkRemoveIpSpecificFirewallRules(network, ipdef); } - networkRemoveGeneralIptablesRules(network); + networkRemoveGeneralFirewallRules(network); /* return the original error */ virSetError(orig_error); @@ -2085,7 +2085,7 @@ err: /* Remove all rules for all ip addresses (and general rules) on a network */ static void -networkRemoveIptablesRules(virNetworkObjPtr network) +networkRemoveFirewallRules(virNetworkObjPtr network) { size_t i; virNetworkIpDefPtr ipdef; @@ -2093,13 +2093,13 @@ networkRemoveIptablesRules(virNetworkObjPtr network) for (i = 0; (ipdef = virNetworkDefGetIpByIndex(network->def, AF_UNSPEC, i)); i++) { - networkRemoveIpSpecificIptablesRules(network, ipdef); + networkRemoveIpSpecificFirewallRules(network, ipdef); } - networkRemoveGeneralIptablesRules(network); + networkRemoveGeneralFirewallRules(network); } static void -networkReloadIptablesRules(virNetworkDriverStatePtr driver) +networkReloadFirewallRules(virNetworkDriverStatePtr driver) { size_t i; @@ -2116,8 +2116,8 @@ networkReloadIptablesRules(virNetworkDriverStatePtr driver) /* Only the three L3 network types that are configured by libvirt * need to have iptables rules reloaded. */ - networkRemoveIptablesRules(network); - if (networkAddIptablesRules(network) < 0) { + networkRemoveFirewallRules(network); + if (networkAddFirewallRules(network) < 0) { /* failed to add but already logged */ } } @@ -2436,7 +2436,7 @@ networkStartNetworkVirtual(virNetworkDriverStatePtr driver, goto err1; /* Add "once per network" rules */ - if (networkAddIptablesRules(network) < 0) + if (networkAddFirewallRules(network) < 0) goto err1; for (i = 0; @@ -2529,7 +2529,7 @@ networkStartNetworkVirtual(virNetworkDriverStatePtr driver, err2: if (!save_err) save_err = virSaveLastError(); - networkRemoveIptablesRules(network); + networkRemoveFirewallRules(network); err1: if (!save_err) @@ -2583,7 +2583,7 @@ static int networkShutdownNetworkVirtual(virNetworkDriverStatePtr driver ATTRIBU ignore_value(virNetDevSetOnline(network->def->bridge, 0)); - networkRemoveIptablesRules(network); + networkRemoveFirewallRules(network); ignore_value(virNetDevBridgeDelete(network->def->bridge)); @@ -3411,8 +3411,8 @@ networkUpdate(virNetworkPtr net, network->def->forward.type == VIR_NETWORK_FORWARD_NAT || network->def->forward.type == VIR_NETWORK_FORWARD_ROUTE)) { /* these could affect the iptables rules */ - networkRemoveIptablesRules(network); - if (networkAddIptablesRules(network) < 0) + networkRemoveFirewallRules(network); + if (networkAddFirewallRules(network) < 0) goto cleanup; } -- 1.8.1.4

3 2

[libvirt] [PATCH] Add virDBusMessage(Encode,Decode) stubs
by Roman Bogorodskiy 23 Jul '13

23 Jul '13

Commit 834c9c94 introduced virDBusMessageEncode and virDBusMessageDecode functions, however corresponding stubs were not added to !WITH_DBUS section, therefore 'make check' started to fail when compiled w/out dbus support like that: Expected symbol virDBusMessageDecode is not in ELF library --- src/util/virdbus.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/src/util/virdbus.c b/src/util/virdbus.c index ee99f7f..6221bdc 100644 --- a/src/util/virdbus.c +++ b/src/util/virdbus.c @@ -1222,4 +1222,22 @@ int virDBusMessageRead(DBusMessage *msg ATTRIBUTE_UNUSED, return -1; } +int virDBusMessageEncode(DBusMessage* msg ATTRIBUTE_UNUSED, + const char *types ATTRIBUTE_UNUSED, + ...) +{ + virReportError(VIR_ERR_INTERNAL_ERROR, + "%s", _("DBus support not compiled into this binary")); + return -1; +} + +int virDBusMessageDecode(DBusMessage* msg ATTRIBUTE_UNUSED, + const char *types ATTRIBUTE_UNUSED, + ...) +{ + virReportError(VIR_ERR_INTERNAL_ERROR, + "%s", _("DBus support not compiled into this binary")); + return -1; +} + #endif /* ! WITH_DBUS */ -- 1.8.1.4

3 2

[libvirt] [PATCH] Make locking more debuggable from logs
by Martin Kletzander 23 Jul '13

23 Jul '13

With this patch, there is new ./configure option '--enable-lock-debug' which controls whether we want to turn on debugging locks. This feature is exposed as a ./configure option due to its huge overhead in speed/log size and is only meant to be used with this in mind. It is designed in a way that even log from deadlocked daemon should provide enough info to find the deadlock itself. Every matching Lock() call can be matched with its Unlock() call and with every Lock() called it is visible whether it failed or not. Unlock() call follows the same output, even though unnecessary (the call cannot block). Lock logging is disabled while logging because that would either recurse or deadlock. Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- configure.ac | 19 +++++++++++++++ src/Makefile.am | 3 ++- src/libvirt_private.syms | 1 + src/util/virlog.c | 8 +++++++ src/util/virthread.h | 4 ++++ src/util/virthreadpthread.c | 58 ++++++++++++++++++++++++++++++++++++++++++++- src/util/virutil.c | 40 +++++++++++++++++++++++++++++++ src/util/virutil.h | 2 ++ 8 files changed, 133 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index b5af0d3..c63ffe7 100644 --- a/configure.ac +++ b/configure.ac @@ -478,6 +478,24 @@ if test x"$enable_debug" = x"yes"; then AC_DEFINE([ENABLE_DEBUG], [], [whether debugging is enabled]) fi +dnl --enable-lock-debug=(yes|no) +AC_ARG_ENABLE([lock-debug], + [AC_HELP_STRING([--enable-lock-debug=@<:@no|yes@:>@], + [enable lock debugging (beware of huge overhead) @<:@default=no@:>@])], + [],[enable_lock_debug=no]) +AM_CONDITIONAL([ENABLE_LOCK_DEBUG], test x"$enable_lock_debug" = x"yes") +if test x"$enable_lock_debug" = x"yes"; then + if test "$ac_cv_header_pthread_h" != "yes" ; then + AC_MSG_ERROR([POSIX threads are needed to properly debug locking]) + fi + if test x"$enable_debug" != x"yes" ; then + AC_MSG_ERROR([Cannot debug locking without enabling debugging itself]) + fi + + AC_DEFINE([ENABLE_LOCK_DEBUG], [], [whether lock debugging is enabled]) + LOCK_DEBUG_LDFLAGS="-rdynamic" +fi +AC_SUBST([LOCK_DEBUG_LDFLAGS]) dnl @@ -2601,6 +2619,7 @@ AC_MSG_NOTICE([]) AC_MSG_NOTICE([Miscellaneous]) AC_MSG_NOTICE([]) AC_MSG_NOTICE([ Debug: $enable_debug]) +AC_MSG_NOTICE([ Lock debug: $enable_lock_debug]) AC_MSG_NOTICE([ Use -Werror: $set_werror]) AC_MSG_NOTICE([ Warning Flags: $WARN_CFLAGS]) AC_MSG_NOTICE([ Readline: $lv_use_readline]) diff --git a/src/Makefile.am b/src/Makefile.am index 8fa8680..ef6aaa3 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -33,7 +33,8 @@ AM_CFLAGS = $(LIBXML_CFLAGS) \ $(WIN32_EXTRA_CFLAGS) \ $(COVERAGE_CFLAGS) AM_LDFLAGS = $(DRIVER_MODULE_LDFLAGS) \ - $(COVERAGE_LDFLAGS) + $(COVERAGE_LDFLAGS) \ + $(LOCK_DEBUG_LDFLAGS) EXTRA_DIST = $(conf_DATA) util/keymaps.csv diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 7790ede..44b4a60 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -2022,6 +2022,7 @@ virGetGroupID; virGetGroupList; virGetGroupName; virGetHostname; +virGetLockFunc; virGetUnprivSGIOSysfsPath; virGetUserCacheDirectory; virGetUserConfigDirectory; diff --git a/src/util/virlog.c b/src/util/virlog.c index d1fb0b3..8d1e943 100644 --- a/src/util/virlog.c +++ b/src/util/virlog.c @@ -150,14 +150,22 @@ virMutex virLogMutex; void virLogLock(void) { +#ifdef ENABLE_LOCK_DEBUG + virMutexLockNoLog(&virLogMutex); +#else virMutexLock(&virLogMutex); +#endif } void virLogUnlock(void) { +#ifdef ENABLE_LOCK_DEBUG + virMutexUnlockNoLog(&virLogMutex); +#else virMutexUnlock(&virLogMutex); +#endif } diff --git a/src/util/virthread.h b/src/util/virthread.h index 84d3bdc..6d86227 100644 --- a/src/util/virthread.h +++ b/src/util/virthread.h @@ -88,6 +88,10 @@ void virMutexDestroy(virMutexPtr m); void virMutexLock(virMutexPtr m); void virMutexUnlock(virMutexPtr m); +# ifdef ENABLE_LOCK_DEBUG +void virMutexLockNoLog(virMutexPtr m); +void virMutexUnlockNoLog(virMutexPtr m); +# endif int virCondInit(virCondPtr c) ATTRIBUTE_RETURN_CHECK; diff --git a/src/util/virthreadpthread.c b/src/util/virthreadpthread.c index ca841e4..95e20b5 100644 --- a/src/util/virthreadpthread.c +++ b/src/util/virthreadpthread.c @@ -29,6 +29,11 @@ #include "viralloc.h" +#ifdef ENABLE_LOCK_DEBUG +# include "virutil.h" +# include "virlog.h" +#endif + /* Nothing special required for pthreads */ int virThreadInitialize(void) @@ -81,7 +86,57 @@ void virMutexDestroy(virMutexPtr m) pthread_mutex_destroy(&m->lock); } -void virMutexLock(virMutexPtr m){ +#ifdef ENABLE_LOCK_DEBUG + +# define PRE_LOCK_PROC(mutex) \ + char *frame = virGetLockFrame(); \ + do { \ + if (frame) \ + VIR_DEBUG("lock=%p, frame=%s, state=request", \ + &mutex->lock, NULLSTR(frame)); \ + else \ + VIR_DEBUG("lock=%p, state=request", &mutex->lock); \ + } while (0) + +# define POST_LOCK_PROC(mutex) \ + do { \ + if (frame) { \ + VIR_DEBUG("lock=%p, frame=%s, state=done", \ + &mutex->lock, NULLSTR(frame)); \ + VIR_FREE(frame); \ + } else { \ + VIR_DEBUG("lock=%p, state=done", &mutex->lock); \ + } \ + } while (0) + +void virMutexLock(virMutexPtr m) +{ + PRE_LOCK_PROC(m); + virMutexLockNoLog(m); + POST_LOCK_PROC(m); +} + +void virMutexUnlock(virMutexPtr m) +{ + PRE_LOCK_PROC(m); + virMutexUnlockNoLog(m); + POST_LOCK_PROC(m); +} + +void virMutexLockNoLog(virMutexPtr m) +{ + pthread_mutex_lock(&m->lock); +} + +void virMutexUnlockNoLog(virMutexPtr m) +{ + pthread_mutex_unlock(&m->lock); +} + +#else /* ENABLE_LOCK_DEBUG */ + +void virMutexLock(virMutexPtr m) +{ pthread_mutex_lock(&m->lock); } @@ -90,6 +145,7 @@ void virMutexUnlock(virMutexPtr m) pthread_mutex_unlock(&m->lock); } +#endif /* ENABLE_LOCK_DEBUG */ int virCondInit(virCondPtr c) { diff --git a/src/util/virutil.c b/src/util/virutil.c index 0b54ef7..88b7984 100644 --- a/src/util/virutil.c +++ b/src/util/virutil.c @@ -40,6 +40,7 @@ #include <string.h> #include <termios.h> #include <locale.h> +#include <execinfo.h> #if HAVE_LIBDEVMAPPER_H # include <libdevmapper.h> @@ -2017,3 +2018,42 @@ virCompareLimitUlong(unsigned long long a, unsigned long b) return -1; } + + +/** + * virGetLockFrame: + * + * This function returns possibly the most relevant frame information + * from where a lock function was called. This info is obtained from + * a backtrace while going through the functions and filtering those + * which end with 'Lock'. + * + * We don't want to log anything from this method, not even an OOM + * Error, in case of any problems, just cleanup and return NULL. + */ +char * +virGetLockFrame(void) +{ + char **fnames = NULL; + char *out = NULL; + int i = 0; + int nframes = 0; + void *frames[100] = {0}; + + if (!(nframes = backtrace(frames, ARRAY_CARDINALITY(frames))) || + !(fnames = backtrace_symbols(frames, nframes))) + goto cleanup; + + for (i = 0; i < nframes; i++) { + if (!strstr(fnames[i], "Lock") && + !strstr(fnames[i], "Unlock") && + !strstr(fnames[i], "(+")) { + ignore_value(VIR_STRDUP_QUIET(out, fnames[i])); + break; + } + } + + cleanup: + VIR_FREE(fnames); + return out; +} diff --git a/src/util/virutil.h b/src/util/virutil.h index 0083c88..e385ae6 100644 --- a/src/util/virutil.h +++ b/src/util/virutil.h @@ -169,4 +169,6 @@ char *virFindFCHostCapableVport(const char *sysfs_prefix); int virCompareLimitUlong(unsigned long long a, unsigned long b); +char *virGetLockFrame(void); + #endif /* __VIR_UTIL_H__ */ -- 1.8.3.2

3 4

[libvirt] [PATCH] qemu:Delete sockets which act as UNIX domain socket server
by Wangyufei (A) 23 Jul '13

23 Jul '13

When I shutdown a vm, I found sockets which act as UNIX domain socket server were not deleted. When I add the following code, it work out. Signed-off-by: WangYufei <james.wangyufei(a)huawei.com<mailto:james.wangyufei@huawei.com>> --- src/qemu/qemu_process.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 3d5e8f6..e794f37 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -4086,6 +4086,13 @@ void qemuProcessStop(virQEMUDriverPtr driver, priv->monConfig = NULL; } + /* remove socket which acts as UNIX domain socket server */ + for (i = 0; i < vm->def->nchannels; i++) { + if ((vm->def->channels[i]->source.type == VIR_DOMAIN_CHR_TYPE_UNIX) && + vm->def->channels[i]->source.data.nix.listen) + unlink(vm->def->channels[i]->source.data.nix.path); + } + /* shut it off for sure */ ignore_value(qemuProcessKill(vm, VIR_QEMU_PROCESS_KILL_FORCE| -- 1.7.3.1.msysgit.0 Best Regards, -WangYufei

2 1

[libvirt] [PATCH] virsh: fix change-media bug on disk block type
by Guannan Ren 23 Jul '13

23 Jul '13

Resolves:https://bugzilla.redhat.com/show_bug.cgi?id=923053 When cdrom is block type, the virsh change-media failed to insert source info because virsh uses "<source block='/dev/sdb'/>" while the correct name of the attribute for block disks is "dev". --- tools/virsh-domain.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index 606bcdf..8cafce4 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -9866,8 +9866,10 @@ vshPrepareDiskXML(xmlNodePtr disk_node, if (source) { new_node = xmlNewNode(NULL, BAD_CAST "source"); - xmlNewProp(new_node, (const xmlChar *)disk_type, - (const xmlChar *)source); + if (STREQ(disk_type, "block")) + xmlNewProp(new_node, BAD_CAST "dev", BAD_CAST source); + else + xmlNewProp(new_node, BAD_CAST disk_type, BAD_CAST source); xmlAddChild(disk_node, new_node); } else if (type == VSH_PREPARE_DISK_XML_INSERT) { vshError(NULL, _("No source is specified for inserting media")); -- 1.8.3.1

2 2

[libvirt] [PATCH 0/2] Seclabel SIGSEGV issue
by Michal Privoznik 23 Jul '13

23 Jul '13

There's been a crasher reported just a few days ago: https://www.redhat.com/archives/libvirt-users/2013-July/msg00067.html I'm proposing two patches which I can't decide which one is better. Both fixes the problem, though. Opinions? Michal Privoznik (2): lxcCapsInit: Allocate primary security driver unconditionally virSecurityManagerGenLabel: Skip seclabels without model src/security/security_manager.c | 3 +++ 1 file changed, 3 insertions(+) -- 1.8.1.5

4 6