Google Git
Sign in
android / platform / external / crosvm / ca66addad0f4448a8b8607e119f8ffc2a39c57e4
commitca66addad0f4448a8b8607e119f8ffc2a39c57e4[log] [tgz]
authorDennis Kempin <denniskempin@google.com>Thu Jun 02 17:58:09 2022 +0000
committerDennis Kempin <denniskempin@google.com>Fri Jun 03 19:12:04 2022 +0000
treee1eafbf64137a230ced2b5357bfff1d0cad3871d
parentbebb69843a0f87883ee16198ab1ee488ff3dd383 [diff]
Update merge_bot to support merging across repos

We will be merging from the upstream repo into the cros repo. The
script can be run from both an upstream and a cros checkout, it
will setup the required remotes.

The CLI changes a little. We now require a revision to merge from
needs to be specified, since the script is not setting up the
upstream remote.

CI jobs will simply use HEAD, as the version to merge is already
checked out by the CI system.

BUG=b:233913643
TEST=
./merge_bot update-merges HEAD
./merge_bot update-merges origin/main
./merge_bot update-dry-runs HEAD

Change-Id: I247e1edc3ad951becf5d59b63efd74914bb2205f
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/crosvm/+/3687222
Reviewed-by: Daniel Verkamp <dverkamp@chromium.org>
Tested-by: kokoro <noreply+kokoro@google.com>
2 files changed
tree: e1eafbf64137a230ced2b5357bfff1d0cad3871d
  1. .cargo/
  2. .devcontainer/
  3. .github/
  4. aarch64/
  5. acpi_tables/
  6. arch/
  7. argh_helpers/
  8. base/
  9. bin/
  10. bit_field/
  11. ci/
  12. common/
  13. cros_async/
  14. crosvm-fuzz/
  15. crosvm_control/
  16. crosvm_plugin/
  17. devices/
  18. disk/
  19. docs/
  20. fuse/
  21. gpu_display/
  22. hypervisor/
  23. infra/
  24. integration_tests/
  25. io_uring/
  26. kernel_cmdline/
  27. kernel_loader/
  28. kvm/
  29. kvm_sys/
  30. libcras_stub/
  31. linux_input_sys/
  32. logo/
  33. media/
  34. metrics/
  35. net_sys/
  36. net_util/
  37. power_monitor/
  38. protos/
  39. qcow_utils/
  40. resources/
  41. rutabaga_gfx/
  42. seccomp/
  43. serde_keyvalue/
  44. src/
  45. system_api_stub/
  46. tests/
  47. third_party/
  48. tools/
  49. tpm2/
  50. tpm2-sys/
  51. tube_transporter/
  52. usb_sys/
  53. usb_util/
  54. vfio_sys/
  55. vhost/
  56. virtio_sys/
  57. vm_control/
  58. vm_memory/
  59. win_util/
  60. x86_64/
  61. .dockerignore
  62. .gitignore
  63. .gitmodules
  64. .rustfmt.toml
  65. ARCHITECTURE.md
  66. Cargo.toml
  67. CONTRIBUTING.md
  68. LICENSE
  69. navbar.md
  70. OWNERS
  71. PRESUBMIT.cfg
  72. README.chromeos.md
  73. README.md
  74. run_tests
  75. rust-toolchain
  76. setup_cros_cargo.sh
  77. test_all
  78. unblocked_terms.txt
README.md

crosvm - The Chrome OS 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 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.

Logo