aboutsummaryrefslogtreecommitdiff
path: root/vl.c
diff options
context:
space:
mode:
authorMarkus Armbruster <armbru@redhat.com>2013-06-14 13:15:04 +0200
committerAnthony Liguori <aliguori@us.ibm.com>2013-06-19 14:10:42 -0500
commit083b79c9fea0e3842f0b2b57ff0d20ab5f57084a (patch)
treed89aa0101bcf31e426fa51e50b530aa8f3d7dda0 /vl.c
parent8281abd548d840d84223e66812491918c713e56c (diff)
downloadqemu-083b79c9fea0e3842f0b2b57ff0d20ab5f57084a.zip
qemu-083b79c9fea0e3842f0b2b57ff0d20ab5f57084a.tar.gz
qemu-083b79c9fea0e3842f0b2b57ff0d20ab5f57084a.tar.bz2
vl: Rename *boot_devices to *boot_order, for consistency
Signed-off-by: Markus Armbruster <armbru@redhat.com> Reviewed-by: Anthony Liguori <aliguori@us.ibm.com> Message-id: 1371208516-7857-5-git-send-email-armbru@redhat.com Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Diffstat (limited to 'vl.c')
-rw-r--r--vl.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/vl.c b/vl.c
index ea4e1ef..767e020 100644
--- a/vl.c
+++ b/vl.c
@@ -1149,12 +1149,12 @@ void qemu_register_boot_set(QEMUBootSetHandler *func, void *opaque)
boot_set_opaque = opaque;
}
-int qemu_boot_set(const char *boot_devices)
+int qemu_boot_set(const char *boot_order)
{
if (!boot_set_handler) {
return -EINVAL;
}
- return boot_set_handler(boot_set_opaque, boot_devices);
+ return boot_set_handler(boot_set_opaque, boot_order);
}
static void validate_bootdevices(const char *devices)
@@ -1185,9 +1185,9 @@ static void validate_bootdevices(const char *devices)
}
}
-static void restore_boot_devices(void *opaque)
+static void restore_boot_order(void *opaque)
{
- char *standard_boot_devices = opaque;
+ char *normal_boot_order = opaque;
static int first = 1;
/* Restore boot order and remove ourselves after the first boot */
@@ -1196,10 +1196,10 @@ static void restore_boot_devices(void *opaque)
return;
}
- qemu_boot_set(standard_boot_devices);
+ qemu_boot_set(normal_boot_order);
- qemu_unregister_reset(restore_boot_devices, standard_boot_devices);
- g_free(standard_boot_devices);
+ qemu_unregister_reset(restore_boot_order, normal_boot_order);
+ g_free(normal_boot_order);
}
void add_boot_device_path(int32_t bootindex, DeviceState *dev,
@@ -4093,7 +4093,7 @@ int main(int argc, char **argv, char **envp)
validate_bootdevices(once);
normal_boot_order = g_strdup(boot_order);
boot_order = once;
- qemu_register_reset(restore_boot_devices, normal_boot_order);
+ qemu_register_reset(restore_boot_order, normal_boot_order);
}
boot_menu = qemu_opt_get_bool(opts, "menu", boot_menu);