summary refs log tree commit diff
path: root/src/plugin
diff options
context:
space:
mode:
authorMatt Delco <delco@chromium.org>2019-09-25 10:51:20 -0700
committerCommit Bot <commit-bot@chromium.org>2019-10-23 06:21:58 +0000
commit3156937410b99e7b27283c6dc566e72ca4de53ab (patch)
tree946118c7993251869106d1c03568ec46a9807179 /src/plugin
parent4fad33b679e0d4230f5bf0a6b8365321c1ef6e60 (diff)
downloadcrosvm-3156937410b99e7b27283c6dc566e72ca4de53ab.tar
crosvm-3156937410b99e7b27283c6dc566e72ca4de53ab.tar.gz
crosvm-3156937410b99e7b27283c6dc566e72ca4de53ab.tar.bz2
crosvm-3156937410b99e7b27283c6dc566e72ca4de53ab.tar.lz
crosvm-3156937410b99e7b27283c6dc566e72ca4de53ab.tar.xz
crosvm-3156937410b99e7b27283c6dc566e72ca4de53ab.tar.zst
crosvm-3156937410b99e7b27283c6dc566e72ca4de53ab.zip
crosvm: delete resume response from protobuf
The resume response was deleted in a earlier change.  This change
removes the message type from the proto file and adjusts crosvm
so it can still build after this removal.

BUG=None
TEST=build and run.

Change-Id: I27d36a51b1e7eb59258d23da38199b86d7cb3659
Signed-off-by: Matt Delco <delco@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/crosvm/+/1825260
Reviewed-by: Zach Reizner <zachr@chromium.org>
Reviewed-by: Dylan Reid <dgreid@chromium.org>
Diffstat (limited to 'src/plugin')
-rw-r--r--src/plugin/vcpu.rs5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/plugin/vcpu.rs b/src/plugin/vcpu.rs
index c9d811a..5ca27da 100644
--- a/src/plugin/vcpu.rs
+++ b/src/plugin/vcpu.rs
@@ -396,6 +396,7 @@ impl PluginVcpu {
         let mut do_recv = true;
         let mut resume_data = None;
         let mut response = VcpuResponse::new();
+        let mut send_response = true;
 
         // Typically a response is sent for every request received.  The odd (yet common)
         // case is when a resume request is received.  This function will skip sending
@@ -442,7 +443,7 @@ impl PluginVcpu {
                 self.wait_reason.set(wait_reason);
                 Err(SysError::new(EPROTO))
             } else if request.has_resume() {
-                response.mut_resume();
+                send_response = false;
                 resume_data = Some(request.take_resume().take_data());
                 Ok(())
             } else if request.has_get_state() {
@@ -540,7 +541,7 @@ impl PluginVcpu {
 
         // Send the response, except if it's a resume response (in which case
         // we'll go run the VM and afterwards send a wait response message).
-        if !response.has_resume() {
+        if send_response {
             let mut response_buffer = self.response_buffer.borrow_mut();
             response_buffer.clear();
             response