diff options
author | Charles William Dick <cwd@google.com> | 2020-01-10 14:31:52 +0900 |
---|---|---|
committer | Commit Bot <commit-bot@chromium.org> | 2020-03-31 05:59:32 +0000 |
commit | 664cc3ca49cb58d5bf7d936686fd211d6dd728bf (patch) | |
tree | 78fc6d497bf33209e6308c2e677b2e676db579fe /src/linux.rs | |
parent | 31deb9fd456c876c16a624eaf04b23c7887802c6 (diff) | |
download | crosvm-664cc3ca49cb58d5bf7d936686fd211d6dd728bf.tar crosvm-664cc3ca49cb58d5bf7d936686fd211d6dd728bf.tar.gz crosvm-664cc3ca49cb58d5bf7d936686fd211d6dd728bf.tar.bz2 crosvm-664cc3ca49cb58d5bf7d936686fd211d6dd728bf.tar.lz crosvm-664cc3ca49cb58d5bf7d936686fd211d6dd728bf.tar.xz crosvm-664cc3ca49cb58d5bf7d936686fd211d6dd728bf.tar.zst crosvm-664cc3ca49cb58d5bf7d936686fd211d6dd728bf.zip |
crosvm virtio balloon stats
Introduces the ability to request BalloonStats from a BalloonControlCommand. BUG=b:147334004 TEST=tast run <DUT> arc.Boot.vm, and the balance available changes based on this. Change-Id: I808c4024f8c644c9cc4e30cc455ceda5f477bff3 Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/crosvm/+/2061517 Reviewed-by: Chirantan Ekbote <chirantan@chromium.org> Tested-by: kokoro <noreply+kokoro@google.com> Commit-Queue: Charles Dueck <cwd@chromium.org>
Diffstat (limited to 'src/linux.rs')
-rw-r--r-- | src/linux.rs | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/linux.rs b/src/linux.rs index 130644d..3370c1e 100644 --- a/src/linux.rs +++ b/src/linux.rs @@ -54,10 +54,10 @@ use sys_util::{ use vhost; use vm_control::{ BalloonControlCommand, BalloonControlRequestSocket, BalloonControlResponseSocket, - DiskControlCommand, DiskControlRequestSocket, DiskControlResponseSocket, DiskControlResult, - UsbControlSocket, VmControlResponseSocket, VmIrqRequest, VmIrqResponse, VmIrqResponseSocket, - VmMemoryControlRequestSocket, VmMemoryControlResponseSocket, VmMemoryRequest, VmMemoryResponse, - VmRunMode, + BalloonControlResult, DiskControlCommand, DiskControlRequestSocket, DiskControlResponseSocket, + DiskControlResult, UsbControlSocket, VmControlResponseSocket, VmIrqRequest, VmIrqResponse, + VmIrqResponseSocket, VmMemoryControlRequestSocket, VmMemoryControlResponseSocket, + VmMemoryRequest, VmMemoryResponse, VmRunMode, }; use crate::{Config, DiskOption, Executable, SharedDir, SharedDirKind, TouchDeviceOption}; @@ -1589,7 +1589,8 @@ pub fn run_config(cfg: Config) -> Result<()> { control_sockets.push(TaggedControlSocket::VmMemory(wayland_host_socket)); // Balloon gets a special socket so balloon requests can be forwarded from the main process. let (balloon_host_socket, balloon_device_socket) = - msg_socket::pair::<BalloonControlCommand, ()>().map_err(Error::CreateSocket)?; + msg_socket::pair::<BalloonControlCommand, BalloonControlResult>() + .map_err(Error::CreateSocket)?; // Create one control socket per disk. let mut disk_device_sockets = Vec::new(); |