From: Andrew Cooper <andrew.cooper3@citrix.com>
To: Xen-devel <xen-devel@lists.xen.org>
Cc: Andrew Cooper <andrew.cooper3@citrix.com>,
Keir Fraser <keir@xen.org>, Jan Beulich <JBeulich@suse.com>
Subject: [PATCH 4/5] common/symbols: Remove print_symbol() and associated infrastructure
Date: Mon, 4 Nov 2013 10:55:38 +0000 [thread overview]
Message-ID: <1383562539-16085-5-git-send-email-andrew.cooper3@citrix.com> (raw)
In-Reply-To: <1383562539-16085-1-git-send-email-andrew.cooper3@citrix.com>
Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>
CC: Keir Fraser <keir@xen.org>
CC: Jan Beulich <JBeulich@suse.com>
---
xen/common/symbols.c | 26 --------------------------
xen/include/xen/symbols.h | 23 -----------------------
2 files changed, 49 deletions(-)
diff --git a/xen/common/symbols.c b/xen/common/symbols.c
index 83b2b58..45941e1 100644
--- a/xen/common/symbols.c
+++ b/xen/common/symbols.c
@@ -148,29 +148,3 @@ const char *symbols_lookup(unsigned long addr,
*offset = addr - symbols_address(low);
return namebuf;
}
-
-/* Replace "%s" in format with address, or returns -errno. */
-void __print_symbol(const char *fmt, unsigned long address)
-{
- const char *name;
- unsigned long offset, size, flags;
-
- static DEFINE_SPINLOCK(lock);
- static char namebuf[KSYM_NAME_LEN+1];
-#define BUFFER_SIZE sizeof("%s+%#lx/%#lx [%s]") + KSYM_NAME_LEN + \
- 2*(BITS_PER_LONG*3/10) + 1
- static char buffer[BUFFER_SIZE];
-
- spin_lock_irqsave(&lock, flags);
-
- name = symbols_lookup(address, &size, &offset, namebuf);
-
- if (!name)
- snprintf(buffer, BUFFER_SIZE, "???");
- else
- snprintf(buffer, BUFFER_SIZE, "%s+%#lx/%#lx", name, offset, size);
-
- printk(fmt, buffer);
-
- spin_unlock_irqrestore(&lock, flags);
-}
diff --git a/xen/include/xen/symbols.h b/xen/include/xen/symbols.h
index 37cf6bf..87cd77d 100644
--- a/xen/include/xen/symbols.h
+++ b/xen/include/xen/symbols.h
@@ -11,27 +11,4 @@ const char *symbols_lookup(unsigned long addr,
unsigned long *offset,
char *namebuf);
-/* Replace "%s" in format with address, if found */
-void __print_symbol(const char *fmt, unsigned long address);
-
-/* This macro allows us to keep printk typechecking */
-static void __check_printsym_format(const char *fmt, ...)
- __attribute__((format(printf,1,2)));
- static inline void __check_printsym_format(const char *fmt, ...)
-{
-}
-
-#if 0
-#define print_fn_descriptor_symbol(fmt, addr) \
- print_symbol(fmt, *(unsigned long *)addr)
-#else
-#define print_fn_descriptor_symbol(fmt, addr) print_symbol(fmt, addr)
-#endif
-
-#define print_symbol(fmt, addr) \
-do { \
- __check_printsym_format(fmt, ""); \
- __print_symbol(fmt, addr); \
-} while(0)
-
#endif /*_XEN_SYMBOLS_H*/
--
1.7.10.4
next prev parent reply other threads:[~2013-11-04 10:55 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-11-04 10:55 [PATCH 0/5] Printk symbol specifier Andrew Cooper
2013-11-04 10:55 ` [PATCH 1/5] common/vsprintf: Add %ps and %pS format specifier support Andrew Cooper
2013-11-04 14:51 ` Jan Beulich
2013-11-04 14:54 ` Jan Beulich
2013-11-04 18:39 ` Tim Deegan
2013-11-04 10:55 ` [PATCH 2/5] x86: Replace print_symbol() with new %ps/%pS format Andrew Cooper
2013-11-04 10:55 ` [PATCH 3/5] arm: " Andrew Cooper
2013-11-04 15:20 ` Ian Campbell
2013-11-04 10:55 ` Andrew Cooper [this message]
2013-11-04 10:55 ` [PATCH 5/5] Test harness for new printk formatting Andrew Cooper
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1383562539-16085-5-git-send-email-andrew.cooper3@citrix.com \
--to=andrew.cooper3@citrix.com \
--cc=JBeulich@suse.com \
--cc=keir@xen.org \
--cc=xen-devel@lists.xen.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).