diff options
| author | Dave Voutila <dv@cvs.openbsd.org> | 2024-07-09 09:31:38 +0000 |
|---|---|---|
| committer | Dave Voutila <dv@cvs.openbsd.org> | 2024-07-09 09:31:38 +0000 |
| commit | 4316864a53c3007498bacef755d1b19cb5127bda (patch) | |
| tree | dd19ecaed52a7f5472c1868a10c1390e749e6a26 /sys/arch/amd64/include | |
| parent | ff8c8e07adc82a0422ce8f46a8ba09e7cced592f (diff) | |
vmd/vmm: move vm_run_params into mi header.
To prepare for mi/md splitting vmd, need to fixup the dev/vmm/vmm.h
mi header. Move the vm_run_params struct and clean up the includes
in vmd.
"sure", mlarkin@
Diffstat (limited to 'sys/arch/amd64/include')
| -rw-r--r-- | sys/arch/amd64/include/vmmvar.h | 26 |
1 files changed, 1 insertions, 25 deletions
diff --git a/sys/arch/amd64/include/vmmvar.h b/sys/arch/amd64/include/vmmvar.h index 8426a5d94d1..50c1f15b0a3 100644 --- a/sys/arch/amd64/include/vmmvar.h +++ b/sys/arch/amd64/include/vmmvar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: vmmvar.h,v 1.101 2024/04/29 14:47:05 dv Exp $ */ +/* $OpenBSD: vmmvar.h,v 1.102 2024/07/09 09:31:37 dv Exp $ */ /* * Copyright (c) 2014 Mike Larkin <mlarkin@openbsd.org> * @@ -23,14 +23,6 @@ #define VMM_HV_SIGNATURE "OpenBSDVMM58" -#define VMM_MAX_MEM_RANGES 16 -#define VMM_MAX_DISKS_PER_VM 4 -#define VMM_MAX_NAME_LEN 64 -#define VMM_MAX_VCPUS 512 -#define VMM_MAX_VCPUS_PER_VM 64 -#define VMM_MAX_VM_MEM_SIZE 128L * 1024 * 1024 * 1024 -#define VMM_MAX_NICS_PER_VM 4 - #define VMM_PCI_MMIO_BAR_BASE 0xF0000000ULL #define VMM_PCI_MMIO_BAR_END 0xFFDFFFFFULL /* 2 MiB below 4 GiB */ @@ -474,21 +466,6 @@ struct vm_exit { int cpl; }; -struct vm_run_params { - /* Input parameters to VMM_IOC_RUN */ - uint32_t vrp_vm_id; - uint32_t vrp_vcpu_id; - struct vcpu_inject_event vrp_inject; - uint8_t vrp_intr_pending; /* Additional intrs pending? */ - - /* Input/output parameter to VMM_IOC_RUN */ - struct vm_exit *vrp_exit; /* updated exit data */ - - /* Output parameter from VMM_IOC_RUN */ - uint16_t vrp_exit_reason; /* exit reason */ - uint8_t vrp_irqready; /* ready for IRQ on entry */ -}; - struct vm_intr_params { /* Input parameters to VMM_IOC_INTR */ uint32_t vip_vm_id; @@ -961,7 +938,6 @@ int vcpu_init(struct vcpu *); void vcpu_deinit(struct vcpu *); int vm_rwvmparams(struct vm_rwvmparams_params *, int); int vm_rwregs(struct vm_rwregs_params *, int); -int vm_run(struct vm_run_params *); int vcpu_reset_regs(struct vcpu *, struct vcpu_reg_state *); #endif /* _KERNEL */ |