mirror of https://github.com/xemu-project/xemu.git
boot: remove unused boot_devices_bitmap variable
In addition to removing the variable, this also renames the parse_bootdevices() function to validate_bootdevices(), as we don't need its return value anymore. Signed-off-by: Eduardo Habkost <ehabkost@redhat.com> Acked-by: Juan Quintela <quintela@redhat.com> Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>
This commit is contained in:
parent
da1fcfda59
commit
4e9e9d6e0a
8
vl.c
8
vl.c
|
@ -1183,7 +1183,7 @@ int qemu_boot_set(const char *boot_devices)
|
|||
return boot_set_handler(boot_set_opaque, boot_devices);
|
||||
}
|
||||
|
||||
static int parse_bootdevices(char *devices)
|
||||
static void validate_bootdevices(char *devices)
|
||||
{
|
||||
/* We just do some generic consistency checks */
|
||||
const char *p;
|
||||
|
@ -1209,7 +1209,6 @@ static int parse_bootdevices(char *devices)
|
|||
}
|
||||
bitmap |= 1 << (*p - 'a');
|
||||
}
|
||||
return bitmap;
|
||||
}
|
||||
|
||||
static void restore_boot_devices(void *opaque)
|
||||
|
@ -2556,7 +2555,6 @@ static const QEMUOption *lookup_opt(int argc, char **argv,
|
|||
int main(int argc, char **argv, char **envp)
|
||||
{
|
||||
const char *gdbstub_dev = NULL;
|
||||
uint32_t boot_devices_bitmap = 0;
|
||||
int i;
|
||||
int snapshot, linux_boot;
|
||||
const char *icount_option = NULL;
|
||||
|
@ -2875,13 +2873,13 @@ int main(int argc, char **argv, char **envp)
|
|||
|
||||
if (legacy ||
|
||||
get_param_value(buf, sizeof(buf), "order", optarg)) {
|
||||
boot_devices_bitmap = parse_bootdevices(buf);
|
||||
validate_bootdevices(buf);
|
||||
pstrcpy(boot_devices, sizeof(boot_devices), buf);
|
||||
}
|
||||
if (!legacy) {
|
||||
if (get_param_value(buf, sizeof(buf),
|
||||
"once", optarg)) {
|
||||
boot_devices_bitmap |= parse_bootdevices(buf);
|
||||
validate_bootdevices(buf);
|
||||
standard_boot_devices = qemu_strdup(boot_devices);
|
||||
pstrcpy(boot_devices, sizeof(boot_devices), buf);
|
||||
qemu_register_reset(restore_boot_devices,
|
||||
|
|
Loading…
Reference in New Issue