Re: [PATCH v4 04/23] migration: Remove masking for compression

2022-01-11 Thread Dr. David Alan Gilbert
* Juan Quintela (quint...@redhat.com) wrote:
> Remove the mask in the call to ram_release_pages().  Nothing else does
> it, and if the offset has that bits set, we have a lot of trouble.
> 
> Signed-off-by: Juan Quintela 

Yeh same as in the other branch

Reviewed-by: Dr. David Alan Gilbert 

> ---
>  migration/ram.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/migration/ram.c b/migration/ram.c
> index 881fe4974e..fa49d22e69 100644
> --- a/migration/ram.c
> +++ b/migration/ram.c
> @@ -1340,7 +1340,7 @@ static bool do_compress_ram_page(QEMUFile *f, z_stream 
> *stream, RAMBlock *block,
>   ram_addr_t offset, uint8_t *source_buf)
>  {
>  RAMState *rs = ram_state;
> -uint8_t *p = block->host + (offset & TARGET_PAGE_MASK);
> +uint8_t *p = block->host + offset;
>  bool zero_page = false;
>  int ret;
>  
> @@ -1365,7 +1365,7 @@ static bool do_compress_ram_page(QEMUFile *f, z_stream 
> *stream, RAMBlock *block,
>  }
>  
>  exit:
> -ram_release_page(block->idstr, offset & TARGET_PAGE_MASK);
> +ram_release_page(block->idstr, offset);
>  return zero_page;
>  }
>  
> -- 
> 2.34.1
> 
-- 
Dr. David Alan Gilbert / dgilb...@redhat.com / Manchester, UK




[PATCH v4 04/23] migration: Remove masking for compression

2022-01-11 Thread Juan Quintela
Remove the mask in the call to ram_release_pages().  Nothing else does
it, and if the offset has that bits set, we have a lot of trouble.

Signed-off-by: Juan Quintela 
---
 migration/ram.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/migration/ram.c b/migration/ram.c
index 881fe4974e..fa49d22e69 100644
--- a/migration/ram.c
+++ b/migration/ram.c
@@ -1340,7 +1340,7 @@ static bool do_compress_ram_page(QEMUFile *f, z_stream 
*stream, RAMBlock *block,
  ram_addr_t offset, uint8_t *source_buf)
 {
 RAMState *rs = ram_state;
-uint8_t *p = block->host + (offset & TARGET_PAGE_MASK);
+uint8_t *p = block->host + offset;
 bool zero_page = false;
 int ret;
 
@@ -1365,7 +1365,7 @@ static bool do_compress_ram_page(QEMUFile *f, z_stream 
*stream, RAMBlock *block,
 }
 
 exit:
-ram_release_page(block->idstr, offset & TARGET_PAGE_MASK);
+ram_release_page(block->idstr, offset);
 return zero_page;
 }
 
-- 
2.34.1