target-arm/translate-a64: Fix wrong mmu_idx usage for LDT/STT

[qemu.git] / bootdevice.c

diff --git a/bootdevice.c b/bootdevice.c
index 7f07507a95b62fdf3e93c371d8160edec95ef3c9..5914417027f02014dce6a882ad561959d9e01c9a 100644 (file)
--- a/bootdevice.c
+++ b/bootdevice.c
@@ -49,16 +49,21 @@ void qemu_register_boot_set(QEMUBootSetHandler *func, void *opaque)
 
 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;
     }
 
-    if (boot_set_handler(boot_set_opaque, boot_order)) {
-        error_setg(errp, "setting boot device list failed");
+    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)