diff mbox

[2/3] memory: actually set the owner

Message ID 1373988662-19211-3-git-send-email-pbonzini@redhat.com
State New
Headers show

Commit Message

Paolo Bonzini July 16, 2013, 3:31 p.m. UTC 
Brown paper bag for me.  Commit 2c9b15c added a line setting mr->owner,
but there was already one that initialized it to NULL (added in the
earlier commit 803c0816).

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
 memory.c | 1 -
 1 file changed, 1 deletion(-)

Comments

Hu Tao July 17, 2013, 2:32 a.m. UTC | #1 
On Tue, Jul 16, 2013 at 05:31:01PM +0200, Paolo Bonzini wrote:
> Brown paper bag for me.  Commit 2c9b15c added a line setting mr->owner,
> but there was already one that initialized it to NULL (added in the
> earlier commit 803c0816).

What I read from log is the reverse, Commit 2c9b15c added a line setting
mr->owner, which was correct, but 803c0816 accidentally set it to NULL later.

Reviewed-by: Hu Tao <hutao@cn.fujitsu.com>

> 
> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
> ---
>  memory.c | 1 -
>  1 file changed, 1 deletion(-)
> 
> diff --git a/memory.c b/memory.c
> index c8f9a2b..9938b6b 100644
> --- a/memory.c
> +++ b/memory.c
> @@ -805,7 +805,6 @@ void memory_region_init(MemoryRegion *mr,
>      mr->owner = owner;
>      mr->iommu_ops = NULL;
>      mr->parent = NULL;
> -    mr->owner = NULL;
>      mr->size = int128_make64(size);
>      if (size == UINT64_MAX) {
>          mr->size = int128_2_64();
> -- 
> 1.8.1.4
> 
> 
>
diff mbox

Patch

diff --git a/memory.c b/memory.c
index c8f9a2b..9938b6b 100644
--- a/memory.c
+++ b/memory.c
@@ -805,7 +805,6 @@  void memory_region_init(MemoryRegion *mr,
     mr->owner = owner;
     mr->iommu_ops = NULL;
     mr->parent = NULL;
-    mr->owner = NULL;
     mr->size = int128_make64(size);
     if (size == UINT64_MAX) {
         mr->size = int128_2_64();