OrgACRN
/
acrn-hypervisor
mirror of https://github.com/projectacrn/acrn-hypervisor.git
1
0
Fork 0
Code Issues Releases Wiki Activity

dm:change mac_seed to virtio-net sub-parameter 

As a parameter of acrn-dm,the mac_seed is only used for virtio-net.

So this patch change it to the sub-parameter of virtio-net.

Tracked-On: #6690
Acked-by: Yu1 Wang <yu1.wang@intel.com>
Signed-off-by: Chenli Wei <chenli.wei@linux.intel.com>
This commit is contained in:
Chenli Wei 2022-01-26 15:35:01 +08:00 committed by acrnsi-robot
parent d755205c8d
commit 8594d15d0c
2 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
devicemodel/core/main.c
View File

@ -89,7 +89,6 @@ char *ovmf_vars_file_name;
char *kernel_file_name; char *kernel_file_name;
char *elf_file_name; char *elf_file_name;
uint8_t trusty_enabled; uint8_t trusty_enabled;
char *mac_seed;
bool stdio_in_use; bool stdio_in_use;
bool lapic_pt; bool lapic_pt;
bool is_rtvm; bool is_rtvm;
@ -102,7 +101,6 @@ bool skip_pci_mem64bar_workaround = false;
static int guest_ncpus; static int guest_ncpus;
static int virtio_msix = 1; static int virtio_msix = 1;
static bool debugexit_enabled; static bool debugexit_enabled;
static char mac_seed_str[50];
static int pm_notify_channel; static int pm_notify_channel;
static char *progname; static char *progname;
@ -146,7 +144,7 @@ usage(int code)
" %*s [-s pci] [--ovmf ovmf_file_path]\n" " %*s [-s pci] [--ovmf ovmf_file_path]\n"
" %*s [--enable_trusty] [--intr_monitor param_setting]\n" " %*s [--enable_trusty] [--intr_monitor param_setting]\n"
" %*s [--acpidev_pt HID] [--mmiodev_pt MMIO_Regions]\n" " %*s [--acpidev_pt HID] [--mmiodev_pt MMIO_Regions]\n"
" %*s [--vtpm2 sock_path] [--virtio_poll interval] [--mac_seed seed_string]\n" " %*s [--vtpm2 sock_path] [--virtio_poll interval]\n"
" %*s [--cpu_affinity pCPUs] [--lapic_pt] [--rtvm] [--windows]\n" " %*s [--cpu_affinity pCPUs] [--lapic_pt] [--rtvm] [--windows]\n"
" %*s [--debugexit] [--logger_setting param_setting]\n" " %*s [--debugexit] [--logger_setting param_setting]\n"
" %*s [--ssram] <vm>\n" " %*s [--ssram] <vm>\n"
@ -159,7 +157,6 @@ usage(int code)
" -r: ramdisk image path\n" " -r: ramdisk image path\n"
" -s: <slot,driver,configinfo> PCI slot config\n" " -s: <slot,driver,configinfo> PCI slot config\n"
" -v: version\n" " -v: version\n"
" --mac_seed: set a platform unique string as a seed for generate mac address\n"
" --ovmf: ovmf file path\n" " --ovmf: ovmf file path\n"
" --ssram: Congfiure Software SRAM parameters\n" " --ssram: Congfiure Software SRAM parameters\n"
" --cpu_affinity: list of pCPUs assigned to this VM\n" " --cpu_affinity: list of pCPUs assigned to this VM\n"
@ -796,7 +793,6 @@ static struct option long_options[] = {
{"enable_trusty", no_argument, 0, {"enable_trusty", no_argument, 0,
CMD_OPT_TRUSTY_ENABLE}, CMD_OPT_TRUSTY_ENABLE},
{"virtio_poll", required_argument, 0, CMD_OPT_VIRTIO_POLL_ENABLE}, {"virtio_poll", required_argument, 0, CMD_OPT_VIRTIO_POLL_ENABLE},
{"mac_seed", required_argument, 0, CMD_OPT_MAC_SEED},
{"debugexit", no_argument, 0, CMD_OPT_DEBUGEXIT}, {"debugexit", no_argument, 0, CMD_OPT_DEBUGEXIT},
{"intr_monitor", required_argument, 0, CMD_OPT_INTR_MONITOR}, {"intr_monitor", required_argument, 0, CMD_OPT_INTR_MONITOR},
{"acpidev_pt", required_argument, 0, CMD_OPT_ACPIDEV_PT}, {"acpidev_pt", required_argument, 0, CMD_OPT_ACPIDEV_PT},
@ -925,11 +921,6 @@ main(int argc, char *argv[])
optarg); optarg);
} }
break; break;
case CMD_OPT_MAC_SEED:
strncpy(mac_seed_str, optarg, sizeof(mac_seed_str));
mac_seed_str[sizeof(mac_seed_str) - 1] = '\0';
mac_seed = mac_seed_str;
break;
case CMD_OPT_DEBUGEXIT: case CMD_OPT_DEBUGEXIT:
debugexit_enabled = true; debugexit_enabled = true;
break; break;

6
devicemodel/hw/pci/virtio/virtio_net.c
View File

@ -821,6 +821,7 @@ virtio_net_init(struct vmctx *ctx, struct pci_vdev *dev, char *opts)
char *devopts = NULL; char *devopts = NULL;
char *name = NULL; char *name = NULL;
char *type = NULL; char *type = NULL;
char *mac_seed = NULL;
char *tmp; char *tmp;
char *vtopts; char *vtopts;
char *opt; char *opt;
@ -913,6 +914,11 @@ virtio_net_init(struct vmctx *ctx, struct pci_vdev *dev, char *opts)
name = strsep(&tmp, ","); name = strsep(&tmp, ",");
} }
if (strncmp(tmp, "mac_seed",8) == 0) {
strsep(&tmp, "=");
mac_seed = tmp;
}
if ((type != NULL) && (name != NULL)) { if ((type != NULL) && (name != NULL)) {
snprintf(fname, IFNAMSIZ, "%s_%s", type, name); snprintf(fname, IFNAMSIZ, "%s_%s", type, name);