diff options
| author | Peter Maydell | 2015-03-08 07:43:32 +0100 |
|---|---|---|
| committer | Peter Maydell | 2015-03-08 07:43:32 +0100 |
| commit | fff795ab383e2052cfef792e74a3086e12a14f14 (patch) | |
| tree | a3275f016c7a5ecebe6d67e8922bd825b2218412 /bootdevice.c | |
| parent | Merge remote-tracking branch 'remotes/bkoppelmann/tags/pull-tricore-20150303'... (diff) | |
| parent | bootdevice: add check in restore_boot_order() (diff) | |
| download | qemu-fff795ab383e2052cfef792e74a3086e12a14f14.tar.gz qemu-fff795ab383e2052cfef792e74a3086e12a14f14.tar.xz qemu-fff795ab383e2052cfef792e74a3086e12a14f14.zip | |
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.c | 4 |
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); |