Merge pull request #20 from nmi/handle_eintr_kvm_run

machine: handle return code EINTR for ioctl KVM_RUN
bobuhiro11 · Feb 21, 2021 · d6540da · d6540da
2 parents 194b575 + 5879bb8
commit d6540da
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/kvm/kvm.go b/kvm/kvm.go
@@ -120,7 +120,8 @@ type Descriptor struct {
 
 type RunData struct {
 	RequestInterruptWindow     uint8
-	_                          [7]uint8
+	ImmediateExit              uint8
+	_                          [6]uint8
 	ExitReason                 uint32
 	ReadyForInterruptInjection uint8
 	IfFlag                     uint8

diff --git a/machine/machine.go b/machine/machine.go
@@ -293,6 +293,12 @@ func (m *Machine) RunInfiniteLoop() error {
 
 func (m *Machine) RunOnce() (bool, error) {
 	if err := kvm.Run(m.vcpuFd); err != nil {
+		// When a signal is sent to the thread hosting the VM it will result in EINTR
+		// refs https://gist.github.com/mcastelino/df7e65ade874f6890f618dc51778d83a
+		if m.run.ExitReason == kvm.EXITINTR {
+			return true, nil
+		}
+
 		return false, err
 	}