From patchwork Mon Jan 16 15:55:36 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kiszka X-Patchwork-Id: 136333 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [140.186.70.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id C74E21007D2 for ; Tue, 17 Jan 2012 04:31:54 +1100 (EST) Received: from localhost ([::1]:48728 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Rmovg-0002hr-E3 for incoming@patchwork.ozlabs.org; Mon, 16 Jan 2012 10:57:04 -0500 Received: from eggs.gnu.org ([140.186.70.92]:54727) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Rmoux-0000gm-9v for qemu-devel@nongnu.org; Mon, 16 Jan 2012 10:56:29 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Rmoun-0002oK-6q for qemu-devel@nongnu.org; Mon, 16 Jan 2012 10:56:19 -0500 Received: from goliath.siemens.de ([192.35.17.28]:24702) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Rmoum-0002kO-Ez for qemu-devel@nongnu.org; Mon, 16 Jan 2012 10:56:08 -0500 Received: from mail1.siemens.de (localhost [127.0.0.1]) by goliath.siemens.de (8.13.6/8.13.6) with ESMTP id q0GFtsKE029684; Mon, 16 Jan 2012 16:55:54 +0100 Received: from mchn199C.mchp.siemens.de ([139.25.109.49]) by mail1.siemens.de (8.13.6/8.13.6) with ESMTP id q0GFtqks023489; Mon, 16 Jan 2012 16:55:54 +0100 From: Jan Kiszka To: Avi Kivity , Marcelo Tosatti Date: Mon, 16 Jan 2012 16:55:36 +0100 Message-Id: X-Mailer: git-send-email 1.7.3.4 In-Reply-To: References: In-Reply-To: References: X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6, seldom 2.4 (older, 4) X-Received-From: 192.35.17.28 Cc: Blue Swirl , Anthony Liguori , qemu-devel , kvm@vger.kernel.org, "Michael S. Tsirkin" Subject: [Qemu-devel] [PATCH v7 02/18] kvm: Move kvmclock into hw/kvm folder X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org 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} | 4 ++-- hw/{kvmclock.h => kvm/clock.h} | 0 hw/pc_piix.c | 2 +- 5 files changed, 6 insertions(+), 5 deletions(-) rename hw/{kvmclock.c => kvm/clock.c} (98%) rename hw/{kvmclock.h => kvm/clock.h} (100%) diff --git a/Makefile.target b/Makefile.target index 3261383..974cd72 100644 --- a/Makefile.target +++ b/Makefile.target @@ -228,7 +228,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 @@ -418,7 +418,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 640e815..11edff6 100755 --- a/configure +++ b/configure @@ -3384,6 +3384,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 98% rename from hw/kvmclock.c rename to hw/kvm/clock.c index 5388bc4..5983271 100644 --- a/hw/kvmclock.c +++ b/hw/kvm/clock.c @@ -13,9 +13,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 #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 b70431f..f44f00e 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"