github/acrn-hypervisor
1
0
Fork 0
mirror of https://github.com/projectacrn/acrn-hypervisor.git synced 2025-06-26 23:36:51 +00:00
Code Issues Projects Releases Wiki Activity

HV: move MAX_CONFIG_NAME_SIZE to acrn_common.h

Browse Source 
The vm_config in hypervisor restricted VM name size to
MAX_CONFIG_NAME_SIZE (32 bytes). When UOS is launched by DM, the vmname
is passed in as the last optional args, we hope to to copy it to vm_config
in the future. So the size of vmname in DM args should be restricted to
MAX_CONFIG_NAME_SIZE, too. Because MAX_CONFIG_NAME_SIZE will be used by DM,
we move it from vm_config.h to acrn_common.h
We also rename MAX_CONFIG_NAME_SIZE to MAX_VM_OS_NAME_LEN, because it will
be used by another components, should has a clear name.

Tracked-On: #2851
Signed-off-by: Tao Yuhong <yuhong.tao@intel.com>
Acked-by: Eddie Dong <eddie.dong@intel.com>
This commit is contained in:
yuhong.tao@intel.com 2019-03-19 11:13:14 +00:00 committed by wenlingz
parent c55308bd3d
commit b1586ccc3e
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
hypervisor/include/arch/x86/vm_config.h
View File

@ -10,8 +10,7 @@
#include <types.h> #include <types.h>
#include <pci.h> #include <pci.h>
#include <multiboot.h> #include <multiboot.h>
#include <acrn_common.h>
#define MAX_CONFIG_NAME_SIZE 32U
#define PLUG_CPU(n) (1U << (n)) #define PLUG_CPU(n) (1U << (n))
@ -33,7 +32,7 @@ struct acrn_vm_mem_config {
}; };
struct acrn_vm_os_config { struct acrn_vm_os_config {
char name[MAX_CONFIG_NAME_SIZE]; /* OS name, useful for debug */ char name[MAX_VM_OS_NAME_LEN]; /* OS name, useful for debug */
char bootargs[MAX_BOOTARGS_SIZE]; /* boot args/cmdline */ char bootargs[MAX_BOOTARGS_SIZE]; /* boot args/cmdline */
} __aligned(8); } __aligned(8);
@ -44,7 +43,7 @@ struct acrn_vm_pci_ptdev_config {
struct acrn_vm_config { struct acrn_vm_config {
enum acrn_vm_type type; /* specify the type of VM */ enum acrn_vm_type type; /* specify the type of VM */
char name[MAX_CONFIG_NAME_SIZE]; /* VM name identifier, useful for debug. */ char name[MAX_VM_OS_NAME_LEN]; /* VM name identifier, useful for debug. */
uint8_t GUID[16]; /* GUID of the VM */ uint8_t GUID[16]; /* GUID of the VM */
uint64_t pcpu_bitmap; /* from pcpu bitmap, we could know VM core number */ uint64_t pcpu_bitmap; /* from pcpu bitmap, we could know VM core number */
uint64_t guest_flags; /* VM flags that we want to configure for guest uint64_t guest_flags; /* VM flags that we want to configure for guest

2
hypervisor/include/public/acrn_common.h
View File

@ -357,6 +357,8 @@ struct acrn_create_vm {
uint8_t reserved2[16]; uint8_t reserved2[16];
} __aligned(8); } __aligned(8);
#define MAX_VM_OS_NAME_LEN 32U
/** /**
* @brief Info to create a VCPU * @brief Info to create a VCPU
* *