[Xen-changelog] [xen master] tools/hotplug: xendomains.service conflicts with libvirt

[patchbot@xxxxxxx]

commit b38a310f9f21d95f98d3cce915787c34cb5f727c
Author:     Olaf Hering <olaf@xxxxxxxxx>
AuthorDate: Thu Oct 29 11:02:54 2015 +0000
Commit:     Ian Campbell <ian.campbell@xxxxxxxxxx>
CommitDate: Tue Nov 3 16:37:05 2015 +0000

    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@xxxxxxxxx>
    Cc: Ian Jackson <ian.jackson@xxxxxxxxxxxxx>
    Cc: Stefano Stabellini <stefano.stabellini@xxxxxxxxxxxxx>
    Cc: Ian Campbell <ian.campbell@xxxxxxxxxx>
    Cc: Wei Liu <wei.liu2@xxxxxxxxxx>
    Acked-by: Wei Liu <wei.liu2@xxxxxxxxxx>
---
 tools/hotplug/Linux/systemd/xendomains.service.in |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/tools/hotplug/Linux/systemd/xendomains.service.in 
b/tools/hotplug/Linux/systemd/xendomains.service.in
index 66e2065..c7bfb61 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
--
generated by git-patchbot for /home/xen/git/xen.git#master

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog