commit 703008e81a6ace40f227aae16d630014e5016af1
author Gonglei <arei.gonglei@huawei.com> Wed Dec 03 17:11:39 2014 +0000
committer root <root@ceth6.(none)> Mon Dec 22 14:39:20 2014 +0800
tree c515ae6d62765dd51094e9063e125bb8bdc3bac9
parent 9816833d3b8ec9adfb63b6a53f1b56f5304f4c40

bootdevice: add Error **errp argument for validate_bootdevices()

It will be useful for checking when we change traditional
boot order dynamically and propagate error message
to the monitor.

Signed-off-by: Gonglei <arei.gonglei@huawei.com>
Reviewed-by: Markus Armbruster <armbru@redhat.com>

vl.c

diff --git a/vl.c b/vl.c
index f665621..a824a7d 100644
--- a/vl.c
+++ b/vl.c
@@ -4087,16 +4087,25 @@
     if (opts) {
         char *normal_boot_order;
         const char *order, *once;
+        Error *local_err = NULL;
 
         order = qemu_opt_get(opts, "order");
         if (order) {
-            validate_bootdevices(order);
+            validate_bootdevices(order, &local_err);
+            if (local_err) {
+                error_report("%s", error_get_pretty(local_err));
+                exit(1);
+            }
             boot_order = order;
         }
 
         once = qemu_opt_get(opts, "once");
         if (once) {
-            validate_bootdevices(once);
+            validate_bootdevices(once, &local_err);
+            if (local_err) {
+                error_report("%s", error_get_pretty(local_err));
+                exit(1);
+            }
             normal_boot_order = g_strdup(boot_order);
             boot_order = once;
             qemu_register_reset(restore_boot_order, normal_boot_order);