From: Olaf Hering <olaf@aepfle.de>
Date: Thu, 29 Oct 2015 11:02:54 +0000 (+0000)
Subject: tools/hotplug: xendomains.service conflicts with libvirt
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~2312
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=b38a310f9f21d95f98d3cce915787c34cb5f727c;p=xen.git

tools/hotplug: xendomains.service conflicts with libvirt

xendomains will manage guests behind libvirts back:
- libvirt starts a guest
- that guest can be "managed" by libvirt and xl at the same time
- when xendomains runs on shutdown it will save the guest using xl
  libvirt does not know about this
- when xendomains runs on boot it will restore the saved guest using xl
  libvirt does not know about this, it will just fail to manage the
  restored guest

To prevent xendomains from interfering with libvirt add a Conflicts= to
xendomains.service. It will cause libvirt to be stopped if xendomains is
started manually with 'systemctl start'.

Signed-off-by: Olaf Hering <olaf@aepfle.de>
Cc: Ian Jackson <ian.jackson@eu.citrix.com>
Cc: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
Cc: Ian Campbell <ian.campbell@citrix.com>
Cc: Wei Liu <wei.liu2@citrix.com>
Acked-by: Wei Liu <wei.liu2@citrix.com>
---

diff --git a/tools/hotplug/Linux/systemd/xendomains.service.in b/tools/hotplug/Linux/systemd/xendomains.service.in
index 66e2065fcb..c7bfb61eb4 100644
--- a/tools/hotplug/Linux/systemd/xendomains.service.in
+++ b/tools/hotplug/Linux/systemd/xendomains.service.in
@@ -5,6 +5,7 @@ After=proc-xen.mount xenstored.service xenconsoled.service xen-init-dom0.service
 After=network-online.target
 After=remote-fs.target
 ConditionPathExists=/proc/xen/capabilities
+Conflicts=libvirtd.service
 
 [Service]
 Type=oneshot