On Tue, Nov 27, 2012 at 01:48:51PM -0500, Eric Blake wrote:
----- Original Message -----
From: Alexander Larsson <alexl@redhat.com>
This splits out some common code from virDBusGetSystemBus and uses it to implement a new virDBusGetSessionBus helper. --- src/libvirt_private.syms | 1 + src/util/virdbus.c | 84 ++++++++++++++++++++++++++++++++++++------------ src/util/virdbus.h | 1 + 3 files changed, 66 insertions(+), 20 deletions(-)
diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 63e187a..8d649bf 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -1336,6 +1336,7 @@ virConsoleOpen;
# virdbus.h virDBusGetSystemBus; +virDBusGetSessionBus;
Sorting (although I see 4/10 touches this again, and it doesn't affect bisection, so I won't oppose this going in as-is)
I'll fix this while applying
-static void virDBusSystemBusInit(void) +static DBusConnection *virDBusBusInit(DBusBusType type, DBusError *dbuserr)
Long line; should this be:
static DBusConnection* virDBusBusInit(DBusBusType type, DBusError *dbuserr)
Yep, wil fix
@@ -74,7 +83,7 @@ DBusConnection *virDBusGetSystemBus(void) if (!systembus) { virReportError(VIR_ERR_INTERNAL_ERROR, _("Unable to get DBus system bus connection: %s"), - dbuserr.message ? dbuserr.message : "watch setup failed"); + systemdbuserr.message ? systemdbuserr.message : "watch setup failed");
Worth wrapping this to avoid long lines?
Ok 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 :|