kvm: Move kvmclock into hw/kvm folder

More KVM-specific devices will come, so let's start with moving the
kvmclock into a dedicated folder.

Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
This commit is contained in:
Jan Kiszka 2011-10-15 10:01:27 +02:00
parent 60ba3cc231
commit 3b9a6ee50e
5 changed files with 6 additions and 5 deletions

View File

@ -233,7 +233,7 @@ obj-i386-y += vmport.o
obj-i386-y += pci-hotplug.o smbios.o wdt_ib700.o obj-i386-y += pci-hotplug.o smbios.o wdt_ib700.o
obj-i386-y += debugcon.o multiboot.o obj-i386-y += debugcon.o multiboot.o
obj-i386-y += pc_piix.o obj-i386-y += pc_piix.o
obj-i386-$(CONFIG_KVM) += kvmclock.o obj-i386-$(CONFIG_KVM) += kvm/clock.o
obj-i386-$(CONFIG_SPICE) += qxl.o qxl-logger.o qxl-render.o obj-i386-$(CONFIG_SPICE) += qxl.o qxl-logger.o qxl-render.o
# shared objects # shared objects
@ -424,7 +424,7 @@ qmp-commands-old.h: $(SRC_PATH)/qmp-commands.hx
clean: clean:
rm -f *.o *.a *~ $(PROGS) nwfpe/*.o fpu/*.o rm -f *.o *.a *~ $(PROGS) nwfpe/*.o fpu/*.o
rm -f *.d */*.d tcg/*.o ide/*.o 9pfs/*.o rm -f *.d */*.d tcg/*.o ide/*.o 9pfs/*.o kvm/*.o
rm -f hmp-commands.h qmp-commands-old.h gdbstub-xml.c rm -f hmp-commands.h qmp-commands-old.h gdbstub-xml.c
ifdef CONFIG_TRACE_SYSTEMTAP ifdef CONFIG_TRACE_SYSTEMTAP
rm -f *.stp rm -f *.stp

1
configure vendored
View File

@ -3363,6 +3363,7 @@ mkdir -p $target_dir/fpu
mkdir -p $target_dir/tcg mkdir -p $target_dir/tcg
mkdir -p $target_dir/ide mkdir -p $target_dir/ide
mkdir -p $target_dir/9pfs mkdir -p $target_dir/9pfs
mkdir -p $target_dir/kvm
if test "$target" = "arm-linux-user" -o "$target" = "armeb-linux-user" -o "$target" = "arm-bsd-user" -o "$target" = "armeb-bsd-user" ; then if test "$target" = "arm-linux-user" -o "$target" = "armeb-linux-user" -o "$target" = "arm-bsd-user" -o "$target" = "armeb-bsd-user" ; then
mkdir -p $target_dir/nwfpe mkdir -p $target_dir/nwfpe
fi fi

View File

@ -15,9 +15,9 @@
#include "qemu-common.h" #include "qemu-common.h"
#include "sysemu.h" #include "sysemu.h"
#include "sysbus.h"
#include "kvm.h" #include "kvm.h"
#include "kvmclock.h" #include "hw/sysbus.h"
#include "hw/kvm/clock.h"
#include <linux/kvm.h> #include <linux/kvm.h>
#include <linux/kvm_para.h> #include <linux/kvm_para.h>

View File

@ -34,7 +34,7 @@
#include "boards.h" #include "boards.h"
#include "ide.h" #include "ide.h"
#include "kvm.h" #include "kvm.h"
#include "kvmclock.h" #include "kvm/clock.h"
#include "sysemu.h" #include "sysemu.h"
#include "sysbus.h" #include "sysbus.h"
#include "arch_init.h" #include "arch_init.h"