Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 175463
b: refs/heads/master
c: a78d962
h: refs/heads/master
i:
  175461: fd6bd9e
  175459: fe8e16d
  175455: 05aae9b
v: v3
  • Loading branch information
Joe Perches authored and Ingo Molnar committed Dec 10, 2009
1 parent c46a284 commit 53e53b8
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 6 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 40685236b3161b80030a4df34bcbc5941ea59876
refs/heads/master: a78d9626f4f6fa7904bfdb071205080743125983
12 changes: 7 additions & 5 deletions trunk/arch/x86/kvm/i8254.c
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,8 @@
* Based on QEMU and Xen.
*/

#define pr_fmt(fmt) "pit: " fmt

#include <linux/kvm_host.h>

#include "irq.h"
Expand Down Expand Up @@ -262,7 +264,7 @@ void __kvm_migrate_pit_timer(struct kvm_vcpu *vcpu)

static void destroy_pit_timer(struct kvm_timer *pt)
{
pr_debug("pit: execute del timer!\n");
pr_debug("execute del timer!\n");
hrtimer_cancel(&pt->timer);
}

Expand All @@ -284,7 +286,7 @@ static void create_pit_timer(struct kvm_kpit_state *ps, u32 val, int is_period)

interval = muldiv64(val, NSEC_PER_SEC, KVM_PIT_FREQ);

pr_debug("pit: create pit timer, interval is %llu nsec\n", interval);
pr_debug("create pit timer, interval is %llu nsec\n", interval);

/* TODO The new value only affected after the retriggered */
hrtimer_cancel(&pt->timer);
Expand All @@ -309,7 +311,7 @@ static void pit_load_count(struct kvm *kvm, int channel, u32 val)

WARN_ON(!mutex_is_locked(&ps->lock));

pr_debug("pit: load_count val is %d, channel is %d\n", val, channel);
pr_debug("load_count val is %d, channel is %d\n", val, channel);

/*
* The largest possible initial count is 0; this is equivalent
Expand Down Expand Up @@ -395,8 +397,8 @@ static int pit_ioport_write(struct kvm_io_device *this,
mutex_lock(&pit_state->lock);

if (val != 0)
pr_debug("pit: write addr is 0x%x, len is %d, val is 0x%x\n",
(unsigned int)addr, len, val);
pr_debug("write addr is 0x%x, len is %d, val is 0x%x\n",
(unsigned int)addr, len, val);

if (addr == 3) {
channel = val >> 6;
Expand Down

0 comments on commit 53e53b8

Please sign in to comment.