Skip to content

Commit

Permalink
migration: Rename ram_handle_compressed() to ram_handle_zero()
Browse files Browse the repository at this point in the history
Now that we know it only handles zero, we can remove the ch parameter.

Reviewed-by: Fabiano Rosas <farosas@suse.de>
Reviewed-by: Peter Xu <peterx@redhat.com>
Signed-off-by: Juan Quintela <quintela@redhat.com>
Message-ID: <20231019085259.13307-3-quintela@redhat.com>
  • Loading branch information
Juan Quintela committed Oct 30, 2023
1 parent 413d64f commit 7091dab
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 7 deletions.
10 changes: 5 additions & 5 deletions migration/ram.c
Original file line number Diff line number Diff line change
Expand Up @@ -3446,7 +3446,7 @@ static inline void *colo_cache_from_block_offset(RAMBlock *block,
}

/**
* ram_handle_compressed: handle the zero page case
* ram_handle_zero: handle the zero page case
*
* If a page (or a whole RDMA chunk) has been
* determined to be zero, then zap it.
Expand All @@ -3455,10 +3455,10 @@ static inline void *colo_cache_from_block_offset(RAMBlock *block,
* @ch: what the page is filled from. We only support zero
* @size: size of the zero page
*/
void ram_handle_compressed(void *host, uint8_t ch, uint64_t size)
void ram_handle_zero(void *host, uint64_t size)
{
if (ch != 0 || !buffer_is_zero(host, size)) {
memset(host, ch, size);
if (!buffer_is_zero(host, size)) {
memset(host, 0, size);
}
}

Expand Down Expand Up @@ -4037,7 +4037,7 @@ static int ram_load_precopy(QEMUFile *f)
ret = -EINVAL;
break;
}
ram_handle_compressed(host, ch, TARGET_PAGE_SIZE);
ram_handle_zero(host, TARGET_PAGE_SIZE);
break;

case RAM_SAVE_FLAG_PAGE:
Expand Down
2 changes: 1 addition & 1 deletion migration/ram.h
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ int ram_discard_range(const char *block_name, uint64_t start, size_t length);
int ram_postcopy_incoming_init(MigrationIncomingState *mis);
int ram_load_postcopy(QEMUFile *f, int channel);

void ram_handle_compressed(void *host, uint8_t ch, uint64_t size);
void ram_handle_zero(void *host, uint64_t size);

void ram_transferred_add(uint64_t bytes);
void ram_release_page(const char *rbname, uint64_t offset);
Expand Down
2 changes: 1 addition & 1 deletion migration/rdma.c
Original file line number Diff line number Diff line change
Expand Up @@ -3597,7 +3597,7 @@ int rdma_registration_handle(QEMUFile *f)
comp->value);
goto err;
}
ram_handle_compressed(host_addr, comp->value, comp->length);
ram_handle_zero(host_addr, comp->length);
break;

case RDMA_CONTROL_REGISTER_FINISHED:
Expand Down

0 comments on commit 7091dab

Please sign in to comment.