From mboxrd@z Thu Jan 1 00:00:00 1970 From: Daniel Kiper Subject: [PATCH 3/7] kexec: Move crash kernel area placement and size detection to is_crashkernel_mem_reserved() Date: Mon, 10 Sep 2012 13:57:47 +0200 Message-ID: <1347278271-5211-4-git-send-email-daniel.kiper@oracle.com> References: <1347278271-5211-1-git-send-email-daniel.kiper@oracle.com> <1347278271-5211-2-git-send-email-daniel.kiper@oracle.com> <1347278271-5211-3-git-send-email-daniel.kiper@oracle.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <1347278271-5211-3-git-send-email-daniel.kiper-QHcLZuEGTsvQT0dZR+AlfA@public.gmane.org> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: kexec-bounces-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org Errors-To: kexec-bounces+glkk-kexec=m.gmane.org-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org To: konrad.wilk-QHcLZuEGTsvQT0dZR+AlfA@public.gmane.org, andrew.cooper3-Sxgqhf6Nn4DQT0dZR+AlfA@public.gmane.org, olaf-QOLJcTWqO2uzQB+pC5nmwQ@public.gmane.org, jbeulich-IBi9RG/b67k@public.gmane.org, ptesarik-AlSwsSmVLrQ@public.gmane.org, kexec-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org, xen-devel-GuqFBffKawuULHF6PoxzQEEOCMrvLtNR@public.gmane.org List-Id: xen-devel@lists.xenproject.org Move crash kernel area placement and size detection from get_crash_memory_ranges() to is_crashkernel_mem_reserved(). Former one will not be used by fixed Xen kdump support. Signed-off-by: Daniel Kiper --- kexec/arch/i386/crashdump-x86.c | 17 ++++++++--------- 1 files changed, 8 insertions(+), 9 deletions(-) diff --git a/kexec/arch/i386/crashdump-x86.c b/kexec/arch/i386/crashdump-x86.c index 2af090c..ec9432b 100644 --- a/kexec/arch/i386/crashdump-x86.c +++ b/kexec/arch/i386/crashdump-x86.c @@ -212,13 +212,6 @@ static int get_crash_memory_ranges(struct memory_range **range, int *ranges, /* Only Dumping memory of type System RAM. */ if (memcmp(str, "System RAM\n", 11) == 0) { type = RANGE_RAM; - } else if (memcmp(str, "Crash kernel\n", 13) == 0) { - /* Reserved memory region. New kernel can - * use this region to boot into. */ - crash_reserved_mem.start = start; - crash_reserved_mem.end = end; - crash_reserved_mem.type = RANGE_RAM; - continue; } else if (memcmp(str, "ACPI Tables\n", 12) == 0) { /* * ACPI Tables area need to be passed to new @@ -849,6 +842,12 @@ int is_crashkernel_mem_reserved(void) { uint64_t start, end; - return parse_iomem_single("Crash kernel\n", &start, &end) == 0 ? - (start != end) : 0; + if (parse_iomem_single("Crash kernel\n", &start, &end) || start == end) + return 0; + + crash_reserved_mem.start = start; + crash_reserved_mem.end = end; + crash_reserved_mem.type = RANGE_RAM; + + return 1; } -- 1.5.6.5