Commit 283c0972 authored by Joe Perches's avatar Joe Perches Committed by Konrad Rzeszutek Wilk

xen: Convert printks to pr_<level>

Convert printks to pr_<level> (excludes printk(KERN_DEBUG...)
to be more consistent throughout the xen subsystem.

Add pr_fmt with KBUILD_MODNAME or "xen:" KBUILD_MODNAME
Coalesce formats and add missing word spaces
Add missing newlines
Align arguments and reflow to 80 columns
Remove DRV_NAME from formats as pr_fmt adds the same content

This does change some of the prefixes of these messages
but it also does make them more consistent.
Signed-off-by: default avatarJoe Perches <joe@perches.com>
Signed-off-by: default avatarKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>
parent 65e053a7
...@@ -36,6 +36,8 @@ ...@@ -36,6 +36,8 @@
* IN THE SOFTWARE. * IN THE SOFTWARE.
*/ */
#define pr_fmt(fmt) "xen:" KBUILD_MODNAME ": " fmt
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/sched.h> #include <linux/sched.h>
#include <linux/errno.h> #include <linux/errno.h>
...@@ -242,7 +244,7 @@ static enum bp_state reserve_additional_memory(long credit) ...@@ -242,7 +244,7 @@ static enum bp_state reserve_additional_memory(long credit)
rc = add_memory(nid, hotplug_start_paddr, balloon_hotplug << PAGE_SHIFT); rc = add_memory(nid, hotplug_start_paddr, balloon_hotplug << PAGE_SHIFT);
if (rc) { if (rc) {
pr_info("xen_balloon: %s: add_memory() failed: %i\n", __func__, rc); pr_info("%s: add_memory() failed: %i\n", __func__, rc);
return BP_EAGAIN; return BP_EAGAIN;
} }
...@@ -591,7 +593,7 @@ static int __init balloon_init(void) ...@@ -591,7 +593,7 @@ static int __init balloon_init(void)
if (!xen_domain()) if (!xen_domain())
return -ENODEV; return -ENODEV;
pr_info("xen/balloon: Initialising balloon driver.\n"); pr_info("Initialising balloon driver\n");
balloon_stats.current_pages = xen_pv_domain() balloon_stats.current_pages = xen_pv_domain()
? min(xen_start_info->nr_pages - xen_released_pages, max_pfn) ? min(xen_start_info->nr_pages - xen_released_pages, max_pfn)
......
#define pr_fmt(fmt) "xen:" KBUILD_MODNAME ": " fmt
#include <linux/notifier.h> #include <linux/notifier.h>
#include <xen/xen.h> #include <xen/xen.h>
...@@ -31,7 +33,7 @@ static int vcpu_online(unsigned int cpu) ...@@ -31,7 +33,7 @@ static int vcpu_online(unsigned int cpu)
err = xenbus_scanf(XBT_NIL, dir, "availability", "%15s", state); err = xenbus_scanf(XBT_NIL, dir, "availability", "%15s", state);
if (err != 1) { if (err != 1) {
if (!xen_initial_domain()) if (!xen_initial_domain())
printk(KERN_ERR "XENBUS: Unable to read cpu state\n"); pr_err("Unable to read cpu state\n");
return err; return err;
} }
...@@ -40,7 +42,7 @@ static int vcpu_online(unsigned int cpu) ...@@ -40,7 +42,7 @@ static int vcpu_online(unsigned int cpu)
else if (strcmp(state, "offline") == 0) else if (strcmp(state, "offline") == 0)
return 0; return 0;
printk(KERN_ERR "XENBUS: unknown state(%s) on CPU%d\n", state, cpu); pr_err("unknown state(%s) on CPU%d\n", state, cpu);
return -EINVAL; return -EINVAL;
} }
static void vcpu_hotplug(unsigned int cpu) static void vcpu_hotplug(unsigned int cpu)
......
...@@ -21,6 +21,8 @@ ...@@ -21,6 +21,8 @@
* Jeremy Fitzhardinge <jeremy@xensource.com>, XenSource Inc, 2007 * Jeremy Fitzhardinge <jeremy@xensource.com>, XenSource Inc, 2007
*/ */
#define pr_fmt(fmt) "xen:" KBUILD_MODNAME ": " fmt
#include <linux/linkage.h> #include <linux/linkage.h>
#include <linux/interrupt.h> #include <linux/interrupt.h>
#include <linux/irq.h> #include <linux/irq.h>
...@@ -600,8 +602,7 @@ static unsigned int __startup_pirq(unsigned int irq) ...@@ -600,8 +602,7 @@ static unsigned int __startup_pirq(unsigned int irq)
rc = HYPERVISOR_event_channel_op(EVTCHNOP_bind_pirq, &bind_pirq); rc = HYPERVISOR_event_channel_op(EVTCHNOP_bind_pirq, &bind_pirq);
if (rc != 0) { if (rc != 0) {
if (!probing_irq(irq)) if (!probing_irq(irq))
printk(KERN_INFO "Failed to obtain physical IRQ %d\n", pr_info("Failed to obtain physical IRQ %d\n", irq);
irq);
return 0; return 0;
} }
evtchn = bind_pirq.port; evtchn = bind_pirq.port;
...@@ -693,8 +694,8 @@ int xen_bind_pirq_gsi_to_irq(unsigned gsi, ...@@ -693,8 +694,8 @@ int xen_bind_pirq_gsi_to_irq(unsigned gsi,
irq = xen_irq_from_gsi(gsi); irq = xen_irq_from_gsi(gsi);
if (irq != -1) { if (irq != -1) {
printk(KERN_INFO "xen_map_pirq_gsi: returning irq %d for gsi %u\n", pr_info("%s: returning irq %d for gsi %u\n",
irq, gsi); __func__, irq, gsi);
goto out; goto out;
} }
...@@ -812,10 +813,10 @@ int xen_destroy_irq(int irq) ...@@ -812,10 +813,10 @@ int xen_destroy_irq(int irq)
* (free_domain_pirqs). * (free_domain_pirqs).
*/ */
if ((rc == -ESRCH && info->u.pirq.domid != DOMID_SELF)) if ((rc == -ESRCH && info->u.pirq.domid != DOMID_SELF))
printk(KERN_INFO "domain %d does not have %d anymore\n", pr_info("domain %d does not have %d anymore\n",
info->u.pirq.domid, info->u.pirq.pirq); info->u.pirq.domid, info->u.pirq.pirq);
else if (rc) { else if (rc) {
printk(KERN_WARNING "unmap irq failed %d\n", rc); pr_warn("unmap irq failed %d\n", rc);
goto out; goto out;
} }
} }
...@@ -1621,7 +1622,7 @@ static void restore_pirqs(void) ...@@ -1621,7 +1622,7 @@ static void restore_pirqs(void)
rc = HYPERVISOR_physdev_op(PHYSDEVOP_map_pirq, &map_irq); rc = HYPERVISOR_physdev_op(PHYSDEVOP_map_pirq, &map_irq);
if (rc) { if (rc) {
printk(KERN_WARNING "xen map irq failed gsi=%d irq=%d pirq=%d rc=%d\n", pr_warn("xen map irq failed gsi=%d irq=%d pirq=%d rc=%d\n",
gsi, irq, pirq, rc); gsi, irq, pirq, rc);
xen_free_irq(irq); xen_free_irq(irq);
continue; continue;
...@@ -1844,13 +1845,11 @@ void xen_callback_vector(void) ...@@ -1844,13 +1845,11 @@ void xen_callback_vector(void)
callback_via = HVM_CALLBACK_VECTOR(HYPERVISOR_CALLBACK_VECTOR); callback_via = HVM_CALLBACK_VECTOR(HYPERVISOR_CALLBACK_VECTOR);
rc = xen_set_callback_via(callback_via); rc = xen_set_callback_via(callback_via);
if (rc) { if (rc) {
printk(KERN_ERR "Request for Xen HVM callback vector" pr_err("Request for Xen HVM callback vector failed\n");
" failed.\n");
xen_have_vector_callback = 0; xen_have_vector_callback = 0;
return; return;
} }
printk(KERN_INFO "Xen HVM callback vector for event delivery is " pr_info("Xen HVM callback vector for event delivery is enabled\n");
"enabled\n");
/* in the restore case the vector has already been allocated */ /* in the restore case the vector has already been allocated */
if (!test_bit(HYPERVISOR_CALLBACK_VECTOR, used_vectors)) if (!test_bit(HYPERVISOR_CALLBACK_VECTOR, used_vectors))
alloc_intr_gate(HYPERVISOR_CALLBACK_VECTOR, alloc_intr_gate(HYPERVISOR_CALLBACK_VECTOR,
......
...@@ -31,6 +31,8 @@ ...@@ -31,6 +31,8 @@
* IN THE SOFTWARE. * IN THE SOFTWARE.
*/ */
#define pr_fmt(fmt) "xen:" KBUILD_MODNAME ": " fmt
#include <linux/module.h> #include <linux/module.h>
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/sched.h> #include <linux/sched.h>
...@@ -547,11 +549,11 @@ static int __init evtchn_init(void) ...@@ -547,11 +549,11 @@ static int __init evtchn_init(void)
/* Create '/dev/xen/evtchn'. */ /* Create '/dev/xen/evtchn'. */
err = misc_register(&evtchn_miscdev); err = misc_register(&evtchn_miscdev);
if (err != 0) { if (err != 0) {
printk(KERN_ERR "Could not register /dev/xen/evtchn\n"); pr_err("Could not register /dev/xen/evtchn\n");
return err; return err;
} }
printk(KERN_INFO "Event-channel device installed.\n"); pr_info("Event-channel device installed\n");
return 0; return 0;
} }
......
...@@ -48,6 +48,8 @@ ...@@ -48,6 +48,8 @@
* grant operation. * grant operation.
*/ */
#define pr_fmt(fmt) "xen:" KBUILD_MODNAME ": " fmt
#include <linux/atomic.h> #include <linux/atomic.h>
#include <linux/module.h> #include <linux/module.h>
#include <linux/miscdevice.h> #include <linux/miscdevice.h>
...@@ -507,7 +509,7 @@ static int gntalloc_mmap(struct file *filp, struct vm_area_struct *vma) ...@@ -507,7 +509,7 @@ static int gntalloc_mmap(struct file *filp, struct vm_area_struct *vma)
int rv, i; int rv, i;
if (!(vma->vm_flags & VM_SHARED)) { if (!(vma->vm_flags & VM_SHARED)) {
printk(KERN_ERR "%s: Mapping must be shared.\n", __func__); pr_err("%s: Mapping must be shared\n", __func__);
return -EINVAL; return -EINVAL;
} }
...@@ -584,7 +586,7 @@ static int __init gntalloc_init(void) ...@@ -584,7 +586,7 @@ static int __init gntalloc_init(void)
err = misc_register(&gntalloc_miscdev); err = misc_register(&gntalloc_miscdev);
if (err != 0) { if (err != 0) {
printk(KERN_ERR "Could not register misc gntalloc device\n"); pr_err("Could not register misc gntalloc device\n");
return err; return err;
} }
......
...@@ -19,6 +19,8 @@ ...@@ -19,6 +19,8 @@
#undef DEBUG #undef DEBUG
#define pr_fmt(fmt) "xen:" KBUILD_MODNAME ": " fmt
#include <linux/module.h> #include <linux/module.h>
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/init.h> #include <linux/init.h>
...@@ -760,7 +762,7 @@ static int gntdev_mmap(struct file *flip, struct vm_area_struct *vma) ...@@ -760,7 +762,7 @@ static int gntdev_mmap(struct file *flip, struct vm_area_struct *vma)
if (use_ptemod && map->vma) if (use_ptemod && map->vma)
goto unlock_out; goto unlock_out;
if (use_ptemod && priv->mm != vma->vm_mm) { if (use_ptemod && priv->mm != vma->vm_mm) {
printk(KERN_WARNING "Huh? Other mm?\n"); pr_warn("Huh? Other mm?\n");
goto unlock_out; goto unlock_out;
} }
...@@ -795,7 +797,7 @@ static int gntdev_mmap(struct file *flip, struct vm_area_struct *vma) ...@@ -795,7 +797,7 @@ static int gntdev_mmap(struct file *flip, struct vm_area_struct *vma)
vma->vm_end - vma->vm_start, vma->vm_end - vma->vm_start,
find_grant_ptes, map); find_grant_ptes, map);
if (err) { if (err) {
printk(KERN_WARNING "find_grant_ptes() failure.\n"); pr_warn("find_grant_ptes() failure.\n");
goto out_put_map; goto out_put_map;
} }
} }
...@@ -855,7 +857,7 @@ static int __init gntdev_init(void) ...@@ -855,7 +857,7 @@ static int __init gntdev_init(void)
err = misc_register(&gntdev_miscdev); err = misc_register(&gntdev_miscdev);
if (err != 0) { if (err != 0) {
printk(KERN_ERR "Could not register gntdev device\n"); pr_err("Could not register gntdev device\n");
return err; return err;
} }
return 0; return 0;
......
...@@ -31,6 +31,8 @@ ...@@ -31,6 +31,8 @@
* IN THE SOFTWARE. * IN THE SOFTWARE.
*/ */
#define pr_fmt(fmt) "xen:" KBUILD_MODNAME ": " fmt
#include <linux/module.h> #include <linux/module.h>
#include <linux/sched.h> #include <linux/sched.h>
#include <linux/mm.h> #include <linux/mm.h>
...@@ -508,8 +510,7 @@ static void gnttab_handle_deferred(unsigned long unused) ...@@ -508,8 +510,7 @@ static void gnttab_handle_deferred(unsigned long unused)
entry = NULL; entry = NULL;
} else { } else {
if (!--entry->warn_delay) if (!--entry->warn_delay)
pr_info("g.e. %#x still pending\n", pr_info("g.e. %#x still pending\n", entry->ref);
entry->ref);
if (!first) if (!first)
first = entry; first = entry;
} }
...@@ -838,7 +839,7 @@ gnttab_retry_eagain_gop(unsigned int cmd, void *gop, int16_t *status, ...@@ -838,7 +839,7 @@ gnttab_retry_eagain_gop(unsigned int cmd, void *gop, int16_t *status,
} while ((*status == GNTST_eagain) && (delay < MAX_DELAY)); } while ((*status == GNTST_eagain) && (delay < MAX_DELAY));
if (delay >= MAX_DELAY) { if (delay >= MAX_DELAY) {
printk(KERN_ERR "%s: %s eagain grant\n", func, current->comm); pr_err("%s: %s eagain grant\n", func, current->comm);
*status = GNTST_bad_page; *status = GNTST_bad_page;
} }
} }
...@@ -1048,8 +1049,8 @@ static int gnttab_map(unsigned int start_idx, unsigned int end_idx) ...@@ -1048,8 +1049,8 @@ static int gnttab_map(unsigned int start_idx, unsigned int end_idx)
xatp.gpfn = (xen_hvm_resume_frames >> PAGE_SHIFT) + i; xatp.gpfn = (xen_hvm_resume_frames >> PAGE_SHIFT) + i;
rc = HYPERVISOR_memory_op(XENMEM_add_to_physmap, &xatp); rc = HYPERVISOR_memory_op(XENMEM_add_to_physmap, &xatp);
if (rc != 0) { if (rc != 0) {
printk(KERN_WARNING pr_warn("grant table add_to_physmap failed, err=%d\n",
"grant table add_to_physmap failed, err=%d\n", rc); rc);
break; break;
} }
} while (i-- > start_idx); } while (i-- > start_idx);
...@@ -1131,8 +1132,7 @@ static void gnttab_request_version(void) ...@@ -1131,8 +1132,7 @@ static void gnttab_request_version(void)
grefs_per_grant_frame = PAGE_SIZE / sizeof(struct grant_entry_v1); grefs_per_grant_frame = PAGE_SIZE / sizeof(struct grant_entry_v1);
gnttab_interface = &gnttab_v1_ops; gnttab_interface = &gnttab_v1_ops;
} }
printk(KERN_INFO "Grant tables using version %d layout.\n", pr_info("Grant tables using version %d layout\n", grant_table_version);
grant_table_version);
} }
static int gnttab_setup(void) static int gnttab_setup(void)
...@@ -1150,8 +1150,7 @@ static int gnttab_setup(void) ...@@ -1150,8 +1150,7 @@ static int gnttab_setup(void)
gnttab_shared.addr = xen_remap(xen_hvm_resume_frames, gnttab_shared.addr = xen_remap(xen_hvm_resume_frames,
PAGE_SIZE * max_nr_gframes); PAGE_SIZE * max_nr_gframes);
if (gnttab_shared.addr == NULL) { if (gnttab_shared.addr == NULL) {
printk(KERN_WARNING pr_warn("Failed to ioremap gnttab share frames!\n");
"Failed to ioremap gnttab share frames!");
return -ENOMEM; return -ENOMEM;
} }
} }
......
/* /*
* Handle extern requests for shutdown, reboot and sysrq * Handle extern requests for shutdown, reboot and sysrq
*/ */
#define pr_fmt(fmt) "xen:" KBUILD_MODNAME ": " fmt
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/err.h> #include <linux/err.h>
#include <linux/slab.h> #include <linux/slab.h>
...@@ -73,8 +76,7 @@ static int xen_suspend(void *data) ...@@ -73,8 +76,7 @@ static int xen_suspend(void *data)
err = syscore_suspend(); err = syscore_suspend();
if (err) { if (err) {
printk(KERN_ERR "xen_suspend: system core suspend failed: %d\n", pr_err("%s: system core suspend failed: %d\n", __func__, err);
err);
return err; return err;
} }
...@@ -115,14 +117,14 @@ static void do_suspend(void) ...@@ -115,14 +117,14 @@ static void do_suspend(void)
during suspend. */ during suspend. */
err = freeze_processes(); err = freeze_processes();
if (err) { if (err) {
printk(KERN_ERR "xen suspend: freeze failed %d\n", err); pr_err("%s: freeze failed %d\n", __func__, err);
goto out; goto out;
} }
#endif #endif
err = dpm_suspend_start(PMSG_FREEZE); err = dpm_suspend_start(PMSG_FREEZE);
if (err) { if (err) {
printk(KERN_ERR "xen suspend: dpm_suspend_start %d\n", err); pr_err("%s: dpm_suspend_start %d\n", __func__, err);
goto out_thaw; goto out_thaw;
} }
...@@ -131,7 +133,7 @@ static void do_suspend(void) ...@@ -131,7 +133,7 @@ static void do_suspend(void)
err = dpm_suspend_end(PMSG_FREEZE); err = dpm_suspend_end(PMSG_FREEZE);
if (err) { if (err) {
printk(KERN_ERR "dpm_suspend_end failed: %d\n", err); pr_err("dpm_suspend_end failed: %d\n", err);
si.cancelled = 0; si.cancelled = 0;
goto out_resume; goto out_resume;
} }
...@@ -153,7 +155,7 @@ static void do_suspend(void) ...@@ -153,7 +155,7 @@ static void do_suspend(void)
dpm_resume_start(si.cancelled ? PMSG_THAW : PMSG_RESTORE); dpm_resume_start(si.cancelled ? PMSG_THAW : PMSG_RESTORE);
if (err) { if (err) {
printk(KERN_ERR "failed to start xen_suspend: %d\n", err); pr_err("failed to start xen_suspend: %d\n", err);
si.cancelled = 1; si.cancelled = 1;
} }
...@@ -245,7 +247,7 @@ static void shutdown_handler(struct xenbus_watch *watch, ...@@ -245,7 +247,7 @@ static void shutdown_handler(struct xenbus_watch *watch,
if (handler->cb) { if (handler->cb) {
handler->cb(); handler->cb();
} else { } else {
printk(KERN_INFO "Ignoring shutdown request: %s\n", str); pr_info("Ignoring shutdown request: %s\n", str);
shutting_down = SHUTDOWN_INVALID; shutting_down = SHUTDOWN_INVALID;
} }
...@@ -265,8 +267,7 @@ static void sysrq_handler(struct xenbus_watch *watch, const char **vec, ...@@ -265,8 +267,7 @@ static void sysrq_handler(struct xenbus_watch *watch, const char **vec,
if (err) if (err)
return; return;
if (!xenbus_scanf(xbt, "control", "sysrq", "%c", &sysrq_key)) { if (!xenbus_scanf(xbt, "control", "sysrq", "%c", &sysrq_key)) {
printk(KERN_ERR "Unable to read sysrq code in " pr_err("Unable to read sysrq code in control/sysrq\n");
"control/sysrq\n");
xenbus_transaction_end(xbt, 1); xenbus_transaction_end(xbt, 1);
return; return;
} }
...@@ -299,14 +300,14 @@ static int setup_shutdown_watcher(void) ...@@ -299,14 +300,14 @@ static int setup_shutdown_watcher(void)
err = register_xenbus_watch(&shutdown_watch); err = register_xenbus_watch(&shutdown_watch);
if (err) { if (err) {
printk(KERN_ERR "Failed to set shutdown watcher\n"); pr_err("Failed to set shutdown watcher\n");
return err; return err;
} }
#ifdef CONFIG_MAGIC_SYSRQ #ifdef CONFIG_MAGIC_SYSRQ
err = register_xenbus_watch(&sysrq_watch); err = register_xenbus_watch(&sysrq_watch);
if (err) { if (err) {
printk(KERN_ERR "Failed to set sysrq watcher\n"); pr_err("Failed to set sysrq watcher\n");
return err; return err;
} }
#endif #endif
......
...@@ -32,6 +32,8 @@ ...@@ -32,6 +32,8 @@
* IN THE SOFTWARE. * IN THE SOFTWARE.
*/ */
#define pr_fmt(fmt) "xen_mcelog: " fmt
#include <linux/init.h> #include <linux/init.h>
#include <linux/types.h> #include <linux/types.h>
#include <linux/kernel.h> #include <linux/kernel.h>
...@@ -51,8 +53,6 @@ ...@@ -51,8 +53,6 @@
#include <asm/xen/hypercall.h> #include <asm/xen/hypercall.h>
#include <asm/xen/hypervisor.h> #include <asm/xen/hypervisor.h>
#define XEN_MCELOG "xen_mcelog: "
static struct mc_info g_mi; static struct mc_info g_mi;
static struct mcinfo_logical_cpu *g_physinfo; static struct mcinfo_logical_cpu *g_physinfo;
static uint32_t ncpus; static uint32_t ncpus;
...@@ -227,7 +227,7 @@ static int convert_log(struct mc_info *mi) ...@@ -227,7 +227,7 @@ static int convert_log(struct mc_info *mi)
mic = NULL; mic = NULL;
x86_mcinfo_lookup(&mic, mi, MC_TYPE_GLOBAL); x86_mcinfo_lookup(&mic, mi, MC_TYPE_GLOBAL);
if (unlikely(!mic)) { if (unlikely(!mic)) {
pr_warning(XEN_MCELOG "Failed to find global error info\n"); pr_warn("Failed to find global error info\n");
return -ENODEV; return -ENODEV;
} }
...@@ -241,8 +241,7 @@ static int convert_log(struct mc_info *mi) ...@@ -241,8 +241,7 @@ static int convert_log(struct mc_info *mi)
if (g_physinfo[i].mc_apicid == m.apicid) if (g_physinfo[i].mc_apicid == m.apicid)
break; break;
if (unlikely(i == ncpus)) { if (unlikely(i == ncpus)) {
pr_warning(XEN_MCELOG "Failed to match cpu with apicid %d\n", pr_warn("Failed to match cpu with apicid %d\n", m.apicid);
m.apicid);
return -ENODEV; return -ENODEV;
} }
...@@ -254,7 +253,7 @@ static int convert_log(struct mc_info *mi) ...@@ -254,7 +253,7 @@ static int convert_log(struct mc_info *mi)
mic = NULL; mic = NULL;
x86_mcinfo_lookup(&mic, mi, MC_TYPE_BANK); x86_mcinfo_lookup(&mic, mi, MC_TYPE_BANK);
if (unlikely(!mic)) { if (unlikely(!mic)) {
pr_warning(XEN_MCELOG "Fail to find bank error info\n"); pr_warn("Fail to find bank error info\n");
return -ENODEV; return -ENODEV;
} }
...@@ -295,9 +294,8 @@ static int mc_queue_handle(uint32_t flags) ...@@ -295,9 +294,8 @@ static int mc_queue_handle(uint32_t flags)
mc_op.u.mc_fetch.flags = flags; mc_op.u.mc_fetch.flags = flags;
ret = HYPERVISOR_mca(&mc_op); ret = HYPERVISOR_mca(&mc_op);
if (ret) { if (ret) {
pr_err(XEN_MCELOG "Failed to fetch %s error log\n", pr_err("Failed to fetch %surgent error log\n",
(flags == XEN_MC_URGENT) ? flags == XEN_MC_URGENT ? "" : "non");
"urgnet" : "nonurgent");
break; break;
} }
...@@ -307,15 +305,12 @@ static int mc_queue_handle(uint32_t flags) ...@@ -307,15 +305,12 @@ static int mc_queue_handle(uint32_t flags)
else { else {
ret = convert_log(&g_mi); ret = convert_log(&g_mi);
if (ret) if (ret)
pr_warning(XEN_MCELOG pr_warn("Failed to convert this error log, continue acking it anyway\n");
"Failed to convert this error log, "
"continue acking it anyway\n");
mc_op.u.mc_fetch.flags = flags | XEN_MC_ACK; mc_op.u.mc_fetch.flags = flags | XEN_MC_ACK;
ret = HYPERVISOR_mca(&mc_op); ret = HYPERVISOR_mca(&mc_op);
if (ret) { if (ret) {
pr_err(XEN_MCELOG pr_err("Failed to ack previous error log\n");
"Failed to ack previous error log\n");
break; break;
} }
} }
...@@ -334,15 +329,12 @@ static void xen_mce_work_fn(struct work_struct *work) ...@@ -334,15 +329,12 @@ static void xen_mce_work_fn(struct work_struct *work)
/* urgent mc_info */ /* urgent mc_info */
err = mc_queue_handle(XEN_MC_URGENT); err = mc_queue_handle(XEN_MC_URGENT);
if (err) if (err)
pr_err(XEN_MCELOG pr_err("Failed to handle urgent mc_info queue, continue handling nonurgent mc_info queue anyway\n");
"Failed to handle urgent mc_info queue, "
"continue handling nonurgent mc_info queue anyway.\n");
/* nonurgent mc_info */ /* nonurgent mc_info */
err = mc_queue_handle(XEN_MC_NONURGENT); err = mc_queue_handle(XEN_MC_NONURGENT);
if (err) if (err)
pr_err(XEN_MCELOG pr_err("Failed to handle nonurgent mc_info queue\n");
"Failed to handle nonurgent mc_info queue.\n");
/* wake processes polling /dev/mcelog */ /* wake processes polling /dev/mcelog */
wake_up_interruptible(&xen_mce_chrdev_wait); wake_up_interruptible(&xen_mce_chrdev_wait);
...@@ -370,7 +362,7 @@ static int bind_virq_for_mce(void) ...@@ -370,7 +362,7 @@ static int bind_virq_for_mce(void)
set_xen_guest_handle(mc_op.u.mc_physcpuinfo.info, g_physinfo); set_xen_guest_handle(mc_op.u.mc_physcpuinfo.info, g_physinfo);
ret = HYPERVISOR_mca(&mc_op); ret = HYPERVISOR_mca(&mc_op);
if (ret) { if (ret) {
pr_err(XEN_MCELOG "Failed to get CPU numbers\n"); pr_err("Failed to get CPU numbers\n");
return ret; return ret;
} }
...@@ -383,7 +375,7 @@ static int bind_virq_for_mce(void) ...@@ -383,7 +375,7 @@ static int bind_virq_for_mce(void)
set_xen_guest_handle(mc_op.u.mc_physcpuinfo.info, g_physinfo); set_xen_guest_handle(mc_op.u.mc_physcpuinfo.info, g_physinfo);
ret = HYPERVISOR_mca(&mc_op); ret = HYPERVISOR_mca(&mc_op);
if (ret) { if (ret) {
pr_err(XEN_MCELOG "Failed to get CPU info\n"); pr_err("Failed to get CPU info\n");
kfree(g_physinfo); kfree(g_physinfo);
return ret; return ret;
} }
...@@ -391,7 +383,7 @@ static int bind_virq_for_mce(void) ...@@ -391,7 +383,7 @@ static int bind_virq_for_mce(void)
ret = bind_virq_to_irqhandler(VIRQ_MCA, 0, ret = bind_virq_to_irqhandler(VIRQ_MCA, 0,
xen_mce_interrupt, 0, "mce", NULL); xen_mce_interrupt, 0, "mce", NULL);
if (ret < 0) { if (ret < 0) {
pr_err(XEN_MCELOG "Failed to bind virq\n"); pr_err("Failed to bind virq\n");
kfree(g_physinfo); kfree(g_physinfo);
return ret; return ret;
} }
......
...@@ -31,6 +31,8 @@ ...@@ -31,6 +31,8 @@
* IN THE SOFTWARE. * IN THE SOFTWARE.
*/ */
#define pr_fmt(fmt) "xen_cpu: " fmt
#include <linux/interrupt.h> #include <linux/interrupt.h>
#include <linux/spinlock.h> #include <linux/spinlock.h>
#include <linux/cpu.h> #include <linux/cpu.h>
...@@ -44,7 +46,6 @@ ...@@ -44,7 +46,6 @@
#include <asm/xen/hypervisor.h> #include <asm/xen/hypervisor.h>
#include <asm/xen/hypercall.h> #include <asm/xen/hypercall.h>
#define XEN_PCPU "xen_cpu: "
/* /*
* @cpu_id: Xen physical cpu logic number * @cpu_id: Xen physical cpu logic number
...@@ -242,8 +243,7 @@ static struct pcpu *create_and_register_pcpu(struct xenpf_pcpuinfo *info) ...@@ -242,8 +243,7 @@ static struct pcpu *create_and_register_pcpu(struct xenpf_pcpuinfo *info)
err = register_pcpu(pcpu); err = register_pcpu(pcpu);
if (err) { if (err) {
pr_warning(XEN_PCPU "Failed to register pcpu%u\n", pr_warn("Failed to register pcpu%u\n", info->xen_cpuid);
info->xen_cpuid);
return ERR_PTR(-ENOENT); return ERR_PTR(-ENOENT);
} }
...@@ -378,19 +378,19 @@ static int __init xen_pcpu_init(void) ...@@ -378,19 +378,19 @@ static int __init xen_pcpu_init(void)
xen_pcpu_interrupt, 0, xen_pcpu_interrupt, 0,
"xen-pcpu", NULL); "xen-pcpu", NULL);
if (irq < 0) { if (irq < 0) {
pr_warning(XEN_PCPU "Failed to bind pcpu virq\n"); pr_warn("Failed to bind pcpu virq\n");
return irq; return irq;
} }
ret = subsys_system_register(&xen_pcpu_subsys, NULL); ret = subsys_system_register(&xen_pcpu_subsys, NULL);
if (ret) { if (ret) {
pr_warning(XEN_PCPU "Failed to register pcpu subsys\n"); pr_warn("Failed to register pcpu subsys\n");
goto err1; goto err1;
} }
ret = xen_sync_pcpus(); ret = xen_sync_pcpus();
if (ret) { if (ret) {
pr_warning(XEN_PCPU "Failed to sync pcpu info\n"); pr_warn("Failed to sync pcpu info\n");
goto err2; goto err2;
} }
......
...@@ -6,6 +6,8 @@ ...@@ -6,6 +6,8 @@
* Copyright (c) 2002-2004, K A Fraser, B Dragovic * Copyright (c) 2002-2004, K A Fraser, B Dragovic
*/ */
#define pr_fmt(fmt) "xen:" KBUILD_MODNAME ": " fmt
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/module.h> #include <linux/module.h>
#include <linux/sched.h> #include <linux/sched.h>
...@@ -565,7 +567,7 @@ static int __init privcmd_init(void) ...@@ -565,7 +567,7 @@ static int __init privcmd_init(void)
err = misc_register(&privcmd_dev); err = misc_register(&privcmd_dev);
if (err != 0) { if (err != 0) {
printk(KERN_ERR "Could not register Xen privcmd device\n"); pr_err("Could not register Xen privcmd device\n");
return err; return err;
} }
return 0; return 0;
......
...@@ -33,6 +33,8 @@ ...@@ -33,6 +33,8 @@
* *
*/ */
#define pr_fmt(fmt) "xen:" KBUILD_MODNAME ": " fmt
#include <linux/bootmem.h> #include <linux/bootmem.h>
#include <linux/dma-mapping.h> #include <linux/dma-mapping.h>
#include <linux/export.h> #include <linux/export.h>
...@@ -202,8 +204,8 @@ int __ref xen_swiotlb_init(int verbose, bool early) ...@@ -202,8 +204,8 @@ int __ref xen_swiotlb_init(int verbose, bool early)
order--; order--;
} }
if (order != get_order(bytes)) { if (order != get_order(bytes)) {
pr_warn("Warning: only able to allocate %ld MB " pr_warn("Warning: only able to allocate %ld MB for software IO TLB\n",
"for software IO TLB\n", (PAGE_SIZE << order) >> 20); (PAGE_SIZE << order) >> 20);
xen_io_tlb_nslabs = SLABS_PER_PAGE << order; xen_io_tlb_nslabs = SLABS_PER_PAGE << order;
bytes = xen_io_tlb_nslabs << IO_TLB_SHIFT; bytes = xen_io_tlb_nslabs << IO_TLB_SHIFT;
} }
...@@ -242,11 +244,11 @@ int __ref xen_swiotlb_init(int verbose, bool early) ...@@ -242,11 +244,11 @@ int __ref xen_swiotlb_init(int verbose, bool early)
if (repeat--) { if (repeat--) {
xen_io_tlb_nslabs = max(1024UL, /* Min is 2MB */ xen_io_tlb_nslabs = max(1024UL, /* Min is 2MB */
(xen_io_tlb_nslabs >> 1)); (xen_io_tlb_nslabs >> 1));
printk(KERN_INFO "Xen-SWIOTLB: Lowering to %luMB\n", pr_info("Lowering to %luMB\n",
(xen_io_tlb_nslabs << IO_TLB_SHIFT) >> 20); (xen_io_tlb_nslabs << IO_TLB_SHIFT) >> 20);
goto retry; goto retry;
} }
pr_err("%s (rc:%d)", xen_swiotlb_error(m_ret), rc); pr_err("%s (rc:%d)\n", xen_swiotlb_error(m_ret), rc);
if (early) if (early)
panic("%s (rc:%d)", xen_swiotlb_error(m_ret), rc); panic("%s (rc:%d)", xen_swiotlb_error(m_ret), rc);
else else
......
...@@ -5,6 +5,8 @@ ...@@ -5,6 +5,8 @@
* Author: Dan Magenheimer * Author: Dan Magenheimer
*/ */
#define pr_fmt(fmt) "xen:" KBUILD_MODNAME ": " fmt
#include <linux/module.h> #include <linux/module.h>
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/types.h> #include <linux/types.h>
...@@ -388,8 +390,8 @@ static int xen_tmem_init(void) ...@@ -388,8 +390,8 @@ static int xen_tmem_init(void)
return PTR_ERR(old_ops); return PTR_ERR(old_ops);
s = " (WARNING: frontswap_ops overridden)"; s = " (WARNING: frontswap_ops overridden)";
} }
printk(KERN_INFO "frontswap enabled, RAM provided by " pr_info("frontswap enabled, RAM provided by Xen Transcendent Memory%s\n",
"Xen Transcendent Memory%s\n", s); s);
} }
#endif #endif
#ifdef CONFIG_CLEANCACHE #ifdef CONFIG_CLEANCACHE
...@@ -400,8 +402,8 @@ static int xen_tmem_init(void) ...@@ -400,8 +402,8 @@ static int xen_tmem_init(void)
cleancache_register_ops(&tmem_cleancache_ops); cleancache_register_ops(&tmem_cleancache_ops);
if (old_ops) if (old_ops)
s = " (WARNING: cleancache_ops overridden)"; s = " (WARNING: cleancache_ops overridden)";
printk(KERN_INFO "cleancache enabled, RAM provided by " pr_info("cleancache enabled, RAM provided by Xen Transcendent Memory%s\n",
"Xen Transcendent Memory%s\n", s); s);
} }
#endif #endif
#ifdef CONFIG_XEN_SELFBALLOONING #ifdef CONFIG_XEN_SELFBALLOONING
......
...@@ -15,6 +15,8 @@ ...@@ -15,6 +15,8 @@
* details. * details.
*/ */
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/module.h> #include <linux/module.h>
#include <linux/init.h> #include <linux/init.h>
......
...@@ -15,6 +15,8 @@ ...@@ -15,6 +15,8 @@
* details. * details.
*/ */
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/module.h> #include <linux/module.h>
#include <linux/init.h> #include <linux/init.h>
......
...@@ -14,6 +14,8 @@ ...@@ -14,6 +14,8 @@
* more details. * more details.
*/ */
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/types.h> #include <linux/types.h>
#include <acpi/acpi_bus.h> #include <acpi/acpi_bus.h>
......
...@@ -17,6 +17,8 @@ ...@@ -17,6 +17,8 @@
* *
*/ */
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
#include <linux/cpumask.h> #include <linux/cpumask.h>
#include <linux/cpufreq.h> #include <linux/cpufreq.h>
#include <linux/freezer.h> #include <linux/freezer.h>
...@@ -34,8 +36,6 @@ ...@@ -34,8 +36,6 @@
#include <xen/interface/platform.h> #include <xen/interface/platform.h>
#include <asm/xen/hypercall.h> #include <asm/xen/hypercall.h>
#define DRV_NAME "xen-acpi-processor: "
static int no_hypercall; static int no_hypercall;
MODULE_PARM_DESC(off, "Inhibit the hypercall."); MODULE_PARM_DESC(off, "Inhibit the hypercall.");
module_param_named(off, no_hypercall, int, 0400); module_param_named(off, no_hypercall, int, 0400);
...@@ -104,7 +104,7 @@ static int push_cxx_to_hypervisor(struct acpi_processor *_pr) ...@@ -104,7 +104,7 @@ static int push_cxx_to_hypervisor(struct acpi_processor *_pr)
set_xen_guest_handle(dst_cx->dp, NULL); set_xen_guest_handle(dst_cx->dp, NULL);
} }
if (!ok) { if (!ok) {
pr_debug(DRV_NAME "No _Cx for ACPI CPU %u\n", _pr->acpi_id); pr_debug("No _Cx for ACPI CPU %u\n", _pr->acpi_id);
kfree(dst_cx_states); kfree(dst_cx_states);
return -EINVAL; return -EINVAL;
} }
...@@ -133,7 +133,7 @@ static int push_cxx_to_hypervisor(struct acpi_processor *_pr) ...@@ -133,7 +133,7 @@ static int push_cxx_to_hypervisor(struct acpi_processor *_pr)
/* EINVAL means the ACPI ID is incorrect - meaning the ACPI /* EINVAL means the ACPI ID is incorrect - meaning the ACPI
* table is referencing a non-existing CPU - which can happen * table is referencing a non-existing CPU - which can happen
* with broken ACPI tables. */ * with broken ACPI tables. */
pr_err(DRV_NAME "(CX): Hypervisor error (%d) for ACPI CPU%u\n", pr_err("(CX): Hypervisor error (%d) for ACPI CPU%u\n",
ret, _pr->acpi_id); ret, _pr->acpi_id);
kfree(dst_cx_states); kfree(dst_cx_states);
...@@ -239,7 +239,7 @@ static int push_pxx_to_hypervisor(struct acpi_processor *_pr) ...@@ -239,7 +239,7 @@ static int push_pxx_to_hypervisor(struct acpi_processor *_pr)
dst_perf->flags |= XEN_PX_PSD; dst_perf->flags |= XEN_PX_PSD;
if (dst_perf->flags != (XEN_PX_PSD | XEN_PX_PSS | XEN_PX_PCT | XEN_PX_PPC)) { if (dst_perf->flags != (XEN_PX_PSD | XEN_PX_PSS | XEN_PX_PCT | XEN_PX_PPC)) {
pr_warn(DRV_NAME "ACPI CPU%u missing some P-state data (%x), skipping.\n", pr_warn("ACPI CPU%u missing some P-state data (%x), skipping\n",
_pr->acpi_id, dst_perf->flags); _pr->acpi_id, dst_perf->flags);
ret = -ENODEV; ret = -ENODEV;
goto err_free; goto err_free;
...@@ -265,7 +265,7 @@ static int push_pxx_to_hypervisor(struct acpi_processor *_pr) ...@@ -265,7 +265,7 @@ static int push_pxx_to_hypervisor(struct acpi_processor *_pr)
/* EINVAL means the ACPI ID is incorrect - meaning the ACPI /* EINVAL means the ACPI ID is incorrect - meaning the ACPI
* table is referencing a non-existing CPU - which can happen * table is referencing a non-existing CPU - which can happen
* with broken ACPI tables. */ * with broken ACPI tables. */
pr_warn(DRV_NAME "(_PXX): Hypervisor error (%d) for ACPI CPU%u\n", pr_warn("(_PXX): Hypervisor error (%d) for ACPI CPU%u\n",
ret, _pr->acpi_id); ret, _pr->acpi_id);
err_free: err_free:
if (!IS_ERR_OR_NULL(dst_states)) if (!IS_ERR_OR_NULL(dst_states))
...@@ -318,7 +318,7 @@ static unsigned int __init get_max_acpi_id(void) ...@@ -318,7 +318,7 @@ static unsigned int __init get_max_acpi_id(void)
max_acpi_id = max(info->acpi_id, max_acpi_id); max_acpi_id = max(info->acpi_id, max_acpi_id);
} }
max_acpi_id *= 2; /* Slack for CPU hotplug support. */ max_acpi_id *= 2; /* Slack for CPU hotplug support. */
pr_debug(DRV_NAME "Max ACPI ID: %u\n", max_acpi_id); pr_debug("Max ACPI ID: %u\n", max_acpi_id);
return max_acpi_id; return max_acpi_id;
} }
/* /*
...@@ -365,15 +365,14 @@ read_acpi_id(acpi_handle handle, u32 lvl, void *context, void **rv) ...@@ -365,15 +365,14 @@ read_acpi_id(acpi_handle handle, u32 lvl, void *context, void **rv)
/* There are more ACPI Processor objects than in x2APIC or MADT. /* There are more ACPI Processor objects than in x2APIC or MADT.
* This can happen with incorrect ACPI SSDT declerations. */ * This can happen with incorrect ACPI SSDT declerations. */
if (acpi_id > nr_acpi_bits) { if (acpi_id > nr_acpi_bits) {
pr_debug(DRV_NAME "We only have %u, trying to set %u\n", pr_debug("We only have %u, trying to set %u\n",
nr_acpi_bits, acpi_id); nr_acpi_bits, acpi_id);
return AE_OK; return AE_OK;
} }
/* OK, There is a ACPI Processor object */ /* OK, There is a ACPI Processor object */
__set_bit(acpi_id, acpi_id_present); __set_bit(acpi_id, acpi_id_present);
pr_debug(DRV_NAME "ACPI CPU%u w/ PBLK:0x%lx\n", acpi_id, pr_debug("ACPI CPU%u w/ PBLK:0x%lx\n", acpi_id, (unsigned long)pblk);
(unsigned long)pblk);
status = acpi_evaluate_object(handle, "_CST", NULL, &buffer); status = acpi_evaluate_object(handle, "_CST", NULL, &buffer);
if (ACPI_FAILURE(status)) { if (ACPI_FAILURE(status)) {
...@@ -476,7 +475,7 @@ static int xen_upload_processor_pm_data(void) ...@@ -476,7 +475,7 @@ static int xen_upload_processor_pm_data(void)
unsigned int i; unsigned int i;
int rc = 0; int rc = 0;
pr_info(DRV_NAME "Uploading Xen processor PM info\n"); pr_info("Uploading Xen processor PM info\n");
for_each_possible_cpu(i) { for_each_possible_cpu(i) {
struct acpi_processor *_pr; struct acpi_processor *_pr;
...@@ -523,7 +522,7 @@ static int __init xen_acpi_processor_init(void) ...@@ -523,7 +522,7 @@ static int __init xen_acpi_processor_init(void)
acpi_perf_data = alloc_percpu(struct acpi_processor_performance); acpi_perf_data = alloc_percpu(struct acpi_processor_performance);
if (!acpi_perf_data) { if (!acpi_perf_data) {
pr_debug(DRV_NAME "Memory allocation error for acpi_perf_data.\n"); pr_debug("Memory allocation error for acpi_perf_data\n");
kfree(acpi_ids_done); kfree(acpi_ids_done);
return -ENOMEM; return -ENOMEM;
} }
......
...@@ -30,6 +30,8 @@ ...@@ -30,6 +30,8 @@
* IN THE SOFTWARE. * IN THE SOFTWARE.
*/ */
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/module.h> #include <linux/module.h>
#include <linux/capability.h> #include <linux/capability.h>
...@@ -81,7 +83,7 @@ static int balloon_init_watcher(struct notifier_block *notifier, ...@@ -81,7 +83,7 @@ static int balloon_init_watcher(struct notifier_block *notifier,
err = register_xenbus_watch(&target_watch); err = register_xenbus_watch(&target_watch);
if (err) if (err)
printk(KERN_ERR "Failed to set balloon watcher\n"); pr_err("Failed to set balloon watcher\n");
return NOTIFY_DONE; return NOTIFY_DONE;
} }
...@@ -95,7 +97,7 @@ static int __init balloon_init(void) ...@@ -95,7 +97,7 @@ static int __init balloon_init(void)
if (!xen_domain()) if (!xen_domain())
return -ENODEV; return -ENODEV;
pr_info("xen-balloon: Initialising balloon driver.\n"); pr_info("Initialising balloon driver\n");
register_balloon(&balloon_dev); register_balloon(&balloon_dev);
......
...@@ -4,6 +4,8 @@ ...@@ -4,6 +4,8 @@
* Author: Ryan Wilson <hap9@epoch.ncsc.mil> * Author: Ryan Wilson <hap9@epoch.ncsc.mil>
*/ */
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/pci.h> #include <linux/pci.h>
#include "pciback.h" #include "pciback.h"
...@@ -75,9 +77,7 @@ static int command_write(struct pci_dev *dev, int offset, u16 value, void *data) ...@@ -75,9 +77,7 @@ static int command_write(struct pci_dev *dev, int offset, u16 value, void *data)
pci_name(dev)); pci_name(dev));
err = pci_set_mwi(dev); err = pci_set_mwi(dev);
if (err) { if (err) {
printk(KERN_WARNING pr_warn("%s: cannot enable memory-write-invalidate (%d)\n",
DRV_NAME ": %s: cannot enable "
"memory-write-invalidate (%d)\n",
pci_name(dev), err); pci_name(dev), err);
value &= ~PCI_COMMAND_INVALIDATE; value &= ~PCI_COMMAND_INVALIDATE;
} }
...@@ -91,7 +91,7 @@ static int rom_write(struct pci_dev *dev, int offset, u32 value, void *data) ...@@ -91,7 +91,7 @@ static int rom_write(struct pci_dev *dev, int offset, u32 value, void *data)
struct pci_bar_info *bar = data; struct pci_bar_info *bar = data;
if (unlikely(!bar)) { if (unlikely(!bar)) {
printk(KERN_WARNING DRV_NAME ": driver data not found for %s\n", pr_warn(DRV_NAME ": driver data not found for %s\n",
pci_name(dev)); pci_name(dev));
return XEN_PCI_ERR_op_failed; return XEN_PCI_ERR_op_failed;
} }
...@@ -125,7 +125,7 @@ static int bar_write(struct pci_dev *dev, int offset, u32 value, void *data) ...@@ -125,7 +125,7 @@ static int bar_write(struct pci_dev *dev, int offset, u32 value, void *data)
struct pci_bar_info *bar = data; struct pci_bar_info *bar = data;
if (unlikely(!bar)) { if (unlikely(!bar)) {
printk(KERN_WARNING DRV_NAME ": driver data not found for %s\n", pr_warn(DRV_NAME ": driver data not found for %s\n",
pci_name(dev)); pci_name(dev));
return XEN_PCI_ERR_op_failed; return XEN_PCI_ERR_op_failed;
} }
...@@ -153,7 +153,7 @@ static int bar_read(struct pci_dev *dev, int offset, u32 * value, void *data) ...@@ -153,7 +153,7 @@ static int bar_read(struct pci_dev *dev, int offset, u32 * value, void *data)
struct pci_bar_info *bar = data; struct pci_bar_info *bar = data;
if (unlikely(!bar)) { if (unlikely(!bar)) {
printk(KERN_WARNING DRV_NAME ": driver data not found for %s\n", pr_warn(DRV_NAME ": driver data not found for %s\n",
pci_name(dev)); pci_name(dev));
return XEN_PCI_ERR_op_failed; return XEN_PCI_ERR_op_failed;
} }
...@@ -375,7 +375,7 @@ int xen_pcibk_config_header_add_fields(struct pci_dev *dev) ...@@ -375,7 +375,7 @@ int xen_pcibk_config_header_add_fields(struct pci_dev *dev)
default: default:
err = -EINVAL; err = -EINVAL;
printk(KERN_ERR DRV_NAME ": %s: Unsupported header type %d!\n", pr_err("%s: Unsupported header type %d!\n",
pci_name(dev), dev->hdr_type); pci_name(dev), dev->hdr_type);
break; break;
} }
......
...@@ -4,6 +4,9 @@ ...@@ -4,6 +4,9 @@
* Ryan Wilson <hap9@epoch.ncsc.mil> * Ryan Wilson <hap9@epoch.ncsc.mil>
* Chris Bookholt <hap10@epoch.ncsc.mil> * Chris Bookholt <hap10@epoch.ncsc.mil>
*/ */
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
#include <linux/module.h> #include <linux/module.h>
#include <linux/init.h> #include <linux/init.h>
#include <linux/rwsem.h> #include <linux/rwsem.h>
...@@ -425,8 +428,6 @@ static int __init pcistub_init_devices_late(void) ...@@ -425,8 +428,6 @@ static int __init pcistub_init_devices_late(void)
unsigned long flags; unsigned long flags;
int err = 0; int err = 0;
pr_debug(DRV_NAME ": pcistub_init_devices_late\n");
spin_lock_irqsave(&pcistub_devices_lock, flags); spin_lock_irqsave(&pcistub_devices_lock, flags);
while (!list_empty(&seized_devices)) { while (!list_empty(&seized_devices)) {
...@@ -544,15 +545,11 @@ static void pcistub_remove(struct pci_dev *dev) ...@@ -544,15 +545,11 @@ static void pcistub_remove(struct pci_dev *dev)
found_psdev->pdev); found_psdev->pdev);
if (found_psdev->pdev) { if (found_psdev->pdev) {
printk(KERN_WARNING DRV_NAME ": ****** removing device " pr_warn("****** removing device %s while still in-use! ******\n",
"%s while still in-use! ******\n",
pci_name(found_psdev->dev)); pci_name(found_psdev->dev));
printk(KERN_WARNING DRV_NAME ": ****** driver domain may" pr_warn("****** driver domain may still access this device's i/o resources!\n");
" still access this device's i/o resources!\n"); pr_warn("****** shutdown driver domain before binding device\n");
printk(KERN_WARNING DRV_NAME ": ****** shutdown driver " pr_warn("****** to other drivers or domains\n");
"domain before binding device\n");
printk(KERN_WARNING DRV_NAME ": ****** to other drivers "
"or domains\n");
xen_pcibk_release_pci_dev(found_psdev->pdev, xen_pcibk_release_pci_dev(found_psdev->pdev,
found_psdev->dev); found_psdev->dev);
...@@ -1018,7 +1015,7 @@ static int pcistub_device_id_add(int domain, int bus, int slot, int func) ...@@ -1018,7 +1015,7 @@ static int pcistub_device_id_add(int domain, int bus, int slot, int func)
pci_dev_id->bus = bus; pci_dev_id->bus = bus;
pci_dev_id->devfn = devfn; pci_dev_id->devfn = devfn;
pr_debug(DRV_NAME ": wants to seize %04x:%02x:%02x.%d\n", pr_debug("wants to seize %04x:%02x:%02x.%d\n",
domain, bus, slot, func); domain, bus, slot, func);
spin_lock_irqsave(&device_ids_lock, flags); spin_lock_irqsave(&device_ids_lock, flags);
...@@ -1048,8 +1045,8 @@ static int pcistub_device_id_remove(int domain, int bus, int slot, int func) ...@@ -1048,8 +1045,8 @@ static int pcistub_device_id_remove(int domain, int bus, int slot, int func)
err = 0; err = 0;
pr_debug(DRV_NAME ": removed %04x:%02x:%02x.%d from " pr_debug("removed %04x:%02x:%02x.%d from seize list\n",
"seize list\n", domain, bus, slot, func); domain, bus, slot, func);
} }
} }
spin_unlock_irqrestore(&device_ids_lock, flags); spin_unlock_irqrestore(&device_ids_lock, flags);
...@@ -1474,7 +1471,7 @@ static int __init pcistub_init(void) ...@@ -1474,7 +1471,7 @@ static int __init pcistub_init(void)
return err; return err;
parse_error: parse_error:
printk(KERN_ERR DRV_NAME ": Error parsing pci_devs_to_hide at \"%s\"\n", pr_err("Error parsing pci_devs_to_hide at \"%s\"\n",
pci_devs_to_hide + pos); pci_devs_to_hide + pos);
return -EINVAL; return -EINVAL;
} }
......
...@@ -3,6 +3,9 @@ ...@@ -3,6 +3,9 @@
* *
* Author: Ryan Wilson <hap9@epoch.ncsc.mil> * Author: Ryan Wilson <hap9@epoch.ncsc.mil>
*/ */
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
#include <linux/module.h> #include <linux/module.h>
#include <linux/wait.h> #include <linux/wait.h>
#include <linux/bitops.h> #include <linux/bitops.h>
...@@ -144,7 +147,7 @@ int xen_pcibk_enable_msi(struct xen_pcibk_device *pdev, ...@@ -144,7 +147,7 @@ int xen_pcibk_enable_msi(struct xen_pcibk_device *pdev,
status = pci_enable_msi(dev); status = pci_enable_msi(dev);
if (status) { if (status) {
pr_warn_ratelimited(DRV_NAME ": %s: error enabling MSI for guest %u: err %d\n", pr_warn_ratelimited("%s: error enabling MSI for guest %u: err %d\n",
pci_name(dev), pdev->xdev->otherend_id, pci_name(dev), pdev->xdev->otherend_id,
status); status);
op->value = 0; op->value = 0;
...@@ -225,7 +228,7 @@ int xen_pcibk_enable_msix(struct xen_pcibk_device *pdev, ...@@ -225,7 +228,7 @@ int xen_pcibk_enable_msix(struct xen_pcibk_device *pdev,
op->msix_entries[i].vector); op->msix_entries[i].vector);
} }
} else } else
pr_warn_ratelimited(DRV_NAME ": %s: error enabling MSI-X for guest %u: err %d!\n", pr_warn_ratelimited("%s: error enabling MSI-X for guest %u: err %d!\n",
pci_name(dev), pdev->xdev->otherend_id, pci_name(dev), pdev->xdev->otherend_id,
result); result);
kfree(entries); kfree(entries);
...@@ -372,7 +375,7 @@ static irqreturn_t xen_pcibk_guest_interrupt(int irq, void *dev_id) ...@@ -372,7 +375,7 @@ static irqreturn_t xen_pcibk_guest_interrupt(int irq, void *dev_id)
dev_data->handled++; dev_data->handled++;
if ((dev_data->handled % 1000) == 0) { if ((dev_data->handled % 1000) == 0) {
if (xen_test_irq_shared(irq)) { if (xen_test_irq_shared(irq)) {
printk(KERN_INFO "%s IRQ line is not shared " pr_info("%s IRQ line is not shared "
"with other domains. Turning ISR off\n", "with other domains. Turning ISR off\n",
dev_data->irq_name); dev_data->irq_name);
dev_data->ack_intr = 0; dev_data->ack_intr = 0;
......
...@@ -5,6 +5,8 @@ ...@@ -5,6 +5,8 @@
* Author: Ryan Wilson <hap9@epoch.ncsc.mil> * Author: Ryan Wilson <hap9@epoch.ncsc.mil>
*/ */
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
#include <linux/list.h> #include <linux/list.h>
#include <linux/slab.h> #include <linux/slab.h>
#include <linux/pci.h> #include <linux/pci.h>
...@@ -102,8 +104,7 @@ static int __xen_pcibk_add_pci_dev(struct xen_pcibk_device *pdev, ...@@ -102,8 +104,7 @@ static int __xen_pcibk_add_pci_dev(struct xen_pcibk_device *pdev,
struct pci_dev_entry, list); struct pci_dev_entry, list);
if (match_slot(dev, t->dev)) { if (match_slot(dev, t->dev)) {
pr_info(DRV_NAME ": vpci: %s: " pr_info("vpci: %s: assign to virtual slot %d func %d\n",
"assign to virtual slot %d func %d\n",
pci_name(dev), slot, pci_name(dev), slot,
PCI_FUNC(dev->devfn)); PCI_FUNC(dev->devfn));
list_add_tail(&dev_entry->list, list_add_tail(&dev_entry->list,
...@@ -117,8 +118,7 @@ static int __xen_pcibk_add_pci_dev(struct xen_pcibk_device *pdev, ...@@ -117,8 +118,7 @@ static int __xen_pcibk_add_pci_dev(struct xen_pcibk_device *pdev,
/* Assign to a new slot on the virtual PCI bus */ /* Assign to a new slot on the virtual PCI bus */
for (slot = 0; slot < PCI_SLOT_MAX; slot++) { for (slot = 0; slot < PCI_SLOT_MAX; slot++) {
if (list_empty(&vpci_dev->dev_list[slot])) { if (list_empty(&vpci_dev->dev_list[slot])) {
printk(KERN_INFO DRV_NAME pr_info("vpci: %s: assign to virtual slot %d\n",
": vpci: %s: assign to virtual slot %d\n",
pci_name(dev), slot); pci_name(dev), slot);
list_add_tail(&dev_entry->list, list_add_tail(&dev_entry->list,
&vpci_dev->dev_list[slot]); &vpci_dev->dev_list[slot]);
......
...@@ -3,6 +3,9 @@ ...@@ -3,6 +3,9 @@
* *
* Author: Ryan Wilson <hap9@epoch.ncsc.mil> * Author: Ryan Wilson <hap9@epoch.ncsc.mil>
*/ */
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
#include <linux/module.h> #include <linux/module.h>
#include <linux/init.h> #include <linux/init.h>
#include <linux/list.h> #include <linux/list.h>
...@@ -723,14 +726,13 @@ int __init xen_pcibk_xenbus_register(void) ...@@ -723,14 +726,13 @@ int __init xen_pcibk_xenbus_register(void)
{ {
xen_pcibk_wq = create_workqueue("xen_pciback_workqueue"); xen_pcibk_wq = create_workqueue("xen_pciback_workqueue");
if (!xen_pcibk_wq) { if (!xen_pcibk_wq) {
printk(KERN_ERR "%s: create" pr_err("%s: create xen_pciback_workqueue failed\n", __func__);
"xen_pciback_workqueue failed\n", __func__);
return -EFAULT; return -EFAULT;
} }
xen_pcibk_backend = &xen_pcibk_vpci_backend; xen_pcibk_backend = &xen_pcibk_vpci_backend;
if (passthrough) if (passthrough)
xen_pcibk_backend = &xen_pcibk_passthrough_backend; xen_pcibk_backend = &xen_pcibk_passthrough_backend;
pr_info(DRV_NAME ": backend is %s\n", xen_pcibk_backend->name); pr_info("backend is %s\n", xen_pcibk_backend->name);
return xenbus_register_backend(&xen_pcibk_driver); return xenbus_register_backend(&xen_pcibk_driver);
} }
......
...@@ -64,6 +64,8 @@ ...@@ -64,6 +64,8 @@
* *
*/ */
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/bootmem.h> #include <linux/bootmem.h>
#include <linux/swap.h> #include <linux/swap.h>
...@@ -510,22 +512,19 @@ int xen_selfballoon_init(bool use_selfballooning, bool use_frontswap_selfshrink) ...@@ -510,22 +512,19 @@ int xen_selfballoon_init(bool use_selfballooning, bool use_frontswap_selfshrink)
return -ENODEV; return -ENODEV;
if (xen_initial_domain()) { if (xen_initial_domain()) {
pr_info("xen/balloon: Xen selfballooning driver " pr_info("Xen selfballooning driver disabled for domain0\n");
"disabled for domain0.\n");
return -ENODEV; return -ENODEV;
} }
xen_selfballooning_enabled = tmem_enabled && use_selfballooning; xen_selfballooning_enabled = tmem_enabled && use_selfballooning;
if (xen_selfballooning_enabled) { if (xen_selfballooning_enabled) {
pr_info("xen/balloon: Initializing Xen " pr_info("Initializing Xen selfballooning driver\n");
"selfballooning driver.\n");
enable = true; enable = true;
} }
#ifdef CONFIG_FRONTSWAP #ifdef CONFIG_FRONTSWAP
frontswap_selfshrinking = tmem_enabled && use_frontswap_selfshrink; frontswap_selfshrinking = tmem_enabled && use_frontswap_selfshrink;
if (frontswap_selfshrinking) { if (frontswap_selfshrinking) {
pr_info("xen/balloon: Initializing frontswap " pr_info("Initializing frontswap selfshrinking driver\n");
"selfshrinking driver.\n");
enable = true; enable = true;
} }
#endif #endif
......
...@@ -30,6 +30,8 @@ ...@@ -30,6 +30,8 @@
* IN THE SOFTWARE. * IN THE SOFTWARE.
*/ */
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
#include <linux/wait.h> #include <linux/wait.h>
#include <linux/interrupt.h> #include <linux/interrupt.h>
#include <linux/sched.h> #include <linux/sched.h>
...@@ -205,12 +207,11 @@ int xb_init_comms(void) ...@@ -205,12 +207,11 @@ int xb_init_comms(void)
struct xenstore_domain_interface *intf = xen_store_interface; struct xenstore_domain_interface *intf = xen_store_interface;
if (intf->req_prod != intf->req_cons) if (intf->req_prod != intf->req_cons)
printk(KERN_ERR "XENBUS request ring is not quiescent " pr_err("request ring is not quiescent (%08x:%08x)!\n",
"(%08x:%08x)!\n", intf->req_cons, intf->req_prod); intf->req_cons, intf->req_prod);
if (intf->rsp_prod != intf->rsp_cons) { if (intf->rsp_prod != intf->rsp_cons) {
printk(KERN_WARNING "XENBUS response ring is not quiescent " pr_warn("response ring is not quiescent (%08x:%08x): fixing up\n",
"(%08x:%08x): fixing up\n",
intf->rsp_cons, intf->rsp_prod); intf->rsp_cons, intf->rsp_prod);
/* breaks kdump */ /* breaks kdump */
if (!reset_devices) if (!reset_devices)
...@@ -225,7 +226,7 @@ int xb_init_comms(void) ...@@ -225,7 +226,7 @@ int xb_init_comms(void)
err = bind_evtchn_to_irqhandler(xen_store_evtchn, wake_waiting, err = bind_evtchn_to_irqhandler(xen_store_evtchn, wake_waiting,
0, "xenbus", &xb_waitq); 0, "xenbus", &xb_waitq);
if (err < 0) { if (err < 0) {
printk(KERN_ERR "XENBUS request irq failed %i\n", err); pr_err("request irq failed %i\n", err);
return err; return err;
} }
......
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
#include <linux/slab.h> #include <linux/slab.h>
#include <linux/types.h> #include <linux/types.h>
#include <linux/mm.h> #include <linux/mm.h>
...@@ -127,7 +129,7 @@ static int __init xenbus_backend_init(void) ...@@ -127,7 +129,7 @@ static int __init xenbus_backend_init(void)
err = misc_register(&xenbus_backend_dev); err = misc_register(&xenbus_backend_dev);
if (err) if (err)
printk(KERN_ERR "Could not register xenbus backend device\n"); pr_err("Could not register xenbus backend device\n");
return err; return err;
} }
......
...@@ -35,6 +35,8 @@ ...@@ -35,6 +35,8 @@
* Turned xenfs into a loadable module. * Turned xenfs into a loadable module.
*/ */
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/errno.h> #include <linux/errno.h>
#include <linux/uio.h> #include <linux/uio.h>
...@@ -616,7 +618,7 @@ static int __init xenbus_init(void) ...@@ -616,7 +618,7 @@ static int __init xenbus_init(void)
err = misc_register(&xenbus_dev); err = misc_register(&xenbus_dev);
if (err) if (err)
printk(KERN_ERR "Could not register xenbus frontend device\n"); pr_err("Could not register xenbus frontend device\n");
return err; return err;
} }
......
...@@ -30,6 +30,8 @@ ...@@ -30,6 +30,8 @@
* IN THE SOFTWARE. * IN THE SOFTWARE.
*/ */
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
#define DPRINTK(fmt, args...) \ #define DPRINTK(fmt, args...) \
pr_debug("xenbus_probe (%s:%d) " fmt ".\n", \ pr_debug("xenbus_probe (%s:%d) " fmt ".\n", \
__func__, __LINE__, ##args) __func__, __LINE__, ##args)
...@@ -280,14 +282,14 @@ void xenbus_dev_shutdown(struct device *_dev) ...@@ -280,14 +282,14 @@ void xenbus_dev_shutdown(struct device *_dev)
get_device(&dev->dev); get_device(&dev->dev);
if (dev->state != XenbusStateConnected) { if (dev->state != XenbusStateConnected) {
printk(KERN_INFO "%s: %s: %s != Connected, skipping\n", __func__, pr_info("%s: %s: %s != Connected, skipping\n",
dev->nodename, xenbus_strstate(dev->state)); __func__, dev->nodename, xenbus_strstate(dev->state));
goto out; goto out;
} }
xenbus_switch_state(dev, XenbusStateClosing); xenbus_switch_state(dev, XenbusStateClosing);
timeout = wait_for_completion_timeout(&dev->down, timeout); timeout = wait_for_completion_timeout(&dev->down, timeout);
if (!timeout) if (!timeout)
printk(KERN_INFO "%s: %s timeout closing device\n", pr_info("%s: %s timeout closing device\n",
__func__, dev->nodename); __func__, dev->nodename);
out: out:
put_device(&dev->dev); put_device(&dev->dev);
...@@ -579,8 +581,7 @@ int xenbus_dev_suspend(struct device *dev) ...@@ -579,8 +581,7 @@ int xenbus_dev_suspend(struct device *dev)
if (drv->suspend) if (drv->suspend)
err = drv->suspend(xdev); err = drv->suspend(xdev);
if (err) if (err)
printk(KERN_WARNING pr_warn("suspend %s failed: %i\n", dev_name(dev), err);
"xenbus: suspend %s failed: %i\n", dev_name(dev), err);
return 0; return 0;
} }
EXPORT_SYMBOL_GPL(xenbus_dev_suspend); EXPORT_SYMBOL_GPL(xenbus_dev_suspend);
...@@ -599,8 +600,7 @@ int xenbus_dev_resume(struct device *dev) ...@@ -599,8 +600,7 @@ int xenbus_dev_resume(struct device *dev)
drv = to_xenbus_driver(dev->driver); drv = to_xenbus_driver(dev->driver);
err = talk_to_otherend(xdev); err = talk_to_otherend(xdev);
if (err) { if (err) {
printk(KERN_WARNING pr_warn("resume (talk_to_otherend) %s failed: %i\n",
"xenbus: resume (talk_to_otherend) %s failed: %i\n",
dev_name(dev), err); dev_name(dev), err);
return err; return err;
} }
...@@ -610,18 +610,15 @@ int xenbus_dev_resume(struct device *dev) ...@@ -610,18 +610,15 @@ int xenbus_dev_resume(struct device *dev)
if (drv->resume) { if (drv->resume) {
err = drv->resume(xdev); err = drv->resume(xdev);
if (err) { if (err) {
printk(KERN_WARNING pr_warn("resume %s failed: %i\n", dev_name(dev), err);
"xenbus: resume %s failed: %i\n",
dev_name(dev), err);
return err; return err;
} }
} }
err = watch_otherend(xdev); err = watch_otherend(xdev);
if (err) { if (err) {
printk(KERN_WARNING pr_warn("resume (watch_otherend) %s failed: %d.\n",
"xenbus_probe: resume (watch_otherend) %s failed: " dev_name(dev), err);
"%d.\n", dev_name(dev), err);
return err; return err;
} }
...@@ -776,8 +773,7 @@ static int __init xenbus_init(void) ...@@ -776,8 +773,7 @@ static int __init xenbus_init(void)
/* Initialize the interface to xenstore. */ /* Initialize the interface to xenstore. */
err = xs_init(); err = xs_init();
if (err) { if (err) {
printk(KERN_WARNING pr_warn("Error initializing xenstore comms: %i\n", err);
"XENBUS: Error initializing xenstore comms: %i\n", err);
goto out_error; goto out_error;
} }
......
...@@ -31,9 +31,11 @@ ...@@ -31,9 +31,11 @@
* IN THE SOFTWARE. * IN THE SOFTWARE.
*/ */
#define DPRINTK(fmt, args...) \ #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
pr_debug("xenbus_probe (%s:%d) " fmt ".\n", \
__func__, __LINE__, ##args) #define DPRINTK(fmt, ...) \
pr_debug("(%s:%d) " fmt "\n", \
__func__, __LINE__, ##__VA_ARGS__)
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/err.h> #include <linux/err.h>
......
#define DPRINTK(fmt, args...) \ #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
pr_debug("xenbus_probe (%s:%d) " fmt ".\n", \
__func__, __LINE__, ##args) #define DPRINTK(fmt, ...) \
pr_debug("(%s:%d) " fmt "\n", \
__func__, __LINE__, ##__VA_ARGS__)
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/err.h> #include <linux/err.h>
...@@ -36,13 +38,13 @@ static int frontend_bus_id(char bus_id[XEN_BUS_ID_SIZE], const char *nodename) ...@@ -36,13 +38,13 @@ static int frontend_bus_id(char bus_id[XEN_BUS_ID_SIZE], const char *nodename)
{ {
nodename = strchr(nodename, '/'); nodename = strchr(nodename, '/');
if (!nodename || strlen(nodename + 1) >= XEN_BUS_ID_SIZE) { if (!nodename || strlen(nodename + 1) >= XEN_BUS_ID_SIZE) {
printk(KERN_WARNING "XENBUS: bad frontend %s\n", nodename); pr_warn("bad frontend %s\n", nodename);
return -EINVAL; return -EINVAL;
} }
strlcpy(bus_id, nodename + 1, XEN_BUS_ID_SIZE); strlcpy(bus_id, nodename + 1, XEN_BUS_ID_SIZE);
if (!strchr(bus_id, '/')) { if (!strchr(bus_id, '/')) {
printk(KERN_WARNING "XENBUS: bus_id %s no slash\n", bus_id); pr_warn("bus_id %s no slash\n", bus_id);
return -EINVAL; return -EINVAL;
} }
*strchr(bus_id, '/') = '-'; *strchr(bus_id, '/') = '-';
...@@ -234,14 +236,12 @@ static int print_device_status(struct device *dev, void *data) ...@@ -234,14 +236,12 @@ static int print_device_status(struct device *dev, void *data)
if (!dev->driver) { if (!dev->driver) {
/* Information only: is this too noisy? */ /* Information only: is this too noisy? */
printk(KERN_INFO "XENBUS: Device with no driver: %s\n", pr_info("Device with no driver: %s\n", xendev->nodename);
xendev->nodename);
} else if (xendev->state < XenbusStateConnected) { } else if (xendev->state < XenbusStateConnected) {
enum xenbus_state rstate = XenbusStateUnknown; enum xenbus_state rstate = XenbusStateUnknown;
if (xendev->otherend) if (xendev->otherend)
rstate = xenbus_read_driver_state(xendev->otherend); rstate = xenbus_read_driver_state(xendev->otherend);
printk(KERN_WARNING "XENBUS: Timeout connecting " pr_warn("Timeout connecting to device: %s (local state %d, remote state %d)\n",
"to device: %s (local state %d, remote state %d)\n",
xendev->nodename, xendev->state, rstate); xendev->nodename, xendev->state, rstate);
} }
...@@ -256,13 +256,14 @@ static bool wait_loop(unsigned long start, unsigned int max_delay, ...@@ -256,13 +256,14 @@ static bool wait_loop(unsigned long start, unsigned int max_delay,
{ {
if (time_after(jiffies, start + (*seconds_waited+5)*HZ)) { if (time_after(jiffies, start + (*seconds_waited+5)*HZ)) {
if (!*seconds_waited) if (!*seconds_waited)
printk(KERN_WARNING "XENBUS: Waiting for " pr_warn("Waiting for devices to initialise: ");
"devices to initialise: ");
*seconds_waited += 5; *seconds_waited += 5;
printk("%us...", max_delay - *seconds_waited); pr_cont("%us...", max_delay - *seconds_waited);
if (*seconds_waited == max_delay) if (*seconds_waited == max_delay) {
pr_cont("\n");
return true; return true;
} }
}
schedule_timeout_interruptible(HZ/10); schedule_timeout_interruptible(HZ/10);
...@@ -342,7 +343,7 @@ static void xenbus_reset_wait_for_backend(char *be, int expected) ...@@ -342,7 +343,7 @@ static void xenbus_reset_wait_for_backend(char *be, int expected)
timeout = wait_event_interruptible_timeout(backend_state_wq, timeout = wait_event_interruptible_timeout(backend_state_wq,
backend_state == expected, 5 * HZ); backend_state == expected, 5 * HZ);
if (timeout <= 0) if (timeout <= 0)
printk(KERN_INFO "XENBUS: backend %s timed out.\n", be); pr_info("backend %s timed out\n", be);
} }
/* /*
...@@ -365,7 +366,7 @@ static void xenbus_reset_frontend(char *fe, char *be, int be_state) ...@@ -365,7 +366,7 @@ static void xenbus_reset_frontend(char *fe, char *be, int be_state)
be_watch.callback = xenbus_reset_backend_state_changed; be_watch.callback = xenbus_reset_backend_state_changed;
backend_state = XenbusStateUnknown; backend_state = XenbusStateUnknown;
printk(KERN_INFO "XENBUS: triggering reconnect on %s\n", be); pr_info("triggering reconnect on %s\n", be);
register_xenbus_watch(&be_watch); register_xenbus_watch(&be_watch);
/* fall through to forward backend to state XenbusStateInitialising */ /* fall through to forward backend to state XenbusStateInitialising */
...@@ -384,7 +385,7 @@ static void xenbus_reset_frontend(char *fe, char *be, int be_state) ...@@ -384,7 +385,7 @@ static void xenbus_reset_frontend(char *fe, char *be, int be_state)
} }
unregister_xenbus_watch(&be_watch); unregister_xenbus_watch(&be_watch);
printk(KERN_INFO "XENBUS: reconnect done on %s\n", be); pr_info("reconnect done on %s\n", be);
kfree(be_watch.node); kfree(be_watch.node);
} }
......
...@@ -31,6 +31,8 @@ ...@@ -31,6 +31,8 @@
* IN THE SOFTWARE. * IN THE SOFTWARE.
*/ */
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
#include <linux/unistd.h> #include <linux/unistd.h>
#include <linux/errno.h> #include <linux/errno.h>
#include <linux/types.h> #include <linux/types.h>
...@@ -129,8 +131,7 @@ static int get_error(const char *errorstring) ...@@ -129,8 +131,7 @@ static int get_error(const char *errorstring)
for (i = 0; strcmp(errorstring, xsd_errors[i].errstring) != 0; i++) { for (i = 0; strcmp(errorstring, xsd_errors[i].errstring) != 0; i++) {
if (i == ARRAY_SIZE(xsd_errors) - 1) { if (i == ARRAY_SIZE(xsd_errors) - 1) {
printk(KERN_WARNING pr_warn("xen store gave: unknown error %s\n",
"XENBUS xen store gave: unknown error %s",
errorstring); errorstring);
return EINVAL; return EINVAL;
} }
...@@ -272,9 +273,7 @@ static void *xs_talkv(struct xenbus_transaction t, ...@@ -272,9 +273,7 @@ static void *xs_talkv(struct xenbus_transaction t,
} }
if (msg.type != type) { if (msg.type != type) {
if (printk_ratelimit()) pr_warn_ratelimited("unexpected type [%d], expected [%d]\n",
printk(KERN_WARNING
"XENBUS unexpected type [%d], expected [%d]\n",
msg.type, type); msg.type, type);
kfree(ret); kfree(ret);
return ERR_PTR(-EINVAL); return ERR_PTR(-EINVAL);
...@@ -655,7 +654,7 @@ static void xs_reset_watches(void) ...@@ -655,7 +654,7 @@ static void xs_reset_watches(void)
err = xs_error(xs_single(XBT_NIL, XS_RESET_WATCHES, "", NULL)); err = xs_error(xs_single(XBT_NIL, XS_RESET_WATCHES, "", NULL));
if (err && err != -EEXIST) if (err && err != -EEXIST)
printk(KERN_WARNING "xs_reset_watches failed: %d\n", err); pr_warn("xs_reset_watches failed: %d\n", err);
} }
/* Register callback to watch this node. */ /* Register callback to watch this node. */
...@@ -705,9 +704,7 @@ void unregister_xenbus_watch(struct xenbus_watch *watch) ...@@ -705,9 +704,7 @@ void unregister_xenbus_watch(struct xenbus_watch *watch)
err = xs_unwatch(watch->node, token); err = xs_unwatch(watch->node, token);
if (err) if (err)
printk(KERN_WARNING pr_warn("Failed to release watch %s: %i\n", watch->node, err);
"XENBUS Failed to release watch %s: %i\n",
watch->node, err);
up_read(&xs_state.watch_mutex); up_read(&xs_state.watch_mutex);
...@@ -901,8 +898,7 @@ static int xenbus_thread(void *unused) ...@@ -901,8 +898,7 @@ static int xenbus_thread(void *unused)
for (;;) { for (;;) {
err = process_msg(); err = process_msg();
if (err) if (err)
printk(KERN_WARNING "XENBUS error %d while reading " pr_warn("error %d while reading message\n", err);
"message\n", err);
if (kthread_should_stop()) if (kthread_should_stop())
break; break;
} }
......
...@@ -18,6 +18,8 @@ ...@@ -18,6 +18,8 @@
* Authors: Hollis Blanchard <hollisb@us.ibm.com> * Authors: Hollis Blanchard <hollisb@us.ibm.com>
*/ */
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
#include <linux/mm.h> #include <linux/mm.h>
#include <linux/slab.h> #include <linux/slab.h>
#include <asm/page.h> #include <asm/page.h>
......
...@@ -7,6 +7,8 @@ ...@@ -7,6 +7,8 @@
* Turned xenfs into a loadable module. * Turned xenfs into a loadable module.
*/ */
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/errno.h> #include <linux/errno.h>
#include <linux/module.h> #include <linux/module.h>
...@@ -82,7 +84,7 @@ static int __init xenfs_init(void) ...@@ -82,7 +84,7 @@ static int __init xenfs_init(void)
if (xen_domain()) if (xen_domain())
return register_filesystem(&xenfs_type); return register_filesystem(&xenfs_type);
printk(KERN_INFO "XENFS: not registering filesystem on non-xen platform\n"); pr_info("not registering filesystem on non-xen platform\n");
return 0; return 0;
} }
......
...@@ -44,7 +44,7 @@ static inline int hvm_get_parameter(int idx, uint64_t *value) ...@@ -44,7 +44,7 @@ static inline int hvm_get_parameter(int idx, uint64_t *value)
xhv.index = idx; xhv.index = idx;
r = HYPERVISOR_hvm_op(HVMOP_get_param, &xhv); r = HYPERVISOR_hvm_op(HVMOP_get_param, &xhv);
if (r < 0) { if (r < 0) {
printk(KERN_ERR "Cannot get hvm parameter %s (%d): %d!\n", pr_err("Cannot get hvm parameter %s (%d): %d!\n",
param_name(idx), idx, r); param_name(idx), idx, r);
return r; return r;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment