External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-11-05 04:41:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Added disk target bus type to Xen driver

Browse Source
This commit is contained in:
Daniel P. Berrange 2008-05-08 14:41:56 +00:00
parent 979edb4a64
commit 021bd31706
59 changed files with 129 additions and 102 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@ -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

18
src/xend_internal.c
View File

@ -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");
}

13
src/xm_internal.c
View File

@ -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");
}

4
tests/sexpr2xmldata/sexpr2xml-curmem.xml
View File

@ -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>

2
tests/sexpr2xmldata/sexpr2xml-disk-block-shareable.xml
View File

@ -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'>

2
tests/sexpr2xmldata/sexpr2xml-disk-block.xml
View File

@ -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'/>

2
tests/sexpr2xmldata/sexpr2xml-disk-drv-blktap-qcow.xml
View File

@ -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'/>

2
tests/sexpr2xmldata/sexpr2xml-disk-drv-blktap-raw.xml
View File

@ -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'/>

2
tests/sexpr2xmldata/sexpr2xml-disk-file.xml
View File

@ -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'/>

2
tests/sexpr2xmldata/sexpr2xml-fv-kernel.xml
View File

@ -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'/>

2
tests/sexpr2xmldata/sexpr2xml-fv-legacy-vfb.xml
View File

@ -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'/>

4
tests/sexpr2xmldata/sexpr2xml-fv-localtime.xml
View File

@ -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'/>

4
tests/sexpr2xmldata/sexpr2xml-fv-parallel-tcp.xml
View File

@ -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'/>

4
tests/sexpr2xmldata/sexpr2xml-fv-serial-file.xml
View File

@ -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'/>

4
tests/sexpr2xmldata/sexpr2xml-fv-serial-null.xml
View File

@ -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'/>

4
tests/sexpr2xmldata/sexpr2xml-fv-serial-pipe.xml
View File

@ -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'/>

4
tests/sexpr2xmldata/sexpr2xml-fv-serial-pty.xml
View File

@ -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'/>

4
tests/sexpr2xmldata/sexpr2xml-fv-serial-stdio.xml
View File

@ -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'/>

4
tests/sexpr2xmldata/sexpr2xml-fv-serial-tcp-telnet.xml
View File

@ -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'/>

4
tests/sexpr2xmldata/sexpr2xml-fv-serial-tcp.xml
View File

@ -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'/>

4
tests/sexpr2xmldata/sexpr2xml-fv-serial-udp.xml
View File

@ -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'/>

4
tests/sexpr2xmldata/sexpr2xml-fv-serial-unix.xml
View File

@ -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'/>

4
tests/sexpr2xmldata/sexpr2xml-fv-sound-all.xml
View File

@ -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'/>

4
tests/sexpr2xmldata/sexpr2xml-fv-sound.xml
View File

@ -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'/>

4
tests/sexpr2xmldata/sexpr2xml-fv-usbmouse.xml
View File

@ -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'/>

4
tests/sexpr2xmldata/sexpr2xml-fv-usbtablet.xml
View File

@ -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'/>

4
tests/sexpr2xmldata/sexpr2xml-fv-utc.xml
View File

@ -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'/>

4
tests/sexpr2xmldata/sexpr2xml-fv-v2.xml
View File

@ -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'/>

4
tests/sexpr2xmldata/sexpr2xml-fv.xml
View File

@ -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'/>

2
tests/sexpr2xmldata/sexpr2xml-net-bridged.xml
View File

@ -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'/>

2
tests/sexpr2xmldata/sexpr2xml-net-e1000.xml
View File

@ -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'/>

2
tests/sexpr2xmldata/sexpr2xml-net-routed.xml
View File

@ -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'/>

6
tests/sexpr2xmldata/sexpr2xml-no-source-cdrom.xml
View File

@ -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>

2
tests/sexpr2xmldata/sexpr2xml-pv-bootloader.xml
View File

@ -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'/>

2
tests/sexpr2xmldata/sexpr2xml-pv-vfb-new.xml
View File

@ -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'/>

2
tests/sexpr2xmldata/sexpr2xml-pv-vfb-orig.xml
View File

@ -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'/>

2
tests/sexpr2xmldata/sexpr2xml-pv.xml
View File

@ -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'/>

4
tests/sexpr2xmltest.c
View File

@ -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);

4
tests/xmconfigdata/test-fullvirt-localtime.xml
View File

@ -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'>

4
tests/xmconfigdata/test-fullvirt-new-cdrom.xml
View File

@ -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'>

4
tests/xmconfigdata/test-fullvirt-old-cdrom.xml
View File

@ -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'>

4
tests/xmconfigdata/test-fullvirt-parallel-tcp.xml
View File

@ -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'>

4
tests/xmconfigdata/test-fullvirt-serial-file.xml
View File

@ -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'>

4
tests/xmconfigdata/test-fullvirt-serial-null.xml
View File

@ -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'>

4
tests/xmconfigdata/test-fullvirt-serial-pipe.xml
View File

@ -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'>

4
tests/xmconfigdata/test-fullvirt-serial-pty.xml
View File

@ -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'>

4
tests/xmconfigdata/test-fullvirt-serial-stdio.xml
View File

@ -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'>

4
tests/xmconfigdata/test-fullvirt-serial-tcp-telnet.xml
View File

@ -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'>

4
tests/xmconfigdata/test-fullvirt-serial-tcp.xml
View File

@ -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'>

4
tests/xmconfigdata/test-fullvirt-serial-udp.xml
View File

@ -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'>

4
tests/xmconfigdata/test-fullvirt-serial-unix.xml
View File

@ -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'>

4
tests/xmconfigdata/test-fullvirt-sound.xml
View File

@ -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'>

4
tests/xmconfigdata/test-fullvirt-usbmouse.xml
View File

@ -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'>

4
tests/xmconfigdata/test-fullvirt-usbtablet-no-bus.xml
View File

@ -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'>

4
tests/xmconfigdata/test-fullvirt-usbtablet.xml
View File

@ -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'>

4
tests/xmconfigdata/test-fullvirt-utc.xml
View File

@ -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'>

2
tests/xmconfigdata/test-paravirt-net-e1000.xml
View File

@ -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'/>

2
tests/xmconfigdata/test-paravirt-new-pvfb.xml
View File

@ -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'/>

2
tests/xmconfigdata/test-paravirt-old-pvfb.xml
View File

@ -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'/>