[Xen-devel] [PATCH v3] xen: Enforce page size when it could not be established by other means

[Daniel Kiper <daniel.kiper@xxxxxxxxxx>]

Enforce page size when it could not be established by other means.

v3 - suggestions/fixes:
   - rearrange code for readability
     (suggested by Atsushi Kumagai).

Signed-off-by: Daniel Kiper <daniel.kiper@xxxxxxxxxx>
---
 makedumpfile.c |   12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/makedumpfile.c b/makedumpfile.c
index b42565c..20a547b 100644
--- a/makedumpfile.c
+++ b/makedumpfile.c
@@ -7324,8 +7324,6 @@ initial_xen(void)
 #endif
        if (!init_xen_crash_info())
                return FALSE;
-       if (!fallback_to_current_page_size())
-               return FALSE;
        /*
         * Get the debug information for analysis from the vmcoreinfo file
         */
@@ -7370,6 +7368,16 @@ initial_xen(void)
                if (!read_vmcoreinfo_from_vmcore(offset, size, TRUE))
                        return FALSE;
        }
+
+       if (!info->page_size) {
+               /*
+                * If we cannot get page_size from a vmcoreinfo file,
+                * fall back to the current kernel page size.
+                */
+               if (!fallback_to_current_page_size())
+                       return FALSE;
+       }
+
        if (!get_xen_info())
                return FALSE;
 
-- 
1.7.10.4


_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxx
http://lists.xen.org/xen-devel