diff options
| author | Dave Voutila <dv@cvs.openbsd.org> | 2023-04-25 12:46:14 +0000 |
|---|---|---|
| committer | Dave Voutila <dv@cvs.openbsd.org> | 2023-04-25 12:46:14 +0000 |
| commit | dfaf58e2837030abaf552d5534faad6f4399ce1c (patch) | |
| tree | a6480222f6fe7514e9d0b38db0b7fb14fbf3b4b5 /sys/arch/amd64 | |
| parent | eba21f3d8d841dbd7d6a710260d947da9c161550 (diff) | |
vmm(4)/vmd(8): pull struct members out of vmm ioctl create struct.
The object sent to vmm(4) contained file paths and details the
kernel does not need for cpu virtualization as device emulation is
in userland. Effectively, "pull up" the struct members from the
vm_create_params struct to the parent vmop_create_params struct.
This allows us to clean up some of vmd(8) and simplify things for
switching to having vmctl(8) open the "kernel" file (SeaBIOS, bsd.rd,
etc.) to allow users to boot recovery ramdisk kernels.
ok mlarkin@
Diffstat (limited to 'sys/arch/amd64')
| -rw-r--r-- | sys/arch/amd64/include/vmmvar.h | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/sys/arch/amd64/include/vmmvar.h b/sys/arch/amd64/include/vmmvar.h index 4e020bcafc9..b01979676b0 100644 --- a/sys/arch/amd64/include/vmmvar.h +++ b/sys/arch/amd64/include/vmmvar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: vmmvar.h,v 1.89 2023/01/30 02:32:01 dv Exp $ */ +/* $OpenBSD: vmmvar.h,v 1.90 2023/04/25 12:46:13 dv Exp $ */ /* * Copyright (c) 2014 Mike Larkin <mlarkin@openbsd.org> * @@ -25,10 +25,7 @@ #define VMM_MAX_MEM_RANGES 16 #define VMM_MAX_DISKS_PER_VM 4 -#define VMM_MAX_PATH_DISK 128 -#define VMM_MAX_PATH_CDROM 128 #define VMM_MAX_NAME_LEN 64 -#define VMM_MAX_KERNEL_PATH 128 #define VMM_MAX_VCPUS 512 #define VMM_MAX_VCPUS_PER_VM 64 #define VMM_MAX_VM_MEM_SIZE 32L * 1024 * 1024 * 1024 /* 32 GiB */ @@ -473,14 +470,8 @@ struct vm_create_params { /* Input parameters to VMM_IOC_CREATE */ size_t vcp_nmemranges; size_t vcp_ncpus; - size_t vcp_ndisks; - size_t vcp_nnics; struct vm_mem_range vcp_memranges[VMM_MAX_MEM_RANGES]; - char vcp_disks[VMM_MAX_DISKS_PER_VM][VMM_MAX_PATH_DISK]; - char vcp_cdrom[VMM_MAX_PATH_CDROM]; char vcp_name[VMM_MAX_NAME_LEN]; - char vcp_kernel[VMM_MAX_KERNEL_PATH]; - uint8_t vcp_macs[VMM_MAX_NICS_PER_VM][6]; /* Output parameter from VMM_IOC_CREATE */ uint32_t vcp_id; |