summaryrefslogtreecommitdiffstats
path: root/arch/x86/kvm
diff options
context:
space:
mode:
authorGlauber Costa2009-04-29 23:29:09 +0200
committerAvi Kivity2009-06-10 10:48:50 +0200
commit9b5843ddd20557b77c73ddbcc814a8c816bf3d3a (patch)
treeaec862c5978c8f06d42f64d0dd91ed69896482c1 /arch/x86/kvm
parentKVM: Trivial format fix in setup_routing_entry() (diff)
downloadkernel-qcow2-linux-9b5843ddd20557b77c73ddbcc814a8c816bf3d3a.tar.gz
kernel-qcow2-linux-9b5843ddd20557b77c73ddbcc814a8c816bf3d3a.tar.xz
kernel-qcow2-linux-9b5843ddd20557b77c73ddbcc814a8c816bf3d3a.zip
KVM: fix apic_debug instances
Apparently nobody turned this on in a while... setting apic_debug to something compilable, generates some errors. This patch fixes it. Signed-off-by: Glauber Costa <glommer@redhat.com> Signed-off-by: Avi Kivity <avi@redhat.com>
Diffstat (limited to 'arch/x86/kvm')
-rw-r--r--arch/x86/kvm/lapic.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/kvm/lapic.c b/arch/x86/kvm/lapic.c
index 4d76bb6c5e51..ae99d83f81a3 100644
--- a/arch/x86/kvm/lapic.c
+++ b/arch/x86/kvm/lapic.c
@@ -445,7 +445,7 @@ static void apic_send_ipi(struct kvm_lapic *apic)
apic_debug("icr_high 0x%x, icr_low 0x%x, "
"short_hand 0x%x, dest 0x%x, trig_mode 0x%x, level 0x%x, "
"dest_mode 0x%x, delivery_mode 0x%x, vector 0x%x\n",
- icr_high, icr_low, irq.shorthand, irq.dest,
+ icr_high, icr_low, irq.shorthand, irq.dest_id,
irq.trig_mode, irq.level, irq.dest_mode, irq.delivery_mode,
irq.vector);
@@ -560,7 +560,7 @@ static void update_divide_count(struct kvm_lapic *apic)
apic->divide_count = 0x1 << (tmp2 & 0x7);
apic_debug("timer divide count is 0x%x\n",
- apic->lapic_timer.divide_count);
+ apic->divide_count);
}
static void start_apic_timer(struct kvm_lapic *apic)