commit fb0597574d01f56776676b2e48eb860ad7ad41a6
Author: Jim Fehlig <jfehlig@suse.com>
Date:   Wed Mar 6 17:43:21 2019 -0700

    libxl: Add implicit xenbus controller
    
    All Xen domains have a xenbus device. Implicitly add one if not
    already explicitly specified in the domain config.
    
    Signed-off-by: Jim Fehlig <jfehlig@suse.com>
    Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>

Index: libvirt-4.0.0/src/libxl/libxl_domain.c
===================================================================
--- libvirt-4.0.0.orig/src/libxl/libxl_domain.c
+++ libvirt-4.0.0/src/libxl/libxl_domain.c
@@ -414,6 +414,11 @@ libxlDomainDefPostParse(virDomainDefPtr
             def->features[VIR_DOMAIN_FEATURE_ACPI] = VIR_TRISTATE_SWITCH_ON;
     }
 
+    /* add implicit xenbus device */
+    if (virDomainControllerFindByType(def, VIR_DOMAIN_CONTROLLER_TYPE_XENBUS) == -1)
+        if (virDomainDefAddController(def, VIR_DOMAIN_CONTROLLER_TYPE_XENBUS, -1, -1) == NULL)
+            return -1;
+
     return 0;
 }
 
Index: libvirt-4.0.0/tests/sexpr2xmldata/sexpr2xml-boot-grub.xml
===================================================================
--- libvirt-4.0.0.orig/tests/sexpr2xmldata/sexpr2xml-boot-grub.xml
+++ libvirt-4.0.0/tests/sexpr2xmldata/sexpr2xml-boot-grub.xml
@@ -19,6 +19,7 @@
       <source dev='/dev/MainVG/GuestVG'/>
       <target dev='xvda' bus='xen'/>
     </disk>
+    <controller type='xenbus' index='0'/>
     <console type='pty'>
       <target type='xen' port='0'/>
     </console>
Index: libvirt-4.0.0/tests/sexpr2xmldata/sexpr2xml-bridge-ipaddr.xml
===================================================================
--- libvirt-4.0.0.orig/tests/sexpr2xmldata/sexpr2xml-bridge-ipaddr.xml
+++ libvirt-4.0.0/tests/sexpr2xmldata/sexpr2xml-bridge-ipaddr.xml
@@ -20,6 +20,7 @@
       <source file='/root/some.img'/>
       <target dev='xvda' bus='xen'/>
     </disk>
+    <controller type='xenbus' index='0'/>
     <interface type='bridge'>
       <mac address='00:11:22:33:44:55'/>
       <source bridge='xenbr2'/>
Index: libvirt-4.0.0/tests/sexpr2xmldata/sexpr2xml-curmem.xml
===================================================================
--- libvirt-4.0.0.orig/tests/sexpr2xmldata/sexpr2xml-curmem.xml
+++ libvirt-4.0.0/tests/sexpr2xmldata/sexpr2xml-curmem.xml
@@ -21,6 +21,7 @@
       <source file='/xen/rhel5.img'/>
       <target dev='xvda' bus='xen'/>
     </disk>
+    <controller type='xenbus' index='0'/>
     <interface type='bridge'>
       <mac address='00:16:3e:1d:06:15'/>
       <source bridge='xenbr0'/>
Index: libvirt-4.0.0/tests/sexpr2xmldata/sexpr2xml-disk-block-shareable.xml
===================================================================
--- libvirt-4.0.0.orig/tests/sexpr2xmldata/sexpr2xml-disk-block-shareable.xml
+++ libvirt-4.0.0/tests/sexpr2xmldata/sexpr2xml-disk-block-shareable.xml
@@ -19,6 +19,7 @@
       <target dev='xvda' bus='xen'/>
       <shareable/>
     </disk>
+    <controller type='xenbus' index='0'/>
     <interface type='bridge'>
       <mac address='00:16:3e:23:9e:eb'/>
       <source bridge='xenbr0'/>
Index: libvirt-4.0.0/tests/sexpr2xmldata/sexpr2xml-disk-block.xml
===================================================================
--- libvirt-4.0.0.orig/tests/sexpr2xmldata/sexpr2xml-disk-block.xml
+++ libvirt-4.0.0/tests/sexpr2xmldata/sexpr2xml-disk-block.xml
@@ -20,6 +20,7 @@
       <source dev='/dev/MainVG/GuestVG'/>
       <target dev='xvda' bus='xen'/>
     </disk>
+    <controller type='xenbus' index='0'/>
     <console type='pty'>
       <target type='xen' port='0'/>
     </console>
Index: libvirt-4.0.0/tests/sexpr2xmldata/sexpr2xml-disk-drv-blktap-qcow.xml
===================================================================
--- libvirt-4.0.0.orig/tests/sexpr2xmldata/sexpr2xml-disk-drv-blktap-qcow.xml
+++ libvirt-4.0.0/tests/sexpr2xmldata/sexpr2xml-disk-drv-blktap-qcow.xml
@@ -20,6 +20,7 @@
       <source file='/root/some.img'/>
       <target dev='xvda' bus='xen'/>
     </disk>
+    <controller type='xenbus' index='0'/>
     <console type='pty'>
       <target type='xen' port='0'/>
     </console>
Index: libvirt-4.0.0/tests/sexpr2xmldata/sexpr2xml-disk-drv-blktap-raw.xml
===================================================================
--- libvirt-4.0.0.orig/tests/sexpr2xmldata/sexpr2xml-disk-drv-blktap-raw.xml
+++ libvirt-4.0.0/tests/sexpr2xmldata/sexpr2xml-disk-drv-blktap-raw.xml
@@ -20,6 +20,7 @@
       <source file='/root/some.img'/>
       <target dev='xvda' bus='xen'/>
     </disk>
+    <controller type='xenbus' index='0'/>
     <console type='pty'>
       <target type='xen' port='0'/>
     </console>
Index: libvirt-4.0.0/tests/sexpr2xmldata/sexpr2xml-disk-drv-blktap2-raw.xml
===================================================================
--- libvirt-4.0.0.orig/tests/sexpr2xmldata/sexpr2xml-disk-drv-blktap2-raw.xml
+++ libvirt-4.0.0/tests/sexpr2xmldata/sexpr2xml-disk-drv-blktap2-raw.xml
@@ -20,6 +20,7 @@
       <source file='/root/some.img'/>
       <target dev='xvda' bus='xen'/>
     </disk>
+    <controller type='xenbus' index='0'/>
     <console type='pty'>
       <target type='xen' port='0'/>
     </console>
Index: libvirt-4.0.0/tests/sexpr2xmldata/sexpr2xml-disk-file.xml
===================================================================
--- libvirt-4.0.0.orig/tests/sexpr2xmldata/sexpr2xml-disk-file.xml
+++ libvirt-4.0.0/tests/sexpr2xmldata/sexpr2xml-disk-file.xml
@@ -20,6 +20,7 @@
       <source file='/root/some.img'/>
       <target dev='xvda' bus='xen'/>
     </disk>
+    <controller type='xenbus' index='0'/>
     <console type='pty'>
       <target type='xen' port='0'/>
     </console>
Index: libvirt-4.0.0/tests/sexpr2xmldata/sexpr2xml-fv-autoport.xml
===================================================================
--- libvirt-4.0.0.orig/tests/sexpr2xmldata/sexpr2xml-fv-autoport.xml
+++ libvirt-4.0.0/tests/sexpr2xmldata/sexpr2xml-fv-autoport.xml
@@ -31,6 +31,7 @@
       <readonly/>
       <address type='drive' controller='0' bus='1' target='0' unit='0'/>
     </disk>
+    <controller type='xenbus' index='0'/>
     <controller type='ide' index='0'/>
     <interface type='bridge'>
       <mac address='00:16:3e:1b:e8:18'/>
Index: libvirt-4.0.0/tests/sexpr2xmldata/sexpr2xml-fv-empty-kernel.xml
===================================================================
--- libvirt-4.0.0.orig/tests/sexpr2xmldata/sexpr2xml-fv-empty-kernel.xml
+++ libvirt-4.0.0/tests/sexpr2xmldata/sexpr2xml-fv-empty-kernel.xml
@@ -31,6 +31,7 @@
       <readonly/>
       <address type='drive' controller='0' bus='1' target='0' unit='0'/>
     </disk>
+    <controller type='xenbus' index='0'/>
     <controller type='ide' index='0'/>
     <interface type='bridge'>
       <mac address='00:16:3e:1b:b1:47'/>
Index: libvirt-4.0.0/tests/sexpr2xmldata/sexpr2xml-fv-force-hpet.xml
===================================================================
--- libvirt-4.0.0.orig/tests/sexpr2xmldata/sexpr2xml-fv-force-hpet.xml
+++ libvirt-4.0.0/tests/sexpr2xmldata/sexpr2xml-fv-force-hpet.xml
@@ -33,6 +33,7 @@
       <readonly/>
       <address type='drive' controller='0' bus='1' target='0' unit='0'/>
     </disk>
+    <controller type='xenbus' index='0'/>
     <controller type='ide' index='0'/>
     <interface type='bridge'>
       <mac address='00:16:3e:1b:b1:47'/>
Index: libvirt-4.0.0/tests/sexpr2xmldata/sexpr2xml-fv-force-nohpet.xml
===================================================================
--- libvirt-4.0.0.orig/tests/sexpr2xmldata/sexpr2xml-fv-force-nohpet.xml
+++ libvirt-4.0.0/tests/sexpr2xmldata/sexpr2xml-fv-force-nohpet.xml
@@ -33,6 +33,7 @@
       <readonly/>
       <address type='drive' controller='0' bus='1' target='0' unit='0'/>
     </disk>
+    <controller type='xenbus' index='0'/>
     <controller type='ide' index='0'/>
     <interface type='bridge'>
       <mac address='00:16:3e:1b:b1:47'/>
Index: libvirt-4.0.0/tests/sexpr2xmldata/sexpr2xml-fv-kernel.xml
===================================================================
--- libvirt-4.0.0.orig/tests/sexpr2xmldata/sexpr2xml-fv-kernel.xml
+++ libvirt-4.0.0/tests/sexpr2xmldata/sexpr2xml-fv-kernel.xml
@@ -21,6 +21,7 @@
       <source file='/root/some.img'/>
       <target dev='xvda' bus='xen'/>
     </disk>
+    <controller type='xenbus' index='0'/>
     <serial type='pty'>
       <target port='0'/>
     </serial>
Index: libvirt-4.0.0/tests/sexpr2xmldata/sexpr2xml-fv-localtime.xml
===================================================================
--- libvirt-4.0.0.orig/tests/sexpr2xmldata/sexpr2xml-fv-localtime.xml
+++ libvirt-4.0.0/tests/sexpr2xmldata/sexpr2xml-fv-localtime.xml
@@ -31,6 +31,7 @@
       <readonly/>
       <address type='drive' controller='0' bus='1' target='0' unit='0'/>
     </disk>
+    <controller type='xenbus' index='0'/>
     <controller type='ide' index='0'/>
     <interface type='bridge'>
       <mac address='00:16:3e:1b:b1:47'/>
Index: libvirt-4.0.0/tests/sexpr2xmldata/sexpr2xml-fv-net-netfront.xml
===================================================================
--- libvirt-4.0.0.orig/tests/sexpr2xmldata/sexpr2xml-fv-net-netfront.xml
+++ libvirt-4.0.0/tests/sexpr2xmldata/sexpr2xml-fv-net-netfront.xml
@@ -31,6 +31,7 @@
       <readonly/>
       <address type='drive' controller='0' bus='1' target='0' unit='0'/>
     </disk>
+    <controller type='xenbus' index='0'/>
     <controller type='ide' index='0'/>
     <interface type='bridge'>
       <mac address='00:16:3e:1b:b1:47'/>
Index: libvirt-4.0.0/tests/sexpr2xmldata/sexpr2xml-fv-parallel-tcp.xml
===================================================================
--- libvirt-4.0.0.orig/tests/sexpr2xmldata/sexpr2xml-fv-parallel-tcp.xml
+++ libvirt-4.0.0/tests/sexpr2xmldata/sexpr2xml-fv-parallel-tcp.xml
@@ -31,6 +31,7 @@
       <readonly/>
       <address type='drive' controller='0' bus='1' target='0' unit='0'/>
     </disk>
+    <controller type='xenbus' index='0'/>
     <controller type='ide' index='0'/>
     <interface type='bridge'>
       <mac address='00:16:3e:1b:b1:47'/>
Index: libvirt-4.0.0/tests/sexpr2xmldata/sexpr2xml-fv-serial-dev-2-ports.xml
===================================================================
--- libvirt-4.0.0.orig/tests/sexpr2xmldata/sexpr2xml-fv-serial-dev-2-ports.xml
+++ libvirt-4.0.0/tests/sexpr2xmldata/sexpr2xml-fv-serial-dev-2-ports.xml
@@ -31,6 +31,7 @@
       <readonly/>
       <address type='drive' controller='0' bus='1' target='0' unit='0'/>
     </disk>
+    <controller type='xenbus' index='0'/>
     <controller type='ide' index='0'/>
     <interface type='bridge'>
       <mac address='00:16:3e:1b:b1:47'/>
Index: libvirt-4.0.0/tests/sexpr2xmldata/sexpr2xml-fv-serial-dev-2nd-port.xml
===================================================================
--- libvirt-4.0.0.orig/tests/sexpr2xmldata/sexpr2xml-fv-serial-dev-2nd-port.xml
+++ libvirt-4.0.0/tests/sexpr2xmldata/sexpr2xml-fv-serial-dev-2nd-port.xml
@@ -31,6 +31,7 @@
       <readonly/>
       <address type='drive' controller='0' bus='1' target='0' unit='0'/>
     </disk>
+    <controller type='xenbus' index='0'/>
     <controller type='ide' index='0'/>
     <interface type='bridge'>
       <mac address='00:16:3e:1b:b1:47'/>
Index: libvirt-4.0.0/tests/sexpr2xmldata/sexpr2xml-fv-serial-file.xml
===================================================================
--- libvirt-4.0.0.orig/tests/sexpr2xmldata/sexpr2xml-fv-serial-file.xml
+++ libvirt-4.0.0/tests/sexpr2xmldata/sexpr2xml-fv-serial-file.xml
@@ -31,6 +31,7 @@
       <readonly/>
       <address type='drive' controller='0' bus='1' target='0' unit='0'/>
     </disk>
+    <controller type='xenbus' index='0'/>
     <controller type='ide' index='0'/>
     <interface type='bridge'>
       <mac address='00:16:3e:1b:b1:47'/>
Index: libvirt-4.0.0/tests/sexpr2xmldata/sexpr2xml-fv-serial-null.xml
===================================================================
--- libvirt-4.0.0.orig/tests/sexpr2xmldata/sexpr2xml-fv-serial-null.xml
+++ libvirt-4.0.0/tests/sexpr2xmldata/sexpr2xml-fv-serial-null.xml
@@ -31,6 +31,7 @@
       <readonly/>
       <address type='drive' controller='0' bus='1' target='0' unit='0'/>
     </disk>
+    <controller type='xenbus' index='0'/>
     <controller type='ide' index='0'/>
     <interface type='bridge'>
       <mac address='00:16:3e:1b:b1:47'/>
Index: libvirt-4.0.0/tests/sexpr2xmldata/sexpr2xml-fv-serial-pipe.xml
===================================================================
--- libvirt-4.0.0.orig/tests/sexpr2xmldata/sexpr2xml-fv-serial-pipe.xml
+++ libvirt-4.0.0/tests/sexpr2xmldata/sexpr2xml-fv-serial-pipe.xml
@@ -31,6 +31,7 @@
       <readonly/>
       <address type='drive' controller='0' bus='1' target='0' unit='0'/>
     </disk>
+    <controller type='xenbus' index='0'/>
     <controller type='ide' index='0'/>
     <interface type='bridge'>
       <mac address='00:16:3e:1b:b1:47'/>
Index: libvirt-4.0.0/tests/sexpr2xmldata/sexpr2xml-fv-serial-pty.xml
===================================================================
--- libvirt-4.0.0.orig/tests/sexpr2xmldata/sexpr2xml-fv-serial-pty.xml
+++ libvirt-4.0.0/tests/sexpr2xmldata/sexpr2xml-fv-serial-pty.xml
@@ -31,6 +31,7 @@
       <readonly/>
       <address type='drive' controller='0' bus='1' target='0' unit='0'/>
     </disk>
+    <controller type='xenbus' index='0'/>
     <controller type='ide' index='0'/>
     <interface type='bridge'>
       <mac address='00:16:3e:1b:b1:47'/>
Index: libvirt-4.0.0/tests/sexpr2xmldata/sexpr2xml-fv-serial-stdio.xml
===================================================================
--- libvirt-4.0.0.orig/tests/sexpr2xmldata/sexpr2xml-fv-serial-stdio.xml
+++ libvirt-4.0.0/tests/sexpr2xmldata/sexpr2xml-fv-serial-stdio.xml
@@ -31,6 +31,7 @@
       <readonly/>
       <address type='drive' controller='0' bus='1' target='0' unit='0'/>
     </disk>
+    <controller type='xenbus' index='0'/>
     <controller type='ide' index='0'/>
     <interface type='bridge'>
       <mac address='00:16:3e:1b:b1:47'/>
Index: libvirt-4.0.0/tests/sexpr2xmldata/sexpr2xml-fv-serial-tcp-telnet.xml
===================================================================
--- libvirt-4.0.0.orig/tests/sexpr2xmldata/sexpr2xml-fv-serial-tcp-telnet.xml
+++ libvirt-4.0.0/tests/sexpr2xmldata/sexpr2xml-fv-serial-tcp-telnet.xml
@@ -31,6 +31,7 @@
       <readonly/>
       <address type='drive' controller='0' bus='1' target='0' unit='0'/>
     </disk>
+    <controller type='xenbus' index='0'/>
     <controller type='ide' index='0'/>
     <interface type='bridge'>
       <mac address='00:16:3e:1b:b1:47'/>
Index: libvirt-4.0.0/tests/sexpr2xmldata/sexpr2xml-fv-serial-tcp.xml
===================================================================
--- libvirt-4.0.0.orig/tests/sexpr2xmldata/sexpr2xml-fv-serial-tcp.xml
+++ libvirt-4.0.0/tests/sexpr2xmldata/sexpr2xml-fv-serial-tcp.xml
@@ -31,6 +31,7 @@
       <readonly/>
       <address type='drive' controller='0' bus='1' target='0' unit='0'/>
     </disk>
+    <controller type='xenbus' index='0'/>
     <controller type='ide' index='0'/>
     <interface type='bridge'>
       <mac address='00:16:3e:1b:b1:47'/>
Index: libvirt-4.0.0/tests/sexpr2xmldata/sexpr2xml-fv-serial-udp.xml
===================================================================
--- libvirt-4.0.0.orig/tests/sexpr2xmldata/sexpr2xml-fv-serial-udp.xml
+++ libvirt-4.0.0/tests/sexpr2xmldata/sexpr2xml-fv-serial-udp.xml
@@ -31,6 +31,7 @@
       <readonly/>
       <address type='drive' controller='0' bus='1' target='0' unit='0'/>
     </disk>
+    <controller type='xenbus' index='0'/>
     <controller type='ide' index='0'/>
     <interface type='bridge'>
       <mac address='00:16:3e:1b:b1:47'/>
Index: libvirt-4.0.0/tests/sexpr2xmldata/sexpr2xml-fv-serial-unix.xml
===================================================================
--- libvirt-4.0.0.orig/tests/sexpr2xmldata/sexpr2xml-fv-serial-unix.xml
+++ libvirt-4.0.0/tests/sexpr2xmldata/sexpr2xml-fv-serial-unix.xml
@@ -31,6 +31,7 @@
       <readonly/>
       <address type='drive' controller='0' bus='1' target='0' unit='0'/>
     </disk>
+    <controller type='xenbus' index='0'/>
     <controller type='ide' index='0'/>
     <interface type='bridge'>
       <mac address='00:16:3e:1b:b1:47'/>
Index: libvirt-4.0.0/tests/sexpr2xmldata/sexpr2xml-fv-sound-all.xml
===================================================================
--- libvirt-4.0.0.orig/tests/sexpr2xmldata/sexpr2xml-fv-sound-all.xml
+++ libvirt-4.0.0/tests/sexpr2xmldata/sexpr2xml-fv-sound-all.xml
@@ -31,6 +31,7 @@
       <readonly/>
       <address type='drive' controller='0' bus='1' target='0' unit='0'/>
     </disk>
+    <controller type='xenbus' index='0'/>
     <controller type='ide' index='0'/>
     <interface type='bridge'>
       <mac address='00:16:3e:1b:b1:47'/>
Index: libvirt-4.0.0/tests/sexpr2xmldata/sexpr2xml-fv-sound.xml
===================================================================
--- libvirt-4.0.0.orig/tests/sexpr2xmldata/sexpr2xml-fv-sound.xml
+++ libvirt-4.0.0/tests/sexpr2xmldata/sexpr2xml-fv-sound.xml
@@ -31,6 +31,7 @@
       <readonly/>
       <address type='drive' controller='0' bus='1' target='0' unit='0'/>
     </disk>
+    <controller type='xenbus' index='0'/>
     <controller type='ide' index='0'/>
     <interface type='bridge'>
       <mac address='00:16:3e:1b:b1:47'/>
Index: libvirt-4.0.0/tests/sexpr2xmldata/sexpr2xml-fv-usbmouse.xml
===================================================================
--- libvirt-4.0.0.orig/tests/sexpr2xmldata/sexpr2xml-fv-usbmouse.xml
+++ libvirt-4.0.0/tests/sexpr2xmldata/sexpr2xml-fv-usbmouse.xml
@@ -31,6 +31,7 @@
       <readonly/>
       <address type='drive' controller='0' bus='1' target='0' unit='0'/>
     </disk>
+    <controller type='xenbus' index='0'/>
     <controller type='ide' index='0'/>
     <interface type='bridge'>
       <mac address='00:16:3e:1b:b1:47'/>
Index: libvirt-4.0.0/tests/sexpr2xmldata/sexpr2xml-fv-usbtablet.xml
===================================================================
--- libvirt-4.0.0.orig/tests/sexpr2xmldata/sexpr2xml-fv-usbtablet.xml
+++ libvirt-4.0.0/tests/sexpr2xmldata/sexpr2xml-fv-usbtablet.xml
@@ -31,6 +31,7 @@
       <readonly/>
       <address type='drive' controller='0' bus='1' target='0' unit='0'/>
     </disk>
+    <controller type='xenbus' index='0'/>
     <controller type='ide' index='0'/>
     <interface type='bridge'>
       <mac address='00:16:3e:1b:b1:47'/>
Index: libvirt-4.0.0/tests/sexpr2xmldata/sexpr2xml-fv-utc.xml
===================================================================
--- libvirt-4.0.0.orig/tests/sexpr2xmldata/sexpr2xml-fv-utc.xml
+++ libvirt-4.0.0/tests/sexpr2xmldata/sexpr2xml-fv-utc.xml
@@ -31,6 +31,7 @@
       <readonly/>
       <address type='drive' controller='0' bus='1' target='0' unit='0'/>
     </disk>
+    <controller type='xenbus' index='0'/>
     <controller type='ide' index='0'/>
     <interface type='bridge'>
       <mac address='00:16:3e:1b:b1:47'/>
Index: libvirt-4.0.0/tests/sexpr2xmldata/sexpr2xml-fv-v2.xml
===================================================================
--- libvirt-4.0.0.orig/tests/sexpr2xmldata/sexpr2xml-fv-v2.xml
+++ libvirt-4.0.0/tests/sexpr2xmldata/sexpr2xml-fv-v2.xml
@@ -31,6 +31,7 @@
       <readonly/>
       <address type='drive' controller='0' bus='1' target='0' unit='0'/>
     </disk>
+    <controller type='xenbus' index='0'/>
     <controller type='ide' index='0'/>
     <interface type='bridge'>
       <mac address='00:16:3e:1b:b1:47'/>
Index: libvirt-4.0.0/tests/sexpr2xmldata/sexpr2xml-fv.xml
===================================================================
--- libvirt-4.0.0.orig/tests/sexpr2xmldata/sexpr2xml-fv.xml
+++ libvirt-4.0.0/tests/sexpr2xmldata/sexpr2xml-fv.xml
@@ -31,6 +31,7 @@
       <readonly/>
       <address type='drive' controller='0' bus='1' target='0' unit='0'/>
     </disk>
+    <controller type='xenbus' index='0'/>
     <controller type='ide' index='0'/>
     <interface type='bridge'>
       <mac address='00:16:3e:1b:b1:47'/>
Index: libvirt-4.0.0/tests/sexpr2xmldata/sexpr2xml-net-bridged.xml
===================================================================
--- libvirt-4.0.0.orig/tests/sexpr2xmldata/sexpr2xml-net-bridged.xml
+++ libvirt-4.0.0/tests/sexpr2xmldata/sexpr2xml-net-bridged.xml
@@ -20,6 +20,7 @@
       <source file='/root/some.img'/>
       <target dev='xvda' bus='xen'/>
     </disk>
+    <controller type='xenbus' index='0'/>
     <interface type='bridge'>
       <mac address='00:11:22:33:44:55'/>
       <source bridge='xenbr2'/>
Index: libvirt-4.0.0/tests/sexpr2xmldata/sexpr2xml-net-e1000.xml
===================================================================
--- libvirt-4.0.0.orig/tests/sexpr2xmldata/sexpr2xml-net-e1000.xml
+++ libvirt-4.0.0/tests/sexpr2xmldata/sexpr2xml-net-e1000.xml
@@ -20,6 +20,7 @@
       <source file='/root/some.img'/>
       <target dev='xvda' bus='xen'/>
     </disk>
+    <controller type='xenbus' index='0'/>
     <interface type='bridge'>
       <mac address='00:11:22:33:44:55'/>
       <source bridge='xenbr2'/>
Index: libvirt-4.0.0/tests/sexpr2xmldata/sexpr2xml-net-routed.xml
===================================================================
--- libvirt-4.0.0.orig/tests/sexpr2xmldata/sexpr2xml-net-routed.xml
+++ libvirt-4.0.0/tests/sexpr2xmldata/sexpr2xml-net-routed.xml
@@ -20,6 +20,7 @@
       <source file='/root/some.img'/>
       <target dev='xvda' bus='xen'/>
     </disk>
+    <controller type='xenbus' index='0'/>
     <interface type='ethernet'>
       <mac address='00:11:22:33:44:55'/>
       <ip address='172.14.5.6' family='ipv4'/>
Index: libvirt-4.0.0/tests/sexpr2xmldata/sexpr2xml-no-source-cdrom.xml
===================================================================
--- libvirt-4.0.0.orig/tests/sexpr2xmldata/sexpr2xml-no-source-cdrom.xml
+++ libvirt-4.0.0/tests/sexpr2xmldata/sexpr2xml-no-source-cdrom.xml
@@ -31,6 +31,7 @@
       <readonly/>
       <address type='drive' controller='0' bus='1' target='0' unit='0'/>
     </disk>
+    <controller type='xenbus' index='0'/>
     <controller type='ide' index='0'/>
     <interface type='bridge'>
       <mac address='00:16:3e:0a:7b:39'/>
Index: libvirt-4.0.0/tests/sexpr2xmldata/sexpr2xml-pci-devs.xml
===================================================================
--- libvirt-4.0.0.orig/tests/sexpr2xmldata/sexpr2xml-pci-devs.xml
+++ libvirt-4.0.0/tests/sexpr2xmldata/sexpr2xml-pci-devs.xml
@@ -20,6 +20,7 @@
       <source dev='/dev/MainVG/GuestVG'/>
       <target dev='xvda' bus='xen'/>
     </disk>
+    <controller type='xenbus' index='0'/>
     <console type='pty'>
       <target type='xen' port='0'/>
     </console>
Index: libvirt-4.0.0/tests/sexpr2xmldata/sexpr2xml-pv-bootloader-cmdline.xml
===================================================================
--- libvirt-4.0.0.orig/tests/sexpr2xmldata/sexpr2xml-pv-bootloader-cmdline.xml
+++ libvirt-4.0.0/tests/sexpr2xmldata/sexpr2xml-pv-bootloader-cmdline.xml
@@ -20,6 +20,7 @@
       <source file='/root/some.img'/>
       <target dev='xvda' bus='xen'/>
     </disk>
+    <controller type='xenbus' index='0'/>
     <console type='pty'>
       <target type='xen' port='0'/>
     </console>
Index: libvirt-4.0.0/tests/sexpr2xmldata/sexpr2xml-pv-bootloader.xml
===================================================================
--- libvirt-4.0.0.orig/tests/sexpr2xmldata/sexpr2xml-pv-bootloader.xml
+++ libvirt-4.0.0/tests/sexpr2xmldata/sexpr2xml-pv-bootloader.xml
@@ -19,6 +19,7 @@
       <source file='/root/some.img'/>
       <target dev='xvda' bus='xen'/>
     </disk>
+    <controller type='xenbus' index='0'/>
     <console type='pty'>
       <target type='xen' port='0'/>
     </console>
Index: libvirt-4.0.0/tests/sexpr2xmldata/sexpr2xml-pv-localtime.xml
===================================================================
--- libvirt-4.0.0.orig/tests/sexpr2xmldata/sexpr2xml-pv-localtime.xml
+++ libvirt-4.0.0/tests/sexpr2xmldata/sexpr2xml-pv-localtime.xml
@@ -20,6 +20,7 @@
       <source file='/root/some.img'/>
       <target dev='xvda' bus='xen'/>
     </disk>
+    <controller type='xenbus' index='0'/>
     <console type='pty'>
       <target type='xen' port='0'/>
     </console>
Index: libvirt-4.0.0/tests/sexpr2xmldata/sexpr2xml-pv-vcpus.xml
===================================================================
--- libvirt-4.0.0.orig/tests/sexpr2xmldata/sexpr2xml-pv-vcpus.xml
+++ libvirt-4.0.0/tests/sexpr2xmldata/sexpr2xml-pv-vcpus.xml
@@ -20,6 +20,7 @@
       <source file='/root/some.img'/>
       <target dev='xvda' bus='xen'/>
     </disk>
+    <controller type='xenbus' index='0'/>
     <console type='pty'>
       <target type='xen' port='0'/>
     </console>
Index: libvirt-4.0.0/tests/sexpr2xmldata/sexpr2xml-pv-vfb-new-vncdisplay.xml
===================================================================
--- libvirt-4.0.0.orig/tests/sexpr2xmldata/sexpr2xml-pv-vfb-new-vncdisplay.xml
+++ libvirt-4.0.0/tests/sexpr2xmldata/sexpr2xml-pv-vfb-new-vncdisplay.xml
@@ -20,6 +20,7 @@
       <source file='/root/some.img'/>
       <target dev='xvda' bus='xen'/>
     </disk>
+    <controller type='xenbus' index='0'/>
     <console type='pty'>
       <target type='xen' port='0'/>
     </console>
Index: libvirt-4.0.0/tests/sexpr2xmldata/sexpr2xml-pv-vfb-new.xml
===================================================================
--- libvirt-4.0.0.orig/tests/sexpr2xmldata/sexpr2xml-pv-vfb-new.xml
+++ libvirt-4.0.0/tests/sexpr2xmldata/sexpr2xml-pv-vfb-new.xml
@@ -20,6 +20,7 @@
       <source file='/root/some.img'/>
       <target dev='xvda' bus='xen'/>
     </disk>
+    <controller type='xenbus' index='0'/>
     <console type='pty'>
       <target type='xen' port='0'/>
     </console>
Index: libvirt-4.0.0/tests/sexpr2xmldata/sexpr2xml-pv-vfb-type-crash.xml
===================================================================
--- libvirt-4.0.0.orig/tests/sexpr2xmldata/sexpr2xml-pv-vfb-type-crash.xml
+++ libvirt-4.0.0/tests/sexpr2xmldata/sexpr2xml-pv-vfb-type-crash.xml
@@ -19,6 +19,7 @@
       <source dev='/dev/vg_dom0test/test2vm'/>
       <target dev='xvda' bus='xen'/>
     </disk>
+    <controller type='xenbus' index='0'/>
     <interface type='bridge'>
       <mac address='00:16:36:68:9f:5d'/>
       <source bridge='virbr0'/>
Index: libvirt-4.0.0/tests/sexpr2xmldata/sexpr2xml-pv.xml
===================================================================
--- libvirt-4.0.0.orig/tests/sexpr2xmldata/sexpr2xml-pv.xml
+++ libvirt-4.0.0/tests/sexpr2xmldata/sexpr2xml-pv.xml
@@ -20,6 +20,7 @@
       <source file='/root/some.img'/>
       <target dev='xvda' bus='xen'/>
     </disk>
+    <controller type='xenbus' index='0'/>
     <console type='pty'>
       <target type='xen' port='0'/>
     </console>
Index: libvirt-4.0.0/tests/sexpr2xmldata/sexpr2xml-vif-rate.xml
===================================================================
--- libvirt-4.0.0.orig/tests/sexpr2xmldata/sexpr2xml-vif-rate.xml
+++ libvirt-4.0.0/tests/sexpr2xmldata/sexpr2xml-vif-rate.xml
@@ -31,6 +31,7 @@
       <readonly/>
       <address type='drive' controller='0' bus='1' target='0' unit='0'/>
     </disk>
+    <controller type='xenbus' index='0'/>
     <controller type='ide' index='0'/>
     <interface type='bridge'>
       <mac address='00:16:3e:1b:b1:47'/>
Index: libvirt-4.0.0/tests/xlconfigdata/test-channel-pty.xml
===================================================================
--- libvirt-4.0.0.orig/tests/xlconfigdata/test-channel-pty.xml
+++ libvirt-4.0.0/tests/xlconfigdata/test-channel-pty.xml
@@ -18,6 +18,7 @@
       <source file='/var/lib/xen/images/debian/disk.qcow2'/>
       <target dev='xvda' bus='xen'/>
     </disk>
+    <controller type='xenbus' index='0'/>
     <interface type='ethernet'>
       <mac address='5a:36:0e:be:00:09'/>
     </interface>
Index: libvirt-4.0.0/tests/xlconfigdata/test-channel-unix.xml
===================================================================
--- libvirt-4.0.0.orig/tests/xlconfigdata/test-channel-unix.xml
+++ libvirt-4.0.0/tests/xlconfigdata/test-channel-unix.xml
@@ -18,6 +18,7 @@
       <source file='/var/lib/xen/images/debian/disk.qcow2'/>
       <target dev='xvda' bus='xen'/>
     </disk>
+    <controller type='xenbus' index='0'/>
     <interface type='ethernet'>
       <mac address='5a:36:0e:be:00:09'/>
     </interface>
Index: libvirt-4.0.0/tests/xlconfigdata/test-disk-positional-parms-full.xml
===================================================================
--- libvirt-4.0.0.orig/tests/xlconfigdata/test-disk-positional-parms-full.xml
+++ libvirt-4.0.0/tests/xlconfigdata/test-disk-positional-parms-full.xml
@@ -39,6 +39,7 @@
       <readonly/>
       <address type='drive' controller='0' bus='1' target='0' unit='0'/>
     </disk>
+    <controller type='xenbus' index='0'/>
     <controller type='ide' index='0'/>
     <interface type='bridge'>
       <mac address='00:16:3e:66:92:9c'/>
Index: libvirt-4.0.0/tests/xlconfigdata/test-disk-positional-parms-partial.xml
===================================================================
--- libvirt-4.0.0.orig/tests/xlconfigdata/test-disk-positional-parms-partial.xml
+++ libvirt-4.0.0/tests/xlconfigdata/test-disk-positional-parms-partial.xml
@@ -45,6 +45,7 @@
       <readonly/>
       <address type='drive' controller='0' bus='1' target='0' unit='1'/>
     </disk>
+    <controller type='xenbus' index='0'/>
     <controller type='ide' index='0'/>
     <interface type='bridge'>
       <mac address='00:16:3e:66:92:9c'/>
Index: libvirt-4.0.0/tests/xlconfigdata/test-disk-qed.xml
===================================================================
--- libvirt-4.0.0.orig/tests/xlconfigdata/test-disk-qed.xml
+++ libvirt-4.0.0/tests/xlconfigdata/test-disk-qed.xml
@@ -26,6 +26,7 @@
       <target dev='hda' bus='ide'/>
       <address type='drive' controller='0' bus='0' target='0' unit='0'/>
     </disk>
+    <controller type='xenbus' index='0'/>
     <controller type='ide' index='0'/>
     <interface type='bridge'>
       <mac address='00:16:3e:66:92:9c'/>
Index: libvirt-4.0.0/tests/xlconfigdata/test-fullvirt-direct-kernel-boot-bogus-extra.xml
===================================================================
--- libvirt-4.0.0.orig/tests/xlconfigdata/test-fullvirt-direct-kernel-boot-bogus-extra.xml
+++ libvirt-4.0.0/tests/xlconfigdata/test-fullvirt-direct-kernel-boot-bogus-extra.xml
@@ -36,6 +36,7 @@
       <readonly/>
       <address type='drive' controller='0' bus='1' target='0' unit='0'/>
     </disk>
+    <controller type='xenbus' index='0'/>
     <controller type='ide' index='0'/>
     <interface type='bridge'>
       <mac address='00:16:3e:66:92:9c'/>
Index: libvirt-4.0.0/tests/xlconfigdata/test-fullvirt-direct-kernel-boot-extra.xml
===================================================================
--- libvirt-4.0.0.orig/tests/xlconfigdata/test-fullvirt-direct-kernel-boot-extra.xml
+++ libvirt-4.0.0/tests/xlconfigdata/test-fullvirt-direct-kernel-boot-extra.xml
@@ -36,6 +36,7 @@
       <readonly/>
       <address type='drive' controller='0' bus='1' target='0' unit='0'/>
     </disk>
+    <controller type='xenbus' index='0'/>
     <controller type='ide' index='0'/>
     <interface type='bridge'>
       <mac address='00:16:3e:66:92:9c'/>
Index: libvirt-4.0.0/tests/xlconfigdata/test-fullvirt-direct-kernel-boot.xml
===================================================================
--- libvirt-4.0.0.orig/tests/xlconfigdata/test-fullvirt-direct-kernel-boot.xml
+++ libvirt-4.0.0/tests/xlconfigdata/test-fullvirt-direct-kernel-boot.xml
@@ -36,6 +36,7 @@
       <readonly/>
       <address type='drive' controller='0' bus='1' target='0' unit='0'/>
     </disk>
+    <controller type='xenbus' index='0'/>
     <controller type='ide' index='0'/>
     <interface type='bridge'>
       <mac address='00:16:3e:66:92:9c'/>
Index: libvirt-4.0.0/tests/xlconfigdata/test-fullvirt-hpet-timer.xml
===================================================================
--- libvirt-4.0.0.orig/tests/xlconfigdata/test-fullvirt-hpet-timer.xml
+++ libvirt-4.0.0/tests/xlconfigdata/test-fullvirt-hpet-timer.xml
@@ -42,6 +42,7 @@
       <readonly/>
       <address type='drive' controller='0' bus='1' target='0' unit='0'/>
     </disk>
+    <controller type='xenbus' index='0'/>
     <controller type='ide' index='0'/>
     <interface type='bridge'>
       <mac address='00:16:3e:66:92:9c'/>
Index: libvirt-4.0.0/tests/xlconfigdata/test-fullvirt-multi-timer.xml
===================================================================
--- libvirt-4.0.0.orig/tests/xlconfigdata/test-fullvirt-multi-timer.xml
+++ libvirt-4.0.0/tests/xlconfigdata/test-fullvirt-multi-timer.xml
@@ -43,6 +43,7 @@
       <readonly/>
       <address type='drive' controller='0' bus='1' target='0' unit='0'/>
     </disk>
+    <controller type='xenbus' index='0'/>
     <controller type='ide' index='0'/>
     <interface type='bridge'>
       <mac address='00:16:3e:66:92:9c'/>
Index: libvirt-4.0.0/tests/xlconfigdata/test-fullvirt-multiserial.xml
===================================================================
--- libvirt-4.0.0.orig/tests/xlconfigdata/test-fullvirt-multiserial.xml
+++ libvirt-4.0.0/tests/xlconfigdata/test-fullvirt-multiserial.xml
@@ -33,6 +33,7 @@
       <readonly/>
       <address type='drive' controller='0' bus='1' target='0' unit='0'/>
     </disk>
+    <controller type='xenbus' index='0'/>
     <controller type='ide' index='0'/>
     <interface type='bridge'>
       <mac address='00:16:3e:66:92:9c'/>
Index: libvirt-4.0.0/tests/xlconfigdata/test-fullvirt-multiusb.xml
===================================================================
--- libvirt-4.0.0.orig/tests/xlconfigdata/test-fullvirt-multiusb.xml
+++ libvirt-4.0.0/tests/xlconfigdata/test-fullvirt-multiusb.xml
@@ -33,6 +33,7 @@
       <readonly/>
       <address type='drive' controller='0' bus='1' target='0' unit='0'/>
     </disk>
+    <controller type='xenbus' index='0'/>
     <controller type='ide' index='0'/>
     <interface type='bridge'>
       <mac address='00:16:3e:66:92:9c'/>
Index: libvirt-4.0.0/tests/xlconfigdata/test-fullvirt-nestedhvm-disabled.xml
===================================================================
--- libvirt-4.0.0.orig/tests/xlconfigdata/test-fullvirt-nestedhvm-disabled.xml
+++ libvirt-4.0.0/tests/xlconfigdata/test-fullvirt-nestedhvm-disabled.xml
@@ -42,6 +42,7 @@
       <readonly/>
       <address type='drive' controller='0' bus='1' target='0' unit='0'/>
     </disk>
+    <controller type='xenbus' index='0'/>
     <controller type='ide' index='0'/>
     <interface type='bridge'>
       <mac address='00:16:3e:66:92:9c'/>
Index: libvirt-4.0.0/tests/xlconfigdata/test-fullvirt-nestedhvm.xml
===================================================================
--- libvirt-4.0.0.orig/tests/xlconfigdata/test-fullvirt-nestedhvm.xml
+++ libvirt-4.0.0/tests/xlconfigdata/test-fullvirt-nestedhvm.xml
@@ -40,6 +40,7 @@
       <readonly/>
       <address type='drive' controller='0' bus='1' target='0' unit='0'/>
     </disk>
+    <controller type='xenbus' index='0'/>
     <controller type='ide' index='0'/>
     <interface type='bridge'>
       <mac address='00:16:3e:66:92:9c'/>
Index: libvirt-4.0.0/tests/xlconfigdata/test-fullvirt-nohap.xml
===================================================================
--- libvirt-4.0.0.orig/tests/xlconfigdata/test-fullvirt-nohap.xml
+++ libvirt-4.0.0/tests/xlconfigdata/test-fullvirt-nohap.xml
@@ -40,6 +40,7 @@
       <readonly/>
       <address type='drive' controller='0' bus='1' target='0' unit='0'/>
     </disk>
+    <controller type='xenbus' index='0'/>
     <controller type='ide' index='0'/>
     <interface type='bridge'>
       <mac address='00:16:3e:66:92:9c'/>
Index: libvirt-4.0.0/tests/xlconfigdata/test-fullvirt-ovmf.xml
===================================================================
--- libvirt-4.0.0.orig/tests/xlconfigdata/test-fullvirt-ovmf.xml
+++ libvirt-4.0.0/tests/xlconfigdata/test-fullvirt-ovmf.xml
@@ -39,6 +39,7 @@
       <readonly/>
       <address type='drive' controller='0' bus='1' target='0' unit='0'/>
     </disk>
+    <controller type='xenbus' index='0'/>
     <controller type='ide' index='0'/>
     <interface type='bridge'>
       <mac address='00:16:3e:66:92:9c'/>
Index: libvirt-4.0.0/tests/xlconfigdata/test-fullvirt-tsc-timer.xml
===================================================================
--- libvirt-4.0.0.orig/tests/xlconfigdata/test-fullvirt-tsc-timer.xml
+++ libvirt-4.0.0/tests/xlconfigdata/test-fullvirt-tsc-timer.xml
@@ -42,6 +42,7 @@
       <readonly/>
       <address type='drive' controller='0' bus='1' target='0' unit='0'/>
     </disk>
+    <controller type='xenbus' index='0'/>
     <controller type='ide' index='0'/>
     <interface type='bridge'>
       <mac address='00:16:3e:66:92:9c'/>
Index: libvirt-4.0.0/tests/xlconfigdata/test-fullvirt-vnuma.xml
===================================================================
--- libvirt-4.0.0.orig/tests/xlconfigdata/test-fullvirt-vnuma.xml
+++ libvirt-4.0.0/tests/xlconfigdata/test-fullvirt-vnuma.xml
@@ -62,6 +62,7 @@
       <target dev='hda' bus='ide'/>
       <address type='drive' controller='0' bus='0' target='0' unit='0'/>
     </disk>
+    <controller type='xenbus' index='0'/>
     <controller type='ide' index='0'/>
     <interface type='bridge'>
       <mac address='00:16:3e:66:92:9c'/>
Index: libvirt-4.0.0/tests/xlconfigdata/test-new-disk.xml
===================================================================
--- libvirt-4.0.0.orig/tests/xlconfigdata/test-new-disk.xml
+++ libvirt-4.0.0/tests/xlconfigdata/test-new-disk.xml
@@ -39,6 +39,7 @@
       <readonly/>
       <address type='drive' controller='0' bus='1' target='0' unit='0'/>
     </disk>
+    <controller type='xenbus' index='0'/>
     <controller type='ide' index='0'/>
     <interface type='bridge'>
       <mac address='00:16:3e:66:92:9c'/>
Index: libvirt-4.0.0/tests/xlconfigdata/test-paravirt-cmdline-bogus-extra-root.xml
===================================================================
--- libvirt-4.0.0.orig/tests/xlconfigdata/test-paravirt-cmdline-bogus-extra-root.xml
+++ libvirt-4.0.0/tests/xlconfigdata/test-paravirt-cmdline-bogus-extra-root.xml
@@ -20,6 +20,7 @@
       <source file='/dev/HostVG/XenGuest2'/>
       <target dev='xvda' bus='xen'/>
     </disk>
+    <controller type='xenbus' index='0'/>
     <interface type='bridge'>
       <mac address='00:16:3e:66:92:9c'/>
       <source bridge='xenbr1'/>
Index: libvirt-4.0.0/tests/xlconfigdata/test-paravirt-cmdline-extra-root.xml
===================================================================
--- libvirt-4.0.0.orig/tests/xlconfigdata/test-paravirt-cmdline-extra-root.xml
+++ libvirt-4.0.0/tests/xlconfigdata/test-paravirt-cmdline-extra-root.xml
@@ -20,6 +20,7 @@
       <source file='/dev/HostVG/XenGuest2'/>
       <target dev='xvda' bus='xen'/>
     </disk>
+    <controller type='xenbus' index='0'/>
     <interface type='bridge'>
       <mac address='00:16:3e:66:92:9c'/>
       <source bridge='xenbr1'/>
Index: libvirt-4.0.0/tests/xlconfigdata/test-paravirt-cmdline.xml
===================================================================
--- libvirt-4.0.0.orig/tests/xlconfigdata/test-paravirt-cmdline.xml
+++ libvirt-4.0.0/tests/xlconfigdata/test-paravirt-cmdline.xml
@@ -20,6 +20,7 @@
       <source file='/dev/HostVG/XenGuest2'/>
       <target dev='xvda' bus='xen'/>
     </disk>
+    <controller type='xenbus' index='0'/>
     <interface type='bridge'>
       <mac address='00:16:3e:66:92:9c'/>
       <source bridge='xenbr1'/>
Index: libvirt-4.0.0/tests/xlconfigdata/test-paravirt-maxvcpus.xml
===================================================================
--- libvirt-4.0.0.orig/tests/xlconfigdata/test-paravirt-maxvcpus.xml
+++ libvirt-4.0.0/tests/xlconfigdata/test-paravirt-maxvcpus.xml
@@ -18,6 +18,7 @@
       <source file='/var/lib/xen/images/debian/disk.qcow2'/>
       <target dev='xvda' bus='xen'/>
     </disk>
+    <controller type='xenbus' index='0'/>
     <interface type='ethernet'>
       <mac address='5a:36:0e:be:00:09'/>
     </interface>
Index: libvirt-4.0.0/tests/xlconfigdata/test-rbd-multihost-noauth.xml
===================================================================
--- libvirt-4.0.0.orig/tests/xlconfigdata/test-rbd-multihost-noauth.xml
+++ libvirt-4.0.0/tests/xlconfigdata/test-rbd-multihost-noauth.xml
@@ -36,6 +36,7 @@
       <target dev='hdb' bus='ide'/>
       <address type='drive' controller='0' bus='0' target='0' unit='1'/>
     </disk>
+    <controller type='xenbus' index='0'/>
     <controller type='ide' index='0'/>
     <interface type='bridge'>
       <mac address='00:16:3e:66:92:9c'/>
Index: libvirt-4.0.0/tests/xlconfigdata/test-spice-features.xml
===================================================================
--- libvirt-4.0.0.orig/tests/xlconfigdata/test-spice-features.xml
+++ libvirt-4.0.0/tests/xlconfigdata/test-spice-features.xml
@@ -33,6 +33,7 @@
       <readonly/>
       <address type='drive' controller='0' bus='1' target='0' unit='0'/>
     </disk>
+    <controller type='xenbus' index='0'/>
     <controller type='ide' index='0'/>
     <interface type='bridge'>
       <mac address='00:16:3e:66:92:9c'/>
Index: libvirt-4.0.0/tests/xlconfigdata/test-spice.xml
===================================================================
--- libvirt-4.0.0.orig/tests/xlconfigdata/test-spice.xml
+++ libvirt-4.0.0/tests/xlconfigdata/test-spice.xml
@@ -33,6 +33,7 @@
       <readonly/>
       <address type='drive' controller='0' bus='1' target='0' unit='0'/>
     </disk>
+    <controller type='xenbus' index='0'/>
     <controller type='ide' index='0'/>
     <interface type='bridge'>
       <mac address='00:16:3e:66:92:9c'/>
Index: libvirt-4.0.0/tests/xlconfigdata/test-usb.xml
===================================================================
--- libvirt-4.0.0.orig/tests/xlconfigdata/test-usb.xml
+++ libvirt-4.0.0/tests/xlconfigdata/test-usb.xml
@@ -18,6 +18,7 @@
       <source file='/var/lib/xen/images/debian/disk.qcow2'/>
       <target dev='xvda' bus='xen'/>
     </disk>
+    <controller type='xenbus' index='0'/>
     <interface type='ethernet'>
       <mac address='5a:36:0e:be:00:09'/>
     </interface>
Index: libvirt-4.0.0/tests/xlconfigdata/test-usbctrl.xml
===================================================================
--- libvirt-4.0.0.orig/tests/xlconfigdata/test-usbctrl.xml
+++ libvirt-4.0.0/tests/xlconfigdata/test-usbctrl.xml
@@ -19,6 +19,7 @@
       <target dev='xvda' bus='xen'/>
     </disk>
     <controller type='usb' index='0' model='qusb2' ports='6'/>
+    <controller type='xenbus' index='0'/>
     <interface type='ethernet'>
       <mac address='5a:36:0e:be:00:09'/>
     </interface>
Index: libvirt-4.0.0/tests/xlconfigdata/test-vif-multi-ip.xml
===================================================================
--- libvirt-4.0.0.orig/tests/xlconfigdata/test-vif-multi-ip.xml
+++ libvirt-4.0.0/tests/xlconfigdata/test-vif-multi-ip.xml
@@ -26,6 +26,7 @@
       <target dev='hda' bus='ide'/>
       <address type='drive' controller='0' bus='0' target='0' unit='0'/>
     </disk>
+    <controller type='xenbus' index='0'/>
     <controller type='ide' index='0'/>
     <interface type='bridge'>
       <mac address='00:16:3e:66:92:9c'/>
Index: libvirt-4.0.0/tests/xlconfigdata/test-vif-rate.xml
===================================================================
--- libvirt-4.0.0.orig/tests/xlconfigdata/test-vif-rate.xml
+++ libvirt-4.0.0/tests/xlconfigdata/test-vif-rate.xml
@@ -39,6 +39,7 @@
       <readonly/>
       <address type='drive' controller='0' bus='1' target='0' unit='0'/>
     </disk>
+    <controller type='xenbus' index='0'/>
     <controller type='ide' index='0'/>
     <interface type='bridge'>
       <mac address='00:16:3e:66:92:9c'/>
Index: libvirt-4.0.0/tests/xlconfigdata/test-vif-typename.xml
===================================================================
--- libvirt-4.0.0.orig/tests/xlconfigdata/test-vif-typename.xml
+++ libvirt-4.0.0/tests/xlconfigdata/test-vif-typename.xml
@@ -26,6 +26,7 @@
       <target dev='hda' bus='ide'/>
       <address type='drive' controller='0' bus='0' target='0' unit='0'/>
     </disk>
+    <controller type='xenbus' index='0'/>
     <controller type='ide' index='0'/>
     <interface type='bridge'>
       <mac address='00:16:3e:66:92:9c'/>
Index: libvirt-4.0.0/tests/xmconfigdata/test-disk-drv-blktap-raw.xml
===================================================================
--- libvirt-4.0.0.orig/tests/xmconfigdata/test-disk-drv-blktap-raw.xml
+++ libvirt-4.0.0/tests/xmconfigdata/test-disk-drv-blktap-raw.xml
@@ -18,6 +18,7 @@
       <source file='/root/some.img'/>
       <target dev='xvda' bus='xen'/>
     </disk>
+    <controller type='xenbus' index='0'/>
     <interface type='bridge'>
       <mac address='00:16:3e:66:94:9c'/>
       <source bridge='br0'/>
Index: libvirt-4.0.0/tests/xmconfigdata/test-disk-drv-blktap2-raw.xml
===================================================================
--- libvirt-4.0.0.orig/tests/xmconfigdata/test-disk-drv-blktap2-raw.xml
+++ libvirt-4.0.0/tests/xmconfigdata/test-disk-drv-blktap2-raw.xml
@@ -18,6 +18,7 @@
       <source file='/root/some.img'/>
       <target dev='xvda' bus='xen'/>
     </disk>
+    <controller type='xenbus' index='0'/>
     <interface type='bridge'>
       <mac address='00:16:3e:66:94:9c'/>
       <source bridge='br0'/>
Index: libvirt-4.0.0/tests/xmconfigdata/test-escape-paths.xml
===================================================================
--- libvirt-4.0.0.orig/tests/xmconfigdata/test-escape-paths.xml
+++ libvirt-4.0.0/tests/xmconfigdata/test-escape-paths.xml
@@ -39,6 +39,7 @@
       <readonly/>
       <address type='drive' controller='0' bus='1' target='0' unit='0'/>
     </disk>
+    <controller type='xenbus' index='0'/>
     <controller type='ide' index='0'/>
     <interface type='bridge'>
       <mac address='00:16:3e:66:92:9c'/>
Index: libvirt-4.0.0/tests/xmconfigdata/test-fullvirt-default-feature.xml
===================================================================
--- libvirt-4.0.0.orig/tests/xmconfigdata/test-fullvirt-default-feature.xml
+++ libvirt-4.0.0/tests/xmconfigdata/test-fullvirt-default-feature.xml
@@ -35,6 +35,7 @@
       <readonly/>
       <address type='drive' controller='0' bus='1' target='0' unit='0'/>
     </disk>
+    <controller type='xenbus' index='0'/>
     <controller type='ide' index='0'/>
     <interface type='bridge'>
       <mac address='00:16:3e:66:92:9c'/>
Index: libvirt-4.0.0/tests/xmconfigdata/test-fullvirt-force-hpet.xml
===================================================================
--- libvirt-4.0.0.orig/tests/xmconfigdata/test-fullvirt-force-hpet.xml
+++ libvirt-4.0.0/tests/xmconfigdata/test-fullvirt-force-hpet.xml
@@ -35,6 +35,7 @@
       <readonly/>
       <address type='drive' controller='0' bus='1' target='0' unit='0'/>
     </disk>
+    <controller type='xenbus' index='0'/>
     <controller type='ide' index='0'/>
     <interface type='bridge'>
       <mac address='00:16:3e:66:92:9c'/>
Index: libvirt-4.0.0/tests/xmconfigdata/test-fullvirt-force-nohpet.xml
===================================================================
--- libvirt-4.0.0.orig/tests/xmconfigdata/test-fullvirt-force-nohpet.xml
+++ libvirt-4.0.0/tests/xmconfigdata/test-fullvirt-force-nohpet.xml
@@ -35,6 +35,7 @@
       <readonly/>
       <address type='drive' controller='0' bus='1' target='0' unit='0'/>
     </disk>
+    <controller type='xenbus' index='0'/>
     <controller type='ide' index='0'/>
     <interface type='bridge'>
       <mac address='00:16:3e:66:92:9c'/>
Index: libvirt-4.0.0/tests/xmconfigdata/test-fullvirt-localtime.xml
===================================================================
--- libvirt-4.0.0.orig/tests/xmconfigdata/test-fullvirt-localtime.xml
+++ libvirt-4.0.0/tests/xmconfigdata/test-fullvirt-localtime.xml
@@ -33,6 +33,7 @@
       <readonly/>
       <address type='drive' controller='0' bus='1' target='0' unit='0'/>
     </disk>
+    <controller type='xenbus' index='0'/>
     <controller type='ide' index='0'/>
     <interface type='bridge'>
       <mac address='00:16:3e:66:92:9c'/>
Index: libvirt-4.0.0/tests/xmconfigdata/test-fullvirt-net-netfront.xml
===================================================================
--- libvirt-4.0.0.orig/tests/xmconfigdata/test-fullvirt-net-netfront.xml
+++ libvirt-4.0.0/tests/xmconfigdata/test-fullvirt-net-netfront.xml
@@ -33,6 +33,7 @@
       <readonly/>
       <address type='drive' controller='0' bus='1' target='0' unit='0'/>
     </disk>
+    <controller type='xenbus' index='0'/>
     <controller type='ide' index='0'/>
     <interface type='bridge'>
       <mac address='00:16:3e:66:92:9c'/>
Index: libvirt-4.0.0/tests/xmconfigdata/test-fullvirt-new-cdrom.xml
===================================================================
--- libvirt-4.0.0.orig/tests/xmconfigdata/test-fullvirt-new-cdrom.xml
+++ libvirt-4.0.0/tests/xmconfigdata/test-fullvirt-new-cdrom.xml
@@ -33,6 +33,7 @@
       <readonly/>
       <address type='drive' controller='0' bus='1' target='0' unit='0'/>
     </disk>
+    <controller type='xenbus' index='0'/>
     <controller type='ide' index='0'/>
     <interface type='bridge'>
       <mac address='00:16:3e:66:92:9c'/>
Index: libvirt-4.0.0/tests/xmconfigdata/test-fullvirt-nohap.xml
===================================================================
--- libvirt-4.0.0.orig/tests/xmconfigdata/test-fullvirt-nohap.xml
+++ libvirt-4.0.0/tests/xmconfigdata/test-fullvirt-nohap.xml
@@ -34,6 +34,7 @@
       <readonly/>
       <address type='drive' controller='0' bus='1' target='0' unit='0'/>
     </disk>
+    <controller type='xenbus' index='0'/>
     <controller type='ide' index='0'/>
     <interface type='bridge'>
       <mac address='00:16:3e:66:92:9c'/>
Index: libvirt-4.0.0/tests/xmconfigdata/test-fullvirt-parallel-tcp.xml
===================================================================
--- libvirt-4.0.0.orig/tests/xmconfigdata/test-fullvirt-parallel-tcp.xml
+++ libvirt-4.0.0/tests/xmconfigdata/test-fullvirt-parallel-tcp.xml
@@ -33,6 +33,7 @@
       <readonly/>
       <address type='drive' controller='0' bus='1' target='0' unit='0'/>
     </disk>
+    <controller type='xenbus' index='0'/>
     <controller type='ide' index='0'/>
     <interface type='bridge'>
       <mac address='00:16:3e:66:92:9c'/>
Index: libvirt-4.0.0/tests/xmconfigdata/test-fullvirt-serial-file.xml
===================================================================
--- libvirt-4.0.0.orig/tests/xmconfigdata/test-fullvirt-serial-file.xml
+++ libvirt-4.0.0/tests/xmconfigdata/test-fullvirt-serial-file.xml
@@ -33,6 +33,7 @@
       <readonly/>
       <address type='drive' controller='0' bus='1' target='0' unit='0'/>
     </disk>
+    <controller type='xenbus' index='0'/>
     <controller type='ide' index='0'/>
     <interface type='bridge'>
       <mac address='00:16:3e:66:92:9c'/>
Index: libvirt-4.0.0/tests/xmconfigdata/test-fullvirt-serial-null.xml
===================================================================
--- libvirt-4.0.0.orig/tests/xmconfigdata/test-fullvirt-serial-null.xml
+++ libvirt-4.0.0/tests/xmconfigdata/test-fullvirt-serial-null.xml
@@ -33,6 +33,7 @@
       <readonly/>
       <address type='drive' controller='0' bus='1' target='0' unit='0'/>
     </disk>
+    <controller type='xenbus' index='0'/>
     <controller type='ide' index='0'/>
     <interface type='bridge'>
       <mac address='00:16:3e:66:92:9c'/>
Index: libvirt-4.0.0/tests/xmconfigdata/test-fullvirt-serial-pipe.xml
===================================================================
--- libvirt-4.0.0.orig/tests/xmconfigdata/test-fullvirt-serial-pipe.xml
+++ libvirt-4.0.0/tests/xmconfigdata/test-fullvirt-serial-pipe.xml
@@ -33,6 +33,7 @@
       <readonly/>
       <address type='drive' controller='0' bus='1' target='0' unit='0'/>
     </disk>
+    <controller type='xenbus' index='0'/>
     <controller type='ide' index='0'/>
     <interface type='bridge'>
       <mac address='00:16:3e:66:92:9c'/>
Index: libvirt-4.0.0/tests/xmconfigdata/test-fullvirt-serial-pty.xml
===================================================================
--- libvirt-4.0.0.orig/tests/xmconfigdata/test-fullvirt-serial-pty.xml
+++ libvirt-4.0.0/tests/xmconfigdata/test-fullvirt-serial-pty.xml
@@ -33,6 +33,7 @@
       <readonly/>
       <address type='drive' controller='0' bus='1' target='0' unit='0'/>
     </disk>
+    <controller type='xenbus' index='0'/>
     <controller type='ide' index='0'/>
     <interface type='bridge'>
       <mac address='00:16:3e:66:92:9c'/>
Index: libvirt-4.0.0/tests/xmconfigdata/test-fullvirt-serial-stdio.xml
===================================================================
--- libvirt-4.0.0.orig/tests/xmconfigdata/test-fullvirt-serial-stdio.xml
+++ libvirt-4.0.0/tests/xmconfigdata/test-fullvirt-serial-stdio.xml
@@ -33,6 +33,7 @@
       <readonly/>
       <address type='drive' controller='0' bus='1' target='0' unit='0'/>
     </disk>
+    <controller type='xenbus' index='0'/>
     <controller type='ide' index='0'/>
     <interface type='bridge'>
       <mac address='00:16:3e:66:92:9c'/>
Index: libvirt-4.0.0/tests/xmconfigdata/test-fullvirt-serial-tcp-telnet.xml
===================================================================
--- libvirt-4.0.0.orig/tests/xmconfigdata/test-fullvirt-serial-tcp-telnet.xml
+++ libvirt-4.0.0/tests/xmconfigdata/test-fullvirt-serial-tcp-telnet.xml
@@ -33,6 +33,7 @@
       <readonly/>
       <address type='drive' controller='0' bus='1' target='0' unit='0'/>
     </disk>
+    <controller type='xenbus' index='0'/>
     <controller type='ide' index='0'/>
     <interface type='bridge'>
       <mac address='00:16:3e:66:92:9c'/>
Index: libvirt-4.0.0/tests/xmconfigdata/test-fullvirt-serial-tcp.xml
===================================================================
--- libvirt-4.0.0.orig/tests/xmconfigdata/test-fullvirt-serial-tcp.xml
+++ libvirt-4.0.0/tests/xmconfigdata/test-fullvirt-serial-tcp.xml
@@ -33,6 +33,7 @@
       <readonly/>
       <address type='drive' controller='0' bus='1' target='0' unit='0'/>
     </disk>
+    <controller type='xenbus' index='0'/>
     <controller type='ide' index='0'/>
     <interface type='bridge'>
       <mac address='00:16:3e:66:92:9c'/>
Index: libvirt-4.0.0/tests/xmconfigdata/test-fullvirt-serial-udp.xml
===================================================================
--- libvirt-4.0.0.orig/tests/xmconfigdata/test-fullvirt-serial-udp.xml
+++ libvirt-4.0.0/tests/xmconfigdata/test-fullvirt-serial-udp.xml
@@ -33,6 +33,7 @@
       <readonly/>
       <address type='drive' controller='0' bus='1' target='0' unit='0'/>
     </disk>
+    <controller type='xenbus' index='0'/>
     <controller type='ide' index='0'/>
     <interface type='bridge'>
       <mac address='00:16:3e:66:92:9c'/>
Index: libvirt-4.0.0/tests/xmconfigdata/test-fullvirt-serial-unix.xml
===================================================================
--- libvirt-4.0.0.orig/tests/xmconfigdata/test-fullvirt-serial-unix.xml
+++ libvirt-4.0.0/tests/xmconfigdata/test-fullvirt-serial-unix.xml
@@ -33,6 +33,7 @@
       <readonly/>
       <address type='drive' controller='0' bus='1' target='0' unit='0'/>
     </disk>
+    <controller type='xenbus' index='0'/>
     <controller type='ide' index='0'/>
     <interface type='bridge'>
       <mac address='00:16:3e:66:92:9c'/>
Index: libvirt-4.0.0/tests/xmconfigdata/test-fullvirt-sound.xml
===================================================================
--- libvirt-4.0.0.orig/tests/xmconfigdata/test-fullvirt-sound.xml
+++ libvirt-4.0.0/tests/xmconfigdata/test-fullvirt-sound.xml
@@ -33,6 +33,7 @@
       <readonly/>
       <address type='drive' controller='0' bus='1' target='0' unit='0'/>
     </disk>
+    <controller type='xenbus' index='0'/>
     <controller type='ide' index='0'/>
     <interface type='bridge'>
       <mac address='00:16:3e:66:92:9c'/>
Index: libvirt-4.0.0/tests/xmconfigdata/test-fullvirt-usbmouse.xml
===================================================================
--- libvirt-4.0.0.orig/tests/xmconfigdata/test-fullvirt-usbmouse.xml
+++ libvirt-4.0.0/tests/xmconfigdata/test-fullvirt-usbmouse.xml
@@ -33,6 +33,7 @@
       <readonly/>
       <address type='drive' controller='0' bus='1' target='0' unit='0'/>
     </disk>
+    <controller type='xenbus' index='0'/>
     <controller type='ide' index='0'/>
     <interface type='bridge'>
       <mac address='00:16:3e:66:92:9c'/>
Index: libvirt-4.0.0/tests/xmconfigdata/test-fullvirt-usbtablet.xml
===================================================================
--- libvirt-4.0.0.orig/tests/xmconfigdata/test-fullvirt-usbtablet.xml
+++ libvirt-4.0.0/tests/xmconfigdata/test-fullvirt-usbtablet.xml
@@ -33,6 +33,7 @@
       <readonly/>
       <address type='drive' controller='0' bus='1' target='0' unit='0'/>
     </disk>
+    <controller type='xenbus' index='0'/>
     <controller type='ide' index='0'/>
     <interface type='bridge'>
       <mac address='00:16:3e:66:92:9c'/>
Index: libvirt-4.0.0/tests/xmconfigdata/test-fullvirt-utc.xml
===================================================================
--- libvirt-4.0.0.orig/tests/xmconfigdata/test-fullvirt-utc.xml
+++ libvirt-4.0.0/tests/xmconfigdata/test-fullvirt-utc.xml
@@ -33,6 +33,7 @@
       <readonly/>
       <address type='drive' controller='0' bus='1' target='0' unit='0'/>
     </disk>
+    <controller type='xenbus' index='0'/>
     <controller type='ide' index='0'/>
     <interface type='bridge'>
       <mac address='00:16:3e:66:92:9c'/>
Index: libvirt-4.0.0/tests/xmconfigdata/test-no-source-cdrom.xml
===================================================================
--- libvirt-4.0.0.orig/tests/xmconfigdata/test-no-source-cdrom.xml
+++ libvirt-4.0.0/tests/xmconfigdata/test-no-source-cdrom.xml
@@ -32,6 +32,7 @@
       <readonly/>
       <address type='drive' controller='0' bus='1' target='0' unit='0'/>
     </disk>
+    <controller type='xenbus' index='0'/>
     <controller type='ide' index='0'/>
     <interface type='bridge'>
       <mac address='00:16:3e:0a:7b:39'/>
Index: libvirt-4.0.0/tests/xmconfigdata/test-paravirt-maxvcpus.xml
===================================================================
--- libvirt-4.0.0.orig/tests/xmconfigdata/test-paravirt-maxvcpus.xml
+++ libvirt-4.0.0/tests/xmconfigdata/test-paravirt-maxvcpus.xml
@@ -18,6 +18,7 @@
       <source dev='/dev/HostVG/XenGuest1'/>
       <target dev='xvda' bus='xen'/>
     </disk>
+    <controller type='xenbus' index='0'/>
     <interface type='bridge'>
       <mac address='00:16:3e:66:94:9c'/>
       <source bridge='br0'/>
Index: libvirt-4.0.0/tests/xmconfigdata/test-paravirt-net-e1000.xml
===================================================================
--- libvirt-4.0.0.orig/tests/xmconfigdata/test-paravirt-net-e1000.xml
+++ libvirt-4.0.0/tests/xmconfigdata/test-paravirt-net-e1000.xml
@@ -18,6 +18,7 @@
       <source dev='/dev/HostVG/XenGuest1'/>
       <target dev='xvda' bus='xen'/>
     </disk>
+    <controller type='xenbus' index='0'/>
     <interface type='bridge'>
       <mac address='00:16:3e:66:94:9c'/>
       <source bridge='br0'/>
Index: libvirt-4.0.0/tests/xmconfigdata/test-paravirt-net-vifname.xml
===================================================================
--- libvirt-4.0.0.orig/tests/xmconfigdata/test-paravirt-net-vifname.xml
+++ libvirt-4.0.0/tests/xmconfigdata/test-paravirt-net-vifname.xml
@@ -18,6 +18,7 @@
       <source dev='/dev/HostVG/XenGuest1'/>
       <target dev='xvda' bus='xen'/>
     </disk>
+    <controller type='xenbus' index='0'/>
     <interface type='bridge'>
       <mac address='00:16:3e:66:94:9c'/>
       <source bridge='br0'/>
Index: libvirt-4.0.0/tests/xmconfigdata/test-paravirt-new-pvfb-vncdisplay.xml
===================================================================
--- libvirt-4.0.0.orig/tests/xmconfigdata/test-paravirt-new-pvfb-vncdisplay.xml
+++ libvirt-4.0.0/tests/xmconfigdata/test-paravirt-new-pvfb-vncdisplay.xml
@@ -18,6 +18,7 @@
       <source dev='/dev/HostVG/XenGuest1'/>
       <target dev='xvda' bus='xen'/>
     </disk>
+    <controller type='xenbus' index='0'/>
     <interface type='bridge'>
       <mac address='00:16:3e:66:94:9c'/>
       <source bridge='br0'/>
Index: libvirt-4.0.0/tests/xmconfigdata/test-paravirt-new-pvfb.xml
===================================================================
--- libvirt-4.0.0.orig/tests/xmconfigdata/test-paravirt-new-pvfb.xml
+++ libvirt-4.0.0/tests/xmconfigdata/test-paravirt-new-pvfb.xml
@@ -18,6 +18,7 @@
       <source dev='/dev/HostVG/XenGuest1'/>
       <target dev='xvda' bus='xen'/>
     </disk>
+    <controller type='xenbus' index='0'/>
     <interface type='bridge'>
       <mac address='00:16:3e:66:94:9c'/>
       <source bridge='br0'/>
Index: libvirt-4.0.0/tests/xmconfigdata/test-paravirt-vcpu.xml
===================================================================
--- libvirt-4.0.0.orig/tests/xmconfigdata/test-paravirt-vcpu.xml
+++ libvirt-4.0.0/tests/xmconfigdata/test-paravirt-vcpu.xml
@@ -18,6 +18,7 @@
       <source dev='/dev/HostVG/XenGuest1'/>
       <target dev='xvda' bus='xen'/>
     </disk>
+    <controller type='xenbus' index='0'/>
     <interface type='bridge'>
       <mac address='00:16:3e:66:94:9c'/>
       <source bridge='br0'/>
Index: libvirt-4.0.0/tests/xmconfigdata/test-pci-devs.xml
===================================================================
--- libvirt-4.0.0.orig/tests/xmconfigdata/test-pci-devs.xml
+++ libvirt-4.0.0/tests/xmconfigdata/test-pci-devs.xml
@@ -32,6 +32,7 @@
       <readonly/>
       <address type='drive' controller='0' bus='1' target='0' unit='0'/>
     </disk>
+    <controller type='xenbus' index='0'/>
     <controller type='ide' index='0'/>
     <interface type='bridge'>
       <mac address='00:16:3e:0a:7b:39'/>
