diff options
| author | Jan Kiszka <jan.kiszka@siemens.com> | 2012-01-27 13:53:08 +0100 |
|---|---|---|
| committer | Jan Kiszka <jan.kiszka@siemens.com> | 2012-01-27 13:53:08 +0100 |
| commit | bce7513c0409056080754d9c3b5c2bd39ad5fcad (patch) | |
| tree | d272e14774c2d1399c0f66d038c15fd0ade8a584 /target-i386 | |
| parent | b040f9d99a2a9def038a519ff6775771e3c23dc0 (diff) | |
| parent | 84b058d7df1e75543ef7422d97b039cd413f68f1 (diff) | |
| download | qemu-kvm-bce7513c0409056080754d9c3b5c2bd39ad5fcad.tar.gz | |
Merge commit '84b058d7df1e75543ef7422d97b039cd413f68f1' into queues/qemu-merge
Conflicts:
kvm-all.c
kvm.h
target-i386/kvm.c
Diffstat (limited to 'target-i386')
| -rw-r--r-- | target-i386/kvm.c | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/target-i386/kvm.c b/target-i386/kvm.c index a17c209212f..8bda67dcd4d 100644 --- a/target-i386/kvm.c +++ b/target-i386/kvm.c @@ -1981,4 +1981,17 @@ bool kvm_arch_stop_on_emulation_error(CPUState *env) ((env->segs[R_CS].selector & 3) != 3); } +#ifdef UNUSED_UPSTREAM_KVM +void kvm_arch_init_irq_routing(KVMState *s) +{ + if (!kvm_check_extension(s, KVM_CAP_IRQ_ROUTING)) { + /* If kernel can't do irq routing, interrupt source + * override 0->2 cannot be set up as required by HPET. + * So we have to disable it. + */ + no_hpet = 1; + } +} +#endif + #include "qemu-kvm-x86.c" |