diff options
| author |   mlarkin <mlarkin@openbsd.org> | 2019-07-28 23:18:33 +0000 |
|---|---|---|
| committer | mlarkin <mlarkin@openbsd.org> | 2019-07-28 23:18:33 +0000 |
| commit | a674406a03e72f3fdd85d52f9b98a05ec52eccde (patch) | |
| tree | 16c69e46af9c2bba0723b4393616ffdab84a97ed | |
| parent | minor markup polishing and typo fixes; OK kn@ (diff) | |
| download | wireguard-openbsd-a674406a03e72f3fdd85d52f9b98a05ec52eccde.tar.xz wireguard-openbsd-a674406a03e72f3fdd85d52f9b98a05ec52eccde.zip | |
vmm(4): join some short lines of code
KNF, no code change.
| -rw-r--r-- | sys/arch/amd64/amd64/vmm.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/sys/arch/amd64/amd64/vmm.c b/sys/arch/amd64/amd64/vmm.c index 4dadb04bbf6..2c5e7d637ed 100644 --- a/sys/arch/amd64/amd64/vmm.c +++ b/sys/arch/amd64/amd64/vmm.c @@ -1,4 +1,4 @@ -/* $OpenBSD: vmm.c,v 1.249 2019/07/17 05:51:07 pd Exp $ */ +/* $OpenBSD: vmm.c,v 1.250 2019/07/28 23:18:33 mlarkin Exp $ */ /* * Copyright (c) 2014 Mike Larkin <mlarkin@openbsd.org> * @@ -42,7 +42,7 @@ #include <dev/isa/isareg.h> #include <dev/pv/pvreg.h> -/* #define VMM_DEBUG */ +#define VMM_DEBUG void *l1tf_flush_region; @@ -5673,8 +5673,7 @@ vmx_handle_cr0_write(struct vcpu *vcpu, uint64_t r) /* Inject #GP, let the guest handle it */ DPRINTF("%s: guest set invalid bits in %%cr0. Zeros " "mask=0x%llx, data=0x%llx\n", __func__, - curcpu()->ci_vmm_cap.vcc_vmx.vmx_cr0_fixed1, - r); + curcpu()->ci_vmm_cap.vcc_vmx.vmx_cr0_fixed1, r); vmm_inject_gp(vcpu); return (0); } @@ -5685,8 +5684,7 @@ vmx_handle_cr0_write(struct vcpu *vcpu, uint64_t r) /* Inject #GP, let the guest handle it */ DPRINTF("%s: guest set invalid bits in %%cr0. Ones " "mask=0x%llx, data=0x%llx\n", __func__, - curcpu()->ci_vmm_cap.vcc_vmx.vmx_cr0_fixed0, - r); + curcpu()->ci_vmm_cap.vcc_vmx.vmx_cr0_fixed0, r); vmm_inject_gp(vcpu); return (0); } |