deepblue/ipmitool
1
0
Fork 0
mirror of https://github.com/ipmitool/ipmitool.git synced 2025-05-10 18:47:22 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

chassis: bootdev: Refactor more

Browse Source 
* Get rid of magic '8' in bootdev options processing.

* Optimize the code of bootdev arguments processing, remove the
  special crafting of flags for 'clear-cmos' argument, make it use
  the same code as other options.

Signed-off-by: Alexander Amelkin <alexander@amelkin.msk.ru>
This commit is contained in:
Alexander Amelkin 2019-11-08 14:04:13 +03:00 committed by Alexander Amelkin
parent aa72d9c426
commit 0663814eec
1 changed files with 27 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
lib/ipmi_chassis.c
View File

@ -1714,7 +1714,8 @@ ipmi_chassis_set_bootflag_help()
/* /*
* Sugar. Macros for internal use by bootdev_parse_options() to make * Sugar. Macros for internal use by bootdev_parse_options() to make
* the structure initialization look better * the structure initialization look better. Can't use scope-limited
* static consts for initializers with gcc5, alas.
*/ */
#define BF1_OFFSET 0 #define BF1_OFFSET 0
#define BF2_OFFSET 1 #define BF2_OFFSET 1
@ -1730,13 +1731,15 @@ bootdev_parse_options(char *optstring, uint8_t flags[])
char *token; char *token;
char *saveptr = NULL; char *saveptr = NULL;
int optionError = 0; int optionError = 0;
static struct {
static const struct bootdev_opt_s {
char *name; char *name;
off_t offset; off_t offset;
unsigned char mask; unsigned char mask;
unsigned char value; unsigned char value;
char *desc; char *desc;
} *op, options[] = { } *op;
static const struct bootdev_opt_s options[] = {
/* data 1 */ /* data 1 */
{ {
"valid", "valid",
@ -2047,23 +2050,30 @@ ipmi_chassis_main(struct ipmi_intf * intf, int argc, char ** argv)
lprintf(LOG_NOTICE, " bios : Force boot into BIOS Setup"); lprintf(LOG_NOTICE, " bios : Force boot into BIOS Setup");
lprintf(LOG_NOTICE, " floppy: Force boot from Floppy/primary removable media"); lprintf(LOG_NOTICE, " floppy: Force boot from Floppy/primary removable media");
} else { } else {
if (argc < 3) static const char *kw = "options=";
rc = ipmi_chassis_set_bootdev(intf, argv[1], NULL); static const int kw_len = 8;
else if (strncmp(argv[2], "clear-cmos=", 11) == 0) { char *optstr = NULL;
if (strncmp(argv[2]+11, "yes", 3) == 0) { uint8_t flags[BF_BYTE_COUNT];
uint8_t flags[5] = {0, (1<<7), 0, 0, 0}; bool use_flags = false;
rc = ipmi_chassis_set_bootdev(intf, argv[1], flags);
} else if (argc >= 3) {
rc = ipmi_chassis_set_bootdev(intf, argv[1], NULL); if (!strcmp(argv[2], "clear-cmos=yes")) {
/* Exclusive clear-cmos, no other flags */
optstr = "clear-cmos";
}
else if (!strncmp(argv[2], kw, kw_len)) {
optstr = argv[2] + kw_len;
}
} }
else if (strncmp(argv[2], "options=", 8) == 0) { if (optstr) {
uint8_t flags[BF_BYTE_COUNT]; if (!bootdev_parse_options(optstr, flags))
if (!bootdev_parse_options(argv[2] + 8, flags))
return -1; return -1;
rc = ipmi_chassis_set_bootdev(intf, argv[1], flags); use_flags = true;
} }
else rc = ipmi_chassis_set_bootdev(intf, argv[1],
rc = ipmi_chassis_set_bootdev(intf, argv[1], NULL); use_flags
? flags
: NULL);
} }
} }
else if (!strcmp(argv[0], "bootmbox")) { else if (!strcmp(argv[0], "bootmbox")) {