david.venhoff/QEMU-Nyx-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bootdevice: add Error **errp argument for validate_bootdevices()

Browse Source 
It will be useful for checking when we change traditional
boot order dynamically and propagate error message
to the monitor.

Signed-off-by: Gonglei <arei.gonglei@huawei.com>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
This commit is contained in:
Gonglei 2014-12-03 17:11:39 +00:00 committed by root
parent 9816833d3b
commit 703008e81a
3 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
bootdevice.c
View File

@ -55,7 +55,7 @@ int qemu_boot_set(const char *boot_order)
return boot_set_handler(boot_set_opaque, boot_order); return boot_set_handler(boot_set_opaque, boot_order);
} }
void validate_bootdevices(const char *devices) void validate_bootdevices(const char *devices, Error **errp)
{ {
/* We just do some generic consistency checks */ /* We just do some generic consistency checks */
const char *p; const char *p;
@ -72,12 +72,12 @@ void validate_bootdevices(const char *devices)
* features. * features.
*/ */
if (*p < 'a' || *p > 'p') { if (*p < 'a' || *p > 'p') {
fprintf(stderr, "Invalid boot device '%c'\n", *p); error_setg(errp, "Invalid boot device '%c'", *p);
exit(1); return;
} }
if (bitmap & (1 << (*p - 'a'))) { if (bitmap & (1 << (*p - 'a'))) {
fprintf(stderr, "Boot device '%c' was given twice\n", *p); error_setg(errp, "Boot device '%c' was given twice", *p);
exit(1); return;
} }
bitmap |= 1 << (*p - 'a'); bitmap |= 1 << (*p - 'a');
} }

2
include/sysemu/sysemu.h
View File

@ -217,7 +217,7 @@ void device_add_bootindex_property(Object *obj, int32_t *bootindex,
const char *name, const char *suffix, const char *name, const char *suffix,
DeviceState *dev, Error **errp); DeviceState *dev, Error **errp);
void restore_boot_order(void *opaque); void restore_boot_order(void *opaque);
void validate_bootdevices(const char *devices); void validate_bootdevices(const char *devices, Error **errp);
/* handler to set the boot_device order for a specific type of QEMUMachine */ /* handler to set the boot_device order for a specific type of QEMUMachine */
/* return 0 if success */ /* return 0 if success */

13
vl.c
View File

@ -4087,16 +4087,25 @@ int main(int argc, char **argv, char **envp)
if (opts) { if (opts) {
char *normal_boot_order; char *normal_boot_order;
const char *order, *once; const char *order, *once;
Error *local_err = NULL;
order = qemu_opt_get(opts, "order"); order = qemu_opt_get(opts, "order");
if (order) { if (order) {
validate_bootdevices(order); validate_bootdevices(order, &local_err);
if (local_err) {
error_report("%s", error_get_pretty(local_err));
exit(1);
}
boot_order = order; boot_order = order;
} }
once = qemu_opt_get(opts, "once"); once = qemu_opt_get(opts, "once");
if (once) { if (once) {
validate_bootdevices(once); validate_bootdevices(once, &local_err);
if (local_err) {
error_report("%s", error_get_pretty(local_err));
exit(1);
}
normal_boot_order = g_strdup(boot_order); normal_boot_order = g_strdup(boot_order);
boot_order = once; boot_order = once;
qemu_register_reset(restore_boot_order, normal_boot_order); qemu_register_reset(restore_boot_order, normal_boot_order);