bootdevice: add check in restore_boot_order()
authorGonglei <arei.gonglei@huawei.com>
Thu, 29 Jan 2015 13:13:47 +0000 (13:13 +0000)
committerLili <huanglili.huang@huawei.com>
Tue, 3 Mar 2015 05:13:21 +0000 (13:13 +0800)
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

index c3a010c09448afbb366bc3cc398a7032efd7a59a..df9ab0e8021dc45b0a318386311aa8eec88f9ccd 100644 (file)
@@ -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);