qemu-devel
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Qemu-devel] [PATCH 1/2] bootdevice: remove the check about boot_set_han


From: arei.gonglei
Subject: [Qemu-devel] [PATCH 1/2] bootdevice: remove the check about boot_set_handler
Date: Thu, 29 Jan 2015 21:29:52 +0800

From: Gonglei <address@hidden>

The reset logic can be done by both machine reset and
boot handler. So we shouldn't return error when the boot
handler callback don't be set.

Cc: Alexander Graf <address@hidden>
Cc: Dinar Valeev <address@hidden>
Signed-off-by: Gonglei <address@hidden>
---
 bootdevice.c | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/bootdevice.c b/bootdevice.c
index 5914417..52d3f9e 100644
--- a/bootdevice.c
+++ b/bootdevice.c
@@ -51,19 +51,15 @@ void qemu_boot_set(const char *boot_order, Error **errp)
 {
     Error *local_err = NULL;
 
-    if (!boot_set_handler) {
-        error_setg(errp, "no function defined to set boot device list for"
-                         " this architecture");
-        return;
-    }
-
     validate_bootdevices(boot_order, &local_err);
     if (local_err) {
         error_propagate(errp, local_err);
         return;
     }
 
-    boot_set_handler(boot_set_opaque, boot_order, errp);
+    if (boot_set_handler) {
+        boot_set_handler(boot_set_opaque, boot_order, errp);
+    }
 }
 
 void validate_bootdevices(const char *devices, Error **errp)
-- 
1.7.12.4





reply via email to

[Prev in Thread] Current Thread [Next in Thread]