diff options
| -rw-r--r-- | Makefile.target | 4 | ||||
| -rwxr-xr-x | configure | 1 | ||||
| -rw-r--r-- | hw/kvm/clock.c (renamed from hw/kvmclock.c) | 4 | ||||
| -rw-r--r-- | hw/kvm/clock.h (renamed from hw/kvmclock.h) | 0 | ||||
| -rw-r--r-- | hw/pc_piix.c | 2 |
5 files changed, 6 insertions, 5 deletions
diff --git a/Makefile.target b/Makefile.target index 798dd30fe..0451b637d 100644 --- a/Makefile.target +++ b/Makefile.target @@ -233,7 +233,7 @@ obj-i386-y += vmport.o obj-i386-y += pci-hotplug.o smbios.o wdt_ib700.o obj-i386-y += debugcon.o multiboot.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 # shared objects @@ -424,7 +424,7 @@ qmp-commands-old.h: $(SRC_PATH)/qmp-commands.hx clean: 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 ifdef CONFIG_TRACE_SYSTEMTAP rm -f *.stp @@ -3363,6 +3363,7 @@ mkdir -p $target_dir/fpu mkdir -p $target_dir/tcg mkdir -p $target_dir/ide 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 mkdir -p $target_dir/nwfpe fi diff --git a/hw/kvmclock.c b/hw/kvm/clock.c index 3b9fb2049..bb28c088d 100644 --- a/hw/kvmclock.c +++ b/hw/kvm/clock.c @@ -15,9 +15,9 @@ #include "qemu-common.h" #include "sysemu.h" -#include "sysbus.h" #include "kvm.h" -#include "kvmclock.h" +#include "hw/sysbus.h" +#include "hw/kvm/clock.h" #include <linux/kvm.h> #include <linux/kvm_para.h> diff --git a/hw/kvmclock.h b/hw/kvm/clock.h index 252ea1346..252ea1346 100644 --- a/hw/kvmclock.h +++ b/hw/kvm/clock.h diff --git a/hw/pc_piix.c b/hw/pc_piix.c index 3aea3cc9d..cde810db2 100644 --- a/hw/pc_piix.c +++ b/hw/pc_piix.c @@ -34,7 +34,7 @@ #include "boards.h" #include "ide.h" #include "kvm.h" -#include "kvmclock.h" +#include "kvm/clock.h" #include "sysemu.h" #include "sysbus.h" #include "arch_init.h" |