From 76349f5ba8f4e2f0b8c93c12ec0950a8bc77408a Mon Sep 17 00:00:00 2001 From: Gonglei Date: Thu, 29 Jan 2015 13:13:47 +0000 Subject: bootdevice: add check in restore_boot_order() qemu_boot_set() can't fail in restore_boot_order(), then simply assert it doesn't fail, by passing &error_abort if boot_set_handler set. Suggested-by: Markus Armbruster Signed-off-by: Gonglei Reviewed-by: Markus Armbruster --- bootdevice.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'bootdevice.c') diff --git a/bootdevice.c b/bootdevice.c index c3a010c094..df9ab0e802 100644 --- a/bootdevice.c +++ b/bootdevice.c @@ -105,7 +105,9 @@ void restore_boot_order(void *opaque) return; } - qemu_boot_set(normal_boot_order, NULL); + if (boot_set_handler) { + qemu_boot_set(normal_boot_order, &error_abort); + } qemu_unregister_reset(restore_boot_order, normal_boot_order); g_free(normal_boot_order); -- cgit v1.2.1