Skip to content

Commit 2bbe85c

Browse files
Chuanxiao DongCommit Bot
Chuanxiao Dong
authored and
Commit Bot
committed
linux: Fix a recent regression of ACPI S1 suspending issue
Let main thread do the io_notify when the current run_mode is Running. The previous implementation is to check if the last run_mode is suspending or not. As here the checking object is the current run_mode, so should use Running instead of Suspending. BUG=chromium:1149266 TEST=boot a VM and do a suspend/resume test through both ways of the socket and "#echo standby > /sys/power/state". VM can be suspended and resumed back. Change-Id: Iae187a18c707e5da0cfd1e241130a0981fb902ae Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/crosvm/+/2534253 Reviewed-by: Keiichi Watanabe <[email protected]> Reviewed-by: Dylan Reid <[email protected]> Reviewed-by: Tomasz Jeznach <[email protected]> Reviewed-by: Daniel Verkamp <[email protected]> Tested-by: kokoro <[email protected]> Commit-Queue: Chuanxiao Dong <[email protected]> Commit-Queue: Dylan Reid <[email protected]>
1 parent 4e464ae commit 2bbe85c

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

src/linux.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2614,7 +2614,7 @@ fn run_control<V: VmArch + 'static, Vcpu: VcpuArch + 'static, I: IrqChipArch + '
26142614
break 'wait;
26152615
}
26162616
other => {
2617-
if other == VmRunMode::Suspending {
2617+
if other == VmRunMode::Running {
26182618
linux.io_bus.notify_resume();
26192619
}
26202620
for (handle, channel) in &vcpu_handles {

0 commit comments

Comments
 (0)