From mboxrd@z Thu Jan 1 00:00:00 1970 From: Daniel Kiper Subject: [PATCH v2 5/7] Do not break progress messages Date: Tue, 16 Jul 2013 14:32:07 +0200 Message-ID: <1373977929-4253-6-git-send-email-daniel.kiper@oracle.com> References: <1373977929-4253-1-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: <1373977929-4253-1-git-send-email-daniel.kiper-QHcLZuEGTsvQT0dZR+AlfA@public.gmane.org> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "kexec" Errors-To: kexec-bounces+glkk-kexec=m.gmane.org-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org To: andrew.cooper3-Sxgqhf6Nn4DQT0dZR+AlfA@public.gmane.org, kumagai-atsushi-biTfD1RFvDe45+QrQBaojngSJqDPrsil@public.gmane.org, kexec-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org, xen-devel-GuqFBffKawuULHF6PoxzQEEOCMrvLtNR@public.gmane.org Cc: Daniel Kiper List-Id: xen-devel@lists.xenproject.org DEBUG_MSG() displaying erase info size breaks progress messages. Fix this by moving relevant DEBUG_MSG() to write_elf_eraseinfo(). Signed-off-by: Daniel Kiper --- makedumpfile.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/makedumpfile.c b/makedumpfile.c index b4abbe5..a3bfc80 100644 --- a/makedumpfile.c +++ b/makedumpfile.c @@ -5045,7 +5045,6 @@ write_elf_header(struct cache_data *cd_header) * function. */ info->size_elf_eraseinfo = size_eraseinfo; - DEBUG_MSG("erase info size: %lu\n", info->size_elf_eraseinfo); /* * Write a PT_NOTE header. @@ -6326,6 +6325,8 @@ write_elf_eraseinfo(struct cache_data *cd_header) off_t offset_eraseinfo; unsigned long note_header_size, size_written, size_note; + DEBUG_MSG("erase info size: %lu\n", info->size_elf_eraseinfo); + if (!info->size_elf_eraseinfo) return TRUE; -- 1.7.10.4