diff options
-rw-r--r-- | Kernel/Devices/BXVGADevice.cpp | 2 | ||||
-rw-r--r-- | Kernel/Devices/MBVGADevice.cpp | 2 | ||||
-rw-r--r-- | Kernel/FileSystem/VirtualFileSystem.cpp | 13 | ||||
-rw-r--r-- | Kernel/Thread.cpp | 2 |
4 files changed, 11 insertions, 8 deletions
diff --git a/Kernel/Devices/BXVGADevice.cpp b/Kernel/Devices/BXVGADevice.cpp index b7520c6c95..a45305f1d6 100644 --- a/Kernel/Devices/BXVGADevice.cpp +++ b/Kernel/Devices/BXVGADevice.cpp @@ -96,7 +96,7 @@ KResultOr<Region*> BXVGADevice::mmap(Process& process, FileDescription&, Virtual 0, "BXVGA Framebuffer", prot); - kprintf("BXVGA: %s(%u) created Region{%p} with size %u for framebuffer P%x with vaddr V%p\n", + dbgprintf("BXVGA: %s(%u) created Region{%p} with size %u for framebuffer P%x with vaddr V%p\n", process.name().characters(), process.pid(), region, region->size(), m_framebuffer_address.as_ptr(), region->vaddr().get()); ASSERT(region); diff --git a/Kernel/Devices/MBVGADevice.cpp b/Kernel/Devices/MBVGADevice.cpp index 0f5f3204e0..0c86eccbdd 100644 --- a/Kernel/Devices/MBVGADevice.cpp +++ b/Kernel/Devices/MBVGADevice.cpp @@ -35,7 +35,7 @@ KResultOr<Region*> MBVGADevice::mmap(Process& process, FileDescription&, Virtual 0, "MBVGA Framebuffer", prot); - kprintf("MBVGA: %s(%u) created Region{%p} with size %u for framebuffer P%x with vaddr V%p\n", + dbgprintf("MBVGA: %s(%u) created Region{%p} with size %u for framebuffer P%x with vaddr V%p\n", process.name().characters(), process.pid(), region, region->size(), m_framebuffer_address.as_ptr(), region->vaddr().get()); ASSERT(region); diff --git a/Kernel/FileSystem/VirtualFileSystem.cpp b/Kernel/FileSystem/VirtualFileSystem.cpp index ef5fd4d7e4..5a36839244 100644 --- a/Kernel/FileSystem/VirtualFileSystem.cpp +++ b/Kernel/FileSystem/VirtualFileSystem.cpp @@ -2,6 +2,7 @@ #include <AK/StringBuilder.h> #include <Kernel/Devices/CharacterDevice.h> #include <Kernel/FileSystem/Custody.h> +#include <Kernel/FileSystem/DiskBackedFileSystem.h> #include <Kernel/FileSystem/FileDescription.h> #include <Kernel/FileSystem/FileSystem.h> #include <Kernel/FileSystem/VirtualFileSystem.h> @@ -99,10 +100,14 @@ bool VFS::mount_root(NonnullRefPtr<FS>&& file_system) } m_root_inode = move(root_inode); - - kprintf("VFS: mounted root on %s{%p}\n", - m_root_inode->fs().class_name(), - &m_root_inode->fs()); + char device_name[32]; + if (m_root_inode->fs().is_disk_backed()) { + auto& device = static_cast<DiskBackedFS&>(m_root_inode->fs()).device(); + sprintf(device_name, "%d,%d", device.major(), device.minor()); + } else { + sprintf(device_name, "not-a-disk"); + } + kprintf("VFS: mounted root on %s (%s)\n", m_root_inode->fs().class_name(), device_name); m_mounts.append(move(mount)); return true; diff --git a/Kernel/Thread.cpp b/Kernel/Thread.cpp index c5a9f638d0..30c0057a58 100644 --- a/Kernel/Thread.cpp +++ b/Kernel/Thread.cpp @@ -89,7 +89,6 @@ Thread::Thread(Process& process) m_kernel_stack_base = m_kernel_stack_region->vaddr().get(); m_kernel_stack_top = m_kernel_stack_region->vaddr().offset(default_kernel_stack_size).get() & 0xfffffff8u; m_tss.esp = m_kernel_stack_top; - kprintf("Allocated ring0 stack @ %p - %p\n", m_kernel_stack_base, m_kernel_stack_top); } else { // Ring3 processes need a separate stack for Ring0. m_kernel_stack_region = MM.allocate_kernel_region(default_kernel_stack_size, String::format("Kernel Stack (Thread %d)", m_tid), Region::Access::Read | Region::Access::Write, false, true); @@ -98,7 +97,6 @@ Thread::Thread(Process& process) m_kernel_stack_top = m_kernel_stack_region->vaddr().offset(default_kernel_stack_size).get() & 0xfffffff8u; m_tss.ss0 = 0x10; m_tss.esp0 = m_kernel_stack_top; - kprintf("Allocated ring0 stack @ %p - %p\n", m_kernel_stack_base, m_kernel_stack_top); } // HACK: Ring2 SS in the TSS is the current PID. |