[libvirt] [PATCH] docs: use unique dev names in <disk> examples
Jiri Moskovcak reported on IRC that the documentation on valid <disk> was confusing because it didn't have unique dev='...' entries. * docs/formatdomain.html.in: Use unique names. Signed-off-by: Eric Blake <eblake@redhat.com> --- docs/formatdomain.html.in | 26 +++++++++++++------------- 1 files changed, 13 insertions(+), 13 deletions(-) diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index 8950959..08f31c4 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -1540,14 +1540,14 @@ <source protocol="rbd" name="image_name2"> <host name="hostname" port="7000"/> </source> - <target dev="hdd" bus="ide"/> + <target dev="hdc" bus="ide"/> <auth username='myuser'> <secret type='ceph' usage='mypassid'/> </auth> </disk> <disk type='block' device='cdrom'> <driver name='qemu' type='raw'/> - <target dev='hdc' bus='ide' tray='open'/> + <target dev='hdd' bus='ide' tray='open'/> <readonly/> </disk> <disk type='network' device='cdrom'> @@ -1555,7 +1555,7 @@ <source protocol="http" name="url_path"> <host name="hostname" port="80"/> </source> - <target dev='hdc' bus='ide' tray='open'/> + <target dev='hde' bus='ide' tray='open'/> <readonly/> </disk> <disk type='network' device='cdrom'> @@ -1563,7 +1563,7 @@ <source protocol="https" name="url_path"> <host name="hostname" port="443"/> </source> - <target dev='hdc' bus='ide' tray='open'/> + <target dev='hdf' bus='ide' tray='open'/> <readonly/> </disk> <disk type='network' device='cdrom'> @@ -1571,7 +1571,7 @@ <source protocol="ftp" name="url_path"> <host name="hostname" port="21"/> </source> - <target dev='hdc' bus='ide' tray='open'/> + <target dev='hdg' bus='ide' tray='open'/> <readonly/> </disk> <disk type='network' device='cdrom'> @@ -1579,7 +1579,7 @@ <source protocol="ftps" name="url_path"> <host name="hostname" port="990"/> </source> - <target dev='hdc' bus='ide' tray='open'/> + <target dev='hdh' bus='ide' tray='open'/> <readonly/> </disk> <disk type='network' device='cdrom'> @@ -1587,7 +1587,7 @@ <source protocol="tftp" name="url_path"> <host name="hostname" port="69"/> </source> - <target dev='hdc' bus='ide' tray='open'/> + <target dev='hdi' bus='ide' tray='open'/> <readonly/> </disk> <disk type='block' device='lun'> @@ -1601,12 +1601,12 @@ <source dev='/dev/sda'/> <geometry cyls='16383' heads='16' secs='63' trans='lba'/> <blockio logical_block_size='512' physical_block_size='4096'/> - <target dev='hda' bus='ide'/> + <target dev='sdb' bus='ide'/> </disk> <disk type='volume' device='disk'> <driver name='qemu' type='raw'/> <source pool='blk-pool0' volume='blk-pool0-vol0'/> - <target dev='hda' bus='ide'/> + <target dev='sdc' bus='ide'/> </disk> <disk type='network' device='disk'> <driver name='qemu' type='raw'/> @@ -1626,7 +1626,7 @@ <auth username='myuser'> <secret type='iscsi' usage='libvirtiscsi'/> </auth> - <target dev='sda' bus='scsi'/> + <target dev='vdb' bus='scsi'/> </disk> <disk type='volume' device='disk'> <driver name='qemu' type='raw'/> @@ -1634,7 +1634,7 @@ <auth username='myuser'> <secret type='iscsi' usage='libvirtiscsi'/> </auth> - <target dev='vda' bus='virtio'/> + <target dev='vdc' bus='virtio'/> </disk> <disk type='volume' device='disk'> <driver name='qemu' type='raw'/> @@ -1642,7 +1642,7 @@ <auth username='myuser'> <secret type='iscsi' usage='libvirtiscsi'/> </auth> - <target dev='vda' bus='virtio'/> + <target dev='vdd' bus='virtio'/> </disk> <disk type='file' device='disk'> <driver name='qemu' type='qcow2'/> @@ -1656,7 +1656,7 @@ <backingStore/> </backingStore> </backingStore> - <target dev='vda' bus='virtio'/> + <target dev='vde' bus='virtio'/> </disk> </devices> ...</pre> -- 1.7.1
On Thu, Aug 07, 2014 at 08:38:11AM -0600, Eric Blake wrote:
Jiri Moskovcak reported on IRC that the documentation on valid <disk> was confusing because it didn't have unique dev='...' entries.
* docs/formatdomain.html.in: Use unique names.
Signed-off-by: Eric Blake <eblake@redhat.com> --- docs/formatdomain.html.in | 26 +++++++++++++------------- 1 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index 8950959..08f31c4 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in [...] @@ -1601,12 +1601,12 @@ <source dev='/dev/sda'/> <geometry cyls='16383' heads='16' secs='63' trans='lba'/> <blockio logical_block_size='512' physical_block_size='4096'/> - <target dev='hda' bus='ide'/> + <target dev='sdb' bus='ide'/>
This one should start with "hd", it's IDE. Or the bus should be changed.
</disk> <disk type='volume' device='disk'> <driver name='qemu' type='raw'/> <source pool='blk-pool0' volume='blk-pool0-vol0'/> - <target dev='hda' bus='ide'/> + <target dev='sdc' bus='ide'/>
The same applies here.
</disk> <disk type='network' device='disk'> <driver name='qemu' type='raw'/> @@ -1626,7 +1626,7 @@ <auth username='myuser'> <secret type='iscsi' usage='libvirtiscsi'/> </auth> - <target dev='sda' bus='scsi'/> + <target dev='vdb' bus='scsi'/>
This one should start with "sd", it's SCSI. Rest looks fine, ACK if you match the dev/bus in those three mentioned places. Martin
On 08/07/2014 09:35 AM, Martin Kletzander wrote:
On Thu, Aug 07, 2014 at 08:38:11AM -0600, Eric Blake wrote:
Jiri Moskovcak reported on IRC that the documentation on valid <disk> was confusing because it didn't have unique dev='...' entries.
* docs/formatdomain.html.in: Use unique names.
- <target dev='hda' bus='ide'/> + <target dev='sdb' bus='ide'/>
This one should start with "hd", it's IDE. Or the bus should be changed.
Good catch.
Rest looks fine, ACK if you match the dev/bus in those three mentioned places.
Fixed, and pushed. -- Eric Blake eblake redhat com +1-919-301-3266 Libvirt virtualization library http://libvirt.org
On 08/07/2014 11:20 AM, Eric Blake wrote:
On 08/07/2014 09:35 AM, Martin Kletzander wrote:
On Thu, Aug 07, 2014 at 08:38:11AM -0600, Eric Blake wrote:
Jiri Moskovcak reported on IRC that the documentation on valid <disk> was confusing because it didn't have unique dev='...' entries.
* docs/formatdomain.html.in: Use unique names.
- <target dev='hda' bus='ide'/> + <target dev='sdb' bus='ide'/>
This one should start with "hd", it's IDE. Or the bus should be changed.
Good catch.
Rest looks fine, ACK if you match the dev/bus in those three mentioned places.
Fixed, and pushed.
Well, I thought I had fixed it. But this morning, I noticed my editor buffer still hadn't been saved. I'm pushing the followup under the trivial rule: commit 51cb34b31df8ef2b71ca0ad977e6576cbdc60184 Author: Eric Blake <eblake@redhat.com> Date: Mon Aug 11 15:42:45 2014 -0600 docs: use correct hints per bus type in <disk> examples Commit 4cf53158 tried to set up unique labels per disk in the example, but ended up choosing strings that don't correspond to the usual choice of bus types. Tweak the strings once again. * docs/formatdomain.html.in: Use preferred names. Signed-off-by: Eric Blake <eblake@redhat.com> diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index 6b5df51..bd99ae0 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -1616,12 +1616,12 @@ <source dev='/dev/sda'/> <geometry cyls='16383' heads='16' secs='63' trans='lba'/> <blockio logical_block_size='512' physical_block_size='4096'/> - <target dev='sdb' bus='ide'/> + <target dev='hdj' bus='ide'/> </disk> <disk type='volume' device='disk'> <driver name='qemu' type='raw'/> <source pool='blk-pool0' volume='blk-pool0-vol0'/> - <target dev='sdc' bus='ide'/> + <target dev='hdk' bus='ide'/> </disk> <disk type='network' device='disk'> <driver name='qemu' type='raw'/> @@ -1641,7 +1641,7 @@ <auth username='myuser'> <secret type='iscsi' usage='libvirtiscsi'/> </auth> - <target dev='vdb' bus='scsi'/> + <target dev='sdb' bus='scsi'/> </disk> <disk type='volume' device='disk'> <driver name='qemu' type='raw'/> @@ -1649,7 +1649,7 @@ <auth username='myuser'> <secret type='iscsi' usage='libvirtiscsi'/> </auth> - <target dev='vdc' bus='virtio'/> + <target dev='vdb' bus='virtio'/> </disk> <disk type='volume' device='disk'> <driver name='qemu' type='raw'/> @@ -1657,7 +1657,7 @@ <auth username='myuser'> <secret type='iscsi' usage='libvirtiscsi'/> </auth> - <target dev='vdd' bus='virtio'/> + <target dev='vdc' bus='virtio'/> </disk> <disk type='file' device='disk'> <driver name='qemu' type='qcow2'/> @@ -1671,7 +1671,7 @@ <backingStore/> </backingStore> </backingStore> - <target dev='vde' bus='virtio'/> + <target dev='vdd' bus='virtio'/> </disk> </devices> ...</pre> -- Eric Blake eblake redhat com +1-919-301-3266 Libvirt virtualization library http://libvirt.org
participants (3)
-
Eric Blake -
Laine Stump -
Martin Kletzander