From: Andreas Sandberg <andreas@sandberg.pp.se>
Date: Mon, 3 Mar 2014 13:31:39 +0000 (+0100)
Subject: kvm: Initialize signal handlers from startupThread()
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=739cc0128b666694274b018f303aba452107f8f6;p=gem5.git

kvm: Initialize signal handlers from startupThread()

Signal handlers in KVM are controlled per thread and should be
initialized from the thread that is going to execute the CPU. This
changeset moves the initialization call from startup() to
startupThread().
---

diff --git a/src/cpu/kvm/base.cc b/src/cpu/kvm/base.cc
index 64c1a5e81..26ffe37a5 100644
--- a/src/cpu/kvm/base.cc
+++ b/src/cpu/kvm/base.cc
@@ -138,10 +138,6 @@ BaseKvmCPU::startup()
     // point. Initialize virtual CPUs here instead.
     vcpuFD = vm.createVCPU(vcpuID);
 
-    // Setup signal handlers. This has to be done after the vCPU is
-    // created since it manipulates the vCPU signal mask.
-    setupSignalHandler();
-
     // Map the KVM run structure */
     vcpuMMapSize = kvm.getVCPUMMapSize();
     _kvmRun = (struct kvm_run *)mmap(0, vcpuMMapSize,
@@ -182,6 +178,10 @@ BaseKvmCPU::startupThread()
     const BaseKvmCPUParams * const p(
         dynamic_cast<const BaseKvmCPUParams *>(params()));
 
+    // Setup signal handlers. This has to be done after the vCPU is
+    // created since it manipulates the vCPU signal mask.
+    setupSignalHandler();
+
     setupCounters();
 
     if (p->usePerfOverflow)