diff options
author | Jan Kiszka <jan.kiszka@siemens.com> | 2010-03-12 15:20:49 +0100 |
---|---|---|
committer | Marcelo Tosatti <mtosatti@redhat.com> | 2010-04-26 11:28:35 -0300 |
commit | ff44f1a3737bfda3cac294b8e92d8ec5ddf3abf5 (patch) | |
tree | 0ed0db251b75b3f0902cb3a2421544fc49297b73 /target-i386 | |
parent | a303f9e37b87ced34e966dc2c0b7f86bc5e74035 (diff) | |
download | qemu-ff44f1a3737bfda3cac294b8e92d8ec5ddf3abf5.zip qemu-ff44f1a3737bfda3cac294b8e92d8ec5ddf3abf5.tar.gz qemu-ff44f1a3737bfda3cac294b8e92d8ec5ddf3abf5.tar.bz2 |
KVM: x86: Add debug register saving and restoring
Make use of the new KVM_GET/SET_DEBUGREGS to save/restore the x86 debug
registers.
Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
Diffstat (limited to 'target-i386')
-rw-r--r-- | target-i386/kvm.c | 55 |
1 files changed, 55 insertions, 0 deletions
diff --git a/target-i386/kvm.c b/target-i386/kvm.c index 5513472..bb6dafa 100644 --- a/target-i386/kvm.c +++ b/target-i386/kvm.c @@ -874,6 +874,53 @@ static int kvm_guest_debug_workarounds(CPUState *env) return ret; } +static int kvm_put_debugregs(CPUState *env) +{ +#ifdef KVM_CAP_DEBUGREGS + struct kvm_debugregs dbgregs; + int i; + + if (!kvm_has_debugregs()) { + return 0; + } + + for (i = 0; i < 4; i++) { + dbgregs.db[i] = env->dr[i]; + } + dbgregs.dr6 = env->dr[6]; + dbgregs.dr7 = env->dr[7]; + dbgregs.flags = 0; + + return kvm_vcpu_ioctl(env, KVM_SET_DEBUGREGS, &dbgregs); +#else + return 0; +#endif +} + +static int kvm_get_debugregs(CPUState *env) +{ +#ifdef KVM_CAP_DEBUGREGS + struct kvm_debugregs dbgregs; + int i, ret; + + if (!kvm_has_debugregs()) { + return 0; + } + + ret = kvm_vcpu_ioctl(env, KVM_GET_DEBUGREGS, &dbgregs); + if (ret < 0) { + return ret; + } + for (i = 0; i < 4; i++) { + env->dr[i] = dbgregs.db[i]; + } + env->dr[4] = env->dr[6] = dbgregs.dr6; + env->dr[5] = env->dr[7] = dbgregs.dr7; +#endif + + return 0; +} + int kvm_arch_put_registers(CPUState *env, int level) { int ret; @@ -909,6 +956,10 @@ int kvm_arch_put_registers(CPUState *env, int level) if (ret < 0) return ret; + ret = kvm_put_debugregs(env); + if (ret < 0) + return ret; + return 0; } @@ -940,6 +991,10 @@ int kvm_arch_get_registers(CPUState *env) if (ret < 0) return ret; + ret = kvm_get_debugregs(env); + if (ret < 0) + return ret; + return 0; } |