mirrors/crosvm
1
0
Fork 0
mirror of https://chromium.googlesource.com/crosvm/crosvm synced 2024-12-24 11:58:41 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

devices: balloon: fix the 'crosvm balloon' command

Browse source 
The balloon socket interface was changed to take an absolute number of
pages in a u64 in commit 448516e3f9 ("balloon: Implement device
policy"), but the 'crosvm balloon' command wasn't updated to match.  Fix
the crosvm front-end to send a u64 as expected by the command socket
reader instead of the i32 it was sending previously, and change the
parameter to bytes instead of pages to match the receiving end as well.

BUG=None
TEST=crosvm balloon a running VM to various sizes

Change-Id: I265bee55c06809de7559a79a5eb6d0d094533993
Signed-off-by: Daniel Verkamp <dverkamp@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/1394157
Commit-Ready: ChromeOS CL Exonerator Bot <chromiumos-cl-exonerator@appspot.gserviceaccount.com>
Reviewed-by: Chirantan Ekbote <chirantan@chromium.org>
This commit is contained in:
Daniel Verkamp 2019-01-03 12:53:04 -08:00 committed by chrome-bot
parent 3a794ccb25
commit f76869d2a6
2 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/main.rs
View file

@ -571,13 +571,13 @@ fn stop_vms(args: std::env::Args) -> std::result::Result<(), ()> {
fn balloon_vms(mut args: std::env::Args) -> std::result::Result<(), ()> {
if args.len() < 2 {
print_help("crosvm balloon", "PAGE_ADJUST VM_SOCKET...", &[]);
println!("Adjust the ballon size of the crosvm instance by `PAGE_ADJUST` pages, `PAGE_ADJUST` can be negative to shrink the balloon.");
print_help("crosvm balloon", "SIZE VM_SOCKET...", &[]);
println!("Set the ballon size of the crosvm instance to `SIZE` bytes.");
}
let num_pages: i32 = match args.nth(0).unwrap().parse::<i32>() {
let num_bytes = match args.nth(0).unwrap().parse::<u64>() {
Ok(n) => n,
Err(_) => {
error!("Failed to parse number of pages");
error!("Failed to parse number of bytes");
return Err(());
}
};
@ -590,7 +590,7 @@ fn balloon_vms(mut args: std::env::Args) -> std::result::Result<(), ()> {
}) {
Ok(s) => {
let sender = Sender::<VmRequest>::new(s);
if let Err(e) = sender.send(&VmRequest::BalloonAdjust(num_pages)) {
if let Err(e) = sender.send(&VmRequest::BalloonAdjust(num_bytes)) {
error!(
"failed to send balloon request to socket at '{}': {:?}",
socket_path, e

10
vm_control/src/lib.rs
View file

@ -71,8 +71,8 @@ impl MsgOnSocket for MaybeOwnedFd {
/// Unless otherwise noted, each request should expect a `VmResponse::Ok` to be received on success.
#[derive(MsgOnSocket)]
pub enum VmRequest {
/// Try to grow or shrink the VM's balloon.
BalloonAdjust(i32),
/// Set the size of the VM's balloon in bytes.
BalloonAdjust(u64),
/// Break the VM's run loop and exit.
Exit,
/// Register the given ioevent address along with given datamatch to trigger the `EventFd`.
@ -161,10 +161,10 @@ impl VmRequest {
Err(e) => VmResponse::Err(e),
},
VmRequest::BalloonAdjust(num_pages) => {
let mut buf = [0u8; 4];
// write_i32 can't fail as the buffer is 4 bytes long.
let mut buf = [0u8; 8];
// write_u64 can't fail as the buffer is 8 bytes long.
(&mut buf[0..])
.write_i32::<LittleEndian>(num_pages)
.write_u64::<LittleEndian>(num_pages)
.unwrap();
match balloon_host_socket.send(&buf) {
Ok(_) => VmResponse::Ok,