From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:56115) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RWnbN-00026Z-99 for qemu-devel@nongnu.org; Sat, 03 Dec 2011 06:17:57 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RWnbL-0002dh-GH for qemu-devel@nongnu.org; Sat, 03 Dec 2011 06:17:53 -0500 Received: from fmmailgate03.web.de ([217.72.192.234]:56660) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RWnbL-0002d3-5O for qemu-devel@nongnu.org; Sat, 03 Dec 2011 06:17:51 -0500 Received: from moweb001.kundenserver.de (moweb001.kundenserver.de [172.19.20.114]) by fmmailgate03.web.de (Postfix) with ESMTP id 0DA4C1AB327EA for ; Sat, 3 Dec 2011 12:17:50 +0100 (CET) From: Jan Kiszka Date: Sat, 3 Dec 2011 12:17:27 +0100 Message-Id: In-Reply-To: References: In-Reply-To: References: Subject: [Qemu-devel] [RFC][PATCH 02/16] kvm: Move kvmclock into hw/kvm folder List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Avi Kivity , Marcelo Tosatti Cc: Blue Swirl , Anthony Liguori , qemu-devel , kvm@vger.kernel.org, "Michael S. Tsirkin" From: Jan Kiszka More KVM-specific devices will come, so let's start with moving the kvmclock into a dedicated folder. Signed-off-by: Jan Kiszka --- Makefile.target | 4 ++-- configure | 1 + hw/{kvmclock.c => kvm/clock.c} | 10 +++++----- hw/{kvmclock.h => kvm/clock.h} | 0 hw/pc_piix.c | 2 +- 5 files changed, 9 insertions(+), 8 deletions(-) rename hw/{kvmclock.c => kvm/clock.c} (96%) rename hw/{kvmclock.h => kvm/clock.h} (100%) diff --git a/Makefile.target b/Makefile.target index 1e90df7..3a9e95d 100644 --- a/Makefile.target +++ b/Makefile.target @@ -231,7 +231,7 @@ obj-i386-y += vmport.o obj-i386-y += device-hotplug.o 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 @@ -421,7 +421,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 diff --git a/configure b/configure index 4f87e0a..d768e44 100755 --- a/configure +++ b/configure @@ -3220,6 +3220,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 similarity index 96% rename from hw/kvmclock.c rename to hw/kvm/clock.c index 5388bc4..aa37c5d 100644 --- a/hw/kvmclock.c +++ b/hw/kvm/clock.c @@ -11,11 +11,11 @@ * */ -#include "qemu-common.h" -#include "sysemu.h" -#include "sysbus.h" -#include "kvm.h" -#include "kvmclock.h" +#include +#include +#include +#include +#include #include #include diff --git a/hw/kvmclock.h b/hw/kvm/clock.h similarity index 100% rename from hw/kvmclock.h rename to hw/kvm/clock.h diff --git a/hw/pc_piix.c b/hw/pc_piix.c index c89042f..22997b0 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" -- 1.7.3.4