mirrors/crosvm
1
0
Fork 0
mirror of https://chromium.googlesource.com/crosvm/crosvm synced 2024-11-28 09:33:01 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
crosvm/crosvm_control/Cargo.toml

26 lines
572 B
TOML
Raw Normal View History

Add FFI library providing control socket access This allows other languages to communicate directly with the control socket without having to invoke `crosvm` BUG=None TEST=Ran ./run_tests Change-Id: Icbf5905c41643b080bae3613b73a032467db1c4c Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/crosvm/+/2772798 Tested-by: kokoro <noreply+kokoro@google.com> Commit-Queue: Kevin Hamacher <hamacher@google.com> Commit-Queue: Daniel Verkamp <dverkamp@chromium.org> Reviewed-by: Daniel Verkamp <dverkamp@chromium.org>
2021-03-18 11:41:23 +00:00
[package]
crosvm: Rename libcrosvm_control to crosvm_control The current inclusion of the 'lib' prefix is redundant and results in 'liblibcrosvm_control' once built. These changes remove the 'lib' prefix from the source files. BUG=b:188858559 TEST=cros_run_unit_tests --board ${board} --packages chromeos-base/crosvm Change-Id: Ic1bcdce9aa5d879f5867232ffec60f40fe57d3a1 Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/crosvm/+/3321731 Reviewed-by: Hikaru Nishida <hikalium@chromium.org> Reviewed-by: Chirantan Ekbote <chirantan@chromium.org> Tested-by: kokoro <noreply+kokoro@google.com> Reviewed-by: Christian Blichmann <cblichmann@google.com> Commit-Queue: Kameron Lutes <kalutes@chromium.org>
2021-12-07 19:56:03 +00:00
name = "crosvm_control"
Add FFI library providing control socket access This allows other languages to communicate directly with the control socket without having to invoke `crosvm` BUG=None TEST=Ran ./run_tests Change-Id: Icbf5905c41643b080bae3613b73a032467db1c4c Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/crosvm/+/2772798 Tested-by: kokoro <noreply+kokoro@google.com> Commit-Queue: Kevin Hamacher <hamacher@google.com> Commit-Queue: Daniel Verkamp <dverkamp@chromium.org> Reviewed-by: Daniel Verkamp <dverkamp@chromium.org>
2021-03-18 11:41:23 +00:00
version = "0.1.0"
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>
2022-12-29 21:24:33 +00:00
authors = ["The ChromiumOS Authors"]
crosvm: migrate to Rust 2021 edition BUG=none TEST=cq Change-Id: I0059c970879b78bfd40b6ce58b10debcf154b50f Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/crosvm/+/3508322 Tested-by: kokoro <noreply+kokoro@google.com> Reviewed-by: Daniel Verkamp <dverkamp@chromium.org> Commit-Queue: Anton Romanov <romanton@google.com>
2022-03-08 01:16:09 +00:00
edition = "2021"
Add FFI library providing control socket access This allows other languages to communicate directly with the control socket without having to invoke `crosvm` BUG=None TEST=Ran ./run_tests Change-Id: Icbf5905c41643b080bae3613b73a032467db1c4c Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/crosvm/+/2772798 Tested-by: kokoro <noreply+kokoro@google.com> Commit-Queue: Kevin Hamacher <hamacher@google.com> Commit-Queue: Daniel Verkamp <dverkamp@chromium.org> Reviewed-by: Daniel Verkamp <dverkamp@chromium.org>
2021-03-18 11:41:23 +00:00
balloon: use protos for registered events since the RegisteredEvent model is effectively an external API, switch to using protobuf as a more formal/stable means of communicating messages. also introduces exporting the registered_events.proto file as part of crosvm_control build, alongside the currently existing header file. this patch also introduces feature-gating for registered_events and protos so as not to bring in too many third party dependencies for a base build. BUG=b/278117550 TEST=run bzImage locally TEST=sidecar program available at https://x20.corp.google.com/users/dr/drmasquatch/socket-pinger-proto Change-Id: I5d91d87f7807effc125352caf5c75eee2593f70d Reviewed-on: https://chromium-review.googlesource.com/c/crosvm/crosvm/+/4521604 Reviewed-by: Daniel Verkamp <dverkamp@chromium.org> Commit-Queue: maciek swiech <drmasquatch@google.com>
2023-05-10 19:10:52 +00:00
[features]
crosvm-control: Add pci-hotplug flag This CL adds pci-hotplug feature flag to crosvm-control FFI. This flag is required since otherwise vm_control for crosvm_control target would be built without pci-hotplug flag. BUG=b/294777126 TEST=manual VmConciergeClient DBus call workds with crrev/c/4798333 Change-Id: Iad4a7f47185025709bb2ae5029d42a06df8f555b Reviewed-on: https://chromium-review.googlesource.com/c/crosvm/crosvm/+/5098244 Reviewed-by: Alexandre Courbot <acourbot@chromium.org> Reviewed-by: Keiichi Watanabe <keiichiw@chromium.org> Commit-Queue: Ningyuan Wang <ningyuan@google.com>
2023-12-07 04:53:03 +00:00
pci-hotplug = ["vm_control/pci-hotplug"]
balloon: use protos for registered events since the RegisteredEvent model is effectively an external API, switch to using protobuf as a more formal/stable means of communicating messages. also introduces exporting the registered_events.proto file as part of crosvm_control build, alongside the currently existing header file. this patch also introduces feature-gating for registered_events and protos so as not to bring in too many third party dependencies for a base build. BUG=b/278117550 TEST=run bzImage locally TEST=sidecar program available at https://x20.corp.google.com/users/dr/drmasquatch/socket-pinger-proto Change-Id: I5d91d87f7807effc125352caf5c75eee2593f70d Reviewed-on: https://chromium-review.googlesource.com/c/crosvm/crosvm/+/4521604 Reviewed-by: Daniel Verkamp <dverkamp@chromium.org> Commit-Queue: maciek swiech <drmasquatch@google.com>
2023-05-10 19:10:52 +00:00
registered_events = ["vm_control/registered_events"]
Add FFI library providing control socket access This allows other languages to communicate directly with the control socket without having to invoke `crosvm` BUG=None TEST=Ran ./run_tests Change-Id: Icbf5905c41643b080bae3613b73a032467db1c4c Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/crosvm/+/2772798 Tested-by: kokoro <noreply+kokoro@google.com> Commit-Queue: Kevin Hamacher <hamacher@google.com> Commit-Queue: Daniel Verkamp <dverkamp@chromium.org> Reviewed-by: Daniel Verkamp <dverkamp@chromium.org>
2021-03-18 11:41:23 +00:00
[lib]
crosvm_control: Also create a static lib This is useful for projects that build in lock-step with crosvm and want to control a VM without having to `dlopen()` or embed `libcrosvm_control.so`. TEST=./tools/presubmit --quick BUG=none Change-Id: I9407c3e1783f55e399358bdf291a999ee8dc8892 Reviewed-on: https://chromium-review.googlesource.com/c/crosvm/crosvm/+/3864925 Reviewed-by: Dennis Kempin <denniskempin@google.com> Commit-Queue: Christian Blichmann <cblichmann@google.com> Tested-by: Christian Blichmann <cblichmann@google.com>
2022-08-31 12:13:58 +00:00
crate-type = ["cdylib", "staticlib"]
Add FFI library providing control socket access This allows other languages to communicate directly with the control socket without having to invoke `crosvm` BUG=None TEST=Ran ./run_tests Change-Id: Icbf5905c41643b080bae3613b73a032467db1c4c Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/crosvm/+/2772798 Tested-by: kokoro <noreply+kokoro@google.com> Commit-Queue: Kevin Hamacher <hamacher@google.com> Commit-Queue: Daniel Verkamp <dverkamp@chromium.org> Reviewed-by: Daniel Verkamp <dverkamp@chromium.org>
2021-03-18 11:41:23 +00:00
[dependencies]
vm_control: fix more wildcard re-exports Import balloon_control items directly from that crate rather than via re-exports from vm_control. This fixes the fuzzer build, which depended on an implicitly imported type via one of the conditional wildcard imports. BUG=chromium:69590 TEST=(cd fuzz; cargo build) Change-Id: I97d5df66741cfb64f600bebd503b73d779888440 Reviewed-on: https://chromium-review.googlesource.com/c/crosvm/crosvm/+/5630345 Reviewed-by: Dennis Kempin <denniskempin@google.com> Commit-Queue: Daniel Verkamp <dverkamp@chromium.org>
2024-06-13 17:51:15 +00:00
balloon_control = { path = "../common/balloon_control" }
Revert "crosvm_control: split into inner and outer crates" This reverts commit 821f544301b6b285a735487dd938e084f62ed4e7. Reason for revert: breaks builds and is not terribly important at the moment Original change's description: > crosvm_control: split into inner and outer crates > > since the crosvm_control crate is build as a cdylib, the functions are > not able to be used from other rust code. this patch moves all actual > implementation into an inner crosvm_control_rust crate, and has the > outer crosvm_control crate import and expose all of the inner code. > > Change-Id: Ib05d5df8bb138680f3e77a8837b1103854c0b316 > Reviewed-on: https://chromium-review.googlesource.com/c/crosvm/crosvm/+/4276641 > Commit-Queue: Maciek Swiech <drmasquatch@google.com> > Reviewed-by: Dennis Kempin <denniskempin@google.com> Change-Id: I2fb1b8b6337b58d69074e63b5ed81771402e616f No-Presubmit: true No-Tree-Checks: true No-Try: true Reviewed-on: https://chromium-review.googlesource.com/c/crosvm/crosvm/+/4305342 Auto-Submit: Maciek Swiech <drmasquatch@google.com> Reviewed-by: Daniel Verkamp <dverkamp@chromium.org> Commit-Queue: Dennis Kempin <denniskempin@google.com> Reviewed-by: Dennis Kempin <denniskempin@google.com> Bot-Commit: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com>
2023-03-02 22:34:43 +00:00
base = { path = "../base" }
libc = "0.2.65"
crosvm_control: add swap status/trim command support SwapStatus, SwapState, SwapStateTransition, SwapMetrics are directly contained into crosvm_control.h SwapState is translated as C++ enum. SwapStateTransition::time_ms is now u64 because u128 does not support repr(C). Changed usize in the structs to u64 because usize is translated as uintptr_t. BUG=b:265386761 TEST=cargo build -p crosvm_control Change-Id: Ia9df56d40c1884067a712620e0fc797e07af77a2 Reviewed-on: https://chromium-review.googlesource.com/c/crosvm/crosvm/+/4486549 Reviewed-by: Daniel Verkamp <dverkamp@chromium.org> Reviewed-by: David Stevens <stevensd@chromium.org> Commit-Queue: Shin Kawamura <kawasin@google.com> Reviewed-by: Dennis Kempin <denniskempin@google.com>
2023-04-28 05:38:25 +00:00
swap = { path = "../swap", default-features = false }
crosvm_control: require vm_control balloon feature crosvm_control unconditionally imports vm_control::BalloonControlCommand which is only available when vm_control has the "balloon" feature enabled. Declare this dependency in crosvm_control/Cargo.toml. Fixes building crosvm_control with --no-default-features. BUG=None TEST=cargo build -p crosvm_control --no-default-features Change-Id: I0f7a956318bd144fcbe9e09ee8319e992df87d5e Reviewed-on: https://chromium-review.googlesource.com/c/crosvm/crosvm/+/4736333 Reviewed-by: maciek swiech <drmasquatch@google.com> Commit-Queue: Daniel Verkamp <dverkamp@chromium.org>
2023-07-31 23:45:29 +00:00
vm_control = { path = "../vm_control", features = [ "balloon" ] }
Reland "crosvm_control: Generate C header during build" This is a reland of commit 06fca32aff0d2d7b7013674812f07109f09ff71c Original change's description: > crosvm_control: Generate C header during build > > Generates a C header for the crosvm_control library during crosvm build. > > BUG=b:188858559 > TEST=cq > > Cq-Depend: chromium:3553666 > Change-Id: Ic6d57d654f546a4ddf9facad16d29a03c103ebbe > Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/crosvm/+/3553761 > Reviewed-by: Dennis Kempin <denniskempin@google.com> > Tested-by: kokoro <noreply+kokoro@google.com> > Commit-Queue: Kameron Lutes <kalutes@chromium.org> Bug: b:188858559 Change-Id: I041cf6452ecec2d3ef9581b07ee0c457ba81cf98 Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/crosvm/+/3593855 Reviewed-by: Dennis Kempin <denniskempin@google.com> Tested-by: kokoro <noreply+kokoro@google.com> Commit-Queue: Kameron Lutes <kalutes@chromium.org>
2022-03-25 23:10:28 +00:00
[build-dependencies]
Cargo.toml: avoid "*" versions for external crates Ensure that every Cargo.toml dependency on a third-party crates.io crate specifies at least a major version, or a minor version for 0.x crates, to ensure that if a new major version is published, it cannot cause API breaks. The versions are selected to match the ones already in Cargo.lock, so this should have no functional change, but it will help prevent new "*" versions from being introduced via copy-and-paste. For rationale, see the Cargo FAQ: <https://doc.rust-lang.org/cargo/faq.html#can-libraries-use--as-a-version-for-their-dependencies> `minijail`, `audio_streams`, and `cras` are left as "*" for now, since they have unusual situations (imported from a submodule and/or replaced at build time with ebuild magic). BUG=None TEST=tools/dev_container tools/presubmit TEST=verify Cargo.lock is unchanged Change-Id: Ifa18199f812f01d2d10bfb4146b3353c1a76527c Reviewed-on: https://chromium-review.googlesource.com/c/crosvm/crosvm/+/5555656 Reviewed-by: Frederick Mayle <fmayle@google.com> Commit-Queue: Daniel Verkamp <dverkamp@chromium.org>
2024-05-21 22:37:42 +00:00
anyhow = "1"
crosvm: Uprev cbindgen dependency Match version available in Debian. BUG=b:265082456 TEST=build Change-Id: I8fc3b65fb8bb6cc3f7e512921d96c8cbbc4291b5 Reviewed-on: https://chromium-review.googlesource.com/c/crosvm/crosvm/+/4364561 Commit-Queue: Junichi Uekawa <uekawa@chromium.org> Reviewed-by: Keiichi Watanabe <keiichiw@chromium.org>
2023-02-28 04:49:39 +00:00
cbindgen = "0.24.3"
Cargo.toml: avoid "*" versions for external crates Ensure that every Cargo.toml dependency on a third-party crates.io crate specifies at least a major version, or a minor version for 0.x crates, to ensure that if a new major version is published, it cannot cause API breaks. The versions are selected to match the ones already in Cargo.lock, so this should have no functional change, but it will help prevent new "*" versions from being introduced via copy-and-paste. For rationale, see the Cargo FAQ: <https://doc.rust-lang.org/cargo/faq.html#can-libraries-use--as-a-version-for-their-dependencies> `minijail`, `audio_streams`, and `cras` are left as "*" for now, since they have unusual situations (imported from a submodule and/or replaced at build time with ebuild magic). BUG=None TEST=tools/dev_container tools/presubmit TEST=verify Cargo.lock is unchanged Change-Id: Ifa18199f812f01d2d10bfb4146b3353c1a76527c Reviewed-on: https://chromium-review.googlesource.com/c/crosvm/crosvm/+/5555656 Reviewed-by: Frederick Mayle <fmayle@google.com> Commit-Queue: Daniel Verkamp <dverkamp@chromium.org>
2024-05-21 22:37:42 +00:00
cc = "1"
tempfile = "3"
Reference in a new issue Copy permalink