diff options
| author | John Levon <john.levon@joyent.com> | 2020-05-26 13:57:13 +0000 |
|---|---|---|
| committer | John Levon <john.levon@joyent.com> | 2020-05-26 13:57:13 +0000 |
| commit | 5b2acc0949194447bba6e45a0fa44d0b5f42f208 (patch) | |
| tree | 7ea9eb87bc68fee386dd39035ce715e87a0e673c /usr/src/uts/i86pc/io/vmm/intel | |
| parent | 8ca018083101bf1cb175869679bc123187fb1bab (diff) | |
| parent | 2a1277d3064386cd5c4e372301007aa330bf1d5e (diff) | |
| download | illumos-joyent-gcc9.tar.gz | |
mergegcc9
Diffstat (limited to 'usr/src/uts/i86pc/io/vmm/intel')
| -rw-r--r-- | usr/src/uts/i86pc/io/vmm/intel/vmx.c | 9 | ||||
| -rw-r--r-- | usr/src/uts/i86pc/io/vmm/intel/vmx_support.s | 29 |
2 files changed, 5 insertions, 33 deletions
diff --git a/usr/src/uts/i86pc/io/vmm/intel/vmx.c b/usr/src/uts/i86pc/io/vmm/intel/vmx.c index 83e137973e..754795c2e9 100644 --- a/usr/src/uts/i86pc/io/vmm/intel/vmx.c +++ b/usr/src/uts/i86pc/io/vmm/intel/vmx.c @@ -40,6 +40,7 @@ * * Copyright 2015 Pluribus Networks Inc. * Copyright 2018 Joyent, Inc. + * Copyright 2020 Oxide Computer Company */ #include <sys/cdefs.h> @@ -1242,11 +1243,9 @@ vmx_handle_cpuid(struct vm *vm, int vcpu, struct vmxctx *vmxctx) int handled; #endif - handled = x86_emulate_cpuid(vm, vcpu, - (uint32_t*)(&vmxctx->guest_rax), - (uint32_t*)(&vmxctx->guest_rbx), - (uint32_t*)(&vmxctx->guest_rcx), - (uint32_t*)(&vmxctx->guest_rdx)); + handled = x86_emulate_cpuid(vm, vcpu, (uint64_t *)&vmxctx->guest_rax, + (uint64_t *)&vmxctx->guest_rbx, (uint64_t *)&vmxctx->guest_rcx, + (uint64_t *)&vmxctx->guest_rdx); return (handled); } diff --git a/usr/src/uts/i86pc/io/vmm/intel/vmx_support.s b/usr/src/uts/i86pc/io/vmm/intel/vmx_support.s index 0130f88dd6..f719e31e30 100644 --- a/usr/src/uts/i86pc/io/vmm/intel/vmx_support.s +++ b/usr/src/uts/i86pc/io/vmm/intel/vmx_support.s @@ -45,31 +45,6 @@ /* Porting note: This is named 'vmx_support.S' upstream. */ - - -#if defined(lint) - -struct vmxctx; -struct vmx; - -/*ARGSUSED*/ -void -vmx_launch(struct vmxctx *ctx) -{} - -void -vmx_exit_guest() -{} - -/*ARGSUSED*/ -int -vmx_enter_guest(struct vmxctx *ctx, struct vmx *vmx, int launched) -{ - return (0); -} - -#else /* lint */ - #include "vmx_assym.h" #include "vmcs.h" @@ -155,7 +130,7 @@ vmx_enter_guest(struct vmxctx *ctx, struct vmx *vmx, int launched) #define VMXSTKSIZE VMXSTK_FP /* - * vmx_enter_guest(struct vmxctx *vmxctx, int launched) + * vmx_enter_guest(struct vmxctx *ctx, struct vmx *vmx, int launched) * Interrupts must be disabled on entry. */ ENTRY_NP(vmx_enter_guest) @@ -380,5 +355,3 @@ ENTRY_NP(vmx_call_isr) popq %rbp ret SET_SIZE(vmx_call_isr) - -#endif /* lint */ |