diff --git a/ChangeLog b/ChangeLog
index 63d5734b9d..fd1ccba896 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+Thu May  8 10:36:11 EST 2008 Daniel P. Berrange <berrange@redhat.com>
+
+	* src/xm_internal.c, src/xend_internal.c: Added 'bus' attribute
+	to disk target.
+	* tests/sexpr2xmldata/*.xml, tests/xmconfigdata/*.xml: Update
+	to add bus attribute to disks
+	* tests/sexpr2xmltest.c: Fix XenD config version for 2 test cases
+
 Thu May  8 10:19:11 EST 2008 Daniel P. Berrange <berrange@redhat.com>
 
 	* docs/page.xsl: Fix detection of sub-headings
diff --git a/src/xend_internal.c b/src/xend_internal.c
index f9db57130c..6d64509b39 100644
--- a/src/xend_internal.c
+++ b/src/xend_internal.c
@@ -1860,6 +1860,7 @@ xend_parse_sexp_desc(virConnectPtr conn, struct sexpr *root,
             const char *src = NULL;
             const char *dst = NULL;
             const char *mode = NULL;
+            const char *bus = NULL;
 
             /* Again dealing with (vbd...) vs (tap ...) differences */
             if (sexpr_lookup(node, "device/vbd")) {
@@ -1979,7 +1980,16 @@ xend_parse_sexp_desc(virConnectPtr conn, struct sexpr *root,
                 /* This case is the cdrom device only */
                 virBufferAddLit(&buf, "    <disk device='cdrom'>\n");
             }
-            virBufferVSprintf(&buf, "      <target dev='%s'/>\n", dst);
+
+            if (STRPREFIX(dst, "xvd") || !hvm) {
+                bus = "xen";
+            } else if (STRPREFIX(dst, "sd")) {
+                bus = "scsi";
+            } else {
+                bus = "ide";
+            }
+            virBufferVSprintf(&buf, "      <target dev='%s' bus='%s'/>\n",
+                              dst, bus);
 
 
             /* XXX should we force mode == r, if cdrom==1, or assume
@@ -2068,14 +2078,14 @@ xend_parse_sexp_desc(virConnectPtr conn, struct sexpr *root,
         if ((tmp != NULL) && (tmp[0] != 0)) {
             virBufferAddLit(&buf, "    <disk type='file' device='floppy'>\n");
             virBufferVSprintf(&buf, "      <source file='%s'/>\n", tmp);
-            virBufferAddLit(&buf, "      <target dev='fda'/>\n");
+            virBufferAddLit(&buf, "      <target dev='fda' bus='fdc'/>\n");
             virBufferAddLit(&buf, "    </disk>\n");
         }
         tmp = sexpr_node(root, "domain/image/hvm/fdb");
         if ((tmp != NULL) && (tmp[0] != 0)) {
             virBufferAddLit(&buf, "    <disk type='file' device='floppy'>\n");
             virBufferVSprintf(&buf, "      <source file='%s'/>\n", tmp);
-            virBufferAddLit(&buf, "      <target dev='fdb'/>\n");
+            virBufferAddLit(&buf, "      <target dev='fdb' bus='fdc'/>\n");
             virBufferAddLit(&buf, "    </disk>\n");
         }
 
@@ -2086,7 +2096,7 @@ xend_parse_sexp_desc(virConnectPtr conn, struct sexpr *root,
                 virBufferAddLit(&buf, "    <disk type='file' device='cdrom'>\n");
                 virBufferAddLit(&buf, "      <driver name='file'/>\n");
                 virBufferVSprintf(&buf, "      <source file='%s'/>\n", tmp);
-                virBufferAddLit(&buf, "      <target dev='hdc'/>\n");
+                virBufferAddLit(&buf, "      <target dev='hdc' bus='ide'/>\n");
                 virBufferAddLit(&buf, "      <readonly/>\n");
                 virBufferAddLit(&buf, "    </disk>\n");
             }
diff --git a/src/xm_internal.c b/src/xm_internal.c
index c820c5369f..107caf6732 100644
--- a/src/xm_internal.c
+++ b/src/xm_internal.c
@@ -733,6 +733,7 @@ char *xenXMDomainFormatXML(virConnectPtr conn, virConfPtr conf) {
             char *head;
             char *offset;
             char *tmp, *tmp1;
+            const char *bus;
 
             if ((list->type != VIR_CONF_STRING) || (list->str == NULL))
                 goto skipdisk;
@@ -805,6 +806,14 @@ char *xenXMDomainFormatXML(virConnectPtr conn, virConfPtr conf) {
                 tmp[0] = '\0';
             }
 
+            if (STRPREFIX(dev, "xvd") || !hvm) {
+                bus = "xen";
+            } else if (STRPREFIX(dev, "sd")) {
+                bus = "scsi";
+            } else {
+                bus = "ide";
+            }
+
             virBufferVSprintf(&buf, "    <disk type='%s' device='%s'>\n",
                               block ? "block" : "file",
                               cdrom ? "cdrom" : "disk");
@@ -814,7 +823,7 @@ char *xenXMDomainFormatXML(virConnectPtr conn, virConfPtr conf) {
                 virBufferVSprintf(&buf, "      <driver name='%s'/>\n", drvName);
             if (src[0])
                 virBufferVSprintf(&buf, "      <source %s='%s'/>\n", block ? "dev" : "file", src);
-            virBufferVSprintf(&buf, "      <target dev='%s'/>\n", dev);
+            virBufferVSprintf(&buf, "      <target dev='%s' bus='%s'/>\n", dev, bus);
             if (!strcmp(head, "r") ||
                 !strcmp(head, "ro"))
                 virBufferAddLit(&buf, "      <readonly/>\n");
@@ -833,7 +842,7 @@ char *xenXMDomainFormatXML(virConnectPtr conn, virConfPtr conf) {
             virBufferAddLit(&buf, "    <disk type='file' device='cdrom'>\n");
             virBufferAddLit(&buf, "      <driver name='file'/>\n");
             virBufferVSprintf(&buf, "      <source file='%s'/>\n", str);
-            virBufferAddLit(&buf, "      <target dev='hdc'/>\n");
+            virBufferAddLit(&buf, "      <target dev='hdc' bus='ide'/>\n");
             virBufferAddLit(&buf, "      <readonly/>\n");
             virBufferAddLit(&buf, "    </disk>\n");
         }
diff --git a/tests/sexpr2xmldata/sexpr2xml-curmem.xml b/tests/sexpr2xmldata/sexpr2xml-curmem.xml
index a609f97e83..bf1907d425 100644
--- a/tests/sexpr2xmldata/sexpr2xml-curmem.xml
+++ b/tests/sexpr2xmldata/sexpr2xml-curmem.xml
@@ -24,10 +24,10 @@
     <disk type='file' device='disk'>
       <driver name='tap' type='aio'/>
       <source file='/xen/rhel5.img'/>
-      <target dev='xvda:disk'/>
+      <target dev='xvda' bus='xen'/>
     </disk>
     <input type='mouse' bus='xen'/>
-    <graphics type='vnc' port='5905'/>
+    <graphics type='vnc' port='-1'/>
     <console type='pty'>
       <target port='0'/>
     </console>
diff --git a/tests/sexpr2xmldata/sexpr2xml-disk-block-shareable.xml b/tests/sexpr2xmldata/sexpr2xml-disk-block-shareable.xml
index 35735399f1..ff4e36537a 100644
--- a/tests/sexpr2xmldata/sexpr2xml-disk-block-shareable.xml
+++ b/tests/sexpr2xmldata/sexpr2xml-disk-block-shareable.xml
@@ -12,7 +12,7 @@
     <disk type='file' device='disk'>
       <driver name='tap' type='aio'/>
       <source file='/var/lib/xen/images/rhel5pv.img'/>
-      <target dev='xvda'/>
+      <target dev='xvda' bus='xen'/>
       <shareable/>
     </disk>
     <interface type='bridge'>
diff --git a/tests/sexpr2xmldata/sexpr2xml-disk-block.xml b/tests/sexpr2xmldata/sexpr2xml-disk-block.xml
index 0bcf583902..c3c96748ef 100644
--- a/tests/sexpr2xmldata/sexpr2xml-disk-block.xml
+++ b/tests/sexpr2xmldata/sexpr2xml-disk-block.xml
@@ -16,7 +16,7 @@
     <disk type='block' device='disk'>
       <driver name='phy'/>
       <source dev='/dev/MainVG/GuestVG'/>
-      <target dev='xvda'/>
+      <target dev='xvda' bus='xen'/>
     </disk>
     <console type='pty'>
       <target port='0'/>
diff --git a/tests/sexpr2xmldata/sexpr2xml-disk-drv-blktap-qcow.xml b/tests/sexpr2xmldata/sexpr2xml-disk-drv-blktap-qcow.xml
index a0e139587b..8aa9162bcb 100644
--- a/tests/sexpr2xmldata/sexpr2xml-disk-drv-blktap-qcow.xml
+++ b/tests/sexpr2xmldata/sexpr2xml-disk-drv-blktap-qcow.xml
@@ -16,7 +16,7 @@
     <disk type='file' device='disk'>
       <driver name='tap' type='qcow'/>
       <source file='/root/some.img'/>
-      <target dev='xvda'/>
+      <target dev='xvda' bus='xen'/>
     </disk>
     <console type='pty'>
       <target port='0'/>
diff --git a/tests/sexpr2xmldata/sexpr2xml-disk-drv-blktap-raw.xml b/tests/sexpr2xmldata/sexpr2xml-disk-drv-blktap-raw.xml
index f16f1cc8d6..37fd40dc1f 100644
--- a/tests/sexpr2xmldata/sexpr2xml-disk-drv-blktap-raw.xml
+++ b/tests/sexpr2xmldata/sexpr2xml-disk-drv-blktap-raw.xml
@@ -16,7 +16,7 @@
     <disk type='file' device='disk'>
       <driver name='tap' type='aio'/>
       <source file='/root/some.img'/>
-      <target dev='xvda'/>
+      <target dev='xvda' bus='xen'/>
     </disk>
     <console type='pty'>
       <target port='0'/>
diff --git a/tests/sexpr2xmldata/sexpr2xml-disk-file.xml b/tests/sexpr2xmldata/sexpr2xml-disk-file.xml
index e0841aa8b8..24011bb3de 100644
--- a/tests/sexpr2xmldata/sexpr2xml-disk-file.xml
+++ b/tests/sexpr2xmldata/sexpr2xml-disk-file.xml
@@ -16,7 +16,7 @@
     <disk type='file' device='disk'>
       <driver name='file'/>
       <source file='/root/some.img'/>
-      <target dev='xvda'/>
+      <target dev='xvda' bus='xen'/>
     </disk>
     <console type='pty'>
       <target port='0'/>
diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-kernel.xml b/tests/sexpr2xmldata/sexpr2xml-fv-kernel.xml
index 96ce59d161..def88b4ed6 100644
--- a/tests/sexpr2xmldata/sexpr2xml-fv-kernel.xml
+++ b/tests/sexpr2xmldata/sexpr2xml-fv-kernel.xml
@@ -20,7 +20,7 @@
     <disk type='file' device='disk'>
       <driver name='file'/>
       <source file='/root/some.img'/>
-      <target dev='xvda'/>
+      <target dev='xvda' bus='xen'/>
     </disk>
     <serial type='pty'>
       <target port='0'/>
diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-legacy-vfb.xml b/tests/sexpr2xmldata/sexpr2xml-fv-legacy-vfb.xml
index 62a8d0a185..680ff1c436 100644
--- a/tests/sexpr2xmldata/sexpr2xml-fv-legacy-vfb.xml
+++ b/tests/sexpr2xmldata/sexpr2xml-fv-legacy-vfb.xml
@@ -25,7 +25,7 @@
     <disk type='block' device='disk'>
       <driver name='phy'/>
       <source dev='/dev/zvol/dsk/export/s10u4-root'/>
-      <target dev='hda'/>
+      <target dev='hda' bus='ide'/>
     </disk>
     <input type='mouse' bus='ps2'/>
     <graphics type='vnc' port='-1' keymap='en-us'/>
diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-localtime.xml b/tests/sexpr2xmldata/sexpr2xml-fv-localtime.xml
index 051097f781..e14dec2774 100644
--- a/tests/sexpr2xmldata/sexpr2xml-fv-localtime.xml
+++ b/tests/sexpr2xmldata/sexpr2xml-fv-localtime.xml
@@ -20,7 +20,7 @@
     <disk type='file' device='disk'>
       <driver name='file'/>
       <source file='/root/foo.img'/>
-      <target dev='hda'/>
+      <target dev='hda' bus='ide'/>
     </disk>
     <interface type='bridge'>
       <source bridge='xenbr0'/>
@@ -31,7 +31,7 @@
     <disk type='file' device='cdrom'>
       <driver name='file'/>
       <source file='/root/boot.iso'/>
-      <target dev='hdc'/>
+      <target dev='hdc' bus='ide'/>
       <readonly/>
     </disk>
     <input type='mouse' bus='ps2'/>
diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-parallel-tcp.xml b/tests/sexpr2xmldata/sexpr2xml-fv-parallel-tcp.xml
index 7bab9c679b..0a3032c12b 100644
--- a/tests/sexpr2xmldata/sexpr2xml-fv-parallel-tcp.xml
+++ b/tests/sexpr2xmldata/sexpr2xml-fv-parallel-tcp.xml
@@ -20,7 +20,7 @@
     <disk type='file' device='disk'>
       <driver name='file'/>
       <source file='/root/foo.img'/>
-      <target dev='hda'/>
+      <target dev='hda' bus='ide'/>
     </disk>
     <interface type='bridge'>
       <source bridge='xenbr0'/>
@@ -31,7 +31,7 @@
     <disk type='file' device='cdrom'>
       <driver name='file'/>
       <source file='/root/boot.iso'/>
-      <target dev='hdc'/>
+      <target dev='hdc' bus='ide'/>
       <readonly/>
     </disk>
     <input type='mouse' bus='ps2'/>
diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-serial-file.xml b/tests/sexpr2xmldata/sexpr2xml-fv-serial-file.xml
index 2a55b2a1b7..25e013f720 100644
--- a/tests/sexpr2xmldata/sexpr2xml-fv-serial-file.xml
+++ b/tests/sexpr2xmldata/sexpr2xml-fv-serial-file.xml
@@ -20,7 +20,7 @@
     <disk type='file' device='disk'>
       <driver name='file'/>
       <source file='/root/foo.img'/>
-      <target dev='hda'/>
+      <target dev='hda' bus='ide'/>
     </disk>
     <interface type='bridge'>
       <source bridge='xenbr0'/>
@@ -31,7 +31,7 @@
     <disk type='file' device='cdrom'>
       <driver name='file'/>
       <source file='/root/boot.iso'/>
-      <target dev='hdc'/>
+      <target dev='hdc' bus='ide'/>
       <readonly/>
     </disk>
     <input type='mouse' bus='ps2'/>
diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-serial-null.xml b/tests/sexpr2xmldata/sexpr2xml-fv-serial-null.xml
index 76fa8bf3e9..c0b6e849a3 100644
--- a/tests/sexpr2xmldata/sexpr2xml-fv-serial-null.xml
+++ b/tests/sexpr2xmldata/sexpr2xml-fv-serial-null.xml
@@ -20,7 +20,7 @@
     <disk type='file' device='disk'>
       <driver name='file'/>
       <source file='/root/foo.img'/>
-      <target dev='hda'/>
+      <target dev='hda' bus='ide'/>
     </disk>
     <interface type='bridge'>
       <source bridge='xenbr0'/>
@@ -31,7 +31,7 @@
     <disk type='file' device='cdrom'>
       <driver name='file'/>
       <source file='/root/boot.iso'/>
-      <target dev='hdc'/>
+      <target dev='hdc' bus='ide'/>
       <readonly/>
     </disk>
     <input type='mouse' bus='ps2'/>
diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-serial-pipe.xml b/tests/sexpr2xmldata/sexpr2xml-fv-serial-pipe.xml
index e2dbd14d51..e36fe7d73d 100644
--- a/tests/sexpr2xmldata/sexpr2xml-fv-serial-pipe.xml
+++ b/tests/sexpr2xmldata/sexpr2xml-fv-serial-pipe.xml
@@ -20,7 +20,7 @@
     <disk type='file' device='disk'>
       <driver name='file'/>
       <source file='/root/foo.img'/>
-      <target dev='hda'/>
+      <target dev='hda' bus='ide'/>
     </disk>
     <interface type='bridge'>
       <source bridge='xenbr0'/>
@@ -31,7 +31,7 @@
     <disk type='file' device='cdrom'>
       <driver name='file'/>
       <source file='/root/boot.iso'/>
-      <target dev='hdc'/>
+      <target dev='hdc' bus='ide'/>
       <readonly/>
     </disk>
     <input type='mouse' bus='ps2'/>
diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-serial-pty.xml b/tests/sexpr2xmldata/sexpr2xml-fv-serial-pty.xml
index 34b948858b..2c1cf265ee 100644
--- a/tests/sexpr2xmldata/sexpr2xml-fv-serial-pty.xml
+++ b/tests/sexpr2xmldata/sexpr2xml-fv-serial-pty.xml
@@ -20,7 +20,7 @@
     <disk type='file' device='disk'>
       <driver name='file'/>
       <source file='/root/foo.img'/>
-      <target dev='hda'/>
+      <target dev='hda' bus='ide'/>
     </disk>
     <interface type='bridge'>
       <source bridge='xenbr0'/>
@@ -31,7 +31,7 @@
     <disk type='file' device='cdrom'>
       <driver name='file'/>
       <source file='/root/boot.iso'/>
-      <target dev='hdc'/>
+      <target dev='hdc' bus='ide'/>
       <readonly/>
     </disk>
     <input type='mouse' bus='ps2'/>
diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-serial-stdio.xml b/tests/sexpr2xmldata/sexpr2xml-fv-serial-stdio.xml
index 1ed205eeba..03123830db 100644
--- a/tests/sexpr2xmldata/sexpr2xml-fv-serial-stdio.xml
+++ b/tests/sexpr2xmldata/sexpr2xml-fv-serial-stdio.xml
@@ -20,7 +20,7 @@
     <disk type='file' device='disk'>
       <driver name='file'/>
       <source file='/root/foo.img'/>
-      <target dev='hda'/>
+      <target dev='hda' bus='ide'/>
     </disk>
     <interface type='bridge'>
       <source bridge='xenbr0'/>
@@ -31,7 +31,7 @@
     <disk type='file' device='cdrom'>
       <driver name='file'/>
       <source file='/root/boot.iso'/>
-      <target dev='hdc'/>
+      <target dev='hdc' bus='ide'/>
       <readonly/>
     </disk>
     <input type='mouse' bus='ps2'/>
diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-serial-tcp-telnet.xml b/tests/sexpr2xmldata/sexpr2xml-fv-serial-tcp-telnet.xml
index 764ec82bf8..2f3d1c546f 100644
--- a/tests/sexpr2xmldata/sexpr2xml-fv-serial-tcp-telnet.xml
+++ b/tests/sexpr2xmldata/sexpr2xml-fv-serial-tcp-telnet.xml
@@ -20,7 +20,7 @@
     <disk type='file' device='disk'>
       <driver name='file'/>
       <source file='/root/foo.img'/>
-      <target dev='hda'/>
+      <target dev='hda' bus='ide'/>
     </disk>
     <interface type='bridge'>
       <source bridge='xenbr0'/>
@@ -31,7 +31,7 @@
     <disk type='file' device='cdrom'>
       <driver name='file'/>
       <source file='/root/boot.iso'/>
-      <target dev='hdc'/>
+      <target dev='hdc' bus='ide'/>
       <readonly/>
     </disk>
     <input type='mouse' bus='ps2'/>
diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-serial-tcp.xml b/tests/sexpr2xmldata/sexpr2xml-fv-serial-tcp.xml
index 940092f9c8..b9c8cde605 100644
--- a/tests/sexpr2xmldata/sexpr2xml-fv-serial-tcp.xml
+++ b/tests/sexpr2xmldata/sexpr2xml-fv-serial-tcp.xml
@@ -20,7 +20,7 @@
     <disk type='file' device='disk'>
       <driver name='file'/>
       <source file='/root/foo.img'/>
-      <target dev='hda'/>
+      <target dev='hda' bus='ide'/>
     </disk>
     <interface type='bridge'>
       <source bridge='xenbr0'/>
@@ -31,7 +31,7 @@
     <disk type='file' device='cdrom'>
       <driver name='file'/>
       <source file='/root/boot.iso'/>
-      <target dev='hdc'/>
+      <target dev='hdc' bus='ide'/>
       <readonly/>
     </disk>
     <input type='mouse' bus='ps2'/>
diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-serial-udp.xml b/tests/sexpr2xmldata/sexpr2xml-fv-serial-udp.xml
index 672892a60b..7bed274955 100644
--- a/tests/sexpr2xmldata/sexpr2xml-fv-serial-udp.xml
+++ b/tests/sexpr2xmldata/sexpr2xml-fv-serial-udp.xml
@@ -20,7 +20,7 @@
     <disk type='file' device='disk'>
       <driver name='file'/>
       <source file='/root/foo.img'/>
-      <target dev='hda'/>
+      <target dev='hda' bus='ide'/>
     </disk>
     <interface type='bridge'>
       <source bridge='xenbr0'/>
@@ -31,7 +31,7 @@
     <disk type='file' device='cdrom'>
       <driver name='file'/>
       <source file='/root/boot.iso'/>
-      <target dev='hdc'/>
+      <target dev='hdc' bus='ide'/>
       <readonly/>
     </disk>
     <input type='mouse' bus='ps2'/>
diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-serial-unix.xml b/tests/sexpr2xmldata/sexpr2xml-fv-serial-unix.xml
index ea6b10fec9..b3f1fc68c7 100644
--- a/tests/sexpr2xmldata/sexpr2xml-fv-serial-unix.xml
+++ b/tests/sexpr2xmldata/sexpr2xml-fv-serial-unix.xml
@@ -20,7 +20,7 @@
     <disk type='file' device='disk'>
       <driver name='file'/>
       <source file='/root/foo.img'/>
-      <target dev='hda'/>
+      <target dev='hda' bus='ide'/>
     </disk>
     <interface type='bridge'>
       <source bridge='xenbr0'/>
@@ -31,7 +31,7 @@
     <disk type='file' device='cdrom'>
       <driver name='file'/>
       <source file='/root/boot.iso'/>
-      <target dev='hdc'/>
+      <target dev='hdc' bus='ide'/>
       <readonly/>
     </disk>
     <input type='mouse' bus='ps2'/>
diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-sound-all.xml b/tests/sexpr2xmldata/sexpr2xml-fv-sound-all.xml
index e316a85514..66bd42c085 100644
--- a/tests/sexpr2xmldata/sexpr2xml-fv-sound-all.xml
+++ b/tests/sexpr2xmldata/sexpr2xml-fv-sound-all.xml
@@ -20,7 +20,7 @@
     <disk type='file' device='disk'>
       <driver name='file'/>
       <source file='/root/foo.img'/>
-      <target dev='hda'/>
+      <target dev='hda' bus='ide'/>
     </disk>
     <interface type='bridge'>
       <source bridge='xenbr0'/>
@@ -31,7 +31,7 @@
     <disk type='file' device='cdrom'>
       <driver name='file'/>
       <source file='/root/boot.iso'/>
-      <target dev='hdc'/>
+      <target dev='hdc' bus='ide'/>
       <readonly/>
     </disk>
     <input type='mouse' bus='ps2'/>
diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-sound.xml b/tests/sexpr2xmldata/sexpr2xml-fv-sound.xml
index e316a85514..66bd42c085 100644
--- a/tests/sexpr2xmldata/sexpr2xml-fv-sound.xml
+++ b/tests/sexpr2xmldata/sexpr2xml-fv-sound.xml
@@ -20,7 +20,7 @@
     <disk type='file' device='disk'>
       <driver name='file'/>
       <source file='/root/foo.img'/>
-      <target dev='hda'/>
+      <target dev='hda' bus='ide'/>
     </disk>
     <interface type='bridge'>
       <source bridge='xenbr0'/>
@@ -31,7 +31,7 @@
     <disk type='file' device='cdrom'>
       <driver name='file'/>
       <source file='/root/boot.iso'/>
-      <target dev='hdc'/>
+      <target dev='hdc' bus='ide'/>
       <readonly/>
     </disk>
     <input type='mouse' bus='ps2'/>
diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-usbmouse.xml b/tests/sexpr2xmldata/sexpr2xml-fv-usbmouse.xml
index a2eb84b674..63f6050cd6 100644
--- a/tests/sexpr2xmldata/sexpr2xml-fv-usbmouse.xml
+++ b/tests/sexpr2xmldata/sexpr2xml-fv-usbmouse.xml
@@ -20,7 +20,7 @@
     <disk type='file' device='disk'>
       <driver name='file'/>
       <source file='/root/foo.img'/>
-      <target dev='hda'/>
+      <target dev='hda' bus='ide'/>
     </disk>
     <interface type='bridge'>
       <source bridge='xenbr0'/>
@@ -31,7 +31,7 @@
     <disk type='file' device='cdrom'>
       <driver name='file'/>
       <source file='/root/boot.iso'/>
-      <target dev='hdc'/>
+      <target dev='hdc' bus='ide'/>
       <readonly/>
     </disk>
     <input type='mouse' bus='usb'/>
diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-usbtablet.xml b/tests/sexpr2xmldata/sexpr2xml-fv-usbtablet.xml
index 714e890f20..228510a8ae 100644
--- a/tests/sexpr2xmldata/sexpr2xml-fv-usbtablet.xml
+++ b/tests/sexpr2xmldata/sexpr2xml-fv-usbtablet.xml
@@ -20,7 +20,7 @@
     <disk type='file' device='disk'>
       <driver name='file'/>
       <source file='/root/foo.img'/>
-      <target dev='hda'/>
+      <target dev='hda' bus='ide'/>
     </disk>
     <interface type='bridge'>
       <source bridge='xenbr0'/>
@@ -31,7 +31,7 @@
     <disk type='file' device='cdrom'>
       <driver name='file'/>
       <source file='/root/boot.iso'/>
-      <target dev='hdc'/>
+      <target dev='hdc' bus='ide'/>
       <readonly/>
     </disk>
     <input type='tablet' bus='usb'/>
diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-utc.xml b/tests/sexpr2xmldata/sexpr2xml-fv-utc.xml
index f11571d7ab..77b75809fd 100644
--- a/tests/sexpr2xmldata/sexpr2xml-fv-utc.xml
+++ b/tests/sexpr2xmldata/sexpr2xml-fv-utc.xml
@@ -20,7 +20,7 @@
     <disk type='file' device='disk'>
       <driver name='file'/>
       <source file='/root/foo.img'/>
-      <target dev='hda'/>
+      <target dev='hda' bus='ide'/>
     </disk>
     <interface type='bridge'>
       <source bridge='xenbr0'/>
@@ -31,7 +31,7 @@
     <disk type='file' device='cdrom'>
       <driver name='file'/>
       <source file='/root/boot.iso'/>
-      <target dev='hdc'/>
+      <target dev='hdc' bus='ide'/>
       <readonly/>
     </disk>
     <input type='mouse' bus='ps2'/>
diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-v2.xml b/tests/sexpr2xmldata/sexpr2xml-fv-v2.xml
index c4c4a36083..2588da01ee 100644
--- a/tests/sexpr2xmldata/sexpr2xml-fv-v2.xml
+++ b/tests/sexpr2xmldata/sexpr2xml-fv-v2.xml
@@ -20,13 +20,13 @@
     <disk type='file' device='cdrom'>
       <driver name='file'/>
       <source file='/root/boot.iso'/>
-      <target dev='hdc'/>
+      <target dev='hdc' bus='ide'/>
       <readonly/>
     </disk>
     <disk type='file' device='disk'>
       <driver name='file'/>
       <source file='/root/foo.img'/>
-      <target dev='hda'/>
+      <target dev='hda' bus='ide'/>
     </disk>
     <interface type='bridge'>
       <source bridge='xenbr0'/>
diff --git a/tests/sexpr2xmldata/sexpr2xml-fv.xml b/tests/sexpr2xmldata/sexpr2xml-fv.xml
index f11571d7ab..77b75809fd 100644
--- a/tests/sexpr2xmldata/sexpr2xml-fv.xml
+++ b/tests/sexpr2xmldata/sexpr2xml-fv.xml
@@ -20,7 +20,7 @@
     <disk type='file' device='disk'>
       <driver name='file'/>
       <source file='/root/foo.img'/>
-      <target dev='hda'/>
+      <target dev='hda' bus='ide'/>
     </disk>
     <interface type='bridge'>
       <source bridge='xenbr0'/>
@@ -31,7 +31,7 @@
     <disk type='file' device='cdrom'>
       <driver name='file'/>
       <source file='/root/boot.iso'/>
-      <target dev='hdc'/>
+      <target dev='hdc' bus='ide'/>
       <readonly/>
     </disk>
     <input type='mouse' bus='ps2'/>
diff --git a/tests/sexpr2xmldata/sexpr2xml-net-bridged.xml b/tests/sexpr2xmldata/sexpr2xml-net-bridged.xml
index d4a5db74ea..d6526439d0 100644
--- a/tests/sexpr2xmldata/sexpr2xml-net-bridged.xml
+++ b/tests/sexpr2xmldata/sexpr2xml-net-bridged.xml
@@ -16,7 +16,7 @@
     <disk type='file' device='disk'>
       <driver name='file'/>
       <source file='/root/some.img'/>
-      <target dev='xvda'/>
+      <target dev='xvda' bus='xen'/>
     </disk>
     <interface type='bridge'>
       <source bridge='xenbr2'/>
diff --git a/tests/sexpr2xmldata/sexpr2xml-net-e1000.xml b/tests/sexpr2xmldata/sexpr2xml-net-e1000.xml
index 5f1dc1e721..56061b0557 100644
--- a/tests/sexpr2xmldata/sexpr2xml-net-e1000.xml
+++ b/tests/sexpr2xmldata/sexpr2xml-net-e1000.xml
@@ -16,7 +16,7 @@
     <disk type='file' device='disk'>
       <driver name='file'/>
       <source file='/root/some.img'/>
-      <target dev='xvda'/>
+      <target dev='xvda' bus='xen'/>
     </disk>
     <interface type='bridge'>
       <source bridge='xenbr2'/>
diff --git a/tests/sexpr2xmldata/sexpr2xml-net-routed.xml b/tests/sexpr2xmldata/sexpr2xml-net-routed.xml
index 6f5c6b6e3a..b7a03810d4 100644
--- a/tests/sexpr2xmldata/sexpr2xml-net-routed.xml
+++ b/tests/sexpr2xmldata/sexpr2xml-net-routed.xml
@@ -16,7 +16,7 @@
     <disk type='file' device='disk'>
       <driver name='file'/>
       <source file='/root/some.img'/>
-      <target dev='xvda'/>
+      <target dev='xvda' bus='xen'/>
     </disk>
     <interface type='ethernet'>
       <target dev='vif6.0'/>
diff --git a/tests/sexpr2xmldata/sexpr2xml-no-source-cdrom.xml b/tests/sexpr2xmldata/sexpr2xml-no-source-cdrom.xml
index bc4f2eab27..4c81746f25 100644
--- a/tests/sexpr2xmldata/sexpr2xml-no-source-cdrom.xml
+++ b/tests/sexpr2xmldata/sexpr2xml-no-source-cdrom.xml
@@ -28,14 +28,14 @@
     <disk type='block' device='disk'>
       <driver name='phy'/>
       <source dev='/dev/sda8'/>
-      <target dev='hda:disk'/>
+      <target dev='hda' bus='ide'/>
     </disk>
     <disk device='cdrom'>
-      <target dev='hdc'/>
+      <target dev='hdc' bus='ide'/>
       <readonly/>
     </disk>
     <input type='mouse' bus='ps2'/>
-    <graphics type='vnc' port='5906'/>
+    <graphics type='vnc' port='-1'/>
     <serial type='pty'>
       <target port='0'/>
     </serial>
diff --git a/tests/sexpr2xmldata/sexpr2xml-pv-bootloader.xml b/tests/sexpr2xmldata/sexpr2xml-pv-bootloader.xml
index 7bf3190521..a41e318839 100644
--- a/tests/sexpr2xmldata/sexpr2xml-pv-bootloader.xml
+++ b/tests/sexpr2xmldata/sexpr2xml-pv-bootloader.xml
@@ -12,7 +12,7 @@
     <disk type='file' device='disk'>
       <driver name='file'/>
       <source file='/root/some.img'/>
-      <target dev='xvda'/>
+      <target dev='xvda' bus='xen'/>
     </disk>
     <console type='pty'>
       <target port='0'/>
diff --git a/tests/sexpr2xmldata/sexpr2xml-pv-vfb-new.xml b/tests/sexpr2xmldata/sexpr2xml-pv-vfb-new.xml
index cd9da037d6..311630ca7e 100644
--- a/tests/sexpr2xmldata/sexpr2xml-pv-vfb-new.xml
+++ b/tests/sexpr2xmldata/sexpr2xml-pv-vfb-new.xml
@@ -16,7 +16,7 @@
     <disk type='file' device='disk'>
       <driver name='file'/>
       <source file='/root/some.img'/>
-      <target dev='xvda'/>
+      <target dev='xvda' bus='xen'/>
     </disk>
     <input type='mouse' bus='xen'/>
     <graphics type='vnc' port='-1' listen='0.0.0.0' keymap='ja'/>
diff --git a/tests/sexpr2xmldata/sexpr2xml-pv-vfb-orig.xml b/tests/sexpr2xmldata/sexpr2xml-pv-vfb-orig.xml
index cd9da037d6..311630ca7e 100644
--- a/tests/sexpr2xmldata/sexpr2xml-pv-vfb-orig.xml
+++ b/tests/sexpr2xmldata/sexpr2xml-pv-vfb-orig.xml
@@ -16,7 +16,7 @@
     <disk type='file' device='disk'>
       <driver name='file'/>
       <source file='/root/some.img'/>
-      <target dev='xvda'/>
+      <target dev='xvda' bus='xen'/>
     </disk>
     <input type='mouse' bus='xen'/>
     <graphics type='vnc' port='-1' listen='0.0.0.0' keymap='ja'/>
diff --git a/tests/sexpr2xmldata/sexpr2xml-pv.xml b/tests/sexpr2xmldata/sexpr2xml-pv.xml
index e0841aa8b8..24011bb3de 100644
--- a/tests/sexpr2xmldata/sexpr2xml-pv.xml
+++ b/tests/sexpr2xmldata/sexpr2xml-pv.xml
@@ -16,7 +16,7 @@
     <disk type='file' device='disk'>
       <driver name='file'/>
       <source file='/root/some.img'/>
-      <target dev='xvda'/>
+      <target dev='xvda' bus='xen'/>
     </disk>
     <console type='pty'>
       <target port='0'/>
diff --git a/tests/sexpr2xmltest.c b/tests/sexpr2xmltest.c
index 6a27b40444..80be0f27a1 100644
--- a/tests/sexpr2xmltest.c
+++ b/tests/sexpr2xmltest.c
@@ -113,11 +113,11 @@ main(int argc, char **argv)
     DO_TEST("disk-drv-blktap-raw", "disk-drv-blktap-raw", 2);
     DO_TEST("disk-drv-blktap-qcow", "disk-drv-blktap-qcow", 2);
 
-    DO_TEST("curmem", "curmem", 1);
+    DO_TEST("curmem", "curmem", 2);
     DO_TEST("net-routed", "net-routed", 2);
     DO_TEST("net-bridged", "net-bridged", 2);
     DO_TEST("net-e1000", "net-e1000", 2);
-    DO_TEST("no-source-cdrom", "no-source-cdrom", 1);
+    DO_TEST("no-source-cdrom", "no-source-cdrom", 2);
 
     DO_TEST("fv-utc", "fv-utc", 1);
     DO_TEST("fv-localtime", "fv-localtime", 1);
diff --git a/tests/xmconfigdata/test-fullvirt-localtime.xml b/tests/xmconfigdata/test-fullvirt-localtime.xml
index 3a3aa56457..79d0e8a75d 100644
--- a/tests/xmconfigdata/test-fullvirt-localtime.xml
+++ b/tests/xmconfigdata/test-fullvirt-localtime.xml
@@ -23,12 +23,12 @@
     <disk type='block' device='disk'>
       <driver name='phy'/>
       <source dev='/dev/HostVG/XenGuest2'/>
-      <target dev='hda'/>
+      <target dev='hda' bus='ide'/>
     </disk>
     <disk type='file' device='cdrom'>
       <driver name='file'/>
       <source file='/root/boot.iso'/>
-      <target dev='hdc'/>
+      <target dev='hdc' bus='ide'/>
       <readonly/>
     </disk>
     <interface type='bridge'>
diff --git a/tests/xmconfigdata/test-fullvirt-new-cdrom.xml b/tests/xmconfigdata/test-fullvirt-new-cdrom.xml
index 4d60e66f76..d6da1162e7 100644
--- a/tests/xmconfigdata/test-fullvirt-new-cdrom.xml
+++ b/tests/xmconfigdata/test-fullvirt-new-cdrom.xml
@@ -23,12 +23,12 @@
     <disk type='block' device='disk'>
       <driver name='phy'/>
       <source dev='/dev/HostVG/XenGuest2'/>
-      <target dev='hda'/>
+      <target dev='hda' bus='ide'/>
     </disk>
     <disk type='file' device='cdrom'>
       <driver name='file'/>
       <source file='/root/boot.iso'/>
-      <target dev='hdc'/>
+      <target dev='hdc' bus='ide'/>
       <readonly/>
     </disk>
     <interface type='bridge'>
diff --git a/tests/xmconfigdata/test-fullvirt-old-cdrom.xml b/tests/xmconfigdata/test-fullvirt-old-cdrom.xml
index e6c1d5958a..439a38f478 100644
--- a/tests/xmconfigdata/test-fullvirt-old-cdrom.xml
+++ b/tests/xmconfigdata/test-fullvirt-old-cdrom.xml
@@ -23,12 +23,12 @@
     <disk type='block' device='disk'>
       <driver name='phy'/>
       <source dev='/dev/HostVG/XenGuest2'/>
-      <target dev='hda'/>
+      <target dev='hda' bus='ide'/>
     </disk>
     <disk type='file' device='cdrom'>
       <driver name='file'/>
       <source file='/root/boot.iso'/>
-      <target dev='hdc'/>
+      <target dev='hdc' bus='ide'/>
       <readonly/>
     </disk>
     <interface type='bridge'>
diff --git a/tests/xmconfigdata/test-fullvirt-parallel-tcp.xml b/tests/xmconfigdata/test-fullvirt-parallel-tcp.xml
index b2eb903a4a..cbe7dfd064 100644
--- a/tests/xmconfigdata/test-fullvirt-parallel-tcp.xml
+++ b/tests/xmconfigdata/test-fullvirt-parallel-tcp.xml
@@ -23,12 +23,12 @@
     <disk type='block' device='disk'>
       <driver name='phy'/>
       <source dev='/dev/HostVG/XenGuest2'/>
-      <target dev='hda'/>
+      <target dev='hda' bus='ide'/>
     </disk>
     <disk type='file' device='cdrom'>
       <driver name='file'/>
       <source file='/root/boot.iso'/>
-      <target dev='hdc'/>
+      <target dev='hdc' bus='ide'/>
       <readonly/>
     </disk>
     <interface type='bridge'>
diff --git a/tests/xmconfigdata/test-fullvirt-serial-file.xml b/tests/xmconfigdata/test-fullvirt-serial-file.xml
index dadfe39777..addf4ffe26 100644
--- a/tests/xmconfigdata/test-fullvirt-serial-file.xml
+++ b/tests/xmconfigdata/test-fullvirt-serial-file.xml
@@ -23,12 +23,12 @@
     <disk type='block' device='disk'>
       <driver name='phy'/>
       <source dev='/dev/HostVG/XenGuest2'/>
-      <target dev='hda'/>
+      <target dev='hda' bus='ide'/>
     </disk>
     <disk type='file' device='cdrom'>
       <driver name='file'/>
       <source file='/root/boot.iso'/>
-      <target dev='hdc'/>
+      <target dev='hdc' bus='ide'/>
       <readonly/>
     </disk>
     <interface type='bridge'>
diff --git a/tests/xmconfigdata/test-fullvirt-serial-null.xml b/tests/xmconfigdata/test-fullvirt-serial-null.xml
index 0ce1d56e92..cc54659a9a 100644
--- a/tests/xmconfigdata/test-fullvirt-serial-null.xml
+++ b/tests/xmconfigdata/test-fullvirt-serial-null.xml
@@ -23,12 +23,12 @@
     <disk type='block' device='disk'>
       <driver name='phy'/>
       <source dev='/dev/HostVG/XenGuest2'/>
-      <target dev='hda'/>
+      <target dev='hda' bus='ide'/>
     </disk>
     <disk type='file' device='cdrom'>
       <driver name='file'/>
       <source file='/root/boot.iso'/>
-      <target dev='hdc'/>
+      <target dev='hdc' bus='ide'/>
       <readonly/>
     </disk>
     <interface type='bridge'>
diff --git a/tests/xmconfigdata/test-fullvirt-serial-pipe.xml b/tests/xmconfigdata/test-fullvirt-serial-pipe.xml
index 20198927e5..7ecc344671 100644
--- a/tests/xmconfigdata/test-fullvirt-serial-pipe.xml
+++ b/tests/xmconfigdata/test-fullvirt-serial-pipe.xml
@@ -23,12 +23,12 @@
     <disk type='block' device='disk'>
       <driver name='phy'/>
       <source dev='/dev/HostVG/XenGuest2'/>
-      <target dev='hda'/>
+      <target dev='hda' bus='ide'/>
     </disk>
     <disk type='file' device='cdrom'>
       <driver name='file'/>
       <source file='/root/boot.iso'/>
-      <target dev='hdc'/>
+      <target dev='hdc' bus='ide'/>
       <readonly/>
     </disk>
     <interface type='bridge'>
diff --git a/tests/xmconfigdata/test-fullvirt-serial-pty.xml b/tests/xmconfigdata/test-fullvirt-serial-pty.xml
index 602a2c1801..9c776cd722 100644
--- a/tests/xmconfigdata/test-fullvirt-serial-pty.xml
+++ b/tests/xmconfigdata/test-fullvirt-serial-pty.xml
@@ -23,12 +23,12 @@
     <disk type='block' device='disk'>
       <driver name='phy'/>
       <source dev='/dev/HostVG/XenGuest2'/>
-      <target dev='hda'/>
+      <target dev='hda' bus='ide'/>
     </disk>
     <disk type='file' device='cdrom'>
       <driver name='file'/>
       <source file='/root/boot.iso'/>
-      <target dev='hdc'/>
+      <target dev='hdc' bus='ide'/>
       <readonly/>
     </disk>
     <interface type='bridge'>
diff --git a/tests/xmconfigdata/test-fullvirt-serial-stdio.xml b/tests/xmconfigdata/test-fullvirt-serial-stdio.xml
index 30ec87a141..90e6d33016 100644
--- a/tests/xmconfigdata/test-fullvirt-serial-stdio.xml
+++ b/tests/xmconfigdata/test-fullvirt-serial-stdio.xml
@@ -23,12 +23,12 @@
     <disk type='block' device='disk'>
       <driver name='phy'/>
       <source dev='/dev/HostVG/XenGuest2'/>
-      <target dev='hda'/>
+      <target dev='hda' bus='ide'/>
     </disk>
     <disk type='file' device='cdrom'>
       <driver name='file'/>
       <source file='/root/boot.iso'/>
-      <target dev='hdc'/>
+      <target dev='hdc' bus='ide'/>
       <readonly/>
     </disk>
     <interface type='bridge'>
diff --git a/tests/xmconfigdata/test-fullvirt-serial-tcp-telnet.xml b/tests/xmconfigdata/test-fullvirt-serial-tcp-telnet.xml
index fb1de8829e..87461b922b 100644
--- a/tests/xmconfigdata/test-fullvirt-serial-tcp-telnet.xml
+++ b/tests/xmconfigdata/test-fullvirt-serial-tcp-telnet.xml
@@ -23,12 +23,12 @@
     <disk type='block' device='disk'>
       <driver name='phy'/>
       <source dev='/dev/HostVG/XenGuest2'/>
-      <target dev='hda'/>
+      <target dev='hda' bus='ide'/>
     </disk>
     <disk type='file' device='cdrom'>
       <driver name='file'/>
       <source file='/root/boot.iso'/>
-      <target dev='hdc'/>
+      <target dev='hdc' bus='ide'/>
       <readonly/>
     </disk>
     <interface type='bridge'>
diff --git a/tests/xmconfigdata/test-fullvirt-serial-tcp.xml b/tests/xmconfigdata/test-fullvirt-serial-tcp.xml
index 48682cb934..162b59995d 100644
--- a/tests/xmconfigdata/test-fullvirt-serial-tcp.xml
+++ b/tests/xmconfigdata/test-fullvirt-serial-tcp.xml
@@ -23,12 +23,12 @@
     <disk type='block' device='disk'>
       <driver name='phy'/>
       <source dev='/dev/HostVG/XenGuest2'/>
-      <target dev='hda'/>
+      <target dev='hda' bus='ide'/>
     </disk>
     <disk type='file' device='cdrom'>
       <driver name='file'/>
       <source file='/root/boot.iso'/>
-      <target dev='hdc'/>
+      <target dev='hdc' bus='ide'/>
       <readonly/>
     </disk>
     <interface type='bridge'>
diff --git a/tests/xmconfigdata/test-fullvirt-serial-udp.xml b/tests/xmconfigdata/test-fullvirt-serial-udp.xml
index 2148d3d9d1..48843b2bb5 100644
--- a/tests/xmconfigdata/test-fullvirt-serial-udp.xml
+++ b/tests/xmconfigdata/test-fullvirt-serial-udp.xml
@@ -23,12 +23,12 @@
     <disk type='block' device='disk'>
       <driver name='phy'/>
       <source dev='/dev/HostVG/XenGuest2'/>
-      <target dev='hda'/>
+      <target dev='hda' bus='ide'/>
     </disk>
     <disk type='file' device='cdrom'>
       <driver name='file'/>
       <source file='/root/boot.iso'/>
-      <target dev='hdc'/>
+      <target dev='hdc' bus='ide'/>
       <readonly/>
     </disk>
     <interface type='bridge'>
diff --git a/tests/xmconfigdata/test-fullvirt-serial-unix.xml b/tests/xmconfigdata/test-fullvirt-serial-unix.xml
index b34dfbfce0..f5d8d84e3a 100644
--- a/tests/xmconfigdata/test-fullvirt-serial-unix.xml
+++ b/tests/xmconfigdata/test-fullvirt-serial-unix.xml
@@ -23,12 +23,12 @@
     <disk type='block' device='disk'>
       <driver name='phy'/>
       <source dev='/dev/HostVG/XenGuest2'/>
-      <target dev='hda'/>
+      <target dev='hda' bus='ide'/>
     </disk>
     <disk type='file' device='cdrom'>
       <driver name='file'/>
       <source file='/root/boot.iso'/>
-      <target dev='hdc'/>
+      <target dev='hdc' bus='ide'/>
       <readonly/>
     </disk>
     <interface type='bridge'>
diff --git a/tests/xmconfigdata/test-fullvirt-sound.xml b/tests/xmconfigdata/test-fullvirt-sound.xml
index 5ecf955b40..4c70a1ddb2 100644
--- a/tests/xmconfigdata/test-fullvirt-sound.xml
+++ b/tests/xmconfigdata/test-fullvirt-sound.xml
@@ -23,12 +23,12 @@
     <disk type='block' device='disk'>
       <driver name='phy'/>
       <source dev='/dev/HostVG/XenGuest2'/>
-      <target dev='hda'/>
+      <target dev='hda' bus='ide'/>
     </disk>
     <disk type='file' device='cdrom'>
       <driver name='file'/>
       <source file='/root/boot.iso'/>
-      <target dev='hdc'/>
+      <target dev='hdc' bus='ide'/>
       <readonly/>
     </disk>
     <interface type='bridge'>
diff --git a/tests/xmconfigdata/test-fullvirt-usbmouse.xml b/tests/xmconfigdata/test-fullvirt-usbmouse.xml
index a0eea9e974..c46b1356d0 100644
--- a/tests/xmconfigdata/test-fullvirt-usbmouse.xml
+++ b/tests/xmconfigdata/test-fullvirt-usbmouse.xml
@@ -23,12 +23,12 @@
     <disk type='block' device='disk'>
       <driver name='phy'/>
       <source dev='/dev/HostVG/XenGuest2'/>
-      <target dev='hda'/>
+      <target dev='hda' bus='ide'/>
     </disk>
     <disk type='file' device='cdrom'>
       <driver name='file'/>
       <source file='/root/boot.iso'/>
-      <target dev='hdc'/>
+      <target dev='hdc' bus='ide'/>
       <readonly/>
     </disk>
     <interface type='bridge'>
diff --git a/tests/xmconfigdata/test-fullvirt-usbtablet-no-bus.xml b/tests/xmconfigdata/test-fullvirt-usbtablet-no-bus.xml
index db0ae380dd..bb2710b2fe 100644
--- a/tests/xmconfigdata/test-fullvirt-usbtablet-no-bus.xml
+++ b/tests/xmconfigdata/test-fullvirt-usbtablet-no-bus.xml
@@ -23,12 +23,12 @@
     <disk type='block' device='disk'>
       <driver name='phy'/>
       <source dev='/dev/HostVG/XenGuest2'/>
-      <target dev='hda'/>
+      <target dev='hda' bus='ide'/>
     </disk>
     <disk type='file' device='cdrom'>
       <driver name='file'/>
       <source file='/root/boot.iso'/>
-      <target dev='hdc'/>
+      <target dev='hdc' bus='ide'/>
       <readonly/>
     </disk>
     <interface type='bridge'>
diff --git a/tests/xmconfigdata/test-fullvirt-usbtablet.xml b/tests/xmconfigdata/test-fullvirt-usbtablet.xml
index 7dcb1e56bb..d307f9fd92 100644
--- a/tests/xmconfigdata/test-fullvirt-usbtablet.xml
+++ b/tests/xmconfigdata/test-fullvirt-usbtablet.xml
@@ -23,12 +23,12 @@
     <disk type='block' device='disk'>
       <driver name='phy'/>
       <source dev='/dev/HostVG/XenGuest2'/>
-      <target dev='hda'/>
+      <target dev='hda' bus='ide'/>
     </disk>
     <disk type='file' device='cdrom'>
       <driver name='file'/>
       <source file='/root/boot.iso'/>
-      <target dev='hdc'/>
+      <target dev='hdc' bus='ide'/>
       <readonly/>
     </disk>
     <interface type='bridge'>
diff --git a/tests/xmconfigdata/test-fullvirt-utc.xml b/tests/xmconfigdata/test-fullvirt-utc.xml
index 4d60e66f76..d6da1162e7 100644
--- a/tests/xmconfigdata/test-fullvirt-utc.xml
+++ b/tests/xmconfigdata/test-fullvirt-utc.xml
@@ -23,12 +23,12 @@
     <disk type='block' device='disk'>
       <driver name='phy'/>
       <source dev='/dev/HostVG/XenGuest2'/>
-      <target dev='hda'/>
+      <target dev='hda' bus='ide'/>
     </disk>
     <disk type='file' device='cdrom'>
       <driver name='file'/>
       <source file='/root/boot.iso'/>
-      <target dev='hdc'/>
+      <target dev='hdc' bus='ide'/>
       <readonly/>
     </disk>
     <interface type='bridge'>
diff --git a/tests/xmconfigdata/test-paravirt-net-e1000.xml b/tests/xmconfigdata/test-paravirt-net-e1000.xml
index d12873c63b..fc0ff85362 100644
--- a/tests/xmconfigdata/test-paravirt-net-e1000.xml
+++ b/tests/xmconfigdata/test-paravirt-net-e1000.xml
@@ -12,7 +12,7 @@
     <disk type='block' device='disk'>
       <driver name='phy'/>
       <source dev='/dev/HostVG/XenGuest1'/>
-      <target dev='xvda'/>
+      <target dev='xvda' bus='xen'/>
     </disk>
     <interface type='bridge'>
       <mac address='00:16:3E:66:94:9C'/>
diff --git a/tests/xmconfigdata/test-paravirt-new-pvfb.xml b/tests/xmconfigdata/test-paravirt-new-pvfb.xml
index c114a4188e..b82cee646a 100644
--- a/tests/xmconfigdata/test-paravirt-new-pvfb.xml
+++ b/tests/xmconfigdata/test-paravirt-new-pvfb.xml
@@ -12,7 +12,7 @@
     <disk type='block' device='disk'>
       <driver name='phy'/>
       <source dev='/dev/HostVG/XenGuest1'/>
-      <target dev='xvda'/>
+      <target dev='xvda' bus='xen'/>
     </disk>
     <interface type='bridge'>
       <mac address='00:16:3E:66:94:9C'/>
diff --git a/tests/xmconfigdata/test-paravirt-old-pvfb.xml b/tests/xmconfigdata/test-paravirt-old-pvfb.xml
index c114a4188e..b82cee646a 100644
--- a/tests/xmconfigdata/test-paravirt-old-pvfb.xml
+++ b/tests/xmconfigdata/test-paravirt-old-pvfb.xml
@@ -12,7 +12,7 @@
     <disk type='block' device='disk'>
       <driver name='phy'/>
       <source dev='/dev/HostVG/XenGuest1'/>
-      <target dev='xvda'/>
+      <target dev='xvda' bus='xen'/>
     </disk>
     <interface type='bridge'>
       <mac address='00:16:3E:66:94:9C'/>