OS-590 kvm driver is far too chatty to the console

6 files changed, 26 insertions, 25 deletions

diff --git a/kvm_emulate.c b/kvm_emulate.c
index e508711..fb2c768 100644
--- a/kvm_emulate.c
+++ b/kvm_emulate.c
@@ -1953,7 +1953,7 @@ realmode_get_cr(struct kvm_vcpu *vcpu, int cr)
 		value = kvm_get_cr8(vcpu);
 		break;
 	default:
-		cmn_err(CE_NOTE, "%s: unexpected cr %u\n", __func__, cr);
+		cmn_err(CE_CONT, "!%s: unexpected cr %u\n", __func__, cr);
 		return (0);
 	}
 
@@ -1988,7 +1988,7 @@ realmode_set_cr(struct kvm_vcpu *vcpu,
 		kvm_set_cr8(vcpu, val & 0xfUL);
 		break;
 	default:
-		cmn_err(CE_NOTE, "%s: unexpected cr %u\n", __func__, cr);
+		cmn_err(CE_CONT, "!%s: unexpected cr %u\n", __func__, cr);
 	}
 }
 
@@ -2492,7 +2492,7 @@ xchg:
 		if (c->modrm_reg <= 5)
 			kvm_get_segment(ctxt->vcpu, &segreg, c->modrm_reg);
 		else {
-			cmn_err(CE_NOTE, "0x8c: Invalid segreg in "
+			cmn_err(CE_CONT, "!0x8c: Invalid segreg in "
 			    "modrm byte 0x%02x\n", c->modrm);
 			goto cannot_emulate;
 		}
diff --git a/kvm_irq_comm.c b/kvm_irq_comm.c
index 19b376c..b8c03da 100644
--- a/kvm_irq_comm.c
+++ b/kvm_irq_comm.c
@@ -79,7 +79,8 @@ kvm_irq_delivery_to_apic(struct kvm *kvm, struct kvm_lapic *src,
 
 	if (irq->dest_mode == 0 && irq->dest_id == 0xff &&
 	    kvm_is_dm_lowest_prio(irq))
-		cmn_err(CE_NOTE, "kvm: apic: phys broadcast and lowest prio\n");
+		cmn_err(CE_CONT,
+		    "!kvm: apic: phys broadcast and lowest prio\n");
 
 	kvm_for_each_vcpu(i, vcpu, kvm) {
 		if (!kvm_apic_present(vcpu))
diff --git a/kvm_lapic.c b/kvm_lapic.c
index a42d868..5a9d07e 100644
--- a/kvm_lapic.c
+++ b/kvm_lapic.c
@@ -1014,7 +1014,7 @@ kvm_lapic_reset(struct kvm_vcpu *vcpu)
 
 	vcpu->arch.apic_arb_prio = 0;
 
-	cmn_err(CE_NOTE, "%s: vcpu=%p, id=%d, base_msr= %lx PRIx64 "
+	cmn_err(CE_CONT, "!%s: vcpu=%p, id=%d, base_msr= %lx PRIx64 "
 	    "base_address=%lx\n", __func__, vcpu, kvm_apic_id(apic),
 	    vcpu->arch.apic_base, apic->base_address);
 }
diff --git a/kvm_mmu.c b/kvm_mmu.c
index de25727..95a5cb9 100644
--- a/kvm_mmu.c
+++ b/kvm_mmu.c
@@ -2143,7 +2143,7 @@ kvm_mmu_flush_tlb(struct kvm_vcpu *vcpu)
 static void
 paging_new_cr3(struct kvm_vcpu *vcpu)
 {
-	cmn_err(CE_NOTE, "%s: cr3 %lx\n", __func__, vcpu->arch.cr3);
+	cmn_err(CE_CONT, "!%s: cr3 %lx\n", __func__, vcpu->arch.cr3);
 	mmu_free_roots(vcpu);
 }
 
diff --git a/kvm_vmx.c b/kvm_vmx.c
index c8f4b00..6d00103 100644
--- a/kvm_vmx.c
+++ b/kvm_vmx.c
@@ -1782,7 +1782,7 @@ enter_lmode(struct kvm_vcpu *vcpu)
 
 	guest_tr_ar = vmcs_read32(GUEST_TR_AR_BYTES);
 	if ((guest_tr_ar & AR_TYPE_MASK) != AR_TYPE_BUSY_64_TSS) {
-		cmn_err(CE_NOTE, "%s: tss fixup for long mode. \n",
+		cmn_err(CE_CONT, "!%s: tss fixup for long mode. \n",
 		    __func__);
 		vmcs_write32(GUEST_TR_AR_BYTES,
 		    (guest_tr_ar & ~AR_TYPE_MASK) | AR_TYPE_BUSY_64_TSS);
@@ -3723,17 +3723,17 @@ ept_misconfig_inspect_spte(struct kvm_vcpu *vcpu, uint64_t spte, int level)
 
 	/* 010b (write-only) */
 	if ((spte & 0x7) == 0x2)
-		cmn_err(CE_CONT, "%s: spte is write-only\n", __func__);
+		cmn_err(CE_CONT, "!%s: spte is write-only\n", __func__);
 
 	/* 110b (write/execute) */
 	if ((spte & 0x7) == 0x6)
-		cmn_err(CE_CONT, "%s: spte is write-execute\n", __func__);
+		cmn_err(CE_CONT, "!%s: spte is write-execute\n", __func__);
 
 	/* 100b (execute-only) and value not supported by logical processor */
 	if (!cpu_has_vmx_ept_execute_only()) {
 		if ((spte & 0x7) == 0x4)
 			cmn_err(CE_CONT,
-			    "%s: spte is execute-only\n", __func__);
+			    "!%s: spte is execute-only\n", __func__);
 	}
 
 	/* not 000b */
@@ -3741,7 +3741,7 @@ ept_misconfig_inspect_spte(struct kvm_vcpu *vcpu, uint64_t spte, int level)
 		uint64_t rsvd_bits = spte & ept_rsvd_mask(spte, level);
 
 		if (rsvd_bits != 0) {
-			cmn_err(CE_CONT, "%s: rsvd_bits = 0x%lx\n",
+			cmn_err(CE_CONT, "!%s: rsvd_bits = 0x%lx\n",
 			    __func__, rsvd_bits);
 		}
 
@@ -3750,7 +3750,7 @@ ept_misconfig_inspect_spte(struct kvm_vcpu *vcpu, uint64_t spte, int level)
 
 			if (ept_mem_type == 2 || ept_mem_type == 3 ||
 			    ept_mem_type == 7) {
-				cmn_err(CE_CONT, "%s: ept_mem_type=0x%lx\n",
+				cmn_err(CE_CONT, "!%s: ept_mem_type=0x%lx\n",
 						__func__, ept_mem_type);
 			}
 		}
@@ -3767,7 +3767,7 @@ handle_ept_misconfig(struct kvm_vcpu *vcpu)
 	gpa = vmcs_read64(GUEST_PHYSICAL_ADDRESS);
 
 	cmn_err(CE_WARN, "EPT: Misconfiguration.\n");
-	cmn_err(CE_CONT, "EPT: GPA: 0x%lx\n", gpa);
+	cmn_err(CE_CONT, "!EPT: GPA: 0x%lx\n", gpa);
 	nr_sptes = kvm_mmu_get_spte_hierarchy(vcpu, gpa, sptes);
 
 	for (i = PT64_ROOT_LEVEL; i > PT64_ROOT_LEVEL - nr_sptes; --i)
@@ -4320,7 +4320,7 @@ vmx_create_vcpu(struct kvm *kvm, unsigned int id)
 
 	cpu = curthread->t_cpu->cpu_seqid;
 
-	cmn_err(CE_NOTE, "vmcs revision_id = %x\n", vmcs_config.revision_id);
+	cmn_err(CE_CONT, "!vmcs revision_id = %x\n", vmcs_config.revision_id);
 	vmx->vmcs->revision_id = vmcs_config.revision_id;
 
 	vmcs_clear(vmx->vmcs_pa);
diff --git a/kvm_x86.c b/kvm_x86.c
index 8f6d2bc..329cea7 100644
--- a/kvm_x86.c
+++ b/kvm_x86.c
@@ -1123,14 +1123,14 @@ kvm_set_msr_common(struct kvm_vcpu *vcpu, uint32_t msr, uint64_t data)
 	case MSR_K7_HWCR:
 		data &= ~(uint64_t)0x40; /* ignore flush filter disable */
 		if (data != 0) {
-			cmn_err(CE_NOTE,
-			    "unimplemented HWCR wrmsr: 0x%lx\n", data);
+			cmn_err(CE_CONT,
+			    "!unimplemented HWCR wrmsr: 0x%lx\n", data);
 			return (1);
 		}
 		break;
 	case MSR_FAM10H_MMIO_CONF_BASE:
 		if (data != 0) {
-			cmn_err(CE_NOTE, "unimplemented MMIO_CONF_BASE wrmsr: "
+			cmn_err(CE_CONT, "!unimplemented MMIO_CONF_BASE wrmsr: "
 				"0x%lx\n", data);
 			return (1);
 		}
@@ -1148,7 +1148,7 @@ kvm_set_msr_common(struct kvm_vcpu *vcpu, uint32_t msr, uint64_t data)
 			 */
 			return (1);
 		}
-		cmn_err(CE_NOTE, "%s: MSR_IA32_DEBUGCTLMSR 0x%lx, nop\n",
+		cmn_err(CE_CONT, "!%s: MSR_IA32_DEBUGCTLMSR 0x%lx, nop\n",
 			__func__, data);
 		break;
 	case MSR_IA32_UCODE_REV:
@@ -1222,7 +1222,7 @@ kvm_set_msr_common(struct kvm_vcpu *vcpu, uint32_t msr, uint64_t data)
 	case MSR_K7_EVNTSEL2:
 	case MSR_K7_EVNTSEL3:
 		if (data != 0)
-			cmn_err(CE_NOTE, "unimplemented perfctr wrmsr: "
+			cmn_err(CE_CONT, "!unimplemented perfctr wrmsr: "
 				"0x%x data 0x%lx\n", msr, data);
 		break;
 	/*
@@ -1235,7 +1235,7 @@ kvm_set_msr_common(struct kvm_vcpu *vcpu, uint32_t msr, uint64_t data)
 	case MSR_K7_PERFCTR1:
 	case MSR_K7_PERFCTR2:
 	case MSR_K7_PERFCTR3:
-		cmn_err(CE_NOTE, "unimplemented perfctr wrmsr: "
+		cmn_err(CE_CONT, "!unimplemented perfctr wrmsr: "
 			"0x%x data 0x%lx\n", msr, data);
 		break;
 	case HV_X64_MSR_GUEST_OS_ID ... HV_X64_MSR_SINT15:
@@ -1252,11 +1252,11 @@ kvm_set_msr_common(struct kvm_vcpu *vcpu, uint32_t msr, uint64_t data)
 		if (msr && (msr == vcpu->kvm->arch.xen_hvm_config.msr))
 			return (xen_hvm_config(vcpu, data));
 		if (!ignore_msrs) {
-			cmn_err(CE_NOTE, "unhandled wrmsr: 0x%x data %lx\n",
+			cmn_err(CE_CONT, "!unhandled wrmsr: 0x%x data %lx\n",
 				msr, data);
 			return (1);
 		} else {
-			cmn_err(CE_NOTE, "ignored wrmsr: 0x%x data %lx\n",
+			cmn_err(CE_CONT, "!ignored wrmsr: 0x%x data %lx\n",
 				msr, data);
 			break;
 		}
@@ -1481,10 +1481,10 @@ kvm_get_msr_common(struct kvm_vcpu *vcpu, uint32_t msr, uint64_t *pdata)
 		break;
 	default:
 		if (!ignore_msrs) {
-			cmn_err(CE_NOTE, "unhandled rdmsr: 0x%x\n", msr);
+			cmn_err(CE_CONT, "!unhandled rdmsr: 0x%x\n", msr);
 			return (1);
 		} else {
-			cmn_err(CE_NOTE, "ignored rdmsr: 0x%x\n", msr);
+			cmn_err(CE_CONT, "!ignored rdmsr: 0x%x\n", msr);
 			data = 0;
 		}
 		break;
@@ -3494,7 +3494,7 @@ __vcpu_run(struct kvm_vcpu *vcpu)
 	struct kvm *kvm = vcpu->kvm;
 
 	if (vcpu->arch.mp_state == KVM_MP_STATE_SIPI_RECEIVED) {
-		cmn_err(CE_NOTE, "vcpu %d received sipi with vector # %x\n",
+		cmn_err(CE_CONT, "!vcpu %d received sipi with vector # %x\n",
 		    vcpu->vcpu_id, vcpu->arch.sipi_vector);
 		kvm_lapic_reset(vcpu);
 		r = kvm_arch_vcpu_reset(vcpu);