2021-10-25 14:19:47 +00:00
|
|
|
# Contributing
|
|
|
|
|
2020-01-21 18:44:09 +00:00
|
|
|
## Intro
|
|
|
|
|
2022-01-25 23:14:43 +00:00
|
|
|
This article goes into detail about multiple areas of interest to contributors, which includes
|
|
|
|
reviewers, developers, and integrators who each share an interest in guiding crosvm's direction.
|
2020-01-21 18:44:09 +00:00
|
|
|
|
2021-10-25 11:24:54 +00:00
|
|
|
## Contributor License Agreement
|
|
|
|
|
2022-01-25 23:14:43 +00:00
|
|
|
Contributions to this project must be accompanied by a Contributor License Agreement (CLA). You (or
|
|
|
|
your employer) retain the copyright to your contribution; this simply gives us permission to use and
|
|
|
|
redistribute your contributions as part of the project. Head over to
|
|
|
|
<https://cla.developers.google.com/> to see your current agreements on file or to sign a new one.
|
2021-10-25 11:24:54 +00:00
|
|
|
|
2022-01-25 23:14:43 +00:00
|
|
|
You generally only need to submit a CLA once, so if you've already submitted one (even if it was for
|
|
|
|
a different project), you probably don't need to do it again.
|
2021-10-25 11:24:54 +00:00
|
|
|
|
2021-10-25 14:22:25 +00:00
|
|
|
## Bug Reports
|
|
|
|
|
|
|
|
We use the Chromium issue tracker. Please use
|
|
|
|
[`OS>Systems>Containers`](https://bugs.chromium.org/p/chromium/issues/list?q=component:OS%3ESystems%3EContainers)
|
|
|
|
component.
|
|
|
|
|
|
|
|
## Philosophy
|
2020-01-21 18:44:09 +00:00
|
|
|
|
|
|
|
The following is high level guidance for producing contributions to crosvm.
|
|
|
|
|
2022-01-25 23:14:43 +00:00
|
|
|
- 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
|
|
|
|
stable version of Rust, but can be behind a version for a few weeks.
|
|
|
|
- Avoid distribution specific code.
|
2020-01-21 18:44:09 +00:00
|
|
|
|
|
|
|
## Code Health
|
|
|
|
|
|
|
|
### Scripts
|
|
|
|
|
2022-01-25 23:14:43 +00:00
|
|
|
In the `bin/` directory of the crosvm repository, there is the `clippy` script which lints the Rust
|
|
|
|
code and the `fmt` script which will format the crosvm Rust code inplace.
|
2020-01-21 18:44:09 +00:00
|
|
|
|
2021-02-17 00:05:50 +00:00
|
|
|
### Running tests
|
2020-01-21 18:44:09 +00:00
|
|
|
|
2021-02-17 00:05:50 +00:00
|
|
|
The `./test_all` script will use docker containers to run all tests for crosvm.
|
2020-01-21 18:44:09 +00:00
|
|
|
|
2022-01-25 23:14:43 +00:00
|
|
|
For more details on using the docker containers for running tests locally, including faster,
|
|
|
|
iterative test runs, see `ci/README.md`.
|
2021-02-17 00:05:50 +00:00
|
|
|
|
2021-10-25 14:19:47 +00:00
|
|
|
### Style guidelines
|
|
|
|
|
2022-01-25 23:14:43 +00:00
|
|
|
To format all code, crosvm defers to rustfmt. In addition, the code adheres to the following rules:
|
2021-10-25 14:19:47 +00:00
|
|
|
|
|
|
|
The `use` statements for each module should be grouped in this order
|
|
|
|
|
2022-01-25 23:14:43 +00:00
|
|
|
1. `std`
|
|
|
|
1. third-party crates
|
|
|
|
1. chrome os crates
|
|
|
|
1. crosvm crates
|
|
|
|
1. `crate`
|
2021-10-25 14:19:47 +00:00
|
|
|
|
2022-01-25 23:14:43 +00:00
|
|
|
crosvm uses the [remain](https://github.com/dtolnay/remain) crate to keep error enums sorted, along
|
|
|
|
with the `#[sorted]` attribute to keep their corresponding match statements in the same order.
|
2021-10-25 14:19:47 +00:00
|
|
|
|
|
|
|
## Submitting Code
|
|
|
|
|
2022-01-25 23:14:43 +00:00
|
|
|
Since crosvm is one of Chromium OS projects, please read through [Chrome OS Contributing Guide]
|
|
|
|
first. This section describes the crosvm-specific workflow.
|
2021-10-25 14:19:47 +00:00
|
|
|
|
2021-11-01 15:18:42 +00:00
|
|
|
### Trying crosvm
|
|
|
|
|
|
|
|
Please see [the book of crosvm].
|
|
|
|
|
|
|
|
### Sending for code review
|
2021-10-25 14:19:47 +00:00
|
|
|
|
2022-01-25 23:14:43 +00:00
|
|
|
We use [Chromium Gerrit](https://chromium-review.googlesource.com/) for code reviewing. All crosvm
|
|
|
|
CLs are listed at the [crosvm component].
|
2021-10-25 14:19:47 +00:00
|
|
|
|
|
|
|
> Note: We don't accept any pull requests on the [GitHub mirror].
|
|
|
|
|
|
|
|
#### For non-Chromium OS Developers
|
|
|
|
|
2021-11-01 15:18:42 +00:00
|
|
|
If you are not interested in other Chromium OS components, you can simply
|
2022-03-30 22:38:51 +00:00
|
|
|
[clone and contribute crosvm only](https://google.github.io/crosvm/building_crosvm.html). Before you
|
|
|
|
make a commit locally, please set up [Gerrit's Change-Id hook] on your system.
|
2021-10-25 14:19:47 +00:00
|
|
|
|
2022-01-28 12:16:30 +00:00
|
|
|
```sh
|
2021-10-25 14:19:47 +00:00
|
|
|
# Modify code and make a git commit with a commit message following this rule:
|
|
|
|
# https://chromium.googlesource.com/chromiumos/docs/+/HEAD/contributing.md#Commit-messages
|
2022-01-28 12:16:30 +00:00
|
|
|
git commit
|
2021-10-25 14:19:47 +00:00
|
|
|
# Push your commit to Chromium Gerrit (https://chromium-review.googlesource.com/).
|
2022-01-28 12:16:30 +00:00
|
|
|
git push origin HEAD:refs/for/main
|
2021-10-25 14:19:47 +00:00
|
|
|
```
|
|
|
|
|
|
|
|
### Code review
|
|
|
|
|
|
|
|
Your change must be reviewed and approved by one of [crosvm owners].
|
|
|
|
|
2022-01-21 08:53:49 +00:00
|
|
|
### Presubmit checking {#presubmit}
|
2021-10-25 14:19:47 +00:00
|
|
|
|
2022-01-25 23:14:43 +00:00
|
|
|
Once your change is reviewed, it will need to go through two layers of presubmit checks.
|
2021-04-30 21:43:25 +00:00
|
|
|
|
2022-01-25 23:14:43 +00:00
|
|
|
The review will trigger Kokoro to run crosvm specific tests. If you want to check kokoro results
|
|
|
|
before a review, you can set 'Commit Queue +1' in gerrit to trigger a dry-run.
|
2021-04-30 21:43:25 +00:00
|
|
|
|
2022-01-25 23:14:43 +00:00
|
|
|
If you upload further changes after the you were given 'Code Review +2', Kokoro will automatically
|
|
|
|
trigger another test run. But you can also always comment 'kokoro rerun' to manually trigger another
|
|
|
|
build if needed.
|
2021-04-30 21:43:25 +00:00
|
|
|
|
2022-01-25 23:14:43 +00:00
|
|
|
When Kokoro passes, it will set Verified +1 and the change is ready to be sent to the
|
2021-04-30 21:43:25 +00:00
|
|
|
[ChromeOS commit queue](https://chromium.googlesource.com/chromiumos/docs/+/HEAD/contributing.md#send-your-changes-to-the-commit-queue)
|
|
|
|
by setting CQ+2.
|
|
|
|
|
2022-01-25 23:14:43 +00:00
|
|
|
Note: This is different from other ChromeOS repositories, where Verified +1 bit is set by the
|
|
|
|
developers to indicate that they successfully tested a change. The Verified bit can only be set by
|
|
|
|
Kokoro in the crosvm repository.
|
2021-04-30 21:43:25 +00:00
|
|
|
|
2021-10-28 10:34:00 +00:00
|
|
|
## Contributing to the documentation
|
|
|
|
|
|
|
|
[The book of crosvm] is build with [mdBook]. Each markdown files must follow
|
|
|
|
[Google Markdown style guide].
|
|
|
|
|
2022-01-25 23:14:43 +00:00
|
|
|
To render the book locally, you need to install mdbook and [mdbook-mermaid], which should be
|
|
|
|
installed when you run `./tools/install-deps`script.
|
2021-10-28 10:34:00 +00:00
|
|
|
|
2022-01-28 12:16:30 +00:00
|
|
|
```sh
|
2021-10-28 10:34:00 +00:00
|
|
|
cd crosvm/docs/book/
|
2021-10-29 16:08:25 +00:00
|
|
|
mdbook build
|
2021-10-28 10:34:00 +00:00
|
|
|
```
|
|
|
|
|
2022-01-25 23:14:43 +00:00
|
|
|
> Note: If you make a certain size of changes, it's recommended to reinstall mdbook manually with
|
|
|
|
> `cargo install mdbook`, as `./tools/install-deps` only installs a binary with some convenient
|
|
|
|
> features disabled. For example, the full version of mdbook allows you to edit files while checking
|
|
|
|
> rendered results.
|
2021-10-29 16:08:25 +00:00
|
|
|
|
2022-01-25 23:14:43 +00:00
|
|
|
[chrome os contributing guide]: https://chromium.googlesource.com/chromiumos/docs/+/HEAD/contributing.md
|
|
|
|
[crosvm component]: https://chromium-review.googlesource.com/q/project:chromiumos%252Fplatform%252Fcrosvm
|
|
|
|
[crosvm owners]: https://chromium.googlesource.com/chromiumos/platform/crosvm/+/HEAD/OWNERS
|
|
|
|
[gerrit's change-id hook]: https://gerrit-review.googlesource.com/Documentation/user-changeid.html
|
|
|
|
[github mirror]: https://github.com/google/crosvm
|
|
|
|
[google markdown style guide]: https://github.com/google/styleguide/blob/gh-pages/docguide/style.md
|
|
|
|
[mdbook]: https://rust-lang.github.io/mdBook/
|
2021-10-28 10:34:00 +00:00
|
|
|
[mdbook-mermaid]: https://github.com/badboy/mdbook-mermaid
|
2022-01-25 23:14:43 +00:00
|
|
|
[the book of crosvm]: https://google.github.io/crosvm/
|