[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v8 02/18] kvm: Move kvmclock into hw/kvm folder
From: |
Jan Kiszka |
Subject: |
[Qemu-devel] [PATCH v8 02/18] kvm: Move kvmclock into hw/kvm folder |
Date: |
Thu, 19 Jan 2012 12:24:54 +0100 |
More KVM-specific devices will come, so let's start with moving the
kvmclock into a dedicated folder.
Signed-off-by: Jan Kiszka <address@hidden>
---
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 798dd30..0451b63 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
diff --git a/configure b/configure
index 467e87b..9d5175b 100755
--- a/configure
+++ b/configure
@@ -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
similarity index 98%
rename from hw/kvmclock.c
rename to hw/kvm/clock.c
index 3b9fb20..bb28c08 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
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 3aea3cc..cde810d 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
- [Qemu-devel] [PATCH v8 00/18] uq/master: Introduce basic irqchip support, Jan Kiszka, 2012/01/19
- [Qemu-devel] [PATCH v8 14/18] kvm: x86: Establish IRQ0 override control, Jan Kiszka, 2012/01/19
- [Qemu-devel] [PATCH v8 18/18] kvm: Activate in-kernel irqchip support, Jan Kiszka, 2012/01/19
- Re: [Qemu-devel] [PATCH v8 18/18] kvm: Activate in-kernel irqchip support, Marcelo Tosatti, 2012/01/19
- Re: [Qemu-devel] [PATCH v8 18/18] kvm: Activate in-kernel irqchip support, Jan Kiszka, 2012/01/19
- Re: [Qemu-devel] [PATCH v8 18/18] kvm: Activate in-kernel irqchip support, Avi Kivity, 2012/01/24
- Re: [Qemu-devel] [PATCH v8 18/18] kvm: Activate in-kernel irqchip support, Jan Kiszka, 2012/01/24
- Re: [Qemu-devel] [PATCH v8 18/18] kvm: Activate in-kernel irqchip support, Avi Kivity, 2012/01/24
- Re: [Qemu-devel] [PATCH v8 18/18] kvm: Activate in-kernel irqchip support, Anthony Liguori, 2012/01/24
- Re: [Qemu-devel] [PATCH v8 18/18] kvm: Activate in-kernel irqchip support, Anthony Liguori, 2012/01/24
[Qemu-devel] [PATCH v8 02/18] kvm: Move kvmclock into hw/kvm folder,
Jan Kiszka <=
[Qemu-devel] [PATCH v8 04/18] apic: Inject external NMI events via LINT1, Jan Kiszka, 2012/01/19
[Qemu-devel] [PATCH v8 03/18] apic: Stop timer on reset, Jan Kiszka, 2012/01/19
[Qemu-devel] [PATCH v8 01/18] msi: Generalize msix_supported to msi_supported, Jan Kiszka, 2012/01/19
[Qemu-devel] [PATCH v8 10/18] ioapic: Drop post-load irr initialization, Jan Kiszka, 2012/01/19
[Qemu-devel] [PATCH v8 17/18] kvm: x86: Add user space part for in-kernel IOAPIC, Jan Kiszka, 2012/01/19
[Qemu-devel] [PATCH v8 16/18] kvm: x86: Add user space part for in-kernel i8259, Jan Kiszka, 2012/01/19
[Qemu-devel] [PATCH v8 12/18] memory: Introduce memory_region_init_reservation, Jan Kiszka, 2012/01/19
[Qemu-devel] [PATCH v8 07/18] apic: Open-code timer save/restore, Jan Kiszka, 2012/01/19
[Qemu-devel] [PATCH v8 08/18] i8259: Completely privatize PicState, Jan Kiszka, 2012/01/19
[Qemu-devel] [PATCH v8 13/18] kvm: Introduce core services for in-kernel irqchip support, Jan Kiszka, 2012/01/19