diff options
| author | Juan Quintela <quintela@redhat.com> | 2023-10-19 10:52:59 +0200 |
|---|---|---|
| committer | Juan Quintela <quintela@redhat.com> | 2023-10-30 17:41:55 +0100 |
| commit | 7091dabeb41806132428ffe96164c8425854ea27 (patch) | |
| tree | b4f990876715beb3a6fabf887f3d4290d3f413ff | |
| parent | 413d64fedcc8e7f83b19ab4b79e3fd1f871f3564 (diff) | |
| download | qemu-7091dabeb41806132428ffe96164c8425854ea27.zip qemu-7091dabeb41806132428ffe96164c8425854ea27.tar.gz qemu-7091dabeb41806132428ffe96164c8425854ea27.tar.bz2 | |
migration: Rename ram_handle_compressed() to ram_handle_zero()
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>
| -rw-r--r-- | migration/ram.c | 10 | ||||
| -rw-r--r-- | migration/ram.h | 2 | ||||
| -rw-r--r-- | migration/rdma.c | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/migration/ram.c b/migration/ram.c index 4bfb20c..e0ad732 100644 --- a/migration/ram.c +++ b/migration/ram.c @@ -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. @@ -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); } } @@ -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: diff --git a/migration/ram.h b/migration/ram.h index 145c915..3f724b2 100644 --- a/migration/ram.h +++ b/migration/ram.h @@ -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); diff --git a/migration/rdma.c b/migration/rdma.c index 2d963fd..e3493e3 100644 --- a/migration/rdma.c +++ b/migration/rdma.c @@ -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: |