diff -r 1236685aaba3 -r 24b2d17c9b85 src/cpu/kvm/vm.hh
--- a/src/cpu/kvm/vm.hh	Thu May 07 11:39:05 2015 +0100
+++ b/src/cpu/kvm/vm.hh	Thu May 07 11:39:14 2015 +0100
@@ -309,17 +309,6 @@
     /** @} */
 
     /**
-     * @addtogroup KvmInterrupts
-     * @{
-     */
-    /**
-     * Create an in-kernel interrupt  controller
-     *
-     * @note This functionality depends on Kvm::capIRQChip().
-     */
-    void createIRQChip();
-
-    /**
      * Set the status of an IRQ line using KVM_IRQ_LINE.
      *
      * @note This ioctl is usually only used if the interrupt
@@ -332,12 +321,6 @@
      */
     void setIRQLine(uint32_t irq, bool high);
 
-    /**
-     * Is in-kernel IRQ chip emulation enabled?
-     */
-    bool hasKernelIRQChip() const { return _hasKernelIRQChip; }
-    /** @} */
-
     struct MemSlot
     {
         MemSlot(uint32_t _num) : num(_num)
@@ -471,9 +454,6 @@
     /** Has delayedStartup() already been called? */
     bool started;
 
-    /** Do we have in-kernel IRQ-chip emulation enabled? */
-    bool _hasKernelIRQChip;
-
     /** Next unallocated vCPU ID */
     long nextVCPUID;
 
diff -r 1236685aaba3 -r 24b2d17c9b85 src/cpu/kvm/vm.cc
--- a/src/cpu/kvm/vm.cc	Thu May 07 11:39:05 2015 +0100
+++ b/src/cpu/kvm/vm.cc	Thu May 07 11:39:14 2015 +0100
@@ -461,21 +461,6 @@
 }
 
 void
-KvmVM::createIRQChip()
-{
-    if (_hasKernelIRQChip)
-        panic("KvmVM::createIRQChip called twice.\n");
-
-    if (ioctl(KVM_CREATE_IRQCHIP) != -1) {
-        _hasKernelIRQChip = true;
-    } else {
-        warn("KVM: Failed to create in-kernel IRQ chip (errno: %i)\n",
-             errno);
-        _hasKernelIRQChip = false;
-    }
-}
-
-void
 KvmVM::setIRQLine(uint32_t irq, bool high)
 {
     struct kvm_irq_level kvm_level;