proxmox-mirrors/qemu
1
0
Fork 0
mirror of https://git.proxmox.com/git/qemu synced 2025-08-06 17:31:06 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

boot: remove unused boot_devices_bitmap variable

Browse Source 
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:
Eduardo Habkost 2010-04-06 19:22:08 -03:00 committed by Aurelien Jarno
parent da1fcfda59
commit 4e9e9d6e0a
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
vl.c
View File

@ -1183,7 +1183,7 @@ int qemu_boot_set(const char *boot_devices)
return boot_set_handler(boot_set_opaque, 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 */ /* We just do some generic consistency checks */
const char *p; const char *p;
@ -1209,7 +1209,6 @@ static int parse_bootdevices(char *devices)
} }
bitmap |= 1 << (*p - 'a'); bitmap |= 1 << (*p - 'a');
} }
return bitmap;
} }
static void restore_boot_devices(void *opaque) 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) int main(int argc, char **argv, char **envp)
{ {
const char *gdbstub_dev = NULL; const char *gdbstub_dev = NULL;
uint32_t boot_devices_bitmap = 0;
int i; int i;
int snapshot, linux_boot; int snapshot, linux_boot;
const char *icount_option = NULL; const char *icount_option = NULL;
@ -2875,13 +2873,13 @@ int main(int argc, char **argv, char **envp)
if (legacy || if (legacy ||
get_param_value(buf, sizeof(buf), "order", optarg)) { get_param_value(buf, sizeof(buf), "order", optarg)) {
boot_devices_bitmap = parse_bootdevices(buf); validate_bootdevices(buf);
pstrcpy(boot_devices, sizeof(boot_devices), buf); pstrcpy(boot_devices, sizeof(boot_devices), buf);
} }
if (!legacy) { if (!legacy) {
if (get_param_value(buf, sizeof(buf), if (get_param_value(buf, sizeof(buf),
"once", optarg)) { "once", optarg)) {
boot_devices_bitmap |= parse_bootdevices(buf); validate_bootdevices(buf);
standard_boot_devices = qemu_strdup(boot_devices); standard_boot_devices = qemu_strdup(boot_devices);
pstrcpy(boot_devices, sizeof(boot_devices), buf); pstrcpy(boot_devices, sizeof(boot_devices), buf);
qemu_register_reset(restore_boot_devices, qemu_register_reset(restore_boot_devices,