OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

vl: Rename *boot_devices to *boot_order, for consistency

Browse Source 
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>
This commit is contained in:
Markus Armbruster 2013-06-14 13:15:04 +02:00 committed by Anthony Liguori
parent 8281abd548
commit 083b79c9fe
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/hw/hw.h
View File

@ -44,9 +44,9 @@ void qemu_unregister_reset(QEMUResetHandler *func, void *opaque);
/* handler to set the boot_device order for a specific type of QEMUMachine */
/* return 0 if success */
typedef int QEMUBootSetHandler(void *opaque, const char *boot_devices);
typedef int QEMUBootSetHandler(void *opaque, const char *boot_order);
void qemu_register_boot_set(QEMUBootSetHandler *func, void *opaque);
int qemu_boot_set(const char *boot_devices);
int qemu_boot_set(const char *boot_order);
#ifdef NEED_CPU_H
#if TARGET_LONG_BITS == 64

16
vl.c
View File

@ -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);