From dafd16075fba72be950f35c9cb9b4bd02c3b00d9 Mon Sep 17 00:00:00 2001 From: Zhang Junyang Date: Mon, 19 Aug 2024 19:15:22 +0800 Subject: [PATCH] Remove the shim kernel crate --- Cargo.lock | 15 +- Cargo.toml | 1 - Components.toml | 3 +- Makefile | 1 - kernel/Cargo.toml | 86 ++++++++-- kernel/aster-nix/Cargo.toml | 81 --------- kernel/aster-nix/src/lib.rs | 155 ----------------- kernel/{aster-nix => }/src/arch/mod.rs | 0 kernel/{aster-nix => }/src/arch/x86/cpu.rs | 0 kernel/{aster-nix => }/src/arch/x86/mod.rs | 0 kernel/{aster-nix => }/src/arch/x86/signal.rs | 0 kernel/{aster-nix => }/src/console.rs | 0 kernel/{aster-nix => }/src/context.rs | 0 kernel/{aster-nix => }/src/cpu.rs | 0 kernel/{aster-nix => }/src/device/mod.rs | 0 kernel/{aster-nix => }/src/device/null.rs | 0 kernel/{aster-nix => }/src/device/pty/mod.rs | 0 kernel/{aster-nix => }/src/device/pty/pty.rs | 0 kernel/{aster-nix => }/src/device/random.rs | 0 .../src/device/tdxguest/mod.rs | 0 .../{aster-nix => }/src/device/tty/device.rs | 0 .../{aster-nix => }/src/device/tty/driver.rs | 0 .../src/device/tty/line_discipline.rs | 0 kernel/{aster-nix => }/src/device/tty/mod.rs | 0 .../{aster-nix => }/src/device/tty/termio.rs | 0 kernel/{aster-nix => }/src/device/urandom.rs | 0 kernel/{aster-nix => }/src/device/zero.rs | 0 kernel/{aster-nix => }/src/driver/mod.rs | 0 kernel/{aster-nix => }/src/error.rs | 0 kernel/{aster-nix => }/src/events/events.rs | 0 .../{aster-nix => }/src/events/io_events.rs | 0 kernel/{aster-nix => }/src/events/mod.rs | 0 kernel/{aster-nix => }/src/events/observer.rs | 0 kernel/{aster-nix => }/src/events/subject.rs | 0 kernel/{aster-nix => }/src/fs/device.rs | 0 kernel/{aster-nix => }/src/fs/devpts/mod.rs | 0 kernel/{aster-nix => }/src/fs/devpts/ptmx.rs | 0 kernel/{aster-nix => }/src/fs/devpts/slave.rs | 0 .../src/fs/epoll/epoll_file.rs | 0 kernel/{aster-nix => }/src/fs/epoll/mod.rs | 0 kernel/{aster-nix => }/src/fs/exfat/bitmap.rs | 0 .../{aster-nix => }/src/fs/exfat/constants.rs | 0 kernel/{aster-nix => }/src/fs/exfat/dentry.rs | 0 kernel/{aster-nix => }/src/fs/exfat/fat.rs | 0 kernel/{aster-nix => }/src/fs/exfat/fs.rs | 0 kernel/{aster-nix => }/src/fs/exfat/inode.rs | 0 kernel/{aster-nix => }/src/fs/exfat/mod.rs | 2 +- .../src/fs/exfat/super_block.rs | 0 .../src/fs/exfat/upcase_table.rs | 0 kernel/{aster-nix => }/src/fs/exfat/utils.rs | 0 .../src/fs/ext2/block_group.rs | 0 .../{aster-nix => }/src/fs/ext2/block_ptr.rs | 0 .../src/fs/ext2/blocks_hole.rs | 0 kernel/{aster-nix => }/src/fs/ext2/dir.rs | 0 kernel/{aster-nix => }/src/fs/ext2/fs.rs | 0 .../src/fs/ext2/impl_for_vfs/fs.rs | 0 .../src/fs/ext2/impl_for_vfs/inode.rs | 0 .../src/fs/ext2/impl_for_vfs/mod.rs | 0 .../src/fs/ext2/indirect_block_cache.rs | 0 kernel/{aster-nix => }/src/fs/ext2/inode.rs | 0 kernel/{aster-nix => }/src/fs/ext2/mod.rs | 0 kernel/{aster-nix => }/src/fs/ext2/prelude.rs | 0 .../src/fs/ext2/super_block.rs | 0 kernel/{aster-nix => }/src/fs/ext2/utils.rs | 0 kernel/{aster-nix => }/src/fs/file_handle.rs | 0 kernel/{aster-nix => }/src/fs/file_table.rs | 0 kernel/{aster-nix => }/src/fs/fs_resolver.rs | 0 .../src/fs/inode_handle/dyn_cap.rs | 0 .../src/fs/inode_handle/mod.rs | 0 .../src/fs/inode_handle/static_cap.rs | 0 kernel/{aster-nix => }/src/fs/mod.rs | 0 kernel/{aster-nix => }/src/fs/named_pipe.rs | 0 kernel/{aster-nix => }/src/fs/path/dentry.rs | 0 kernel/{aster-nix => }/src/fs/path/mod.rs | 0 kernel/{aster-nix => }/src/fs/path/mount.rs | 0 kernel/{aster-nix => }/src/fs/pipe.rs | 0 .../src/fs/procfs/filesystems.rs | 0 .../{aster-nix => }/src/fs/procfs/meminfo.rs | 0 kernel/{aster-nix => }/src/fs/procfs/mod.rs | 0 .../src/fs/procfs/pid/cmdline.rs | 0 .../{aster-nix => }/src/fs/procfs/pid/comm.rs | 0 .../{aster-nix => }/src/fs/procfs/pid/exe.rs | 0 .../{aster-nix => }/src/fs/procfs/pid/fd.rs | 0 .../{aster-nix => }/src/fs/procfs/pid/mod.rs | 0 kernel/{aster-nix => }/src/fs/procfs/self_.rs | 0 .../src/fs/procfs/sys/kernel/cap_last_cap.rs | 0 .../src/fs/procfs/sys/kernel/mod.rs | 0 .../{aster-nix => }/src/fs/procfs/sys/mod.rs | 0 .../src/fs/procfs/template/builder.rs | 0 .../src/fs/procfs/template/dir.rs | 0 .../src/fs/procfs/template/file.rs | 0 .../src/fs/procfs/template/mod.rs | 0 .../src/fs/procfs/template/sym.rs | 0 kernel/{aster-nix => }/src/fs/ramfs/fs.rs | 0 kernel/{aster-nix => }/src/fs/ramfs/mod.rs | 0 kernel/{aster-nix => }/src/fs/rootfs.rs | 0 .../src/fs/utils/access_mode.rs | 0 .../{aster-nix => }/src/fs/utils/channel.rs | 0 .../src/fs/utils/creation_flags.rs | 0 .../src/fs/utils/dirent_visitor.rs | 0 .../src/fs/utils/direntry_vec.rs | 0 .../src/fs/utils/falloc_mode.rs | 0 .../src/fs/utils/file_creation_mask.rs | 0 kernel/{aster-nix => }/src/fs/utils/flock.rs | 0 kernel/{aster-nix => }/src/fs/utils/fs.rs | 0 kernel/{aster-nix => }/src/fs/utils/inode.rs | 0 kernel/{aster-nix => }/src/fs/utils/ioctl.rs | 0 kernel/{aster-nix => }/src/fs/utils/mod.rs | 0 .../src/fs/utils/page_cache.rs | 0 .../src/fs/utils/random_test.rs | 0 .../src/fs/utils/range_lock/builder.rs | 0 .../src/fs/utils/range_lock/mod.rs | 0 .../src/fs/utils/range_lock/range.rs | 0 .../src/fs/utils/status_flags.rs | 0 kernel/{aster-nix => }/src/ipc/mod.rs | 0 .../{aster-nix => }/src/ipc/semaphore/mod.rs | 0 .../src/ipc/semaphore/posix/mod.rs | 0 .../src/ipc/semaphore/system_v/mod.rs | 0 .../src/ipc/semaphore/system_v/sem.rs | 0 .../src/ipc/semaphore/system_v/sem_set.rs | 0 kernel/src/lib.rs | 156 +++++++++++++++++- .../src/net/iface/any_socket.rs | 0 .../{aster-nix => }/src/net/iface/common.rs | 0 .../{aster-nix => }/src/net/iface/loopback.rs | 0 kernel/{aster-nix => }/src/net/iface/mod.rs | 0 kernel/{aster-nix => }/src/net/iface/time.rs | 0 kernel/{aster-nix => }/src/net/iface/util.rs | 0 .../{aster-nix => }/src/net/iface/virtio.rs | 0 kernel/{aster-nix => }/src/net/mod.rs | 0 .../{aster-nix => }/src/net/socket/ip/addr.rs | 0 .../src/net/socket/ip/common.rs | 0 .../src/net/socket/ip/datagram/bound.rs | 0 .../src/net/socket/ip/datagram/mod.rs | 0 .../src/net/socket/ip/datagram/unbound.rs | 0 .../{aster-nix => }/src/net/socket/ip/mod.rs | 0 .../src/net/socket/ip/stream/connected.rs | 0 .../src/net/socket/ip/stream/connecting.rs | 0 .../src/net/socket/ip/stream/init.rs | 0 .../src/net/socket/ip/stream/listen.rs | 0 .../src/net/socket/ip/stream/mod.rs | 0 .../src/net/socket/ip/stream/options.rs | 0 .../src/net/socket/ip/stream/util.rs | 0 kernel/{aster-nix => }/src/net/socket/mod.rs | 0 .../src/net/socket/options/macros.rs | 0 .../src/net/socket/options/mod.rs | 0 .../src/net/socket/unix/addr.rs | 0 .../src/net/socket/unix/mod.rs | 0 .../src/net/socket/unix/stream/connected.rs | 0 .../src/net/socket/unix/stream/init.rs | 0 .../src/net/socket/unix/stream/listener.rs | 0 .../src/net/socket/unix/stream/mod.rs | 0 .../src/net/socket/unix/stream/socket.rs | 0 .../src/net/socket/util/message_header.rs | 0 .../src/net/socket/util/mod.rs | 0 .../src/net/socket/util/options.rs | 0 .../src/net/socket/util/send_recv_flags.rs | 0 .../src/net/socket/util/shutdown_cmd.rs | 0 .../src/net/socket/util/socket_addr.rs | 0 .../src/net/socket/vsock/addr.rs | 0 .../src/net/socket/vsock/common.rs | 0 .../src/net/socket/vsock/mod.rs | 0 .../src/net/socket/vsock/stream/connected.rs | 0 .../src/net/socket/vsock/stream/connecting.rs | 0 .../src/net/socket/vsock/stream/init.rs | 0 .../src/net/socket/vsock/stream/listen.rs | 0 .../src/net/socket/vsock/stream/mod.rs | 0 .../src/net/socket/vsock/stream/socket.rs | 0 kernel/{aster-nix => }/src/prelude.rs | 0 kernel/{aster-nix => }/src/process/clone.rs | 0 .../src/process/credentials/c_types.rs | 0 .../src/process/credentials/capabilities.rs | 0 .../src/process/credentials/credentials_.rs | 0 .../src/process/credentials/group.rs | 0 .../src/process/credentials/mod.rs | 0 .../src/process/credentials/static_cap.rs | 0 .../src/process/credentials/user.rs | 0 kernel/{aster-nix => }/src/process/exit.rs | 0 kernel/{aster-nix => }/src/process/kill.rs | 0 kernel/{aster-nix => }/src/process/mod.rs | 0 .../src/process/posix_thread/builder.rs | 0 .../src/process/posix_thread/exit.rs | 0 .../src/process/posix_thread/futex.rs | 0 .../src/process/posix_thread/mod.rs | 0 .../src/process/posix_thread/name.rs | 0 .../process/posix_thread/posix_thread_ext.rs | 0 .../src/process/posix_thread/robust_list.rs | 0 .../src/process/process/builder.rs | 0 .../src/process/process/job_control.rs | 0 .../src/process/process/mod.rs | 0 .../src/process/process/process_group.rs | 0 .../src/process/process/session.rs | 0 .../src/process/process/terminal.rs | 0 .../src/process/process/timer_manager.rs | 0 .../src/process/process_filter.rs | 0 .../src/process/process_table.rs | 0 .../src/process/process_vm/heap.rs | 0 .../process/process_vm/init_stack/aux_vec.rs | 0 .../src/process/process_vm/init_stack/mod.rs | 0 .../src/process/process_vm/mod.rs | 0 .../process/program_loader/elf/elf_file.rs | 0 .../process/program_loader/elf/load_elf.rs | 0 .../src/process/program_loader/elf/mod.rs | 0 .../src/process/program_loader/mod.rs | 0 .../src/process/program_loader/shebang.rs | 0 kernel/{aster-nix => }/src/process/rlimit.rs | 0 .../src/process/signal/c_types.rs | 0 .../src/process/signal/constants.rs | 0 .../src/process/signal/events.rs | 0 .../{aster-nix => }/src/process/signal/mod.rs | 0 .../src/process/signal/pauser.rs | 0 .../src/process/signal/poll.rs | 0 .../src/process/signal/sig_action.rs | 0 .../src/process/signal/sig_disposition.rs | 0 .../src/process/signal/sig_mask.rs | 0 .../src/process/signal/sig_num.rs | 0 .../src/process/signal/sig_queues.rs | 0 .../src/process/signal/sig_stack.rs | 0 .../src/process/signal/signals/fault.rs | 0 .../src/process/signal/signals/kernel.rs | 0 .../src/process/signal/signals/mod.rs | 0 .../src/process/signal/signals/user.rs | 0 kernel/{aster-nix => }/src/process/status.rs | 0 .../src/process/sync/condvar.rs | 0 .../{aster-nix => }/src/process/sync/mod.rs | 0 .../src/process/term_status.rs | 0 kernel/{aster-nix => }/src/process/wait.rs | 0 kernel/{aster-nix => }/src/sched/mod.rs | 0 kernel/{aster-nix => }/src/sched/nice.rs | 0 .../src/sched/priority_scheduler.rs | 0 kernel/{aster-nix => }/src/softirq_id.rs | 0 kernel/{aster-nix => }/src/syscall/accept.rs | 0 kernel/{aster-nix => }/src/syscall/access.rs | 0 kernel/{aster-nix => }/src/syscall/alarm.rs | 0 .../{aster-nix => }/src/syscall/arch/mod.rs | 0 .../{aster-nix => }/src/syscall/arch/x86.rs | 0 .../{aster-nix => }/src/syscall/arch_prctl.rs | 0 kernel/{aster-nix => }/src/syscall/bind.rs | 0 kernel/{aster-nix => }/src/syscall/brk.rs | 0 kernel/{aster-nix => }/src/syscall/capget.rs | 0 kernel/{aster-nix => }/src/syscall/capset.rs | 0 kernel/{aster-nix => }/src/syscall/chdir.rs | 0 kernel/{aster-nix => }/src/syscall/chmod.rs | 0 kernel/{aster-nix => }/src/syscall/chown.rs | 0 kernel/{aster-nix => }/src/syscall/chroot.rs | 0 .../src/syscall/clock_gettime.rs | 0 kernel/{aster-nix => }/src/syscall/clone.rs | 0 kernel/{aster-nix => }/src/syscall/close.rs | 0 kernel/{aster-nix => }/src/syscall/connect.rs | 0 .../{aster-nix => }/src/syscall/constants.rs | 0 kernel/{aster-nix => }/src/syscall/dup.rs | 0 kernel/{aster-nix => }/src/syscall/epoll.rs | 0 kernel/{aster-nix => }/src/syscall/eventfd.rs | 0 kernel/{aster-nix => }/src/syscall/execve.rs | 0 kernel/{aster-nix => }/src/syscall/exit.rs | 0 .../{aster-nix => }/src/syscall/exit_group.rs | 0 .../{aster-nix => }/src/syscall/fallocate.rs | 0 kernel/{aster-nix => }/src/syscall/fcntl.rs | 0 kernel/{aster-nix => }/src/syscall/flock.rs | 0 kernel/{aster-nix => }/src/syscall/fork.rs | 0 kernel/{aster-nix => }/src/syscall/fsync.rs | 0 kernel/{aster-nix => }/src/syscall/futex.rs | 0 kernel/{aster-nix => }/src/syscall/getcwd.rs | 0 .../{aster-nix => }/src/syscall/getdents64.rs | 0 kernel/{aster-nix => }/src/syscall/getegid.rs | 0 kernel/{aster-nix => }/src/syscall/geteuid.rs | 0 kernel/{aster-nix => }/src/syscall/getgid.rs | 0 .../{aster-nix => }/src/syscall/getgroups.rs | 0 .../src/syscall/getpeername.rs | 0 kernel/{aster-nix => }/src/syscall/getpgrp.rs | 0 kernel/{aster-nix => }/src/syscall/getpid.rs | 0 kernel/{aster-nix => }/src/syscall/getppid.rs | 0 .../{aster-nix => }/src/syscall/getrandom.rs | 0 .../{aster-nix => }/src/syscall/getresgid.rs | 0 .../{aster-nix => }/src/syscall/getresuid.rs | 0 .../{aster-nix => }/src/syscall/getrusage.rs | 0 kernel/{aster-nix => }/src/syscall/getsid.rs | 0 .../src/syscall/getsockname.rs | 0 .../{aster-nix => }/src/syscall/getsockopt.rs | 0 kernel/{aster-nix => }/src/syscall/gettid.rs | 0 .../src/syscall/gettimeofday.rs | 0 kernel/{aster-nix => }/src/syscall/getuid.rs | 0 kernel/{aster-nix => }/src/syscall/ioctl.rs | 0 kernel/{aster-nix => }/src/syscall/kill.rs | 0 kernel/{aster-nix => }/src/syscall/link.rs | 0 kernel/{aster-nix => }/src/syscall/listen.rs | 0 kernel/{aster-nix => }/src/syscall/lseek.rs | 0 kernel/{aster-nix => }/src/syscall/madvise.rs | 0 kernel/{aster-nix => }/src/syscall/mkdir.rs | 0 kernel/{aster-nix => }/src/syscall/mknod.rs | 0 kernel/{aster-nix => }/src/syscall/mmap.rs | 0 kernel/{aster-nix => }/src/syscall/mod.rs | 0 kernel/{aster-nix => }/src/syscall/mount.rs | 0 .../{aster-nix => }/src/syscall/mprotect.rs | 0 kernel/{aster-nix => }/src/syscall/msync.rs | 0 kernel/{aster-nix => }/src/syscall/munmap.rs | 0 .../{aster-nix => }/src/syscall/nanosleep.rs | 0 kernel/{aster-nix => }/src/syscall/open.rs | 0 kernel/{aster-nix => }/src/syscall/pause.rs | 0 kernel/{aster-nix => }/src/syscall/pipe.rs | 0 kernel/{aster-nix => }/src/syscall/poll.rs | 0 kernel/{aster-nix => }/src/syscall/prctl.rs | 0 kernel/{aster-nix => }/src/syscall/pread64.rs | 0 kernel/{aster-nix => }/src/syscall/preadv.rs | 0 .../{aster-nix => }/src/syscall/prlimit64.rs | 0 .../{aster-nix => }/src/syscall/pselect6.rs | 0 .../{aster-nix => }/src/syscall/pwrite64.rs | 0 kernel/{aster-nix => }/src/syscall/pwritev.rs | 0 kernel/{aster-nix => }/src/syscall/read.rs | 0 .../{aster-nix => }/src/syscall/readlink.rs | 0 .../{aster-nix => }/src/syscall/recvfrom.rs | 0 kernel/{aster-nix => }/src/syscall/recvmsg.rs | 0 kernel/{aster-nix => }/src/syscall/rename.rs | 0 kernel/{aster-nix => }/src/syscall/rmdir.rs | 0 .../src/syscall/rt_sigaction.rs | 0 .../src/syscall/rt_sigpending.rs | 0 .../src/syscall/rt_sigprocmask.rs | 0 .../src/syscall/rt_sigreturn.rs | 0 .../src/syscall/rt_sigsuspend.rs | 0 .../src/syscall/sched_getaffinity.rs | 0 .../src/syscall/sched_yield.rs | 0 kernel/{aster-nix => }/src/syscall/select.rs | 0 kernel/{aster-nix => }/src/syscall/semctl.rs | 0 kernel/{aster-nix => }/src/syscall/semget.rs | 0 kernel/{aster-nix => }/src/syscall/semop.rs | 0 .../{aster-nix => }/src/syscall/sendfile.rs | 0 kernel/{aster-nix => }/src/syscall/sendmsg.rs | 0 kernel/{aster-nix => }/src/syscall/sendto.rs | 0 .../src/syscall/set_get_priority.rs | 0 .../src/syscall/set_robust_list.rs | 0 .../src/syscall/set_tid_address.rs | 0 .../{aster-nix => }/src/syscall/setfsgid.rs | 0 .../{aster-nix => }/src/syscall/setfsuid.rs | 0 kernel/{aster-nix => }/src/syscall/setgid.rs | 0 .../{aster-nix => }/src/syscall/setgroups.rs | 0 .../{aster-nix => }/src/syscall/setitimer.rs | 0 kernel/{aster-nix => }/src/syscall/setpgid.rs | 0 .../{aster-nix => }/src/syscall/setregid.rs | 0 .../{aster-nix => }/src/syscall/setresgid.rs | 0 .../{aster-nix => }/src/syscall/setresuid.rs | 0 .../{aster-nix => }/src/syscall/setreuid.rs | 0 kernel/{aster-nix => }/src/syscall/setsid.rs | 0 .../{aster-nix => }/src/syscall/setsockopt.rs | 0 kernel/{aster-nix => }/src/syscall/setuid.rs | 0 .../{aster-nix => }/src/syscall/shutdown.rs | 0 .../src/syscall/sigaltstack.rs | 0 kernel/{aster-nix => }/src/syscall/socket.rs | 0 .../{aster-nix => }/src/syscall/socketpair.rs | 0 kernel/{aster-nix => }/src/syscall/stat.rs | 0 kernel/{aster-nix => }/src/syscall/statfs.rs | 0 kernel/{aster-nix => }/src/syscall/symlink.rs | 0 kernel/{aster-nix => }/src/syscall/sync.rs | 0 kernel/{aster-nix => }/src/syscall/tgkill.rs | 0 kernel/{aster-nix => }/src/syscall/time.rs | 0 .../src/syscall/timer_create.rs | 0 .../src/syscall/timer_settime.rs | 0 .../{aster-nix => }/src/syscall/truncate.rs | 0 kernel/{aster-nix => }/src/syscall/umask.rs | 0 kernel/{aster-nix => }/src/syscall/umount.rs | 0 kernel/{aster-nix => }/src/syscall/uname.rs | 0 kernel/{aster-nix => }/src/syscall/unlink.rs | 0 kernel/{aster-nix => }/src/syscall/utimens.rs | 0 kernel/{aster-nix => }/src/syscall/wait4.rs | 0 kernel/{aster-nix => }/src/syscall/waitid.rs | 0 kernel/{aster-nix => }/src/syscall/write.rs | 0 kernel/{aster-nix => }/src/taskless.rs | 0 .../{aster-nix => }/src/thread/exception.rs | 0 .../src/thread/kernel_thread.rs | 0 kernel/{aster-nix => }/src/thread/mod.rs | 0 kernel/{aster-nix => }/src/thread/status.rs | 0 kernel/{aster-nix => }/src/thread/task.rs | 0 .../src/thread/thread_table.rs | 0 .../src/thread/work_queue/mod.rs | 0 .../src/thread/work_queue/simple_scheduler.rs | 0 .../src/thread/work_queue/work_item.rs | 0 .../src/thread/work_queue/worker.rs | 0 .../src/thread/work_queue/worker_pool.rs | 0 .../src/time/clocks/cpu_clock.rs | 0 kernel/{aster-nix => }/src/time/clocks/mod.rs | 0 .../src/time/clocks/system_wide.rs | 0 kernel/{aster-nix => }/src/time/core/mod.rs | 0 kernel/{aster-nix => }/src/time/core/timer.rs | 0 kernel/{aster-nix => }/src/time/mod.rs | 0 kernel/{aster-nix => }/src/time/softirq.rs | 0 .../{aster-nix => }/src/time/system_time.rs | 0 kernel/{aster-nix => }/src/time/wait.rs | 0 kernel/{aster-nix => }/src/util/iovec.rs | 0 kernel/{aster-nix => }/src/util/mod.rs | 0 .../src/util/net/addr/family.rs | 0 .../{aster-nix => }/src/util/net/addr/ip.rs | 0 .../{aster-nix => }/src/util/net/addr/mod.rs | 0 .../{aster-nix => }/src/util/net/addr/unix.rs | 0 .../src/util/net/addr/vsock.rs | 0 kernel/{aster-nix => }/src/util/net/mod.rs | 0 .../src/util/net/options/mod.rs | 0 .../src/util/net/options/socket.rs | 0 .../src/util/net/options/tcp.rs | 0 .../src/util/net/options/utils.rs | 0 kernel/{aster-nix => }/src/util/net/socket.rs | 0 kernel/{aster-nix => }/src/util/random.rs | 0 kernel/{aster-nix => }/src/vdso.rs | 0 kernel/{aster-nix => }/src/vm/mod.rs | 0 .../src/vm/page_fault_handler.rs | 0 kernel/{aster-nix => }/src/vm/perms.rs | 0 kernel/{aster-nix => }/src/vm/util.rs | 0 kernel/{aster-nix => }/src/vm/vmar/dyn_cap.rs | 0 .../{aster-nix => }/src/vm/vmar/interval.rs | 0 kernel/{aster-nix => }/src/vm/vmar/mod.rs | 0 kernel/{aster-nix => }/src/vm/vmar/options.rs | 0 .../{aster-nix => }/src/vm/vmar/static_cap.rs | 0 .../{aster-nix => }/src/vm/vmar/vm_mapping.rs | 0 kernel/{aster-nix => }/src/vm/vmo/dyn_cap.rs | 0 kernel/{aster-nix => }/src/vm/vmo/mod.rs | 0 kernel/{aster-nix => }/src/vm/vmo/options.rs | 0 kernel/{aster-nix => }/src/vm/vmo/pager.rs | 0 .../{aster-nix => }/src/vm/vmo/static_cap.rs | 0 tools/bump_version.sh | 4 +- 416 files changed, 231 insertions(+), 273 deletions(-) delete mode 100644 kernel/aster-nix/Cargo.toml delete mode 100644 kernel/aster-nix/src/lib.rs rename kernel/{aster-nix => }/src/arch/mod.rs (100%) rename kernel/{aster-nix => }/src/arch/x86/cpu.rs (100%) rename kernel/{aster-nix => }/src/arch/x86/mod.rs (100%) rename kernel/{aster-nix => }/src/arch/x86/signal.rs (100%) rename kernel/{aster-nix => }/src/console.rs (100%) rename kernel/{aster-nix => }/src/context.rs (100%) rename kernel/{aster-nix => }/src/cpu.rs (100%) rename kernel/{aster-nix => }/src/device/mod.rs (100%) rename kernel/{aster-nix => }/src/device/null.rs (100%) rename kernel/{aster-nix => }/src/device/pty/mod.rs (100%) rename kernel/{aster-nix => }/src/device/pty/pty.rs (100%) rename kernel/{aster-nix => }/src/device/random.rs (100%) rename kernel/{aster-nix => }/src/device/tdxguest/mod.rs (100%) rename kernel/{aster-nix => }/src/device/tty/device.rs (100%) rename kernel/{aster-nix => }/src/device/tty/driver.rs (100%) rename kernel/{aster-nix => }/src/device/tty/line_discipline.rs (100%) rename kernel/{aster-nix => }/src/device/tty/mod.rs (100%) rename kernel/{aster-nix => }/src/device/tty/termio.rs (100%) rename kernel/{aster-nix => }/src/device/urandom.rs (100%) rename kernel/{aster-nix => }/src/device/zero.rs (100%) rename kernel/{aster-nix => }/src/driver/mod.rs (100%) rename kernel/{aster-nix => }/src/error.rs (100%) rename kernel/{aster-nix => }/src/events/events.rs (100%) rename kernel/{aster-nix => }/src/events/io_events.rs (100%) rename kernel/{aster-nix => }/src/events/mod.rs (100%) rename kernel/{aster-nix => }/src/events/observer.rs (100%) rename kernel/{aster-nix => }/src/events/subject.rs (100%) rename kernel/{aster-nix => }/src/fs/device.rs (100%) rename kernel/{aster-nix => }/src/fs/devpts/mod.rs (100%) rename kernel/{aster-nix => }/src/fs/devpts/ptmx.rs (100%) rename kernel/{aster-nix => }/src/fs/devpts/slave.rs (100%) rename kernel/{aster-nix => }/src/fs/epoll/epoll_file.rs (100%) rename kernel/{aster-nix => }/src/fs/epoll/mod.rs (100%) rename kernel/{aster-nix => }/src/fs/exfat/bitmap.rs (100%) rename kernel/{aster-nix => }/src/fs/exfat/constants.rs (100%) rename kernel/{aster-nix => }/src/fs/exfat/dentry.rs (100%) rename kernel/{aster-nix => }/src/fs/exfat/fat.rs (100%) rename kernel/{aster-nix => }/src/fs/exfat/fs.rs (100%) rename kernel/{aster-nix => }/src/fs/exfat/inode.rs (100%) rename kernel/{aster-nix => }/src/fs/exfat/mod.rs (99%) rename kernel/{aster-nix => }/src/fs/exfat/super_block.rs (100%) rename kernel/{aster-nix => }/src/fs/exfat/upcase_table.rs (100%) rename kernel/{aster-nix => }/src/fs/exfat/utils.rs (100%) rename kernel/{aster-nix => }/src/fs/ext2/block_group.rs (100%) rename kernel/{aster-nix => }/src/fs/ext2/block_ptr.rs (100%) rename kernel/{aster-nix => }/src/fs/ext2/blocks_hole.rs (100%) rename kernel/{aster-nix => }/src/fs/ext2/dir.rs (100%) rename kernel/{aster-nix => }/src/fs/ext2/fs.rs (100%) rename kernel/{aster-nix => }/src/fs/ext2/impl_for_vfs/fs.rs (100%) rename kernel/{aster-nix => }/src/fs/ext2/impl_for_vfs/inode.rs (100%) rename kernel/{aster-nix => }/src/fs/ext2/impl_for_vfs/mod.rs (100%) rename kernel/{aster-nix => }/src/fs/ext2/indirect_block_cache.rs (100%) rename kernel/{aster-nix => }/src/fs/ext2/inode.rs (100%) rename kernel/{aster-nix => }/src/fs/ext2/mod.rs (100%) rename kernel/{aster-nix => }/src/fs/ext2/prelude.rs (100%) rename kernel/{aster-nix => }/src/fs/ext2/super_block.rs (100%) rename kernel/{aster-nix => }/src/fs/ext2/utils.rs (100%) rename kernel/{aster-nix => }/src/fs/file_handle.rs (100%) rename kernel/{aster-nix => }/src/fs/file_table.rs (100%) rename kernel/{aster-nix => }/src/fs/fs_resolver.rs (100%) rename kernel/{aster-nix => }/src/fs/inode_handle/dyn_cap.rs (100%) rename kernel/{aster-nix => }/src/fs/inode_handle/mod.rs (100%) rename kernel/{aster-nix => }/src/fs/inode_handle/static_cap.rs (100%) rename kernel/{aster-nix => }/src/fs/mod.rs (100%) rename kernel/{aster-nix => }/src/fs/named_pipe.rs (100%) rename kernel/{aster-nix => }/src/fs/path/dentry.rs (100%) rename kernel/{aster-nix => }/src/fs/path/mod.rs (100%) rename kernel/{aster-nix => }/src/fs/path/mount.rs (100%) rename kernel/{aster-nix => }/src/fs/pipe.rs (100%) rename kernel/{aster-nix => }/src/fs/procfs/filesystems.rs (100%) rename kernel/{aster-nix => }/src/fs/procfs/meminfo.rs (100%) rename kernel/{aster-nix => }/src/fs/procfs/mod.rs (100%) rename kernel/{aster-nix => }/src/fs/procfs/pid/cmdline.rs (100%) rename kernel/{aster-nix => }/src/fs/procfs/pid/comm.rs (100%) rename kernel/{aster-nix => }/src/fs/procfs/pid/exe.rs (100%) rename kernel/{aster-nix => }/src/fs/procfs/pid/fd.rs (100%) rename kernel/{aster-nix => }/src/fs/procfs/pid/mod.rs (100%) rename kernel/{aster-nix => }/src/fs/procfs/self_.rs (100%) rename kernel/{aster-nix => }/src/fs/procfs/sys/kernel/cap_last_cap.rs (100%) rename kernel/{aster-nix => }/src/fs/procfs/sys/kernel/mod.rs (100%) rename kernel/{aster-nix => }/src/fs/procfs/sys/mod.rs (100%) rename kernel/{aster-nix => }/src/fs/procfs/template/builder.rs (100%) rename kernel/{aster-nix => }/src/fs/procfs/template/dir.rs (100%) rename kernel/{aster-nix => }/src/fs/procfs/template/file.rs (100%) rename kernel/{aster-nix => }/src/fs/procfs/template/mod.rs (100%) rename kernel/{aster-nix => }/src/fs/procfs/template/sym.rs (100%) rename kernel/{aster-nix => }/src/fs/ramfs/fs.rs (100%) rename kernel/{aster-nix => }/src/fs/ramfs/mod.rs (100%) rename kernel/{aster-nix => }/src/fs/rootfs.rs (100%) rename kernel/{aster-nix => }/src/fs/utils/access_mode.rs (100%) rename kernel/{aster-nix => }/src/fs/utils/channel.rs (100%) rename kernel/{aster-nix => }/src/fs/utils/creation_flags.rs (100%) rename kernel/{aster-nix => }/src/fs/utils/dirent_visitor.rs (100%) rename kernel/{aster-nix => }/src/fs/utils/direntry_vec.rs (100%) rename kernel/{aster-nix => }/src/fs/utils/falloc_mode.rs (100%) rename kernel/{aster-nix => }/src/fs/utils/file_creation_mask.rs (100%) rename kernel/{aster-nix => }/src/fs/utils/flock.rs (100%) rename kernel/{aster-nix => }/src/fs/utils/fs.rs (100%) rename kernel/{aster-nix => }/src/fs/utils/inode.rs (100%) rename kernel/{aster-nix => }/src/fs/utils/ioctl.rs (100%) rename kernel/{aster-nix => }/src/fs/utils/mod.rs (100%) rename kernel/{aster-nix => }/src/fs/utils/page_cache.rs (100%) rename kernel/{aster-nix => }/src/fs/utils/random_test.rs (100%) rename kernel/{aster-nix => }/src/fs/utils/range_lock/builder.rs (100%) rename kernel/{aster-nix => }/src/fs/utils/range_lock/mod.rs (100%) rename kernel/{aster-nix => }/src/fs/utils/range_lock/range.rs (100%) rename kernel/{aster-nix => }/src/fs/utils/status_flags.rs (100%) rename kernel/{aster-nix => }/src/ipc/mod.rs (100%) rename kernel/{aster-nix => }/src/ipc/semaphore/mod.rs (100%) rename kernel/{aster-nix => }/src/ipc/semaphore/posix/mod.rs (100%) rename kernel/{aster-nix => }/src/ipc/semaphore/system_v/mod.rs (100%) rename kernel/{aster-nix => }/src/ipc/semaphore/system_v/sem.rs (100%) rename kernel/{aster-nix => }/src/ipc/semaphore/system_v/sem_set.rs (100%) rename kernel/{aster-nix => }/src/net/iface/any_socket.rs (100%) rename kernel/{aster-nix => }/src/net/iface/common.rs (100%) rename kernel/{aster-nix => }/src/net/iface/loopback.rs (100%) rename kernel/{aster-nix => }/src/net/iface/mod.rs (100%) rename kernel/{aster-nix => }/src/net/iface/time.rs (100%) rename kernel/{aster-nix => }/src/net/iface/util.rs (100%) rename kernel/{aster-nix => }/src/net/iface/virtio.rs (100%) rename kernel/{aster-nix => }/src/net/mod.rs (100%) rename kernel/{aster-nix => }/src/net/socket/ip/addr.rs (100%) rename kernel/{aster-nix => }/src/net/socket/ip/common.rs (100%) rename kernel/{aster-nix => }/src/net/socket/ip/datagram/bound.rs (100%) rename kernel/{aster-nix => }/src/net/socket/ip/datagram/mod.rs (100%) rename kernel/{aster-nix => }/src/net/socket/ip/datagram/unbound.rs (100%) rename kernel/{aster-nix => }/src/net/socket/ip/mod.rs (100%) rename kernel/{aster-nix => }/src/net/socket/ip/stream/connected.rs (100%) rename kernel/{aster-nix => }/src/net/socket/ip/stream/connecting.rs (100%) rename kernel/{aster-nix => }/src/net/socket/ip/stream/init.rs (100%) rename kernel/{aster-nix => }/src/net/socket/ip/stream/listen.rs (100%) rename kernel/{aster-nix => }/src/net/socket/ip/stream/mod.rs (100%) rename kernel/{aster-nix => }/src/net/socket/ip/stream/options.rs (100%) rename kernel/{aster-nix => }/src/net/socket/ip/stream/util.rs (100%) rename kernel/{aster-nix => }/src/net/socket/mod.rs (100%) rename kernel/{aster-nix => }/src/net/socket/options/macros.rs (100%) rename kernel/{aster-nix => }/src/net/socket/options/mod.rs (100%) rename kernel/{aster-nix => }/src/net/socket/unix/addr.rs (100%) rename kernel/{aster-nix => }/src/net/socket/unix/mod.rs (100%) rename kernel/{aster-nix => }/src/net/socket/unix/stream/connected.rs (100%) rename kernel/{aster-nix => }/src/net/socket/unix/stream/init.rs (100%) rename kernel/{aster-nix => }/src/net/socket/unix/stream/listener.rs (100%) rename kernel/{aster-nix => }/src/net/socket/unix/stream/mod.rs (100%) rename kernel/{aster-nix => }/src/net/socket/unix/stream/socket.rs (100%) rename kernel/{aster-nix => }/src/net/socket/util/message_header.rs (100%) rename kernel/{aster-nix => }/src/net/socket/util/mod.rs (100%) rename kernel/{aster-nix => }/src/net/socket/util/options.rs (100%) rename kernel/{aster-nix => }/src/net/socket/util/send_recv_flags.rs (100%) rename kernel/{aster-nix => }/src/net/socket/util/shutdown_cmd.rs (100%) rename kernel/{aster-nix => }/src/net/socket/util/socket_addr.rs (100%) rename kernel/{aster-nix => }/src/net/socket/vsock/addr.rs (100%) rename kernel/{aster-nix => }/src/net/socket/vsock/common.rs (100%) rename kernel/{aster-nix => }/src/net/socket/vsock/mod.rs (100%) rename kernel/{aster-nix => }/src/net/socket/vsock/stream/connected.rs (100%) rename kernel/{aster-nix => }/src/net/socket/vsock/stream/connecting.rs (100%) rename kernel/{aster-nix => }/src/net/socket/vsock/stream/init.rs (100%) rename kernel/{aster-nix => }/src/net/socket/vsock/stream/listen.rs (100%) rename kernel/{aster-nix => }/src/net/socket/vsock/stream/mod.rs (100%) rename kernel/{aster-nix => }/src/net/socket/vsock/stream/socket.rs (100%) rename kernel/{aster-nix => }/src/prelude.rs (100%) rename kernel/{aster-nix => }/src/process/clone.rs (100%) rename kernel/{aster-nix => }/src/process/credentials/c_types.rs (100%) rename kernel/{aster-nix => }/src/process/credentials/capabilities.rs (100%) rename kernel/{aster-nix => }/src/process/credentials/credentials_.rs (100%) rename kernel/{aster-nix => }/src/process/credentials/group.rs (100%) rename kernel/{aster-nix => }/src/process/credentials/mod.rs (100%) rename kernel/{aster-nix => }/src/process/credentials/static_cap.rs (100%) rename kernel/{aster-nix => }/src/process/credentials/user.rs (100%) rename kernel/{aster-nix => }/src/process/exit.rs (100%) rename kernel/{aster-nix => }/src/process/kill.rs (100%) rename kernel/{aster-nix => }/src/process/mod.rs (100%) rename kernel/{aster-nix => }/src/process/posix_thread/builder.rs (100%) rename kernel/{aster-nix => }/src/process/posix_thread/exit.rs (100%) rename kernel/{aster-nix => }/src/process/posix_thread/futex.rs (100%) rename kernel/{aster-nix => }/src/process/posix_thread/mod.rs (100%) rename kernel/{aster-nix => }/src/process/posix_thread/name.rs (100%) rename kernel/{aster-nix => }/src/process/posix_thread/posix_thread_ext.rs (100%) rename kernel/{aster-nix => }/src/process/posix_thread/robust_list.rs (100%) rename kernel/{aster-nix => }/src/process/process/builder.rs (100%) rename kernel/{aster-nix => }/src/process/process/job_control.rs (100%) rename kernel/{aster-nix => }/src/process/process/mod.rs (100%) rename kernel/{aster-nix => }/src/process/process/process_group.rs (100%) rename kernel/{aster-nix => }/src/process/process/session.rs (100%) rename kernel/{aster-nix => }/src/process/process/terminal.rs (100%) rename kernel/{aster-nix => }/src/process/process/timer_manager.rs (100%) rename kernel/{aster-nix => }/src/process/process_filter.rs (100%) rename kernel/{aster-nix => }/src/process/process_table.rs (100%) rename kernel/{aster-nix => }/src/process/process_vm/heap.rs (100%) rename kernel/{aster-nix => }/src/process/process_vm/init_stack/aux_vec.rs (100%) rename kernel/{aster-nix => }/src/process/process_vm/init_stack/mod.rs (100%) rename kernel/{aster-nix => }/src/process/process_vm/mod.rs (100%) rename kernel/{aster-nix => }/src/process/program_loader/elf/elf_file.rs (100%) rename kernel/{aster-nix => }/src/process/program_loader/elf/load_elf.rs (100%) rename kernel/{aster-nix => }/src/process/program_loader/elf/mod.rs (100%) rename kernel/{aster-nix => }/src/process/program_loader/mod.rs (100%) rename kernel/{aster-nix => }/src/process/program_loader/shebang.rs (100%) rename kernel/{aster-nix => }/src/process/rlimit.rs (100%) rename kernel/{aster-nix => }/src/process/signal/c_types.rs (100%) rename kernel/{aster-nix => }/src/process/signal/constants.rs (100%) rename kernel/{aster-nix => }/src/process/signal/events.rs (100%) rename kernel/{aster-nix => }/src/process/signal/mod.rs (100%) rename kernel/{aster-nix => }/src/process/signal/pauser.rs (100%) rename kernel/{aster-nix => }/src/process/signal/poll.rs (100%) rename kernel/{aster-nix => }/src/process/signal/sig_action.rs (100%) rename kernel/{aster-nix => }/src/process/signal/sig_disposition.rs (100%) rename kernel/{aster-nix => }/src/process/signal/sig_mask.rs (100%) rename kernel/{aster-nix => }/src/process/signal/sig_num.rs (100%) rename kernel/{aster-nix => }/src/process/signal/sig_queues.rs (100%) rename kernel/{aster-nix => }/src/process/signal/sig_stack.rs (100%) rename kernel/{aster-nix => }/src/process/signal/signals/fault.rs (100%) rename kernel/{aster-nix => }/src/process/signal/signals/kernel.rs (100%) rename kernel/{aster-nix => }/src/process/signal/signals/mod.rs (100%) rename kernel/{aster-nix => }/src/process/signal/signals/user.rs (100%) rename kernel/{aster-nix => }/src/process/status.rs (100%) rename kernel/{aster-nix => }/src/process/sync/condvar.rs (100%) rename kernel/{aster-nix => }/src/process/sync/mod.rs (100%) rename kernel/{aster-nix => }/src/process/term_status.rs (100%) rename kernel/{aster-nix => }/src/process/wait.rs (100%) rename kernel/{aster-nix => }/src/sched/mod.rs (100%) rename kernel/{aster-nix => }/src/sched/nice.rs (100%) rename kernel/{aster-nix => }/src/sched/priority_scheduler.rs (100%) rename kernel/{aster-nix => }/src/softirq_id.rs (100%) rename kernel/{aster-nix => }/src/syscall/accept.rs (100%) rename kernel/{aster-nix => }/src/syscall/access.rs (100%) rename kernel/{aster-nix => }/src/syscall/alarm.rs (100%) rename kernel/{aster-nix => }/src/syscall/arch/mod.rs (100%) rename kernel/{aster-nix => }/src/syscall/arch/x86.rs (100%) rename kernel/{aster-nix => }/src/syscall/arch_prctl.rs (100%) rename kernel/{aster-nix => }/src/syscall/bind.rs (100%) rename kernel/{aster-nix => }/src/syscall/brk.rs (100%) rename kernel/{aster-nix => }/src/syscall/capget.rs (100%) rename kernel/{aster-nix => }/src/syscall/capset.rs (100%) rename kernel/{aster-nix => }/src/syscall/chdir.rs (100%) rename kernel/{aster-nix => }/src/syscall/chmod.rs (100%) rename kernel/{aster-nix => }/src/syscall/chown.rs (100%) rename kernel/{aster-nix => }/src/syscall/chroot.rs (100%) rename kernel/{aster-nix => }/src/syscall/clock_gettime.rs (100%) rename kernel/{aster-nix => }/src/syscall/clone.rs (100%) rename kernel/{aster-nix => }/src/syscall/close.rs (100%) rename kernel/{aster-nix => }/src/syscall/connect.rs (100%) rename kernel/{aster-nix => }/src/syscall/constants.rs (100%) rename kernel/{aster-nix => }/src/syscall/dup.rs (100%) rename kernel/{aster-nix => }/src/syscall/epoll.rs (100%) rename kernel/{aster-nix => }/src/syscall/eventfd.rs (100%) rename kernel/{aster-nix => }/src/syscall/execve.rs (100%) rename kernel/{aster-nix => }/src/syscall/exit.rs (100%) rename kernel/{aster-nix => }/src/syscall/exit_group.rs (100%) rename kernel/{aster-nix => }/src/syscall/fallocate.rs (100%) rename kernel/{aster-nix => }/src/syscall/fcntl.rs (100%) rename kernel/{aster-nix => }/src/syscall/flock.rs (100%) rename kernel/{aster-nix => }/src/syscall/fork.rs (100%) rename kernel/{aster-nix => }/src/syscall/fsync.rs (100%) rename kernel/{aster-nix => }/src/syscall/futex.rs (100%) rename kernel/{aster-nix => }/src/syscall/getcwd.rs (100%) rename kernel/{aster-nix => }/src/syscall/getdents64.rs (100%) rename kernel/{aster-nix => }/src/syscall/getegid.rs (100%) rename kernel/{aster-nix => }/src/syscall/geteuid.rs (100%) rename kernel/{aster-nix => }/src/syscall/getgid.rs (100%) rename kernel/{aster-nix => }/src/syscall/getgroups.rs (100%) rename kernel/{aster-nix => }/src/syscall/getpeername.rs (100%) rename kernel/{aster-nix => }/src/syscall/getpgrp.rs (100%) rename kernel/{aster-nix => }/src/syscall/getpid.rs (100%) rename kernel/{aster-nix => }/src/syscall/getppid.rs (100%) rename kernel/{aster-nix => }/src/syscall/getrandom.rs (100%) rename kernel/{aster-nix => }/src/syscall/getresgid.rs (100%) rename kernel/{aster-nix => }/src/syscall/getresuid.rs (100%) rename kernel/{aster-nix => }/src/syscall/getrusage.rs (100%) rename kernel/{aster-nix => }/src/syscall/getsid.rs (100%) rename kernel/{aster-nix => }/src/syscall/getsockname.rs (100%) rename kernel/{aster-nix => }/src/syscall/getsockopt.rs (100%) rename kernel/{aster-nix => }/src/syscall/gettid.rs (100%) rename kernel/{aster-nix => }/src/syscall/gettimeofday.rs (100%) rename kernel/{aster-nix => }/src/syscall/getuid.rs (100%) rename kernel/{aster-nix => }/src/syscall/ioctl.rs (100%) rename kernel/{aster-nix => }/src/syscall/kill.rs (100%) rename kernel/{aster-nix => }/src/syscall/link.rs (100%) rename kernel/{aster-nix => }/src/syscall/listen.rs (100%) rename kernel/{aster-nix => }/src/syscall/lseek.rs (100%) rename kernel/{aster-nix => }/src/syscall/madvise.rs (100%) rename kernel/{aster-nix => }/src/syscall/mkdir.rs (100%) rename kernel/{aster-nix => }/src/syscall/mknod.rs (100%) rename kernel/{aster-nix => }/src/syscall/mmap.rs (100%) rename kernel/{aster-nix => }/src/syscall/mod.rs (100%) rename kernel/{aster-nix => }/src/syscall/mount.rs (100%) rename kernel/{aster-nix => }/src/syscall/mprotect.rs (100%) rename kernel/{aster-nix => }/src/syscall/msync.rs (100%) rename kernel/{aster-nix => }/src/syscall/munmap.rs (100%) rename kernel/{aster-nix => }/src/syscall/nanosleep.rs (100%) rename kernel/{aster-nix => }/src/syscall/open.rs (100%) rename kernel/{aster-nix => }/src/syscall/pause.rs (100%) rename kernel/{aster-nix => }/src/syscall/pipe.rs (100%) rename kernel/{aster-nix => }/src/syscall/poll.rs (100%) rename kernel/{aster-nix => }/src/syscall/prctl.rs (100%) rename kernel/{aster-nix => }/src/syscall/pread64.rs (100%) rename kernel/{aster-nix => }/src/syscall/preadv.rs (100%) rename kernel/{aster-nix => }/src/syscall/prlimit64.rs (100%) rename kernel/{aster-nix => }/src/syscall/pselect6.rs (100%) rename kernel/{aster-nix => }/src/syscall/pwrite64.rs (100%) rename kernel/{aster-nix => }/src/syscall/pwritev.rs (100%) rename kernel/{aster-nix => }/src/syscall/read.rs (100%) rename kernel/{aster-nix => }/src/syscall/readlink.rs (100%) rename kernel/{aster-nix => }/src/syscall/recvfrom.rs (100%) rename kernel/{aster-nix => }/src/syscall/recvmsg.rs (100%) rename kernel/{aster-nix => }/src/syscall/rename.rs (100%) rename kernel/{aster-nix => }/src/syscall/rmdir.rs (100%) rename kernel/{aster-nix => }/src/syscall/rt_sigaction.rs (100%) rename kernel/{aster-nix => }/src/syscall/rt_sigpending.rs (100%) rename kernel/{aster-nix => }/src/syscall/rt_sigprocmask.rs (100%) rename kernel/{aster-nix => }/src/syscall/rt_sigreturn.rs (100%) rename kernel/{aster-nix => }/src/syscall/rt_sigsuspend.rs (100%) rename kernel/{aster-nix => }/src/syscall/sched_getaffinity.rs (100%) rename kernel/{aster-nix => }/src/syscall/sched_yield.rs (100%) rename kernel/{aster-nix => }/src/syscall/select.rs (100%) rename kernel/{aster-nix => }/src/syscall/semctl.rs (100%) rename kernel/{aster-nix => }/src/syscall/semget.rs (100%) rename kernel/{aster-nix => }/src/syscall/semop.rs (100%) rename kernel/{aster-nix => }/src/syscall/sendfile.rs (100%) rename kernel/{aster-nix => }/src/syscall/sendmsg.rs (100%) rename kernel/{aster-nix => }/src/syscall/sendto.rs (100%) rename kernel/{aster-nix => }/src/syscall/set_get_priority.rs (100%) rename kernel/{aster-nix => }/src/syscall/set_robust_list.rs (100%) rename kernel/{aster-nix => }/src/syscall/set_tid_address.rs (100%) rename kernel/{aster-nix => }/src/syscall/setfsgid.rs (100%) rename kernel/{aster-nix => }/src/syscall/setfsuid.rs (100%) rename kernel/{aster-nix => }/src/syscall/setgid.rs (100%) rename kernel/{aster-nix => }/src/syscall/setgroups.rs (100%) rename kernel/{aster-nix => }/src/syscall/setitimer.rs (100%) rename kernel/{aster-nix => }/src/syscall/setpgid.rs (100%) rename kernel/{aster-nix => }/src/syscall/setregid.rs (100%) rename kernel/{aster-nix => }/src/syscall/setresgid.rs (100%) rename kernel/{aster-nix => }/src/syscall/setresuid.rs (100%) rename kernel/{aster-nix => }/src/syscall/setreuid.rs (100%) rename kernel/{aster-nix => }/src/syscall/setsid.rs (100%) rename kernel/{aster-nix => }/src/syscall/setsockopt.rs (100%) rename kernel/{aster-nix => }/src/syscall/setuid.rs (100%) rename kernel/{aster-nix => }/src/syscall/shutdown.rs (100%) rename kernel/{aster-nix => }/src/syscall/sigaltstack.rs (100%) rename kernel/{aster-nix => }/src/syscall/socket.rs (100%) rename kernel/{aster-nix => }/src/syscall/socketpair.rs (100%) rename kernel/{aster-nix => }/src/syscall/stat.rs (100%) rename kernel/{aster-nix => }/src/syscall/statfs.rs (100%) rename kernel/{aster-nix => }/src/syscall/symlink.rs (100%) rename kernel/{aster-nix => }/src/syscall/sync.rs (100%) rename kernel/{aster-nix => }/src/syscall/tgkill.rs (100%) rename kernel/{aster-nix => }/src/syscall/time.rs (100%) rename kernel/{aster-nix => }/src/syscall/timer_create.rs (100%) rename kernel/{aster-nix => }/src/syscall/timer_settime.rs (100%) rename kernel/{aster-nix => }/src/syscall/truncate.rs (100%) rename kernel/{aster-nix => }/src/syscall/umask.rs (100%) rename kernel/{aster-nix => }/src/syscall/umount.rs (100%) rename kernel/{aster-nix => }/src/syscall/uname.rs (100%) rename kernel/{aster-nix => }/src/syscall/unlink.rs (100%) rename kernel/{aster-nix => }/src/syscall/utimens.rs (100%) rename kernel/{aster-nix => }/src/syscall/wait4.rs (100%) rename kernel/{aster-nix => }/src/syscall/waitid.rs (100%) rename kernel/{aster-nix => }/src/syscall/write.rs (100%) rename kernel/{aster-nix => }/src/taskless.rs (100%) rename kernel/{aster-nix => }/src/thread/exception.rs (100%) rename kernel/{aster-nix => }/src/thread/kernel_thread.rs (100%) rename kernel/{aster-nix => }/src/thread/mod.rs (100%) rename kernel/{aster-nix => }/src/thread/status.rs (100%) rename kernel/{aster-nix => }/src/thread/task.rs (100%) rename kernel/{aster-nix => }/src/thread/thread_table.rs (100%) rename kernel/{aster-nix => }/src/thread/work_queue/mod.rs (100%) rename kernel/{aster-nix => }/src/thread/work_queue/simple_scheduler.rs (100%) rename kernel/{aster-nix => }/src/thread/work_queue/work_item.rs (100%) rename kernel/{aster-nix => }/src/thread/work_queue/worker.rs (100%) rename kernel/{aster-nix => }/src/thread/work_queue/worker_pool.rs (100%) rename kernel/{aster-nix => }/src/time/clocks/cpu_clock.rs (100%) rename kernel/{aster-nix => }/src/time/clocks/mod.rs (100%) rename kernel/{aster-nix => }/src/time/clocks/system_wide.rs (100%) rename kernel/{aster-nix => }/src/time/core/mod.rs (100%) rename kernel/{aster-nix => }/src/time/core/timer.rs (100%) rename kernel/{aster-nix => }/src/time/mod.rs (100%) rename kernel/{aster-nix => }/src/time/softirq.rs (100%) rename kernel/{aster-nix => }/src/time/system_time.rs (100%) rename kernel/{aster-nix => }/src/time/wait.rs (100%) rename kernel/{aster-nix => }/src/util/iovec.rs (100%) rename kernel/{aster-nix => }/src/util/mod.rs (100%) rename kernel/{aster-nix => }/src/util/net/addr/family.rs (100%) rename kernel/{aster-nix => }/src/util/net/addr/ip.rs (100%) rename kernel/{aster-nix => }/src/util/net/addr/mod.rs (100%) rename kernel/{aster-nix => }/src/util/net/addr/unix.rs (100%) rename kernel/{aster-nix => }/src/util/net/addr/vsock.rs (100%) rename kernel/{aster-nix => }/src/util/net/mod.rs (100%) rename kernel/{aster-nix => }/src/util/net/options/mod.rs (100%) rename kernel/{aster-nix => }/src/util/net/options/socket.rs (100%) rename kernel/{aster-nix => }/src/util/net/options/tcp.rs (100%) rename kernel/{aster-nix => }/src/util/net/options/utils.rs (100%) rename kernel/{aster-nix => }/src/util/net/socket.rs (100%) rename kernel/{aster-nix => }/src/util/random.rs (100%) rename kernel/{aster-nix => }/src/vdso.rs (100%) rename kernel/{aster-nix => }/src/vm/mod.rs (100%) rename kernel/{aster-nix => }/src/vm/page_fault_handler.rs (100%) rename kernel/{aster-nix => }/src/vm/perms.rs (100%) rename kernel/{aster-nix => }/src/vm/util.rs (100%) rename kernel/{aster-nix => }/src/vm/vmar/dyn_cap.rs (100%) rename kernel/{aster-nix => }/src/vm/vmar/interval.rs (100%) rename kernel/{aster-nix => }/src/vm/vmar/mod.rs (100%) rename kernel/{aster-nix => }/src/vm/vmar/options.rs (100%) rename kernel/{aster-nix => }/src/vm/vmar/static_cap.rs (100%) rename kernel/{aster-nix => }/src/vm/vmar/vm_mapping.rs (100%) rename kernel/{aster-nix => }/src/vm/vmo/dyn_cap.rs (100%) rename kernel/{aster-nix => }/src/vm/vmo/mod.rs (100%) rename kernel/{aster-nix => }/src/vm/vmo/options.rs (100%) rename kernel/{aster-nix => }/src/vm/vmo/pager.rs (100%) rename kernel/{aster-nix => }/src/vm/vmo/static_cap.rs (100%) diff --git a/Cargo.lock b/Cargo.lock index 507bc81c..75ac2c88 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -153,6 +153,7 @@ dependencies = [ "ascii", "aster-block", "aster-console", + "aster-framebuffer", "aster-input", "aster-network", "aster-rights", @@ -166,6 +167,7 @@ dependencies = [ "bytemuck", "bytemuck_derive", "cfg-if", + "component", "controlled", "core2", "cpio-decoder", @@ -262,19 +264,6 @@ dependencies = [ "typeflags-util", ] -[[package]] -name = "asterinas" -version = "0.4.0" -dependencies = [ - "aster-framebuffer", - "aster-nix", - "aster-time", - "component", - "id-alloc", - "ostd", - "x86_64 0.14.11", -] - [[package]] name = "atomic" version = "0.6.0" diff --git a/Cargo.toml b/Cargo.toml index edcb204c..64ffc7e5 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -11,7 +11,6 @@ members = [ "ostd/libs/linux-bzimage/setup", "ostd/libs/ostd-test", "kernel", - "kernel/aster-nix", "kernel/comps/block", "kernel/comps/console", "kernel/comps/framebuffer", diff --git a/Components.toml b/Components.toml index ba1b5572..f442c589 100644 --- a/Components.toml +++ b/Components.toml @@ -8,8 +8,7 @@ console = { name = "aster-console" } time = { name = "aster-time" } framebuffer = { name = "aster-framebuffer" } network = { name = "aster-network" } -main = { name = "asterinas" } [whitelist] -[whitelist.nix.run_first_process] +[whitelist.nix.main] main = true diff --git a/Makefile b/Makefile index 88140b5e..227088ff 100644 --- a/Makefile +++ b/Makefile @@ -114,7 +114,6 @@ OSDK_CRATES := \ ostd \ ostd/libs/linux-bzimage/setup \ kernel \ - kernel/aster-nix \ kernel/comps/block \ kernel/comps/console \ kernel/comps/framebuffer \ diff --git a/kernel/Cargo.toml b/kernel/Cargo.toml index 8ceec4a4..5351b489 100644 --- a/kernel/Cargo.toml +++ b/kernel/Cargo.toml @@ -1,18 +1,82 @@ [package] -name = "asterinas" -version = "0.4.0" +name = "aster-nix" +version = "0.1.0" edition = "2021" -[dependencies] -id-alloc = { path = "../ostd/libs/id-alloc" } -ostd = { path = "../ostd" } -aster-nix = { path = "aster-nix" } -component = { path = "libs/comp-sys/component" } +# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html -[dev-dependencies] -x86_64 = "0.14.2" -aster-time = { path = "comps/time" } +[dependencies] +align_ext = { path = "../ostd/libs/align_ext" } +aster-input = { path = "comps/input" } +aster-block = { path = "comps/block" } +aster-network = { path = "comps/network" } +aster-console = { path = "comps/console" } aster-framebuffer = { path = "comps/framebuffer" } +aster-time = { path = "comps/time" } +aster-virtio = { path = "comps/virtio" } +aster-rights = { path = "libs/aster-rights" } +component = { path = "libs/comp-sys/component" } +controlled = { path = "libs/comp-sys/controlled" } +ostd = { path = "../ostd" } +typeflags = { path = "libs/typeflags" } +typeflags-util = { path = "libs/typeflags-util" } +aster-rights-proc = { path = "libs/aster-rights-proc" } +aster-util = { path = "libs/aster-util" } +id-alloc = { path = "../ostd/libs/id-alloc" } +int-to-c-enum = { path = "libs/int-to-c-enum" } +cpio-decoder = { path = "libs/cpio-decoder" } +ascii = { version = "1.1", default-features = false, features = ["alloc"] } +intrusive-collections = "0.9.5" +paste = "1.0" +time = { version = "0.3", default-features = false, features = ["alloc"] } +smoltcp = { git = "https://github.com/smoltcp-rs/smoltcp", rev = "dc08e0b", default-features = false, features = [ + "alloc", + "log", + "medium-ethernet", + "medium-ip", + "proto-dhcpv4", + "proto-ipv4", + "proto-igmp", + "socket-icmp", + "socket-udp", + "socket-tcp", + "socket-raw", + "socket-dhcpv4", +] } +tdx-guest = { version = "0.1.7", optional = true } + +# parse elf file +xmas-elf = "0.8.0" +# data-structures +bitflags = "1.3" +ringbuf = { version = "0.3.2", default-features = false, features = ["alloc"] } +keyable-arc = { path = "libs/keyable-arc" } +# unzip initramfs +libflate = { version = "2", default-features = false } +core2 = { version = "0.4", default-features = false, features = ["alloc"] } +lending-iterator = "0.1.7" +spin = "0.9.4" +vte = "0.10" +lru = "0.12.3" +log = "0.4" +bitvec = { version = "1.0", default-features = false, features = ["alloc"] } +hashbrown = "0.14" +rand = { version = "0.8.5", default-features = false, features = [ + "small_rng", + "std_rng", +] } +static_assertions = "1.1.0" +inherit-methods-macro = { git = "https://github.com/asterinas/inherit-methods-macro", rev = "98f7e3e" } +getset = "0.1.2" +atomic = "0.6" +bytemuck = "1.14.3" +bytemuck_derive = "1.5.0" +takeable = "0.2.2" +cfg-if = "1.0" + +[dependencies.lazy_static] +version = "1.0" +features = ["spin_no_std"] [features] -cvm_guest = ["ostd/cvm_guest", "aster-nix/cvm_guest"] +cvm_guest = ["dep:tdx-guest", "ostd/cvm_guest"] diff --git a/kernel/aster-nix/Cargo.toml b/kernel/aster-nix/Cargo.toml deleted file mode 100644 index 219b3725..00000000 --- a/kernel/aster-nix/Cargo.toml +++ /dev/null @@ -1,81 +0,0 @@ -[package] -name = "aster-nix" -version = "0.1.0" -edition = "2021" - -# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html - -[dependencies] -align_ext = { path = "../../ostd/libs/align_ext" } -aster-input = { path = "../comps/input" } -aster-block = { path = "../comps/block" } -aster-network = { path = "../comps/network" } -aster-console = { path = "../comps/console" } -aster-time = { path = "../comps/time" } -aster-virtio = { path = "../comps/virtio" } -aster-rights = { path = "../libs/aster-rights" } -controlled = { path = "../libs/comp-sys/controlled" } -ostd = { path = "../../ostd" } -typeflags = { path = "../libs/typeflags" } -typeflags-util = { path = "../libs/typeflags-util" } -aster-rights-proc = { path = "../libs/aster-rights-proc" } -aster-util = { path = "../libs/aster-util" } -id-alloc = { path = "../../ostd/libs/id-alloc" } -int-to-c-enum = { path = "../libs/int-to-c-enum" } -cpio-decoder = { path = "../libs/cpio-decoder" } -ascii = { version = "1.1", default-features = false, features = ["alloc"] } -intrusive-collections = "0.9.5" -paste = "1.0" -time = { version = "0.3", default-features = false, features = ["alloc"] } -smoltcp = { git = "https://github.com/smoltcp-rs/smoltcp", rev = "dc08e0b", default-features = false, features = [ - "alloc", - "log", - "medium-ethernet", - "medium-ip", - "proto-dhcpv4", - "proto-ipv4", - "proto-igmp", - "socket-icmp", - "socket-udp", - "socket-tcp", - "socket-raw", - "socket-dhcpv4", -] } -tdx-guest = { version = "0.1.7", optional = true } - -# parse elf file -xmas-elf = "0.8.0" -# goblin = {version= "0.5.3", default-features = false, features = ["elf64"]} -# data-structures -bitflags = "1.3" -ringbuf = { version = "0.3.2", default-features = false, features = ["alloc"] } -keyable-arc = { path = "../libs/keyable-arc" } -# unzip initramfs -libflate = { version = "2", default-features = false } -core2 = { version = "0.4", default-features = false, features = ["alloc"] } -lending-iterator = "0.1.7" -spin = "0.9.4" -vte = "0.10" -lru = "0.12.3" -log = "0.4" -bitvec = { version = "1.0", default-features = false, features = ["alloc"] } -hashbrown = "0.14" -rand = { version = "0.8.5", default-features = false, features = [ - "small_rng", - "std_rng", -] } -static_assertions = "1.1.0" -inherit-methods-macro = { git = "https://github.com/asterinas/inherit-methods-macro", rev = "98f7e3e" } -getset = "0.1.2" -atomic = "0.6" -bytemuck = "1.14.3" -bytemuck_derive = "1.5.0" -takeable = "0.2.2" -cfg-if = "1.0" - -[dependencies.lazy_static] -version = "1.0" -features = ["spin_no_std"] - -[features] -cvm_guest = ["dep:tdx-guest"] diff --git a/kernel/aster-nix/src/lib.rs b/kernel/aster-nix/src/lib.rs deleted file mode 100644 index 4a8faf02..00000000 --- a/kernel/aster-nix/src/lib.rs +++ /dev/null @@ -1,155 +0,0 @@ -// SPDX-License-Identifier: MPL-2.0 - -//! The std library of Asterinas. -#![no_std] -#![deny(unsafe_code)] -#![allow(incomplete_features)] -#![feature(btree_cursors)] -#![feature(btree_extract_if)] -#![feature(const_option)] -#![feature(extend_one)] -#![feature(fn_traits)] -#![feature(format_args_nl)] -#![feature(int_roundings)] -#![feature(iter_repeat_n)] -#![feature(let_chains)] -#![feature(linkage)] -#![feature(linked_list_remove)] -#![feature(negative_impls)] -#![feature(register_tool)] -// FIXME: This feature is used to support vm capbility now as a work around. -// Since this is an incomplete feature, use this feature is unsafe. -// We should find a proper method to replace this feature with min_specialization, which is a sound feature. -#![feature(specialization)] -#![feature(step_trait)] -#![feature(trait_alias)] -#![feature(trait_upcasting)] -#![feature(linked_list_retain)] -#![register_tool(component_access_control)] - -use ostd::{ - arch::qemu::{exit_qemu, QemuExitCode}, - boot, -}; -use process::Process; - -use crate::{ - prelude::*, - thread::{ - kernel_thread::{KernelThreadExt, ThreadOptions}, - Thread, - }, -}; - -extern crate alloc; -extern crate lru; -#[macro_use] -extern crate controlled; -#[macro_use] -extern crate getset; - -pub mod arch; -pub mod console; -pub mod context; -pub mod cpu; -pub mod device; -pub mod driver; -pub mod error; -pub mod events; -pub mod fs; -pub mod ipc; -pub mod net; -pub mod prelude; -mod process; -mod sched; -pub mod softirq_id; -pub mod syscall; -mod taskless; -pub mod thread; -pub mod time; -mod util; -pub(crate) mod vdso; -pub mod vm; - -pub fn init() { - util::random::init(); - driver::init(); - time::init(); - net::init(); - sched::init(); - fs::rootfs::init(boot::initramfs()).unwrap(); - device::init().unwrap(); - vdso::init(); - taskless::init(); - process::init(); -} - -fn init_thread() { - println!( - "[kernel] Spawn init thread, tid = {}", - current_thread!().tid() - ); - // Work queue should be initialized before interrupt is enabled, - // in case any irq handler uses work queue as bottom half - thread::work_queue::init(); - net::lazy_init(); - fs::lazy_init(); - ipc::init(); - // driver::pci::virtio::block::block_device_test(); - let thread = Thread::spawn_kernel_thread(ThreadOptions::new(|| { - println!("[kernel] Hello world from kernel!"); - let current = current_thread!(); - let tid = current.tid(); - debug!("current tid = {}", tid); - })); - thread.join(); - info!( - "[aster-nix/lib.rs] spawn kernel thread, tid = {}", - thread.tid() - ); - - print_banner(); - - let karg = boot::kernel_cmdline(); - - let initproc = Process::spawn_user_process( - karg.get_initproc_path().unwrap(), - karg.get_initproc_argv().to_vec(), - karg.get_initproc_envp().to_vec(), - ) - .expect("Run init process failed."); - // Wait till initproc become zombie. - while !initproc.is_zombie() { - // We don't have preemptive scheduler now. - // The long running init thread should yield its own execution to allow other tasks to go on. - Thread::yield_now(); - } - - // TODO: exit via qemu isa debug device should not be the only way. - let exit_code = if initproc.exit_code().unwrap() == 0 { - QemuExitCode::Success - } else { - QemuExitCode::Failed - }; - exit_qemu(exit_code); -} - -/// first process never return -#[controlled] -pub fn run_first_process() -> ! { - Thread::spawn_kernel_thread(ThreadOptions::new(init_thread)); - unreachable!() -} - -fn print_banner() { - println!("\x1B[36m"); - println!( - r" - _ ___ _____ ___ ___ ___ _ _ _ ___ - /_\ / __|_ _| __| _ \_ _| \| | /_\ / __| - / _ \\__ \ | | | _|| /| || .` |/ _ \\__ \ -/_/ \_\___/ |_| |___|_|_\___|_|\_/_/ \_\___/ -" - ); - println!("\x1B[0m"); -} diff --git a/kernel/aster-nix/src/arch/mod.rs b/kernel/src/arch/mod.rs similarity index 100% rename from kernel/aster-nix/src/arch/mod.rs rename to kernel/src/arch/mod.rs diff --git a/kernel/aster-nix/src/arch/x86/cpu.rs b/kernel/src/arch/x86/cpu.rs similarity index 100% rename from kernel/aster-nix/src/arch/x86/cpu.rs rename to kernel/src/arch/x86/cpu.rs diff --git a/kernel/aster-nix/src/arch/x86/mod.rs b/kernel/src/arch/x86/mod.rs similarity index 100% rename from kernel/aster-nix/src/arch/x86/mod.rs rename to kernel/src/arch/x86/mod.rs diff --git a/kernel/aster-nix/src/arch/x86/signal.rs b/kernel/src/arch/x86/signal.rs similarity index 100% rename from kernel/aster-nix/src/arch/x86/signal.rs rename to kernel/src/arch/x86/signal.rs diff --git a/kernel/aster-nix/src/console.rs b/kernel/src/console.rs similarity index 100% rename from kernel/aster-nix/src/console.rs rename to kernel/src/console.rs diff --git a/kernel/aster-nix/src/context.rs b/kernel/src/context.rs similarity index 100% rename from kernel/aster-nix/src/context.rs rename to kernel/src/context.rs diff --git a/kernel/aster-nix/src/cpu.rs b/kernel/src/cpu.rs similarity index 100% rename from kernel/aster-nix/src/cpu.rs rename to kernel/src/cpu.rs diff --git a/kernel/aster-nix/src/device/mod.rs b/kernel/src/device/mod.rs similarity index 100% rename from kernel/aster-nix/src/device/mod.rs rename to kernel/src/device/mod.rs diff --git a/kernel/aster-nix/src/device/null.rs b/kernel/src/device/null.rs similarity index 100% rename from kernel/aster-nix/src/device/null.rs rename to kernel/src/device/null.rs diff --git a/kernel/aster-nix/src/device/pty/mod.rs b/kernel/src/device/pty/mod.rs similarity index 100% rename from kernel/aster-nix/src/device/pty/mod.rs rename to kernel/src/device/pty/mod.rs diff --git a/kernel/aster-nix/src/device/pty/pty.rs b/kernel/src/device/pty/pty.rs similarity index 100% rename from kernel/aster-nix/src/device/pty/pty.rs rename to kernel/src/device/pty/pty.rs diff --git a/kernel/aster-nix/src/device/random.rs b/kernel/src/device/random.rs similarity index 100% rename from kernel/aster-nix/src/device/random.rs rename to kernel/src/device/random.rs diff --git a/kernel/aster-nix/src/device/tdxguest/mod.rs b/kernel/src/device/tdxguest/mod.rs similarity index 100% rename from kernel/aster-nix/src/device/tdxguest/mod.rs rename to kernel/src/device/tdxguest/mod.rs diff --git a/kernel/aster-nix/src/device/tty/device.rs b/kernel/src/device/tty/device.rs similarity index 100% rename from kernel/aster-nix/src/device/tty/device.rs rename to kernel/src/device/tty/device.rs diff --git a/kernel/aster-nix/src/device/tty/driver.rs b/kernel/src/device/tty/driver.rs similarity index 100% rename from kernel/aster-nix/src/device/tty/driver.rs rename to kernel/src/device/tty/driver.rs diff --git a/kernel/aster-nix/src/device/tty/line_discipline.rs b/kernel/src/device/tty/line_discipline.rs similarity index 100% rename from kernel/aster-nix/src/device/tty/line_discipline.rs rename to kernel/src/device/tty/line_discipline.rs diff --git a/kernel/aster-nix/src/device/tty/mod.rs b/kernel/src/device/tty/mod.rs similarity index 100% rename from kernel/aster-nix/src/device/tty/mod.rs rename to kernel/src/device/tty/mod.rs diff --git a/kernel/aster-nix/src/device/tty/termio.rs b/kernel/src/device/tty/termio.rs similarity index 100% rename from kernel/aster-nix/src/device/tty/termio.rs rename to kernel/src/device/tty/termio.rs diff --git a/kernel/aster-nix/src/device/urandom.rs b/kernel/src/device/urandom.rs similarity index 100% rename from kernel/aster-nix/src/device/urandom.rs rename to kernel/src/device/urandom.rs diff --git a/kernel/aster-nix/src/device/zero.rs b/kernel/src/device/zero.rs similarity index 100% rename from kernel/aster-nix/src/device/zero.rs rename to kernel/src/device/zero.rs diff --git a/kernel/aster-nix/src/driver/mod.rs b/kernel/src/driver/mod.rs similarity index 100% rename from kernel/aster-nix/src/driver/mod.rs rename to kernel/src/driver/mod.rs diff --git a/kernel/aster-nix/src/error.rs b/kernel/src/error.rs similarity index 100% rename from kernel/aster-nix/src/error.rs rename to kernel/src/error.rs diff --git a/kernel/aster-nix/src/events/events.rs b/kernel/src/events/events.rs similarity index 100% rename from kernel/aster-nix/src/events/events.rs rename to kernel/src/events/events.rs diff --git a/kernel/aster-nix/src/events/io_events.rs b/kernel/src/events/io_events.rs similarity index 100% rename from kernel/aster-nix/src/events/io_events.rs rename to kernel/src/events/io_events.rs diff --git a/kernel/aster-nix/src/events/mod.rs b/kernel/src/events/mod.rs similarity index 100% rename from kernel/aster-nix/src/events/mod.rs rename to kernel/src/events/mod.rs diff --git a/kernel/aster-nix/src/events/observer.rs b/kernel/src/events/observer.rs similarity index 100% rename from kernel/aster-nix/src/events/observer.rs rename to kernel/src/events/observer.rs diff --git a/kernel/aster-nix/src/events/subject.rs b/kernel/src/events/subject.rs similarity index 100% rename from kernel/aster-nix/src/events/subject.rs rename to kernel/src/events/subject.rs diff --git a/kernel/aster-nix/src/fs/device.rs b/kernel/src/fs/device.rs similarity index 100% rename from kernel/aster-nix/src/fs/device.rs rename to kernel/src/fs/device.rs diff --git a/kernel/aster-nix/src/fs/devpts/mod.rs b/kernel/src/fs/devpts/mod.rs similarity index 100% rename from kernel/aster-nix/src/fs/devpts/mod.rs rename to kernel/src/fs/devpts/mod.rs diff --git a/kernel/aster-nix/src/fs/devpts/ptmx.rs b/kernel/src/fs/devpts/ptmx.rs similarity index 100% rename from kernel/aster-nix/src/fs/devpts/ptmx.rs rename to kernel/src/fs/devpts/ptmx.rs diff --git a/kernel/aster-nix/src/fs/devpts/slave.rs b/kernel/src/fs/devpts/slave.rs similarity index 100% rename from kernel/aster-nix/src/fs/devpts/slave.rs rename to kernel/src/fs/devpts/slave.rs diff --git a/kernel/aster-nix/src/fs/epoll/epoll_file.rs b/kernel/src/fs/epoll/epoll_file.rs similarity index 100% rename from kernel/aster-nix/src/fs/epoll/epoll_file.rs rename to kernel/src/fs/epoll/epoll_file.rs diff --git a/kernel/aster-nix/src/fs/epoll/mod.rs b/kernel/src/fs/epoll/mod.rs similarity index 100% rename from kernel/aster-nix/src/fs/epoll/mod.rs rename to kernel/src/fs/epoll/mod.rs diff --git a/kernel/aster-nix/src/fs/exfat/bitmap.rs b/kernel/src/fs/exfat/bitmap.rs similarity index 100% rename from kernel/aster-nix/src/fs/exfat/bitmap.rs rename to kernel/src/fs/exfat/bitmap.rs diff --git a/kernel/aster-nix/src/fs/exfat/constants.rs b/kernel/src/fs/exfat/constants.rs similarity index 100% rename from kernel/aster-nix/src/fs/exfat/constants.rs rename to kernel/src/fs/exfat/constants.rs diff --git a/kernel/aster-nix/src/fs/exfat/dentry.rs b/kernel/src/fs/exfat/dentry.rs similarity index 100% rename from kernel/aster-nix/src/fs/exfat/dentry.rs rename to kernel/src/fs/exfat/dentry.rs diff --git a/kernel/aster-nix/src/fs/exfat/fat.rs b/kernel/src/fs/exfat/fat.rs similarity index 100% rename from kernel/aster-nix/src/fs/exfat/fat.rs rename to kernel/src/fs/exfat/fat.rs diff --git a/kernel/aster-nix/src/fs/exfat/fs.rs b/kernel/src/fs/exfat/fs.rs similarity index 100% rename from kernel/aster-nix/src/fs/exfat/fs.rs rename to kernel/src/fs/exfat/fs.rs diff --git a/kernel/aster-nix/src/fs/exfat/inode.rs b/kernel/src/fs/exfat/inode.rs similarity index 100% rename from kernel/aster-nix/src/fs/exfat/inode.rs rename to kernel/src/fs/exfat/inode.rs diff --git a/kernel/aster-nix/src/fs/exfat/mod.rs b/kernel/src/fs/exfat/mod.rs similarity index 99% rename from kernel/aster-nix/src/fs/exfat/mod.rs rename to kernel/src/fs/exfat/mod.rs index 67fca56e..b748f32a 100644 --- a/kernel/aster-nix/src/fs/exfat/mod.rs +++ b/kernel/src/fs/exfat/mod.rs @@ -107,7 +107,7 @@ mod test { } } /// Exfat disk image - static EXFAT_IMAGE: &[u8] = include_bytes!("../../../../../test/build/exfat.img"); + static EXFAT_IMAGE: &[u8] = include_bytes!("../../../../test/build/exfat.img"); /// Read exfat disk image fn new_vm_segment_from_image() -> Segment { diff --git a/kernel/aster-nix/src/fs/exfat/super_block.rs b/kernel/src/fs/exfat/super_block.rs similarity index 100% rename from kernel/aster-nix/src/fs/exfat/super_block.rs rename to kernel/src/fs/exfat/super_block.rs diff --git a/kernel/aster-nix/src/fs/exfat/upcase_table.rs b/kernel/src/fs/exfat/upcase_table.rs similarity index 100% rename from kernel/aster-nix/src/fs/exfat/upcase_table.rs rename to kernel/src/fs/exfat/upcase_table.rs diff --git a/kernel/aster-nix/src/fs/exfat/utils.rs b/kernel/src/fs/exfat/utils.rs similarity index 100% rename from kernel/aster-nix/src/fs/exfat/utils.rs rename to kernel/src/fs/exfat/utils.rs diff --git a/kernel/aster-nix/src/fs/ext2/block_group.rs b/kernel/src/fs/ext2/block_group.rs similarity index 100% rename from kernel/aster-nix/src/fs/ext2/block_group.rs rename to kernel/src/fs/ext2/block_group.rs diff --git a/kernel/aster-nix/src/fs/ext2/block_ptr.rs b/kernel/src/fs/ext2/block_ptr.rs similarity index 100% rename from kernel/aster-nix/src/fs/ext2/block_ptr.rs rename to kernel/src/fs/ext2/block_ptr.rs diff --git a/kernel/aster-nix/src/fs/ext2/blocks_hole.rs b/kernel/src/fs/ext2/blocks_hole.rs similarity index 100% rename from kernel/aster-nix/src/fs/ext2/blocks_hole.rs rename to kernel/src/fs/ext2/blocks_hole.rs diff --git a/kernel/aster-nix/src/fs/ext2/dir.rs b/kernel/src/fs/ext2/dir.rs similarity index 100% rename from kernel/aster-nix/src/fs/ext2/dir.rs rename to kernel/src/fs/ext2/dir.rs diff --git a/kernel/aster-nix/src/fs/ext2/fs.rs b/kernel/src/fs/ext2/fs.rs similarity index 100% rename from kernel/aster-nix/src/fs/ext2/fs.rs rename to kernel/src/fs/ext2/fs.rs diff --git a/kernel/aster-nix/src/fs/ext2/impl_for_vfs/fs.rs b/kernel/src/fs/ext2/impl_for_vfs/fs.rs similarity index 100% rename from kernel/aster-nix/src/fs/ext2/impl_for_vfs/fs.rs rename to kernel/src/fs/ext2/impl_for_vfs/fs.rs diff --git a/kernel/aster-nix/src/fs/ext2/impl_for_vfs/inode.rs b/kernel/src/fs/ext2/impl_for_vfs/inode.rs similarity index 100% rename from kernel/aster-nix/src/fs/ext2/impl_for_vfs/inode.rs rename to kernel/src/fs/ext2/impl_for_vfs/inode.rs diff --git a/kernel/aster-nix/src/fs/ext2/impl_for_vfs/mod.rs b/kernel/src/fs/ext2/impl_for_vfs/mod.rs similarity index 100% rename from kernel/aster-nix/src/fs/ext2/impl_for_vfs/mod.rs rename to kernel/src/fs/ext2/impl_for_vfs/mod.rs diff --git a/kernel/aster-nix/src/fs/ext2/indirect_block_cache.rs b/kernel/src/fs/ext2/indirect_block_cache.rs similarity index 100% rename from kernel/aster-nix/src/fs/ext2/indirect_block_cache.rs rename to kernel/src/fs/ext2/indirect_block_cache.rs diff --git a/kernel/aster-nix/src/fs/ext2/inode.rs b/kernel/src/fs/ext2/inode.rs similarity index 100% rename from kernel/aster-nix/src/fs/ext2/inode.rs rename to kernel/src/fs/ext2/inode.rs diff --git a/kernel/aster-nix/src/fs/ext2/mod.rs b/kernel/src/fs/ext2/mod.rs similarity index 100% rename from kernel/aster-nix/src/fs/ext2/mod.rs rename to kernel/src/fs/ext2/mod.rs diff --git a/kernel/aster-nix/src/fs/ext2/prelude.rs b/kernel/src/fs/ext2/prelude.rs similarity index 100% rename from kernel/aster-nix/src/fs/ext2/prelude.rs rename to kernel/src/fs/ext2/prelude.rs diff --git a/kernel/aster-nix/src/fs/ext2/super_block.rs b/kernel/src/fs/ext2/super_block.rs similarity index 100% rename from kernel/aster-nix/src/fs/ext2/super_block.rs rename to kernel/src/fs/ext2/super_block.rs diff --git a/kernel/aster-nix/src/fs/ext2/utils.rs b/kernel/src/fs/ext2/utils.rs similarity index 100% rename from kernel/aster-nix/src/fs/ext2/utils.rs rename to kernel/src/fs/ext2/utils.rs diff --git a/kernel/aster-nix/src/fs/file_handle.rs b/kernel/src/fs/file_handle.rs similarity index 100% rename from kernel/aster-nix/src/fs/file_handle.rs rename to kernel/src/fs/file_handle.rs diff --git a/kernel/aster-nix/src/fs/file_table.rs b/kernel/src/fs/file_table.rs similarity index 100% rename from kernel/aster-nix/src/fs/file_table.rs rename to kernel/src/fs/file_table.rs diff --git a/kernel/aster-nix/src/fs/fs_resolver.rs b/kernel/src/fs/fs_resolver.rs similarity index 100% rename from kernel/aster-nix/src/fs/fs_resolver.rs rename to kernel/src/fs/fs_resolver.rs diff --git a/kernel/aster-nix/src/fs/inode_handle/dyn_cap.rs b/kernel/src/fs/inode_handle/dyn_cap.rs similarity index 100% rename from kernel/aster-nix/src/fs/inode_handle/dyn_cap.rs rename to kernel/src/fs/inode_handle/dyn_cap.rs diff --git a/kernel/aster-nix/src/fs/inode_handle/mod.rs b/kernel/src/fs/inode_handle/mod.rs similarity index 100% rename from kernel/aster-nix/src/fs/inode_handle/mod.rs rename to kernel/src/fs/inode_handle/mod.rs diff --git a/kernel/aster-nix/src/fs/inode_handle/static_cap.rs b/kernel/src/fs/inode_handle/static_cap.rs similarity index 100% rename from kernel/aster-nix/src/fs/inode_handle/static_cap.rs rename to kernel/src/fs/inode_handle/static_cap.rs diff --git a/kernel/aster-nix/src/fs/mod.rs b/kernel/src/fs/mod.rs similarity index 100% rename from kernel/aster-nix/src/fs/mod.rs rename to kernel/src/fs/mod.rs diff --git a/kernel/aster-nix/src/fs/named_pipe.rs b/kernel/src/fs/named_pipe.rs similarity index 100% rename from kernel/aster-nix/src/fs/named_pipe.rs rename to kernel/src/fs/named_pipe.rs diff --git a/kernel/aster-nix/src/fs/path/dentry.rs b/kernel/src/fs/path/dentry.rs similarity index 100% rename from kernel/aster-nix/src/fs/path/dentry.rs rename to kernel/src/fs/path/dentry.rs diff --git a/kernel/aster-nix/src/fs/path/mod.rs b/kernel/src/fs/path/mod.rs similarity index 100% rename from kernel/aster-nix/src/fs/path/mod.rs rename to kernel/src/fs/path/mod.rs diff --git a/kernel/aster-nix/src/fs/path/mount.rs b/kernel/src/fs/path/mount.rs similarity index 100% rename from kernel/aster-nix/src/fs/path/mount.rs rename to kernel/src/fs/path/mount.rs diff --git a/kernel/aster-nix/src/fs/pipe.rs b/kernel/src/fs/pipe.rs similarity index 100% rename from kernel/aster-nix/src/fs/pipe.rs rename to kernel/src/fs/pipe.rs diff --git a/kernel/aster-nix/src/fs/procfs/filesystems.rs b/kernel/src/fs/procfs/filesystems.rs similarity index 100% rename from kernel/aster-nix/src/fs/procfs/filesystems.rs rename to kernel/src/fs/procfs/filesystems.rs diff --git a/kernel/aster-nix/src/fs/procfs/meminfo.rs b/kernel/src/fs/procfs/meminfo.rs similarity index 100% rename from kernel/aster-nix/src/fs/procfs/meminfo.rs rename to kernel/src/fs/procfs/meminfo.rs diff --git a/kernel/aster-nix/src/fs/procfs/mod.rs b/kernel/src/fs/procfs/mod.rs similarity index 100% rename from kernel/aster-nix/src/fs/procfs/mod.rs rename to kernel/src/fs/procfs/mod.rs diff --git a/kernel/aster-nix/src/fs/procfs/pid/cmdline.rs b/kernel/src/fs/procfs/pid/cmdline.rs similarity index 100% rename from kernel/aster-nix/src/fs/procfs/pid/cmdline.rs rename to kernel/src/fs/procfs/pid/cmdline.rs diff --git a/kernel/aster-nix/src/fs/procfs/pid/comm.rs b/kernel/src/fs/procfs/pid/comm.rs similarity index 100% rename from kernel/aster-nix/src/fs/procfs/pid/comm.rs rename to kernel/src/fs/procfs/pid/comm.rs diff --git a/kernel/aster-nix/src/fs/procfs/pid/exe.rs b/kernel/src/fs/procfs/pid/exe.rs similarity index 100% rename from kernel/aster-nix/src/fs/procfs/pid/exe.rs rename to kernel/src/fs/procfs/pid/exe.rs diff --git a/kernel/aster-nix/src/fs/procfs/pid/fd.rs b/kernel/src/fs/procfs/pid/fd.rs similarity index 100% rename from kernel/aster-nix/src/fs/procfs/pid/fd.rs rename to kernel/src/fs/procfs/pid/fd.rs diff --git a/kernel/aster-nix/src/fs/procfs/pid/mod.rs b/kernel/src/fs/procfs/pid/mod.rs similarity index 100% rename from kernel/aster-nix/src/fs/procfs/pid/mod.rs rename to kernel/src/fs/procfs/pid/mod.rs diff --git a/kernel/aster-nix/src/fs/procfs/self_.rs b/kernel/src/fs/procfs/self_.rs similarity index 100% rename from kernel/aster-nix/src/fs/procfs/self_.rs rename to kernel/src/fs/procfs/self_.rs diff --git a/kernel/aster-nix/src/fs/procfs/sys/kernel/cap_last_cap.rs b/kernel/src/fs/procfs/sys/kernel/cap_last_cap.rs similarity index 100% rename from kernel/aster-nix/src/fs/procfs/sys/kernel/cap_last_cap.rs rename to kernel/src/fs/procfs/sys/kernel/cap_last_cap.rs diff --git a/kernel/aster-nix/src/fs/procfs/sys/kernel/mod.rs b/kernel/src/fs/procfs/sys/kernel/mod.rs similarity index 100% rename from kernel/aster-nix/src/fs/procfs/sys/kernel/mod.rs rename to kernel/src/fs/procfs/sys/kernel/mod.rs diff --git a/kernel/aster-nix/src/fs/procfs/sys/mod.rs b/kernel/src/fs/procfs/sys/mod.rs similarity index 100% rename from kernel/aster-nix/src/fs/procfs/sys/mod.rs rename to kernel/src/fs/procfs/sys/mod.rs diff --git a/kernel/aster-nix/src/fs/procfs/template/builder.rs b/kernel/src/fs/procfs/template/builder.rs similarity index 100% rename from kernel/aster-nix/src/fs/procfs/template/builder.rs rename to kernel/src/fs/procfs/template/builder.rs diff --git a/kernel/aster-nix/src/fs/procfs/template/dir.rs b/kernel/src/fs/procfs/template/dir.rs similarity index 100% rename from kernel/aster-nix/src/fs/procfs/template/dir.rs rename to kernel/src/fs/procfs/template/dir.rs diff --git a/kernel/aster-nix/src/fs/procfs/template/file.rs b/kernel/src/fs/procfs/template/file.rs similarity index 100% rename from kernel/aster-nix/src/fs/procfs/template/file.rs rename to kernel/src/fs/procfs/template/file.rs diff --git a/kernel/aster-nix/src/fs/procfs/template/mod.rs b/kernel/src/fs/procfs/template/mod.rs similarity index 100% rename from kernel/aster-nix/src/fs/procfs/template/mod.rs rename to kernel/src/fs/procfs/template/mod.rs diff --git a/kernel/aster-nix/src/fs/procfs/template/sym.rs b/kernel/src/fs/procfs/template/sym.rs similarity index 100% rename from kernel/aster-nix/src/fs/procfs/template/sym.rs rename to kernel/src/fs/procfs/template/sym.rs diff --git a/kernel/aster-nix/src/fs/ramfs/fs.rs b/kernel/src/fs/ramfs/fs.rs similarity index 100% rename from kernel/aster-nix/src/fs/ramfs/fs.rs rename to kernel/src/fs/ramfs/fs.rs diff --git a/kernel/aster-nix/src/fs/ramfs/mod.rs b/kernel/src/fs/ramfs/mod.rs similarity index 100% rename from kernel/aster-nix/src/fs/ramfs/mod.rs rename to kernel/src/fs/ramfs/mod.rs diff --git a/kernel/aster-nix/src/fs/rootfs.rs b/kernel/src/fs/rootfs.rs similarity index 100% rename from kernel/aster-nix/src/fs/rootfs.rs rename to kernel/src/fs/rootfs.rs diff --git a/kernel/aster-nix/src/fs/utils/access_mode.rs b/kernel/src/fs/utils/access_mode.rs similarity index 100% rename from kernel/aster-nix/src/fs/utils/access_mode.rs rename to kernel/src/fs/utils/access_mode.rs diff --git a/kernel/aster-nix/src/fs/utils/channel.rs b/kernel/src/fs/utils/channel.rs similarity index 100% rename from kernel/aster-nix/src/fs/utils/channel.rs rename to kernel/src/fs/utils/channel.rs diff --git a/kernel/aster-nix/src/fs/utils/creation_flags.rs b/kernel/src/fs/utils/creation_flags.rs similarity index 100% rename from kernel/aster-nix/src/fs/utils/creation_flags.rs rename to kernel/src/fs/utils/creation_flags.rs diff --git a/kernel/aster-nix/src/fs/utils/dirent_visitor.rs b/kernel/src/fs/utils/dirent_visitor.rs similarity index 100% rename from kernel/aster-nix/src/fs/utils/dirent_visitor.rs rename to kernel/src/fs/utils/dirent_visitor.rs diff --git a/kernel/aster-nix/src/fs/utils/direntry_vec.rs b/kernel/src/fs/utils/direntry_vec.rs similarity index 100% rename from kernel/aster-nix/src/fs/utils/direntry_vec.rs rename to kernel/src/fs/utils/direntry_vec.rs diff --git a/kernel/aster-nix/src/fs/utils/falloc_mode.rs b/kernel/src/fs/utils/falloc_mode.rs similarity index 100% rename from kernel/aster-nix/src/fs/utils/falloc_mode.rs rename to kernel/src/fs/utils/falloc_mode.rs diff --git a/kernel/aster-nix/src/fs/utils/file_creation_mask.rs b/kernel/src/fs/utils/file_creation_mask.rs similarity index 100% rename from kernel/aster-nix/src/fs/utils/file_creation_mask.rs rename to kernel/src/fs/utils/file_creation_mask.rs diff --git a/kernel/aster-nix/src/fs/utils/flock.rs b/kernel/src/fs/utils/flock.rs similarity index 100% rename from kernel/aster-nix/src/fs/utils/flock.rs rename to kernel/src/fs/utils/flock.rs diff --git a/kernel/aster-nix/src/fs/utils/fs.rs b/kernel/src/fs/utils/fs.rs similarity index 100% rename from kernel/aster-nix/src/fs/utils/fs.rs rename to kernel/src/fs/utils/fs.rs diff --git a/kernel/aster-nix/src/fs/utils/inode.rs b/kernel/src/fs/utils/inode.rs similarity index 100% rename from kernel/aster-nix/src/fs/utils/inode.rs rename to kernel/src/fs/utils/inode.rs diff --git a/kernel/aster-nix/src/fs/utils/ioctl.rs b/kernel/src/fs/utils/ioctl.rs similarity index 100% rename from kernel/aster-nix/src/fs/utils/ioctl.rs rename to kernel/src/fs/utils/ioctl.rs diff --git a/kernel/aster-nix/src/fs/utils/mod.rs b/kernel/src/fs/utils/mod.rs similarity index 100% rename from kernel/aster-nix/src/fs/utils/mod.rs rename to kernel/src/fs/utils/mod.rs diff --git a/kernel/aster-nix/src/fs/utils/page_cache.rs b/kernel/src/fs/utils/page_cache.rs similarity index 100% rename from kernel/aster-nix/src/fs/utils/page_cache.rs rename to kernel/src/fs/utils/page_cache.rs diff --git a/kernel/aster-nix/src/fs/utils/random_test.rs b/kernel/src/fs/utils/random_test.rs similarity index 100% rename from kernel/aster-nix/src/fs/utils/random_test.rs rename to kernel/src/fs/utils/random_test.rs diff --git a/kernel/aster-nix/src/fs/utils/range_lock/builder.rs b/kernel/src/fs/utils/range_lock/builder.rs similarity index 100% rename from kernel/aster-nix/src/fs/utils/range_lock/builder.rs rename to kernel/src/fs/utils/range_lock/builder.rs diff --git a/kernel/aster-nix/src/fs/utils/range_lock/mod.rs b/kernel/src/fs/utils/range_lock/mod.rs similarity index 100% rename from kernel/aster-nix/src/fs/utils/range_lock/mod.rs rename to kernel/src/fs/utils/range_lock/mod.rs diff --git a/kernel/aster-nix/src/fs/utils/range_lock/range.rs b/kernel/src/fs/utils/range_lock/range.rs similarity index 100% rename from kernel/aster-nix/src/fs/utils/range_lock/range.rs rename to kernel/src/fs/utils/range_lock/range.rs diff --git a/kernel/aster-nix/src/fs/utils/status_flags.rs b/kernel/src/fs/utils/status_flags.rs similarity index 100% rename from kernel/aster-nix/src/fs/utils/status_flags.rs rename to kernel/src/fs/utils/status_flags.rs diff --git a/kernel/aster-nix/src/ipc/mod.rs b/kernel/src/ipc/mod.rs similarity index 100% rename from kernel/aster-nix/src/ipc/mod.rs rename to kernel/src/ipc/mod.rs diff --git a/kernel/aster-nix/src/ipc/semaphore/mod.rs b/kernel/src/ipc/semaphore/mod.rs similarity index 100% rename from kernel/aster-nix/src/ipc/semaphore/mod.rs rename to kernel/src/ipc/semaphore/mod.rs diff --git a/kernel/aster-nix/src/ipc/semaphore/posix/mod.rs b/kernel/src/ipc/semaphore/posix/mod.rs similarity index 100% rename from kernel/aster-nix/src/ipc/semaphore/posix/mod.rs rename to kernel/src/ipc/semaphore/posix/mod.rs diff --git a/kernel/aster-nix/src/ipc/semaphore/system_v/mod.rs b/kernel/src/ipc/semaphore/system_v/mod.rs similarity index 100% rename from kernel/aster-nix/src/ipc/semaphore/system_v/mod.rs rename to kernel/src/ipc/semaphore/system_v/mod.rs diff --git a/kernel/aster-nix/src/ipc/semaphore/system_v/sem.rs b/kernel/src/ipc/semaphore/system_v/sem.rs similarity index 100% rename from kernel/aster-nix/src/ipc/semaphore/system_v/sem.rs rename to kernel/src/ipc/semaphore/system_v/sem.rs diff --git a/kernel/aster-nix/src/ipc/semaphore/system_v/sem_set.rs b/kernel/src/ipc/semaphore/system_v/sem_set.rs similarity index 100% rename from kernel/aster-nix/src/ipc/semaphore/system_v/sem_set.rs rename to kernel/src/ipc/semaphore/system_v/sem_set.rs diff --git a/kernel/src/lib.rs b/kernel/src/lib.rs index 32805827..96e14678 100644 --- a/kernel/src/lib.rs +++ b/kernel/src/lib.rs @@ -1,17 +1,161 @@ // SPDX-License-Identifier: MPL-2.0 +//! Aster-nix is the Asterinas kernel, a safe, efficient unix-like +//! operating system kernel built on top of OSTD and OSDK. + #![no_std] #![no_main] -#![feature(linkage)] #![deny(unsafe_code)] -extern crate ostd; +#![allow(incomplete_features)] +#![feature(btree_cursors)] +#![feature(btree_extract_if)] +#![feature(const_option)] +#![feature(extend_one)] +#![feature(fn_traits)] +#![feature(format_args_nl)] +#![feature(int_roundings)] +#![feature(iter_repeat_n)] +#![feature(let_chains)] +#![feature(linkage)] +#![feature(linked_list_remove)] +#![feature(negative_impls)] +#![feature(register_tool)] +// FIXME: This feature is used to support vm capbility now as a work around. +// Since this is an incomplete feature, use this feature is unsafe. +// We should find a proper method to replace this feature with min_specialization, which is a sound feature. +#![feature(specialization)] +#![feature(step_trait)] +#![feature(trait_alias)] +#![feature(trait_upcasting)] +#![feature(linked_list_retain)] +#![register_tool(component_access_control)] -use ostd::prelude::*; +use ostd::{ + arch::qemu::{exit_qemu, QemuExitCode}, + boot, +}; +use process::Process; + +use crate::{ + prelude::*, + thread::{ + kernel_thread::{KernelThreadExt, ThreadOptions}, + Thread, + }, +}; + +extern crate alloc; +extern crate lru; +#[macro_use] +extern crate controlled; +#[macro_use] +extern crate getset; + +pub mod arch; +pub mod console; +pub mod context; +pub mod cpu; +pub mod device; +pub mod driver; +pub mod error; +pub mod events; +pub mod fs; +pub mod ipc; +pub mod net; +pub mod prelude; +mod process; +mod sched; +pub mod softirq_id; +pub mod syscall; +mod taskless; +pub mod thread; +pub mod time; +mod util; +pub(crate) mod vdso; +pub mod vm; #[ostd::main] +#[controlled] pub fn main() { - println!("[kernel] finish init ostd"); + ostd::early_println!("[kernel] OSTD initialized. Preparing components."); component::init_all(component::parse_metadata!()).unwrap(); - aster_nix::init(); - aster_nix::run_first_process(); + init(); + Thread::spawn_kernel_thread(ThreadOptions::new(init_thread)); + unreachable!() +} + +pub fn init() { + util::random::init(); + driver::init(); + time::init(); + net::init(); + sched::init(); + fs::rootfs::init(boot::initramfs()).unwrap(); + device::init().unwrap(); + vdso::init(); + taskless::init(); + process::init(); +} + +fn init_thread() { + println!( + "[kernel] Spawn init thread, tid = {}", + current_thread!().tid() + ); + // Work queue should be initialized before interrupt is enabled, + // in case any irq handler uses work queue as bottom half + thread::work_queue::init(); + net::lazy_init(); + fs::lazy_init(); + ipc::init(); + // driver::pci::virtio::block::block_device_test(); + let thread = Thread::spawn_kernel_thread(ThreadOptions::new(|| { + println!("[kernel] Hello world from kernel!"); + let current = current_thread!(); + let tid = current.tid(); + debug!("current tid = {}", tid); + })); + thread.join(); + info!( + "[aster-nix/lib.rs] spawn kernel thread, tid = {}", + thread.tid() + ); + + print_banner(); + + let karg = boot::kernel_cmdline(); + + let initproc = Process::spawn_user_process( + karg.get_initproc_path().unwrap(), + karg.get_initproc_argv().to_vec(), + karg.get_initproc_envp().to_vec(), + ) + .expect("Run init process failed."); + // Wait till initproc become zombie. + while !initproc.is_zombie() { + // We don't have preemptive scheduler now. + // The long running init thread should yield its own execution to allow other tasks to go on. + Thread::yield_now(); + } + + // TODO: exit via qemu isa debug device should not be the only way. + let exit_code = if initproc.exit_code().unwrap() == 0 { + QemuExitCode::Success + } else { + QemuExitCode::Failed + }; + exit_qemu(exit_code); +} + +fn print_banner() { + println!("\x1B[36m"); + println!( + r" + _ ___ _____ ___ ___ ___ _ _ _ ___ + /_\ / __|_ _| __| _ \_ _| \| | /_\ / __| + / _ \\__ \ | | | _|| /| || .` |/ _ \\__ \ +/_/ \_\___/ |_| |___|_|_\___|_|\_/_/ \_\___/ +" + ); + println!("\x1B[0m"); } diff --git a/kernel/aster-nix/src/net/iface/any_socket.rs b/kernel/src/net/iface/any_socket.rs similarity index 100% rename from kernel/aster-nix/src/net/iface/any_socket.rs rename to kernel/src/net/iface/any_socket.rs diff --git a/kernel/aster-nix/src/net/iface/common.rs b/kernel/src/net/iface/common.rs similarity index 100% rename from kernel/aster-nix/src/net/iface/common.rs rename to kernel/src/net/iface/common.rs diff --git a/kernel/aster-nix/src/net/iface/loopback.rs b/kernel/src/net/iface/loopback.rs similarity index 100% rename from kernel/aster-nix/src/net/iface/loopback.rs rename to kernel/src/net/iface/loopback.rs diff --git a/kernel/aster-nix/src/net/iface/mod.rs b/kernel/src/net/iface/mod.rs similarity index 100% rename from kernel/aster-nix/src/net/iface/mod.rs rename to kernel/src/net/iface/mod.rs diff --git a/kernel/aster-nix/src/net/iface/time.rs b/kernel/src/net/iface/time.rs similarity index 100% rename from kernel/aster-nix/src/net/iface/time.rs rename to kernel/src/net/iface/time.rs diff --git a/kernel/aster-nix/src/net/iface/util.rs b/kernel/src/net/iface/util.rs similarity index 100% rename from kernel/aster-nix/src/net/iface/util.rs rename to kernel/src/net/iface/util.rs diff --git a/kernel/aster-nix/src/net/iface/virtio.rs b/kernel/src/net/iface/virtio.rs similarity index 100% rename from kernel/aster-nix/src/net/iface/virtio.rs rename to kernel/src/net/iface/virtio.rs diff --git a/kernel/aster-nix/src/net/mod.rs b/kernel/src/net/mod.rs similarity index 100% rename from kernel/aster-nix/src/net/mod.rs rename to kernel/src/net/mod.rs diff --git a/kernel/aster-nix/src/net/socket/ip/addr.rs b/kernel/src/net/socket/ip/addr.rs similarity index 100% rename from kernel/aster-nix/src/net/socket/ip/addr.rs rename to kernel/src/net/socket/ip/addr.rs diff --git a/kernel/aster-nix/src/net/socket/ip/common.rs b/kernel/src/net/socket/ip/common.rs similarity index 100% rename from kernel/aster-nix/src/net/socket/ip/common.rs rename to kernel/src/net/socket/ip/common.rs diff --git a/kernel/aster-nix/src/net/socket/ip/datagram/bound.rs b/kernel/src/net/socket/ip/datagram/bound.rs similarity index 100% rename from kernel/aster-nix/src/net/socket/ip/datagram/bound.rs rename to kernel/src/net/socket/ip/datagram/bound.rs diff --git a/kernel/aster-nix/src/net/socket/ip/datagram/mod.rs b/kernel/src/net/socket/ip/datagram/mod.rs similarity index 100% rename from kernel/aster-nix/src/net/socket/ip/datagram/mod.rs rename to kernel/src/net/socket/ip/datagram/mod.rs diff --git a/kernel/aster-nix/src/net/socket/ip/datagram/unbound.rs b/kernel/src/net/socket/ip/datagram/unbound.rs similarity index 100% rename from kernel/aster-nix/src/net/socket/ip/datagram/unbound.rs rename to kernel/src/net/socket/ip/datagram/unbound.rs diff --git a/kernel/aster-nix/src/net/socket/ip/mod.rs b/kernel/src/net/socket/ip/mod.rs similarity index 100% rename from kernel/aster-nix/src/net/socket/ip/mod.rs rename to kernel/src/net/socket/ip/mod.rs diff --git a/kernel/aster-nix/src/net/socket/ip/stream/connected.rs b/kernel/src/net/socket/ip/stream/connected.rs similarity index 100% rename from kernel/aster-nix/src/net/socket/ip/stream/connected.rs rename to kernel/src/net/socket/ip/stream/connected.rs diff --git a/kernel/aster-nix/src/net/socket/ip/stream/connecting.rs b/kernel/src/net/socket/ip/stream/connecting.rs similarity index 100% rename from kernel/aster-nix/src/net/socket/ip/stream/connecting.rs rename to kernel/src/net/socket/ip/stream/connecting.rs diff --git a/kernel/aster-nix/src/net/socket/ip/stream/init.rs b/kernel/src/net/socket/ip/stream/init.rs similarity index 100% rename from kernel/aster-nix/src/net/socket/ip/stream/init.rs rename to kernel/src/net/socket/ip/stream/init.rs diff --git a/kernel/aster-nix/src/net/socket/ip/stream/listen.rs b/kernel/src/net/socket/ip/stream/listen.rs similarity index 100% rename from kernel/aster-nix/src/net/socket/ip/stream/listen.rs rename to kernel/src/net/socket/ip/stream/listen.rs diff --git a/kernel/aster-nix/src/net/socket/ip/stream/mod.rs b/kernel/src/net/socket/ip/stream/mod.rs similarity index 100% rename from kernel/aster-nix/src/net/socket/ip/stream/mod.rs rename to kernel/src/net/socket/ip/stream/mod.rs diff --git a/kernel/aster-nix/src/net/socket/ip/stream/options.rs b/kernel/src/net/socket/ip/stream/options.rs similarity index 100% rename from kernel/aster-nix/src/net/socket/ip/stream/options.rs rename to kernel/src/net/socket/ip/stream/options.rs diff --git a/kernel/aster-nix/src/net/socket/ip/stream/util.rs b/kernel/src/net/socket/ip/stream/util.rs similarity index 100% rename from kernel/aster-nix/src/net/socket/ip/stream/util.rs rename to kernel/src/net/socket/ip/stream/util.rs diff --git a/kernel/aster-nix/src/net/socket/mod.rs b/kernel/src/net/socket/mod.rs similarity index 100% rename from kernel/aster-nix/src/net/socket/mod.rs rename to kernel/src/net/socket/mod.rs diff --git a/kernel/aster-nix/src/net/socket/options/macros.rs b/kernel/src/net/socket/options/macros.rs similarity index 100% rename from kernel/aster-nix/src/net/socket/options/macros.rs rename to kernel/src/net/socket/options/macros.rs diff --git a/kernel/aster-nix/src/net/socket/options/mod.rs b/kernel/src/net/socket/options/mod.rs similarity index 100% rename from kernel/aster-nix/src/net/socket/options/mod.rs rename to kernel/src/net/socket/options/mod.rs diff --git a/kernel/aster-nix/src/net/socket/unix/addr.rs b/kernel/src/net/socket/unix/addr.rs similarity index 100% rename from kernel/aster-nix/src/net/socket/unix/addr.rs rename to kernel/src/net/socket/unix/addr.rs diff --git a/kernel/aster-nix/src/net/socket/unix/mod.rs b/kernel/src/net/socket/unix/mod.rs similarity index 100% rename from kernel/aster-nix/src/net/socket/unix/mod.rs rename to kernel/src/net/socket/unix/mod.rs diff --git a/kernel/aster-nix/src/net/socket/unix/stream/connected.rs b/kernel/src/net/socket/unix/stream/connected.rs similarity index 100% rename from kernel/aster-nix/src/net/socket/unix/stream/connected.rs rename to kernel/src/net/socket/unix/stream/connected.rs diff --git a/kernel/aster-nix/src/net/socket/unix/stream/init.rs b/kernel/src/net/socket/unix/stream/init.rs similarity index 100% rename from kernel/aster-nix/src/net/socket/unix/stream/init.rs rename to kernel/src/net/socket/unix/stream/init.rs diff --git a/kernel/aster-nix/src/net/socket/unix/stream/listener.rs b/kernel/src/net/socket/unix/stream/listener.rs similarity index 100% rename from kernel/aster-nix/src/net/socket/unix/stream/listener.rs rename to kernel/src/net/socket/unix/stream/listener.rs diff --git a/kernel/aster-nix/src/net/socket/unix/stream/mod.rs b/kernel/src/net/socket/unix/stream/mod.rs similarity index 100% rename from kernel/aster-nix/src/net/socket/unix/stream/mod.rs rename to kernel/src/net/socket/unix/stream/mod.rs diff --git a/kernel/aster-nix/src/net/socket/unix/stream/socket.rs b/kernel/src/net/socket/unix/stream/socket.rs similarity index 100% rename from kernel/aster-nix/src/net/socket/unix/stream/socket.rs rename to kernel/src/net/socket/unix/stream/socket.rs diff --git a/kernel/aster-nix/src/net/socket/util/message_header.rs b/kernel/src/net/socket/util/message_header.rs similarity index 100% rename from kernel/aster-nix/src/net/socket/util/message_header.rs rename to kernel/src/net/socket/util/message_header.rs diff --git a/kernel/aster-nix/src/net/socket/util/mod.rs b/kernel/src/net/socket/util/mod.rs similarity index 100% rename from kernel/aster-nix/src/net/socket/util/mod.rs rename to kernel/src/net/socket/util/mod.rs diff --git a/kernel/aster-nix/src/net/socket/util/options.rs b/kernel/src/net/socket/util/options.rs similarity index 100% rename from kernel/aster-nix/src/net/socket/util/options.rs rename to kernel/src/net/socket/util/options.rs diff --git a/kernel/aster-nix/src/net/socket/util/send_recv_flags.rs b/kernel/src/net/socket/util/send_recv_flags.rs similarity index 100% rename from kernel/aster-nix/src/net/socket/util/send_recv_flags.rs rename to kernel/src/net/socket/util/send_recv_flags.rs diff --git a/kernel/aster-nix/src/net/socket/util/shutdown_cmd.rs b/kernel/src/net/socket/util/shutdown_cmd.rs similarity index 100% rename from kernel/aster-nix/src/net/socket/util/shutdown_cmd.rs rename to kernel/src/net/socket/util/shutdown_cmd.rs diff --git a/kernel/aster-nix/src/net/socket/util/socket_addr.rs b/kernel/src/net/socket/util/socket_addr.rs similarity index 100% rename from kernel/aster-nix/src/net/socket/util/socket_addr.rs rename to kernel/src/net/socket/util/socket_addr.rs diff --git a/kernel/aster-nix/src/net/socket/vsock/addr.rs b/kernel/src/net/socket/vsock/addr.rs similarity index 100% rename from kernel/aster-nix/src/net/socket/vsock/addr.rs rename to kernel/src/net/socket/vsock/addr.rs diff --git a/kernel/aster-nix/src/net/socket/vsock/common.rs b/kernel/src/net/socket/vsock/common.rs similarity index 100% rename from kernel/aster-nix/src/net/socket/vsock/common.rs rename to kernel/src/net/socket/vsock/common.rs diff --git a/kernel/aster-nix/src/net/socket/vsock/mod.rs b/kernel/src/net/socket/vsock/mod.rs similarity index 100% rename from kernel/aster-nix/src/net/socket/vsock/mod.rs rename to kernel/src/net/socket/vsock/mod.rs diff --git a/kernel/aster-nix/src/net/socket/vsock/stream/connected.rs b/kernel/src/net/socket/vsock/stream/connected.rs similarity index 100% rename from kernel/aster-nix/src/net/socket/vsock/stream/connected.rs rename to kernel/src/net/socket/vsock/stream/connected.rs diff --git a/kernel/aster-nix/src/net/socket/vsock/stream/connecting.rs b/kernel/src/net/socket/vsock/stream/connecting.rs similarity index 100% rename from kernel/aster-nix/src/net/socket/vsock/stream/connecting.rs rename to kernel/src/net/socket/vsock/stream/connecting.rs diff --git a/kernel/aster-nix/src/net/socket/vsock/stream/init.rs b/kernel/src/net/socket/vsock/stream/init.rs similarity index 100% rename from kernel/aster-nix/src/net/socket/vsock/stream/init.rs rename to kernel/src/net/socket/vsock/stream/init.rs diff --git a/kernel/aster-nix/src/net/socket/vsock/stream/listen.rs b/kernel/src/net/socket/vsock/stream/listen.rs similarity index 100% rename from kernel/aster-nix/src/net/socket/vsock/stream/listen.rs rename to kernel/src/net/socket/vsock/stream/listen.rs diff --git a/kernel/aster-nix/src/net/socket/vsock/stream/mod.rs b/kernel/src/net/socket/vsock/stream/mod.rs similarity index 100% rename from kernel/aster-nix/src/net/socket/vsock/stream/mod.rs rename to kernel/src/net/socket/vsock/stream/mod.rs diff --git a/kernel/aster-nix/src/net/socket/vsock/stream/socket.rs b/kernel/src/net/socket/vsock/stream/socket.rs similarity index 100% rename from kernel/aster-nix/src/net/socket/vsock/stream/socket.rs rename to kernel/src/net/socket/vsock/stream/socket.rs diff --git a/kernel/aster-nix/src/prelude.rs b/kernel/src/prelude.rs similarity index 100% rename from kernel/aster-nix/src/prelude.rs rename to kernel/src/prelude.rs diff --git a/kernel/aster-nix/src/process/clone.rs b/kernel/src/process/clone.rs similarity index 100% rename from kernel/aster-nix/src/process/clone.rs rename to kernel/src/process/clone.rs diff --git a/kernel/aster-nix/src/process/credentials/c_types.rs b/kernel/src/process/credentials/c_types.rs similarity index 100% rename from kernel/aster-nix/src/process/credentials/c_types.rs rename to kernel/src/process/credentials/c_types.rs diff --git a/kernel/aster-nix/src/process/credentials/capabilities.rs b/kernel/src/process/credentials/capabilities.rs similarity index 100% rename from kernel/aster-nix/src/process/credentials/capabilities.rs rename to kernel/src/process/credentials/capabilities.rs diff --git a/kernel/aster-nix/src/process/credentials/credentials_.rs b/kernel/src/process/credentials/credentials_.rs similarity index 100% rename from kernel/aster-nix/src/process/credentials/credentials_.rs rename to kernel/src/process/credentials/credentials_.rs diff --git a/kernel/aster-nix/src/process/credentials/group.rs b/kernel/src/process/credentials/group.rs similarity index 100% rename from kernel/aster-nix/src/process/credentials/group.rs rename to kernel/src/process/credentials/group.rs diff --git a/kernel/aster-nix/src/process/credentials/mod.rs b/kernel/src/process/credentials/mod.rs similarity index 100% rename from kernel/aster-nix/src/process/credentials/mod.rs rename to kernel/src/process/credentials/mod.rs diff --git a/kernel/aster-nix/src/process/credentials/static_cap.rs b/kernel/src/process/credentials/static_cap.rs similarity index 100% rename from kernel/aster-nix/src/process/credentials/static_cap.rs rename to kernel/src/process/credentials/static_cap.rs diff --git a/kernel/aster-nix/src/process/credentials/user.rs b/kernel/src/process/credentials/user.rs similarity index 100% rename from kernel/aster-nix/src/process/credentials/user.rs rename to kernel/src/process/credentials/user.rs diff --git a/kernel/aster-nix/src/process/exit.rs b/kernel/src/process/exit.rs similarity index 100% rename from kernel/aster-nix/src/process/exit.rs rename to kernel/src/process/exit.rs diff --git a/kernel/aster-nix/src/process/kill.rs b/kernel/src/process/kill.rs similarity index 100% rename from kernel/aster-nix/src/process/kill.rs rename to kernel/src/process/kill.rs diff --git a/kernel/aster-nix/src/process/mod.rs b/kernel/src/process/mod.rs similarity index 100% rename from kernel/aster-nix/src/process/mod.rs rename to kernel/src/process/mod.rs diff --git a/kernel/aster-nix/src/process/posix_thread/builder.rs b/kernel/src/process/posix_thread/builder.rs similarity index 100% rename from kernel/aster-nix/src/process/posix_thread/builder.rs rename to kernel/src/process/posix_thread/builder.rs diff --git a/kernel/aster-nix/src/process/posix_thread/exit.rs b/kernel/src/process/posix_thread/exit.rs similarity index 100% rename from kernel/aster-nix/src/process/posix_thread/exit.rs rename to kernel/src/process/posix_thread/exit.rs diff --git a/kernel/aster-nix/src/process/posix_thread/futex.rs b/kernel/src/process/posix_thread/futex.rs similarity index 100% rename from kernel/aster-nix/src/process/posix_thread/futex.rs rename to kernel/src/process/posix_thread/futex.rs diff --git a/kernel/aster-nix/src/process/posix_thread/mod.rs b/kernel/src/process/posix_thread/mod.rs similarity index 100% rename from kernel/aster-nix/src/process/posix_thread/mod.rs rename to kernel/src/process/posix_thread/mod.rs diff --git a/kernel/aster-nix/src/process/posix_thread/name.rs b/kernel/src/process/posix_thread/name.rs similarity index 100% rename from kernel/aster-nix/src/process/posix_thread/name.rs rename to kernel/src/process/posix_thread/name.rs diff --git a/kernel/aster-nix/src/process/posix_thread/posix_thread_ext.rs b/kernel/src/process/posix_thread/posix_thread_ext.rs similarity index 100% rename from kernel/aster-nix/src/process/posix_thread/posix_thread_ext.rs rename to kernel/src/process/posix_thread/posix_thread_ext.rs diff --git a/kernel/aster-nix/src/process/posix_thread/robust_list.rs b/kernel/src/process/posix_thread/robust_list.rs similarity index 100% rename from kernel/aster-nix/src/process/posix_thread/robust_list.rs rename to kernel/src/process/posix_thread/robust_list.rs diff --git a/kernel/aster-nix/src/process/process/builder.rs b/kernel/src/process/process/builder.rs similarity index 100% rename from kernel/aster-nix/src/process/process/builder.rs rename to kernel/src/process/process/builder.rs diff --git a/kernel/aster-nix/src/process/process/job_control.rs b/kernel/src/process/process/job_control.rs similarity index 100% rename from kernel/aster-nix/src/process/process/job_control.rs rename to kernel/src/process/process/job_control.rs diff --git a/kernel/aster-nix/src/process/process/mod.rs b/kernel/src/process/process/mod.rs similarity index 100% rename from kernel/aster-nix/src/process/process/mod.rs rename to kernel/src/process/process/mod.rs diff --git a/kernel/aster-nix/src/process/process/process_group.rs b/kernel/src/process/process/process_group.rs similarity index 100% rename from kernel/aster-nix/src/process/process/process_group.rs rename to kernel/src/process/process/process_group.rs diff --git a/kernel/aster-nix/src/process/process/session.rs b/kernel/src/process/process/session.rs similarity index 100% rename from kernel/aster-nix/src/process/process/session.rs rename to kernel/src/process/process/session.rs diff --git a/kernel/aster-nix/src/process/process/terminal.rs b/kernel/src/process/process/terminal.rs similarity index 100% rename from kernel/aster-nix/src/process/process/terminal.rs rename to kernel/src/process/process/terminal.rs diff --git a/kernel/aster-nix/src/process/process/timer_manager.rs b/kernel/src/process/process/timer_manager.rs similarity index 100% rename from kernel/aster-nix/src/process/process/timer_manager.rs rename to kernel/src/process/process/timer_manager.rs diff --git a/kernel/aster-nix/src/process/process_filter.rs b/kernel/src/process/process_filter.rs similarity index 100% rename from kernel/aster-nix/src/process/process_filter.rs rename to kernel/src/process/process_filter.rs diff --git a/kernel/aster-nix/src/process/process_table.rs b/kernel/src/process/process_table.rs similarity index 100% rename from kernel/aster-nix/src/process/process_table.rs rename to kernel/src/process/process_table.rs diff --git a/kernel/aster-nix/src/process/process_vm/heap.rs b/kernel/src/process/process_vm/heap.rs similarity index 100% rename from kernel/aster-nix/src/process/process_vm/heap.rs rename to kernel/src/process/process_vm/heap.rs diff --git a/kernel/aster-nix/src/process/process_vm/init_stack/aux_vec.rs b/kernel/src/process/process_vm/init_stack/aux_vec.rs similarity index 100% rename from kernel/aster-nix/src/process/process_vm/init_stack/aux_vec.rs rename to kernel/src/process/process_vm/init_stack/aux_vec.rs diff --git a/kernel/aster-nix/src/process/process_vm/init_stack/mod.rs b/kernel/src/process/process_vm/init_stack/mod.rs similarity index 100% rename from kernel/aster-nix/src/process/process_vm/init_stack/mod.rs rename to kernel/src/process/process_vm/init_stack/mod.rs diff --git a/kernel/aster-nix/src/process/process_vm/mod.rs b/kernel/src/process/process_vm/mod.rs similarity index 100% rename from kernel/aster-nix/src/process/process_vm/mod.rs rename to kernel/src/process/process_vm/mod.rs diff --git a/kernel/aster-nix/src/process/program_loader/elf/elf_file.rs b/kernel/src/process/program_loader/elf/elf_file.rs similarity index 100% rename from kernel/aster-nix/src/process/program_loader/elf/elf_file.rs rename to kernel/src/process/program_loader/elf/elf_file.rs diff --git a/kernel/aster-nix/src/process/program_loader/elf/load_elf.rs b/kernel/src/process/program_loader/elf/load_elf.rs similarity index 100% rename from kernel/aster-nix/src/process/program_loader/elf/load_elf.rs rename to kernel/src/process/program_loader/elf/load_elf.rs diff --git a/kernel/aster-nix/src/process/program_loader/elf/mod.rs b/kernel/src/process/program_loader/elf/mod.rs similarity index 100% rename from kernel/aster-nix/src/process/program_loader/elf/mod.rs rename to kernel/src/process/program_loader/elf/mod.rs diff --git a/kernel/aster-nix/src/process/program_loader/mod.rs b/kernel/src/process/program_loader/mod.rs similarity index 100% rename from kernel/aster-nix/src/process/program_loader/mod.rs rename to kernel/src/process/program_loader/mod.rs diff --git a/kernel/aster-nix/src/process/program_loader/shebang.rs b/kernel/src/process/program_loader/shebang.rs similarity index 100% rename from kernel/aster-nix/src/process/program_loader/shebang.rs rename to kernel/src/process/program_loader/shebang.rs diff --git a/kernel/aster-nix/src/process/rlimit.rs b/kernel/src/process/rlimit.rs similarity index 100% rename from kernel/aster-nix/src/process/rlimit.rs rename to kernel/src/process/rlimit.rs diff --git a/kernel/aster-nix/src/process/signal/c_types.rs b/kernel/src/process/signal/c_types.rs similarity index 100% rename from kernel/aster-nix/src/process/signal/c_types.rs rename to kernel/src/process/signal/c_types.rs diff --git a/kernel/aster-nix/src/process/signal/constants.rs b/kernel/src/process/signal/constants.rs similarity index 100% rename from kernel/aster-nix/src/process/signal/constants.rs rename to kernel/src/process/signal/constants.rs diff --git a/kernel/aster-nix/src/process/signal/events.rs b/kernel/src/process/signal/events.rs similarity index 100% rename from kernel/aster-nix/src/process/signal/events.rs rename to kernel/src/process/signal/events.rs diff --git a/kernel/aster-nix/src/process/signal/mod.rs b/kernel/src/process/signal/mod.rs similarity index 100% rename from kernel/aster-nix/src/process/signal/mod.rs rename to kernel/src/process/signal/mod.rs diff --git a/kernel/aster-nix/src/process/signal/pauser.rs b/kernel/src/process/signal/pauser.rs similarity index 100% rename from kernel/aster-nix/src/process/signal/pauser.rs rename to kernel/src/process/signal/pauser.rs diff --git a/kernel/aster-nix/src/process/signal/poll.rs b/kernel/src/process/signal/poll.rs similarity index 100% rename from kernel/aster-nix/src/process/signal/poll.rs rename to kernel/src/process/signal/poll.rs diff --git a/kernel/aster-nix/src/process/signal/sig_action.rs b/kernel/src/process/signal/sig_action.rs similarity index 100% rename from kernel/aster-nix/src/process/signal/sig_action.rs rename to kernel/src/process/signal/sig_action.rs diff --git a/kernel/aster-nix/src/process/signal/sig_disposition.rs b/kernel/src/process/signal/sig_disposition.rs similarity index 100% rename from kernel/aster-nix/src/process/signal/sig_disposition.rs rename to kernel/src/process/signal/sig_disposition.rs diff --git a/kernel/aster-nix/src/process/signal/sig_mask.rs b/kernel/src/process/signal/sig_mask.rs similarity index 100% rename from kernel/aster-nix/src/process/signal/sig_mask.rs rename to kernel/src/process/signal/sig_mask.rs diff --git a/kernel/aster-nix/src/process/signal/sig_num.rs b/kernel/src/process/signal/sig_num.rs similarity index 100% rename from kernel/aster-nix/src/process/signal/sig_num.rs rename to kernel/src/process/signal/sig_num.rs diff --git a/kernel/aster-nix/src/process/signal/sig_queues.rs b/kernel/src/process/signal/sig_queues.rs similarity index 100% rename from kernel/aster-nix/src/process/signal/sig_queues.rs rename to kernel/src/process/signal/sig_queues.rs diff --git a/kernel/aster-nix/src/process/signal/sig_stack.rs b/kernel/src/process/signal/sig_stack.rs similarity index 100% rename from kernel/aster-nix/src/process/signal/sig_stack.rs rename to kernel/src/process/signal/sig_stack.rs diff --git a/kernel/aster-nix/src/process/signal/signals/fault.rs b/kernel/src/process/signal/signals/fault.rs similarity index 100% rename from kernel/aster-nix/src/process/signal/signals/fault.rs rename to kernel/src/process/signal/signals/fault.rs diff --git a/kernel/aster-nix/src/process/signal/signals/kernel.rs b/kernel/src/process/signal/signals/kernel.rs similarity index 100% rename from kernel/aster-nix/src/process/signal/signals/kernel.rs rename to kernel/src/process/signal/signals/kernel.rs diff --git a/kernel/aster-nix/src/process/signal/signals/mod.rs b/kernel/src/process/signal/signals/mod.rs similarity index 100% rename from kernel/aster-nix/src/process/signal/signals/mod.rs rename to kernel/src/process/signal/signals/mod.rs diff --git a/kernel/aster-nix/src/process/signal/signals/user.rs b/kernel/src/process/signal/signals/user.rs similarity index 100% rename from kernel/aster-nix/src/process/signal/signals/user.rs rename to kernel/src/process/signal/signals/user.rs diff --git a/kernel/aster-nix/src/process/status.rs b/kernel/src/process/status.rs similarity index 100% rename from kernel/aster-nix/src/process/status.rs rename to kernel/src/process/status.rs diff --git a/kernel/aster-nix/src/process/sync/condvar.rs b/kernel/src/process/sync/condvar.rs similarity index 100% rename from kernel/aster-nix/src/process/sync/condvar.rs rename to kernel/src/process/sync/condvar.rs diff --git a/kernel/aster-nix/src/process/sync/mod.rs b/kernel/src/process/sync/mod.rs similarity index 100% rename from kernel/aster-nix/src/process/sync/mod.rs rename to kernel/src/process/sync/mod.rs diff --git a/kernel/aster-nix/src/process/term_status.rs b/kernel/src/process/term_status.rs similarity index 100% rename from kernel/aster-nix/src/process/term_status.rs rename to kernel/src/process/term_status.rs diff --git a/kernel/aster-nix/src/process/wait.rs b/kernel/src/process/wait.rs similarity index 100% rename from kernel/aster-nix/src/process/wait.rs rename to kernel/src/process/wait.rs diff --git a/kernel/aster-nix/src/sched/mod.rs b/kernel/src/sched/mod.rs similarity index 100% rename from kernel/aster-nix/src/sched/mod.rs rename to kernel/src/sched/mod.rs diff --git a/kernel/aster-nix/src/sched/nice.rs b/kernel/src/sched/nice.rs similarity index 100% rename from kernel/aster-nix/src/sched/nice.rs rename to kernel/src/sched/nice.rs diff --git a/kernel/aster-nix/src/sched/priority_scheduler.rs b/kernel/src/sched/priority_scheduler.rs similarity index 100% rename from kernel/aster-nix/src/sched/priority_scheduler.rs rename to kernel/src/sched/priority_scheduler.rs diff --git a/kernel/aster-nix/src/softirq_id.rs b/kernel/src/softirq_id.rs similarity index 100% rename from kernel/aster-nix/src/softirq_id.rs rename to kernel/src/softirq_id.rs diff --git a/kernel/aster-nix/src/syscall/accept.rs b/kernel/src/syscall/accept.rs similarity index 100% rename from kernel/aster-nix/src/syscall/accept.rs rename to kernel/src/syscall/accept.rs diff --git a/kernel/aster-nix/src/syscall/access.rs b/kernel/src/syscall/access.rs similarity index 100% rename from kernel/aster-nix/src/syscall/access.rs rename to kernel/src/syscall/access.rs diff --git a/kernel/aster-nix/src/syscall/alarm.rs b/kernel/src/syscall/alarm.rs similarity index 100% rename from kernel/aster-nix/src/syscall/alarm.rs rename to kernel/src/syscall/alarm.rs diff --git a/kernel/aster-nix/src/syscall/arch/mod.rs b/kernel/src/syscall/arch/mod.rs similarity index 100% rename from kernel/aster-nix/src/syscall/arch/mod.rs rename to kernel/src/syscall/arch/mod.rs diff --git a/kernel/aster-nix/src/syscall/arch/x86.rs b/kernel/src/syscall/arch/x86.rs similarity index 100% rename from kernel/aster-nix/src/syscall/arch/x86.rs rename to kernel/src/syscall/arch/x86.rs diff --git a/kernel/aster-nix/src/syscall/arch_prctl.rs b/kernel/src/syscall/arch_prctl.rs similarity index 100% rename from kernel/aster-nix/src/syscall/arch_prctl.rs rename to kernel/src/syscall/arch_prctl.rs diff --git a/kernel/aster-nix/src/syscall/bind.rs b/kernel/src/syscall/bind.rs similarity index 100% rename from kernel/aster-nix/src/syscall/bind.rs rename to kernel/src/syscall/bind.rs diff --git a/kernel/aster-nix/src/syscall/brk.rs b/kernel/src/syscall/brk.rs similarity index 100% rename from kernel/aster-nix/src/syscall/brk.rs rename to kernel/src/syscall/brk.rs diff --git a/kernel/aster-nix/src/syscall/capget.rs b/kernel/src/syscall/capget.rs similarity index 100% rename from kernel/aster-nix/src/syscall/capget.rs rename to kernel/src/syscall/capget.rs diff --git a/kernel/aster-nix/src/syscall/capset.rs b/kernel/src/syscall/capset.rs similarity index 100% rename from kernel/aster-nix/src/syscall/capset.rs rename to kernel/src/syscall/capset.rs diff --git a/kernel/aster-nix/src/syscall/chdir.rs b/kernel/src/syscall/chdir.rs similarity index 100% rename from kernel/aster-nix/src/syscall/chdir.rs rename to kernel/src/syscall/chdir.rs diff --git a/kernel/aster-nix/src/syscall/chmod.rs b/kernel/src/syscall/chmod.rs similarity index 100% rename from kernel/aster-nix/src/syscall/chmod.rs rename to kernel/src/syscall/chmod.rs diff --git a/kernel/aster-nix/src/syscall/chown.rs b/kernel/src/syscall/chown.rs similarity index 100% rename from kernel/aster-nix/src/syscall/chown.rs rename to kernel/src/syscall/chown.rs diff --git a/kernel/aster-nix/src/syscall/chroot.rs b/kernel/src/syscall/chroot.rs similarity index 100% rename from kernel/aster-nix/src/syscall/chroot.rs rename to kernel/src/syscall/chroot.rs diff --git a/kernel/aster-nix/src/syscall/clock_gettime.rs b/kernel/src/syscall/clock_gettime.rs similarity index 100% rename from kernel/aster-nix/src/syscall/clock_gettime.rs rename to kernel/src/syscall/clock_gettime.rs diff --git a/kernel/aster-nix/src/syscall/clone.rs b/kernel/src/syscall/clone.rs similarity index 100% rename from kernel/aster-nix/src/syscall/clone.rs rename to kernel/src/syscall/clone.rs diff --git a/kernel/aster-nix/src/syscall/close.rs b/kernel/src/syscall/close.rs similarity index 100% rename from kernel/aster-nix/src/syscall/close.rs rename to kernel/src/syscall/close.rs diff --git a/kernel/aster-nix/src/syscall/connect.rs b/kernel/src/syscall/connect.rs similarity index 100% rename from kernel/aster-nix/src/syscall/connect.rs rename to kernel/src/syscall/connect.rs diff --git a/kernel/aster-nix/src/syscall/constants.rs b/kernel/src/syscall/constants.rs similarity index 100% rename from kernel/aster-nix/src/syscall/constants.rs rename to kernel/src/syscall/constants.rs diff --git a/kernel/aster-nix/src/syscall/dup.rs b/kernel/src/syscall/dup.rs similarity index 100% rename from kernel/aster-nix/src/syscall/dup.rs rename to kernel/src/syscall/dup.rs diff --git a/kernel/aster-nix/src/syscall/epoll.rs b/kernel/src/syscall/epoll.rs similarity index 100% rename from kernel/aster-nix/src/syscall/epoll.rs rename to kernel/src/syscall/epoll.rs diff --git a/kernel/aster-nix/src/syscall/eventfd.rs b/kernel/src/syscall/eventfd.rs similarity index 100% rename from kernel/aster-nix/src/syscall/eventfd.rs rename to kernel/src/syscall/eventfd.rs diff --git a/kernel/aster-nix/src/syscall/execve.rs b/kernel/src/syscall/execve.rs similarity index 100% rename from kernel/aster-nix/src/syscall/execve.rs rename to kernel/src/syscall/execve.rs diff --git a/kernel/aster-nix/src/syscall/exit.rs b/kernel/src/syscall/exit.rs similarity index 100% rename from kernel/aster-nix/src/syscall/exit.rs rename to kernel/src/syscall/exit.rs diff --git a/kernel/aster-nix/src/syscall/exit_group.rs b/kernel/src/syscall/exit_group.rs similarity index 100% rename from kernel/aster-nix/src/syscall/exit_group.rs rename to kernel/src/syscall/exit_group.rs diff --git a/kernel/aster-nix/src/syscall/fallocate.rs b/kernel/src/syscall/fallocate.rs similarity index 100% rename from kernel/aster-nix/src/syscall/fallocate.rs rename to kernel/src/syscall/fallocate.rs diff --git a/kernel/aster-nix/src/syscall/fcntl.rs b/kernel/src/syscall/fcntl.rs similarity index 100% rename from kernel/aster-nix/src/syscall/fcntl.rs rename to kernel/src/syscall/fcntl.rs diff --git a/kernel/aster-nix/src/syscall/flock.rs b/kernel/src/syscall/flock.rs similarity index 100% rename from kernel/aster-nix/src/syscall/flock.rs rename to kernel/src/syscall/flock.rs diff --git a/kernel/aster-nix/src/syscall/fork.rs b/kernel/src/syscall/fork.rs similarity index 100% rename from kernel/aster-nix/src/syscall/fork.rs rename to kernel/src/syscall/fork.rs diff --git a/kernel/aster-nix/src/syscall/fsync.rs b/kernel/src/syscall/fsync.rs similarity index 100% rename from kernel/aster-nix/src/syscall/fsync.rs rename to kernel/src/syscall/fsync.rs diff --git a/kernel/aster-nix/src/syscall/futex.rs b/kernel/src/syscall/futex.rs similarity index 100% rename from kernel/aster-nix/src/syscall/futex.rs rename to kernel/src/syscall/futex.rs diff --git a/kernel/aster-nix/src/syscall/getcwd.rs b/kernel/src/syscall/getcwd.rs similarity index 100% rename from kernel/aster-nix/src/syscall/getcwd.rs rename to kernel/src/syscall/getcwd.rs diff --git a/kernel/aster-nix/src/syscall/getdents64.rs b/kernel/src/syscall/getdents64.rs similarity index 100% rename from kernel/aster-nix/src/syscall/getdents64.rs rename to kernel/src/syscall/getdents64.rs diff --git a/kernel/aster-nix/src/syscall/getegid.rs b/kernel/src/syscall/getegid.rs similarity index 100% rename from kernel/aster-nix/src/syscall/getegid.rs rename to kernel/src/syscall/getegid.rs diff --git a/kernel/aster-nix/src/syscall/geteuid.rs b/kernel/src/syscall/geteuid.rs similarity index 100% rename from kernel/aster-nix/src/syscall/geteuid.rs rename to kernel/src/syscall/geteuid.rs diff --git a/kernel/aster-nix/src/syscall/getgid.rs b/kernel/src/syscall/getgid.rs similarity index 100% rename from kernel/aster-nix/src/syscall/getgid.rs rename to kernel/src/syscall/getgid.rs diff --git a/kernel/aster-nix/src/syscall/getgroups.rs b/kernel/src/syscall/getgroups.rs similarity index 100% rename from kernel/aster-nix/src/syscall/getgroups.rs rename to kernel/src/syscall/getgroups.rs diff --git a/kernel/aster-nix/src/syscall/getpeername.rs b/kernel/src/syscall/getpeername.rs similarity index 100% rename from kernel/aster-nix/src/syscall/getpeername.rs rename to kernel/src/syscall/getpeername.rs diff --git a/kernel/aster-nix/src/syscall/getpgrp.rs b/kernel/src/syscall/getpgrp.rs similarity index 100% rename from kernel/aster-nix/src/syscall/getpgrp.rs rename to kernel/src/syscall/getpgrp.rs diff --git a/kernel/aster-nix/src/syscall/getpid.rs b/kernel/src/syscall/getpid.rs similarity index 100% rename from kernel/aster-nix/src/syscall/getpid.rs rename to kernel/src/syscall/getpid.rs diff --git a/kernel/aster-nix/src/syscall/getppid.rs b/kernel/src/syscall/getppid.rs similarity index 100% rename from kernel/aster-nix/src/syscall/getppid.rs rename to kernel/src/syscall/getppid.rs diff --git a/kernel/aster-nix/src/syscall/getrandom.rs b/kernel/src/syscall/getrandom.rs similarity index 100% rename from kernel/aster-nix/src/syscall/getrandom.rs rename to kernel/src/syscall/getrandom.rs diff --git a/kernel/aster-nix/src/syscall/getresgid.rs b/kernel/src/syscall/getresgid.rs similarity index 100% rename from kernel/aster-nix/src/syscall/getresgid.rs rename to kernel/src/syscall/getresgid.rs diff --git a/kernel/aster-nix/src/syscall/getresuid.rs b/kernel/src/syscall/getresuid.rs similarity index 100% rename from kernel/aster-nix/src/syscall/getresuid.rs rename to kernel/src/syscall/getresuid.rs diff --git a/kernel/aster-nix/src/syscall/getrusage.rs b/kernel/src/syscall/getrusage.rs similarity index 100% rename from kernel/aster-nix/src/syscall/getrusage.rs rename to kernel/src/syscall/getrusage.rs diff --git a/kernel/aster-nix/src/syscall/getsid.rs b/kernel/src/syscall/getsid.rs similarity index 100% rename from kernel/aster-nix/src/syscall/getsid.rs rename to kernel/src/syscall/getsid.rs diff --git a/kernel/aster-nix/src/syscall/getsockname.rs b/kernel/src/syscall/getsockname.rs similarity index 100% rename from kernel/aster-nix/src/syscall/getsockname.rs rename to kernel/src/syscall/getsockname.rs diff --git a/kernel/aster-nix/src/syscall/getsockopt.rs b/kernel/src/syscall/getsockopt.rs similarity index 100% rename from kernel/aster-nix/src/syscall/getsockopt.rs rename to kernel/src/syscall/getsockopt.rs diff --git a/kernel/aster-nix/src/syscall/gettid.rs b/kernel/src/syscall/gettid.rs similarity index 100% rename from kernel/aster-nix/src/syscall/gettid.rs rename to kernel/src/syscall/gettid.rs diff --git a/kernel/aster-nix/src/syscall/gettimeofday.rs b/kernel/src/syscall/gettimeofday.rs similarity index 100% rename from kernel/aster-nix/src/syscall/gettimeofday.rs rename to kernel/src/syscall/gettimeofday.rs diff --git a/kernel/aster-nix/src/syscall/getuid.rs b/kernel/src/syscall/getuid.rs similarity index 100% rename from kernel/aster-nix/src/syscall/getuid.rs rename to kernel/src/syscall/getuid.rs diff --git a/kernel/aster-nix/src/syscall/ioctl.rs b/kernel/src/syscall/ioctl.rs similarity index 100% rename from kernel/aster-nix/src/syscall/ioctl.rs rename to kernel/src/syscall/ioctl.rs diff --git a/kernel/aster-nix/src/syscall/kill.rs b/kernel/src/syscall/kill.rs similarity index 100% rename from kernel/aster-nix/src/syscall/kill.rs rename to kernel/src/syscall/kill.rs diff --git a/kernel/aster-nix/src/syscall/link.rs b/kernel/src/syscall/link.rs similarity index 100% rename from kernel/aster-nix/src/syscall/link.rs rename to kernel/src/syscall/link.rs diff --git a/kernel/aster-nix/src/syscall/listen.rs b/kernel/src/syscall/listen.rs similarity index 100% rename from kernel/aster-nix/src/syscall/listen.rs rename to kernel/src/syscall/listen.rs diff --git a/kernel/aster-nix/src/syscall/lseek.rs b/kernel/src/syscall/lseek.rs similarity index 100% rename from kernel/aster-nix/src/syscall/lseek.rs rename to kernel/src/syscall/lseek.rs diff --git a/kernel/aster-nix/src/syscall/madvise.rs b/kernel/src/syscall/madvise.rs similarity index 100% rename from kernel/aster-nix/src/syscall/madvise.rs rename to kernel/src/syscall/madvise.rs diff --git a/kernel/aster-nix/src/syscall/mkdir.rs b/kernel/src/syscall/mkdir.rs similarity index 100% rename from kernel/aster-nix/src/syscall/mkdir.rs rename to kernel/src/syscall/mkdir.rs diff --git a/kernel/aster-nix/src/syscall/mknod.rs b/kernel/src/syscall/mknod.rs similarity index 100% rename from kernel/aster-nix/src/syscall/mknod.rs rename to kernel/src/syscall/mknod.rs diff --git a/kernel/aster-nix/src/syscall/mmap.rs b/kernel/src/syscall/mmap.rs similarity index 100% rename from kernel/aster-nix/src/syscall/mmap.rs rename to kernel/src/syscall/mmap.rs diff --git a/kernel/aster-nix/src/syscall/mod.rs b/kernel/src/syscall/mod.rs similarity index 100% rename from kernel/aster-nix/src/syscall/mod.rs rename to kernel/src/syscall/mod.rs diff --git a/kernel/aster-nix/src/syscall/mount.rs b/kernel/src/syscall/mount.rs similarity index 100% rename from kernel/aster-nix/src/syscall/mount.rs rename to kernel/src/syscall/mount.rs diff --git a/kernel/aster-nix/src/syscall/mprotect.rs b/kernel/src/syscall/mprotect.rs similarity index 100% rename from kernel/aster-nix/src/syscall/mprotect.rs rename to kernel/src/syscall/mprotect.rs diff --git a/kernel/aster-nix/src/syscall/msync.rs b/kernel/src/syscall/msync.rs similarity index 100% rename from kernel/aster-nix/src/syscall/msync.rs rename to kernel/src/syscall/msync.rs diff --git a/kernel/aster-nix/src/syscall/munmap.rs b/kernel/src/syscall/munmap.rs similarity index 100% rename from kernel/aster-nix/src/syscall/munmap.rs rename to kernel/src/syscall/munmap.rs diff --git a/kernel/aster-nix/src/syscall/nanosleep.rs b/kernel/src/syscall/nanosleep.rs similarity index 100% rename from kernel/aster-nix/src/syscall/nanosleep.rs rename to kernel/src/syscall/nanosleep.rs diff --git a/kernel/aster-nix/src/syscall/open.rs b/kernel/src/syscall/open.rs similarity index 100% rename from kernel/aster-nix/src/syscall/open.rs rename to kernel/src/syscall/open.rs diff --git a/kernel/aster-nix/src/syscall/pause.rs b/kernel/src/syscall/pause.rs similarity index 100% rename from kernel/aster-nix/src/syscall/pause.rs rename to kernel/src/syscall/pause.rs diff --git a/kernel/aster-nix/src/syscall/pipe.rs b/kernel/src/syscall/pipe.rs similarity index 100% rename from kernel/aster-nix/src/syscall/pipe.rs rename to kernel/src/syscall/pipe.rs diff --git a/kernel/aster-nix/src/syscall/poll.rs b/kernel/src/syscall/poll.rs similarity index 100% rename from kernel/aster-nix/src/syscall/poll.rs rename to kernel/src/syscall/poll.rs diff --git a/kernel/aster-nix/src/syscall/prctl.rs b/kernel/src/syscall/prctl.rs similarity index 100% rename from kernel/aster-nix/src/syscall/prctl.rs rename to kernel/src/syscall/prctl.rs diff --git a/kernel/aster-nix/src/syscall/pread64.rs b/kernel/src/syscall/pread64.rs similarity index 100% rename from kernel/aster-nix/src/syscall/pread64.rs rename to kernel/src/syscall/pread64.rs diff --git a/kernel/aster-nix/src/syscall/preadv.rs b/kernel/src/syscall/preadv.rs similarity index 100% rename from kernel/aster-nix/src/syscall/preadv.rs rename to kernel/src/syscall/preadv.rs diff --git a/kernel/aster-nix/src/syscall/prlimit64.rs b/kernel/src/syscall/prlimit64.rs similarity index 100% rename from kernel/aster-nix/src/syscall/prlimit64.rs rename to kernel/src/syscall/prlimit64.rs diff --git a/kernel/aster-nix/src/syscall/pselect6.rs b/kernel/src/syscall/pselect6.rs similarity index 100% rename from kernel/aster-nix/src/syscall/pselect6.rs rename to kernel/src/syscall/pselect6.rs diff --git a/kernel/aster-nix/src/syscall/pwrite64.rs b/kernel/src/syscall/pwrite64.rs similarity index 100% rename from kernel/aster-nix/src/syscall/pwrite64.rs rename to kernel/src/syscall/pwrite64.rs diff --git a/kernel/aster-nix/src/syscall/pwritev.rs b/kernel/src/syscall/pwritev.rs similarity index 100% rename from kernel/aster-nix/src/syscall/pwritev.rs rename to kernel/src/syscall/pwritev.rs diff --git a/kernel/aster-nix/src/syscall/read.rs b/kernel/src/syscall/read.rs similarity index 100% rename from kernel/aster-nix/src/syscall/read.rs rename to kernel/src/syscall/read.rs diff --git a/kernel/aster-nix/src/syscall/readlink.rs b/kernel/src/syscall/readlink.rs similarity index 100% rename from kernel/aster-nix/src/syscall/readlink.rs rename to kernel/src/syscall/readlink.rs diff --git a/kernel/aster-nix/src/syscall/recvfrom.rs b/kernel/src/syscall/recvfrom.rs similarity index 100% rename from kernel/aster-nix/src/syscall/recvfrom.rs rename to kernel/src/syscall/recvfrom.rs diff --git a/kernel/aster-nix/src/syscall/recvmsg.rs b/kernel/src/syscall/recvmsg.rs similarity index 100% rename from kernel/aster-nix/src/syscall/recvmsg.rs rename to kernel/src/syscall/recvmsg.rs diff --git a/kernel/aster-nix/src/syscall/rename.rs b/kernel/src/syscall/rename.rs similarity index 100% rename from kernel/aster-nix/src/syscall/rename.rs rename to kernel/src/syscall/rename.rs diff --git a/kernel/aster-nix/src/syscall/rmdir.rs b/kernel/src/syscall/rmdir.rs similarity index 100% rename from kernel/aster-nix/src/syscall/rmdir.rs rename to kernel/src/syscall/rmdir.rs diff --git a/kernel/aster-nix/src/syscall/rt_sigaction.rs b/kernel/src/syscall/rt_sigaction.rs similarity index 100% rename from kernel/aster-nix/src/syscall/rt_sigaction.rs rename to kernel/src/syscall/rt_sigaction.rs diff --git a/kernel/aster-nix/src/syscall/rt_sigpending.rs b/kernel/src/syscall/rt_sigpending.rs similarity index 100% rename from kernel/aster-nix/src/syscall/rt_sigpending.rs rename to kernel/src/syscall/rt_sigpending.rs diff --git a/kernel/aster-nix/src/syscall/rt_sigprocmask.rs b/kernel/src/syscall/rt_sigprocmask.rs similarity index 100% rename from kernel/aster-nix/src/syscall/rt_sigprocmask.rs rename to kernel/src/syscall/rt_sigprocmask.rs diff --git a/kernel/aster-nix/src/syscall/rt_sigreturn.rs b/kernel/src/syscall/rt_sigreturn.rs similarity index 100% rename from kernel/aster-nix/src/syscall/rt_sigreturn.rs rename to kernel/src/syscall/rt_sigreturn.rs diff --git a/kernel/aster-nix/src/syscall/rt_sigsuspend.rs b/kernel/src/syscall/rt_sigsuspend.rs similarity index 100% rename from kernel/aster-nix/src/syscall/rt_sigsuspend.rs rename to kernel/src/syscall/rt_sigsuspend.rs diff --git a/kernel/aster-nix/src/syscall/sched_getaffinity.rs b/kernel/src/syscall/sched_getaffinity.rs similarity index 100% rename from kernel/aster-nix/src/syscall/sched_getaffinity.rs rename to kernel/src/syscall/sched_getaffinity.rs diff --git a/kernel/aster-nix/src/syscall/sched_yield.rs b/kernel/src/syscall/sched_yield.rs similarity index 100% rename from kernel/aster-nix/src/syscall/sched_yield.rs rename to kernel/src/syscall/sched_yield.rs diff --git a/kernel/aster-nix/src/syscall/select.rs b/kernel/src/syscall/select.rs similarity index 100% rename from kernel/aster-nix/src/syscall/select.rs rename to kernel/src/syscall/select.rs diff --git a/kernel/aster-nix/src/syscall/semctl.rs b/kernel/src/syscall/semctl.rs similarity index 100% rename from kernel/aster-nix/src/syscall/semctl.rs rename to kernel/src/syscall/semctl.rs diff --git a/kernel/aster-nix/src/syscall/semget.rs b/kernel/src/syscall/semget.rs similarity index 100% rename from kernel/aster-nix/src/syscall/semget.rs rename to kernel/src/syscall/semget.rs diff --git a/kernel/aster-nix/src/syscall/semop.rs b/kernel/src/syscall/semop.rs similarity index 100% rename from kernel/aster-nix/src/syscall/semop.rs rename to kernel/src/syscall/semop.rs diff --git a/kernel/aster-nix/src/syscall/sendfile.rs b/kernel/src/syscall/sendfile.rs similarity index 100% rename from kernel/aster-nix/src/syscall/sendfile.rs rename to kernel/src/syscall/sendfile.rs diff --git a/kernel/aster-nix/src/syscall/sendmsg.rs b/kernel/src/syscall/sendmsg.rs similarity index 100% rename from kernel/aster-nix/src/syscall/sendmsg.rs rename to kernel/src/syscall/sendmsg.rs diff --git a/kernel/aster-nix/src/syscall/sendto.rs b/kernel/src/syscall/sendto.rs similarity index 100% rename from kernel/aster-nix/src/syscall/sendto.rs rename to kernel/src/syscall/sendto.rs diff --git a/kernel/aster-nix/src/syscall/set_get_priority.rs b/kernel/src/syscall/set_get_priority.rs similarity index 100% rename from kernel/aster-nix/src/syscall/set_get_priority.rs rename to kernel/src/syscall/set_get_priority.rs diff --git a/kernel/aster-nix/src/syscall/set_robust_list.rs b/kernel/src/syscall/set_robust_list.rs similarity index 100% rename from kernel/aster-nix/src/syscall/set_robust_list.rs rename to kernel/src/syscall/set_robust_list.rs diff --git a/kernel/aster-nix/src/syscall/set_tid_address.rs b/kernel/src/syscall/set_tid_address.rs similarity index 100% rename from kernel/aster-nix/src/syscall/set_tid_address.rs rename to kernel/src/syscall/set_tid_address.rs diff --git a/kernel/aster-nix/src/syscall/setfsgid.rs b/kernel/src/syscall/setfsgid.rs similarity index 100% rename from kernel/aster-nix/src/syscall/setfsgid.rs rename to kernel/src/syscall/setfsgid.rs diff --git a/kernel/aster-nix/src/syscall/setfsuid.rs b/kernel/src/syscall/setfsuid.rs similarity index 100% rename from kernel/aster-nix/src/syscall/setfsuid.rs rename to kernel/src/syscall/setfsuid.rs diff --git a/kernel/aster-nix/src/syscall/setgid.rs b/kernel/src/syscall/setgid.rs similarity index 100% rename from kernel/aster-nix/src/syscall/setgid.rs rename to kernel/src/syscall/setgid.rs diff --git a/kernel/aster-nix/src/syscall/setgroups.rs b/kernel/src/syscall/setgroups.rs similarity index 100% rename from kernel/aster-nix/src/syscall/setgroups.rs rename to kernel/src/syscall/setgroups.rs diff --git a/kernel/aster-nix/src/syscall/setitimer.rs b/kernel/src/syscall/setitimer.rs similarity index 100% rename from kernel/aster-nix/src/syscall/setitimer.rs rename to kernel/src/syscall/setitimer.rs diff --git a/kernel/aster-nix/src/syscall/setpgid.rs b/kernel/src/syscall/setpgid.rs similarity index 100% rename from kernel/aster-nix/src/syscall/setpgid.rs rename to kernel/src/syscall/setpgid.rs diff --git a/kernel/aster-nix/src/syscall/setregid.rs b/kernel/src/syscall/setregid.rs similarity index 100% rename from kernel/aster-nix/src/syscall/setregid.rs rename to kernel/src/syscall/setregid.rs diff --git a/kernel/aster-nix/src/syscall/setresgid.rs b/kernel/src/syscall/setresgid.rs similarity index 100% rename from kernel/aster-nix/src/syscall/setresgid.rs rename to kernel/src/syscall/setresgid.rs diff --git a/kernel/aster-nix/src/syscall/setresuid.rs b/kernel/src/syscall/setresuid.rs similarity index 100% rename from kernel/aster-nix/src/syscall/setresuid.rs rename to kernel/src/syscall/setresuid.rs diff --git a/kernel/aster-nix/src/syscall/setreuid.rs b/kernel/src/syscall/setreuid.rs similarity index 100% rename from kernel/aster-nix/src/syscall/setreuid.rs rename to kernel/src/syscall/setreuid.rs diff --git a/kernel/aster-nix/src/syscall/setsid.rs b/kernel/src/syscall/setsid.rs similarity index 100% rename from kernel/aster-nix/src/syscall/setsid.rs rename to kernel/src/syscall/setsid.rs diff --git a/kernel/aster-nix/src/syscall/setsockopt.rs b/kernel/src/syscall/setsockopt.rs similarity index 100% rename from kernel/aster-nix/src/syscall/setsockopt.rs rename to kernel/src/syscall/setsockopt.rs diff --git a/kernel/aster-nix/src/syscall/setuid.rs b/kernel/src/syscall/setuid.rs similarity index 100% rename from kernel/aster-nix/src/syscall/setuid.rs rename to kernel/src/syscall/setuid.rs diff --git a/kernel/aster-nix/src/syscall/shutdown.rs b/kernel/src/syscall/shutdown.rs similarity index 100% rename from kernel/aster-nix/src/syscall/shutdown.rs rename to kernel/src/syscall/shutdown.rs diff --git a/kernel/aster-nix/src/syscall/sigaltstack.rs b/kernel/src/syscall/sigaltstack.rs similarity index 100% rename from kernel/aster-nix/src/syscall/sigaltstack.rs rename to kernel/src/syscall/sigaltstack.rs diff --git a/kernel/aster-nix/src/syscall/socket.rs b/kernel/src/syscall/socket.rs similarity index 100% rename from kernel/aster-nix/src/syscall/socket.rs rename to kernel/src/syscall/socket.rs diff --git a/kernel/aster-nix/src/syscall/socketpair.rs b/kernel/src/syscall/socketpair.rs similarity index 100% rename from kernel/aster-nix/src/syscall/socketpair.rs rename to kernel/src/syscall/socketpair.rs diff --git a/kernel/aster-nix/src/syscall/stat.rs b/kernel/src/syscall/stat.rs similarity index 100% rename from kernel/aster-nix/src/syscall/stat.rs rename to kernel/src/syscall/stat.rs diff --git a/kernel/aster-nix/src/syscall/statfs.rs b/kernel/src/syscall/statfs.rs similarity index 100% rename from kernel/aster-nix/src/syscall/statfs.rs rename to kernel/src/syscall/statfs.rs diff --git a/kernel/aster-nix/src/syscall/symlink.rs b/kernel/src/syscall/symlink.rs similarity index 100% rename from kernel/aster-nix/src/syscall/symlink.rs rename to kernel/src/syscall/symlink.rs diff --git a/kernel/aster-nix/src/syscall/sync.rs b/kernel/src/syscall/sync.rs similarity index 100% rename from kernel/aster-nix/src/syscall/sync.rs rename to kernel/src/syscall/sync.rs diff --git a/kernel/aster-nix/src/syscall/tgkill.rs b/kernel/src/syscall/tgkill.rs similarity index 100% rename from kernel/aster-nix/src/syscall/tgkill.rs rename to kernel/src/syscall/tgkill.rs diff --git a/kernel/aster-nix/src/syscall/time.rs b/kernel/src/syscall/time.rs similarity index 100% rename from kernel/aster-nix/src/syscall/time.rs rename to kernel/src/syscall/time.rs diff --git a/kernel/aster-nix/src/syscall/timer_create.rs b/kernel/src/syscall/timer_create.rs similarity index 100% rename from kernel/aster-nix/src/syscall/timer_create.rs rename to kernel/src/syscall/timer_create.rs diff --git a/kernel/aster-nix/src/syscall/timer_settime.rs b/kernel/src/syscall/timer_settime.rs similarity index 100% rename from kernel/aster-nix/src/syscall/timer_settime.rs rename to kernel/src/syscall/timer_settime.rs diff --git a/kernel/aster-nix/src/syscall/truncate.rs b/kernel/src/syscall/truncate.rs similarity index 100% rename from kernel/aster-nix/src/syscall/truncate.rs rename to kernel/src/syscall/truncate.rs diff --git a/kernel/aster-nix/src/syscall/umask.rs b/kernel/src/syscall/umask.rs similarity index 100% rename from kernel/aster-nix/src/syscall/umask.rs rename to kernel/src/syscall/umask.rs diff --git a/kernel/aster-nix/src/syscall/umount.rs b/kernel/src/syscall/umount.rs similarity index 100% rename from kernel/aster-nix/src/syscall/umount.rs rename to kernel/src/syscall/umount.rs diff --git a/kernel/aster-nix/src/syscall/uname.rs b/kernel/src/syscall/uname.rs similarity index 100% rename from kernel/aster-nix/src/syscall/uname.rs rename to kernel/src/syscall/uname.rs diff --git a/kernel/aster-nix/src/syscall/unlink.rs b/kernel/src/syscall/unlink.rs similarity index 100% rename from kernel/aster-nix/src/syscall/unlink.rs rename to kernel/src/syscall/unlink.rs diff --git a/kernel/aster-nix/src/syscall/utimens.rs b/kernel/src/syscall/utimens.rs similarity index 100% rename from kernel/aster-nix/src/syscall/utimens.rs rename to kernel/src/syscall/utimens.rs diff --git a/kernel/aster-nix/src/syscall/wait4.rs b/kernel/src/syscall/wait4.rs similarity index 100% rename from kernel/aster-nix/src/syscall/wait4.rs rename to kernel/src/syscall/wait4.rs diff --git a/kernel/aster-nix/src/syscall/waitid.rs b/kernel/src/syscall/waitid.rs similarity index 100% rename from kernel/aster-nix/src/syscall/waitid.rs rename to kernel/src/syscall/waitid.rs diff --git a/kernel/aster-nix/src/syscall/write.rs b/kernel/src/syscall/write.rs similarity index 100% rename from kernel/aster-nix/src/syscall/write.rs rename to kernel/src/syscall/write.rs diff --git a/kernel/aster-nix/src/taskless.rs b/kernel/src/taskless.rs similarity index 100% rename from kernel/aster-nix/src/taskless.rs rename to kernel/src/taskless.rs diff --git a/kernel/aster-nix/src/thread/exception.rs b/kernel/src/thread/exception.rs similarity index 100% rename from kernel/aster-nix/src/thread/exception.rs rename to kernel/src/thread/exception.rs diff --git a/kernel/aster-nix/src/thread/kernel_thread.rs b/kernel/src/thread/kernel_thread.rs similarity index 100% rename from kernel/aster-nix/src/thread/kernel_thread.rs rename to kernel/src/thread/kernel_thread.rs diff --git a/kernel/aster-nix/src/thread/mod.rs b/kernel/src/thread/mod.rs similarity index 100% rename from kernel/aster-nix/src/thread/mod.rs rename to kernel/src/thread/mod.rs diff --git a/kernel/aster-nix/src/thread/status.rs b/kernel/src/thread/status.rs similarity index 100% rename from kernel/aster-nix/src/thread/status.rs rename to kernel/src/thread/status.rs diff --git a/kernel/aster-nix/src/thread/task.rs b/kernel/src/thread/task.rs similarity index 100% rename from kernel/aster-nix/src/thread/task.rs rename to kernel/src/thread/task.rs diff --git a/kernel/aster-nix/src/thread/thread_table.rs b/kernel/src/thread/thread_table.rs similarity index 100% rename from kernel/aster-nix/src/thread/thread_table.rs rename to kernel/src/thread/thread_table.rs diff --git a/kernel/aster-nix/src/thread/work_queue/mod.rs b/kernel/src/thread/work_queue/mod.rs similarity index 100% rename from kernel/aster-nix/src/thread/work_queue/mod.rs rename to kernel/src/thread/work_queue/mod.rs diff --git a/kernel/aster-nix/src/thread/work_queue/simple_scheduler.rs b/kernel/src/thread/work_queue/simple_scheduler.rs similarity index 100% rename from kernel/aster-nix/src/thread/work_queue/simple_scheduler.rs rename to kernel/src/thread/work_queue/simple_scheduler.rs diff --git a/kernel/aster-nix/src/thread/work_queue/work_item.rs b/kernel/src/thread/work_queue/work_item.rs similarity index 100% rename from kernel/aster-nix/src/thread/work_queue/work_item.rs rename to kernel/src/thread/work_queue/work_item.rs diff --git a/kernel/aster-nix/src/thread/work_queue/worker.rs b/kernel/src/thread/work_queue/worker.rs similarity index 100% rename from kernel/aster-nix/src/thread/work_queue/worker.rs rename to kernel/src/thread/work_queue/worker.rs diff --git a/kernel/aster-nix/src/thread/work_queue/worker_pool.rs b/kernel/src/thread/work_queue/worker_pool.rs similarity index 100% rename from kernel/aster-nix/src/thread/work_queue/worker_pool.rs rename to kernel/src/thread/work_queue/worker_pool.rs diff --git a/kernel/aster-nix/src/time/clocks/cpu_clock.rs b/kernel/src/time/clocks/cpu_clock.rs similarity index 100% rename from kernel/aster-nix/src/time/clocks/cpu_clock.rs rename to kernel/src/time/clocks/cpu_clock.rs diff --git a/kernel/aster-nix/src/time/clocks/mod.rs b/kernel/src/time/clocks/mod.rs similarity index 100% rename from kernel/aster-nix/src/time/clocks/mod.rs rename to kernel/src/time/clocks/mod.rs diff --git a/kernel/aster-nix/src/time/clocks/system_wide.rs b/kernel/src/time/clocks/system_wide.rs similarity index 100% rename from kernel/aster-nix/src/time/clocks/system_wide.rs rename to kernel/src/time/clocks/system_wide.rs diff --git a/kernel/aster-nix/src/time/core/mod.rs b/kernel/src/time/core/mod.rs similarity index 100% rename from kernel/aster-nix/src/time/core/mod.rs rename to kernel/src/time/core/mod.rs diff --git a/kernel/aster-nix/src/time/core/timer.rs b/kernel/src/time/core/timer.rs similarity index 100% rename from kernel/aster-nix/src/time/core/timer.rs rename to kernel/src/time/core/timer.rs diff --git a/kernel/aster-nix/src/time/mod.rs b/kernel/src/time/mod.rs similarity index 100% rename from kernel/aster-nix/src/time/mod.rs rename to kernel/src/time/mod.rs diff --git a/kernel/aster-nix/src/time/softirq.rs b/kernel/src/time/softirq.rs similarity index 100% rename from kernel/aster-nix/src/time/softirq.rs rename to kernel/src/time/softirq.rs diff --git a/kernel/aster-nix/src/time/system_time.rs b/kernel/src/time/system_time.rs similarity index 100% rename from kernel/aster-nix/src/time/system_time.rs rename to kernel/src/time/system_time.rs diff --git a/kernel/aster-nix/src/time/wait.rs b/kernel/src/time/wait.rs similarity index 100% rename from kernel/aster-nix/src/time/wait.rs rename to kernel/src/time/wait.rs diff --git a/kernel/aster-nix/src/util/iovec.rs b/kernel/src/util/iovec.rs similarity index 100% rename from kernel/aster-nix/src/util/iovec.rs rename to kernel/src/util/iovec.rs diff --git a/kernel/aster-nix/src/util/mod.rs b/kernel/src/util/mod.rs similarity index 100% rename from kernel/aster-nix/src/util/mod.rs rename to kernel/src/util/mod.rs diff --git a/kernel/aster-nix/src/util/net/addr/family.rs b/kernel/src/util/net/addr/family.rs similarity index 100% rename from kernel/aster-nix/src/util/net/addr/family.rs rename to kernel/src/util/net/addr/family.rs diff --git a/kernel/aster-nix/src/util/net/addr/ip.rs b/kernel/src/util/net/addr/ip.rs similarity index 100% rename from kernel/aster-nix/src/util/net/addr/ip.rs rename to kernel/src/util/net/addr/ip.rs diff --git a/kernel/aster-nix/src/util/net/addr/mod.rs b/kernel/src/util/net/addr/mod.rs similarity index 100% rename from kernel/aster-nix/src/util/net/addr/mod.rs rename to kernel/src/util/net/addr/mod.rs diff --git a/kernel/aster-nix/src/util/net/addr/unix.rs b/kernel/src/util/net/addr/unix.rs similarity index 100% rename from kernel/aster-nix/src/util/net/addr/unix.rs rename to kernel/src/util/net/addr/unix.rs diff --git a/kernel/aster-nix/src/util/net/addr/vsock.rs b/kernel/src/util/net/addr/vsock.rs similarity index 100% rename from kernel/aster-nix/src/util/net/addr/vsock.rs rename to kernel/src/util/net/addr/vsock.rs diff --git a/kernel/aster-nix/src/util/net/mod.rs b/kernel/src/util/net/mod.rs similarity index 100% rename from kernel/aster-nix/src/util/net/mod.rs rename to kernel/src/util/net/mod.rs diff --git a/kernel/aster-nix/src/util/net/options/mod.rs b/kernel/src/util/net/options/mod.rs similarity index 100% rename from kernel/aster-nix/src/util/net/options/mod.rs rename to kernel/src/util/net/options/mod.rs diff --git a/kernel/aster-nix/src/util/net/options/socket.rs b/kernel/src/util/net/options/socket.rs similarity index 100% rename from kernel/aster-nix/src/util/net/options/socket.rs rename to kernel/src/util/net/options/socket.rs diff --git a/kernel/aster-nix/src/util/net/options/tcp.rs b/kernel/src/util/net/options/tcp.rs similarity index 100% rename from kernel/aster-nix/src/util/net/options/tcp.rs rename to kernel/src/util/net/options/tcp.rs diff --git a/kernel/aster-nix/src/util/net/options/utils.rs b/kernel/src/util/net/options/utils.rs similarity index 100% rename from kernel/aster-nix/src/util/net/options/utils.rs rename to kernel/src/util/net/options/utils.rs diff --git a/kernel/aster-nix/src/util/net/socket.rs b/kernel/src/util/net/socket.rs similarity index 100% rename from kernel/aster-nix/src/util/net/socket.rs rename to kernel/src/util/net/socket.rs diff --git a/kernel/aster-nix/src/util/random.rs b/kernel/src/util/random.rs similarity index 100% rename from kernel/aster-nix/src/util/random.rs rename to kernel/src/util/random.rs diff --git a/kernel/aster-nix/src/vdso.rs b/kernel/src/vdso.rs similarity index 100% rename from kernel/aster-nix/src/vdso.rs rename to kernel/src/vdso.rs diff --git a/kernel/aster-nix/src/vm/mod.rs b/kernel/src/vm/mod.rs similarity index 100% rename from kernel/aster-nix/src/vm/mod.rs rename to kernel/src/vm/mod.rs diff --git a/kernel/aster-nix/src/vm/page_fault_handler.rs b/kernel/src/vm/page_fault_handler.rs similarity index 100% rename from kernel/aster-nix/src/vm/page_fault_handler.rs rename to kernel/src/vm/page_fault_handler.rs diff --git a/kernel/aster-nix/src/vm/perms.rs b/kernel/src/vm/perms.rs similarity index 100% rename from kernel/aster-nix/src/vm/perms.rs rename to kernel/src/vm/perms.rs diff --git a/kernel/aster-nix/src/vm/util.rs b/kernel/src/vm/util.rs similarity index 100% rename from kernel/aster-nix/src/vm/util.rs rename to kernel/src/vm/util.rs diff --git a/kernel/aster-nix/src/vm/vmar/dyn_cap.rs b/kernel/src/vm/vmar/dyn_cap.rs similarity index 100% rename from kernel/aster-nix/src/vm/vmar/dyn_cap.rs rename to kernel/src/vm/vmar/dyn_cap.rs diff --git a/kernel/aster-nix/src/vm/vmar/interval.rs b/kernel/src/vm/vmar/interval.rs similarity index 100% rename from kernel/aster-nix/src/vm/vmar/interval.rs rename to kernel/src/vm/vmar/interval.rs diff --git a/kernel/aster-nix/src/vm/vmar/mod.rs b/kernel/src/vm/vmar/mod.rs similarity index 100% rename from kernel/aster-nix/src/vm/vmar/mod.rs rename to kernel/src/vm/vmar/mod.rs diff --git a/kernel/aster-nix/src/vm/vmar/options.rs b/kernel/src/vm/vmar/options.rs similarity index 100% rename from kernel/aster-nix/src/vm/vmar/options.rs rename to kernel/src/vm/vmar/options.rs diff --git a/kernel/aster-nix/src/vm/vmar/static_cap.rs b/kernel/src/vm/vmar/static_cap.rs similarity index 100% rename from kernel/aster-nix/src/vm/vmar/static_cap.rs rename to kernel/src/vm/vmar/static_cap.rs diff --git a/kernel/aster-nix/src/vm/vmar/vm_mapping.rs b/kernel/src/vm/vmar/vm_mapping.rs similarity index 100% rename from kernel/aster-nix/src/vm/vmar/vm_mapping.rs rename to kernel/src/vm/vmar/vm_mapping.rs diff --git a/kernel/aster-nix/src/vm/vmo/dyn_cap.rs b/kernel/src/vm/vmo/dyn_cap.rs similarity index 100% rename from kernel/aster-nix/src/vm/vmo/dyn_cap.rs rename to kernel/src/vm/vmo/dyn_cap.rs diff --git a/kernel/aster-nix/src/vm/vmo/mod.rs b/kernel/src/vm/vmo/mod.rs similarity index 100% rename from kernel/aster-nix/src/vm/vmo/mod.rs rename to kernel/src/vm/vmo/mod.rs diff --git a/kernel/aster-nix/src/vm/vmo/options.rs b/kernel/src/vm/vmo/options.rs similarity index 100% rename from kernel/aster-nix/src/vm/vmo/options.rs rename to kernel/src/vm/vmo/options.rs diff --git a/kernel/aster-nix/src/vm/vmo/pager.rs b/kernel/src/vm/vmo/pager.rs similarity index 100% rename from kernel/aster-nix/src/vm/vmo/pager.rs rename to kernel/src/vm/vmo/pager.rs diff --git a/kernel/aster-nix/src/vm/vmo/static_cap.rs b/kernel/src/vm/vmo/static_cap.rs similarity index 100% rename from kernel/aster-nix/src/vm/vmo/static_cap.rs rename to kernel/src/vm/vmo/static_cap.rs diff --git a/tools/bump_version.sh b/tools/bump_version.sh index 8b01e437..410fcb63 100755 --- a/tools/bump_version.sh +++ b/tools/bump_version.sh @@ -126,7 +126,7 @@ update_package_version ${OSTD_TEST_RUNNER_CARGO_TOML_PATH} update_ostd_dep_version ${OSTD_TEST_RUNNER_CARGO_TOML_PATH} # Automatically bump Cargo.lock file -cargo update -p asterinas --precise $new_version +cargo update -p aster-nix --precise $new_version # Update Docker image versions in README files update_image_versions ${ASTER_SRC_DIR}/README.md @@ -152,4 +152,4 @@ update_image_versions $GET_STARTED_PATH # `-n` is used to avoid adding a '\n' in the VERSION file. echo -n "${new_version}" > ${VERSION_PATH} -echo "Bumped Asterinas & OSDK version to $new_version" +echo "Bumped Asterinas OSTD & OSDK version to $new_version"