From nobody Thu May 2 21:52:53 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zoho.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 149823159059917.345910092551094; Fri, 23 Jun 2017 08:26:30 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 2BEC179705; Fri, 23 Jun 2017 15:26:26 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id F09EE6F9C4; Fri, 23 Jun 2017 15:26:25 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id A7587265; Fri, 23 Jun 2017 15:26:25 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id v5NFMvqw006915 for ; Fri, 23 Jun 2017 11:22:57 -0400 Received: by smtp.corp.redhat.com (Postfix) id 54852600C8; Fri, 23 Jun 2017 15:22:57 +0000 (UTC) Received: from t460.redhat.com (ovpn-117-186.ams2.redhat.com [10.36.117.186]) by smtp.corp.redhat.com (Postfix) with ESMTP id 36F0D60469; Fri, 23 Jun 2017 15:22:53 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 2BEC179705 Authentication-Results: ext-mx01.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx01.extmail.prod.ext.phx2.redhat.com; spf=pass smtp.mailfrom=libvir-list-bounces@redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com 2BEC179705 From: "Daniel P. Berrange" To: libvir-list@redhat.com Date: Fri, 23 Jun 2017 16:22:52 +0100 Message-Id: <20170623152252.17792-1-berrange@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH] Fix conditional check for DBus X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.25]); Fri, 23 Jun 2017 15:26:26 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" The DBus conditional was renamed way back: commit da77f04ed5fa0731d50b947be8c739bdbf8121ad Author: Daniel P. Berrange Date: Thu Sep 20 15:05:39 2012 +0100 Convert HAVE_DBUS to WITH_DBUS but the shutdown inhibit code was not updated. Thus libvirt was never inhibiting shutdown by a logged in user when VMs are running. Signed-off-by: Daniel P. Berrange --- daemon/libvirtd.c | 4 ++-- src/rpc/virnetdaemon.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/daemon/libvirtd.c b/daemon/libvirtd.c index db239f0..a558458 100644 --- a/daemon/libvirtd.c +++ b/daemon/libvirtd.c @@ -795,7 +795,7 @@ static void daemonInhibitCallback(bool inhibit, void *o= paque) } =20 =20 -#ifdef HAVE_DBUS +#ifdef WITH_DBUS static DBusConnection *sessionBus; static DBusConnection *systemBus; =20 @@ -887,7 +887,7 @@ static void daemonRunStateInit(void *opaque) =20 driversInitialized =3D true; =20 -#ifdef HAVE_DBUS +#ifdef WITH_DBUS /* Tie the non-privileged libvirtd to the session/shutdown lifecycle */ if (!virNetDaemonIsPrivileged(dmn)) { =20 diff --git a/src/rpc/virnetdaemon.c b/src/rpc/virnetdaemon.c index fabacf2..782417e 100644 --- a/src/rpc/virnetdaemon.c +++ b/src/rpc/virnetdaemon.c @@ -437,7 +437,7 @@ virNetDaemonAutoShutdown(virNetDaemonPtr dmn, } =20 =20 -#if defined(HAVE_DBUS) && defined(DBUS_TYPE_UNIX_FD) +#if defined(WITH_DBUS) && defined(DBUS_TYPE_UNIX_FD) static void virNetDaemonGotInhibitReply(DBusPendingCall *pending, void *opaque) @@ -529,7 +529,7 @@ virNetDaemonAddShutdownInhibition(virNetDaemonPtr dmn) =20 VIR_DEBUG("dmn=3D%p inhibitions=3D%zu", dmn, dmn->autoShutdownInhibiti= ons); =20 -#if defined(HAVE_DBUS) && defined(DBUS_TYPE_UNIX_FD) +#if defined(WITH_DBUS) && defined(DBUS_TYPE_UNIX_FD) if (dmn->autoShutdownInhibitions =3D=3D 1) virNetDaemonCallInhibit(dmn, "shutdown", --=20 2.9.3 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list