[Qemu-devel] [RFC 5/7] kvm: Move kvm*.c files to accel/

[Eduardo Habkost <ehabkost@redhat.com>]

While doing it, rename kvm-all.c to kvm-common.c to follow the
same pattern used for xen.

Cc: Paolo Bonzini <pbonzini@redhat.com>
Cc: kvm@vger.kernel.org
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
---
 Makefile.target                 | 2 --
 kvm-all.c => accel/kvm-common.c | 0
 kvm-stub.c => accel/kvm-stub.c  | 0
 MAINTAINERS                     | 3 +--
 accel/Makefile.objs             | 3 +++
 5 files changed, 4 insertions(+), 4 deletions(-)
 rename kvm-all.c => accel/kvm-common.c (100%)
 rename kvm-stub.c => accel/kvm-stub.c (100%)

diff --git a/Makefile.target b/Makefile.target
index 5e78bb0..70a1261 100644
--- a/Makefile.target
+++ b/Makefile.target
@@ -136,8 +136,6 @@ ifdef CONFIG_SOFTMMU
 obj-y += arch_init.o cpus.o monitor.o gdbstub.o balloon.o ioport.o numa.o
 obj-y += qtest.o bootdevice.o
 obj-y += hw/
-obj-$(CONFIG_KVM) += kvm-all.o
-obj-$(call lnot,$(CONFIG_KVM)) += kvm-stub.o
 obj-y += memory.o cputlb.o
 obj-y += memory_mapping.o
 obj-y += dump.o
diff --git a/kvm-all.c b/accel/kvm-common.c
similarity index 100%
rename from kvm-all.c
rename to accel/kvm-common.c
diff --git a/kvm-stub.c b/accel/kvm-stub.c
similarity index 100%
rename from kvm-stub.c
rename to accel/kvm-stub.c
diff --git a/MAINTAINERS b/MAINTAINERS
index 8e25438..9c6dae9 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -261,8 +261,7 @@ Overall
 M: Paolo Bonzini <pbonzini@redhat.com>
 L: kvm@vger.kernel.org
 S: Supported
-F: kvm-*
-F: */kvm.*
+F: */kvm*
 F: include/sysemu/kvm*.h
 
 ARM
diff --git a/accel/Makefile.objs b/accel/Makefile.objs
index 6f3630e..3f3866d 100644
--- a/accel/Makefile.objs
+++ b/accel/Makefile.objs
@@ -1,2 +1,5 @@
 obj-$(CONFIG_XEN) += xen-common.o
 obj-$(CONFIG_XEN_I386) += xen-hvm.o xen-mapcache.o
+
+obj-$(CONFIG_KVM) += kvm-common.o
+obj-$(call lnot,$(CONFIG_KVM)) += kvm-stub.o
-- 
2.7.4