Re: [PATCH] docs: use unique dev names in <disk> examples

[Eric Blake <eblake@xxxxxxxxxx>]

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.
>>>
> 
>>> -      &lt;target dev='hda' bus='ide'/&gt;
>>> +      &lt;target dev='sdb' bus='ide'/&gt;
>>
>> 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@xxxxxxxxxx>
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@xxxxxxxxxx>

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 @@
       &lt;source dev='/dev/sda'/&gt;
       &lt;geometry cyls='16383' heads='16' secs='63' trans='lba'/&gt;
       &lt;blockio logical_block_size='512' physical_block_size='4096'/&gt;
-      &lt;target dev='sdb' bus='ide'/&gt;
+      &lt;target dev='hdj' bus='ide'/&gt;
     &lt;/disk&gt;
     &lt;disk type='volume' device='disk'&gt;
       &lt;driver name='qemu' type='raw'/&gt;
       &lt;source pool='blk-pool0' volume='blk-pool0-vol0'/&gt;
-      &lt;target dev='sdc' bus='ide'/&gt;
+      &lt;target dev='hdk' bus='ide'/&gt;
     &lt;/disk&gt;
     &lt;disk type='network' device='disk'&gt;
       &lt;driver name='qemu' type='raw'/&gt;
@@ -1641,7 +1641,7 @@
       &lt;auth username='myuser'&gt;
         &lt;secret type='iscsi' usage='libvirtiscsi'/&gt;
       &lt;/auth&gt;
-      &lt;target dev='vdb' bus='scsi'/&gt;
+      &lt;target dev='sdb' bus='scsi'/&gt;
     &lt;/disk&gt;
     &lt;disk type='volume' device='disk'&gt;
       &lt;driver name='qemu' type='raw'/&gt;
@@ -1649,7 +1649,7 @@
       &lt;auth username='myuser'&gt;
         &lt;secret type='iscsi' usage='libvirtiscsi'/&gt;
       &lt;/auth&gt;
-      &lt;target dev='vdc' bus='virtio'/&gt;
+      &lt;target dev='vdb' bus='virtio'/&gt;
     &lt;/disk&gt;
     &lt;disk type='volume' device='disk'&gt;
       &lt;driver name='qemu' type='raw'/&gt;
@@ -1657,7 +1657,7 @@
       &lt;auth username='myuser'&gt;
         &lt;secret type='iscsi' usage='libvirtiscsi'/&gt;
       &lt;/auth&gt;
-      &lt;target dev='vdd' bus='virtio'/&gt;
+      &lt;target dev='vdc' bus='virtio'/&gt;
     &lt;/disk&gt;
     &lt;disk type='file' device='disk'&gt;
       &lt;driver name='qemu' type='qcow2'/&gt;
@@ -1671,7 +1671,7 @@
           &lt;backingStore/&gt;
         &lt;/backingStore&gt;
       &lt;/backingStore&gt;
-      &lt;target dev='vde' bus='virtio'/&gt;
+      &lt;target dev='vdd' bus='virtio'/&gt;
     &lt;/disk&gt;
   &lt;/devices&gt;
   ...</pre>


-- 
Eric Blake   eblake redhat com    +1-919-301-3266
Libvirt virtualization library http://libvirt.org

Attachment: signature.asc
Description: OpenPGP digital signature

--
libvir-list mailing list
libvir-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/libvir-list