commit 76349f5ba8f4e2f0b8c93c12ec0950a8bc77408a
author Gonglei <arei.gonglei@huawei.com> Thu Jan 29 13:13:47 2015 +0000
committer Lili <huanglili.huang@huawei.com> Tue Mar 03 13:13:21 2015 +0800
tree b86939dc5f1703725638875a6a51e37568931683
parent f05f47bb5f07ca32a23edf1df3dd75f5004f9325

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 <armbru@redhat.com>
Signed-off-by: Gonglei <arei.gonglei@huawei.com>
Reviewed-by: Markus Armbruster <armbru@redhat.com>

bootdevice.c

diff --git a/bootdevice.c b/bootdevice.c
index c3a010c..df9ab0e 100644
--- a/bootdevice.c
+++ b/bootdevice.c
@@ -105,7 +105,9 @@
         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);