[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 03/54] ram: Rename block_name to rbname
From: |
Juan Quintela |
Subject: |
[Qemu-devel] [PATCH 03/54] ram: Rename block_name to rbname |
Date: |
Thu, 6 Apr 2017 15:08:22 +0200 |
So all places are consistent on the naming of a block name parameter.
Signed-off-by: Juan Quintela <address@hidden>
Reviewed-by: Dr. David Alan Gilbert <address@hidden>
---
migration/ram.c | 17 ++++++++---------
1 file changed, 8 insertions(+), 9 deletions(-)
diff --git a/migration/ram.c b/migration/ram.c
index 356f8ce..776f8a7 100644
--- a/migration/ram.c
+++ b/migration/ram.c
@@ -743,14 +743,14 @@ static int save_zero_page(QEMUFile *f, RAMBlock *block,
ram_addr_t offset,
return pages;
}
-static void ram_release_pages(MigrationState *ms, const char *block_name,
+static void ram_release_pages(MigrationState *ms, const char *rbname,
uint64_t offset, int pages)
{
if (!migrate_release_ram() || !migration_in_postcopy(ms)) {
return;
}
- ram_discard_range(NULL, block_name, offset, pages << TARGET_PAGE_BITS);
+ ram_discard_range(NULL, rbname, offset, pages << TARGET_PAGE_BITS);
}
/**
@@ -1943,25 +1943,24 @@ int ram_postcopy_send_discard_bitmap(MigrationState *ms)
* Returns zero on success
*
* @mis: current migration incoming state
- * @block_name: Name of the RAMBlock of the request. NULL means the
- * same that last one.
+ * @rbname: name of the RAMBlock of the request. NULL means the
+ * same that last one.
* @start: RAMBlock starting page
* @length: RAMBlock size
*/
int ram_discard_range(MigrationIncomingState *mis,
- const char *block_name,
+ const char *rbname,
uint64_t start, size_t length)
{
int ret = -1;
- trace_ram_discard_range(block_name, start, length);
+ trace_ram_discard_range(rbname, start, length);
rcu_read_lock();
- RAMBlock *rb = qemu_ram_block_by_name(block_name);
+ RAMBlock *rb = qemu_ram_block_by_name(rbname);
if (!rb) {
- error_report("ram_discard_range: Failed to find block '%s'",
- block_name);
+ error_report("ram_discard_range: Failed to find block '%s'", rbname);
goto err;
}
--
2.9.3
- [Qemu-devel] [PATCH v3 00/54] Creating RAMState for migration, Juan Quintela, 2017/04/06
- [Qemu-devel] [PATCH 03/54] ram: Rename block_name to rbname,
Juan Quintela <=
- [Qemu-devel] [PATCH 02/54] ram: Rename flush_page_queue() to migration_page_queue_free(), Juan Quintela, 2017/04/06
- [Qemu-devel] [PATCH 06/54] ram: Move bitmap_sync_count into RAMState, Juan Quintela, 2017/04/06
- [Qemu-devel] [PATCH 04/54] ram: Create RAMState, Juan Quintela, 2017/04/06
- [Qemu-devel] [PATCH 01/54] ram: Update all functions comments, Juan Quintela, 2017/04/06
- [Qemu-devel] [PATCH 05/54] ram: Add dirty_rate_high_cnt to RAMState, Juan Quintela, 2017/04/06
- [Qemu-devel] [PATCH 07/54] ram: Move start time into RAMState, Juan Quintela, 2017/04/06
- [Qemu-devel] [PATCH 08/54] ram: Move bytes_xfer_prev into RAMState, Juan Quintela, 2017/04/06