diff mbox

[PULL,2/2] bootdevice: add check in restore_boot_order()

Message ID 1425361889-4580-3-git-send-email-arei.gonglei@huawei.com
State New
Headers show

Commit Message

Gonglei (Arei) March 3, 2015, 5:51 a.m. UTC 
From: Gonglei <arei.gonglei@huawei.com>

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 |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
diff mbox

Patch

diff --git a/bootdevice.c b/bootdevice.c
index c3a010c..df9ab0e 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);