From: Sepherosa Ziehau <sephe@dragonflybsd.org>
Date: Sun, 30 Oct 2011 11:18:57 +0000 (+0800)
Subject: x86_64/ioapic_abi: Rework debug messages
X-Git-Url: https://gitweb.dragonflybsd.org/~lentferj/dragonfly.git/commitdiff_plain/621d2ccf74a7c3c6069377fe217d778a3ad0d414

x86_64/ioapic_abi: Rework debug messages
---

diff --git a/sys/platform/pc64/apic/ioapic_abi.c b/sys/platform/pc64/apic/ioapic_abi.c
index 282fa7e5e2..bd01e5dca4 100644
--- a/sys/platform/pc64/apic/ioapic_abi.c
+++ b/sys/platform/pc64/apic/ioapic_abi.c
@@ -949,14 +949,18 @@ ioapic_abi_gsi_cpuid(int irq, int gsi)
 	KKASSERT(gsi >= 0);
 
 	if (irq == 0 || gsi == 0) {
-		if (bootverbose)
-			kprintf("GSI %d -> CPU 0 (0)\n", gsi);
+		if (bootverbose) {
+			kprintf("IOAPIC: irq %d, gsi %d -> cpu0 (0)\n",
+			    irq, gsi);
+		}
 		return 0;
 	}
 
 	if (irq == acpi_sci_irqno()) {
-		if (bootverbose)
-			kprintf("GSI %d -> CPU 0 (sci)\n", gsi);
+		if (bootverbose) {
+			kprintf("IOAPIC: irq %d, gsi %d -> cpu0 (sci)\n",
+			    irq, gsi);
+		}
 		return 0;
 	}
 
@@ -965,15 +969,21 @@ ioapic_abi_gsi_cpuid(int irq, int gsi)
 
 	if (cpuid < 0) {
 		cpuid = gsi % ncpus;
-		if (bootverbose)
-			kprintf("GSI %d -> CPU %d (auto)\n", gsi, cpuid);
+		if (bootverbose) {
+			kprintf("IOAPIC: irq %d, gsi %d -> cpu%d (auto)\n",
+			    irq, gsi, cpuid);
+		}
 	} else if (cpuid >= ncpus) {
 		cpuid = ncpus - 1;
-		if (bootverbose)
-			kprintf("GSI %d -> CPU %d (fixup)\n", gsi, cpuid);
+		if (bootverbose) {
+			kprintf("IOAPIC: irq %d, gsi %d -> cpu%d (fixup)\n",
+			    irq, gsi, cpuid);
+		}
 	} else {
-		if (bootverbose)
-			kprintf("GSI %d -> CPU %d (user)\n", gsi, cpuid);
+		if (bootverbose) {
+			kprintf("IOAPIC: irq %d, gsi %d -> cpu%d (user)\n",
+			    irq, gsi, cpuid);
+		}
 	}
 	return cpuid;
 }