From: Marc-André Lureau <marcandre.lureau@redhat.com>
Date: Wed, 8 Apr 2020 17:23:48 +0000 (+0200)
Subject: qemu-dbus: prevent double start of the bus daemon
X-Git-Tag: v6.3.0-rc1~74
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a86094d6946b25dd593b5d36ba19b530a6d9afdc;p=thirdparty%2Flibvirt.git

qemu-dbus: prevent double start of the bus daemon

Allow calling qemuDBusStart() multiple times (as may be done by
qemu-slirp already).

Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
---

diff --git a/src/qemu/qemu_dbus.c b/src/qemu/qemu_dbus.c
index f3e6f3ee37..ae55bbb299 100644
--- a/src/qemu/qemu_dbus.c
+++ b/src/qemu/qemu_dbus.c
@@ -177,6 +177,9 @@ qemuDBusStart(virQEMUDriverPtr driver,
     pid_t cpid = -1;
     int ret = -1;
 
+    if (priv->dbusDaemonRunning)
+        return 0;
+
     if (!virFileIsExecutable(cfg->dbusDaemonName)) {
         virReportSystemError(errno,
                              _("'%s' is not a suitable dbus-daemon"),