ShuriZma
/
xqemu
mirror of https://github.com/xqemu/xqemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'stefanha/trivial-patches' into staging

This commit is contained in:
Anthony Liguori 2011-08-25 07:50:07 -05:00
parent 8ef9ea85a2 e99722f66a
commit 56a7a874e9
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
disas.c
View File

@ -137,7 +137,7 @@ print_insn_thumb1(bfd_vma pc, disassemble_info *info)
/* Disassemble this for me please... (debugging). 'flags' has the following /* Disassemble this for me please... (debugging). 'flags' has the following
values: values:
i386 - nonzero means 16 bit code i386 - 1 means 16 bit code, 2 means 64 bit code
arm - nonzero means thumb code arm - nonzero means thumb code
ppc - nonzero means little endian ppc - nonzero means little endian
other targets - unused other targets - unused

3
target-i386/kvm.c
View File

@ -501,8 +501,9 @@ int kvm_arch_init_vcpu(CPUState *env)
qemu_add_vm_change_state_handler(cpu_update_state, env); qemu_add_vm_change_state_handler(cpu_update_state, env);
r = kvm_vcpu_ioctl(env, KVM_SET_CPUID2, &cpuid_data); r = kvm_vcpu_ioctl(env, KVM_SET_CPUID2, &cpuid_data);
if (r) if (r) {
return r; return r;
}
r = kvm_check_extension(env->kvm_state, KVM_CAP_TSC_CONTROL); r = kvm_check_extension(env->kvm_state, KVM_CAP_TSC_CONTROL);
if (r && env->tsc_khz) { if (r && env->tsc_khz) {