[libvirt] [PATCH] Add virDBusMessage(Encode,Decode) stubs

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

On Mon, Jul 22, 2013 at 02:32:49PM -0400, Roman Bogorodskiy wrote:
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 */
Ahh whoops. I was being too clever by assuming that my use of WITH_DBUS in the test code would take care of this, forgetting about the symbol file checks ACK Daniel -- |: http://berrange.com -o- http://www.flickr.com/photos/dberrange/ :| |: http://libvirt.org -o- http://virt-manager.org :| |: http://autobuild.org -o- http://search.cpan.org/~danberr/ :| |: http://entangle-photo.org -o- http://live.gnome.org/gtk-vnc :|

On 07/23/2013 12:15 PM, Daniel P. Berrange wrote:
On Mon, Jul 22, 2013 at 02:32:49PM -0400, Roman Bogorodskiy wrote:
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(+)
ACK
Now pushed. Jan
participants (3)
-
Daniel P. Berrange
-
Ján Tomko
-
Roman Bogorodskiy