From c950129e3876ac89b15af8f668976aa03142e802 Mon Sep 17 00:00:00 2001 From: Feng(Eric) Liu Date: Thu, 10 Apr 2008 09:15:53 -0400 Subject: [PATCH] kvm: Modify "Kbuild" for kvm trace and ensure that "kvm_stat" can work when kvm trace is enabling by userspace app. Signed-off-by: Feng (Eric) Liu --- kernel/Kbuild | 3 +++ kvm_stat | 3 +++ 2 files changed, 6 insertions(+), 0 deletions(-) diff --git a/kernel/Kbuild b/kernel/Kbuild index 014cc17..e3e97ab 100644 --- a/kernel/Kbuild +++ b/kernel/Kbuild @@ -2,6 +2,9 @@ EXTRA_CFLAGS := -I$(src)/include -include $(src)/external-module-compat.h obj-m := kvm.o kvm-intel.o kvm-amd.o kvm-objs := kvm_main.o x86.o mmu.o x86_emulate.o anon_inodes.o irq.o i8259.o \ lapic.o ioapic.o preempt.o i8254.o +ifeq ($(CONFIG_KVM_TRACE),y) +kvm-objs += kvm_trace.o +endif kvm-intel-objs := vmx.o vmx-debug.o kvm-amd-objs := svm.o diff --git a/kvm_stat b/kvm_stat index 07773b0..9e754b4 100755 --- a/kvm_stat +++ b/kvm_stat @@ -2,12 +2,15 @@ import curses import sys, os, time, optparse +import string class Stats: def __init__(self): self.base = '/sys/kernel/debug/kvm' self.values = {} for key in os.listdir(self.base): + if key.startswith('trace'): + continue self.values[key] = None def get(self): for key, oldval in self.values.iteritems(): -- 1.5.1