[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

[libvirt] PATCH: Add <disk> bus attribute for Xen driver



To complement soren's patch adding a bus attribute to the QEMU driver,
here is a minimal patch adding bus attribute to the Xen drivers. It merely
adds it on when generating the XML. It isn't making any attempt to interpret
it when creating a VM, since Xen does everything based off the disk node
name anyway its (currently) redundant.

The bus types supported  are 'xen' for paravirt disks, or 'ide' and 'scsi'
for HVM guests. 

NB, if setting up ide / scsi disks with HVM, XenD also sets up a parvirt
disk, but we don't attempt to express this duplication as its an underlying
impl detail.

Regards,
Daniel.

Index: src/xend_internal.c
===================================================================
RCS file: /data/cvs/libvirt/src/xend_internal.c,v
retrieving revision 1.183
diff -u -p -r1.183 xend_internal.c
--- src/xend_internal.c	30 Apr 2008 12:30:55 -0000	1.183
+++ src/xend_internal.c	7 May 2008 00:14:23 -0000
@@ -1759,6 +1759,7 @@ xend_parse_sexp_desc(virConnectPtr conn,
             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")) {
@@ -1878,7 +1879,16 @@ xend_parse_sexp_desc(virConnectPtr conn,
                 /* 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
@@ -1967,14 +1977,14 @@ xend_parse_sexp_desc(virConnectPtr conn,
         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");
         }
 
@@ -1985,7 +1995,7 @@ xend_parse_sexp_desc(virConnectPtr conn,
                 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");
             }
Index: src/xm_internal.c
===================================================================
RCS file: /data/cvs/libvirt/src/xm_internal.c,v
retrieving revision 1.74
diff -u -p -r1.74 xm_internal.c
--- src/xm_internal.c	30 Apr 2008 12:30:55 -0000	1.74
+++ src/xm_internal.c	7 May 2008 00:14:26 -0000
@@ -733,6 +733,7 @@ char *xenXMDomainFormatXML(virConnectPtr
             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
                 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
                 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
             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");
         }
Index: tests/sexpr2xmltest.c
===================================================================
RCS file: /data/cvs/libvirt/tests/sexpr2xmltest.c,v
retrieving revision 1.27
diff -u -p -r1.27 sexpr2xmltest.c
--- tests/sexpr2xmltest.c	30 Apr 2008 12:30:55 -0000	1.27
+++ tests/sexpr2xmltest.c	7 May 2008 00:14:36 -0000
@@ -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);
Index: tests/sexpr2xmldata/sexpr2xml-curmem.xml
===================================================================
RCS file: /data/cvs/libvirt/tests/sexpr2xmldata/sexpr2xml-curmem.xml,v
retrieving revision 1.5
diff -u -p -r1.5 sexpr2xml-curmem.xml
--- tests/sexpr2xmldata/sexpr2xml-curmem.xml	26 Apr 2008 14:22:02 -0000	1.5
+++ tests/sexpr2xmldata/sexpr2xml-curmem.xml	7 May 2008 00:14:36 -0000
@@ -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>
Index: tests/sexpr2xmldata/sexpr2xml-disk-block-shareable.xml
===================================================================
RCS file: /data/cvs/libvirt/tests/sexpr2xmldata/sexpr2xml-disk-block-shareable.xml,v
retrieving revision 1.2
diff -u -p -r1.2 sexpr2xml-disk-block-shareable.xml
--- tests/sexpr2xmldata/sexpr2xml-disk-block-shareable.xml	26 Apr 2008 14:22:02 -0000	1.2
+++ tests/sexpr2xmldata/sexpr2xml-disk-block-shareable.xml	7 May 2008 00:14:36 -0000
@@ -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'>
Index: tests/sexpr2xmldata/sexpr2xml-disk-block.xml
===================================================================
RCS file: /data/cvs/libvirt/tests/sexpr2xmldata/sexpr2xml-disk-block.xml,v
retrieving revision 1.3
diff -u -p -r1.3 sexpr2xml-disk-block.xml
--- tests/sexpr2xmldata/sexpr2xml-disk-block.xml	26 Apr 2008 14:22:02 -0000	1.3
+++ tests/sexpr2xmldata/sexpr2xml-disk-block.xml	7 May 2008 00:14:36 -0000
@@ -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'/>
Index: tests/sexpr2xmldata/sexpr2xml-disk-drv-blktap-qcow.xml
===================================================================
RCS file: /data/cvs/libvirt/tests/sexpr2xmldata/sexpr2xml-disk-drv-blktap-qcow.xml,v
retrieving revision 1.3
diff -u -p -r1.3 sexpr2xml-disk-drv-blktap-qcow.xml
--- tests/sexpr2xmldata/sexpr2xml-disk-drv-blktap-qcow.xml	26 Apr 2008 14:22:02 -0000	1.3
+++ tests/sexpr2xmldata/sexpr2xml-disk-drv-blktap-qcow.xml	7 May 2008 00:14:36 -0000
@@ -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'/>
Index: tests/sexpr2xmldata/sexpr2xml-disk-drv-blktap-raw.xml
===================================================================
RCS file: /data/cvs/libvirt/tests/sexpr2xmldata/sexpr2xml-disk-drv-blktap-raw.xml,v
retrieving revision 1.3
diff -u -p -r1.3 sexpr2xml-disk-drv-blktap-raw.xml
--- tests/sexpr2xmldata/sexpr2xml-disk-drv-blktap-raw.xml	26 Apr 2008 14:22:02 -0000	1.3
+++ tests/sexpr2xmldata/sexpr2xml-disk-drv-blktap-raw.xml	7 May 2008 00:14:36 -0000
@@ -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'/>
Index: tests/sexpr2xmldata/sexpr2xml-disk-file.xml
===================================================================
RCS file: /data/cvs/libvirt/tests/sexpr2xmldata/sexpr2xml-disk-file.xml,v
retrieving revision 1.3
diff -u -p -r1.3 sexpr2xml-disk-file.xml
--- tests/sexpr2xmldata/sexpr2xml-disk-file.xml	26 Apr 2008 14:22:02 -0000	1.3
+++ tests/sexpr2xmldata/sexpr2xml-disk-file.xml	7 May 2008 00:14:36 -0000
@@ -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'/>
Index: tests/sexpr2xmldata/sexpr2xml-fv-kernel.xml
===================================================================
RCS file: /data/cvs/libvirt/tests/sexpr2xmldata/sexpr2xml-fv-kernel.xml,v
retrieving revision 1.2
diff -u -p -r1.2 sexpr2xml-fv-kernel.xml
--- tests/sexpr2xmldata/sexpr2xml-fv-kernel.xml	26 Apr 2008 14:22:02 -0000	1.2
+++ tests/sexpr2xmldata/sexpr2xml-fv-kernel.xml	7 May 2008 00:14:36 -0000
@@ -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'/>
Index: tests/sexpr2xmldata/sexpr2xml-fv-legacy-vfb.xml
===================================================================
RCS file: /data/cvs/libvirt/tests/sexpr2xmldata/sexpr2xml-fv-legacy-vfb.xml,v
retrieving revision 1.1
diff -u -p -r1.1 sexpr2xml-fv-legacy-vfb.xml
--- tests/sexpr2xmldata/sexpr2xml-fv-legacy-vfb.xml	5 Feb 2008 16:21:25 -0000	1.1
+++ tests/sexpr2xmldata/sexpr2xml-fv-legacy-vfb.xml	7 May 2008 00:14:36 -0000
@@ -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'/>
Index: tests/sexpr2xmldata/sexpr2xml-fv-localtime.xml
===================================================================
RCS file: /data/cvs/libvirt/tests/sexpr2xmldata/sexpr2xml-fv-localtime.xml,v
retrieving revision 1.4
diff -u -p -r1.4 sexpr2xml-fv-localtime.xml
--- tests/sexpr2xmldata/sexpr2xml-fv-localtime.xml	21 Aug 2007 08:54:07 -0000	1.4
+++ tests/sexpr2xmldata/sexpr2xml-fv-localtime.xml	7 May 2008 00:14:36 -0000
@@ -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'/>
Index: tests/sexpr2xmldata/sexpr2xml-fv-parallel-tcp.xml
===================================================================
RCS file: /data/cvs/libvirt/tests/sexpr2xmldata/sexpr2xml-fv-parallel-tcp.xml,v
retrieving revision 1.1
diff -u -p -r1.1 sexpr2xml-fv-parallel-tcp.xml
--- tests/sexpr2xmldata/sexpr2xml-fv-parallel-tcp.xml	26 Apr 2008 14:22:02 -0000	1.1
+++ tests/sexpr2xmldata/sexpr2xml-fv-parallel-tcp.xml	7 May 2008 00:14:36 -0000
@@ -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'/>
Index: tests/sexpr2xmldata/sexpr2xml-fv-serial-file.xml
===================================================================
RCS file: /data/cvs/libvirt/tests/sexpr2xmldata/sexpr2xml-fv-serial-file.xml,v
retrieving revision 1.1
diff -u -p -r1.1 sexpr2xml-fv-serial-file.xml
--- tests/sexpr2xmldata/sexpr2xml-fv-serial-file.xml	26 Apr 2008 14:22:02 -0000	1.1
+++ tests/sexpr2xmldata/sexpr2xml-fv-serial-file.xml	7 May 2008 00:14:37 -0000
@@ -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'/>
Index: tests/sexpr2xmldata/sexpr2xml-fv-serial-null.xml
===================================================================
RCS file: /data/cvs/libvirt/tests/sexpr2xmldata/sexpr2xml-fv-serial-null.xml,v
retrieving revision 1.1
diff -u -p -r1.1 sexpr2xml-fv-serial-null.xml
--- tests/sexpr2xmldata/sexpr2xml-fv-serial-null.xml	26 Apr 2008 14:22:02 -0000	1.1
+++ tests/sexpr2xmldata/sexpr2xml-fv-serial-null.xml	7 May 2008 00:14:37 -0000
@@ -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'/>
Index: tests/sexpr2xmldata/sexpr2xml-fv-serial-pipe.xml
===================================================================
RCS file: /data/cvs/libvirt/tests/sexpr2xmldata/sexpr2xml-fv-serial-pipe.xml,v
retrieving revision 1.1
diff -u -p -r1.1 sexpr2xml-fv-serial-pipe.xml
--- tests/sexpr2xmldata/sexpr2xml-fv-serial-pipe.xml	26 Apr 2008 14:22:02 -0000	1.1
+++ tests/sexpr2xmldata/sexpr2xml-fv-serial-pipe.xml	7 May 2008 00:14:37 -0000
@@ -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'/>
Index: tests/sexpr2xmldata/sexpr2xml-fv-serial-pty.xml
===================================================================
RCS file: /data/cvs/libvirt/tests/sexpr2xmldata/sexpr2xml-fv-serial-pty.xml,v
retrieving revision 1.1
diff -u -p -r1.1 sexpr2xml-fv-serial-pty.xml
--- tests/sexpr2xmldata/sexpr2xml-fv-serial-pty.xml	26 Apr 2008 14:22:02 -0000	1.1
+++ tests/sexpr2xmldata/sexpr2xml-fv-serial-pty.xml	7 May 2008 00:14:37 -0000
@@ -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'/>
Index: tests/sexpr2xmldata/sexpr2xml-fv-serial-stdio.xml
===================================================================
RCS file: /data/cvs/libvirt/tests/sexpr2xmldata/sexpr2xml-fv-serial-stdio.xml,v
retrieving revision 1.1
diff -u -p -r1.1 sexpr2xml-fv-serial-stdio.xml
--- tests/sexpr2xmldata/sexpr2xml-fv-serial-stdio.xml	26 Apr 2008 14:22:02 -0000	1.1
+++ tests/sexpr2xmldata/sexpr2xml-fv-serial-stdio.xml	7 May 2008 00:14:37 -0000
@@ -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'/>
Index: tests/sexpr2xmldata/sexpr2xml-fv-serial-tcp-telnet.xml
===================================================================
RCS file: /data/cvs/libvirt/tests/sexpr2xmldata/sexpr2xml-fv-serial-tcp-telnet.xml,v
retrieving revision 1.1
diff -u -p -r1.1 sexpr2xml-fv-serial-tcp-telnet.xml
--- tests/sexpr2xmldata/sexpr2xml-fv-serial-tcp-telnet.xml	26 Apr 2008 14:22:02 -0000	1.1
+++ tests/sexpr2xmldata/sexpr2xml-fv-serial-tcp-telnet.xml	7 May 2008 00:14:37 -0000
@@ -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'/>
Index: tests/sexpr2xmldata/sexpr2xml-fv-serial-tcp.xml
===================================================================
RCS file: /data/cvs/libvirt/tests/sexpr2xmldata/sexpr2xml-fv-serial-tcp.xml,v
retrieving revision 1.1
diff -u -p -r1.1 sexpr2xml-fv-serial-tcp.xml
--- tests/sexpr2xmldata/sexpr2xml-fv-serial-tcp.xml	26 Apr 2008 14:22:02 -0000	1.1
+++ tests/sexpr2xmldata/sexpr2xml-fv-serial-tcp.xml	7 May 2008 00:14:37 -0000
@@ -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'/>
Index: tests/sexpr2xmldata/sexpr2xml-fv-serial-udp.xml
===================================================================
RCS file: /data/cvs/libvirt/tests/sexpr2xmldata/sexpr2xml-fv-serial-udp.xml,v
retrieving revision 1.1
diff -u -p -r1.1 sexpr2xml-fv-serial-udp.xml
--- tests/sexpr2xmldata/sexpr2xml-fv-serial-udp.xml	26 Apr 2008 14:22:02 -0000	1.1
+++ tests/sexpr2xmldata/sexpr2xml-fv-serial-udp.xml	7 May 2008 00:14:37 -0000
@@ -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'/>
Index: tests/sexpr2xmldata/sexpr2xml-fv-serial-unix.xml
===================================================================
RCS file: /data/cvs/libvirt/tests/sexpr2xmldata/sexpr2xml-fv-serial-unix.xml,v
retrieving revision 1.1
diff -u -p -r1.1 sexpr2xml-fv-serial-unix.xml
--- tests/sexpr2xmldata/sexpr2xml-fv-serial-unix.xml	26 Apr 2008 14:22:02 -0000	1.1
+++ tests/sexpr2xmldata/sexpr2xml-fv-serial-unix.xml	7 May 2008 00:14:37 -0000
@@ -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'/>
Index: tests/sexpr2xmldata/sexpr2xml-fv-usbmouse.xml
===================================================================
RCS file: /data/cvs/libvirt/tests/sexpr2xmldata/sexpr2xml-fv-usbmouse.xml,v
retrieving revision 1.3
diff -u -p -r1.3 sexpr2xml-fv-usbmouse.xml
--- tests/sexpr2xmldata/sexpr2xml-fv-usbmouse.xml	21 Aug 2007 08:54:07 -0000	1.3
+++ tests/sexpr2xmldata/sexpr2xml-fv-usbmouse.xml	7 May 2008 00:14:37 -0000
@@ -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'/>
Index: tests/sexpr2xmldata/sexpr2xml-fv-usbtablet.xml
===================================================================
RCS file: /data/cvs/libvirt/tests/sexpr2xmldata/sexpr2xml-fv-usbtablet.xml,v
retrieving revision 1.3
diff -u -p -r1.3 sexpr2xml-fv-usbtablet.xml
--- tests/sexpr2xmldata/sexpr2xml-fv-usbtablet.xml	21 Aug 2007 08:54:07 -0000	1.3
+++ tests/sexpr2xmldata/sexpr2xml-fv-usbtablet.xml	7 May 2008 00:14:37 -0000
@@ -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'/>
Index: tests/sexpr2xmldata/sexpr2xml-fv-utc.xml
===================================================================
RCS file: /data/cvs/libvirt/tests/sexpr2xmldata/sexpr2xml-fv-utc.xml,v
retrieving revision 1.4
diff -u -p -r1.4 sexpr2xml-fv-utc.xml
--- tests/sexpr2xmldata/sexpr2xml-fv-utc.xml	21 Aug 2007 08:54:07 -0000	1.4
+++ tests/sexpr2xmldata/sexpr2xml-fv-utc.xml	7 May 2008 00:14:37 -0000
@@ -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'/>
Index: tests/sexpr2xmldata/sexpr2xml-fv-v2.xml
===================================================================
RCS file: /data/cvs/libvirt/tests/sexpr2xmldata/sexpr2xml-fv-v2.xml,v
retrieving revision 1.7
diff -u -p -r1.7 sexpr2xml-fv-v2.xml
--- tests/sexpr2xmldata/sexpr2xml-fv-v2.xml	21 Aug 2007 08:54:07 -0000	1.7
+++ tests/sexpr2xmldata/sexpr2xml-fv-v2.xml	7 May 2008 00:14:37 -0000
@@ -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'/>
Index: tests/sexpr2xmldata/sexpr2xml-fv.xml
===================================================================
RCS file: /data/cvs/libvirt/tests/sexpr2xmldata/sexpr2xml-fv.xml,v
retrieving revision 1.7
diff -u -p -r1.7 sexpr2xml-fv.xml
--- tests/sexpr2xmldata/sexpr2xml-fv.xml	21 Aug 2007 08:54:07 -0000	1.7
+++ tests/sexpr2xmldata/sexpr2xml-fv.xml	7 May 2008 00:14:37 -0000
@@ -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'/>
Index: tests/sexpr2xmldata/sexpr2xml-net-bridged.xml
===================================================================
RCS file: /data/cvs/libvirt/tests/sexpr2xmldata/sexpr2xml-net-bridged.xml,v
retrieving revision 1.4
diff -u -p -r1.4 sexpr2xml-net-bridged.xml
--- tests/sexpr2xmldata/sexpr2xml-net-bridged.xml	26 Apr 2008 14:22:02 -0000	1.4
+++ tests/sexpr2xmldata/sexpr2xml-net-bridged.xml	7 May 2008 00:14:37 -0000
@@ -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'/>
Index: tests/sexpr2xmldata/sexpr2xml-net-e1000.xml
===================================================================
RCS file: /data/cvs/libvirt/tests/sexpr2xmldata/sexpr2xml-net-e1000.xml,v
retrieving revision 1.1
diff -u -p -r1.1 sexpr2xml-net-e1000.xml
--- tests/sexpr2xmldata/sexpr2xml-net-e1000.xml	30 Apr 2008 12:30:55 -0000	1.1
+++ tests/sexpr2xmldata/sexpr2xml-net-e1000.xml	7 May 2008 00:14:37 -0000
@@ -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'/>
Index: tests/sexpr2xmldata/sexpr2xml-net-routed.xml
===================================================================
RCS file: /data/cvs/libvirt/tests/sexpr2xmldata/sexpr2xml-net-routed.xml,v
retrieving revision 1.4
diff -u -p -r1.4 sexpr2xml-net-routed.xml
--- tests/sexpr2xmldata/sexpr2xml-net-routed.xml	26 Apr 2008 14:22:02 -0000	1.4
+++ tests/sexpr2xmldata/sexpr2xml-net-routed.xml	7 May 2008 00:14:37 -0000
@@ -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'/>
Index: tests/sexpr2xmldata/sexpr2xml-no-source-cdrom.xml
===================================================================
RCS file: /data/cvs/libvirt/tests/sexpr2xmldata/sexpr2xml-no-source-cdrom.xml,v
retrieving revision 1.9
diff -u -p -r1.9 sexpr2xml-no-source-cdrom.xml
--- tests/sexpr2xmldata/sexpr2xml-no-source-cdrom.xml	26 Apr 2008 14:22:02 -0000	1.9
+++ tests/sexpr2xmldata/sexpr2xml-no-source-cdrom.xml	7 May 2008 00:14:37 -0000
@@ -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>
Index: tests/sexpr2xmldata/sexpr2xml-pv-bootloader.xml
===================================================================
RCS file: /data/cvs/libvirt/tests/sexpr2xmldata/sexpr2xml-pv-bootloader.xml,v
retrieving revision 1.3
diff -u -p -r1.3 sexpr2xml-pv-bootloader.xml
--- tests/sexpr2xmldata/sexpr2xml-pv-bootloader.xml	26 Apr 2008 14:22:02 -0000	1.3
+++ tests/sexpr2xmldata/sexpr2xml-pv-bootloader.xml	7 May 2008 00:14:37 -0000
@@ -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'/>
Index: tests/sexpr2xmldata/sexpr2xml-pv-vfb-new.xml
===================================================================
RCS file: /data/cvs/libvirt/tests/sexpr2xmldata/sexpr2xml-pv-vfb-new.xml,v
retrieving revision 1.6
diff -u -p -r1.6 sexpr2xml-pv-vfb-new.xml
--- tests/sexpr2xmldata/sexpr2xml-pv-vfb-new.xml	26 Apr 2008 14:22:02 -0000	1.6
+++ tests/sexpr2xmldata/sexpr2xml-pv-vfb-new.xml	7 May 2008 00:14:37 -0000
@@ -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'/>
Index: tests/sexpr2xmldata/sexpr2xml-pv-vfb-orig.xml
===================================================================
RCS file: /data/cvs/libvirt/tests/sexpr2xmldata/sexpr2xml-pv-vfb-orig.xml,v
retrieving revision 1.6
diff -u -p -r1.6 sexpr2xml-pv-vfb-orig.xml
--- tests/sexpr2xmldata/sexpr2xml-pv-vfb-orig.xml	26 Apr 2008 14:22:02 -0000	1.6
+++ tests/sexpr2xmldata/sexpr2xml-pv-vfb-orig.xml	7 May 2008 00:14:37 -0000
@@ -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'/>
Index: tests/sexpr2xmldata/sexpr2xml-pv.xml
===================================================================
RCS file: /data/cvs/libvirt/tests/sexpr2xmldata/sexpr2xml-pv.xml,v
retrieving revision 1.4
diff -u -p -r1.4 sexpr2xml-pv.xml
--- tests/sexpr2xmldata/sexpr2xml-pv.xml	26 Apr 2008 14:22:02 -0000	1.4
+++ tests/sexpr2xmldata/sexpr2xml-pv.xml	7 May 2008 00:14:37 -0000
@@ -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'/>
Index: tests/xmconfigdata/test-fullvirt-localtime.xml
===================================================================
RCS file: /data/cvs/libvirt/tests/xmconfigdata/test-fullvirt-localtime.xml,v
retrieving revision 1.3
diff -u -p -r1.3 test-fullvirt-localtime.xml
--- tests/xmconfigdata/test-fullvirt-localtime.xml	9 Aug 2007 20:19:12 -0000	1.3
+++ tests/xmconfigdata/test-fullvirt-localtime.xml	7 May 2008 00:14:37 -0000
@@ -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'>
Index: tests/xmconfigdata/test-fullvirt-new-cdrom.xml
===================================================================
RCS file: /data/cvs/libvirt/tests/xmconfigdata/test-fullvirt-new-cdrom.xml,v
retrieving revision 1.6
diff -u -p -r1.6 test-fullvirt-new-cdrom.xml
--- tests/xmconfigdata/test-fullvirt-new-cdrom.xml	9 Aug 2007 20:19:12 -0000	1.6
+++ tests/xmconfigdata/test-fullvirt-new-cdrom.xml	7 May 2008 00:14:38 -0000
@@ -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'>
Index: tests/xmconfigdata/test-fullvirt-old-cdrom.xml
===================================================================
RCS file: /data/cvs/libvirt/tests/xmconfigdata/test-fullvirt-old-cdrom.xml,v
retrieving revision 1.6
diff -u -p -r1.6 test-fullvirt-old-cdrom.xml
--- tests/xmconfigdata/test-fullvirt-old-cdrom.xml	9 Aug 2007 20:19:12 -0000	1.6
+++ tests/xmconfigdata/test-fullvirt-old-cdrom.xml	7 May 2008 00:14:38 -0000
@@ -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'>
Index: tests/xmconfigdata/test-fullvirt-parallel-tcp.xml
===================================================================
RCS file: /data/cvs/libvirt/tests/xmconfigdata/test-fullvirt-parallel-tcp.xml,v
retrieving revision 1.1
diff -u -p -r1.1 test-fullvirt-parallel-tcp.xml
--- tests/xmconfigdata/test-fullvirt-parallel-tcp.xml	26 Apr 2008 14:22:02 -0000	1.1
+++ tests/xmconfigdata/test-fullvirt-parallel-tcp.xml	7 May 2008 00:14:38 -0000
@@ -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'>
Index: tests/xmconfigdata/test-fullvirt-serial-file.xml
===================================================================
RCS file: /data/cvs/libvirt/tests/xmconfigdata/test-fullvirt-serial-file.xml,v
retrieving revision 1.1
diff -u -p -r1.1 test-fullvirt-serial-file.xml
--- tests/xmconfigdata/test-fullvirt-serial-file.xml	26 Apr 2008 14:22:02 -0000	1.1
+++ tests/xmconfigdata/test-fullvirt-serial-file.xml	7 May 2008 00:14:38 -0000
@@ -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'>
Index: tests/xmconfigdata/test-fullvirt-serial-null.xml
===================================================================
RCS file: /data/cvs/libvirt/tests/xmconfigdata/test-fullvirt-serial-null.xml,v
retrieving revision 1.1
diff -u -p -r1.1 test-fullvirt-serial-null.xml
--- tests/xmconfigdata/test-fullvirt-serial-null.xml	26 Apr 2008 14:22:02 -0000	1.1
+++ tests/xmconfigdata/test-fullvirt-serial-null.xml	7 May 2008 00:14:38 -0000
@@ -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'>
Index: tests/xmconfigdata/test-fullvirt-serial-pipe.xml
===================================================================
RCS file: /data/cvs/libvirt/tests/xmconfigdata/test-fullvirt-serial-pipe.xml,v
retrieving revision 1.1
diff -u -p -r1.1 test-fullvirt-serial-pipe.xml
--- tests/xmconfigdata/test-fullvirt-serial-pipe.xml	26 Apr 2008 14:22:02 -0000	1.1
+++ tests/xmconfigdata/test-fullvirt-serial-pipe.xml	7 May 2008 00:14:38 -0000
@@ -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'>
Index: tests/xmconfigdata/test-fullvirt-serial-pty.xml
===================================================================
RCS file: /data/cvs/libvirt/tests/xmconfigdata/test-fullvirt-serial-pty.xml,v
retrieving revision 1.1
diff -u -p -r1.1 test-fullvirt-serial-pty.xml
--- tests/xmconfigdata/test-fullvirt-serial-pty.xml	26 Apr 2008 14:22:02 -0000	1.1
+++ tests/xmconfigdata/test-fullvirt-serial-pty.xml	7 May 2008 00:14:38 -0000
@@ -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'>
Index: tests/xmconfigdata/test-fullvirt-serial-stdio.xml
===================================================================
RCS file: /data/cvs/libvirt/tests/xmconfigdata/test-fullvirt-serial-stdio.xml,v
retrieving revision 1.1
diff -u -p -r1.1 test-fullvirt-serial-stdio.xml
--- tests/xmconfigdata/test-fullvirt-serial-stdio.xml	26 Apr 2008 14:22:02 -0000	1.1
+++ tests/xmconfigdata/test-fullvirt-serial-stdio.xml	7 May 2008 00:14:38 -0000
@@ -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'>
Index: tests/xmconfigdata/test-fullvirt-serial-tcp-telnet.xml
===================================================================
RCS file: /data/cvs/libvirt/tests/xmconfigdata/test-fullvirt-serial-tcp-telnet.xml,v
retrieving revision 1.1
diff -u -p -r1.1 test-fullvirt-serial-tcp-telnet.xml
--- tests/xmconfigdata/test-fullvirt-serial-tcp-telnet.xml	26 Apr 2008 14:22:02 -0000	1.1
+++ tests/xmconfigdata/test-fullvirt-serial-tcp-telnet.xml	7 May 2008 00:14:38 -0000
@@ -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'>
Index: tests/xmconfigdata/test-fullvirt-serial-tcp.xml
===================================================================
RCS file: /data/cvs/libvirt/tests/xmconfigdata/test-fullvirt-serial-tcp.xml,v
retrieving revision 1.1
diff -u -p -r1.1 test-fullvirt-serial-tcp.xml
--- tests/xmconfigdata/test-fullvirt-serial-tcp.xml	26 Apr 2008 14:22:02 -0000	1.1
+++ tests/xmconfigdata/test-fullvirt-serial-tcp.xml	7 May 2008 00:14:38 -0000
@@ -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'>
Index: tests/xmconfigdata/test-fullvirt-serial-udp.xml
===================================================================
RCS file: /data/cvs/libvirt/tests/xmconfigdata/test-fullvirt-serial-udp.xml,v
retrieving revision 1.1
diff -u -p -r1.1 test-fullvirt-serial-udp.xml
--- tests/xmconfigdata/test-fullvirt-serial-udp.xml	26 Apr 2008 14:22:02 -0000	1.1
+++ tests/xmconfigdata/test-fullvirt-serial-udp.xml	7 May 2008 00:14:38 -0000
@@ -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'>
Index: tests/xmconfigdata/test-fullvirt-serial-unix.xml
===================================================================
RCS file: /data/cvs/libvirt/tests/xmconfigdata/test-fullvirt-serial-unix.xml,v
retrieving revision 1.1
diff -u -p -r1.1 test-fullvirt-serial-unix.xml
--- tests/xmconfigdata/test-fullvirt-serial-unix.xml	26 Apr 2008 14:22:02 -0000	1.1
+++ tests/xmconfigdata/test-fullvirt-serial-unix.xml	7 May 2008 00:14:38 -0000
@@ -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'>
Index: tests/xmconfigdata/test-fullvirt-usbmouse.xml
===================================================================
RCS file: /data/cvs/libvirt/tests/xmconfigdata/test-fullvirt-usbmouse.xml,v
retrieving revision 1.2
diff -u -p -r1.2 test-fullvirt-usbmouse.xml
--- tests/xmconfigdata/test-fullvirt-usbmouse.xml	9 Aug 2007 20:19:12 -0000	1.2
+++ tests/xmconfigdata/test-fullvirt-usbmouse.xml	7 May 2008 00:14:38 -0000
@@ -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'>
Index: tests/xmconfigdata/test-fullvirt-usbtablet-no-bus.xml
===================================================================
RCS file: /data/cvs/libvirt/tests/xmconfigdata/test-fullvirt-usbtablet-no-bus.xml,v
retrieving revision 1.2
diff -u -p -r1.2 test-fullvirt-usbtablet-no-bus.xml
--- tests/xmconfigdata/test-fullvirt-usbtablet-no-bus.xml	9 Aug 2007 20:19:12 -0000	1.2
+++ tests/xmconfigdata/test-fullvirt-usbtablet-no-bus.xml	7 May 2008 00:14:38 -0000
@@ -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'>
Index: tests/xmconfigdata/test-fullvirt-usbtablet.xml
===================================================================
RCS file: /data/cvs/libvirt/tests/xmconfigdata/test-fullvirt-usbtablet.xml,v
retrieving revision 1.2
diff -u -p -r1.2 test-fullvirt-usbtablet.xml
--- tests/xmconfigdata/test-fullvirt-usbtablet.xml	9 Aug 2007 20:19:12 -0000	1.2
+++ tests/xmconfigdata/test-fullvirt-usbtablet.xml	7 May 2008 00:14:38 -0000
@@ -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'>
Index: tests/xmconfigdata/test-fullvirt-utc.xml
===================================================================
RCS file: /data/cvs/libvirt/tests/xmconfigdata/test-fullvirt-utc.xml,v
retrieving revision 1.3
diff -u -p -r1.3 test-fullvirt-utc.xml
--- tests/xmconfigdata/test-fullvirt-utc.xml	9 Aug 2007 20:19:12 -0000	1.3
+++ tests/xmconfigdata/test-fullvirt-utc.xml	7 May 2008 00:14:38 -0000
@@ -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'>
Index: tests/xmconfigdata/test-paravirt-net-e1000.xml
===================================================================
RCS file: /data/cvs/libvirt/tests/xmconfigdata/test-paravirt-net-e1000.xml,v
retrieving revision 1.1
diff -u -p -r1.1 test-paravirt-net-e1000.xml
--- tests/xmconfigdata/test-paravirt-net-e1000.xml	30 Apr 2008 12:30:55 -0000	1.1
+++ tests/xmconfigdata/test-paravirt-net-e1000.xml	7 May 2008 00:14:38 -0000
@@ -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'/>
Index: tests/xmconfigdata/test-paravirt-new-pvfb.xml
===================================================================
RCS file: /data/cvs/libvirt/tests/xmconfigdata/test-paravirt-new-pvfb.xml,v
retrieving revision 1.4
diff -u -p -r1.4 test-paravirt-new-pvfb.xml
--- tests/xmconfigdata/test-paravirt-new-pvfb.xml	26 Apr 2008 14:22:03 -0000	1.4
+++ tests/xmconfigdata/test-paravirt-new-pvfb.xml	7 May 2008 00:14:38 -0000
@@ -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'/>
Index: tests/xmconfigdata/test-paravirt-old-pvfb.xml
===================================================================
RCS file: /data/cvs/libvirt/tests/xmconfigdata/test-paravirt-old-pvfb.xml,v
retrieving revision 1.4
diff -u -p -r1.4 test-paravirt-old-pvfb.xml
--- tests/xmconfigdata/test-paravirt-old-pvfb.xml	26 Apr 2008 14:22:03 -0000	1.4
+++ tests/xmconfigdata/test-paravirt-old-pvfb.xml	7 May 2008 00:14:38 -0000
@@ -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'/>

-- 
|: Red Hat, Engineering, Boston   -o-   http://people.redhat.com/berrange/ :|
|: http://libvirt.org  -o-  http://virt-manager.org  -o-  http://ovirt.org :|
|: http://autobuild.org       -o-         http://search.cpan.org/~danberr/ :|
|: GnuPG: 7D3B9505  -o-  F3C9 553F A1DA 4AC2 5648 23C1 B3DF F742 7D3B 9505 :|


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]