WIP: codebase ref: reduce qlib

qkernel/src/lib.rs

@@ -124,6 +124,7 @@ mod interrupt;
 pub mod kernel_def;
 pub mod rdma_def;
 mod syscalls;
+pub mod qkernel;
 
 #[global_allocator]
 pub static VCPU_ALLOCATOR: GlobalVcpuAllocator = GlobalVcpuAllocator::New();

qkernel/src/qkernel.rs

@@ -0,0 +1,15 @@
+// Copyright (c) 2021 Quark Container Authors / 2018 The gVisor Authors.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+pub mod arch;

qkernel/src/qkernel/arch.rs

@@ -0,0 +1,16 @@
+// Copyright (c) 2021 Quark Container Authors / 2018 The gVisor Authors.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+#[cfg(target_arch = "x86_64")]
+#[path = "./x86_64/mod.rs"]
+pub mod __arch;

qlib/kernel/arch/x86_64/arch_x86.rs → qkernel/src/qkernel/x86_64/arch_x86.rs

@@ -12,16 +12,17 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+use crate::qlib::kernel::SignalDef;
 use crate::qlib::mutex::*;
 use alloc::sync::Arc;
 use core::sync::atomic::AtomicUsize;
 use core::sync::atomic::AtomicU64;
 use core::sync::atomic::Ordering;
 
-use super::super::super::super::cpuid::*;
-use super::super::super::asm::*;
-use super::super::super::SignalDef::*;
-use super::super::super::FP_STATE;
+use crate::qlib::cpuid::*;
+use crate::asm::*;
+use SignalDef::*;
+use FP_STATE;
 
 // System-related constants for x86.
 

qlib/kernel/arch/x86_64/context.rs → qkernel/src/qkernel/x86_64/context.rs

@@ -12,14 +12,24 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-use super::super::super::super::addr::*;
-use super::super::super::super::common::*;
-use super::super::super::super::limits::*;
-use super::super::super::super::linux_def::*;
-use super::super::super::kernel_util::*;
-use super::super::super::memmgr::arch::*;
-use super::super::super::SignalDef::*;
-use super::arch_def::*;
+use addr::*;
+use crate::kernel_util;
+use crate::qlib::addr;
+use crate::qlib::common;
+use crate::qlib::kernel::memmgr;
+use crate::qlib::kernel::SignalDef;
+use crate::qlib::limits;
+use crate::qlib::linux_def;
+
+use common::*;
+use limits::*;
+use linux_def::*;
+use kernel_util::*;
+use memmgr::arch::*;
+use SignalDef::*;
+use arch_def::*;
+
+use super::arch_def;
 
 // These constants come directly from Linux.
 

qlib/kernel/arch/x86_64/mod.rs → qkernel/src/qkernel/x86_64/mod.rs

@@ -15,4 +15,3 @@
 pub mod arch_def;
 
 pub mod context;
-pub mod signal;

qlib/kernel/arch/mod.rs

@@ -11,9 +11,10 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-#[cfg(target_arch = "x86_64")]
-#[path = "./x86_64/mod.rs"]
-pub mod __arch;
+
+//
+// TODO - Arm next
+//
 #[cfg(target_arch = "aarch64")]
 #[path = "./aarch64/mod.rs"]
 pub mod __arch;