diff options
| author | pd <pd@cvs.openbsd.org> | 2017-08-09 19:13:07 +0000 |
|---|---|---|
| committer | pd <pd@cvs.openbsd.org> | 2017-08-09 19:13:07 +0000 |
| commit | bdcc3cc714ca1e98360a2cb4a8ccbc72f3e4523a (patch) | |
| tree | f5537b4d7a5bfc903fd8270f77bb87a904f15d88 | |
| parent | 9a7ea2ef37ecc50bc5dec293e6e263afbda11b5e (diff) | |
fix a few DPRINTFs in vmm.c so that compilation with VMM_DEBUG works
ok mlarkin@
| -rw-r--r-- | sys/arch/amd64/amd64/vmm.c | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/sys/arch/amd64/amd64/vmm.c b/sys/arch/amd64/amd64/vmm.c index 7379d8ec013..9aeaf3d3634 100644 --- a/sys/arch/amd64/amd64/vmm.c +++ b/sys/arch/amd64/amd64/vmm.c @@ -1,4 +1,4 @@ -/* $OpenBSD: vmm.c,v 1.160 2017/08/09 17:22:18 pd Exp $ */ +/* $OpenBSD: vmm.c,v 1.161 2017/08/09 19:13:06 pd Exp $ */ /* * Copyright (c) 2014 Mike Larkin <mlarkin@openbsd.org> * @@ -7228,9 +7228,9 @@ vmm_decode_cr0(uint64_t cr0) DPRINTF("("); for (i = 0; i < 11; i++) if (cr0 & cr0_info[i].vrdi_bit) - DPRINTF(cr0_info[i].vrdi_present); + DPRINTF("%c", cr0_info[i].vrdi_present); else - DPRINTF(cr0_info[i].vrdi_absent); + DPRINTF("%c", cr0_info[i].vrdi_absent); DPRINTF(")\n"); } @@ -7256,9 +7256,9 @@ vmm_decode_cr3(uint64_t cr3) DPRINTF("("); for (i = 0 ; i < 2 ; i++) if (cr3 & cr3_info[i].vrdi_bit) - DPRINTF(cr3_info[i].vrdi_present); + DPRINTF("%c", cr3_info[i].vrdi_present); else - DPRINTF(cr3_info[i].vrdi_absent); + DPRINTF("%c", cr3_info[i].vrdi_absent); DPRINTF(")\n"); } else { @@ -7296,9 +7296,9 @@ vmm_decode_cr4(uint64_t cr4) DPRINTF("("); for (i = 0; i < 19; i++) if (cr4 & cr4_info[i].vrdi_bit) - DPRINTF(cr4_info[i].vrdi_present); + DPRINTF("%c", cr4_info[i].vrdi_present); else - DPRINTF(cr4_info[i].vrdi_absent); + DPRINTF("%c", cr4_info[i].vrdi_absent); DPRINTF(")\n"); } @@ -7317,9 +7317,9 @@ vmm_decode_apicbase_msr_value(uint64_t apicbase) DPRINTF("("); for (i = 0; i < 3; i++) if (apicbase & apicbase_info[i].vrdi_bit) - DPRINTF(apicbase_info[i].vrdi_present); + DPRINTF("%c", apicbase_info[i].vrdi_present); else - DPRINTF(apicbase_info[i].vrdi_absent); + DPRINTF("%c", apicbase_info[i].vrdi_absent); DPRINTF(")\n"); } @@ -7339,9 +7339,9 @@ vmm_decode_ia32_fc_value(uint64_t fcr) DPRINTF("("); for (i = 0; i < 4; i++) if (fcr & fcr_info[i].vrdi_bit) - DPRINTF(fcr_info[i].vrdi_present); + DPRINTF("%c", fcr_info[i].vrdi_present); else - DPRINTF(fcr_info[i].vrdi_absent); + DPRINTF("%c", fcr_info[i].vrdi_absent); if (fcr & IA32_FEATURE_CONTROL_SENTER_EN) DPRINTF(" [SENTER param = 0x%llx]", @@ -7364,9 +7364,9 @@ vmm_decode_mtrrcap_value(uint64_t val) DPRINTF("("); for (i = 0; i < 3; i++) if (val & mtrrcap_info[i].vrdi_bit) - DPRINTF(mtrrcap_info[i].vrdi_present); + DPRINTF("%c", mtrrcap_info[i].vrdi_present); else - DPRINTF(mtrrcap_info[i].vrdi_absent); + DPRINTF("%c", mtrrcap_info[i].vrdi_absent); if (val & MTRRcap_FIXED) DPRINTF(" [nr fixed ranges = 0x%llx]", @@ -7401,9 +7401,9 @@ vmm_decode_mtrrdeftype_value(uint64_t mtrrdeftype) DPRINTF("("); for (i = 0; i < 2; i++) if (mtrrdeftype & mtrrdeftype_info[i].vrdi_bit) - DPRINTF(mtrrdeftype_info[i].vrdi_present); + DPRINTF("%c", mtrrdeftype_info[i].vrdi_present); else - DPRINTF(mtrrdeftype_info[i].vrdi_absent); + DPRINTF("%c", mtrrdeftype_info[i].vrdi_absent); DPRINTF("type = "); type = mtrr2mrt(mtrrdeftype & 0xff); @@ -7437,9 +7437,9 @@ vmm_decode_efer_value(uint64_t efer) DPRINTF("("); for (i = 0; i < 4; i++) if (efer & efer_info[i].vrdi_bit) - DPRINTF(efer_info[i].vrdi_present); + DPRINTF("%c", efer_info[i].vrdi_present); else - DPRINTF(efer_info[i].vrdi_absent); + DPRINTF("%c", efer_info[i].vrdi_absent); DPRINTF(")\n"); } |