qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
* [Qemu-devel] [PATCH] docs: fix typo in memory.txt
@ 2016-03-22  9:45 Wei Jiangang
  2016-04-05  1:01 ` Wei, Jiangang
  2016-04-05 23:02 ` Paolo Bonzini
  0 siblings, 2 replies; 4+ messages in thread
From: Wei Jiangang @ 2016-03-22  9:45 UTC (permalink / raw)
  To: qemu-devel; +Cc: qemu-trivial, peter.maydell, mjt, avi, Wei Jiangang

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)
-- 
1.9.3

^ permalink raw reply related	[flat|nested] 4+ messages in thread

* Re: [Qemu-devel] [PATCH] docs: fix typo in memory.txt
  2016-03-22  9:45 [Qemu-devel] [PATCH] docs: fix typo in memory.txt Wei Jiangang
@ 2016-04-05  1:01 ` Wei, Jiangang
  2016-04-05 23:02 ` Paolo Bonzini
  1 sibling, 0 replies; 4+ messages in thread
From: Wei, Jiangang @ 2016-04-05  1:01 UTC (permalink / raw)
  To: qemu-devel@nongnu.org
  Cc: qemu-trivial@nongnu.org, peter.maydell@linaro.org, mjt@tls.msk.ru,
	avi@redhat.com

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)




^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [Qemu-devel] [PATCH] docs: fix typo in memory.txt
  2016-03-22  9:45 [Qemu-devel] [PATCH] docs: fix typo in memory.txt Wei Jiangang
  2016-04-05  1:01 ` Wei, Jiangang
@ 2016-04-05 23:02 ` Paolo Bonzini
  2016-04-06  1:12   ` Wei, Jiangang
  1 sibling, 1 reply; 4+ messages in thread
From: Paolo Bonzini @ 2016-04-05 23:02 UTC (permalink / raw)
  To: Wei Jiangang, qemu-devel; +Cc: qemu-trivial, peter.maydell, mjt, avi



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

^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [Qemu-devel] [PATCH] docs: fix typo in memory.txt
  2016-04-05 23:02 ` Paolo Bonzini
@ 2016-04-06  1:12   ` Wei, Jiangang
  0 siblings, 0 replies; 4+ messages in thread
From: Wei, Jiangang @ 2016-04-06  1:12 UTC (permalink / raw)
  To: pbonzini@redhat.com
  Cc: qemu-trivial@nongnu.org, peter.maydell@linaro.org, mjt@tls.msk.ru,
	qemu-devel@nongnu.org, avi@redhat.com

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




^ permalink raw reply	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2016-04-06  1:12 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-03-22  9:45 [Qemu-devel] [PATCH] docs: fix typo in memory.txt Wei Jiangang
2016-04-05  1:01 ` Wei, Jiangang
2016-04-05 23:02 ` Paolo Bonzini
2016-04-06  1:12   ` Wei, Jiangang

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).