diff options
author | Gonglei <arei.gonglei@huawei.com> | 2014-12-03 18:20:58 +0000 |
---|---|---|
committer | root <root@ceth6.(none)> | 2014-12-22 14:39:20 +0800 |
commit | f1839938b090b28537d9be2c1b255b834f3cfbb8 (patch) | |
tree | ebeb86523e811daf6ccd5641c427d15e9c4c88b9 /bootdevice.c | |
parent | 703008e81a6ace40f227aae16d630014e5016af1 (diff) | |
download | qemu-f1839938b090b28537d9be2c1b255b834f3cfbb8.zip qemu-f1839938b090b28537d9be2c1b255b834f3cfbb8.tar.gz qemu-f1839938b090b28537d9be2c1b255b834f3cfbb8.tar.bz2 |
bootdevice: add Error **errp argument for qemu_boot_set()
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>
Diffstat (limited to 'bootdevice.c')
-rw-r--r-- | bootdevice.c | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/bootdevice.c b/bootdevice.c index 184348e..7f07507 100644 --- a/bootdevice.c +++ b/bootdevice.c @@ -47,12 +47,18 @@ void qemu_register_boot_set(QEMUBootSetHandler *func, void *opaque) boot_set_opaque = opaque; } -int qemu_boot_set(const char *boot_order) +void qemu_boot_set(const char *boot_order, Error **errp) { if (!boot_set_handler) { - return -EINVAL; + error_setg(errp, "no function defined to set boot device list for" + " this architecture"); + return; + } + + if (boot_set_handler(boot_set_opaque, boot_order)) { + error_setg(errp, "setting boot device list failed"); + return; } - return boot_set_handler(boot_set_opaque, boot_order); } void validate_bootdevices(const char *devices, Error **errp) @@ -94,7 +100,7 @@ void restore_boot_order(void *opaque) return; } - qemu_boot_set(normal_boot_order); + qemu_boot_set(normal_boot_order, NULL); qemu_unregister_reset(restore_boot_order, normal_boot_order); g_free(normal_boot_order); |