From: Jack Lange Date: Fri, 29 Oct 2010 21:41:03 +0000 (-0500) Subject: Merge branch 'devel' of ssh://palacios@newskysaw/home/palacios/palacios into devel X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?p=palacios.git;a=commitdiff_plain;h=cd89b672b4f7e1b64c86ff0234a9935946533590 Merge branch 'devel' of ssh://palacios@newskysaw/home/palacios/palacios into devel Conflicts: palacios/src/devices/apic.c --- cd89b672b4f7e1b64c86ff0234a9935946533590 diff --cc palacios/src/devices/apic.c index f240957,c6441fb..348fff7 --- a/palacios/src/devices/apic.c +++ b/palacios/src/devices/apic.c @@@ -660,17 -670,25 +679,17 @@@ static int deliver_ipi(struct apic_stat } -static int route_ipi(struct guest_info * core, struct apic_dev_state * apic_dev, - struct apic_state * src_apic, uint32_t icr_val) { - struct int_cmd_reg * icr = (struct int_cmd_reg *)&icr_val; +static int route_ipi(struct apic_dev_state * apic_dev, + struct apic_state * src_apic, + struct int_cmd_reg * icr) { struct apic_state * dest_apic = NULL; - PrintDebug("icc_bus: icc_bus=%p, src_apic=%u, icr_data=%llx, extirq=%u\n", - icc_bus, src_apic, icr_data, extirq); + PrintDebug("route_ipi: src_apic=%p, icr_data=%x", + src_apic, icr_val); - // initial sanity checks - if (src_apic == NULL) { - PrintError("route_ipi: Apparently sending from unregistered apic id=%d\n", - src_apic->core->cpu_id); - return -1; - } - - if ((icr->dst_mode == 0) && (icr->dst >= apic_dev->num_apics)) { - PrintError("icc_bus: Attempted send to unregistered apic id=%u\n", + PrintError("route_ipi: Attempted send to unregistered apic id=%u\n", icr->dst); return -1; } diff --cc test/geekos_test_vm/src/common/fmtout.c index c097eb4,c097eb4..ca7f6c0 --- a/test/geekos_test_vm/src/common/fmtout.c +++ b/test/geekos_test_vm/src/common/fmtout.c @@@ -78,7 -78,7 +78,8 @@@ enum ranks #define PTRDIFF_T_RANK rank_long /* DHH */ --#define EMIT(x) do { (q)->Emit((q), (x)); } while (0) ++#include ++#define EMIT(x) do { if (q == NULL) {(q)->Emit((q), (x));} } while (0) /* * DHH - As a hack, we buffer this many digits when generating diff --cc test/geekos_test_vm/src/geekos/bget.c index cccbe16,cccbe16..d13c3e0 --- a/test/geekos_test_vm/src/geekos/bget.c +++ b/test/geekos_test_vm/src/geekos/bget.c @@@ -525,10 -525,10 +525,9 @@@ struct bfhead }; #define BFH(p) ((struct bfhead *) (p)) --static struct bfhead freelist = { /* List of free buffers */ -- {0, 0}, -- {&freelist, &freelist} --}; ++static struct bfhead freelist; /* List of free buffers */ ++ ++ #ifdef BufStats @@@ -1017,6 -1017,6 +1016,14 @@@ void bpool(buf, len assert(len - sizeof(struct bhead) <= -((bufsize) ESent + 1)); ++ /* Initialize Free list since compile time static initializations appear to be broken */ ++ freelist.bh.prevfree = 0; ++ freelist.bh.bsize = 0; ++ freelist.ql.flink = &freelist; ++ freelist.ql.blink = &freelist; ++ ++ ++ /* Clear the backpointer at the start of the block to indicate that there is no free block prior to this one. That blocks recombination when the first block in memory is released. */ diff --cc test/geekos_test_vm/src/geekos/main.c index a163378,a163378..8dd05ab --- a/test/geekos_test_vm/src/geekos/main.c +++ b/test/geekos_test_vm/src/geekos/main.c @@@ -241,18 -241,18 +241,15 @@@ void Main(struct Boot_Info* bootInfo { struct Kernel_Thread * key_thread; struct Kernel_Thread * spkr_thread; ulong_t doIBuzz = 0; Init_BSS(); ++ Init_VMCons(); Init_Screen(); InitSerial(); -- -- Init_VMCons(); ++ Print("Initializing Memory\n"); Init_Mem(bootInfo); ++ Print("Memory Done\n"); Init_CRC32(); Init_TSS(); Init_Interrupts(); @@@ -268,10 -268,10 +265,6 @@@ -- -- -- -- PrintBoth("\n\nHello, Welcome to this horrid output-only serial interface\n"); PrintBoth("Eventually, this will let us control the VMM\n\n"); diff --cc test/geekos_test_vm/src/geekos/malloc.c index ea76959,ea76959..269f0a2 --- a/test/geekos_test_vm/src/geekos/malloc.c +++ b/test/geekos_test_vm/src/geekos/malloc.c @@@ -19,7 -19,7 +19,7 @@@ */ void Init_Heap(ulong_t start, ulong_t size) { -- /*Print("Creating kernel heap: start=%lx, size=%ld\n", start, size);*/ ++ Print("Creating kernel heap: start=%lx, size=%ld\n", start, size); bpool((void*) start, size); } diff --cc test/geekos_test_vm/src/geekos/mem.c index 2f44520,2f44520..6ab2051 --- a/test/geekos_test_vm/src/geekos/mem.c +++ b/test/geekos_test_vm/src/geekos/mem.c @@@ -109,7 -109,7 +109,11 @@@ void Init_Mem(struct Boot_Info* bootInf ulong_t pageListAddr; ulong_t kernEnd; ++ ++ memset(&s_freeList, 0, sizeof(struct Page_List)); ++ KASSERT(bootInfo->memSizeKB > 0); ++ Print("Booting with %d KB memory\n", bootInfo->memSizeKB); /* * Before we do anything, switch from setup.asm's temporary GDT @@@ -180,10 -180,10 +184,12 @@@ /* Initialize the kernel heap */ // Init_Heap(HIGHMEM_START, KERNEL_HEAP_SIZE); ++ ++ Print("Initing heap\n"); Init_Heap(kernEnd, KERNEL_HEAP_SIZE); Print("%uKB memory detected, %u pages in freelist, %d bytes in kernel heap\n", -- bootInfo->memSizeKB, g_freePageCount, KERNEL_HEAP_SIZE); ++ bootInfo->memSizeKB, g_freePageCount, KERNEL_HEAP_SIZE); } /* diff --cc test/geekos_test_vm/src/geekos/screen.c index 077112f,077112f..5323e3c --- a/test/geekos_test_vm/src/geekos/screen.c +++ b/test/geekos_test_vm/src/geekos/screen.c @@@ -14,6 -14,6 +14,7 @@@ #include #include #include ++#include /* * Information sources for VT100 and ANSI escape sequences: @@@ -387,20 -387,20 +388,6 @@@ static void Update_Cursor(void * Public functions * ---------------------------------------------------------------------- */ --/* -- * Initialize the screen module. -- */ --void Init_Screen(void) --{ -- bool iflag = Begin_Int_Atomic(); -- -- s_cons.row = s_cons.col = 0; -- s_cons.currentAttr = DEFAULT_ATTRIBUTE; -- Clear_Screen(); -- -- End_Int_Atomic(iflag); -- Print("Screen Inited\n"); --} /* * Clear the screen using the current attribute. @@@ -512,7 -512,7 +499,7 @@@ void Put_Buf(const char* buf, ulong_t l /* Support for Print(). */ static void Print_Emit(struct Output_Sink *o, int ch) { Put_Char_Imp(ch); } static void Print_Finish(struct Output_Sink *o) { Update_Cursor(); } --static struct Output_Sink s_outputSink = { &Print_Emit, &Print_Finish }; ++static struct Output_Sink s_outputSink; /* * Print to console using printf()-style formatting. @@@ -542,3 -542,3 +529,22 @@@ void PrintList(const char * fmt, va_lis PrintInternal(fmt, ap); End_Int_Atomic(iflag); } ++ ++ ++/* ++ * Initialize the screen module. ++ */ ++void Init_Screen(void) ++{ ++ bool iflag = Begin_Int_Atomic(); ++ ++ s_outputSink.Emit = &Print_Emit; ++ s_outputSink.Finish = &Print_Finish; ++ ++ s_cons.row = s_cons.col = 0; ++ s_cons.currentAttr = DEFAULT_ATTRIBUTE; ++ Clear_Screen(); ++ ++ End_Int_Atomic(iflag); ++ Print("Screen Inited\n"); ++}