qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Amos Kong <akong@redhat.com>
To: seabios@seabios.org
Cc: Amos Kong <akong@redhat.com>,
	kevin@koconnor.net, dallan@redhat.com, qemu-devel@nongnu.org,
	gleb@redhat.com
Subject: [Qemu-devel] [SeaBIOS PATCH v3] boot: add a new type to halt booting
Date: Wed,  9 Jan 2013 13:17:07 +0800	[thread overview]
Message-ID: <1357708627-14094-1-git-send-email-akong@redhat.com> (raw)
In-Reply-To: <20130109040042.GC26614@morn.localdomain>

Current seabios will try to boot from selected devices first,
if they are all failed, seabios will also try to boot from
un-selected devices.

For example:
@ qemu-kvm -boot order=n,menu=on ...

Guest will boot from network first, if it's failed, guest will try to
boot from other un-selected devices (floppy, cdrom, disk) one by one.

We need to make it configurable. This patch added a new type, qemu can
add "HALT" at the end of bootindex string, then seabios will halt
booting after trying to boot from selected devices.

Signed-off-by: Kevin O'Connor <kevin@koconnor.net>
Signed-off-by: Amos Kong <akong@redhat.com>
---
v3: add a new type to halt booting (Kevin)
___
 src/boot.c |    9 +++++++++
 1 files changed, 9 insertions(+), 0 deletions(-)

diff --git a/src/boot.c b/src/boot.c
index c67cc7f..eea2354 100644
--- a/src/boot.c
+++ b/src/boot.c
@@ -291,6 +291,7 @@ static struct bootentry_s *BootList;
 #define IPL_TYPE_CBFS        0x20
 #define IPL_TYPE_BEV         0x80
 #define IPL_TYPE_BCV         0x81
+#define IPL_TYPE_HALT        0xf0
 
 static void
 bootentry_add(int type, int prio, u32 data, const char *desc)
@@ -488,6 +489,11 @@ boot_prep(void)
     interactive_bootmenu();
     wait_threads();
 
+    int haltprio = find_prio("HALT");
+
+    if (haltprio >= 0)
+        bootentry_add(IPL_TYPE_HALT, haltprio, 0, "HALT");
+
     // Map drives and populate BEV list
     struct bootentry_s *pos = BootList;
     while (pos) {
@@ -672,6 +678,9 @@ do_boot(int seq_nr)
     case IPL_TYPE_BEV:
         boot_rom(ie->vector);
         break;
+    case IPL_TYPE_HALT:
+        boot_fail();
+        break;
     }
 
     // Boot failed: invoke the boot recovery function
-- 
1.7.1

  parent reply	other threads:[~2013-01-09  5:17 UTC|newest]

Thread overview: 16+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-12-19  7:22 [Qemu-devel] [PATCH] don't boot from un-selected devices Amos Kong
2012-12-19  7:24 ` [Qemu-devel] [Resend][Seabios PATCH] " Amos Kong
2012-12-19  7:38   ` Gerd Hoffmann
2012-12-19  8:12     ` Amos Kong
2012-12-19  9:32   ` Gleb Natapov
2012-12-25  3:58     ` Amos Kong
2012-12-25  6:37       ` Gleb Natapov
2012-12-25 10:37         ` Amos Kong
2012-12-26  0:55           ` [Qemu-devel] [SeaBIOS PATCH v2] boot: support strict boot and make it configurable Amos Kong
2013-01-09  4:00             ` Kevin O'Connor
2013-01-09  5:03               ` Amos Kong
2013-01-12 22:01                 ` Kevin O'Connor
2013-01-09  5:17               ` Amos Kong [this message]
2012-12-25 15:59     ` [Qemu-devel] [Resend][Seabios PATCH] don't boot from un-selected devices Ronen Hod
2012-12-25 17:15       ` Gleb Natapov
2012-12-19 16:39   ` Kevin O'Connor

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1357708627-14094-1-git-send-email-akong@redhat.com \
    --to=akong@redhat.com \
    --cc=dallan@redhat.com \
    --cc=gleb@redhat.com \
    --cc=kevin@koconnor.net \
    --cc=qemu-devel@nongnu.org \
    --cc=seabios@seabios.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).