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 09:23:42 -0700
commitc3b15b756cc63f1a9237beac2762428fbd6da9e7 (patch)
tree9973706f6e01a3b9191262ad096a8144c552ffb4
parent1f52418cc94fc464fbf7e52ad12850f893cd1a3f (diff)
downloadlibvirt-c3b15b756cc63f1a9237beac2762428fbd6da9e7.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 b8fc031909..b3b82b4890 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)
{