Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

KVM: Add some \n in ioapic_debug()

Browse source 
Add new-line at end of debug strings.

Signed-off-by: Laurent Vivier <Laurent.Vivier@bull.net>
Signed-off-by: Avi Kivity <avi@qumranet.com>
This commit is contained in:
Laurent Vivier 2007-10-12 11:01:59 +02:00 • committed by Avi Kivity
parent e4d47f404b
commit e25e3ed56f
1 changed files with 14 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
drivers/kvm/ioapic.c
View file

@ -40,8 +40,11 @@
#include <asm/apicdef.h> #include <asm/apicdef.h>
#include <asm/io_apic.h> #include <asm/io_apic.h>
#include "irq.h" #include "irq.h"
/* #define ioapic_debug(fmt,arg...) printk(KERN_WARNING fmt,##arg) */ #if 0
#define ioapic_debug(fmt,arg...) printk(KERN_WARNING fmt,##arg)
#else
#define ioapic_debug(fmt, arg...) #define ioapic_debug(fmt, arg...)
#endif
static void ioapic_deliver(struct kvm_ioapic *vioapic, int irq); static void ioapic_deliver(struct kvm_ioapic *vioapic, int irq);
static unsigned long ioapic_read_indirect(struct kvm_ioapic *ioapic, static unsigned long ioapic_read_indirect(struct kvm_ioapic *ioapic,
@ -113,7 +116,7 @@ static void ioapic_write_indirect(struct kvm_ioapic *ioapic, u32 val)
default: default:
index = (ioapic->ioregsel - 0x10) >> 1; index = (ioapic->ioregsel - 0x10) >> 1;
ioapic_debug("change redir index %x val %x", index, val); ioapic_debug("change redir index %x val %x\n", index, val);
if (index >= IOAPIC_NUM_PINS) if (index >= IOAPIC_NUM_PINS)
return; return;
if (ioapic->ioregsel & 1) { if (ioapic->ioregsel & 1) {
@ -134,7 +137,7 @@ static void ioapic_inj_irq(struct kvm_ioapic *ioapic,
struct kvm_lapic *target, struct kvm_lapic *target,
u8 vector, u8 trig_mode, u8 delivery_mode) u8 vector, u8 trig_mode, u8 delivery_mode)
{ {
ioapic_debug("irq %d trig %d deliv %d", vector, trig_mode, ioapic_debug("irq %d trig %d deliv %d\n", vector, trig_mode,
delivery_mode); delivery_mode);
ASSERT((delivery_mode == dest_Fixed) || ASSERT((delivery_mode == dest_Fixed) ||
@ -151,7 +154,7 @@ static u32 ioapic_get_delivery_bitmask(struct kvm_ioapic *ioapic, u8 dest,
struct kvm *kvm = ioapic->kvm; struct kvm *kvm = ioapic->kvm;
struct kvm_vcpu *vcpu; struct kvm_vcpu *vcpu;
ioapic_debug("dest %d dest_mode %d", dest, dest_mode); ioapic_debug("dest %d dest_mode %d\n", dest, dest_mode);
if (dest_mode == 0) { /* Physical mode. */ if (dest_mode == 0) { /* Physical mode. */
if (dest == 0xFF) { /* Broadcast. */ if (dest == 0xFF) { /* Broadcast. */
@ -179,7 +182,7 @@ static u32 ioapic_get_delivery_bitmask(struct kvm_ioapic *ioapic, u8 dest,
kvm_apic_match_logical_addr(vcpu->apic, dest)) kvm_apic_match_logical_addr(vcpu->apic, dest))
mask |= 1 << vcpu->vcpu_id; mask |= 1 << vcpu->vcpu_id;
} }
ioapic_debug("mask %x", mask); ioapic_debug("mask %x\n", mask);
return mask; return mask;
} }
@ -196,12 +199,12 @@ static void ioapic_deliver(struct kvm_ioapic *ioapic, int irq)
int vcpu_id; int vcpu_id;
ioapic_debug("dest=%x dest_mode=%x delivery_mode=%x " ioapic_debug("dest=%x dest_mode=%x delivery_mode=%x "
"vector=%x trig_mode=%x", "vector=%x trig_mode=%x\n",
dest, dest_mode, delivery_mode, vector, trig_mode); dest, dest_mode, delivery_mode, vector, trig_mode);
deliver_bitmask = ioapic_get_delivery_bitmask(ioapic, dest, dest_mode); deliver_bitmask = ioapic_get_delivery_bitmask(ioapic, dest, dest_mode);
if (!deliver_bitmask) { if (!deliver_bitmask) {
ioapic_debug("no target on destination"); ioapic_debug("no target on destination\n");
return; return;
} }
@ -214,7 +217,7 @@ static void ioapic_deliver(struct kvm_ioapic *ioapic, int irq)
trig_mode, delivery_mode); trig_mode, delivery_mode);
else else
ioapic_debug("null round robin: " ioapic_debug("null round robin: "
"mask=%x vector=%x delivery_mode=%x", "mask=%x vector=%x delivery_mode=%x\n",
deliver_bitmask, vector, dest_LowestPrio); deliver_bitmask, vector, dest_LowestPrio);
break; break;
case dest_Fixed: case dest_Fixed:
@ -304,7 +307,7 @@ static void ioapic_mmio_read(struct kvm_io_device *this, gpa_t addr, int len,
struct kvm_ioapic *ioapic = (struct kvm_ioapic *)this->private; struct kvm_ioapic *ioapic = (struct kvm_ioapic *)this->private;
u32 result; u32 result;
ioapic_debug("addr %lx", (unsigned long)addr); ioapic_debug("addr %lx\n", (unsigned long)addr);
ASSERT(!(addr & 0xf)); /* check alignment */ ASSERT(!(addr & 0xf)); /* check alignment */
addr &= 0xff; addr &= 0xff;
@ -341,8 +344,8 @@ static void ioapic_mmio_write(struct kvm_io_device *this, gpa_t addr, int len,
struct kvm_ioapic *ioapic = (struct kvm_ioapic *)this->private; struct kvm_ioapic *ioapic = (struct kvm_ioapic *)this->private;
u32 data; u32 data;
ioapic_debug("ioapic_mmio_write addr=%lx len=%d val=%p\n", ioapic_debug("ioapic_mmio_write addr=%p len=%d val=%p\n",
addr, len, val); (void*)addr, len, val);
ASSERT(!(addr & 0xf)); /* check alignment */ ASSERT(!(addr & 0xf)); /* check alignment */
if (len == 4 || len == 8) if (len == 4 || len == 8)
data = *(u32 *) val; data = *(u32 *) val;