From: Gonglei <arei.gong...@huawei.com> The reset logic can be done by both machine reset and boot handler. So we shouldn't return error when the boot handler callback don't be set.
Signed-off-by: Gonglei <arei.gong...@huawei.com> Reviewed-by: Alexander Graf <ag...@suse.de> --- bootdevice.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/bootdevice.c b/bootdevice.c index 5914417..52d3f9e 100644 --- a/bootdevice.c +++ b/bootdevice.c @@ -51,19 +51,15 @@ void qemu_boot_set(const char *boot_order, Error **errp) { Error *local_err = NULL; - if (!boot_set_handler) { - error_setg(errp, "no function defined to set boot device list for" - " this architecture"); - return; - } - validate_bootdevices(boot_order, &local_err); if (local_err) { error_propagate(errp, local_err); return; } - boot_set_handler(boot_set_opaque, boot_order, errp); + if (boot_set_handler) { + boot_set_handler(boot_set_opaque, boot_order, errp); + } } void validate_bootdevices(const char *devices, Error **errp) -- 1.7.12.4