[Qemu-commits] [qemu/qemu] f05f47: bootdevice: check boot order argument validation b...

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: f05f47bb5f07ca32a23edf1df3dd75f5004f9325
      
https://github.com/qemu/qemu/commit/f05f47bb5f07ca32a23edf1df3dd75f5004f9325
  Author: Gonglei <address@hidden>
  Date:   2015-03-03 (Tue, 03 Mar 2015)

  Changed paths:
    M vl.c

  Log Message:
  -----------
  bootdevice: check boot order argument validation before vm running

Either 'once' option or 'order' option can take effect for -boot at
the same time, that is say initial startup processing can check only
one. And pc.c's set_boot_dev() fails when its boot order argument
is invalid. This patch provide a solution fix this problem:

 1. If "once" is given, register reset handler to restore boot order.

 2. Pass the normal boot order to machine creation.  Should fail when
   the normal boot order is invalid.

 3. If "once" is given, set it with qemu_boot_set().  Fails when the
   once boot order is invalid.

 4. Start the machine.

 5. On reset, the reset handler calls qemu_boot_set() to restore boot
   order.  Should never fail.

Suggested-by: Markus Armbruster <address@hidden>
Signed-off-by: Gonglei <address@hidden>
Reviewed-by: Markus Armbruster <address@hidden>


  Commit: 76349f5ba8f4e2f0b8c93c12ec0950a8bc77408a
      
https://github.com/qemu/qemu/commit/76349f5ba8f4e2f0b8c93c12ec0950a8bc77408a
  Author: Gonglei <address@hidden>
  Date:   2015-03-03 (Tue, 03 Mar 2015)

  Changed paths:
    M bootdevice.c

  Log Message:
  -----------
  bootdevice: add check in restore_boot_order()

qemu_boot_set() can't fail in restore_boot_order(),
then simply assert it doesn't fail, by passing
&error_abort if boot_set_handler set.

Suggested-by: Markus Armbruster <address@hidden>
Signed-off-by: Gonglei <address@hidden>
Reviewed-by: Markus Armbruster <address@hidden>


  Commit: fff795ab383e2052cfef792e74a3086e12a14f14
      
https://github.com/qemu/qemu/commit/fff795ab383e2052cfef792e74a3086e12a14f14
  Author: Peter Maydell <address@hidden>
  Date:   2015-03-08 (Sun, 08 Mar 2015)

  Changed paths:
    M bootdevice.c
    M vl.c

  Log Message:
  -----------
  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 <address@hidden>"
# 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 <address@hidden>


Compare: https://github.com/qemu/qemu/compare/cff6abd6f2fc...fff795ab383e