summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCédric Bosdonnat <cbosdonnat@suse.com>2013-12-18 17:33:44 +0000
committerEric Blake <eblake@redhat.com>2014-12-23 13:12:26 -0700
commit60a353305072d8f2b62685a77d5dc8d44c0cb05c (patch)
treebc58e26e0d6d7d957b40db7bdfa3ccfe15213257
parentf424814d690c92a16a70f135900e5d3851eacead (diff)
downloadlibvirt-60a353305072d8f2b62685a77d5dc8d44c0cb05c.tar.gz
Fix crash in virsystemdtest with dbus 1.7.6
D-bus introduced some changes in its locking code. Overriding the init function skips the new locking init and thus crashes later in libvirt test. Removing the function makes the test pass again. (cherry picked from commit 5e397d9c0f2ce7d464f8e7e6a598d1c955dfc04a)
-rw-r--r--tests/virsystemdmock.c5
1 files changed, 0 insertions, 5 deletions
diff --git a/tests/virsystemdmock.c b/tests/virsystemdmock.c
index b6c36950f8..60908b9375 100644
--- a/tests/virsystemdmock.c
+++ b/tests/virsystemdmock.c
@@ -31,11 +31,6 @@ void dbus_connection_set_change_sigpipe(dbus_bool_t will_modify_sigpipe ATTRIBUT
{
}
-dbus_bool_t dbus_threads_init_default(void)
-{
- return 1;
-}
-
DBusConnection *dbus_bus_get(DBusBusType type ATTRIBUTE_UNUSED,
DBusError *error ATTRIBUTE_UNUSED)
{