On Mon, Mar 12, 2012 at 11:25:07AM -0500, Anthony Liguori wrote:
> On 03/12/2012 09:48 AM, Andreas Färber wrote:
> >Hi Gerd,
> >
> >Am 12.03.2012 14:08, schrieb Gerd Hoffmann:
> >>New seabios release on the 1.6.3 stable branch -- lets update.
> >>Also add a Makefile + script to simplify seabios updating.
> >
> >That version was released yesterday and I don't see any PATCHes yet...
> >Care to share your build script first before you send a PULL?
> >You also forgot to mention where to pull from. ;)
> >
> >No objection to updating though.
>
> I happen to be looking to do this myself, but upon running SeaBIOS
> through some testing, I ran into:
>
> /home/anthony/build/qemu/x86_64-softmmu/qemu-system-x86_64 -kernel
[...]
> How extensively did you test the new seabios changes and are you able to
> recreate?
There's only two lines of code changes in this release (beyond build
related changes (8 lines)). I don't think it's seabios.
-Kevin
--- a/src/boot.c
+++ b/src/boot.c
@@ -326,7 +326,7 @@ boot_add_bev(u16 seg, u16 bev, u16 desc, int prio)
void
boot_add_bcv(u16 seg, u16 ip, u16 desc, int prio)
{
- bootentry_add(IPL_TYPE_BCV, defPrio(prio, DEFAULT_PRIO)
+ bootentry_add(IPL_TYPE_BCV, defPrio(prio, DefaultHDPrio)
, SEGOFF(seg, ip).segoff
, desc ? MAKE_FLATPTR(seg, desc) : "Legacy option rom");
}
diff --git a/src/pmm.c b/src/pmm.c
index 82a0b1d..c649fd8 100644
--- a/src/pmm.c
+++ b/src/pmm.c
@@ -214,7 +214,8 @@ malloc_fixupreloc(void)
int i;
for (i=0; i<ARRAY_SIZE(Zones); i++) {
struct zone_s *zone = Zones[i];
- zone->info->pprev = &zone->info;
+ if (zone->info)
+ zone->info->pprev = &zone->info;
}
// Add space free'd during relocation in f-segment to ZoneFSeg
