github/acrn-hypervisor
1
0
Fork 0
mirror of https://github.com/projectacrn/acrn-hypervisor.git synced 2025-06-19 12:12:16 +00:00
Code Issues Projects Releases Wiki Activity

dm: clean up the use of errx

Browse Source 
errx() does not require an additional exit().

Tracked-On: #3252
Signed-off-by: Peter Fang <peter.fang@intel.com>
Reviewed-by: <yonghua.huang@intel.com>
Acked-by: Yin, Fengwei <fengwei.yin@intel.com>
This commit is contained in:
Peter Fang 2019-06-28 22:54:57 -07:00 committed by wenlingz
parent 82f7720ae7
commit cb8bbf7bea
1 changed files with 9 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
devicemodel/core/main.c
View File

@ -806,8 +806,8 @@ main(int argc, char *argv[])
case 'p': case 'p':
if (pincpu_parse(optarg) != 0) { if (pincpu_parse(optarg) != 0) {
errx(EX_USAGE, errx(EX_USAGE,
"invalid vcpu pinning configuration '%s'", "invalid vcpu pinning configuration '%s'",
optarg); optarg);
} }
break; break;
case 'c': case 'c':
@ -836,8 +836,7 @@ main(int argc, char *argv[])
else else
break; break;
case 'm': case 'm':
error = vm_parse_memsize(optarg, &memsize); if (vm_parse_memsize(optarg, &memsize) != 0)
if (error)
errx(EX_USAGE, "invalid memsize '%s'", optarg); errx(EX_USAGE, "invalid memsize '%s'", optarg);
break; break;
case 'U': case 'U':
@ -866,25 +865,19 @@ main(int argc, char *argv[])
break; break;
break; break;
case 'G': case 'G':
if (acrn_parse_gvtargs(optarg) != 0) { if (acrn_parse_gvtargs(optarg) != 0)
errx(EX_USAGE, "invalid GVT param %s", optarg); errx(EX_USAGE, "invalid GVT param %s", optarg);
exit(1);
}
break; break;
case 'v': case 'v':
print_version(); print_version();
break; break;
case CMD_OPT_VSBL: case CMD_OPT_VSBL:
if (high_bios_size() == 0 && acrn_parse_vsbl(optarg) != 0) { if (high_bios_size() == 0 && acrn_parse_vsbl(optarg) != 0)
errx(EX_USAGE, "invalid vsbl param %s", optarg); errx(EX_USAGE, "invalid vsbl param %s", optarg);
exit(1);
}
break; break;
case CMD_OPT_OVMF: case CMD_OPT_OVMF:
if (!vsbl_file_name && acrn_parse_ovmf(optarg) != 0) { if (!vsbl_file_name && acrn_parse_ovmf(optarg) != 0)
errx(EX_USAGE, "invalid ovmf param %s", optarg); errx(EX_USAGE, "invalid ovmf param %s", optarg);
exit(1);
}
skip_pci_mem64bar_workaround = true; skip_pci_mem64bar_workaround = true;
break; break;
case CMD_OPT_PART_INFO: case CMD_OPT_PART_INFO:
@ -892,7 +885,6 @@ main(int argc, char *argv[])
errx(EX_USAGE, errx(EX_USAGE,
"invalid guest partition info param %s", "invalid guest partition info param %s",
optarg); optarg);
exit(1);
} }
break; break;
case CMD_OPT_TRUSTY_ENABLE: case CMD_OPT_TRUSTY_ENABLE:
@ -903,7 +895,6 @@ main(int argc, char *argv[])
errx(EX_USAGE, errx(EX_USAGE,
"invalid virtio poll interval %s", "invalid virtio poll interval %s",
optarg); optarg);
exit(1);
} }
break; break;
case CMD_OPT_MAC_SEED: case CMD_OPT_MAC_SEED:
@ -923,22 +914,16 @@ main(int argc, char *argv[])
is_rtvm = true; is_rtvm = true;
break; break;
case CMD_OPT_VTPM2: case CMD_OPT_VTPM2:
if (acrn_parse_vtpm2(optarg) != 0) { if (acrn_parse_vtpm2(optarg) != 0)
errx(EX_USAGE, "invalid vtpm2 param %s", optarg); errx(EX_USAGE, "invalid vtpm2 param %s", optarg);
exit(1);
}
break; break;
case CMD_OPT_INTR_MONITOR: case CMD_OPT_INTR_MONITOR:
if (acrn_parse_intr_monitor(optarg) != 0) { if (acrn_parse_intr_monitor(optarg) != 0)
errx(EX_USAGE, "invalid intr-monitor params %s", optarg); errx(EX_USAGE, "invalid intr-monitor params %s", optarg);
exit(1);
}
break; break;
case CMD_OPT_LOGGER_SETTING: case CMD_OPT_LOGGER_SETTING:
if (init_logger_setting(optarg) != 0) { if (init_logger_setting(optarg) != 0)
errx(EX_USAGE, "invalid logger setting params %s", optarg); errx(EX_USAGE, "invalid logger setting params %s", optarg);
exit(1);
}
break; break;
case 'h': case 'h':
usage(0); usage(0);