From ac0fc378a30672c5154f983707604bb299d3dc4b Mon Sep 17 00:00:00 2001 From: Daniel Verkamp Date: Thu, 29 Dec 2022 13:24:33 -0800 Subject: [PATCH] Fix remaining Chrome/Chromium OS instances These should be written as ChromeOS and ChromiumOS (without the space) to match the updated branding. The copyright headers were already migrated to the new style (https://crrev.com/c/3894243), but there were some more instances left over. BUG=None TEST=tools/cargo-doc Change-Id: I8c76aea2eb33b2e370ab71ee9b5cc0a4cfd00585 Reviewed-on: https://chromium-review.googlesource.com/c/crosvm/crosvm/+/4129934 Reviewed-by: Dennis Kempin Commit-Queue: Daniel Verkamp --- ARCHITECTURE.md | 4 ++-- CONTRIBUTING.md | 2 +- Cargo.toml | 4 ++-- README.md | 6 +++--- aarch64/Cargo.toml | 2 +- acpi_tables/Cargo.toml | 2 +- anti_tamper/Cargo.toml | 2 +- arch/Cargo.toml | 2 +- base/Cargo.toml | 2 +- base/base_event_token_derive/Cargo.toml | 2 +- bit_field/Cargo.toml | 2 +- bit_field/bit_field_derive/Cargo.toml | 2 +- broker_ipc/Cargo.toml | 2 +- common/audio_streams/Cargo.toml | 2 +- common/balloon_control/Cargo.toml | 2 +- common/cros-fuzz/Cargo.toml | 2 +- common/cros-fuzz/README.md | 2 +- common/cros-fuzz/src/lib.rs | 4 ++-- common/data_model/Cargo.toml | 2 +- common/p9/Cargo.toml | 2 +- common/p9/fuzz/Cargo.toml | 2 +- common/p9/wire_format_derive/Cargo.toml | 2 +- common/sync/Cargo.toml | 2 +- crash_report/Cargo.toml | 2 +- cros_async/Cargo.toml | 2 +- cros_fdt/Cargo.toml | 2 +- cros_tracing/Cargo.toml | 2 +- crosvm-fuzz/Cargo.toml | 2 +- crosvm_cli/Cargo.toml | 2 +- crosvm_control/Cargo.toml | 2 +- crosvm_plugin/Cargo.toml | 2 +- devices/Cargo.toml | 2 +- disk/Cargo.toml | 2 +- docs/book/book.toml | 2 +- docs/book/src/appendix/seccomp.md | 2 +- docs/book/src/devices/video.md | 3 +-- docs/book/src/devices/wayland.md | 2 +- .../src/running_crosvm/custom_kernel_rootfs.md | 2 +- docs/book/src/running_crosvm/features.md | 16 ++++++++-------- e2e_tests/Cargo.toml | 2 +- fuse/Cargo.toml | 2 +- gpu_display/Cargo.toml | 2 +- hypervisor/Cargo.toml | 2 +- io_uring/Cargo.toml | 2 +- kvm/Cargo.toml | 2 +- kvm_sys/Cargo.toml | 2 +- libcras_stub/Cargo.toml | 2 +- linux_input_sys/Cargo.toml | 2 +- media/cros-codecs/Cargo.toml | 2 +- media/ffmpeg/Cargo.toml | 2 +- media/ffmpeg/README.md | 4 ++-- media/libva/Cargo.toml | 2 +- media/libvda/Cargo.toml | 2 +- metrics/Cargo.toml | 2 +- net_sys/Cargo.toml | 2 +- net_util/Cargo.toml | 2 +- power_monitor/Cargo.toml | 2 +- prebuilts/Cargo.toml | 2 +- proto_build_tools/Cargo.toml | 2 +- protos/Cargo.toml | 2 +- qcow_utils/Cargo.toml | 2 +- resources/Cargo.toml | 2 +- rutabaga_gfx/Cargo.toml | 2 +- rutabaga_gfx/ffi/Cargo.toml | 2 +- sandbox/Cargo.toml | 2 +- serde_keyvalue/Cargo.toml | 2 +- swap/Cargo.toml | 2 +- system_api/Cargo.toml | 2 +- tools/bindgen-all-the-things | 2 +- tube_transporter/Cargo.toml | 2 +- usb_sys/Cargo.toml | 2 +- usb_util/Cargo.toml | 2 +- vfio_sys/Cargo.toml | 2 +- vhost/Cargo.toml | 2 +- virtio_sys/Cargo.toml | 2 +- vm_control/Cargo.toml | 2 +- vm_memory/Cargo.toml | 2 +- win_audio/Cargo.toml | 2 +- win_util/Cargo.toml | 2 +- x86_64/Cargo.toml | 2 +- 80 files changed, 93 insertions(+), 94 deletions(-) diff --git a/ARCHITECTURE.md b/ARCHITECTURE.md index 319b553fde..23133b28c6 100644 --- a/ARCHITECTURE.md +++ b/ARCHITECTURE.md @@ -216,7 +216,7 @@ Source code is organized into crates, each with their own unit tests. - `kernel_loader` - Loads elf64 kernel files to a slice of memory. - `kvm_sys` - Low-level (mostly) auto-generated structures and constants for using KVM. - `kvm` - Unsafe, low-level wrapper code for using `kvm_sys`. -- `media/libvda` - Safe wrapper of [libvda], a Chrome OS HW-accelerated video decoding/encoding +- `media/libvda` - Safe wrapper of [libvda], a ChromeOS HW-accelerated video decoding/encoding library. - `net_sys` - Low-level (mostly) auto-generated structures and constants for creating TUN/TAP devices. @@ -225,7 +225,7 @@ Source code is organized into crates, each with their own unit tests. - `seccomp` - Contains minijail seccomp policy files for each sandboxed device. Because some syscalls vary by architecture, the seccomp policies are split by architecture. - `sync` - Our version of `std::sync::Mutex` and `std::sync::Condvar`. -- `third_party` - Third-party libraries which we are maintaining on the Chrome OS tree or the AOSP +- `third_party` - Third-party libraries which we are maintaining on the ChromeOS tree or the AOSP tree. - `vfio_sys` - Low-level (mostly) auto-generated structures, constants and ioctls for [VFIO]. - `vhost` - Wrappers for creating vhost based devices. diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 61d9a760e3..47af792ec9 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -19,7 +19,7 @@ The following is high level guidance for producing contributions to crosvm. - Prefer mechanism to policy. - Use existing protocols when they are adequate, such as virtio. - Prefer security over code re-use and speed of development. -- Only the version of Rust in use by the Chrome OS toolchain is supported. This is ordinarily the +- Only the version of Rust in use by the ChromeOS toolchain is supported. This is ordinarily the stable version of Rust, but can be behind a version for a few weeks. - Avoid distribution specific code. diff --git a/Cargo.toml b/Cargo.toml index baf25397df..4d4b44a83f 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "crosvm" version = "0.1.0" -authors = ["The Chromium OS Authors"] +authors = ["The ChromiumOS Authors"] edition = "2021" default-run = "crosvm" # b:223855233 @@ -24,7 +24,7 @@ overflow-checks = true inherits = 'release' panic = 'unwind' -# Reproduces the options used when building crosvm for Chrome OS. +# Reproduces the options used when building crosvm for ChromeOS. [profile.chromeos] inherits = "release" opt-level = "s" diff --git a/README.md b/README.md index 0ef0e4ee28..9d02e73df3 100644 --- a/README.md +++ b/README.md @@ -1,12 +1,12 @@ -# crosvm - The Chrome OS Virtual Machine Monitor +# crosvm - The ChromeOS Virtual Machine Monitor crosvm is a virtual machine monitor (VMM) based on Linux’s KVM hypervisor, with a focus on simplicity, security, and speed. crosvm is intended to run Linux guests, originally as a security -boundary for running native applications on the Chrome OS platform. Compared to QEMU, crosvm doesn’t +boundary for running native applications on the ChromeOS platform. Compared to QEMU, crosvm doesn’t emulate architectures or real hardware, instead concentrating on paravirtualized devices, such as the virtio standard. -crosvm is currently used to run Linux/Android guests on Chrome OS devices. +crosvm is currently used to run Linux/Android guests on ChromeOS devices. - [Documentation](https://crosvm.dev/book/) - [Announcements](https://groups.google.com/a/chromium.org/g/crosvm-announce) diff --git a/aarch64/Cargo.toml b/aarch64/Cargo.toml index 9272e419dc..5ed0e65723 100644 --- a/aarch64/Cargo.toml +++ b/aarch64/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "aarch64" version = "0.1.0" -authors = ["The Chromium OS Authors"] +authors = ["The ChromiumOS Authors"] edition = "2021" [features] diff --git a/acpi_tables/Cargo.toml b/acpi_tables/Cargo.toml index c6d5917666..c40b353dbc 100644 --- a/acpi_tables/Cargo.toml +++ b/acpi_tables/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "acpi_tables" version = "0.1.0" -authors = ["The Chromium OS Authors"] +authors = ["The ChromiumOS Authors"] edition = "2021" [dependencies] diff --git a/anti_tamper/Cargo.toml b/anti_tamper/Cargo.toml index 28641dbc84..655ea1a04f 100644 --- a/anti_tamper/Cargo.toml +++ b/anti_tamper/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "anti_tamper" version = "0.1.0" -authors = ["The Chromium OS Authors"] +authors = ["The ChromiumOS Authors"] edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/arch/Cargo.toml b/arch/Cargo.toml index 233804f896..14b209f8b4 100644 --- a/arch/Cargo.toml +++ b/arch/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "arch" version = "0.1.0" -authors = ["The Chromium OS Authors"] +authors = ["The ChromiumOS Authors"] edition = "2021" [features] diff --git a/base/Cargo.toml b/base/Cargo.toml index cd44cec2d9..31b5b6a84e 100644 --- a/base/Cargo.toml +++ b/base/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "base" version = "0.1.0" -authors = ["The Chromium OS Authors"] +authors = ["The ChromiumOS Authors"] edition = "2021" [features] diff --git a/base/base_event_token_derive/Cargo.toml b/base/base_event_token_derive/Cargo.toml index eb86959258..0bea269c72 100644 --- a/base/base_event_token_derive/Cargo.toml +++ b/base/base_event_token_derive/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "base_event_token_derive" version = "0.1.0" -authors = ["The Chromium OS Authors"] +authors = ["The ChromiumOS Authors"] edition = "2021" include = ["*.rs", "Cargo.toml"] diff --git a/bit_field/Cargo.toml b/bit_field/Cargo.toml index 540412f947..ffaa9ffd94 100644 --- a/bit_field/Cargo.toml +++ b/bit_field/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "bit_field" version = "0.1.0" -authors = ["The Chromium OS Authors"] +authors = ["The ChromiumOS Authors"] edition = "2021" [dependencies] diff --git a/bit_field/bit_field_derive/Cargo.toml b/bit_field/bit_field_derive/Cargo.toml index dddf7b4e2d..be1010b9c0 100644 --- a/bit_field/bit_field_derive/Cargo.toml +++ b/bit_field/bit_field_derive/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "bit_field_derive" version = "0.1.0" -authors = ["The Chromium OS Authors"] +authors = ["The ChromiumOS Authors"] edition = "2021" [dependencies] diff --git a/broker_ipc/Cargo.toml b/broker_ipc/Cargo.toml index 79a386979b..0717d47a48 100644 --- a/broker_ipc/Cargo.toml +++ b/broker_ipc/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "broker_ipc" -authors = ["The Chromium OS Authors"] +authors = ["The ChromiumOS Authors"] version = "0.1.0" edition = "2021" diff --git a/common/audio_streams/Cargo.toml b/common/audio_streams/Cargo.toml index 2e5dfe3645..cce7db7a20 100644 --- a/common/audio_streams/Cargo.toml +++ b/common/audio_streams/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "audio_streams" version = "0.1.0" -authors = ["The Chromium OS Authors"] +authors = ["The ChromiumOS Authors"] edition = "2021" [lib] diff --git a/common/balloon_control/Cargo.toml b/common/balloon_control/Cargo.toml index 11b8acfe74..f3a58f9b45 100644 --- a/common/balloon_control/Cargo.toml +++ b/common/balloon_control/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "balloon_control" version = "0.1.0" -authors = ["The Chromium OS Authors"] +authors = ["The ChromiumOS Authors"] edition = "2021" [dependencies] diff --git a/common/cros-fuzz/Cargo.toml b/common/cros-fuzz/Cargo.toml index c12d67a7ec..958663d38a 100644 --- a/common/cros-fuzz/Cargo.toml +++ b/common/cros-fuzz/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "cros_fuzz" version = "0.1.0" -authors = ["The Chromium OS Authors"] +authors = ["The ChromiumOS Authors"] edition = "2021" include = ["Cargo.toml", "src/*.rs"] diff --git a/common/cros-fuzz/README.md b/common/cros-fuzz/README.md index d98898055d..4c4b639967 100644 --- a/common/cros-fuzz/README.md +++ b/common/cros-fuzz/README.md @@ -1,3 +1,3 @@ # Support crate for fuzzing rust code -The crate provides support for fuzzing rust code on Chrome OS. +The crate provides support for fuzzing rust code on ChromeOS. diff --git a/common/cros-fuzz/src/lib.rs b/common/cros-fuzz/src/lib.rs index 58310c94a1..6c9779e0c8 100644 --- a/common/cros-fuzz/src/lib.rs +++ b/common/cros-fuzz/src/lib.rs @@ -2,13 +2,13 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -//! Support crate for writing fuzzers in Chrome OS. +//! Support crate for writing fuzzers in ChromeOS. //! //! The major features provided by this crate are: //! //! * The [`fuzz_target`] macro which wraps the body of the fuzzing code with //! all with all the boilerplate needed to build and run it as a fuzzer on -//! Chrome OS infrastructure. +//! ChromeOS infrastructure. //! * The [`FuzzRng`] type that provides a random number generator using fuzzer //! input as the source of its randomness. Fuzzers that need to generate //! structured data can use this type in conjunction with the [`rand`] crate diff --git a/common/data_model/Cargo.toml b/common/data_model/Cargo.toml index f7ff39752a..059a20c48f 100644 --- a/common/data_model/Cargo.toml +++ b/common/data_model/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "data_model" version = "0.1.0" -authors = ["The Chromium OS Authors"] +authors = ["The ChromiumOS Authors"] edition = "2021" include = ["src/**/*", "Cargo.toml"] diff --git a/common/p9/Cargo.toml b/common/p9/Cargo.toml index 98bb3275d5..79c4705159 100644 --- a/common/p9/Cargo.toml +++ b/common/p9/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "p9" version = "0.1.0" -authors = ["The Chromium OS Authors"] +authors = ["The ChromiumOS Authors"] edition = "2021" [dependencies] diff --git a/common/p9/fuzz/Cargo.toml b/common/p9/fuzz/Cargo.toml index f0095ddacc..0feb8a7627 100644 --- a/common/p9/fuzz/Cargo.toml +++ b/common/p9/fuzz/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "p9-fuzz" version = "0.1.0" -authors = ["The Chromium OS Authors"] +authors = ["The ChromiumOS Authors"] edition = "2021" [dependencies] diff --git a/common/p9/wire_format_derive/Cargo.toml b/common/p9/wire_format_derive/Cargo.toml index 52ab6a4c6e..73c0fce338 100644 --- a/common/p9/wire_format_derive/Cargo.toml +++ b/common/p9/wire_format_derive/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "wire_format_derive" version = "0.1.0" -authors = ["The Chromium OS Authors"] +authors = ["The ChromiumOS Authors"] [dependencies] syn = "^1" diff --git a/common/sync/Cargo.toml b/common/sync/Cargo.toml index 650505c9db..1e68cad533 100644 --- a/common/sync/Cargo.toml +++ b/common/sync/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "sync" version = "0.1.99" -authors = ["The Chromium OS Authors"] +authors = ["The ChromiumOS Authors"] edition = "2021" include = ["src/**/*", "Cargo.toml"] diff --git a/crash_report/Cargo.toml b/crash_report/Cargo.toml index 61f25223c9..0a15ff2058 100644 --- a/crash_report/Cargo.toml +++ b/crash_report/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "crash_report" version = "0.1.0" -authors = ["The Chromium OS Authors"] +authors = ["The ChromiumOS Authors"] edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/cros_async/Cargo.toml b/cros_async/Cargo.toml index 9a2b44547e..f8c3842bb5 100644 --- a/cros_async/Cargo.toml +++ b/cros_async/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "cros_async" version = "0.1.1" -authors = ["The Chromium OS Authors"] +authors = ["The ChromiumOS Authors"] edition = "2021" [dependencies] diff --git a/cros_fdt/Cargo.toml b/cros_fdt/Cargo.toml index fe34213816..a66784ff42 100644 --- a/cros_fdt/Cargo.toml +++ b/cros_fdt/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "cros_fdt" version = "0.1.0" -authors = ["The Chromium OS Authors"] +authors = ["The ChromiumOS Authors"] edition = "2021" [dependencies] diff --git a/cros_tracing/Cargo.toml b/cros_tracing/Cargo.toml index 0a076f3bbb..14b63b426c 100644 --- a/cros_tracing/Cargo.toml +++ b/cros_tracing/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "cros_tracing" version = "0.1.0" -authors = ["The Chromium OS Authors"] +authors = ["The ChromiumOS Authors"] edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/crosvm-fuzz/Cargo.toml b/crosvm-fuzz/Cargo.toml index 670e4fb3fa..aae75fd66e 100644 --- a/crosvm-fuzz/Cargo.toml +++ b/crosvm-fuzz/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "crosvm-fuzz" version = "0.0.1" -authors = ["The Chromium OS Authors"] +authors = ["The ChromiumOS Authors"] edition = "2021" [package.metadata] diff --git a/crosvm_cli/Cargo.toml b/crosvm_cli/Cargo.toml index 5c0bdcf9a2..cb351f84d5 100644 --- a/crosvm_cli/Cargo.toml +++ b/crosvm_cli/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "crosvm_cli" -authors = ["The Chromium OS Authors"] +authors = ["The ChromiumOS Authors"] version = "0.1.0" edition = "2021" diff --git a/crosvm_control/Cargo.toml b/crosvm_control/Cargo.toml index 1c8f3e9f23..41732df3f7 100644 --- a/crosvm_control/Cargo.toml +++ b/crosvm_control/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "crosvm_control" version = "0.1.0" -authors = ["The Chromium OS Authors"] +authors = ["The ChromiumOS Authors"] edition = "2021" [lib] diff --git a/crosvm_plugin/Cargo.toml b/crosvm_plugin/Cargo.toml index 75b538dfad..a4aad32504 100644 --- a/crosvm_plugin/Cargo.toml +++ b/crosvm_plugin/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "crosvm_plugin" version = "0.17.0" -authors = ["The Chromium OS Authors"] +authors = ["The ChromiumOS Authors"] edition = "2021" [features] diff --git a/devices/Cargo.toml b/devices/Cargo.toml index 0e305ae30b..27cfa482d3 100644 --- a/devices/Cargo.toml +++ b/devices/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "devices" version = "0.1.0" -authors = ["The Chromium OS Authors"] +authors = ["The ChromiumOS Authors"] edition = "2021" [features] diff --git a/disk/Cargo.toml b/disk/Cargo.toml index 20f4fa1239..9f33635243 100644 --- a/disk/Cargo.toml +++ b/disk/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "disk" version = "0.1.0" -authors = ["The Chromium OS Authors"] +authors = ["The ChromiumOS Authors"] edition = "2021" [lib] diff --git a/docs/book/book.toml b/docs/book/book.toml index 9306574341..2c80fdac6b 100644 --- a/docs/book/book.toml +++ b/docs/book/book.toml @@ -1,5 +1,5 @@ [book] -authors = ["The Chromium OS Authors"] +authors = ["The ChromiumOS Authors"] language = "en" multilingual = false src = "src" diff --git a/docs/book/src/appendix/seccomp.md b/docs/book/src/appendix/seccomp.md index b363d4103b..031c559469 100644 --- a/docs/book/src/appendix/seccomp.md +++ b/docs/book/src/appendix/seccomp.md @@ -4,7 +4,7 @@ The seccomp system is used to filter the syscalls that sandboxed processes can u seccomp used by crosvm (`SECCOMP_SET_MODE_FILTER`) allows for a BPF program to be used. To generate the BPF programs, crosvm uses minijail's policy file format. A policy file is written for each device per architecture. Each device requires a unique set of syscalls to accomplish their function -and each architecture has slightly different naming for similar syscalls. The Chrome OS docs have a +and each architecture has slightly different naming for similar syscalls. The ChromeOS docs have a useful [listing of syscalls](https://chromium.googlesource.com/chromiumos/docs/+/master/constants/syscalls.md). diff --git a/docs/book/src/devices/video.md b/docs/book/src/devices/video.md index d4176e0253..e0b3c3b207 100644 --- a/docs/book/src/devices/video.md +++ b/docs/book/src/devices/video.md @@ -9,8 +9,7 @@ The virtio-video host device uses backends to perform the actual decoding. The c backends are: - `libvda`, a hardware-accelerated backend that supports both decoding and encoding by delegating - the work to a running instance of Chrome. It can only be built and used in a Chrome OS - environment. + the work to a running instance of Chrome. It can only be built and used in a ChromeOS environment. - `ffmpeg`, a software-based backend that supports encoding and decoding. It exists to make testing and development of virtio-video easier, as it does not require any particular hardware and is based on a reliable codec library. diff --git a/docs/book/src/devices/wayland.md b/docs/book/src/devices/wayland.md index 72cf74a5ac..c85f1c05ea 100644 --- a/docs/book/src/devices/wayland.md +++ b/docs/book/src/devices/wayland.md @@ -29,7 +29,7 @@ compositor running on the host through the guest GPU device. As it is not a stan have to build it by ourselves. It is recommended to do this from the guest [with networking enabled](../running_crosvm/example_usage.md#add-networking-support). -Clone Chrome OS' `platform2` repository, which contains the source for sommelier: +Clone ChromeOS' `platform2` repository, which contains the source for sommelier: ```sh git clone https://chromium.googlesource.com/chromiumos/platform2 diff --git a/docs/book/src/running_crosvm/custom_kernel_rootfs.md b/docs/book/src/running_crosvm/custom_kernel_rootfs.md index 7e48000465..2d779c418a 100644 --- a/docs/book/src/running_crosvm/custom_kernel_rootfs.md +++ b/docs/book/src/running_crosvm/custom_kernel_rootfs.md @@ -11,7 +11,7 @@ The linux kernel in chromiumos comes preconfigured for running in a crosvm guest to build. You can use any mainline kernel though as long as it's configured for para-virtualized (virtio) devices -If you are using the chroot for Chromium OS development, you already have the kernel source. +If you are using the chroot for ChromiumOS development, you already have the kernel source. Otherwise, you can clone it: ```bash diff --git a/docs/book/src/running_crosvm/features.md b/docs/book/src/running_crosvm/features.md index 70e81d6c31..4b52cf56f5 100644 --- a/docs/book/src/running_crosvm/features.md +++ b/docs/book/src/running_crosvm/features.md @@ -5,19 +5,19 @@ file to see which features are enabled by default. ## `audio` -Enables experimental audio input/ouput to the host. Requires some Chrome OS specific dependencies -and daemons currently. +Enables experimental audio input/ouput to the host. Requires some ChromeOS specific dependencies and +daemons currently. ## `chromeos` -This option enables features specific to a Chrome OS environment. Examples of that are usage of -non-upstream kernel security features in the Chrome OS kernel, which should be temporary until -upstream catches up. Another example would be code to use Chrome OS system daemons like the low +This option enables features specific to a ChromeOS environment. Examples of that are usage of +non-upstream kernel security features in the ChromeOS kernel, which should be temporary until +upstream catches up. Another example would be code to use ChromeOS system daemons like the low memory notifier. -These features exist because crosvm was historically a Chrome OS only project, but crosvm is -intended to be OS agnostic now. If Chrome OS specific code is identified, it should be conditionally -compiled in using this feature. +These features exist because crosvm was historically a ChromeOS only project, but crosvm is intended +to be OS agnostic now. If ChromeOS specific code is identified, it should be conditionally compiled +in using this feature. ## `composite-disk` diff --git a/e2e_tests/Cargo.toml b/e2e_tests/Cargo.toml index 3d79318068..3de4900bae 100644 --- a/e2e_tests/Cargo.toml +++ b/e2e_tests/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "e2e_tests" version = "0.1.0" -authors = ["The Chromium OS Authors"] +authors = ["The ChromiumOS Authors"] edition = "2021" [dev-dependencies] diff --git a/fuse/Cargo.toml b/fuse/Cargo.toml index d9e9c5da7d..0eee7ec3dc 100644 --- a/fuse/Cargo.toml +++ b/fuse/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "fuse" version = "0.1.0" -authors = ["The Chromium OS Authors"] +authors = ["The ChromiumOS Authors"] edition = "2021" [lib] diff --git a/gpu_display/Cargo.toml b/gpu_display/Cargo.toml index 176dd77538..91e53a7406 100644 --- a/gpu_display/Cargo.toml +++ b/gpu_display/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "gpu_display" version = "0.1.0" -authors = ["The Chromium OS Authors"] +authors = ["The ChromiumOS Authors"] edition = "2021" [features] diff --git a/hypervisor/Cargo.toml b/hypervisor/Cargo.toml index 6c03532db4..bc5967cfcd 100644 --- a/hypervisor/Cargo.toml +++ b/hypervisor/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "hypervisor" version = "0.1.0" -authors = ["The Chromium OS Authors"] +authors = ["The ChromiumOS Authors"] edition = "2021" [features] diff --git a/io_uring/Cargo.toml b/io_uring/Cargo.toml index 406117945c..2ab40ce970 100644 --- a/io_uring/Cargo.toml +++ b/io_uring/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "io_uring" version = "0.1.1" -authors = ["The Chromium OS Authors"] +authors = ["The ChromiumOS Authors"] edition = "2021" [dependencies] diff --git a/kvm/Cargo.toml b/kvm/Cargo.toml index ec00070868..062a0bc81c 100644 --- a/kvm/Cargo.toml +++ b/kvm/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "kvm" version = "0.1.0" -authors = ["The Chromium OS Authors"] +authors = ["The ChromiumOS Authors"] edition = "2021" [dependencies] diff --git a/kvm_sys/Cargo.toml b/kvm_sys/Cargo.toml index b5bb63e597..fab80cbfad 100644 --- a/kvm_sys/Cargo.toml +++ b/kvm_sys/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "kvm_sys" version = "0.1.0" -authors = ["The Chromium OS Authors"] +authors = ["The ChromiumOS Authors"] edition = "2021" [dependencies] diff --git a/libcras_stub/Cargo.toml b/libcras_stub/Cargo.toml index 2e0e1f13ac..4962cd1644 100644 --- a/libcras_stub/Cargo.toml +++ b/libcras_stub/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "libcras" version = "0.1.0" -authors = ["The Chromium OS Authors"] +authors = ["The ChromiumOS Authors"] edition = "2021" [lib] diff --git a/linux_input_sys/Cargo.toml b/linux_input_sys/Cargo.toml index 355c44f9af..0372ee6320 100644 --- a/linux_input_sys/Cargo.toml +++ b/linux_input_sys/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "linux_input_sys" version = "0.1.0" -authors = ["The Chromium OS Authors"] +authors = ["The ChromiumOS Authors"] edition = "2021" [dependencies] diff --git a/media/cros-codecs/Cargo.toml b/media/cros-codecs/Cargo.toml index 3983b12713..4921e15fb8 100644 --- a/media/cros-codecs/Cargo.toml +++ b/media/cros-codecs/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "cros-codecs" version = "0.1.0" -authors = ["The Chromium OS Authors"] +authors = ["The ChromiumOS Authors"] edition = "2021" [features] diff --git a/media/ffmpeg/Cargo.toml b/media/ffmpeg/Cargo.toml index ea76283bd3..3427ad5f9d 100644 --- a/media/ffmpeg/Cargo.toml +++ b/media/ffmpeg/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "ffmpeg" version = "0.1.0" -authors = ["The Chromium OS Authors"] +authors = ["The ChromiumOS Authors"] edition = "2021" [dependencies] diff --git a/media/ffmpeg/README.md b/media/ffmpeg/README.md index 3cdb0bd27f..0b46bf238a 100644 --- a/media/ffmpeg/README.md +++ b/media/ffmpeg/README.md @@ -7,11 +7,11 @@ situations where no supported video acceleration is available on the host. Although several FFmpeg binding crates exist, most of them are not able to link against the system FFmpeg, and [the only one that does](https://crates.io/crates/ffmpeg-sys) is released under a software license that makes our lawyers nervous. Also they all run bindgen at build time, which is -not possible to do under the Chrome OS build system and would require to patch the crate with fully +not possible to do under the ChromeOS build system and would require to patch the crate with fully generated bindings. So taking this in consideration, as well as the extra work that it is to depend on external Rust -crates in Chrome OS, it is preferable to add our own simple bindings here that cover just the parts +crates in ChromeOS, it is preferable to add our own simple bindings here that cover just the parts of FFmpeg that we need. This crate has minimal dependencies ; on the FFmpeg side, it just uses `libavcodec`, `libavutil` and diff --git a/media/libva/Cargo.toml b/media/libva/Cargo.toml index 971402a76e..515c85e64e 100644 --- a/media/libva/Cargo.toml +++ b/media/libva/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "libva" version = "0.1.0" -authors = ["The Chromium OS Authors"] +authors = ["The ChromiumOS Authors"] edition = "2021" [dependencies] diff --git a/media/libvda/Cargo.toml b/media/libvda/Cargo.toml index 558822556f..afb8f5ffe5 100644 --- a/media/libvda/Cargo.toml +++ b/media/libvda/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "libvda" version = "0.1.0" -authors = ["The Chromium OS Authors"] +authors = ["The ChromiumOS Authors"] edition = "2021" links = "vda" diff --git a/metrics/Cargo.toml b/metrics/Cargo.toml index 7a5837f1e3..0a28d073ce 100644 --- a/metrics/Cargo.toml +++ b/metrics/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "metrics" version = "0.1.0" -authors = ["The Chromium OS Authors"] +authors = ["The ChromiumOS Authors"] edition = "2021" [features] diff --git a/net_sys/Cargo.toml b/net_sys/Cargo.toml index 5da75afec8..afcb578258 100644 --- a/net_sys/Cargo.toml +++ b/net_sys/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "net_sys" version = "0.1.0" -authors = ["The Chromium OS Authors"] +authors = ["The ChromiumOS Authors"] edition = "2021" [dependencies] diff --git a/net_util/Cargo.toml b/net_util/Cargo.toml index 0f2c0a9bc2..d6e10f8276 100644 --- a/net_util/Cargo.toml +++ b/net_util/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "net_util" version = "0.1.0" -authors = ["The Chromium OS Authors"] +authors = ["The ChromiumOS Authors"] edition = "2021" build = 'build.rs' diff --git a/power_monitor/Cargo.toml b/power_monitor/Cargo.toml index 206470b586..a1066a5cbb 100644 --- a/power_monitor/Cargo.toml +++ b/power_monitor/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "power_monitor" version = "0.1.0" -authors = ["The Chromium OS Authors"] +authors = ["The ChromiumOS Authors"] edition = "2021" [features] diff --git a/prebuilts/Cargo.toml b/prebuilts/Cargo.toml index 7c364b20bb..4564c4efa8 100644 --- a/prebuilts/Cargo.toml +++ b/prebuilts/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "prebuilts" version = "0.1.0" -authors = ["The Chromium OS Authors"] +authors = ["The ChromiumOS Authors"] edition = "2021" [dependencies] diff --git a/proto_build_tools/Cargo.toml b/proto_build_tools/Cargo.toml index a6e84697c4..e964e1ff69 100644 --- a/proto_build_tools/Cargo.toml +++ b/proto_build_tools/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "proto_build_tools" -authors = ["The Chromium OS Authors"] +authors = ["The ChromiumOS Authors"] version = "0.1.0" edition = "2021" diff --git a/protos/Cargo.toml b/protos/Cargo.toml index 494bb10db3..c740b55317 100644 --- a/protos/Cargo.toml +++ b/protos/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "protos" version = "0.1.0" -authors = ["The Chromium OS Authors"] +authors = ["The ChromiumOS Authors"] edition = "2021" [features] diff --git a/qcow_utils/Cargo.toml b/qcow_utils/Cargo.toml index 1cea6f396b..df1ae7afee 100644 --- a/qcow_utils/Cargo.toml +++ b/qcow_utils/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "qcow_utils" version = "0.1.0" -authors = ["The Chromium OS Authors"] +authors = ["The ChromiumOS Authors"] edition = "2021" [lib] diff --git a/resources/Cargo.toml b/resources/Cargo.toml index 02fc164a3a..f6d874a771 100644 --- a/resources/Cargo.toml +++ b/resources/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "resources" version = "0.1.0" -authors = ["The Chromium OS Authors"] +authors = ["The ChromiumOS Authors"] edition = "2021" [dependencies] diff --git a/rutabaga_gfx/Cargo.toml b/rutabaga_gfx/Cargo.toml index cdc1b1876c..24f0964493 100644 --- a/rutabaga_gfx/Cargo.toml +++ b/rutabaga_gfx/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "rutabaga_gfx" version = "0.1.0" -authors = ["The Chromium OS Authors"] +authors = ["The ChromiumOS Authors"] edition = "2021" [features] diff --git a/rutabaga_gfx/ffi/Cargo.toml b/rutabaga_gfx/ffi/Cargo.toml index a4160a72c6..75b143357d 100644 --- a/rutabaga_gfx/ffi/Cargo.toml +++ b/rutabaga_gfx/ffi/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "rutabaga_gfx_ffi" version = "0.1.0" -authors = ["The Chromium OS Authors + Android Open Source Project"] +authors = ["The ChromiumOS Authors + Android Open Source Project"] edition = "2021" [lib] diff --git a/sandbox/Cargo.toml b/sandbox/Cargo.toml index c31ee1b4e3..332d0f9899 100644 --- a/sandbox/Cargo.toml +++ b/sandbox/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "sandbox" version = "0.1.0" -authors = ["The Chromium OS Authors"] +authors = ["The ChromiumOS Authors"] edition = "2021" [dependencies] diff --git a/serde_keyvalue/Cargo.toml b/serde_keyvalue/Cargo.toml index b08e73c2db..f14133c182 100644 --- a/serde_keyvalue/Cargo.toml +++ b/serde_keyvalue/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "serde_keyvalue" version = "0.1.0" -authors = ["The Chromium OS Authors"] +authors = ["The ChromiumOS Authors"] edition = "2021" [features] diff --git a/swap/Cargo.toml b/swap/Cargo.toml index 33d7bfe1b0..63c712b29b 100644 --- a/swap/Cargo.toml +++ b/swap/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "swap" version = "0.1.0" -authors = ["The Chromium OS Authors"] +authors = ["The ChromiumOS Authors"] edition = "2021" [features] diff --git a/system_api/Cargo.toml b/system_api/Cargo.toml index b8d86cf054..8e97afed2d 100644 --- a/system_api/Cargo.toml +++ b/system_api/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "system_api" version = "0.1.0" -authors = ["The Chromium OS Authors"] +authors = ["The ChromiumOS Authors"] edition = "2021" [lib] diff --git a/tools/bindgen-all-the-things b/tools/bindgen-all-the-things index d931a613bd..de3ed9ce4f 100755 --- a/tools/bindgen-all-the-things +++ b/tools/bindgen-all-the-things @@ -5,7 +5,7 @@ # # Regenerate all bindgen-generated Rust bindings in the crosvm tree. # -# This script expects to be executed from a full Chrome OS checkout so it has access to the kernel +# This script expects to be executed from a full ChromeOS checkout so it has access to the kernel # and other repositories. Note that it must be run from OUTSIDE the chroot. set -e diff --git a/tube_transporter/Cargo.toml b/tube_transporter/Cargo.toml index 2ed2e99e14..e6e0beca45 100644 --- a/tube_transporter/Cargo.toml +++ b/tube_transporter/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "tube_transporter" version = "0.1.0" -authors = ["The Chromium OS Authors"] +authors = ["The ChromiumOS Authors"] edition = "2021" diff --git a/usb_sys/Cargo.toml b/usb_sys/Cargo.toml index bb7d4deb04..af76b69cd0 100644 --- a/usb_sys/Cargo.toml +++ b/usb_sys/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "usb_sys" version = "0.1.0" -authors = ["The Chromium OS Authors"] +authors = ["The ChromiumOS Authors"] edition = "2021" [dependencies] diff --git a/usb_util/Cargo.toml b/usb_util/Cargo.toml index 24dbaf1762..fc693f9143 100644 --- a/usb_util/Cargo.toml +++ b/usb_util/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "usb_util" version = "0.1.0" -authors = ["The Chromium OS Authors"] +authors = ["The ChromiumOS Authors"] edition = "2021" [dependencies] diff --git a/vfio_sys/Cargo.toml b/vfio_sys/Cargo.toml index 8890f55d06..28f06792cd 100644 --- a/vfio_sys/Cargo.toml +++ b/vfio_sys/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "vfio_sys" version = "0.1.0" -authors = ["The Chromium OS Authors"] +authors = ["The ChromiumOS Authors"] edition = "2021" [dependencies] diff --git a/vhost/Cargo.toml b/vhost/Cargo.toml index 1b3af19a81..ab013563c3 100644 --- a/vhost/Cargo.toml +++ b/vhost/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "vhost" version = "0.1.0" -authors = ["The Chromium OS Authors"] +authors = ["The ChromiumOS Authors"] edition = "2021" [dependencies] diff --git a/virtio_sys/Cargo.toml b/virtio_sys/Cargo.toml index 7deb28aa8c..40bb895d96 100644 --- a/virtio_sys/Cargo.toml +++ b/virtio_sys/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "virtio_sys" version = "0.1.0" -authors = ["The Chromium OS Authors"] +authors = ["The ChromiumOS Authors"] edition = "2021" [dependencies] diff --git a/vm_control/Cargo.toml b/vm_control/Cargo.toml index 280f22ac40..41e68027ee 100644 --- a/vm_control/Cargo.toml +++ b/vm_control/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "vm_control" version = "0.1.0" -authors = ["The Chromium OS Authors"] +authors = ["The ChromiumOS Authors"] edition = "2021" [features] diff --git a/vm_memory/Cargo.toml b/vm_memory/Cargo.toml index 6a4c233179..a1fdf36977 100644 --- a/vm_memory/Cargo.toml +++ b/vm_memory/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "vm_memory" version = "0.1.0" -authors = ["The Chromium OS Authors"] +authors = ["The ChromiumOS Authors"] edition = "2021" include = ["src/**/*", "Cargo.toml"] diff --git a/win_audio/Cargo.toml b/win_audio/Cargo.toml index eb26a05ce5..69767e9daf 100644 --- a/win_audio/Cargo.toml +++ b/win_audio/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "win_audio" version = "0.1.0" -authors = ["The Chromium OS Authors"] +authors = ["The ChromiumOS Authors"] edition = "2021" [target.'cfg(windows)'.dependencies] diff --git a/win_util/Cargo.toml b/win_util/Cargo.toml index e975fd6fef..2c30975c51 100644 --- a/win_util/Cargo.toml +++ b/win_util/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "win_util" version = "0.1.0" -authors = ["The Chromium OS Authors"] +authors = ["The ChromiumOS Authors"] edition = "2021" [dependencies] diff --git a/x86_64/Cargo.toml b/x86_64/Cargo.toml index 3653b897a3..010369f341 100644 --- a/x86_64/Cargo.toml +++ b/x86_64/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "x86_64" version = "0.1.0" -authors = ["The Chromium OS Authors"] +authors = ["The ChromiumOS Authors"] edition = "2021" [features]