aboutsummaryrefslogtreecommitdiff
path: root/bootdevice.c
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2015-03-08 06:43:32 +0000
committerPeter Maydell <peter.maydell@linaro.org>2015-03-08 06:43:32 +0000
commitfff795ab383e2052cfef792e74a3086e12a14f14 (patch)
treea3275f016c7a5ecebe6d67e8922bd825b2218412 /bootdevice.c
parentcff6abd6f2fc1af588207b27f2a6b96e15bd96dc (diff)
parent76349f5ba8f4e2f0b8c93c12ec0950a8bc77408a (diff)
Merge remote-tracking branch 'remotes/gonglei/tags/bootdevice-next-20150303' into staging
bootdevice: bug fixes # gpg: Signature made Tue Mar 3 05:18:39 2015 GMT using RSA key ID DDE30FBB # gpg: Good signature from "Gonglei <arei.gonglei@huawei.com>" # gpg: WARNING: This key is not certified with a trusted signature! # gpg: There is no indication that the signature belongs to the owner. # Primary key fingerprint: 5178 9C82 617F 2F58 8693 63B1 BA7A 65B0 DDE3 0FBB * remotes/gonglei/tags/bootdevice-next-20150303: bootdevice: add check in restore_boot_order() bootdevice: check boot order argument validation before vm running Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'bootdevice.c')
-rw-r--r--bootdevice.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/bootdevice.c b/bootdevice.c
index eacd8c88c2..673bfef60c 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);