diff --git a/qemu.sh b/qemu.sh index c594e9a..ae2effe 100755 --- a/qemu.sh +++ b/qemu.sh @@ -46,7 +46,7 @@ exec qemu-system-x86_64 \ -drive "if=pflash,format=raw,file=${build}/${flash_name}.fd" \ -drive "format=raw,file=${build}/popcorn.img" \ -monitor telnet:localhost:45454,server,nowait \ - -smp 1 \ + -smp 4 \ -m 512 \ -d mmu,int,guest_errors \ -D popcorn.log \ diff --git a/src/include/log_areas.inc b/src/include/log_areas.inc index 5c78128..60ac940 100644 --- a/src/include/log_areas.inc +++ b/src/include/log_areas.inc @@ -1,9 +1,9 @@ LOG(apic, info); LOG(device, info); -LOG(paging, info); +LOG(paging, warn); LOG(driver, info); -LOG(memory, debug); +LOG(memory, info); LOG(fs, info); -LOG(task, debug); -LOG(boot, debug); -LOG(syscall,debug); +LOG(task, info); +LOG(boot, info); +LOG(syscall,info); diff --git a/src/kernel/device_manager.cpp b/src/kernel/device_manager.cpp index 377fe57..1bb6f0f 100644 --- a/src/kernel/device_manager.cpp +++ b/src/kernel/device_manager.cpp @@ -167,7 +167,13 @@ device_manager::load_apic(const acpi_apic *apic) const uint8_t length = p[1]; switch (type) { - case 0: // Local APIC + case 0: { // Local APIC + uint8_t uid = kutil::read_from(p+2); + uint8_t id = kutil::read_from(p+3); + log::debug(logs::device, " Local APIC uid %x id %x", id); + } + break; + case 1: // I/O APIC break;