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

dm: cleanup the cmd options for acrn-dm 

For acrn-dm cmd options, there are some mismatch usage from acrn-dm help
message.
This patch will cleanup them.

Tracked-On: #1469
Signed-off-by: Wei Liu <weix.w.liu@intel.com>
Reviewed-by: Jason Chen <jason.cj.chen@intel.com>
Reviewed-by: Eddie Dong <eddie.dong@intel.com>
This commit is contained in:
Wei Liu 2018-10-11 11:47:48 +08:00 committed by Xie, Nanlin
parent 2202b7f578
commit 909d157630
1 changed files with 3 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
devicemodel/core/main.c
View File

@ -80,7 +80,6 @@ char *vsbl_file_name;
uint8_t trusty_enabled; uint8_t trusty_enabled;
bool stdio_in_use; bool stdio_in_use;
static int guest_vmexit_on_hlt, guest_vmexit_on_pause;
static int virtio_msix = 1; static int virtio_msix = 1;
static int x2apic_mode; /* default is xAPIC */ static int x2apic_mode; /* default is xAPIC */
@ -136,14 +135,11 @@ usage(int code)
" -b: enable bvmcons\n" " -b: enable bvmcons\n"
" -c: # cpus (default 1)\n" " -c: # cpus (default 1)\n"
" -C: include guest memory in core file\n" " -C: include guest memory in core file\n"
" -e: exit on unhandled I/O access\n"
" -g: gdb port\n" " -g: gdb port\n"
" -h: help\n" " -h: help\n"
" -H: vmexit from the guest on hlt\n"
" -l: LPC device configuration\n" " -l: LPC device configuration\n"
" -m: memory size in MB\n" " -m: memory size in MB\n"
" -p: pin 'vcpu' to 'hostcpu'\n" " -p: pin 'vcpu' to 'hostcpu'\n"
" -P: vmexit from the guest on pause\n"
" -s: <slot,driver,configinfo> PCI slot config\n" " -s: <slot,driver,configinfo> PCI slot config\n"
" -S: guest memory cannot be swapped\n" " -S: guest memory cannot be swapped\n"
" -u: RTC keeps UTC time\n" " -u: RTC keeps UTC time\n"
@ -171,7 +167,7 @@ usage(int code)
static void static void
print_version(void) print_version(void)
{ {
fprintf(stderr, "DM version is: %s-%s (daily tag:%s), build by %s@%s\n", fprintf(stdout, "DM version is: %s-%s (daily tag:%s), build by %s@%s\n",
DM_FULL_VERSION, DM_FULL_VERSION,
DM_BUILD_VERSION, DM_DAILY_TAG, DM_BUILD_USER, DM_BUILD_TIME); DM_BUILD_VERSION, DM_DAILY_TAG, DM_BUILD_USER, DM_BUILD_TIME);
@ -695,12 +691,11 @@ static struct option long_options[] = {
{"ncpus", required_argument, 0, 'c' }, {"ncpus", required_argument, 0, 'c' },
{"memflags_incore", no_argument, 0, 'C' }, {"memflags_incore", no_argument, 0, 'C' },
{"gdb_port", required_argument, 0, 'g' }, {"gdb_port", required_argument, 0, 'g' },
{"ioc node", required_argument, 0, 'i' },
{"lpc", required_argument, 0, 'l' }, {"lpc", required_argument, 0, 'l' },
{"pci_slot", required_argument, 0, 's' }, {"pci_slot", required_argument, 0, 's' },
{"memflags_wired", no_argument, 0, 'S' }, {"memflags_wired", no_argument, 0, 'S' },
{"memsize", required_argument, 0, 'm' }, {"memsize", required_argument, 0, 'm' },
{"ioapic", no_argument, 0, 'I' },
{"vmexit_pause", no_argument, 0, 'P' },
{"rtc_localtime", no_argument, 0, 'u' }, {"rtc_localtime", no_argument, 0, 'u' },
{"uuid", required_argument, 0, 'U' }, {"uuid", required_argument, 0, 'U' },
{"strictmsr", no_argument, 0, 'w' }, {"strictmsr", no_argument, 0, 'w' },
@ -747,7 +742,7 @@ main(int argc, char *argv[])
if (signal(SIGINT, sig_handler_term) == SIG_ERR) if (signal(SIGINT, sig_handler_term) == SIG_ERR)
fprintf(stderr, "cannot register handler for SIGINT\n"); fprintf(stderr, "cannot register handler for SIGINT\n");
optstr = "abehuwxACHIPSWYvk:r:B:p:g:c:s:m:l:U:G:i:"; optstr = "abhuwxACSWYvk:r:B:p:g:c:s:m:l:U:G:i:";
while ((c = getopt_long(argc, argv, optstr, long_options, while ((c = getopt_long(argc, argv, optstr, long_options,
&option_idx)) != -1) { &option_idx)) != -1) {
switch (c) { switch (c) {
@ -801,21 +796,6 @@ main(int argc, char *argv[])
if (error) if (error)
errx(EX_USAGE, "invalid memsize '%s'", optarg); errx(EX_USAGE, "invalid memsize '%s'", optarg);
break; break;
case 'H':
guest_vmexit_on_hlt = 1;
break;
case 'I':
/*
* The "-I" option was used to add an ioapic to the
* virtual machine.
*
* An ioapic is now provided unconditionally for each
* virtual machine and this option is now deprecated.
*/
break;
case 'P':
guest_vmexit_on_pause = 1;
break;
case 'u': case 'u':
vrtc_enable_localtime(0); vrtc_enable_localtime(0);
break; break;