From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from mx1.redhat.com ([209.132.183.28]) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1VO9YW-0004iv-PO for kexec@lists.infradead.org; Mon, 23 Sep 2013 17:04:18 +0000 Date: Mon, 23 Sep 2013 13:03:53 -0400 From: Vivek Goyal Subject: Re: [PATCH v2] vmcore-dmesg: Understand >= v3.11-rc4 dmesg Message-ID: <20130923170353.GC10812@redhat.com> References: <20130919143815.GA4487@dhcp-16-126.nay.redhat.com> <1379602186-13617-1-git-send-email-lkundrak@v3.sk> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <1379602186-13617-1-git-send-email-lkundrak@v3.sk> List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "kexec" Errors-To: kexec-bounces+dwmw2=twosheds.infradead.org@lists.infradead.org To: Lubomir Rintel Cc: Joe Perches , Dave Young , Simon Horman , kexec@lists.infradead.org On Thu, Sep 19, 2013 at 04:49:46PM +0200, Lubomir Rintel wrote: > Symbol name changed with the following commit: > 62e32ac printk: rename struct log to struct printk_log > > Signed-off-by: Lubomir Rintel > Cc: Simon Horman > Cc: Vivek Goyal > Cc: Joe Perches > Cc: Dave Young > --- Looks good to me. Agreed that let us put kernel verion number in changelog since this change became effective. Acked-by: Vivek Goyal Vivek > > Changes for v2: > * Clarified printk_log vs. log in some comments. > > vmcore-dmesg/vmcore-dmesg.c | 16 ++++++++++++---- > 1 files changed, 12 insertions(+), 4 deletions(-) > > diff --git a/vmcore-dmesg/vmcore-dmesg.c b/vmcore-dmesg/vmcore-dmesg.c > index 0f477c0..dd222cd 100644 > --- a/vmcore-dmesg/vmcore-dmesg.c > +++ b/vmcore-dmesg/vmcore-dmesg.c > @@ -34,10 +34,10 @@ static loff_t logged_chars_vaddr; > static loff_t log_first_idx_vaddr; > static loff_t log_next_idx_vaddr; > > -/* struct log size */ > +/* struct printk_log (or older log) size */ > static uint64_t log_sz; > > -/* struct log field offsets */ > +/* struct printk_log (or older log) field offsets */ > static uint64_t log_offset_ts_nsec = UINT64_MAX; > static uint16_t log_offset_len = UINT16_MAX; > static uint16_t log_offset_text_len = UINT16_MAX; > @@ -324,19 +324,27 @@ static void scan_vmcoreinfo(char *start, size_t size) > *symbol[i].vaddr = vaddr; > } > > - /* Check for "SIZE(log)=" */ > + /* Check for "SIZE(printk_log)" or older "SIZE(log)=" */ > if (memcmp("SIZE(log)=", pos, 10) == 0) > log_sz = strtoull(pos + 10, NULL, 10); > + if (memcmp("SIZE(printk_log)=", pos, 17) == 0) > + log_sz = strtoull(pos + 17, NULL, 10); > > - /* Check for struct log field offsets */ > + /* Check for struct printk_log (or older log) field offsets */ > if (memcmp("OFFSET(log.ts_nsec)=", pos, 20) == 0) > log_offset_ts_nsec = strtoull(pos + 20, NULL, 10); > + if (memcmp("OFFSET(printk_log.ts_nsec)=", pos, 27) == 0) > + log_offset_ts_nsec = strtoull(pos + 27, NULL, 10); > > if (memcmp("OFFSET(log.len)=", pos, 16) == 0) > log_offset_len = strtoul(pos + 16, NULL, 10); > + if (memcmp("OFFSET(printk_log.len)=", pos, 23) == 0) > + log_offset_len = strtoul(pos + 23, NULL, 10); > > if (memcmp("OFFSET(log.text_len)=", pos, 21) == 0) > log_offset_text_len = strtoul(pos + 21, NULL, 10); > + if (memcmp("OFFSET(printk_log.text_len)=", pos, 28) == 0) > + log_offset_text_len = strtoul(pos + 28, NULL, 10); > > if (last_line) > break; > -- > 1.7.1 _______________________________________________ kexec mailing list kexec@lists.infradead.org http://lists.infradead.org/mailman/listinfo/kexec