hmp: Compile hmp_info_spice() only with CONFIG_SPICE

[qemu.git] / bootdevice.c

diff --git a/bootdevice.c b/bootdevice.c
index 184348ecd2f073281ac52376031e942077b2a42a..5914417027f02014dce6a882ad561959d9e01c9a 100644 (file)
--- a/bootdevice.c
+++ b/bootdevice.c
@@ -47,12 +47,23 @@ void qemu_register_boot_set(QEMUBootSetHandler *func, void *opaque)
     boot_set_opaque = opaque;
 }
 
-int qemu_boot_set(const char *boot_order)
+void qemu_boot_set(const char *boot_order, Error **errp)
 {
+    Error *local_err = NULL;
+
     if (!boot_set_handler) {
-        return -EINVAL;
+        error_setg(errp, "no function defined to set boot device list for"
+                         " this architecture");
+        return;
     }
-    return boot_set_handler(boot_set_opaque, boot_order);
+
+    validate_bootdevices(boot_order, &local_err);
+    if (local_err) {
+        error_propagate(errp, local_err);
+        return;
+    }
+
+    boot_set_handler(boot_set_opaque, boot_order, errp);
 }
 
 void validate_bootdevices(const char *devices, Error **errp)
@@ -94,7 +105,7 @@ void restore_boot_order(void *opaque)
         return;
     }
 
-    qemu_boot_set(normal_boot_order);
+    qemu_boot_set(normal_boot_order, NULL);
 
     qemu_unregister_reset(restore_boot_order, normal_boot_order);
     g_free(normal_boot_order);