diff mbox

docs: fix typo in memory.txt

Message ID 1458639954-9980-1-git-send-email-weijg.fnst@cn.fujitsu.com
State New
Headers show

Commit Message

Wei Jiangang March 22, 2016, 9:45 a.m. UTC
The scale line should align with A line's end,
and correct the range of vga-window example 0xa0000-0xbffff.

Signed-off-by: Wei Jiangang <weijg.fnst@cn.fujitsu.com>
---
 docs/memory.txt | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Comments

Wei Jiangang April 5, 2016, 1:01 a.m. UTC | #1
ping...
Any feedback?
On Tue, 2016-03-22 at 17:45 +0800, Wei Jiangang wrote:
> The scale line should align with A line's end,

> and correct the range of vga-window example 0xa0000-0xbffff.

> 

> Signed-off-by: Wei Jiangang <weijg.fnst@cn.fujitsu.com>

> ---

>  docs/memory.txt | 6 +++---

>  1 file changed, 3 insertions(+), 3 deletions(-)

> 

> diff --git a/docs/memory.txt b/docs/memory.txt

> index 97134e1..5a7163c 100644

> --- a/docs/memory.txt

> +++ b/docs/memory.txt

> @@ -185,8 +185,8 @@ an MMIO region mapped at 0x0, size 0x6000, priority 1. B currently has two

>  of its own subregions: D of size 0x1000 at offset 0 and E of size 0x1000 at

>  offset 0x2000. As a diagram:

>  

> -        0      1000   2000   3000   4000   5000   6000   7000    8000

> -        |------|------|------|------|------|------|------|-------|

> +        0      1000   2000   3000   4000   5000   6000   7000   8000

> +        |------|------|------|------|------|------|------|------|

>    A:    [                                                       ]

>    C:    [CCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC]

>    B:                  [                          ]

> @@ -247,7 +247,7 @@ system_memory: container@0-2^48-1

>   |

>   +---- himem: alias@0x100000000-0x11fffffff ---> #ram (0xe0000000-0xffffffff)

>   |

> - +---- vga-window: alias@0xa0000-0xbfffff ---> #pci (0xa0000-0xbffff)

> + +---- vga-window: alias@0xa0000-0xbffff ---> #pci (0xa0000-0xbffff)

>   |      (prio 1)

>   |

>   +---- pci-hole: alias@0xe0000000-0xffffffff ---> #pci (0xe0000000-0xffffffff)
Paolo Bonzini April 5, 2016, 11:02 p.m. UTC | #2
On 22/03/2016 10:45, Wei Jiangang wrote:
> The scale line should align with A line's end,

No, A ends at 0x7fff so the line should end just before.  See what
happens for B/C/D/E.

However, the space between 7000 and 8000 is indede 7 characters instead
of 6, so I will take your patch and also reduce the space between A's
brackets.

Thanks,

Paolo

> and correct the range of vga-window example 0xa0000-0xbffff.


> Signed-off-by: Wei Jiangang <weijg.fnst@cn.fujitsu.com>
> ---
>  docs/memory.txt | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/docs/memory.txt b/docs/memory.txt
> index 97134e1..5a7163c 100644
> --- a/docs/memory.txt
> +++ b/docs/memory.txt
> @@ -185,8 +185,8 @@ an MMIO region mapped at 0x0, size 0x6000, priority 1. B currently has two
>  of its own subregions: D of size 0x1000 at offset 0 and E of size 0x1000 at
>  offset 0x2000. As a diagram:
>  
> -        0      1000   2000   3000   4000   5000   6000   7000    8000
> -        |------|------|------|------|------|------|------|-------|
> +        0      1000   2000   3000   4000   5000   6000   7000   8000
> +        |------|------|------|------|------|------|------|------|
>    A:    [                                                       ]
>    C:    [CCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC]
>    B:                  [                          ]
> @@ -247,7 +247,7 @@ system_memory: container@0-2^48-1
>   |
>   +---- himem: alias@0x100000000-0x11fffffff ---> #ram (0xe0000000-0xffffffff)
>   |
> - +---- vga-window: alias@0xa0000-0xbfffff ---> #pci (0xa0000-0xbffff)
> + +---- vga-window: alias@0xa0000-0xbffff ---> #pci (0xa0000-0xbffff)
>   |      (prio 1)
>   |
>   +---- pci-hole: alias@0xe0000000-0xffffffff ---> #pci (0xe0000000-0xffffffff)
>
Wei Jiangang April 6, 2016, 1:12 a.m. UTC | #3
On Wed, 2016-04-06 at 01:02 +0200, Paolo Bonzini wrote:
> 

> On 22/03/2016 10:45, Wei Jiangang wrote:

> > The scale line should align with A line's end,

> 

> No, A ends at 0x7fff so the line should end just before.  See what

> happens for B/C/D/E.


Yes, you're right.
Thanks for your reply.

Regards,
wei
> However, the space between 7000 and 8000 is indede 7 characters instead

> of 6, so I will take your patch and also reduce the space between A's

> brackets.

> 

> Thanks,

> 

> Paolo

> 

> > and correct the range of vga-window example 0xa0000-0xbffff.

> 

> 

> > Signed-off-by: Wei Jiangang <weijg.fnst@cn.fujitsu.com>

> > ---

> >  docs/memory.txt | 6 +++---

> >  1 file changed, 3 insertions(+), 3 deletions(-)

> > 

> > diff --git a/docs/memory.txt b/docs/memory.txt

> > index 97134e1..5a7163c 100644

> > --- a/docs/memory.txt

> > +++ b/docs/memory.txt

> > @@ -185,8 +185,8 @@ an MMIO region mapped at 0x0, size 0x6000, priority 1. B currently has two

> >  of its own subregions: D of size 0x1000 at offset 0 and E of size 0x1000 at

> >  offset 0x2000. As a diagram:

> >  

> > -        0      1000   2000   3000   4000   5000   6000   7000    8000

> > -        |------|------|------|------|------|------|------|-------|

> > +        0      1000   2000   3000   4000   5000   6000   7000   8000

> > +        |------|------|------|------|------|------|------|------|

> >    A:    [                                                       ]

> >    C:    [CCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC]

> >    B:                  [                          ]

> > @@ -247,7 +247,7 @@ system_memory: container@0-2^48-1

> >   |

> >   +---- himem: alias@0x100000000-0x11fffffff ---> #ram (0xe0000000-0xffffffff)

> >   |

> > - +---- vga-window: alias@0xa0000-0xbfffff ---> #pci (0xa0000-0xbffff)

> > + +---- vga-window: alias@0xa0000-0xbffff ---> #pci (0xa0000-0xbffff)

> >   |      (prio 1)

> >   |

> >   +---- pci-hole: alias@0xe0000000-0xffffffff ---> #pci (0xe0000000-0xffffffff)

> > 

> 

>
diff mbox

Patch

diff --git a/docs/memory.txt b/docs/memory.txt
index 97134e1..5a7163c 100644
--- a/docs/memory.txt
+++ b/docs/memory.txt
@@ -185,8 +185,8 @@  an MMIO region mapped at 0x0, size 0x6000, priority 1. B currently has two
 of its own subregions: D of size 0x1000 at offset 0 and E of size 0x1000 at
 offset 0x2000. As a diagram:
 
-        0      1000   2000   3000   4000   5000   6000   7000    8000
-        |------|------|------|------|------|------|------|-------|
+        0      1000   2000   3000   4000   5000   6000   7000   8000
+        |------|------|------|------|------|------|------|------|
   A:    [                                                       ]
   C:    [CCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC]
   B:                  [                          ]
@@ -247,7 +247,7 @@  system_memory: container@0-2^48-1
  |
  +---- himem: alias@0x100000000-0x11fffffff ---> #ram (0xe0000000-0xffffffff)
  |
- +---- vga-window: alias@0xa0000-0xbfffff ---> #pci (0xa0000-0xbffff)
+ +---- vga-window: alias@0xa0000-0xbffff ---> #pci (0xa0000-0xbffff)
  |      (prio 1)
  |
  +---- pci-hole: alias@0xe0000000-0xffffffff ---> #pci (0xe0000000-0xffffffff)