From: Pavel Hrdina <phrdina@redhat.com>
Date: Wed, 9 Sep 2020 14:43:12 +0000 (+0200)
Subject: src/lxc/lxc_controller: convert to use GLib DBus
X-Git-Tag: v6.8.0-rc1~98
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bf50ada8c1d0f2c4b8881daaac01c52e155f40ad;p=thirdparty%2Flibvirt.git

src/lxc/lxc_controller: convert to use GLib DBus

Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
---

diff --git a/src/lxc/lxc_controller.c b/src/lxc/lxc_controller.c
index 37a28ac2f3..c3cf485e2c 100644
--- a/src/lxc/lxc_controller.c
+++ b/src/lxc/lxc_controller.c
@@ -54,13 +54,13 @@
 #include "virnetdevveth.h"
 #include "viralloc.h"
 #include "virfile.h"
+#include "virgdbus.h"
 #include "virpidfile.h"
 #include "vircommand.h"
 #include "virhostcpu.h"
 #include "virrandom.h"
 #include "virprocess.h"
 #include "virnuma.h"
-#include "virdbus.h"
 #include "rpc/virnetdaemon.h"
 #include "virstring.h"
 #include "virgettext.h"
@@ -2430,7 +2430,7 @@ virLXCControllerRun(virLXCControllerPtr ctrl)
      * of LXC instance, since dbus-daemon is limited to
      * only a few 100 connections by default
      */
-    virDBusCloseSystemBus();
+    virGDBusCloseSystemBus();
 
     rc = virLXCControllerMain(ctrl);
 
@@ -2612,7 +2612,7 @@ int main(int argc, char *argv[])
 
     virEventRegisterDefaultImpl();
 
-    virDBusSetSharedBus(false);
+    virGDBusSetSharedBus(false);
 
     if (!(ctrl = virLXCControllerNew(name)))
         goto cleanup;
diff --git a/src/lxc/meson.build b/src/lxc/meson.build
index 2810da7604..f8e2a8852a 100644
--- a/src/lxc/meson.build
+++ b/src/lxc/meson.build
@@ -139,7 +139,6 @@ if conf.has('WITH_LXC')
     'deps': [
       blkid_dep,
       capng_dep,
-      dbus_dep,
       fuse_dep,
       libnl_dep,
       rpc_dep,