[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 2/2] bootdevice: add check in restore_boot_order()
From: |
arei.gonglei |
Subject: |
[Qemu-devel] [PULL 2/2] bootdevice: add check in restore_boot_order() |
Date: |
Tue, 3 Mar 2015 13:51:29 +0800 |
From: Gonglei <address@hidden>
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 <address@hidden>
Signed-off-by: Gonglei <address@hidden>
Reviewed-by: Markus Armbruster <address@hidden>
---
bootdevice.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
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);
--
1.7.9.5