74 lines
2.7 KiB
Diff
74 lines
2.7 KiB
Diff
|
From 1f7cb73592a1922b3a981eb3232098281e07679f Mon Sep 17 00:00:00 2001
|
||
|
|
From: Janosch Frank <frankja@linux.ibm.com>
|
||
|
|
Date: Thu, 11 Aug 2022 12:10:59 +0000
|
||
|
|
Subject: [PATCH 27/42] dump: Rework dump_calculate_size function
|
||
|
|
MIME-Version: 1.0
|
||
|
|
Content-Type: text/plain; charset=UTF-8
|
||
|
|
Content-Transfer-Encoding: 8bit
|
||
|
|
|
||
|
|
RH-Author: Cédric Le Goater <clg@redhat.com>
|
||
|
|
RH-MergeRequest: 226: s390: Enhanced Interpretation for PCI Functions and Secure Execution guest dump
|
||
|
|
RH-Bugzilla: 1664378 2043909
|
||
|
|
RH-Acked-by: Thomas Huth <thuth@redhat.com>
|
||
|
|
RH-Acked-by: Cornelia Huck <cohuck@redhat.com>
|
||
|
|
RH-Acked-by: Jon Maloy <jmaloy@redhat.com>
|
||
|
|
RH-Commit: [27/41] eaa05c39109b57a119752ad3df66f4c2ace2cbe4
|
||
|
|
|
||
|
|
dump_calculate_size() sums up all the sizes of the guest memory
|
||
|
|
blocks. Since we already have a function that calculates the size of a
|
||
|
|
single memory block (dump_get_memblock_size()) we can simply iterate
|
||
|
|
over the blocks and use the function instead of calculating the size
|
||
|
|
ourselves.
|
||
|
|
|
||
|
|
Signed-off-by: Janosch Frank <frankja@linux.ibm.com>
|
||
|
|
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
|
||
|
|
Reviewed-by: Janis Schoetterl-Glausch <scgl@linux.ibm.com>
|
||
|
|
Message-Id: <20220811121111.9878-7-frankja@linux.ibm.com>
|
||
|
|
(cherry picked from commit c370d5300f9ac1f90f8158082d22262b904fe30e)
|
||
|
|
Signed-off-by: Cédric Le Goater <clg@redhat.com>
|
||
|
|
---
|
||
|
|
dump/dump.c | 22 ++++++++--------------
|
||
|
|
1 file changed, 8 insertions(+), 14 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/dump/dump.c b/dump/dump.c
|
||
|
|
index f6fe13e258..902a85ef8e 100644
|
||
|
|
--- a/dump/dump.c
|
||
|
|
+++ b/dump/dump.c
|
||
|
|
@@ -1557,25 +1557,19 @@ bool dump_in_progress(void)
|
||
|
|
return (qatomic_read(&state->status) == DUMP_STATUS_ACTIVE);
|
||
|
|
}
|
||
|
|
|
||
|
|
-/* calculate total size of memory to be dumped (taking filter into
|
||
|
|
- * acoount.) */
|
||
|
|
+/*
|
||
|
|
+ * calculate total size of memory to be dumped (taking filter into
|
||
|
|
+ * account.)
|
||
|
|
+ */
|
||
|
|
static int64_t dump_calculate_size(DumpState *s)
|
||
|
|
{
|
||
|
|
GuestPhysBlock *block;
|
||
|
|
- int64_t size = 0, total = 0, left = 0, right = 0;
|
||
|
|
+ int64_t total = 0;
|
||
|
|
|
||
|
|
QTAILQ_FOREACH(block, &s->guest_phys_blocks.head, next) {
|
||
|
|
- if (dump_has_filter(s)) {
|
||
|
|
- /* calculate the overlapped region. */
|
||
|
|
- left = MAX(s->filter_area_begin, block->target_start);
|
||
|
|
- right = MIN(s->filter_area_begin + s->filter_area_length, block->target_end);
|
||
|
|
- size = right - left;
|
||
|
|
- size = size > 0 ? size : 0;
|
||
|
|
- } else {
|
||
|
|
- /* count the whole region in */
|
||
|
|
- size = (block->target_end - block->target_start);
|
||
|
|
- }
|
||
|
|
- total += size;
|
||
|
|
+ total += dump_filtered_memblock_size(block,
|
||
|
|
+ s->filter_area_begin,
|
||
|
|
+ s->filter_area_length);
|
||
|
|
}
|
||
|
|
|
||
|
|
return total;
|
||
|
|
--
|
||
|
|
2.37.3
|
||
|
|
|