[Qemu-devel] [PATCH] docs/memory.txt: Fix document on MMIO operations

[Qemu-devel] [PATCH] docs/memory.txt: Fix document on MMIO operations

[Fam Zheng]

.impl.valid should be .impl.unaligned and the description needs some
fixes.

.old_portio is removed since commit b40acf99b (ioport: Switch
dispatching to memory core layer).

Signed-off-by: Fam Zheng <famz@redhat.com>
---
 docs/memory.txt       | 10 +++++-----
 include/exec/memory.h |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/docs/memory.txt b/docs/memory.txt
index 22eaec7..5bdbdb3 100644
--- a/docs/memory.txt
+++ b/docs/memory.txt
@@ -232,8 +232,8 @@ various constraints can be supplied to control how these callbacks are called:
    (in bytes) supported by the *implementation*; other access sizes will be
    emulated using the ones available.  For example a 4-byte write will be
    emulated using four 1-byte writes, if .impl.max_access_size = 1.
- - .impl.valid specifies that the *implementation* only supports unaligned
-   accesses; unaligned accesses will be emulated by two aligned accesses.
- - .old_portio and .old_mmio can be used to ease porting from code using
-   cpu_register_io_memory() and register_ioport().  They should not be used
-   in new code.
+ - .impl.unaligned specifies that the *implementation* supports unaligned
+   accesses; if false, unaligned accesses will be emulated by two aligned
+   accesses.
+ - .old_mmio can be used to ease porting from code using
+   cpu_register_io_memory(). It should not be used in new code.
diff --git a/include/exec/memory.h b/include/exec/memory.h
index c084db2..1d55ad9 100644
--- a/include/exec/memory.h
+++ b/include/exec/memory.h
@@ -110,7 +110,7 @@ struct MemoryRegionOps {
         /* If true, unaligned accesses are supported.  Otherwise all accesses
          * are converted to (possibly multiple) naturally aligned accesses.
          */
-         bool unaligned;
+        bool unaligned;
     } impl;
 
     /* If .read and .write are not present, old_mmio may be used for
-- 
1.9.2

Re: [Qemu-devel] [PATCH] docs/memory.txt: Fix document on MMIO operations

[Paolo Bonzini]

Il 05/05/2014 09:53, Fam Zheng ha scritto:
> .impl.valid should be .impl.unaligned and the description needs some
> fixes.
>
> .old_portio is removed since commit b40acf99b (ioport: Switch
> dispatching to memory core layer).
>
> Signed-off-by: Fam Zheng <famz@redhat.com>
> ---
>  docs/memory.txt       | 10 +++++-----
>  include/exec/memory.h |  2 +-
>  2 files changed, 6 insertions(+), 6 deletions(-)
>
> diff --git a/docs/memory.txt b/docs/memory.txt
> index 22eaec7..5bdbdb3 100644
> --- a/docs/memory.txt
> +++ b/docs/memory.txt
> @@ -232,8 +232,8 @@ various constraints can be supplied to control how these callbacks are called:
>     (in bytes) supported by the *implementation*; other access sizes will be
>     emulated using the ones available.  For example a 4-byte write will be
>     emulated using four 1-byte writes, if .impl.max_access_size = 1.
> - - .impl.valid specifies that the *implementation* only supports unaligned
> -   accesses; unaligned accesses will be emulated by two aligned accesses.
> - - .old_portio and .old_mmio can be used to ease porting from code using
> -   cpu_register_io_memory() and register_ioport().  They should not be used
> -   in new code.
> + - .impl.unaligned specifies that the *implementation* supports unaligned
> +   accesses; if false, unaligned accesses will be emulated by two aligned
> +   accesses.
> + - .old_mmio can be used to ease porting from code using
> +   cpu_register_io_memory(). It should not be used in new code.
> diff --git a/include/exec/memory.h b/include/exec/memory.h
> index c084db2..1d55ad9 100644
> --- a/include/exec/memory.h
> +++ b/include/exec/memory.h
> @@ -110,7 +110,7 @@ struct MemoryRegionOps {
>          /* If true, unaligned accesses are supported.  Otherwise all accesses
>           * are converted to (possibly multiple) naturally aligned accesses.
>           */
> -         bool unaligned;
> +        bool unaligned;
>      } impl;
>
>      /* If .read and .write are not present, old_mmio may be used for
>

Applied, thanks!

Paolo

Re: [Qemu-devel] [PATCH] docs/memory.txt: Fix document on MMIO operations

[Peter Maydell]

On 5 May 2014 08:53, Fam Zheng <famz@redhat.com> wrote:
> .impl.valid should be .impl.unaligned and the description needs some
> fixes.
>
> .old_portio is removed since commit b40acf99b (ioport: Switch
> dispatching to memory core layer).

I've already sent a patch for that part, which mjt has applied
to the trivial branch :

http://patchwork.ozlabs.org/patch/343332/

so this patch is going to cause a merge conflict with that
if Paolo takes it via a different tree.

thanks
-- PMM

Re: [Qemu-devel] [PATCH] docs/memory.txt: Fix document on MMIO operations

[Fam Zheng]

On Mon, 05/05 11:41, Peter Maydell wrote:
> On 5 May 2014 08:53, Fam Zheng <famz@redhat.com> wrote:
> > .impl.valid should be .impl.unaligned and the description needs some
> > fixes.
> >
> > .old_portio is removed since commit b40acf99b (ioport: Switch
> > dispatching to memory core layer).
> 
> I've already sent a patch for that part, which mjt has applied
> to the trivial branch :
> 
> http://patchwork.ozlabs.org/patch/343332/
> 
> so this patch is going to cause a merge conflict with that
> if Paolo takes it via a different tree.
> 
> thanks
> -- PMM

I overlooked that one. I'll respin to base on your patch and send for -trivial,
so Paolo could drop it.

Thanks,
Fam

Re: [Qemu-devel] [PATCH] docs/memory.txt: Fix document on MMIO operations

[Paolo Bonzini]

Il 05/05/2014 12:51, Fam Zheng ha scritto:
> On Mon, 05/05 11:41, Peter Maydell wrote:
>> On 5 May 2014 08:53, Fam Zheng <famz@redhat.com> wrote:
>>> .impl.valid should be .impl.unaligned and the description needs some
>>> fixes.
>>>
>>> .old_portio is removed since commit b40acf99b (ioport: Switch
>>> dispatching to memory core layer).
>>
>> I've already sent a patch for that part, which mjt has applied
>> to the trivial branch :
>>
>> http://patchwork.ozlabs.org/patch/343332/
>>
>> so this patch is going to cause a merge conflict with that
>> if Paolo takes it via a different tree.
>>
>> thanks
>> -- PMM
>
> I overlooked that one. I'll respin to base on your patch and send for -trivial,
> so Paolo could drop it.

Ok, will drop.

Paolo