From e2fd7b21be44aa852351a1a1f1e8cc22b76d140a Mon Sep 17 00:00:00 2001
From: Haitao Shan <hshan@google.com>
Date: Wed, 29 Nov 2017 11:04:59 -0800
Subject: [PATCH] Fix emulator hang during adb reboot. Bug 69798912

Change-Id: I26e116194e3fb2a5570bd2654e111307a14cc161
Signed-off-by: Haitao Shan <hshan@google.com>
---
 target/i386/hvf/hvf.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/target/i386/hvf/hvf.c b/target/i386/hvf/hvf.c
index df69e6d0a7..ce31bc88f8 100644
--- a/target/i386/hvf/hvf.c
+++ b/target/i386/hvf/hvf.c
@@ -293,6 +293,7 @@ static void do_hvf_cpu_synchronize_post_reset(CPUState *cpu, run_on_cpu_data arg
 {
     CPUState *cpu_state = cpu;
     hvf_put_registers(cpu_state);
+    wvmcs(cpu_state->hvf_fd, VMCS_ENTRY_CTLS, 0);
     cpu_state->vcpu_dirty = false;
 }