The compilation of kvm-userspace part fails if the in-kernel pit is not
detected in <linux/kvm.h> with the following error message:
pc.o: In function `pc_init1':
/home/jroedel/src/kvm/kvm-userspace/qemu/hw/pc.c:987: undefined reference to
`kvm_pit_init'
collect2: ld returned 1 exit status
This patch fixes this little issue.
Signed-off-by: Joerg Roedel <[EMAIL PROTECTED]>
---
qemu/configure | 1 +
qemu/hw/pc.c | 2 ++
2 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/qemu/configure b/qemu/configure
index ca9bce2..bfbd93c 100755
--- a/qemu/configure
+++ b/qemu/configure
@@ -1187,6 +1187,7 @@ configure_kvm() {
echo "CONFIG_KVM_KERNEL_INC=$kernel_path/include" >> $config_mak
if test $kvm_cap_pit = "yes" ; then
echo "USE_KVM_PIT=1" >> $config_mak
+ echo "#define USE_KVM_PIT 1" >> $config_h
fi
disable_cpu_emulation
fi
diff --git a/qemu/hw/pc.c b/qemu/hw/pc.c
index 859d7db..aa9afea 100644
--- a/qemu/hw/pc.c
+++ b/qemu/hw/pc.c
@@ -983,9 +983,11 @@ static void pc_init1(ram_addr_t ram_size, int vga_ram_size,
if (pci_enabled) {
ioapic = ioapic_init();
}
+#ifdef USE_KVM_PIT
if (kvm_enabled() && qemu_kvm_pit_in_kernel())
pit = kvm_pit_init(0x40, i8259[0]);
else
+#endif
pit = pit_init(0x40, i8259[0]);
pcspk_init(pit);
if (pci_enabled) {
--
1.5.2.5
-------------------------------------------------------------------------
This SF.net email is sponsored by the 2008 JavaOne(SM) Conference
Don't miss this year's exciting event. There's still time to save $100.
Use priority code J8TL2D2.
http://ad.doubleclick.net/clk;198757673;13503038;p?http://java.sun.com/javaone
_______________________________________________
kvm-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/kvm-devel
