dm: pass mac seed not to use vm name

Physical NIC mac address is used for generate UOS mac address.
This patch uses a new parameters to pass this information
instead of vm name.

Tracked-On: #1987

Signed-off-by: Jie Deng <jie.deng@intel.com>
Acked-by: Yan, Like <like.yan@intel.com>
Acked-by: Anthony Xu <anthony.xu@intel.com>
This commit is contained in:
Jie Deng
2018-12-07 22:30:02 +08:00
committed by wenlingz
parent e3fc6c3c79
commit ed1c576d08
5 changed files with 20 additions and 6 deletions

View File

@@ -86,10 +86,12 @@ char *vsbl_file_name;
char *kernel_file_name;
char *elf_file_name;
uint8_t trusty_enabled;
char *mac_seed;
bool stdio_in_use;
static int virtio_msix = 1;
static bool debugexit_enabled;
static char mac_seed_str[50];
static int acpi;
@@ -708,6 +710,7 @@ enum {
CMD_OPT_PART_INFO,
CMD_OPT_TRUSTY_ENABLE,
CMD_OPT_VIRTIO_POLL_ENABLE,
CMD_OPT_MAC_SEED,
CMD_OPT_PTDEV_NO_RESET,
CMD_OPT_DEBUGEXIT,
CMD_OPT_VMCFG,
@@ -745,6 +748,7 @@ static struct option long_options[] = {
{"enable_trusty", no_argument, 0,
CMD_OPT_TRUSTY_ENABLE},
{"virtio_poll", required_argument, 0, CMD_OPT_VIRTIO_POLL_ENABLE},
{"mac_seed", required_argument, 0, CMD_OPT_MAC_SEED},
{"ptdev_no_reset", no_argument, 0,
CMD_OPT_PTDEV_NO_RESET},
{"debugexit", no_argument, 0, CMD_OPT_DEBUGEXIT},
@@ -876,6 +880,11 @@ dm_run(int argc, char *argv[])
exit(1);
}
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_PTDEV_NO_RESET:
ptdev_no_reset(true);
break;