KVM: x86: Consolidate PIT legacy test (a647795e) · Commits · 戴 / test

Move the test for KVM_PIT_FLAGS_HPET_LEGACY into create_pit_timer instead of replicating it on the caller site. Signed-off-by:

arch/x86/kvm/i8254.c

+3 −7

Original line number	Diff line number	Diff line
		@@ -344,7 +344,7 @@ static void create_pit_timer(struct kvm *kvm, u32 val, int is_period)
		struct kvm_timer *pt = &ps->pit_timer;
		s64 interval;

		if (!irqchip_in_kernel(kvm))
		if (!irqchip_in_kernel(kvm) \|\| ps->flags & KVM_PIT_FLAGS_HPET_LEGACY)
		return;

		interval = muldiv64(val, NSEC_PER_SEC, KVM_PIT_FREQ);
		@@ -397,15 +397,11 @@ static void pit_load_count(struct kvm *kvm, int channel, u32 val)
		case 1:
		/* FIXME: enhance mode 4 precision */
		case 4:
		if (!(ps->flags & KVM_PIT_FLAGS_HPET_LEGACY)) {
		create_pit_timer(kvm, val, 0);
		}
		break;
		case 2:
		case 3:
		if (!(ps->flags & KVM_PIT_FLAGS_HPET_LEGACY)){
		create_pit_timer(kvm, val, 1);
		}
		break;
		default:
		destroy_pit_timer(kvm->arch.vpit);