From fb0597574d01f56776676b2e48eb860ad7ad41a6 Mon Sep 17 00:00:00 2001
From: Jim Fehlig <jfehlig@suse.com>
Date: Wed, 6 Mar 2019 17:43:21 -0700
Subject: [PATCH] libxl: Add implicit xenbus controller
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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>
---
 src/libxl/libxl_domain.c                                     | 5 +++++
 tests/sexpr2xmldata/sexpr2xml-boot-grub.xml                  | 1 +
 tests/sexpr2xmldata/sexpr2xml-bridge-ipaddr.xml              | 1 +
 tests/sexpr2xmldata/sexpr2xml-curmem.xml                     | 1 +
 tests/sexpr2xmldata/sexpr2xml-disk-block-shareable.xml       | 1 +
 tests/sexpr2xmldata/sexpr2xml-disk-block.xml                 | 1 +
 tests/sexpr2xmldata/sexpr2xml-disk-drv-blktap-qcow.xml       | 1 +
 tests/sexpr2xmldata/sexpr2xml-disk-drv-blktap-raw.xml        | 1 +
 tests/sexpr2xmldata/sexpr2xml-disk-drv-blktap2-raw.xml       | 1 +
 tests/sexpr2xmldata/sexpr2xml-disk-file.xml                  | 1 +
 tests/sexpr2xmldata/sexpr2xml-fv-autoport.xml                | 1 +
 tests/sexpr2xmldata/sexpr2xml-fv-empty-kernel.xml            | 1 +
 tests/sexpr2xmldata/sexpr2xml-fv-force-hpet.xml              | 1 +
 tests/sexpr2xmldata/sexpr2xml-fv-force-nohpet.xml            | 1 +
 tests/sexpr2xmldata/sexpr2xml-fv-kernel.xml                  | 1 +
 tests/sexpr2xmldata/sexpr2xml-fv-localtime.xml               | 1 +
 tests/sexpr2xmldata/sexpr2xml-fv-net-netfront.xml            | 1 +
 tests/sexpr2xmldata/sexpr2xml-fv-parallel-tcp.xml            | 1 +
 tests/sexpr2xmldata/sexpr2xml-fv-serial-dev-2-ports.xml      | 1 +
 tests/sexpr2xmldata/sexpr2xml-fv-serial-dev-2nd-port.xml     | 1 +
 tests/sexpr2xmldata/sexpr2xml-fv-serial-file.xml             | 1 +
 tests/sexpr2xmldata/sexpr2xml-fv-serial-null.xml             | 1 +
 tests/sexpr2xmldata/sexpr2xml-fv-serial-pipe.xml             | 1 +
 tests/sexpr2xmldata/sexpr2xml-fv-serial-pty.xml              | 1 +
 tests/sexpr2xmldata/sexpr2xml-fv-serial-stdio.xml            | 1 +
 tests/sexpr2xmldata/sexpr2xml-fv-serial-tcp-telnet.xml       | 1 +
 tests/sexpr2xmldata/sexpr2xml-fv-serial-tcp.xml              | 1 +
 tests/sexpr2xmldata/sexpr2xml-fv-serial-udp.xml              | 1 +
 tests/sexpr2xmldata/sexpr2xml-fv-serial-unix.xml             | 1 +
 tests/sexpr2xmldata/sexpr2xml-fv-sound-all.xml               | 1 +
 tests/sexpr2xmldata/sexpr2xml-fv-sound.xml                   | 1 +
 tests/sexpr2xmldata/sexpr2xml-fv-usbmouse.xml                | 1 +
 tests/sexpr2xmldata/sexpr2xml-fv-usbtablet.xml               | 1 +
 tests/sexpr2xmldata/sexpr2xml-fv-utc.xml                     | 1 +
 tests/sexpr2xmldata/sexpr2xml-fv-v2.xml                      | 1 +
 tests/sexpr2xmldata/sexpr2xml-fv.xml                         | 1 +
 tests/sexpr2xmldata/sexpr2xml-net-bridged.xml                | 1 +
 tests/sexpr2xmldata/sexpr2xml-net-e1000.xml                  | 1 +
 tests/sexpr2xmldata/sexpr2xml-net-routed.xml                 | 1 +
 tests/sexpr2xmldata/sexpr2xml-no-source-cdrom.xml            | 1 +
 tests/sexpr2xmldata/sexpr2xml-pci-devs.xml                   | 1 +
 tests/sexpr2xmldata/sexpr2xml-pv-bootloader-cmdline.xml      | 1 +
 tests/sexpr2xmldata/sexpr2xml-pv-bootloader.xml              | 1 +
 tests/sexpr2xmldata/sexpr2xml-pv-localtime.xml               | 1 +
 tests/sexpr2xmldata/sexpr2xml-pv-vcpus.xml                   | 1 +
 tests/sexpr2xmldata/sexpr2xml-pv-vfb-new-vncdisplay.xml      | 1 +
 tests/sexpr2xmldata/sexpr2xml-pv-vfb-new.xml                 | 1 +
 tests/sexpr2xmldata/sexpr2xml-pv-vfb-type-crash.xml          | 1 +
 tests/sexpr2xmldata/sexpr2xml-pv.xml                         | 1 +
 tests/sexpr2xmldata/sexpr2xml-vif-rate.xml                   | 1 +
 tests/xlconfigdata/test-channel-pty.xml                      | 1 +
 tests/xlconfigdata/test-channel-unix.xml                     | 1 +
 tests/xlconfigdata/test-disk-positional-parms-full.xml       | 1 +
 tests/xlconfigdata/test-disk-positional-parms-partial.xml    | 1 +
 tests/xlconfigdata/test-disk-qed.xml                         | 1 +
 tests/xlconfigdata/test-fullvirt-cpuid.xml                   | 1 +
 .../test-fullvirt-direct-kernel-boot-bogus-extra.xml         | 1 +
 .../xlconfigdata/test-fullvirt-direct-kernel-boot-extra.xml  | 1 +
 tests/xlconfigdata/test-fullvirt-direct-kernel-boot.xml      | 1 +
 tests/xlconfigdata/test-fullvirt-hpet-timer.xml              | 1 +
 tests/xlconfigdata/test-fullvirt-multi-timer.xml             | 1 +
 tests/xlconfigdata/test-fullvirt-multiserial.xml             | 1 +
 tests/xlconfigdata/test-fullvirt-multiusb.xml                | 1 +
 tests/xlconfigdata/test-fullvirt-nestedhvm-disabled.xml      | 1 +
 tests/xlconfigdata/test-fullvirt-nestedhvm.xml               | 1 +
 tests/xlconfigdata/test-fullvirt-nohap.xml                   | 1 +
 tests/xlconfigdata/test-fullvirt-ovmf.xml                    | 1 +
 tests/xlconfigdata/test-fullvirt-ovswitch-tagged.xml         | 1 +
 tests/xlconfigdata/test-fullvirt-ovswitch-trunked.xml        | 1 +
 tests/xlconfigdata/test-fullvirt-tsc-timer.xml               | 1 +
 tests/xlconfigdata/test-fullvirt-type.xml                    | 1 +
 tests/xlconfigdata/test-fullvirt-vnuma.xml                   | 1 +
 tests/xlconfigdata/test-new-disk.xml                         | 1 +
 .../xlconfigdata/test-paravirt-cmdline-bogus-extra-root.xml  | 1 +
 tests/xlconfigdata/test-paravirt-cmdline-extra-root.xml      | 1 +
 tests/xlconfigdata/test-paravirt-cmdline.xml                 | 1 +
 tests/xlconfigdata/test-paravirt-maxvcpus.xml                | 1 +
 tests/xlconfigdata/test-paravirt-type.xml                    | 1 +
 tests/xlconfigdata/test-pvh-type.xml                         | 1 +
 tests/xlconfigdata/test-rbd-multihost-noauth.xml             | 1 +
 tests/xlconfigdata/test-spice-features.xml                   | 1 +
 tests/xlconfigdata/test-spice.xml                            | 1 +
 tests/xlconfigdata/test-usb.xml                              | 1 +
 tests/xlconfigdata/test-usbctrl.xml                          | 1 +
 tests/xlconfigdata/test-vif-multi-ip.xml                     | 1 +
 tests/xlconfigdata/test-vif-rate.xml                         | 1 +
 tests/xlconfigdata/test-vif-typename.xml                     | 1 +
 tests/xmconfigdata/test-disk-drv-blktap-raw.xml              | 1 +
 tests/xmconfigdata/test-disk-drv-blktap2-raw.xml             | 1 +
 tests/xmconfigdata/test-escape-paths.xml                     | 1 +
 tests/xmconfigdata/test-fullvirt-default-feature.xml         | 1 +
 tests/xmconfigdata/test-fullvirt-force-hpet.xml              | 1 +
 tests/xmconfigdata/test-fullvirt-force-nohpet.xml            | 1 +
 tests/xmconfigdata/test-fullvirt-localtime.xml               | 1 +
 tests/xmconfigdata/test-fullvirt-net-netfront.xml            | 1 +
 tests/xmconfigdata/test-fullvirt-new-cdrom.xml               | 1 +
 tests/xmconfigdata/test-fullvirt-nohap.xml                   | 1 +
 tests/xmconfigdata/test-fullvirt-parallel-tcp.xml            | 1 +
 tests/xmconfigdata/test-fullvirt-serial-file.xml             | 1 +
 tests/xmconfigdata/test-fullvirt-serial-null.xml             | 1 +
 tests/xmconfigdata/test-fullvirt-serial-pipe.xml             | 1 +
 tests/xmconfigdata/test-fullvirt-serial-pty.xml              | 1 +
 tests/xmconfigdata/test-fullvirt-serial-stdio.xml            | 1 +
 tests/xmconfigdata/test-fullvirt-serial-tcp-telnet.xml       | 1 +
 tests/xmconfigdata/test-fullvirt-serial-tcp.xml              | 1 +
 tests/xmconfigdata/test-fullvirt-serial-udp.xml              | 1 +
 tests/xmconfigdata/test-fullvirt-serial-unix.xml             | 1 +
 tests/xmconfigdata/test-fullvirt-sound.xml                   | 1 +
 tests/xmconfigdata/test-fullvirt-usbmouse.xml                | 1 +
 tests/xmconfigdata/test-fullvirt-usbtablet.xml               | 1 +
 tests/xmconfigdata/test-fullvirt-utc.xml                     | 1 +
 tests/xmconfigdata/test-no-source-cdrom.xml                  | 1 +
 tests/xmconfigdata/test-paravirt-extra-root.xml              | 1 +
 tests/xmconfigdata/test-paravirt-maxvcpus.xml                | 1 +
 tests/xmconfigdata/test-paravirt-net-e1000.xml               | 1 +
 tests/xmconfigdata/test-paravirt-net-vifname.xml             | 1 +
 tests/xmconfigdata/test-paravirt-new-pvfb-vncdisplay.xml     | 1 +
 tests/xmconfigdata/test-paravirt-new-pvfb.xml                | 1 +
 tests/xmconfigdata/test-paravirt-root.xml                    | 1 +
 tests/xmconfigdata/test-paravirt-vcpu.xml                    | 1 +
 tests/xmconfigdata/test-pci-devs.xml                         | 1 +
 121 files changed, 125 insertions(+)

diff --git a/src/libxl/libxl_domain.c b/src/libxl/libxl_domain.c
index ffafa7967d..287406d323 100644
--- a/src/libxl/libxl_domain.c
+++ b/src/libxl/libxl_domain.c
@@ -417,6 +417,11 @@ libxlDomainDefPostParse(virDomainDefPtr def,
         def->memballoon = memballoon;
     }
 
+    /* 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;
 }
 
diff --git a/tests/sexpr2xmldata/sexpr2xml-boot-grub.xml b/tests/sexpr2xmldata/sexpr2xml-boot-grub.xml
index 5524af8e2c..0889c68ed0 100644
--- a/tests/sexpr2xmldata/sexpr2xml-boot-grub.xml
+++ b/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>
diff --git a/tests/sexpr2xmldata/sexpr2xml-bridge-ipaddr.xml b/tests/sexpr2xmldata/sexpr2xml-bridge-ipaddr.xml
index c9ab2df511..9c83847afe 100644
--- a/tests/sexpr2xmldata/sexpr2xml-bridge-ipaddr.xml
+++ b/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'/>
diff --git a/tests/sexpr2xmldata/sexpr2xml-curmem.xml b/tests/sexpr2xmldata/sexpr2xml-curmem.xml
index a976986a12..e091829444 100644
--- a/tests/sexpr2xmldata/sexpr2xml-curmem.xml
+++ b/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'/>
diff --git a/tests/sexpr2xmldata/sexpr2xml-disk-block-shareable.xml b/tests/sexpr2xmldata/sexpr2xml-disk-block-shareable.xml
index 9f757efa2d..800b583192 100644
--- a/tests/sexpr2xmldata/sexpr2xml-disk-block-shareable.xml
+++ b/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'/>
diff --git a/tests/sexpr2xmldata/sexpr2xml-disk-block.xml b/tests/sexpr2xmldata/sexpr2xml-disk-block.xml
index edca582418..e8a236e3d1 100644
--- a/tests/sexpr2xmldata/sexpr2xml-disk-block.xml
+++ b/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>
diff --git a/tests/sexpr2xmldata/sexpr2xml-disk-drv-blktap-qcow.xml b/tests/sexpr2xmldata/sexpr2xml-disk-drv-blktap-qcow.xml
index 80f6dd205f..57bb88cd2b 100644
--- a/tests/sexpr2xmldata/sexpr2xml-disk-drv-blktap-qcow.xml
+++ b/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>
diff --git a/tests/sexpr2xmldata/sexpr2xml-disk-drv-blktap-raw.xml b/tests/sexpr2xmldata/sexpr2xml-disk-drv-blktap-raw.xml
index 71e7c40b63..c390053e82 100644
--- a/tests/sexpr2xmldata/sexpr2xml-disk-drv-blktap-raw.xml
+++ b/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>
diff --git a/tests/sexpr2xmldata/sexpr2xml-disk-drv-blktap2-raw.xml b/tests/sexpr2xmldata/sexpr2xml-disk-drv-blktap2-raw.xml
index bd244bbc39..3a44af0760 100644
--- a/tests/sexpr2xmldata/sexpr2xml-disk-drv-blktap2-raw.xml
+++ b/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>
diff --git a/tests/sexpr2xmldata/sexpr2xml-disk-file.xml b/tests/sexpr2xmldata/sexpr2xml-disk-file.xml
index 48fee36117..9aae240832 100644
--- a/tests/sexpr2xmldata/sexpr2xml-disk-file.xml
+++ b/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>
diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-autoport.xml b/tests/sexpr2xmldata/sexpr2xml-fv-autoport.xml
index cf6683feea..20d60602d3 100644
--- a/tests/sexpr2xmldata/sexpr2xml-fv-autoport.xml
+++ b/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'/>
diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-empty-kernel.xml b/tests/sexpr2xmldata/sexpr2xml-fv-empty-kernel.xml
index dd5b46a6a9..7cc4381885 100644
--- a/tests/sexpr2xmldata/sexpr2xml-fv-empty-kernel.xml
+++ b/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'/>
diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-force-hpet.xml b/tests/sexpr2xmldata/sexpr2xml-fv-force-hpet.xml
index 4c120674b5..831417107d 100644
--- a/tests/sexpr2xmldata/sexpr2xml-fv-force-hpet.xml
+++ b/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'/>
diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-force-nohpet.xml b/tests/sexpr2xmldata/sexpr2xml-fv-force-nohpet.xml
index 5652e9a692..f1af499d07 100644
--- a/tests/sexpr2xmldata/sexpr2xml-fv-force-nohpet.xml
+++ b/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'/>
diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-kernel.xml b/tests/sexpr2xmldata/sexpr2xml-fv-kernel.xml
index a3d54ae3c1..95fab2f9c1 100644
--- a/tests/sexpr2xmldata/sexpr2xml-fv-kernel.xml
+++ b/tests/sexpr2xmldata/sexpr2xml-fv-kernel.xml
@@ -22,6 +22,7 @@
       <source file='/root/some.img'/>
       <target dev='xvda' bus='xen'/>
     </disk>
+    <controller type='xenbus' index='0'/>
     <serial type='pty'>
       <target port='0'/>
     </serial>
diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-localtime.xml b/tests/sexpr2xmldata/sexpr2xml-fv-localtime.xml
index d985afbf13..d4bc171aed 100644
--- a/tests/sexpr2xmldata/sexpr2xml-fv-localtime.xml
+++ b/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'/>
diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-net-netfront.xml b/tests/sexpr2xmldata/sexpr2xml-fv-net-netfront.xml
index c15fe80a1b..058299af7c 100644
--- a/tests/sexpr2xmldata/sexpr2xml-fv-net-netfront.xml
+++ b/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'/>
diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-parallel-tcp.xml b/tests/sexpr2xmldata/sexpr2xml-fv-parallel-tcp.xml
index 2c4fd687a0..9af01d072c 100644
--- a/tests/sexpr2xmldata/sexpr2xml-fv-parallel-tcp.xml
+++ b/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'/>
diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-serial-dev-2-ports.xml b/tests/sexpr2xmldata/sexpr2xml-fv-serial-dev-2-ports.xml
index d72e503f8a..e352250696 100644
--- a/tests/sexpr2xmldata/sexpr2xml-fv-serial-dev-2-ports.xml
+++ b/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'/>
diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-serial-dev-2nd-port.xml b/tests/sexpr2xmldata/sexpr2xml-fv-serial-dev-2nd-port.xml
index 860d24e055..51d2a7c2d7 100644
--- a/tests/sexpr2xmldata/sexpr2xml-fv-serial-dev-2nd-port.xml
+++ b/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'/>
diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-serial-file.xml b/tests/sexpr2xmldata/sexpr2xml-fv-serial-file.xml
index c56e5432ce..cce3a9e0b4 100644
--- a/tests/sexpr2xmldata/sexpr2xml-fv-serial-file.xml
+++ b/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'/>
diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-serial-null.xml b/tests/sexpr2xmldata/sexpr2xml-fv-serial-null.xml
index 0615bf4b34..d68bfa89ae 100644
--- a/tests/sexpr2xmldata/sexpr2xml-fv-serial-null.xml
+++ b/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'/>
diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-serial-pipe.xml b/tests/sexpr2xmldata/sexpr2xml-fv-serial-pipe.xml
index 00518e62f3..5ab4048d29 100644
--- a/tests/sexpr2xmldata/sexpr2xml-fv-serial-pipe.xml
+++ b/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'/>
diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-serial-pty.xml b/tests/sexpr2xmldata/sexpr2xml-fv-serial-pty.xml
index e9d3c0e6a6..89d371dc36 100644
--- a/tests/sexpr2xmldata/sexpr2xml-fv-serial-pty.xml
+++ b/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'/>
diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-serial-stdio.xml b/tests/sexpr2xmldata/sexpr2xml-fv-serial-stdio.xml
index 5cdcd25d97..9482ceccb2 100644
--- a/tests/sexpr2xmldata/sexpr2xml-fv-serial-stdio.xml
+++ b/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'/>
diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-serial-tcp-telnet.xml b/tests/sexpr2xmldata/sexpr2xml-fv-serial-tcp-telnet.xml
index 8457f49f8c..ae7a4c54e0 100644
--- a/tests/sexpr2xmldata/sexpr2xml-fv-serial-tcp-telnet.xml
+++ b/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'/>
diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-serial-tcp.xml b/tests/sexpr2xmldata/sexpr2xml-fv-serial-tcp.xml
index 973f8c1cdd..20cbdb6815 100644
--- a/tests/sexpr2xmldata/sexpr2xml-fv-serial-tcp.xml
+++ b/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'/>
diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-serial-udp.xml b/tests/sexpr2xmldata/sexpr2xml-fv-serial-udp.xml
index 2f14f17be5..ece6a2684e 100644
--- a/tests/sexpr2xmldata/sexpr2xml-fv-serial-udp.xml
+++ b/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'/>
diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-serial-unix.xml b/tests/sexpr2xmldata/sexpr2xml-fv-serial-unix.xml
index c2f32144e7..2740e99d70 100644
--- a/tests/sexpr2xmldata/sexpr2xml-fv-serial-unix.xml
+++ b/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'/>
diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-sound-all.xml b/tests/sexpr2xmldata/sexpr2xml-fv-sound-all.xml
index c2ea63f3b1..d6f0bf0e67 100644
--- a/tests/sexpr2xmldata/sexpr2xml-fv-sound-all.xml
+++ b/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'/>
diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-sound.xml b/tests/sexpr2xmldata/sexpr2xml-fv-sound.xml
index c2ea63f3b1..d6f0bf0e67 100644
--- a/tests/sexpr2xmldata/sexpr2xml-fv-sound.xml
+++ b/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'/>
diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-usbmouse.xml b/tests/sexpr2xmldata/sexpr2xml-fv-usbmouse.xml
index 1f919b8c07..f32754b88c 100644
--- a/tests/sexpr2xmldata/sexpr2xml-fv-usbmouse.xml
+++ b/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'/>
diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-usbtablet.xml b/tests/sexpr2xmldata/sexpr2xml-fv-usbtablet.xml
index 639517ee3a..f16804d9ba 100644
--- a/tests/sexpr2xmldata/sexpr2xml-fv-usbtablet.xml
+++ b/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'/>
diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-utc.xml b/tests/sexpr2xmldata/sexpr2xml-fv-utc.xml
index d281090c65..0ef29a6f5d 100644
--- a/tests/sexpr2xmldata/sexpr2xml-fv-utc.xml
+++ b/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'/>
diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-v2.xml b/tests/sexpr2xmldata/sexpr2xml-fv-v2.xml
index d281090c65..0ef29a6f5d 100644
--- a/tests/sexpr2xmldata/sexpr2xml-fv-v2.xml
+++ b/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'/>
diff --git a/tests/sexpr2xmldata/sexpr2xml-fv.xml b/tests/sexpr2xmldata/sexpr2xml-fv.xml
index d281090c65..0ef29a6f5d 100644
--- a/tests/sexpr2xmldata/sexpr2xml-fv.xml
+++ b/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'/>
diff --git a/tests/sexpr2xmldata/sexpr2xml-net-bridged.xml b/tests/sexpr2xmldata/sexpr2xml-net-bridged.xml
index c97eeb0a12..2c07e15859 100644
--- a/tests/sexpr2xmldata/sexpr2xml-net-bridged.xml
+++ b/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'/>
diff --git a/tests/sexpr2xmldata/sexpr2xml-net-e1000.xml b/tests/sexpr2xmldata/sexpr2xml-net-e1000.xml
index ba9a0b2f16..3f79e86444 100644
--- a/tests/sexpr2xmldata/sexpr2xml-net-e1000.xml
+++ b/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'/>
diff --git a/tests/sexpr2xmldata/sexpr2xml-net-routed.xml b/tests/sexpr2xmldata/sexpr2xml-net-routed.xml
index db15b9ddba..a2975fb31d 100644
--- a/tests/sexpr2xmldata/sexpr2xml-net-routed.xml
+++ b/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'/>
diff --git a/tests/sexpr2xmldata/sexpr2xml-no-source-cdrom.xml b/tests/sexpr2xmldata/sexpr2xml-no-source-cdrom.xml
index a02104d0df..ae61449a90 100644
--- a/tests/sexpr2xmldata/sexpr2xml-no-source-cdrom.xml
+++ b/tests/sexpr2xmldata/sexpr2xml-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'/>
diff --git a/tests/sexpr2xmldata/sexpr2xml-pci-devs.xml b/tests/sexpr2xmldata/sexpr2xml-pci-devs.xml
index ab46fb9170..4606b6ccbd 100644
--- a/tests/sexpr2xmldata/sexpr2xml-pci-devs.xml
+++ b/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>
diff --git a/tests/sexpr2xmldata/sexpr2xml-pv-bootloader-cmdline.xml b/tests/sexpr2xmldata/sexpr2xml-pv-bootloader-cmdline.xml
index b2b63bc545..5b8bedd788 100644
--- a/tests/sexpr2xmldata/sexpr2xml-pv-bootloader-cmdline.xml
+++ b/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>
diff --git a/tests/sexpr2xmldata/sexpr2xml-pv-bootloader.xml b/tests/sexpr2xmldata/sexpr2xml-pv-bootloader.xml
index dac1f924b7..cb4b051e35 100644
--- a/tests/sexpr2xmldata/sexpr2xml-pv-bootloader.xml
+++ b/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>
diff --git a/tests/sexpr2xmldata/sexpr2xml-pv-localtime.xml b/tests/sexpr2xmldata/sexpr2xml-pv-localtime.xml
index 124bd6f37d..ce057d9538 100644
--- a/tests/sexpr2xmldata/sexpr2xml-pv-localtime.xml
+++ b/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>
diff --git a/tests/sexpr2xmldata/sexpr2xml-pv-vcpus.xml b/tests/sexpr2xmldata/sexpr2xml-pv-vcpus.xml
index 876a02746c..6d498325e3 100644
--- a/tests/sexpr2xmldata/sexpr2xml-pv-vcpus.xml
+++ b/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>
diff --git a/tests/sexpr2xmldata/sexpr2xml-pv-vfb-new-vncdisplay.xml b/tests/sexpr2xmldata/sexpr2xml-pv-vfb-new-vncdisplay.xml
index e2dbfab36a..64e1423f78 100644
--- a/tests/sexpr2xmldata/sexpr2xml-pv-vfb-new-vncdisplay.xml
+++ b/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>
diff --git a/tests/sexpr2xmldata/sexpr2xml-pv-vfb-new.xml b/tests/sexpr2xmldata/sexpr2xml-pv-vfb-new.xml
index 3fd66c45e1..ccd6824af3 100644
--- a/tests/sexpr2xmldata/sexpr2xml-pv-vfb-new.xml
+++ b/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>
diff --git a/tests/sexpr2xmldata/sexpr2xml-pv-vfb-type-crash.xml b/tests/sexpr2xmldata/sexpr2xml-pv-vfb-type-crash.xml
index d9cb6569c5..6ef05534e4 100644
--- a/tests/sexpr2xmldata/sexpr2xml-pv-vfb-type-crash.xml
+++ b/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'/>
diff --git a/tests/sexpr2xmldata/sexpr2xml-pv.xml b/tests/sexpr2xmldata/sexpr2xml-pv.xml
index 48fee36117..9aae240832 100644
--- a/tests/sexpr2xmldata/sexpr2xml-pv.xml
+++ b/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>
diff --git a/tests/sexpr2xmldata/sexpr2xml-vif-rate.xml b/tests/sexpr2xmldata/sexpr2xml-vif-rate.xml
index 77be06e94b..4b7cb21031 100644
--- a/tests/sexpr2xmldata/sexpr2xml-vif-rate.xml
+++ b/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'/>
diff --git a/tests/xlconfigdata/test-channel-pty.xml b/tests/xlconfigdata/test-channel-pty.xml
index d1ffb86a1d..96e904d9c7 100644
--- a/tests/xlconfigdata/test-channel-pty.xml
+++ b/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>
diff --git a/tests/xlconfigdata/test-channel-unix.xml b/tests/xlconfigdata/test-channel-unix.xml
index e7102d23b5..378b265fd7 100644
--- a/tests/xlconfigdata/test-channel-unix.xml
+++ b/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>
diff --git a/tests/xlconfigdata/test-disk-positional-parms-full.xml b/tests/xlconfigdata/test-disk-positional-parms-full.xml
index bb04ca7109..8961ad5d82 100644
--- a/tests/xlconfigdata/test-disk-positional-parms-full.xml
+++ b/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'/>
diff --git a/tests/xlconfigdata/test-disk-positional-parms-partial.xml b/tests/xlconfigdata/test-disk-positional-parms-partial.xml
index 14f4a72ae1..308011b015 100644
--- a/tests/xlconfigdata/test-disk-positional-parms-partial.xml
+++ b/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'/>
diff --git a/tests/xlconfigdata/test-disk-qed.xml b/tests/xlconfigdata/test-disk-qed.xml
index 90c0a97ae2..8e782c19c6 100644
--- a/tests/xlconfigdata/test-disk-qed.xml
+++ b/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'/>
diff --git a/tests/xlconfigdata/test-fullvirt-cpuid.xml b/tests/xlconfigdata/test-fullvirt-cpuid.xml
index 0979b10fa2..e953e76303 100644
--- a/tests/xlconfigdata/test-fullvirt-cpuid.xml
+++ b/tests/xlconfigdata/test-fullvirt-cpuid.xml
@@ -23,6 +23,7 @@
   <on_crash>restart</on_crash>
   <devices>
     <emulator>/usr/lib/xen/bin/qemu-system-i386</emulator>
+    <controller type='xenbus' index='0'/>
     <input type='mouse' bus='ps2'/>
     <input type='keyboard' bus='ps2'/>
     <graphics type='vnc' port='-1' autoport='yes' listen='127.0.0.1'>
diff --git a/tests/xlconfigdata/test-fullvirt-direct-kernel-boot-bogus-extra.xml b/tests/xlconfigdata/test-fullvirt-direct-kernel-boot-bogus-extra.xml
index 8946b1d8cb..41b82387ee 100644
--- a/tests/xlconfigdata/test-fullvirt-direct-kernel-boot-bogus-extra.xml
+++ b/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'/>
diff --git a/tests/xlconfigdata/test-fullvirt-direct-kernel-boot-extra.xml b/tests/xlconfigdata/test-fullvirt-direct-kernel-boot-extra.xml
index 8946b1d8cb..41b82387ee 100644
--- a/tests/xlconfigdata/test-fullvirt-direct-kernel-boot-extra.xml
+++ b/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'/>
diff --git a/tests/xlconfigdata/test-fullvirt-direct-kernel-boot.xml b/tests/xlconfigdata/test-fullvirt-direct-kernel-boot.xml
index 8946b1d8cb..41b82387ee 100644
--- a/tests/xlconfigdata/test-fullvirt-direct-kernel-boot.xml
+++ b/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'/>
diff --git a/tests/xlconfigdata/test-fullvirt-hpet-timer.xml b/tests/xlconfigdata/test-fullvirt-hpet-timer.xml
index 7da464c0ff..51b6994312 100644
--- a/tests/xlconfigdata/test-fullvirt-hpet-timer.xml
+++ b/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'/>
diff --git a/tests/xlconfigdata/test-fullvirt-multi-timer.xml b/tests/xlconfigdata/test-fullvirt-multi-timer.xml
index 9f600755f6..5c9e526fa7 100644
--- a/tests/xlconfigdata/test-fullvirt-multi-timer.xml
+++ b/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'/>
diff --git a/tests/xlconfigdata/test-fullvirt-multiserial.xml b/tests/xlconfigdata/test-fullvirt-multiserial.xml
index 120677a468..d099a182c8 100644
--- a/tests/xlconfigdata/test-fullvirt-multiserial.xml
+++ b/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'/>
diff --git a/tests/xlconfigdata/test-fullvirt-multiusb.xml b/tests/xlconfigdata/test-fullvirt-multiusb.xml
index bb7beaa1d3..85f36cf9ed 100644
--- a/tests/xlconfigdata/test-fullvirt-multiusb.xml
+++ b/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'/>
diff --git a/tests/xlconfigdata/test-fullvirt-nestedhvm-disabled.xml b/tests/xlconfigdata/test-fullvirt-nestedhvm-disabled.xml
index 9a0df958e2..439e3b119c 100644
--- a/tests/xlconfigdata/test-fullvirt-nestedhvm-disabled.xml
+++ b/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'/>
diff --git a/tests/xlconfigdata/test-fullvirt-nestedhvm.xml b/tests/xlconfigdata/test-fullvirt-nestedhvm.xml
index a311314d80..f8412ffce7 100644
--- a/tests/xlconfigdata/test-fullvirt-nestedhvm.xml
+++ b/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'/>
diff --git a/tests/xlconfigdata/test-fullvirt-nohap.xml b/tests/xlconfigdata/test-fullvirt-nohap.xml
index 4f4942fcd7..8167ea0133 100644
--- a/tests/xlconfigdata/test-fullvirt-nohap.xml
+++ b/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'/>
diff --git a/tests/xlconfigdata/test-fullvirt-ovmf.xml b/tests/xlconfigdata/test-fullvirt-ovmf.xml
index 4efdac58bd..8994b3ea36 100644
--- a/tests/xlconfigdata/test-fullvirt-ovmf.xml
+++ b/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'/>
diff --git a/tests/xlconfigdata/test-fullvirt-ovswitch-tagged.xml b/tests/xlconfigdata/test-fullvirt-ovswitch-tagged.xml
index 63f3258b84..3256f616db 100644
--- a/tests/xlconfigdata/test-fullvirt-ovswitch-tagged.xml
+++ b/tests/xlconfigdata/test-fullvirt-ovswitch-tagged.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'/>
diff --git a/tests/xlconfigdata/test-fullvirt-ovswitch-trunked.xml b/tests/xlconfigdata/test-fullvirt-ovswitch-trunked.xml
index 72d547b2c1..46c0a0f8f8 100644
--- a/tests/xlconfigdata/test-fullvirt-ovswitch-trunked.xml
+++ b/tests/xlconfigdata/test-fullvirt-ovswitch-trunked.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'/>
diff --git a/tests/xlconfigdata/test-fullvirt-tsc-timer.xml b/tests/xlconfigdata/test-fullvirt-tsc-timer.xml
index 6ffcf960fe..f048486380 100644
--- a/tests/xlconfigdata/test-fullvirt-tsc-timer.xml
+++ b/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'/>
diff --git a/tests/xlconfigdata/test-fullvirt-type.xml b/tests/xlconfigdata/test-fullvirt-type.xml
index da8e36001c..6d79300fa9 100644
--- a/tests/xlconfigdata/test-fullvirt-type.xml
+++ b/tests/xlconfigdata/test-fullvirt-type.xml
@@ -20,6 +20,7 @@
   <on_crash>restart</on_crash>
   <devices>
     <emulator>/usr/lib/xen/bin/qemu-system-i386</emulator>
+    <controller type='xenbus' index='0'/>
     <input type='mouse' bus='ps2'/>
     <input type='keyboard' bus='ps2'/>
     <memballoon model='xen'/>
diff --git a/tests/xlconfigdata/test-fullvirt-vnuma.xml b/tests/xlconfigdata/test-fullvirt-vnuma.xml
index fe1904e874..99092817de 100644
--- a/tests/xlconfigdata/test-fullvirt-vnuma.xml
+++ b/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'/>
diff --git a/tests/xlconfigdata/test-new-disk.xml b/tests/xlconfigdata/test-new-disk.xml
index bb04ca7109..8961ad5d82 100644
--- a/tests/xlconfigdata/test-new-disk.xml
+++ b/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'/>
diff --git a/tests/xlconfigdata/test-paravirt-cmdline-bogus-extra-root.xml b/tests/xlconfigdata/test-paravirt-cmdline-bogus-extra-root.xml
index c5758e4bb6..a25eb29200 100644
--- a/tests/xlconfigdata/test-paravirt-cmdline-bogus-extra-root.xml
+++ b/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'/>
diff --git a/tests/xlconfigdata/test-paravirt-cmdline-extra-root.xml b/tests/xlconfigdata/test-paravirt-cmdline-extra-root.xml
index c5758e4bb6..a25eb29200 100644
--- a/tests/xlconfigdata/test-paravirt-cmdline-extra-root.xml
+++ b/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'/>
diff --git a/tests/xlconfigdata/test-paravirt-cmdline.xml b/tests/xlconfigdata/test-paravirt-cmdline.xml
index c5758e4bb6..a25eb29200 100644
--- a/tests/xlconfigdata/test-paravirt-cmdline.xml
+++ b/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'/>
diff --git a/tests/xlconfigdata/test-paravirt-maxvcpus.xml b/tests/xlconfigdata/test-paravirt-maxvcpus.xml
index ae48ae15b0..1638be1af2 100644
--- a/tests/xlconfigdata/test-paravirt-maxvcpus.xml
+++ b/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>
diff --git a/tests/xlconfigdata/test-paravirt-type.xml b/tests/xlconfigdata/test-paravirt-type.xml
index 4357640b94..0a201e05d3 100644
--- a/tests/xlconfigdata/test-paravirt-type.xml
+++ b/tests/xlconfigdata/test-paravirt-type.xml
@@ -15,6 +15,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>restart</on_crash>
   <devices>
+    <controller type='xenbus' index='0'/>
     <console type='pty'>
       <target type='xen' port='0'/>
     </console>
diff --git a/tests/xlconfigdata/test-pvh-type.xml b/tests/xlconfigdata/test-pvh-type.xml
index dc5f452f10..3ff245b969 100644
--- a/tests/xlconfigdata/test-pvh-type.xml
+++ b/tests/xlconfigdata/test-pvh-type.xml
@@ -15,6 +15,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>restart</on_crash>
   <devices>
+    <controller type='xenbus' index='0'/>
     <console type='pty'>
       <target type='xen' port='0'/>
     </console>
diff --git a/tests/xlconfigdata/test-rbd-multihost-noauth.xml b/tests/xlconfigdata/test-rbd-multihost-noauth.xml
index 847c7c44bd..df26f6cf02 100644
--- a/tests/xlconfigdata/test-rbd-multihost-noauth.xml
+++ b/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'/>
diff --git a/tests/xlconfigdata/test-spice-features.xml b/tests/xlconfigdata/test-spice-features.xml
index 6d95afb1fc..11b5f0f665 100644
--- a/tests/xlconfigdata/test-spice-features.xml
+++ b/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'/>
diff --git a/tests/xlconfigdata/test-spice.xml b/tests/xlconfigdata/test-spice.xml
index 2737698ced..745ae3b5c5 100644
--- a/tests/xlconfigdata/test-spice.xml
+++ b/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'/>
diff --git a/tests/xlconfigdata/test-usb.xml b/tests/xlconfigdata/test-usb.xml
index 5bac73b962..ce925cee25 100644
--- a/tests/xlconfigdata/test-usb.xml
+++ b/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>
diff --git a/tests/xlconfigdata/test-usbctrl.xml b/tests/xlconfigdata/test-usbctrl.xml
index 5e0346fa52..3fadd7a8cf 100644
--- a/tests/xlconfigdata/test-usbctrl.xml
+++ b/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>
diff --git a/tests/xlconfigdata/test-vif-multi-ip.xml b/tests/xlconfigdata/test-vif-multi-ip.xml
index 2e72d96374..9498518263 100644
--- a/tests/xlconfigdata/test-vif-multi-ip.xml
+++ b/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'/>
diff --git a/tests/xlconfigdata/test-vif-rate.xml b/tests/xlconfigdata/test-vif-rate.xml
index 73ed43f431..037d410d13 100644
--- a/tests/xlconfigdata/test-vif-rate.xml
+++ b/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'/>
diff --git a/tests/xlconfigdata/test-vif-typename.xml b/tests/xlconfigdata/test-vif-typename.xml
index 1c04354286..d08eff7299 100644
--- a/tests/xlconfigdata/test-vif-typename.xml
+++ b/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'/>
diff --git a/tests/xmconfigdata/test-disk-drv-blktap-raw.xml b/tests/xmconfigdata/test-disk-drv-blktap-raw.xml
index fb0cdac7f0..45a0c527f0 100644
--- a/tests/xmconfigdata/test-disk-drv-blktap-raw.xml
+++ b/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'/>
diff --git a/tests/xmconfigdata/test-disk-drv-blktap2-raw.xml b/tests/xmconfigdata/test-disk-drv-blktap2-raw.xml
index 8e2764aa89..60734d6667 100644
--- a/tests/xmconfigdata/test-disk-drv-blktap2-raw.xml
+++ b/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'/>
diff --git a/tests/xmconfigdata/test-escape-paths.xml b/tests/xmconfigdata/test-escape-paths.xml
index d95d34e031..57930b6913 100644
--- a/tests/xmconfigdata/test-escape-paths.xml
+++ b/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'/>
diff --git a/tests/xmconfigdata/test-fullvirt-default-feature.xml b/tests/xmconfigdata/test-fullvirt-default-feature.xml
index fdbba8a3af..ba8d4299a1 100644
--- a/tests/xmconfigdata/test-fullvirt-default-feature.xml
+++ b/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'/>
diff --git a/tests/xmconfigdata/test-fullvirt-force-hpet.xml b/tests/xmconfigdata/test-fullvirt-force-hpet.xml
index fdbba8a3af..ba8d4299a1 100644
--- a/tests/xmconfigdata/test-fullvirt-force-hpet.xml
+++ b/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'/>
diff --git a/tests/xmconfigdata/test-fullvirt-force-nohpet.xml b/tests/xmconfigdata/test-fullvirt-force-nohpet.xml
index e397a869ee..eaf5206227 100644
--- a/tests/xmconfigdata/test-fullvirt-force-nohpet.xml
+++ b/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'/>
diff --git a/tests/xmconfigdata/test-fullvirt-localtime.xml b/tests/xmconfigdata/test-fullvirt-localtime.xml
index 0a42cfd2aa..5574405002 100644
--- a/tests/xmconfigdata/test-fullvirt-localtime.xml
+++ b/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'/>
diff --git a/tests/xmconfigdata/test-fullvirt-net-netfront.xml b/tests/xmconfigdata/test-fullvirt-net-netfront.xml
index f57d6eb5ca..fb8d0e017e 100644
--- a/tests/xmconfigdata/test-fullvirt-net-netfront.xml
+++ b/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'/>
diff --git a/tests/xmconfigdata/test-fullvirt-new-cdrom.xml b/tests/xmconfigdata/test-fullvirt-new-cdrom.xml
index 4a496cebe3..9e44651a4d 100644
--- a/tests/xmconfigdata/test-fullvirt-new-cdrom.xml
+++ b/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'/>
diff --git a/tests/xmconfigdata/test-fullvirt-nohap.xml b/tests/xmconfigdata/test-fullvirt-nohap.xml
index d8ac373574..82caa1e842 100644
--- a/tests/xmconfigdata/test-fullvirt-nohap.xml
+++ b/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'/>
diff --git a/tests/xmconfigdata/test-fullvirt-parallel-tcp.xml b/tests/xmconfigdata/test-fullvirt-parallel-tcp.xml
index d2cae8f98b..c96079c5ba 100644
--- a/tests/xmconfigdata/test-fullvirt-parallel-tcp.xml
+++ b/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'/>
diff --git a/tests/xmconfigdata/test-fullvirt-serial-file.xml b/tests/xmconfigdata/test-fullvirt-serial-file.xml
index 4b2b432efd..69b4958f6e 100644
--- a/tests/xmconfigdata/test-fullvirt-serial-file.xml
+++ b/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'/>
diff --git a/tests/xmconfigdata/test-fullvirt-serial-null.xml b/tests/xmconfigdata/test-fullvirt-serial-null.xml
index c657139fdc..3d07c394f8 100644
--- a/tests/xmconfigdata/test-fullvirt-serial-null.xml
+++ b/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'/>
diff --git a/tests/xmconfigdata/test-fullvirt-serial-pipe.xml b/tests/xmconfigdata/test-fullvirt-serial-pipe.xml
index 1cb8804bce..617db43dd1 100644
--- a/tests/xmconfigdata/test-fullvirt-serial-pipe.xml
+++ b/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'/>
diff --git a/tests/xmconfigdata/test-fullvirt-serial-pty.xml b/tests/xmconfigdata/test-fullvirt-serial-pty.xml
index 5dc5e2fa9a..e6bc2908a4 100644
--- a/tests/xmconfigdata/test-fullvirt-serial-pty.xml
+++ b/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'/>
diff --git a/tests/xmconfigdata/test-fullvirt-serial-stdio.xml b/tests/xmconfigdata/test-fullvirt-serial-stdio.xml
index ece851585d..9d0c2ebcc1 100644
--- a/tests/xmconfigdata/test-fullvirt-serial-stdio.xml
+++ b/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'/>
diff --git a/tests/xmconfigdata/test-fullvirt-serial-tcp-telnet.xml b/tests/xmconfigdata/test-fullvirt-serial-tcp-telnet.xml
index bd5317787f..372c859853 100644
--- a/tests/xmconfigdata/test-fullvirt-serial-tcp-telnet.xml
+++ b/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'/>
diff --git a/tests/xmconfigdata/test-fullvirt-serial-tcp.xml b/tests/xmconfigdata/test-fullvirt-serial-tcp.xml
index 403bf68c05..774fe59362 100644
--- a/tests/xmconfigdata/test-fullvirt-serial-tcp.xml
+++ b/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'/>
diff --git a/tests/xmconfigdata/test-fullvirt-serial-udp.xml b/tests/xmconfigdata/test-fullvirt-serial-udp.xml
index 5f0b6c0d17..0f2450a7dd 100644
--- a/tests/xmconfigdata/test-fullvirt-serial-udp.xml
+++ b/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'/>
diff --git a/tests/xmconfigdata/test-fullvirt-serial-unix.xml b/tests/xmconfigdata/test-fullvirt-serial-unix.xml
index 6f6b1cf5b8..2cb8b0049f 100644
--- a/tests/xmconfigdata/test-fullvirt-serial-unix.xml
+++ b/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'/>
diff --git a/tests/xmconfigdata/test-fullvirt-sound.xml b/tests/xmconfigdata/test-fullvirt-sound.xml
index 0fbd9f6a46..ac9a4c3eb6 100644
--- a/tests/xmconfigdata/test-fullvirt-sound.xml
+++ b/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'/>
diff --git a/tests/xmconfigdata/test-fullvirt-usbmouse.xml b/tests/xmconfigdata/test-fullvirt-usbmouse.xml
index 244a42b514..133fe53f41 100644
--- a/tests/xmconfigdata/test-fullvirt-usbmouse.xml
+++ b/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'/>
diff --git a/tests/xmconfigdata/test-fullvirt-usbtablet.xml b/tests/xmconfigdata/test-fullvirt-usbtablet.xml
index e315f7e658..ce12d93f6b 100644
--- a/tests/xmconfigdata/test-fullvirt-usbtablet.xml
+++ b/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'/>
diff --git a/tests/xmconfigdata/test-fullvirt-utc.xml b/tests/xmconfigdata/test-fullvirt-utc.xml
index 4a496cebe3..9e44651a4d 100644
--- a/tests/xmconfigdata/test-fullvirt-utc.xml
+++ b/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'/>
diff --git a/tests/xmconfigdata/test-no-source-cdrom.xml b/tests/xmconfigdata/test-no-source-cdrom.xml
index 4a39150795..9d28eb5a8d 100644
--- a/tests/xmconfigdata/test-no-source-cdrom.xml
+++ b/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'/>
diff --git a/tests/xmconfigdata/test-paravirt-extra-root.xml b/tests/xmconfigdata/test-paravirt-extra-root.xml
index 325b07d8e1..120b021d11 100644
--- a/tests/xmconfigdata/test-paravirt-extra-root.xml
+++ b/tests/xmconfigdata/test-paravirt-extra-root.xml
@@ -19,6 +19,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'/>
diff --git a/tests/xmconfigdata/test-paravirt-maxvcpus.xml b/tests/xmconfigdata/test-paravirt-maxvcpus.xml
index 3012821ad4..b2fd79cabf 100644
--- a/tests/xmconfigdata/test-paravirt-maxvcpus.xml
+++ b/tests/xmconfigdata/test-paravirt-maxvcpus.xml
@@ -19,6 +19,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'/>
diff --git a/tests/xmconfigdata/test-paravirt-net-e1000.xml b/tests/xmconfigdata/test-paravirt-net-e1000.xml
index 7b7112dcff..40c20868ed 100644
--- a/tests/xmconfigdata/test-paravirt-net-e1000.xml
+++ b/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'/>
diff --git a/tests/xmconfigdata/test-paravirt-net-vifname.xml b/tests/xmconfigdata/test-paravirt-net-vifname.xml
index 36333c8d60..81b6185c83 100644
--- a/tests/xmconfigdata/test-paravirt-net-vifname.xml
+++ b/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'/>
diff --git a/tests/xmconfigdata/test-paravirt-new-pvfb-vncdisplay.xml b/tests/xmconfigdata/test-paravirt-new-pvfb-vncdisplay.xml
index b7fc9f7230..3633b6444d 100644
--- a/tests/xmconfigdata/test-paravirt-new-pvfb-vncdisplay.xml
+++ b/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'/>
diff --git a/tests/xmconfigdata/test-paravirt-new-pvfb.xml b/tests/xmconfigdata/test-paravirt-new-pvfb.xml
index 60604a20a0..ac859fc0d0 100644
--- a/tests/xmconfigdata/test-paravirt-new-pvfb.xml
+++ b/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'/>
diff --git a/tests/xmconfigdata/test-paravirt-root.xml b/tests/xmconfigdata/test-paravirt-root.xml
index 12d1e3bdbd..d2ad4e88da 100644
--- a/tests/xmconfigdata/test-paravirt-root.xml
+++ b/tests/xmconfigdata/test-paravirt-root.xml
@@ -19,6 +19,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'/>
diff --git a/tests/xmconfigdata/test-paravirt-vcpu.xml b/tests/xmconfigdata/test-paravirt-vcpu.xml
index 3012821ad4..b2fd79cabf 100644
--- a/tests/xmconfigdata/test-paravirt-vcpu.xml
+++ b/tests/xmconfigdata/test-paravirt-vcpu.xml
@@ -19,6 +19,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'/>
diff --git a/tests/xmconfigdata/test-pci-devs.xml b/tests/xmconfigdata/test-pci-devs.xml
index 27f59c28b0..5d5d29c61c 100644
--- a/tests/xmconfigdata/test-pci-devs.xml
+++ b/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'/>
-- 
GitLab