Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm
Pull KVM fix from Paolo Bonzini:
"A simple fix. I'm sending it before the merge window, because it
refines a patch found in your master branch but not yet in the
kvm/next branch that is destined for 4.5"
* tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm:
kvm: x86: only channel 0 of the i8254 is linked to the HPET
+3
-1
+1
arch/x86/kvm/i8254.c
+1
arch/x86/kvm/i8254.c
···
420
420
u8 saved_mode;
421
421
if (hpet_legacy_start) {
422
422
/* save existing mode for later reenablement */
423
+
WARN_ON(channel != 0);
423
424
saved_mode = kvm->arch.vpit->pit_state.channels[0].mode;
424
425
kvm->arch.vpit->pit_state.channels[0].mode = 0xff; /* disable timer */
425
426
pit_load_count(kvm, channel, val);
+2
-1
arch/x86/kvm/x86.c
+2
-1
arch/x86/kvm/x86.c
···
3606
3606
sizeof(kvm->arch.vpit->pit_state.channels));
3607
3607
kvm->arch.vpit->pit_state.flags = ps->flags;
3608
3608
for (i = 0; i < 3; i++)
3609
-
kvm_pit_load_count(kvm, i, kvm->arch.vpit->pit_state.channels[i].count, start);
3609
+
kvm_pit_load_count(kvm, i, kvm->arch.vpit->pit_state.channels[i].count,
3610
+
start && i == 0);
3610
3611
mutex_unlock(&kvm->arch.vpit->pit_state.lock);
3611
3612
return 0;
3612
3613
}