Switch main crosvm repo
This updates all references to chromiumos/platform/crosvm to
crosvm/crosvm.
It will also switch ./tools/cl to upload to the new main repository.
BUG=None
TEST=None
Change-Id: I1f71e5d5de2300e57ace1315cb4553f68533d576
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/crosvm/+/3760903
Reviewed-by: Daniel Verkamp <dverkamp@chromium.org>
Tested-by: Dennis Kempin <denniskempin@google.com>
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index e3f6b03..53853f0 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -134,7 +134,7 @@
[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
+[crosvm owners]: https://chromium.googlesource.com/crosvm/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
diff --git a/PRESUBMIT.cfg b/PRESUBMIT.cfg
index 8db922c..e7eb03f 100644
--- a/PRESUBMIT.cfg
+++ b/PRESUBMIT.cfg
@@ -6,4 +6,4 @@
# https://chromium.googlesource.com/chromiumos/repohooks/
[Hook Scripts]
-check_cq_depend = ./tools/chromeos/check_cq_depend $PRESUBMIT_COMMIT
+repo_upload_warning = ./tools/chromeos/repo_upload_warning
diff --git a/README.md b/README.md
index 393517c..039c404 100644
--- a/README.md
+++ b/README.md
@@ -12,7 +12,7 @@
- [Announcements](https://groups.google.com/a/chromium.org/g/crosvm-announce)
- [Developer Mailing List](https://groups.google.com/a/chromium.org/g/crosvm-dev)
- [#crosvm on matrix.org](https://matrix.to/#/#crosvm:matrix.org)
-- [Source code](https://chromium.googlesource.com/chromiumos/platform/crosvm/)
+- [Source code](https://chromium.googlesource.com/crosvm/crosvm/)
- [API doc](https://google.github.io/crosvm/doc/crosvm/), useful for searching API.
- For contribution, see [the contributor guide](https://google.github.io/crosvm/contributing/).
Mirror repository is available at [GitHub](https://github.com/google/crosvm) for your
diff --git a/docs/book/src/appendix/seccomp.md b/docs/book/src/appendix/seccomp.md
index a886903..b363d41 100644
--- a/docs/book/src/appendix/seccomp.md
+++ b/docs/book/src/appendix/seccomp.md
@@ -11,7 +11,7 @@
## Writing a Policy for crosvm
The detailed rules for naming policy files can be found in
-[seccomp/README.md](https://chromium.googlesource.com/chromiumos/platform/crosvm/+/refs/heads/main/seccomp/README.md)
+[seccomp/README.md](https://chromium.googlesource.com/crosvm/crosvm/+/refs/heads/main/seccomp/README.md)
Most policy files will include the `common_device.policy` from a given architecture using this
directive near the top:
diff --git a/docs/book/src/building_crosvm.md b/docs/book/src/building_crosvm.md
index b96b9df..a241c60 100644
--- a/docs/book/src/building_crosvm.md
+++ b/docs/book/src/building_crosvm.md
@@ -8,7 +8,7 @@
Obtain the source code via git clone.
```sh
-git clone https://chromium.googlesource.com/chromiumos/platform/crosvm
+git clone https://chromium.googlesource.com/crosvm/crosvm
```
## Setting up the development environment
diff --git a/docs/book/src/devices/index.md b/docs/book/src/devices/index.md
index ea54916..b0fba21 100644
--- a/docs/book/src/devices/index.md
+++ b/docs/book/src/devices/index.md
@@ -36,26 +36,26 @@
- [vmm side]: Shares its virtqueues.
- [device side]: Consumes virtqueues.
-[device side]: https://chromium.googlesource.com/chromiumos/platform/crosvm/+/refs/heads/main/devices/src/virtio/vhost/user/device/
+[device side]: https://chromium.googlesource.com/crosvm/crosvm/+/refs/heads/main/devices/src/virtio/vhost/user/device/
[vhost-user protocol]: https://qemu.readthedocs.io/en/latest/interop/vhost-user.html
-[vmm side]: https://chromium.googlesource.com/chromiumos/platform/crosvm/+/refs/heads/main/devices/src/virtio/vhost/user/vmm/
+[vmm side]: https://chromium.googlesource.com/crosvm/crosvm/+/refs/heads/main/devices/src/virtio/vhost/user/vmm/
[`balloon`]: balloon.md
[`block`]: block.md
-[`cmos/rtc`]: https://chromium.googlesource.com/chromiumos/platform/crosvm/+/refs/heads/main/devices/src/cmos.rs
-[`console`]: https://chromium.googlesource.com/chromiumos/platform/crosvm/+/refs/heads/main/devices/src/virtio/console.rs
-[`fs`]: https://chromium.googlesource.com/chromiumos/platform/crosvm/+/refs/heads/main/devices/src/virtio/fs/
-[`gpu`]: https://chromium.googlesource.com/chromiumos/platform/crosvm/+/refs/heads/main/devices/src/virtio/gpu/
-[`i8042`]: https://chromium.googlesource.com/chromiumos/platform/crosvm/+/refs/heads/main/devices/src/i8042.rs
-[`input`]: https://chromium.googlesource.com/chromiumos/platform/crosvm/+/refs/heads/main/devices/src/virtio/input/
-[`iommu`]: https://chromium.googlesource.com/chromiumos/platform/crosvm/+/refs/heads/main/devices/src/virtio/iommu.rs
+[`cmos/rtc`]: https://chromium.googlesource.com/crosvm/crosvm/+/refs/heads/main/devices/src/cmos.rs
+[`console`]: https://chromium.googlesource.com/crosvm/crosvm/+/refs/heads/main/devices/src/virtio/console.rs
+[`fs`]: https://chromium.googlesource.com/crosvm/crosvm/+/refs/heads/main/devices/src/virtio/fs/
+[`gpu`]: https://chromium.googlesource.com/crosvm/crosvm/+/refs/heads/main/devices/src/virtio/gpu/
+[`i8042`]: https://chromium.googlesource.com/crosvm/crosvm/+/refs/heads/main/devices/src/i8042.rs
+[`input`]: https://chromium.googlesource.com/crosvm/crosvm/+/refs/heads/main/devices/src/virtio/input/
+[`iommu`]: https://chromium.googlesource.com/crosvm/crosvm/+/refs/heads/main/devices/src/virtio/iommu.rs
[`net`]: net.md
-[`p9`]: https://chromium.googlesource.com/chromiumos/platform/crosvm/+/refs/heads/main/devices/src/virtio/p9.rs
+[`p9`]: https://chromium.googlesource.com/crosvm/crosvm/+/refs/heads/main/devices/src/virtio/p9.rs
[`pmem`]: pmem.md
-[`rng`]: https://chromium.googlesource.com/chromiumos/platform/crosvm/+/refs/heads/main/devices/src/virtio/rng.rs
-[`serial`]: https://chromium.googlesource.com/chromiumos/platform/crosvm/+/refs/heads/main/devices/src/serial.rs
-[`snd`]: https://chromium.googlesource.com/chromiumos/platform/crosvm/+/refs/heads/main/devices/src/virtio/snd/
-[`tpm`]: https://chromium.googlesource.com/chromiumos/platform/crosvm/+/refs/heads/main/devices/src/virtio/tpm.rs
+[`rng`]: https://chromium.googlesource.com/crosvm/crosvm/+/refs/heads/main/devices/src/virtio/rng.rs
+[`serial`]: https://chromium.googlesource.com/crosvm/crosvm/+/refs/heads/main/devices/src/serial.rs
+[`snd`]: https://chromium.googlesource.com/crosvm/crosvm/+/refs/heads/main/devices/src/virtio/snd/
+[`tpm`]: https://chromium.googlesource.com/crosvm/crosvm/+/refs/heads/main/devices/src/virtio/tpm.rs
[`vhost-user`]: vhost_user.md
[`video`]: video.md
-[`vsock`]: https://chromium.googlesource.com/chromiumos/platform/crosvm/+/refs/heads/main/devices/src/virtio/vhost/vsock.rs
+[`vsock`]: https://chromium.googlesource.com/crosvm/crosvm/+/refs/heads/main/devices/src/virtio/vhost/vsock.rs
[`wayland`]: wayland.md
diff --git a/docs/book/src/introduction.md b/docs/book/src/introduction.md
index 620f8f1..85090f6 100644
--- a/docs/book/src/introduction.md
+++ b/docs/book/src/introduction.md
@@ -15,11 +15,11 @@
- [Announcements](https://groups.google.com/a/chromium.org/g/crosvm-announce)
- [Developer Mailing List](https://groups.google.com/a/chromium.org/g/crosvm-dev)
- [#crosvm on matrix.org](https://matrix.to/#/#crosvm:matrix.org)
-- [Source code](https://chromium.googlesource.com/chromiumos/platform/crosvm/)
+- [Source code](https://chromium.googlesource.com/crosvm/crosvm/)
- [GitHub mirror](https://github.com/google/crosvm)
- [API documentation](https://google.github.io/crosvm/doc/crosvm/), useful for searching API.
- Files for this book are under
- [/docs/](https://chromium.googlesource.com/chromiumos/platform/crosvm/+/HEAD/docs/).
+ [/docs/](https://chromium.googlesource.com/crosvm/crosvm/+/HEAD/docs/).
- [Issue tracker](https://bugs.chromium.org/p/chromium/issues/list?q=component:OS%3ESystems%3EContainers)
![logo](./logo.svg)
diff --git a/docs/book/src/running_crosvm/programmatic_interaction.md b/docs/book/src/running_crosvm/programmatic_interaction.md
index 0b8075b..a8a843b 100644
--- a/docs/book/src/running_crosvm/programmatic_interaction.md
+++ b/docs/book/src/running_crosvm/programmatic_interaction.md
@@ -2,12 +2,12 @@
## Usage
-[`crosvm_control`](https://chromium.googlesource.com/chromiumos/platform/crosvm/+/refs/heads/main/crosvm_control/src/lib.rs)
+[`crosvm_control`](https://chromium.googlesource.com/crosvm/crosvm/+/refs/heads/main/crosvm_control/src/lib.rs)
provides a programmatic way to interface with crosvm as a substitute to the CLI.
The library itself is written in Rust, but a C/C++ compatible header (`crosvm_control.h`) is
generated during the crosvm build and emitted to the Rust `OUT_DIR`.
-([See the `build.rs`](https://chromium.googlesource.com/chromiumos/platform/crosvm/+/refs/heads/main/crosvm_control/build.rs)
+([See the `build.rs`](https://chromium.googlesource.com/crosvm/crosvm/+/refs/heads/main/crosvm_control/build.rs)
script for more information).
The best practice for using `crosvm_control` from your project is to exclusively use the
diff --git a/tools/chromeos/check_cq_depend b/tools/chromeos/check_cq_depend
deleted file mode 100755
index 245f74b..0000000
--- a/tools/chromeos/check_cq_depend
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/usr/bin/env bash
-# Copyright 2022 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-commit=${1:-HEAD}
-
-if git show -q "$commit" | grep -i "Cq-Depend:" > /dev/null; then
- echo "Commit $commit contains Cq-Depend in the message."
- echo "Cq-Depend cannot be used on the crosvm repository."
- echo "See README.chromeos.md"
- exit 1
-fi
diff --git a/tools/chromeos/repo_upload_warning b/tools/chromeos/repo_upload_warning
new file mode 100755
index 0000000..1a2be4c
--- /dev/null
+++ b/tools/chromeos/repo_upload_warning
@@ -0,0 +1,15 @@
+#!/usr/bin/env bash
+# Copyright 2022 The Chromium OS Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+echo "WARNING!"
+echo ""
+echo "Do not submit changes to this repository directly. Please submit changes upstream"
+echo "to https://chromium.googlesource.com/crosvm/crosvm"
+echo ""
+echo "Use './tools/cl upload' instead of repo upload to do so."
+echo ""
+echo "WARNING!"
+
+exit 1
diff --git a/tools/cl b/tools/cl
index 3bb57d0..0a7ee68 100755
--- a/tools/cl
+++ b/tools/cl
@@ -40,7 +40,7 @@
"""
GERRIT_URL = "https://chromium-review.googlesource.com"
-CROSVM_URL = "https://chromium.googlesource.com/chromiumos/platform/crosvm"
+CROSVM_URL = "https://chromium.googlesource.com/crosvm/crosvm"
git = cmd("git")
curl = cmd("curl --silent --fail")
@@ -77,9 +77,6 @@
def prerequisites():
- print("This tool is experimental and a work in progress, please use carefully.")
- print()
-
if not git("remote get-url origin").success():
print("Setting up origin")
git("remote add origin", CROSVM_URL).fg()