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 <denniskempin@google.com>
Commit-Queue: Daniel Verkamp <dverkamp@chromium.org>
This commit is contained in:
Daniel Verkamp 2022-12-29 13:24:33 -08:00 committed by crosvm LUCI
parent 98c490e098
commit ac0fc378a3
80 changed files with 93 additions and 94 deletions

View file

@ -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.

View file

@ -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.

View file

@ -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"

View file

@ -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 Linuxs 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 doesnt
boundary for running native applications on the ChromeOS platform. Compared to QEMU, crosvm doesnt
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)

View file

@ -1,7 +1,7 @@
[package]
name = "aarch64"
version = "0.1.0"
authors = ["The Chromium OS Authors"]
authors = ["The ChromiumOS Authors"]
edition = "2021"
[features]

View file

@ -1,7 +1,7 @@
[package]
name = "acpi_tables"
version = "0.1.0"
authors = ["The Chromium OS Authors"]
authors = ["The ChromiumOS Authors"]
edition = "2021"
[dependencies]

View file

@ -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

View file

@ -1,7 +1,7 @@
[package]
name = "arch"
version = "0.1.0"
authors = ["The Chromium OS Authors"]
authors = ["The ChromiumOS Authors"]
edition = "2021"
[features]

View file

@ -1,7 +1,7 @@
[package]
name = "base"
version = "0.1.0"
authors = ["The Chromium OS Authors"]
authors = ["The ChromiumOS Authors"]
edition = "2021"
[features]

View file

@ -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"]

View file

@ -1,7 +1,7 @@
[package]
name = "bit_field"
version = "0.1.0"
authors = ["The Chromium OS Authors"]
authors = ["The ChromiumOS Authors"]
edition = "2021"
[dependencies]

View file

@ -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]

View file

@ -1,6 +1,6 @@
[package]
name = "broker_ipc"
authors = ["The Chromium OS Authors"]
authors = ["The ChromiumOS Authors"]
version = "0.1.0"
edition = "2021"

View file

@ -1,7 +1,7 @@
[package]
name = "audio_streams"
version = "0.1.0"
authors = ["The Chromium OS Authors"]
authors = ["The ChromiumOS Authors"]
edition = "2021"
[lib]

View file

@ -1,7 +1,7 @@
[package]
name = "balloon_control"
version = "0.1.0"
authors = ["The Chromium OS Authors"]
authors = ["The ChromiumOS Authors"]
edition = "2021"
[dependencies]

View file

@ -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"]

View file

@ -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.

View file

@ -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

View file

@ -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"]

View file

@ -1,7 +1,7 @@
[package]
name = "p9"
version = "0.1.0"
authors = ["The Chromium OS Authors"]
authors = ["The ChromiumOS Authors"]
edition = "2021"
[dependencies]

View file

@ -1,7 +1,7 @@
[package]
name = "p9-fuzz"
version = "0.1.0"
authors = ["The Chromium OS Authors"]
authors = ["The ChromiumOS Authors"]
edition = "2021"
[dependencies]

View file

@ -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"

View file

@ -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"]

View file

@ -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

View file

@ -1,7 +1,7 @@
[package]
name = "cros_async"
version = "0.1.1"
authors = ["The Chromium OS Authors"]
authors = ["The ChromiumOS Authors"]
edition = "2021"
[dependencies]

View file

@ -1,7 +1,7 @@
[package]
name = "cros_fdt"
version = "0.1.0"
authors = ["The Chromium OS Authors"]
authors = ["The ChromiumOS Authors"]
edition = "2021"
[dependencies]

View file

@ -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

View file

@ -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]

View file

@ -1,6 +1,6 @@
[package]
name = "crosvm_cli"
authors = ["The Chromium OS Authors"]
authors = ["The ChromiumOS Authors"]
version = "0.1.0"
edition = "2021"

View file

@ -1,7 +1,7 @@
[package]
name = "crosvm_control"
version = "0.1.0"
authors = ["The Chromium OS Authors"]
authors = ["The ChromiumOS Authors"]
edition = "2021"
[lib]

View file

@ -1,7 +1,7 @@
[package]
name = "crosvm_plugin"
version = "0.17.0"
authors = ["The Chromium OS Authors"]
authors = ["The ChromiumOS Authors"]
edition = "2021"
[features]

View file

@ -1,7 +1,7 @@
[package]
name = "devices"
version = "0.1.0"
authors = ["The Chromium OS Authors"]
authors = ["The ChromiumOS Authors"]
edition = "2021"
[features]

View file

@ -1,7 +1,7 @@
[package]
name = "disk"
version = "0.1.0"
authors = ["The Chromium OS Authors"]
authors = ["The ChromiumOS Authors"]
edition = "2021"
[lib]

View file

@ -1,5 +1,5 @@
[book]
authors = ["The Chromium OS Authors"]
authors = ["The ChromiumOS Authors"]
language = "en"
multilingual = false
src = "src"

View file

@ -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).

View file

@ -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.

View file

@ -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

View file

@ -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

View file

@ -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`

View file

@ -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]

View file

@ -1,7 +1,7 @@
[package]
name = "fuse"
version = "0.1.0"
authors = ["The Chromium OS Authors"]
authors = ["The ChromiumOS Authors"]
edition = "2021"
[lib]

View file

@ -1,7 +1,7 @@
[package]
name = "gpu_display"
version = "0.1.0"
authors = ["The Chromium OS Authors"]
authors = ["The ChromiumOS Authors"]
edition = "2021"
[features]

View file

@ -1,7 +1,7 @@
[package]
name = "hypervisor"
version = "0.1.0"
authors = ["The Chromium OS Authors"]
authors = ["The ChromiumOS Authors"]
edition = "2021"
[features]

View file

@ -1,7 +1,7 @@
[package]
name = "io_uring"
version = "0.1.1"
authors = ["The Chromium OS Authors"]
authors = ["The ChromiumOS Authors"]
edition = "2021"
[dependencies]

View file

@ -1,7 +1,7 @@
[package]
name = "kvm"
version = "0.1.0"
authors = ["The Chromium OS Authors"]
authors = ["The ChromiumOS Authors"]
edition = "2021"
[dependencies]

View file

@ -1,7 +1,7 @@
[package]
name = "kvm_sys"
version = "0.1.0"
authors = ["The Chromium OS Authors"]
authors = ["The ChromiumOS Authors"]
edition = "2021"
[dependencies]

View file

@ -1,7 +1,7 @@
[package]
name = "libcras"
version = "0.1.0"
authors = ["The Chromium OS Authors"]
authors = ["The ChromiumOS Authors"]
edition = "2021"
[lib]

View file

@ -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]

View file

@ -1,7 +1,7 @@
[package]
name = "cros-codecs"
version = "0.1.0"
authors = ["The Chromium OS Authors"]
authors = ["The ChromiumOS Authors"]
edition = "2021"
[features]

View file

@ -1,7 +1,7 @@
[package]
name = "ffmpeg"
version = "0.1.0"
authors = ["The Chromium OS Authors"]
authors = ["The ChromiumOS Authors"]
edition = "2021"
[dependencies]

View file

@ -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

View file

@ -1,7 +1,7 @@
[package]
name = "libva"
version = "0.1.0"
authors = ["The Chromium OS Authors"]
authors = ["The ChromiumOS Authors"]
edition = "2021"
[dependencies]

View file

@ -1,7 +1,7 @@
[package]
name = "libvda"
version = "0.1.0"
authors = ["The Chromium OS Authors"]
authors = ["The ChromiumOS Authors"]
edition = "2021"
links = "vda"

View file

@ -1,7 +1,7 @@
[package]
name = "metrics"
version = "0.1.0"
authors = ["The Chromium OS Authors"]
authors = ["The ChromiumOS Authors"]
edition = "2021"
[features]

View file

@ -1,7 +1,7 @@
[package]
name = "net_sys"
version = "0.1.0"
authors = ["The Chromium OS Authors"]
authors = ["The ChromiumOS Authors"]
edition = "2021"
[dependencies]

View file

@ -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'

View file

@ -1,7 +1,7 @@
[package]
name = "power_monitor"
version = "0.1.0"
authors = ["The Chromium OS Authors"]
authors = ["The ChromiumOS Authors"]
edition = "2021"
[features]

View file

@ -1,7 +1,7 @@
[package]
name = "prebuilts"
version = "0.1.0"
authors = ["The Chromium OS Authors"]
authors = ["The ChromiumOS Authors"]
edition = "2021"
[dependencies]

View file

@ -1,6 +1,6 @@
[package]
name = "proto_build_tools"
authors = ["The Chromium OS Authors"]
authors = ["The ChromiumOS Authors"]
version = "0.1.0"
edition = "2021"

View file

@ -1,7 +1,7 @@
[package]
name = "protos"
version = "0.1.0"
authors = ["The Chromium OS Authors"]
authors = ["The ChromiumOS Authors"]
edition = "2021"
[features]

View file

@ -1,7 +1,7 @@
[package]
name = "qcow_utils"
version = "0.1.0"
authors = ["The Chromium OS Authors"]
authors = ["The ChromiumOS Authors"]
edition = "2021"
[lib]

View file

@ -1,7 +1,7 @@
[package]
name = "resources"
version = "0.1.0"
authors = ["The Chromium OS Authors"]
authors = ["The ChromiumOS Authors"]
edition = "2021"
[dependencies]

View file

@ -1,7 +1,7 @@
[package]
name = "rutabaga_gfx"
version = "0.1.0"
authors = ["The Chromium OS Authors"]
authors = ["The ChromiumOS Authors"]
edition = "2021"
[features]

View file

@ -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]

View file

@ -1,7 +1,7 @@
[package]
name = "sandbox"
version = "0.1.0"
authors = ["The Chromium OS Authors"]
authors = ["The ChromiumOS Authors"]
edition = "2021"
[dependencies]

View file

@ -1,7 +1,7 @@
[package]
name = "serde_keyvalue"
version = "0.1.0"
authors = ["The Chromium OS Authors"]
authors = ["The ChromiumOS Authors"]
edition = "2021"
[features]

View file

@ -1,7 +1,7 @@
[package]
name = "swap"
version = "0.1.0"
authors = ["The Chromium OS Authors"]
authors = ["The ChromiumOS Authors"]
edition = "2021"
[features]

View file

@ -1,7 +1,7 @@
[package]
name = "system_api"
version = "0.1.0"
authors = ["The Chromium OS Authors"]
authors = ["The ChromiumOS Authors"]
edition = "2021"
[lib]

View file

@ -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

View file

@ -1,7 +1,7 @@
[package]
name = "tube_transporter"
version = "0.1.0"
authors = ["The Chromium OS Authors"]
authors = ["The ChromiumOS Authors"]
edition = "2021"

View file

@ -1,7 +1,7 @@
[package]
name = "usb_sys"
version = "0.1.0"
authors = ["The Chromium OS Authors"]
authors = ["The ChromiumOS Authors"]
edition = "2021"
[dependencies]

View file

@ -1,7 +1,7 @@
[package]
name = "usb_util"
version = "0.1.0"
authors = ["The Chromium OS Authors"]
authors = ["The ChromiumOS Authors"]
edition = "2021"
[dependencies]

View file

@ -1,7 +1,7 @@
[package]
name = "vfio_sys"
version = "0.1.0"
authors = ["The Chromium OS Authors"]
authors = ["The ChromiumOS Authors"]
edition = "2021"
[dependencies]

View file

@ -1,7 +1,7 @@
[package]
name = "vhost"
version = "0.1.0"
authors = ["The Chromium OS Authors"]
authors = ["The ChromiumOS Authors"]
edition = "2021"
[dependencies]

View file

@ -1,7 +1,7 @@
[package]
name = "virtio_sys"
version = "0.1.0"
authors = ["The Chromium OS Authors"]
authors = ["The ChromiumOS Authors"]
edition = "2021"
[dependencies]

View file

@ -1,7 +1,7 @@
[package]
name = "vm_control"
version = "0.1.0"
authors = ["The Chromium OS Authors"]
authors = ["The ChromiumOS Authors"]
edition = "2021"
[features]

View file

@ -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"]

View file

@ -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]

View file

@ -1,7 +1,7 @@
[package]
name = "win_util"
version = "0.1.0"
authors = ["The Chromium OS Authors"]
authors = ["The ChromiumOS Authors"]
edition = "2021"
[dependencies]

View file

@ -1,7 +1,7 @@
[package]
name = "x86_64"
version = "0.1.0"
authors = ["The Chromium OS Authors"]
authors = ["The ChromiumOS Authors"]
edition = "2021"
[features]