提交 021bd317 编写于 作者: D Daniel P. Berrange

Added disk target bus type to Xen driver

上级 979edb4a
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> Thu May 8 10:19:11 EST 2008 Daniel P. Berrange <berrange@redhat.com>
* docs/page.xsl: Fix detection of sub-headings * docs/page.xsl: Fix detection of sub-headings
......
...@@ -1860,6 +1860,7 @@ xend_parse_sexp_desc(virConnectPtr conn, struct sexpr *root, ...@@ -1860,6 +1860,7 @@ xend_parse_sexp_desc(virConnectPtr conn, struct sexpr *root,
const char *src = NULL; const char *src = NULL;
const char *dst = NULL; const char *dst = NULL;
const char *mode = NULL; const char *mode = NULL;
const char *bus = NULL;
/* Again dealing with (vbd...) vs (tap ...) differences */ /* Again dealing with (vbd...) vs (tap ...) differences */
if (sexpr_lookup(node, "device/vbd")) { if (sexpr_lookup(node, "device/vbd")) {
...@@ -1979,7 +1980,16 @@ xend_parse_sexp_desc(virConnectPtr conn, struct sexpr *root, ...@@ -1979,7 +1980,16 @@ xend_parse_sexp_desc(virConnectPtr conn, struct sexpr *root,
/* This case is the cdrom device only */ /* This case is the cdrom device only */
virBufferAddLit(&buf, " <disk device='cdrom'>\n"); 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 /* XXX should we force mode == r, if cdrom==1, or assume
...@@ -2068,14 +2078,14 @@ xend_parse_sexp_desc(virConnectPtr conn, struct sexpr *root, ...@@ -2068,14 +2078,14 @@ xend_parse_sexp_desc(virConnectPtr conn, struct sexpr *root,
if ((tmp != NULL) && (tmp[0] != 0)) { if ((tmp != NULL) && (tmp[0] != 0)) {
virBufferAddLit(&buf, " <disk type='file' device='floppy'>\n"); virBufferAddLit(&buf, " <disk type='file' device='floppy'>\n");
virBufferVSprintf(&buf, " <source file='%s'/>\n", tmp); 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"); virBufferAddLit(&buf, " </disk>\n");
} }
tmp = sexpr_node(root, "domain/image/hvm/fdb"); tmp = sexpr_node(root, "domain/image/hvm/fdb");
if ((tmp != NULL) && (tmp[0] != 0)) { if ((tmp != NULL) && (tmp[0] != 0)) {
virBufferAddLit(&buf, " <disk type='file' device='floppy'>\n"); virBufferAddLit(&buf, " <disk type='file' device='floppy'>\n");
virBufferVSprintf(&buf, " <source file='%s'/>\n", tmp); 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"); virBufferAddLit(&buf, " </disk>\n");
} }
...@@ -2086,7 +2096,7 @@ xend_parse_sexp_desc(virConnectPtr conn, struct sexpr *root, ...@@ -2086,7 +2096,7 @@ xend_parse_sexp_desc(virConnectPtr conn, struct sexpr *root,
virBufferAddLit(&buf, " <disk type='file' device='cdrom'>\n"); virBufferAddLit(&buf, " <disk type='file' device='cdrom'>\n");
virBufferAddLit(&buf, " <driver name='file'/>\n"); virBufferAddLit(&buf, " <driver name='file'/>\n");
virBufferVSprintf(&buf, " <source file='%s'/>\n", tmp); 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, " <readonly/>\n");
virBufferAddLit(&buf, " </disk>\n"); virBufferAddLit(&buf, " </disk>\n");
} }
......
...@@ -733,6 +733,7 @@ char *xenXMDomainFormatXML(virConnectPtr conn, virConfPtr conf) { ...@@ -733,6 +733,7 @@ char *xenXMDomainFormatXML(virConnectPtr conn, virConfPtr conf) {
char *head; char *head;
char *offset; char *offset;
char *tmp, *tmp1; char *tmp, *tmp1;
const char *bus;
if ((list->type != VIR_CONF_STRING) || (list->str == NULL)) if ((list->type != VIR_CONF_STRING) || (list->str == NULL))
goto skipdisk; goto skipdisk;
...@@ -805,6 +806,14 @@ char *xenXMDomainFormatXML(virConnectPtr conn, virConfPtr conf) { ...@@ -805,6 +806,14 @@ char *xenXMDomainFormatXML(virConnectPtr conn, virConfPtr conf) {
tmp[0] = '\0'; 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", virBufferVSprintf(&buf, " <disk type='%s' device='%s'>\n",
block ? "block" : "file", block ? "block" : "file",
cdrom ? "cdrom" : "disk"); cdrom ? "cdrom" : "disk");
...@@ -814,7 +823,7 @@ char *xenXMDomainFormatXML(virConnectPtr conn, virConfPtr conf) { ...@@ -814,7 +823,7 @@ char *xenXMDomainFormatXML(virConnectPtr conn, virConfPtr conf) {
virBufferVSprintf(&buf, " <driver name='%s'/>\n", drvName); virBufferVSprintf(&buf, " <driver name='%s'/>\n", drvName);
if (src[0]) if (src[0])
virBufferVSprintf(&buf, " <source %s='%s'/>\n", block ? "dev" : "file", src); 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") || if (!strcmp(head, "r") ||
!strcmp(head, "ro")) !strcmp(head, "ro"))
virBufferAddLit(&buf, " <readonly/>\n"); virBufferAddLit(&buf, " <readonly/>\n");
...@@ -833,7 +842,7 @@ char *xenXMDomainFormatXML(virConnectPtr conn, virConfPtr conf) { ...@@ -833,7 +842,7 @@ char *xenXMDomainFormatXML(virConnectPtr conn, virConfPtr conf) {
virBufferAddLit(&buf, " <disk type='file' device='cdrom'>\n"); virBufferAddLit(&buf, " <disk type='file' device='cdrom'>\n");
virBufferAddLit(&buf, " <driver name='file'/>\n"); virBufferAddLit(&buf, " <driver name='file'/>\n");
virBufferVSprintf(&buf, " <source file='%s'/>\n", str); 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, " <readonly/>\n");
virBufferAddLit(&buf, " </disk>\n"); virBufferAddLit(&buf, " </disk>\n");
} }
......
...@@ -24,10 +24,10 @@ ...@@ -24,10 +24,10 @@
<disk type='file' device='disk'> <disk type='file' device='disk'>
<driver name='tap' type='aio'/> <driver name='tap' type='aio'/>
<source file='/xen/rhel5.img'/> <source file='/xen/rhel5.img'/>
<target dev='xvda:disk'/> <target dev='xvda' bus='xen'/>
</disk> </disk>
<input type='mouse' bus='xen'/> <input type='mouse' bus='xen'/>
<graphics type='vnc' port='5905'/> <graphics type='vnc' port='-1'/>
<console type='pty'> <console type='pty'>
<target port='0'/> <target port='0'/>
</console> </console>
......
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
<disk type='file' device='disk'> <disk type='file' device='disk'>
<driver name='tap' type='aio'/> <driver name='tap' type='aio'/>
<source file='/var/lib/xen/images/rhel5pv.img'/> <source file='/var/lib/xen/images/rhel5pv.img'/>
<target dev='xvda'/> <target dev='xvda' bus='xen'/>
<shareable/> <shareable/>
</disk> </disk>
<interface type='bridge'> <interface type='bridge'>
......
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
<disk type='block' device='disk'> <disk type='block' device='disk'>
<driver name='phy'/> <driver name='phy'/>
<source dev='/dev/MainVG/GuestVG'/> <source dev='/dev/MainVG/GuestVG'/>
<target dev='xvda'/> <target dev='xvda' bus='xen'/>
</disk> </disk>
<console type='pty'> <console type='pty'>
<target port='0'/> <target port='0'/>
......
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
<disk type='file' device='disk'> <disk type='file' device='disk'>
<driver name='tap' type='qcow'/> <driver name='tap' type='qcow'/>
<source file='/root/some.img'/> <source file='/root/some.img'/>
<target dev='xvda'/> <target dev='xvda' bus='xen'/>
</disk> </disk>
<console type='pty'> <console type='pty'>
<target port='0'/> <target port='0'/>
......
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
<disk type='file' device='disk'> <disk type='file' device='disk'>
<driver name='tap' type='aio'/> <driver name='tap' type='aio'/>
<source file='/root/some.img'/> <source file='/root/some.img'/>
<target dev='xvda'/> <target dev='xvda' bus='xen'/>
</disk> </disk>
<console type='pty'> <console type='pty'>
<target port='0'/> <target port='0'/>
......
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
<disk type='file' device='disk'> <disk type='file' device='disk'>
<driver name='file'/> <driver name='file'/>
<source file='/root/some.img'/> <source file='/root/some.img'/>
<target dev='xvda'/> <target dev='xvda' bus='xen'/>
</disk> </disk>
<console type='pty'> <console type='pty'>
<target port='0'/> <target port='0'/>
......
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
<disk type='file' device='disk'> <disk type='file' device='disk'>
<driver name='file'/> <driver name='file'/>
<source file='/root/some.img'/> <source file='/root/some.img'/>
<target dev='xvda'/> <target dev='xvda' bus='xen'/>
</disk> </disk>
<serial type='pty'> <serial type='pty'>
<target port='0'/> <target port='0'/>
......
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
<disk type='block' device='disk'> <disk type='block' device='disk'>
<driver name='phy'/> <driver name='phy'/>
<source dev='/dev/zvol/dsk/export/s10u4-root'/> <source dev='/dev/zvol/dsk/export/s10u4-root'/>
<target dev='hda'/> <target dev='hda' bus='ide'/>
</disk> </disk>
<input type='mouse' bus='ps2'/> <input type='mouse' bus='ps2'/>
<graphics type='vnc' port='-1' keymap='en-us'/> <graphics type='vnc' port='-1' keymap='en-us'/>
......
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
<disk type='file' device='disk'> <disk type='file' device='disk'>
<driver name='file'/> <driver name='file'/>
<source file='/root/foo.img'/> <source file='/root/foo.img'/>
<target dev='hda'/> <target dev='hda' bus='ide'/>
</disk> </disk>
<interface type='bridge'> <interface type='bridge'>
<source bridge='xenbr0'/> <source bridge='xenbr0'/>
...@@ -31,7 +31,7 @@ ...@@ -31,7 +31,7 @@
<disk type='file' device='cdrom'> <disk type='file' device='cdrom'>
<driver name='file'/> <driver name='file'/>
<source file='/root/boot.iso'/> <source file='/root/boot.iso'/>
<target dev='hdc'/> <target dev='hdc' bus='ide'/>
<readonly/> <readonly/>
</disk> </disk>
<input type='mouse' bus='ps2'/> <input type='mouse' bus='ps2'/>
......
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
<disk type='file' device='disk'> <disk type='file' device='disk'>
<driver name='file'/> <driver name='file'/>
<source file='/root/foo.img'/> <source file='/root/foo.img'/>
<target dev='hda'/> <target dev='hda' bus='ide'/>
</disk> </disk>
<interface type='bridge'> <interface type='bridge'>
<source bridge='xenbr0'/> <source bridge='xenbr0'/>
...@@ -31,7 +31,7 @@ ...@@ -31,7 +31,7 @@
<disk type='file' device='cdrom'> <disk type='file' device='cdrom'>
<driver name='file'/> <driver name='file'/>
<source file='/root/boot.iso'/> <source file='/root/boot.iso'/>
<target dev='hdc'/> <target dev='hdc' bus='ide'/>
<readonly/> <readonly/>
</disk> </disk>
<input type='mouse' bus='ps2'/> <input type='mouse' bus='ps2'/>
......
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
<disk type='file' device='disk'> <disk type='file' device='disk'>
<driver name='file'/> <driver name='file'/>
<source file='/root/foo.img'/> <source file='/root/foo.img'/>
<target dev='hda'/> <target dev='hda' bus='ide'/>
</disk> </disk>
<interface type='bridge'> <interface type='bridge'>
<source bridge='xenbr0'/> <source bridge='xenbr0'/>
...@@ -31,7 +31,7 @@ ...@@ -31,7 +31,7 @@
<disk type='file' device='cdrom'> <disk type='file' device='cdrom'>
<driver name='file'/> <driver name='file'/>
<source file='/root/boot.iso'/> <source file='/root/boot.iso'/>
<target dev='hdc'/> <target dev='hdc' bus='ide'/>
<readonly/> <readonly/>
</disk> </disk>
<input type='mouse' bus='ps2'/> <input type='mouse' bus='ps2'/>
......
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
<disk type='file' device='disk'> <disk type='file' device='disk'>
<driver name='file'/> <driver name='file'/>
<source file='/root/foo.img'/> <source file='/root/foo.img'/>
<target dev='hda'/> <target dev='hda' bus='ide'/>
</disk> </disk>
<interface type='bridge'> <interface type='bridge'>
<source bridge='xenbr0'/> <source bridge='xenbr0'/>
...@@ -31,7 +31,7 @@ ...@@ -31,7 +31,7 @@
<disk type='file' device='cdrom'> <disk type='file' device='cdrom'>
<driver name='file'/> <driver name='file'/>
<source file='/root/boot.iso'/> <source file='/root/boot.iso'/>
<target dev='hdc'/> <target dev='hdc' bus='ide'/>
<readonly/> <readonly/>
</disk> </disk>
<input type='mouse' bus='ps2'/> <input type='mouse' bus='ps2'/>
......
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
<disk type='file' device='disk'> <disk type='file' device='disk'>
<driver name='file'/> <driver name='file'/>
<source file='/root/foo.img'/> <source file='/root/foo.img'/>
<target dev='hda'/> <target dev='hda' bus='ide'/>
</disk> </disk>
<interface type='bridge'> <interface type='bridge'>
<source bridge='xenbr0'/> <source bridge='xenbr0'/>
...@@ -31,7 +31,7 @@ ...@@ -31,7 +31,7 @@
<disk type='file' device='cdrom'> <disk type='file' device='cdrom'>
<driver name='file'/> <driver name='file'/>
<source file='/root/boot.iso'/> <source file='/root/boot.iso'/>
<target dev='hdc'/> <target dev='hdc' bus='ide'/>
<readonly/> <readonly/>
</disk> </disk>
<input type='mouse' bus='ps2'/> <input type='mouse' bus='ps2'/>
......
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
<disk type='file' device='disk'> <disk type='file' device='disk'>
<driver name='file'/> <driver name='file'/>
<source file='/root/foo.img'/> <source file='/root/foo.img'/>
<target dev='hda'/> <target dev='hda' bus='ide'/>
</disk> </disk>
<interface type='bridge'> <interface type='bridge'>
<source bridge='xenbr0'/> <source bridge='xenbr0'/>
...@@ -31,7 +31,7 @@ ...@@ -31,7 +31,7 @@
<disk type='file' device='cdrom'> <disk type='file' device='cdrom'>
<driver name='file'/> <driver name='file'/>
<source file='/root/boot.iso'/> <source file='/root/boot.iso'/>
<target dev='hdc'/> <target dev='hdc' bus='ide'/>
<readonly/> <readonly/>
</disk> </disk>
<input type='mouse' bus='ps2'/> <input type='mouse' bus='ps2'/>
......
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
<disk type='file' device='disk'> <disk type='file' device='disk'>
<driver name='file'/> <driver name='file'/>
<source file='/root/foo.img'/> <source file='/root/foo.img'/>
<target dev='hda'/> <target dev='hda' bus='ide'/>
</disk> </disk>
<interface type='bridge'> <interface type='bridge'>
<source bridge='xenbr0'/> <source bridge='xenbr0'/>
...@@ -31,7 +31,7 @@ ...@@ -31,7 +31,7 @@
<disk type='file' device='cdrom'> <disk type='file' device='cdrom'>
<driver name='file'/> <driver name='file'/>
<source file='/root/boot.iso'/> <source file='/root/boot.iso'/>
<target dev='hdc'/> <target dev='hdc' bus='ide'/>
<readonly/> <readonly/>
</disk> </disk>
<input type='mouse' bus='ps2'/> <input type='mouse' bus='ps2'/>
......
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
<disk type='file' device='disk'> <disk type='file' device='disk'>
<driver name='file'/> <driver name='file'/>
<source file='/root/foo.img'/> <source file='/root/foo.img'/>
<target dev='hda'/> <target dev='hda' bus='ide'/>
</disk> </disk>
<interface type='bridge'> <interface type='bridge'>
<source bridge='xenbr0'/> <source bridge='xenbr0'/>
...@@ -31,7 +31,7 @@ ...@@ -31,7 +31,7 @@
<disk type='file' device='cdrom'> <disk type='file' device='cdrom'>
<driver name='file'/> <driver name='file'/>
<source file='/root/boot.iso'/> <source file='/root/boot.iso'/>
<target dev='hdc'/> <target dev='hdc' bus='ide'/>
<readonly/> <readonly/>
</disk> </disk>
<input type='mouse' bus='ps2'/> <input type='mouse' bus='ps2'/>
......
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
<disk type='file' device='disk'> <disk type='file' device='disk'>
<driver name='file'/> <driver name='file'/>
<source file='/root/foo.img'/> <source file='/root/foo.img'/>
<target dev='hda'/> <target dev='hda' bus='ide'/>
</disk> </disk>
<interface type='bridge'> <interface type='bridge'>
<source bridge='xenbr0'/> <source bridge='xenbr0'/>
...@@ -31,7 +31,7 @@ ...@@ -31,7 +31,7 @@
<disk type='file' device='cdrom'> <disk type='file' device='cdrom'>
<driver name='file'/> <driver name='file'/>
<source file='/root/boot.iso'/> <source file='/root/boot.iso'/>
<target dev='hdc'/> <target dev='hdc' bus='ide'/>
<readonly/> <readonly/>
</disk> </disk>
<input type='mouse' bus='ps2'/> <input type='mouse' bus='ps2'/>
......
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
<disk type='file' device='disk'> <disk type='file' device='disk'>
<driver name='file'/> <driver name='file'/>
<source file='/root/foo.img'/> <source file='/root/foo.img'/>
<target dev='hda'/> <target dev='hda' bus='ide'/>
</disk> </disk>
<interface type='bridge'> <interface type='bridge'>
<source bridge='xenbr0'/> <source bridge='xenbr0'/>
...@@ -31,7 +31,7 @@ ...@@ -31,7 +31,7 @@
<disk type='file' device='cdrom'> <disk type='file' device='cdrom'>
<driver name='file'/> <driver name='file'/>
<source file='/root/boot.iso'/> <source file='/root/boot.iso'/>
<target dev='hdc'/> <target dev='hdc' bus='ide'/>
<readonly/> <readonly/>
</disk> </disk>
<input type='mouse' bus='ps2'/> <input type='mouse' bus='ps2'/>
......
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
<disk type='file' device='disk'> <disk type='file' device='disk'>
<driver name='file'/> <driver name='file'/>
<source file='/root/foo.img'/> <source file='/root/foo.img'/>
<target dev='hda'/> <target dev='hda' bus='ide'/>
</disk> </disk>
<interface type='bridge'> <interface type='bridge'>
<source bridge='xenbr0'/> <source bridge='xenbr0'/>
...@@ -31,7 +31,7 @@ ...@@ -31,7 +31,7 @@
<disk type='file' device='cdrom'> <disk type='file' device='cdrom'>
<driver name='file'/> <driver name='file'/>
<source file='/root/boot.iso'/> <source file='/root/boot.iso'/>
<target dev='hdc'/> <target dev='hdc' bus='ide'/>
<readonly/> <readonly/>
</disk> </disk>
<input type='mouse' bus='ps2'/> <input type='mouse' bus='ps2'/>
......
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
<disk type='file' device='disk'> <disk type='file' device='disk'>
<driver name='file'/> <driver name='file'/>
<source file='/root/foo.img'/> <source file='/root/foo.img'/>
<target dev='hda'/> <target dev='hda' bus='ide'/>
</disk> </disk>
<interface type='bridge'> <interface type='bridge'>
<source bridge='xenbr0'/> <source bridge='xenbr0'/>
...@@ -31,7 +31,7 @@ ...@@ -31,7 +31,7 @@
<disk type='file' device='cdrom'> <disk type='file' device='cdrom'>
<driver name='file'/> <driver name='file'/>
<source file='/root/boot.iso'/> <source file='/root/boot.iso'/>
<target dev='hdc'/> <target dev='hdc' bus='ide'/>
<readonly/> <readonly/>
</disk> </disk>
<input type='mouse' bus='ps2'/> <input type='mouse' bus='ps2'/>
......
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
<disk type='file' device='disk'> <disk type='file' device='disk'>
<driver name='file'/> <driver name='file'/>
<source file='/root/foo.img'/> <source file='/root/foo.img'/>
<target dev='hda'/> <target dev='hda' bus='ide'/>
</disk> </disk>
<interface type='bridge'> <interface type='bridge'>
<source bridge='xenbr0'/> <source bridge='xenbr0'/>
...@@ -31,7 +31,7 @@ ...@@ -31,7 +31,7 @@
<disk type='file' device='cdrom'> <disk type='file' device='cdrom'>
<driver name='file'/> <driver name='file'/>
<source file='/root/boot.iso'/> <source file='/root/boot.iso'/>
<target dev='hdc'/> <target dev='hdc' bus='ide'/>
<readonly/> <readonly/>
</disk> </disk>
<input type='mouse' bus='ps2'/> <input type='mouse' bus='ps2'/>
......
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
<disk type='file' device='disk'> <disk type='file' device='disk'>
<driver name='file'/> <driver name='file'/>
<source file='/root/foo.img'/> <source file='/root/foo.img'/>
<target dev='hda'/> <target dev='hda' bus='ide'/>
</disk> </disk>
<interface type='bridge'> <interface type='bridge'>
<source bridge='xenbr0'/> <source bridge='xenbr0'/>
...@@ -31,7 +31,7 @@ ...@@ -31,7 +31,7 @@
<disk type='file' device='cdrom'> <disk type='file' device='cdrom'>
<driver name='file'/> <driver name='file'/>
<source file='/root/boot.iso'/> <source file='/root/boot.iso'/>
<target dev='hdc'/> <target dev='hdc' bus='ide'/>
<readonly/> <readonly/>
</disk> </disk>
<input type='mouse' bus='usb'/> <input type='mouse' bus='usb'/>
......
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
<disk type='file' device='disk'> <disk type='file' device='disk'>
<driver name='file'/> <driver name='file'/>
<source file='/root/foo.img'/> <source file='/root/foo.img'/>
<target dev='hda'/> <target dev='hda' bus='ide'/>
</disk> </disk>
<interface type='bridge'> <interface type='bridge'>
<source bridge='xenbr0'/> <source bridge='xenbr0'/>
...@@ -31,7 +31,7 @@ ...@@ -31,7 +31,7 @@
<disk type='file' device='cdrom'> <disk type='file' device='cdrom'>
<driver name='file'/> <driver name='file'/>
<source file='/root/boot.iso'/> <source file='/root/boot.iso'/>
<target dev='hdc'/> <target dev='hdc' bus='ide'/>
<readonly/> <readonly/>
</disk> </disk>
<input type='tablet' bus='usb'/> <input type='tablet' bus='usb'/>
......
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
<disk type='file' device='disk'> <disk type='file' device='disk'>
<driver name='file'/> <driver name='file'/>
<source file='/root/foo.img'/> <source file='/root/foo.img'/>
<target dev='hda'/> <target dev='hda' bus='ide'/>
</disk> </disk>
<interface type='bridge'> <interface type='bridge'>
<source bridge='xenbr0'/> <source bridge='xenbr0'/>
...@@ -31,7 +31,7 @@ ...@@ -31,7 +31,7 @@
<disk type='file' device='cdrom'> <disk type='file' device='cdrom'>
<driver name='file'/> <driver name='file'/>
<source file='/root/boot.iso'/> <source file='/root/boot.iso'/>
<target dev='hdc'/> <target dev='hdc' bus='ide'/>
<readonly/> <readonly/>
</disk> </disk>
<input type='mouse' bus='ps2'/> <input type='mouse' bus='ps2'/>
......
...@@ -20,13 +20,13 @@ ...@@ -20,13 +20,13 @@
<disk type='file' device='cdrom'> <disk type='file' device='cdrom'>
<driver name='file'/> <driver name='file'/>
<source file='/root/boot.iso'/> <source file='/root/boot.iso'/>
<target dev='hdc'/> <target dev='hdc' bus='ide'/>
<readonly/> <readonly/>
</disk> </disk>
<disk type='file' device='disk'> <disk type='file' device='disk'>
<driver name='file'/> <driver name='file'/>
<source file='/root/foo.img'/> <source file='/root/foo.img'/>
<target dev='hda'/> <target dev='hda' bus='ide'/>
</disk> </disk>
<interface type='bridge'> <interface type='bridge'>
<source bridge='xenbr0'/> <source bridge='xenbr0'/>
......
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
<disk type='file' device='disk'> <disk type='file' device='disk'>
<driver name='file'/> <driver name='file'/>
<source file='/root/foo.img'/> <source file='/root/foo.img'/>
<target dev='hda'/> <target dev='hda' bus='ide'/>
</disk> </disk>
<interface type='bridge'> <interface type='bridge'>
<source bridge='xenbr0'/> <source bridge='xenbr0'/>
...@@ -31,7 +31,7 @@ ...@@ -31,7 +31,7 @@
<disk type='file' device='cdrom'> <disk type='file' device='cdrom'>
<driver name='file'/> <driver name='file'/>
<source file='/root/boot.iso'/> <source file='/root/boot.iso'/>
<target dev='hdc'/> <target dev='hdc' bus='ide'/>
<readonly/> <readonly/>
</disk> </disk>
<input type='mouse' bus='ps2'/> <input type='mouse' bus='ps2'/>
......
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
<disk type='file' device='disk'> <disk type='file' device='disk'>
<driver name='file'/> <driver name='file'/>
<source file='/root/some.img'/> <source file='/root/some.img'/>
<target dev='xvda'/> <target dev='xvda' bus='xen'/>
</disk> </disk>
<interface type='bridge'> <interface type='bridge'>
<source bridge='xenbr2'/> <source bridge='xenbr2'/>
......
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
<disk type='file' device='disk'> <disk type='file' device='disk'>
<driver name='file'/> <driver name='file'/>
<source file='/root/some.img'/> <source file='/root/some.img'/>
<target dev='xvda'/> <target dev='xvda' bus='xen'/>
</disk> </disk>
<interface type='bridge'> <interface type='bridge'>
<source bridge='xenbr2'/> <source bridge='xenbr2'/>
......
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
<disk type='file' device='disk'> <disk type='file' device='disk'>
<driver name='file'/> <driver name='file'/>
<source file='/root/some.img'/> <source file='/root/some.img'/>
<target dev='xvda'/> <target dev='xvda' bus='xen'/>
</disk> </disk>
<interface type='ethernet'> <interface type='ethernet'>
<target dev='vif6.0'/> <target dev='vif6.0'/>
......
...@@ -28,14 +28,14 @@ ...@@ -28,14 +28,14 @@
<disk type='block' device='disk'> <disk type='block' device='disk'>
<driver name='phy'/> <driver name='phy'/>
<source dev='/dev/sda8'/> <source dev='/dev/sda8'/>
<target dev='hda:disk'/> <target dev='hda' bus='ide'/>
</disk> </disk>
<disk device='cdrom'> <disk device='cdrom'>
<target dev='hdc'/> <target dev='hdc' bus='ide'/>
<readonly/> <readonly/>
</disk> </disk>
<input type='mouse' bus='ps2'/> <input type='mouse' bus='ps2'/>
<graphics type='vnc' port='5906'/> <graphics type='vnc' port='-1'/>
<serial type='pty'> <serial type='pty'>
<target port='0'/> <target port='0'/>
</serial> </serial>
......
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
<disk type='file' device='disk'> <disk type='file' device='disk'>
<driver name='file'/> <driver name='file'/>
<source file='/root/some.img'/> <source file='/root/some.img'/>
<target dev='xvda'/> <target dev='xvda' bus='xen'/>
</disk> </disk>
<console type='pty'> <console type='pty'>
<target port='0'/> <target port='0'/>
......
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
<disk type='file' device='disk'> <disk type='file' device='disk'>
<driver name='file'/> <driver name='file'/>
<source file='/root/some.img'/> <source file='/root/some.img'/>
<target dev='xvda'/> <target dev='xvda' bus='xen'/>
</disk> </disk>
<input type='mouse' bus='xen'/> <input type='mouse' bus='xen'/>
<graphics type='vnc' port='-1' listen='0.0.0.0' keymap='ja'/> <graphics type='vnc' port='-1' listen='0.0.0.0' keymap='ja'/>
......
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
<disk type='file' device='disk'> <disk type='file' device='disk'>
<driver name='file'/> <driver name='file'/>
<source file='/root/some.img'/> <source file='/root/some.img'/>
<target dev='xvda'/> <target dev='xvda' bus='xen'/>
</disk> </disk>
<input type='mouse' bus='xen'/> <input type='mouse' bus='xen'/>
<graphics type='vnc' port='-1' listen='0.0.0.0' keymap='ja'/> <graphics type='vnc' port='-1' listen='0.0.0.0' keymap='ja'/>
......
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
<disk type='file' device='disk'> <disk type='file' device='disk'>
<driver name='file'/> <driver name='file'/>
<source file='/root/some.img'/> <source file='/root/some.img'/>
<target dev='xvda'/> <target dev='xvda' bus='xen'/>
</disk> </disk>
<console type='pty'> <console type='pty'>
<target port='0'/> <target port='0'/>
......
...@@ -113,11 +113,11 @@ main(int argc, char **argv) ...@@ -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-raw", "disk-drv-blktap-raw", 2);
DO_TEST("disk-drv-blktap-qcow", "disk-drv-blktap-qcow", 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-routed", "net-routed", 2);
DO_TEST("net-bridged", "net-bridged", 2); DO_TEST("net-bridged", "net-bridged", 2);
DO_TEST("net-e1000", "net-e1000", 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-utc", "fv-utc", 1);
DO_TEST("fv-localtime", "fv-localtime", 1); DO_TEST("fv-localtime", "fv-localtime", 1);
......
...@@ -23,12 +23,12 @@ ...@@ -23,12 +23,12 @@
<disk type='block' device='disk'> <disk type='block' device='disk'>
<driver name='phy'/> <driver name='phy'/>
<source dev='/dev/HostVG/XenGuest2'/> <source dev='/dev/HostVG/XenGuest2'/>
<target dev='hda'/> <target dev='hda' bus='ide'/>
</disk> </disk>
<disk type='file' device='cdrom'> <disk type='file' device='cdrom'>
<driver name='file'/> <driver name='file'/>
<source file='/root/boot.iso'/> <source file='/root/boot.iso'/>
<target dev='hdc'/> <target dev='hdc' bus='ide'/>
<readonly/> <readonly/>
</disk> </disk>
<interface type='bridge'> <interface type='bridge'>
......
...@@ -23,12 +23,12 @@ ...@@ -23,12 +23,12 @@
<disk type='block' device='disk'> <disk type='block' device='disk'>
<driver name='phy'/> <driver name='phy'/>
<source dev='/dev/HostVG/XenGuest2'/> <source dev='/dev/HostVG/XenGuest2'/>
<target dev='hda'/> <target dev='hda' bus='ide'/>
</disk> </disk>
<disk type='file' device='cdrom'> <disk type='file' device='cdrom'>
<driver name='file'/> <driver name='file'/>
<source file='/root/boot.iso'/> <source file='/root/boot.iso'/>
<target dev='hdc'/> <target dev='hdc' bus='ide'/>
<readonly/> <readonly/>
</disk> </disk>
<interface type='bridge'> <interface type='bridge'>
......
...@@ -23,12 +23,12 @@ ...@@ -23,12 +23,12 @@
<disk type='block' device='disk'> <disk type='block' device='disk'>
<driver name='phy'/> <driver name='phy'/>
<source dev='/dev/HostVG/XenGuest2'/> <source dev='/dev/HostVG/XenGuest2'/>
<target dev='hda'/> <target dev='hda' bus='ide'/>
</disk> </disk>
<disk type='file' device='cdrom'> <disk type='file' device='cdrom'>
<driver name='file'/> <driver name='file'/>
<source file='/root/boot.iso'/> <source file='/root/boot.iso'/>
<target dev='hdc'/> <target dev='hdc' bus='ide'/>
<readonly/> <readonly/>
</disk> </disk>
<interface type='bridge'> <interface type='bridge'>
......
...@@ -23,12 +23,12 @@ ...@@ -23,12 +23,12 @@
<disk type='block' device='disk'> <disk type='block' device='disk'>
<driver name='phy'/> <driver name='phy'/>
<source dev='/dev/HostVG/XenGuest2'/> <source dev='/dev/HostVG/XenGuest2'/>
<target dev='hda'/> <target dev='hda' bus='ide'/>
</disk> </disk>
<disk type='file' device='cdrom'> <disk type='file' device='cdrom'>
<driver name='file'/> <driver name='file'/>
<source file='/root/boot.iso'/> <source file='/root/boot.iso'/>
<target dev='hdc'/> <target dev='hdc' bus='ide'/>
<readonly/> <readonly/>
</disk> </disk>
<interface type='bridge'> <interface type='bridge'>
......
...@@ -23,12 +23,12 @@ ...@@ -23,12 +23,12 @@
<disk type='block' device='disk'> <disk type='block' device='disk'>
<driver name='phy'/> <driver name='phy'/>
<source dev='/dev/HostVG/XenGuest2'/> <source dev='/dev/HostVG/XenGuest2'/>
<target dev='hda'/> <target dev='hda' bus='ide'/>
</disk> </disk>
<disk type='file' device='cdrom'> <disk type='file' device='cdrom'>
<driver name='file'/> <driver name='file'/>
<source file='/root/boot.iso'/> <source file='/root/boot.iso'/>
<target dev='hdc'/> <target dev='hdc' bus='ide'/>
<readonly/> <readonly/>
</disk> </disk>
<interface type='bridge'> <interface type='bridge'>
......
...@@ -23,12 +23,12 @@ ...@@ -23,12 +23,12 @@
<disk type='block' device='disk'> <disk type='block' device='disk'>
<driver name='phy'/> <driver name='phy'/>
<source dev='/dev/HostVG/XenGuest2'/> <source dev='/dev/HostVG/XenGuest2'/>
<target dev='hda'/> <target dev='hda' bus='ide'/>
</disk> </disk>
<disk type='file' device='cdrom'> <disk type='file' device='cdrom'>
<driver name='file'/> <driver name='file'/>
<source file='/root/boot.iso'/> <source file='/root/boot.iso'/>
<target dev='hdc'/> <target dev='hdc' bus='ide'/>
<readonly/> <readonly/>
</disk> </disk>
<interface type='bridge'> <interface type='bridge'>
......
...@@ -23,12 +23,12 @@ ...@@ -23,12 +23,12 @@
<disk type='block' device='disk'> <disk type='block' device='disk'>
<driver name='phy'/> <driver name='phy'/>
<source dev='/dev/HostVG/XenGuest2'/> <source dev='/dev/HostVG/XenGuest2'/>
<target dev='hda'/> <target dev='hda' bus='ide'/>
</disk> </disk>
<disk type='file' device='cdrom'> <disk type='file' device='cdrom'>
<driver name='file'/> <driver name='file'/>
<source file='/root/boot.iso'/> <source file='/root/boot.iso'/>
<target dev='hdc'/> <target dev='hdc' bus='ide'/>
<readonly/> <readonly/>
</disk> </disk>
<interface type='bridge'> <interface type='bridge'>
......
...@@ -23,12 +23,12 @@ ...@@ -23,12 +23,12 @@
<disk type='block' device='disk'> <disk type='block' device='disk'>
<driver name='phy'/> <driver name='phy'/>
<source dev='/dev/HostVG/XenGuest2'/> <source dev='/dev/HostVG/XenGuest2'/>
<target dev='hda'/> <target dev='hda' bus='ide'/>
</disk> </disk>
<disk type='file' device='cdrom'> <disk type='file' device='cdrom'>
<driver name='file'/> <driver name='file'/>
<source file='/root/boot.iso'/> <source file='/root/boot.iso'/>
<target dev='hdc'/> <target dev='hdc' bus='ide'/>
<readonly/> <readonly/>
</disk> </disk>
<interface type='bridge'> <interface type='bridge'>
......
...@@ -23,12 +23,12 @@ ...@@ -23,12 +23,12 @@
<disk type='block' device='disk'> <disk type='block' device='disk'>
<driver name='phy'/> <driver name='phy'/>
<source dev='/dev/HostVG/XenGuest2'/> <source dev='/dev/HostVG/XenGuest2'/>
<target dev='hda'/> <target dev='hda' bus='ide'/>
</disk> </disk>
<disk type='file' device='cdrom'> <disk type='file' device='cdrom'>
<driver name='file'/> <driver name='file'/>
<source file='/root/boot.iso'/> <source file='/root/boot.iso'/>
<target dev='hdc'/> <target dev='hdc' bus='ide'/>
<readonly/> <readonly/>
</disk> </disk>
<interface type='bridge'> <interface type='bridge'>
......
...@@ -23,12 +23,12 @@ ...@@ -23,12 +23,12 @@
<disk type='block' device='disk'> <disk type='block' device='disk'>
<driver name='phy'/> <driver name='phy'/>
<source dev='/dev/HostVG/XenGuest2'/> <source dev='/dev/HostVG/XenGuest2'/>
<target dev='hda'/> <target dev='hda' bus='ide'/>
</disk> </disk>
<disk type='file' device='cdrom'> <disk type='file' device='cdrom'>
<driver name='file'/> <driver name='file'/>
<source file='/root/boot.iso'/> <source file='/root/boot.iso'/>
<target dev='hdc'/> <target dev='hdc' bus='ide'/>
<readonly/> <readonly/>
</disk> </disk>
<interface type='bridge'> <interface type='bridge'>
......
...@@ -23,12 +23,12 @@ ...@@ -23,12 +23,12 @@
<disk type='block' device='disk'> <disk type='block' device='disk'>
<driver name='phy'/> <driver name='phy'/>
<source dev='/dev/HostVG/XenGuest2'/> <source dev='/dev/HostVG/XenGuest2'/>
<target dev='hda'/> <target dev='hda' bus='ide'/>
</disk> </disk>
<disk type='file' device='cdrom'> <disk type='file' device='cdrom'>
<driver name='file'/> <driver name='file'/>
<source file='/root/boot.iso'/> <source file='/root/boot.iso'/>
<target dev='hdc'/> <target dev='hdc' bus='ide'/>
<readonly/> <readonly/>
</disk> </disk>
<interface type='bridge'> <interface type='bridge'>
......
...@@ -23,12 +23,12 @@ ...@@ -23,12 +23,12 @@
<disk type='block' device='disk'> <disk type='block' device='disk'>
<driver name='phy'/> <driver name='phy'/>
<source dev='/dev/HostVG/XenGuest2'/> <source dev='/dev/HostVG/XenGuest2'/>
<target dev='hda'/> <target dev='hda' bus='ide'/>
</disk> </disk>
<disk type='file' device='cdrom'> <disk type='file' device='cdrom'>
<driver name='file'/> <driver name='file'/>
<source file='/root/boot.iso'/> <source file='/root/boot.iso'/>
<target dev='hdc'/> <target dev='hdc' bus='ide'/>
<readonly/> <readonly/>
</disk> </disk>
<interface type='bridge'> <interface type='bridge'>
......
...@@ -23,12 +23,12 @@ ...@@ -23,12 +23,12 @@
<disk type='block' device='disk'> <disk type='block' device='disk'>
<driver name='phy'/> <driver name='phy'/>
<source dev='/dev/HostVG/XenGuest2'/> <source dev='/dev/HostVG/XenGuest2'/>
<target dev='hda'/> <target dev='hda' bus='ide'/>
</disk> </disk>
<disk type='file' device='cdrom'> <disk type='file' device='cdrom'>
<driver name='file'/> <driver name='file'/>
<source file='/root/boot.iso'/> <source file='/root/boot.iso'/>
<target dev='hdc'/> <target dev='hdc' bus='ide'/>
<readonly/> <readonly/>
</disk> </disk>
<interface type='bridge'> <interface type='bridge'>
......
...@@ -23,12 +23,12 @@ ...@@ -23,12 +23,12 @@
<disk type='block' device='disk'> <disk type='block' device='disk'>
<driver name='phy'/> <driver name='phy'/>
<source dev='/dev/HostVG/XenGuest2'/> <source dev='/dev/HostVG/XenGuest2'/>
<target dev='hda'/> <target dev='hda' bus='ide'/>
</disk> </disk>
<disk type='file' device='cdrom'> <disk type='file' device='cdrom'>
<driver name='file'/> <driver name='file'/>
<source file='/root/boot.iso'/> <source file='/root/boot.iso'/>
<target dev='hdc'/> <target dev='hdc' bus='ide'/>
<readonly/> <readonly/>
</disk> </disk>
<interface type='bridge'> <interface type='bridge'>
......
...@@ -23,12 +23,12 @@ ...@@ -23,12 +23,12 @@
<disk type='block' device='disk'> <disk type='block' device='disk'>
<driver name='phy'/> <driver name='phy'/>
<source dev='/dev/HostVG/XenGuest2'/> <source dev='/dev/HostVG/XenGuest2'/>
<target dev='hda'/> <target dev='hda' bus='ide'/>
</disk> </disk>
<disk type='file' device='cdrom'> <disk type='file' device='cdrom'>
<driver name='file'/> <driver name='file'/>
<source file='/root/boot.iso'/> <source file='/root/boot.iso'/>
<target dev='hdc'/> <target dev='hdc' bus='ide'/>
<readonly/> <readonly/>
</disk> </disk>
<interface type='bridge'> <interface type='bridge'>
......
...@@ -23,12 +23,12 @@ ...@@ -23,12 +23,12 @@
<disk type='block' device='disk'> <disk type='block' device='disk'>
<driver name='phy'/> <driver name='phy'/>
<source dev='/dev/HostVG/XenGuest2'/> <source dev='/dev/HostVG/XenGuest2'/>
<target dev='hda'/> <target dev='hda' bus='ide'/>
</disk> </disk>
<disk type='file' device='cdrom'> <disk type='file' device='cdrom'>
<driver name='file'/> <driver name='file'/>
<source file='/root/boot.iso'/> <source file='/root/boot.iso'/>
<target dev='hdc'/> <target dev='hdc' bus='ide'/>
<readonly/> <readonly/>
</disk> </disk>
<interface type='bridge'> <interface type='bridge'>
......
...@@ -23,12 +23,12 @@ ...@@ -23,12 +23,12 @@
<disk type='block' device='disk'> <disk type='block' device='disk'>
<driver name='phy'/> <driver name='phy'/>
<source dev='/dev/HostVG/XenGuest2'/> <source dev='/dev/HostVG/XenGuest2'/>
<target dev='hda'/> <target dev='hda' bus='ide'/>
</disk> </disk>
<disk type='file' device='cdrom'> <disk type='file' device='cdrom'>
<driver name='file'/> <driver name='file'/>
<source file='/root/boot.iso'/> <source file='/root/boot.iso'/>
<target dev='hdc'/> <target dev='hdc' bus='ide'/>
<readonly/> <readonly/>
</disk> </disk>
<interface type='bridge'> <interface type='bridge'>
......
...@@ -23,12 +23,12 @@ ...@@ -23,12 +23,12 @@
<disk type='block' device='disk'> <disk type='block' device='disk'>
<driver name='phy'/> <driver name='phy'/>
<source dev='/dev/HostVG/XenGuest2'/> <source dev='/dev/HostVG/XenGuest2'/>
<target dev='hda'/> <target dev='hda' bus='ide'/>
</disk> </disk>
<disk type='file' device='cdrom'> <disk type='file' device='cdrom'>
<driver name='file'/> <driver name='file'/>
<source file='/root/boot.iso'/> <source file='/root/boot.iso'/>
<target dev='hdc'/> <target dev='hdc' bus='ide'/>
<readonly/> <readonly/>
</disk> </disk>
<interface type='bridge'> <interface type='bridge'>
......
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
<disk type='block' device='disk'> <disk type='block' device='disk'>
<driver name='phy'/> <driver name='phy'/>
<source dev='/dev/HostVG/XenGuest1'/> <source dev='/dev/HostVG/XenGuest1'/>
<target dev='xvda'/> <target dev='xvda' bus='xen'/>
</disk> </disk>
<interface type='bridge'> <interface type='bridge'>
<mac address='00:16:3E:66:94:9C'/> <mac address='00:16:3E:66:94:9C'/>
......
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
<disk type='block' device='disk'> <disk type='block' device='disk'>
<driver name='phy'/> <driver name='phy'/>
<source dev='/dev/HostVG/XenGuest1'/> <source dev='/dev/HostVG/XenGuest1'/>
<target dev='xvda'/> <target dev='xvda' bus='xen'/>
</disk> </disk>
<interface type='bridge'> <interface type='bridge'>
<mac address='00:16:3E:66:94:9C'/> <mac address='00:16:3E:66:94:9C'/>
......
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
<disk type='block' device='disk'> <disk type='block' device='disk'>
<driver name='phy'/> <driver name='phy'/>
<source dev='/dev/HostVG/XenGuest1'/> <source dev='/dev/HostVG/XenGuest1'/>
<target dev='xvda'/> <target dev='xvda' bus='xen'/>
</disk> </disk>
<interface type='bridge'> <interface type='bridge'>
<mac address='00:16:3E:66:94:9C'/> <mac address='00:16:3E:66:94:9C'/>
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册