64 lines
2.3 KiB
Diff
64 lines
2.3 KiB
Diff
|
From fbd17986e80087d0d686c5b13a5b39998c845f2c Mon Sep 17 00:00:00 2001
|
||
|
|
From: Eduardo Habkost <ehabkost@redhat.com>
|
||
|
|
Date: Tue, 6 Apr 2010 19:38:53 -0300
|
||
|
|
Subject: [PATCH] boot: remove unused boot_devices_bitmap variable
|
||
|
|
|
||
|
|
Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=561078
|
||
|
|
|
||
|
|
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>
|
||
|
|
---
|
||
|
|
vl.c | 8 +++-----
|
||
|
|
1 files changed, 3 insertions(+), 5 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/vl.c b/vl.c
|
||
|
|
index 98d390e..2c97805 100644
|
||
|
|
--- a/vl.c
|
||
|
|
+++ b/vl.c
|
||
|
|
@@ -2514,7 +2514,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;
|
||
|
|
@@ -2540,7 +2540,6 @@ static int parse_bootdevices(char *devices)
|
||
|
|
}
|
||
|
|
bitmap |= 1 << (*p - 'a');
|
||
|
|
}
|
||
|
|
- return bitmap;
|
||
|
|
}
|
||
|
|
|
||
|
|
static void restore_boot_devices(void *opaque)
|
||
|
|
@@ -4907,7 +4906,6 @@ static int virtcon_parse(const char *devname)
|
||
|
|
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 *initrd_filename;
|
||
|
|
@@ -5202,13 +5200,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,
|
||
|
|
--
|
||
|
|
1.6.6.1
|
||
|
|
|