tree-wide: use "crosvm" capitalization everywhere
Fix a few stray references to "CrosVM" and "CrosVm" so that we refer to the crosvm project with consistent capitalization. BUG=None TEST=None Change-Id: If5c3c131774d6e5da1d27466810642aec3cb42ac Reviewed-on: https://chromium-review.googlesource.com/c/crosvm/crosvm/+/3938640 Commit-Queue: Daniel Verkamp <dverkamp@chromium.org> Reviewed-by: Dennis Kempin <denniskempin@google.com>
This commit is contained in:
parent
fffca30953
commit
b60140b37e
15 changed files with 23 additions and 23 deletions
|
|
@ -493,9 +493,9 @@ impl BusDevice for PciConfigMmio {
|
|||
}
|
||||
}
|
||||
|
||||
/// Inspired by PCI configuration space, CrosVM provides 2048 dword virtual registers (8KiB in
|
||||
/// Inspired by PCI configuration space, crosvm provides 2048 dword virtual registers (8KiB in
|
||||
/// total) for each PCI device. The guest can use these registers to exchange device-specific
|
||||
/// information with CrosVM. The first 4kB is trapped by crosvm and crosm supply these
|
||||
/// information with crosvm. The first 4kB is trapped by crosvm and crosvm supplies these
|
||||
/// register's emulation. The second 4KB is mapped into guest directly as shared memory, so
|
||||
/// when guest access this 4KB, vm exit doesn't happen.
|
||||
/// All these virtual registers from all PCI devices locate in a contiguous memory region.
|
||||
|
|
|
|||
|
|
@ -83,7 +83,7 @@ impl<T: HandleWindowMessage> WindowMessageDispatcher<T> {
|
|||
/// This function should only be called once from the WndProc thread. It will take the ownership
|
||||
/// of the `Window` object, and drop it before the underlying window is completely gone.
|
||||
/// TODO(b/238680252): This should be good enough for supporting multi-windowing, but we should
|
||||
/// revisit it if we also want to manage some child windows of the CrosVM window.
|
||||
/// revisit it if we also want to manage some child windows of the crosvm window.
|
||||
pub fn create(window: Window) -> Result<Pin<Box<Self>>> {
|
||||
let mut dispatcher = Box::pin(Self {
|
||||
message_processor: Default::default(),
|
||||
|
|
|
|||
|
|
@ -269,7 +269,7 @@ impl<T: HandleWindowMessage> WindowProcedureThread<T> {
|
|||
/// The owner of the returned `Window` object is responsible for dropping it before we finish
|
||||
/// processing `WM_NCDESTROY`, because the window handle will become invalid afterwards.
|
||||
unsafe fn create_window() -> Result<Window> {
|
||||
// Gfxstream window is a child window of CrosVM window. Without WS_CLIPCHILDREN, the parent
|
||||
// Gfxstream window is a child window of crosvm window. Without WS_CLIPCHILDREN, the parent
|
||||
// window may use the background brush to clear the gfxstream window client area when
|
||||
// drawing occurs. This caused the screen flickering issue during resizing.
|
||||
// See b/197786842 for details.
|
||||
|
|
|
|||
|
|
@ -21,7 +21,7 @@ pub enum HypervisorCap {
|
|||
///
|
||||
/// Hypervisors which do not provide the TSC frequency (e.g. via the kvm
|
||||
/// pvclock) or have another suitable calibration source can declare this
|
||||
/// capability, which causes CrosVM to substitute a calibrated value in leaf
|
||||
/// capability, which causes crosvm to substitute a calibrated value in leaf
|
||||
/// 0x15 that will be accurate enough for use in a clocksource.
|
||||
CalibratedTscLeafRequired,
|
||||
}
|
||||
|
|
|
|||
|
|
@ -627,10 +627,10 @@ impl Vm for WhpxVm {
|
|||
}
|
||||
|
||||
/// In order to fully unmap a memory range such that the host can reclaim the memory,
|
||||
/// we unmap it from the hypervisor partition, and then mark CrosVm's process as uninterested
|
||||
/// we unmap it from the hypervisor partition, and then mark crosvm's process as uninterested
|
||||
/// in the memory.
|
||||
///
|
||||
/// This will make CrosVm unable to access the memory, and allow Windows to reclaim it for other
|
||||
/// This will make crosvm unable to access the memory, and allow Windows to reclaim it for other
|
||||
/// uses when memory is in demand.
|
||||
fn handle_inflate(&mut self, guest_address: GuestAddress, size: u64) -> Result<()> {
|
||||
info!(
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@ use crate::windows::Result;
|
|||
|
||||
static INSTANCE_EXISTS: AtomicBool = AtomicBool::new(false);
|
||||
|
||||
/// Used by gpu_display to show metrics in the CrosVm performance overlay.
|
||||
/// Used by gpu_display to show metrics in the crosvm performance overlay.
|
||||
pub struct Metrics {
|
||||
metrics: Vec<Box<dyn ToString + Send + Sync>>,
|
||||
// more_metrics is for metrics which have multiple owners (e.g., device dependent).
|
||||
|
|
|
|||
|
|
@ -30,7 +30,7 @@ pub use crate::iff::net_device_flags;
|
|||
pub const TUNTAP: ::std::os::raw::c_uint = 84;
|
||||
|
||||
// Windows doesn't have these constants in libc. As such, we preserve them here
|
||||
// for use on that platform, and for the sake of simplicity, CrosVM code
|
||||
// for use on that platform, and for the sake of simplicity, crosvm code
|
||||
// uses these constants on all platforms.
|
||||
pub type sa_family_t = ::std::os::raw::c_ushort;
|
||||
pub const ARPHRD_ETHER: sa_family_t = 1;
|
||||
|
|
|
|||
|
|
@ -89,7 +89,7 @@ impl Slirp {
|
|||
})
|
||||
}
|
||||
|
||||
/// Instantiate Slirp when running CrosVm in multi process mode.
|
||||
/// Instantiate Slirp when running crosvm in multi process mode.
|
||||
pub fn new_for_multi_process(guest_pipe: PipeConnection) -> Result<Slirp> {
|
||||
Ok(Slirp {
|
||||
guest_pipe,
|
||||
|
|
@ -106,7 +106,7 @@ impl Slirp {
|
|||
})
|
||||
}
|
||||
|
||||
/// Start the Slirp listening loop. This is meant to be called when running CrosVm in multi
|
||||
/// Start the Slirp listening loop. This is meant to be called when running crosvm in multi
|
||||
/// process mode.
|
||||
pub fn run_slirp_process(
|
||||
slirp_pipe: PipeConnection,
|
||||
|
|
|
|||
|
|
@ -516,9 +516,9 @@ pub fn start_slirp(
|
|||
// flow can be thought of as follows:
|
||||
// 1. pollfds_fill creates a map of index -> fd inside Slirp based on the return values from
|
||||
// the pollfds_fill callback.
|
||||
// 2. CrosVM invokes poll on the FDs provided by Slirp.
|
||||
// 3. CrosVM notifies Slirp via pollfds_poll that polling completed for the provided FDs.
|
||||
// 4. Slirp calls into CrosVM via the pollfds_poll callback and asks for the statuses using
|
||||
// 2. crosvm invokes poll on the FDs provided by Slirp.
|
||||
// 3. crosvm notifies Slirp via pollfds_poll that polling completed for the provided FDs.
|
||||
// 4. Slirp calls into crosvm via the pollfds_poll callback and asks for the statuses using
|
||||
// the fd indicies registered in step #1.
|
||||
let mut poll_fds = Vec::new();
|
||||
// We'd like to sleep as long as possible (assuming no actionable notifications arrive).
|
||||
|
|
|
|||
|
|
@ -610,7 +610,7 @@ fn run_internal(mut cfg: Config) -> Result<()> {
|
|||
match &cfg.gpu_parameters {
|
||||
Some(params) => Some(params.use_vulkan),
|
||||
None => {
|
||||
warn!("No GPU parameters set on CrosVM config.");
|
||||
warn!("No GPU parameters set on crosvm config.");
|
||||
None
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -638,7 +638,7 @@ fn crosvm_main() -> Result<CommandStatus> {
|
|||
|
||||
fn main() {
|
||||
syslog::early_init();
|
||||
info!("CrosVM started.");
|
||||
info!("crosvm started.");
|
||||
let res = crosvm_main();
|
||||
let exit_code = match &res {
|
||||
Ok(CommandStatus::Success | CommandStatus::VmStop) => {
|
||||
|
|
|
|||
6
third_party/libslirp-rs/src/context.rs
vendored
6
third_party/libslirp-rs/src/context.rs
vendored
|
|
@ -130,10 +130,10 @@ pub trait CallbackHandler {
|
|||
/// Runs the handler function for a specific timer.
|
||||
fn execute_timer(&mut self, timer: RawDescriptor);
|
||||
|
||||
// Normally in CrosVM we refer to FDs as descriptors, because FDs are platform specific;
|
||||
// Normally in crosvm we refer to FDs as descriptors, because FDs are platform specific;
|
||||
// however, this interface is very close to the libslirp FFI, and libslirp follows the Linux
|
||||
// philosophy of everything is an FD. Since even Windows refers to FDs in WSAPoll, keeping FD
|
||||
// as a concept here helps keep terminology consistent between CrosVM code interfacing with
|
||||
// as a concept here helps keep terminology consistent between crosvm code interfacing with
|
||||
// libslirp, and libslirp itself.
|
||||
fn register_poll_fd(&mut self, fd: i32);
|
||||
fn unregister_poll_fd(&mut self, fd: i32);
|
||||
|
|
@ -650,7 +650,7 @@ impl<H: CallbackHandler> Context<H> {
|
|||
// guaranteed to be valid. While this function may fail, interpretation of the error code
|
||||
// is the responsibility of the caller.
|
||||
//
|
||||
// TODO(nkgold): if state_load becomes used by CrosVM, interpretation of the error code
|
||||
// TODO(nkgold): if state_load becomes used by crosvm, interpretation of the error code
|
||||
// should occur here.
|
||||
let cb = &mut (&mut read_cb as &mut dyn FnMut(&mut [u8]) -> isize);
|
||||
unsafe {
|
||||
|
|
|
|||
|
|
@ -230,7 +230,7 @@ def build_or_test(
|
|||
lib64dir_pc = os.path.join(lib64dir, "pkgconfig")
|
||||
|
||||
# This line that changes the dynamic library path is needed for upstream, but breaks
|
||||
# downstream's CrosVM linux kokoro presubmits.
|
||||
# downstream's crosvm linux kokoro presubmits.
|
||||
# env['LD_LIBRARY_PATH'] = libdir + ':' + lib64dir
|
||||
env["PKG_CONFIG_ALLOW_CROSS"] = "1"
|
||||
env["PKG_CONFIG_LIBDIR"] = libdir_pc + ":" + lib64dir_pc
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@
|
|||
#![cfg(windows)]
|
||||
|
||||
//! This IPC crate is used by the broker process to send boot data across the
|
||||
//! different CrosVm child processes on Windows.
|
||||
//! different crosvm child processes on Windows.
|
||||
|
||||
use std::fmt;
|
||||
use std::fmt::Display;
|
||||
|
|
|
|||
|
|
@ -118,7 +118,7 @@ impl WinAudio {
|
|||
impl StreamSource for WinAudio {
|
||||
// Returns a stream control and a buffer generator object. The stream control object is not used.
|
||||
// The buffer generator object is a wrapper around WASAPI's objects that will create a buffer for
|
||||
// CrosVM to copy audio bytes into.
|
||||
// crosvm to copy audio bytes into.
|
||||
fn new_playback_stream(
|
||||
&mut self,
|
||||
num_channels: usize,
|
||||
|
|
@ -215,7 +215,7 @@ impl PlaybackBufferStream for WinAudioRenderer {
|
|||
}
|
||||
}
|
||||
|
||||
// Implementation of buffer generator object. Used to get a buffer from WASAPI for CrosVM to copy audio
|
||||
// Implementation of buffer generator object. Used to get a buffer from WASAPI for crosvm to copy audio
|
||||
// bytes from the guest memory into.
|
||||
pub(crate) struct DeviceRenderer {
|
||||
audio_render_client: ComPtr<IAudioRenderClient>,
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue