6fdf747a98
RAMBLOCK_FOREACH_MIGRATABLE is need in dirtyrate measure, move the existing definition up into migration/ram.h Signed-off-by: Chuan Zheng <zhengchuan@huawei.com> Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com> Reviewed-by: David Edmondson <david.edmondson@oracle.com> Reviewed-by: Li Qiang <liq3ea@gmail.com> Message-Id: <1600237327-33618-6-git-send-email-zhengchuan@huawei.com> Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
85 lines
2.9 KiB
Diff
85 lines
2.9 KiB
Diff
From 1cee10fe37193c6b5ed4e765a2a6d1e6c1411922 Mon Sep 17 00:00:00 2001
|
|
From: Chuan Zheng <zhengchuan@huawei.com>
|
|
Date: Wed, 16 Sep 2020 14:22:00 +0800
|
|
Subject: [PATCH] migration/dirtyrate: move RAMBLOCK_FOREACH_MIGRATABLE into
|
|
ram.h
|
|
|
|
RAMBLOCK_FOREACH_MIGRATABLE is need in dirtyrate measure,
|
|
move the existing definition up into migration/ram.h
|
|
|
|
Signed-off-by: Chuan Zheng <zhengchuan@huawei.com>
|
|
Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
|
|
Reviewed-by: David Edmondson <david.edmondson@oracle.com>
|
|
Reviewed-by: Li Qiang <liq3ea@gmail.com>
|
|
Message-Id: <1600237327-33618-6-git-send-email-zhengchuan@huawei.com>
|
|
Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
|
|
---
|
|
migration/dirtyrate.c | 1 +
|
|
migration/ram.c | 11 +----------
|
|
migration/ram.h | 10 ++++++++++
|
|
3 files changed, 12 insertions(+), 10 deletions(-)
|
|
|
|
diff --git a/migration/dirtyrate.c b/migration/dirtyrate.c
|
|
index cbb323d6ec..1ccc71077d 100644
|
|
--- a/migration/dirtyrate.c
|
|
+++ b/migration/dirtyrate.c
|
|
@@ -20,6 +20,7 @@
|
|
#include "qemu/rcu_queue.h"
|
|
#include "qapi/qapi-commands-migration.h"
|
|
#include "migration.h"
|
|
+#include "ram.h"
|
|
#include "dirtyrate.h"
|
|
|
|
static int CalculatingState = DIRTY_RATE_STATUS_UNSTARTED;
|
|
diff --git a/migration/ram.c b/migration/ram.c
|
|
index 848059d9fb..1a33c7b3e2 100644
|
|
--- a/migration/ram.c
|
|
+++ b/migration/ram.c
|
|
@@ -159,21 +159,12 @@ out:
|
|
return ret;
|
|
}
|
|
|
|
-static bool ramblock_is_ignored(RAMBlock *block)
|
|
+bool ramblock_is_ignored(RAMBlock *block)
|
|
{
|
|
return !qemu_ram_is_migratable(block) ||
|
|
(migrate_ignore_shared() && qemu_ram_is_shared(block));
|
|
}
|
|
|
|
-/* Should be holding either ram_list.mutex, or the RCU lock. */
|
|
-#define RAMBLOCK_FOREACH_NOT_IGNORED(block) \
|
|
- INTERNAL_RAMBLOCK_FOREACH(block) \
|
|
- if (ramblock_is_ignored(block)) {} else
|
|
-
|
|
-#define RAMBLOCK_FOREACH_MIGRATABLE(block) \
|
|
- INTERNAL_RAMBLOCK_FOREACH(block) \
|
|
- if (!qemu_ram_is_migratable(block)) {} else
|
|
-
|
|
#undef RAMBLOCK_FOREACH
|
|
|
|
int foreach_not_ignored_block(RAMBlockIterFunc func, void *opaque)
|
|
diff --git a/migration/ram.h b/migration/ram.h
|
|
index a788ff0e8e..565ec86b1f 100644
|
|
--- a/migration/ram.h
|
|
+++ b/migration/ram.h
|
|
@@ -37,6 +37,16 @@ extern MigrationStats ram_counters;
|
|
extern XBZRLECacheStats xbzrle_counters;
|
|
extern CompressionStats compression_counters;
|
|
|
|
+bool ramblock_is_ignored(RAMBlock *block);
|
|
+/* Should be holding either ram_list.mutex, or the RCU lock. */
|
|
+#define RAMBLOCK_FOREACH_NOT_IGNORED(block) \
|
|
+ INTERNAL_RAMBLOCK_FOREACH(block) \
|
|
+ if (ramblock_is_ignored(block)) {} else
|
|
+
|
|
+#define RAMBLOCK_FOREACH_MIGRATABLE(block) \
|
|
+ INTERNAL_RAMBLOCK_FOREACH(block) \
|
|
+ if (!qemu_ram_is_migratable(block)) {} else
|
|
+
|
|
int xbzrle_cache_resize(int64_t new_size, Error **errp);
|
|
uint64_t ram_bytes_remaining(void);
|
|
uint64_t ram_bytes_total(void);
|
|
--
|
|
2.27.0
|
|
|