From: Avi Kivity <a...@redhat.com>

So we can retire the kvm/kernel/ directory.

Signed-off-by: Avi Kivity <a...@redhat.com>

diff --git a/configure b/configure
index 4b2ab89..cc7f9f1 100755
--- a/configure
+++ b/configure
@@ -849,8 +849,8 @@ kvm_cflags=""
 
 if test "$kvm" = "yes" ; then
 
-kvm_cflags="-I$source_path/kvm/kernel/include"
-kvm_cflags="$kvm_cflags -I$source_path/kvm/kernel/arch/$kvm_arch/include"
+kvm_cflags="-I$source_path/kvm/include"
+kvm_cflags="$kvm_cflags -I$source_path/kvm/include/$kvm_arch"
 
 # test for KVM_CAP_PIT
 
diff --git a/kvm/kernel/arch/ia64/include/asm/kvm.h b/kvm/include/ia64/asm/kvm.h
similarity index 100%
rename from kvm/kernel/arch/ia64/include/asm/kvm.h
rename to kvm/include/ia64/asm/kvm.h
diff --git a/kvm/kernel/arch/ia64/include/asm/kvm_host.h 
b/kvm/include/ia64/asm/kvm_host.h
similarity index 100%
rename from kvm/kernel/arch/ia64/include/asm/kvm_host.h
rename to kvm/include/ia64/asm/kvm_host.h
diff --git a/kvm/kernel/arch/ia64/include/asm/kvm_para.h 
b/kvm/include/ia64/asm/kvm_para.h
similarity index 100%
rename from kvm/kernel/arch/ia64/include/asm/kvm_para.h
rename to kvm/include/ia64/asm/kvm_para.h
diff --git a/kvm/kernel/include/linux/kvm.h b/kvm/include/linux/kvm.h
similarity index 100%
rename from kvm/kernel/include/linux/kvm.h
rename to kvm/include/linux/kvm.h
diff --git a/kvm/kernel/include/linux/kvm_host.h b/kvm/include/linux/kvm_host.h
similarity index 100%
rename from kvm/kernel/include/linux/kvm_host.h
rename to kvm/include/linux/kvm_host.h
diff --git a/kvm/kernel/include/linux/kvm_para.h b/kvm/include/linux/kvm_para.h
similarity index 100%
rename from kvm/kernel/include/linux/kvm_para.h
rename to kvm/include/linux/kvm_para.h
diff --git a/kvm/kernel/include/linux/kvm_types.h 
b/kvm/include/linux/kvm_types.h
similarity index 100%
rename from kvm/kernel/include/linux/kvm_types.h
rename to kvm/include/linux/kvm_types.h
diff --git a/kvm/kernel/arch/powerpc/include/asm/kvm.h 
b/kvm/include/powerpc/asm/kvm.h
similarity index 100%
rename from kvm/kernel/arch/powerpc/include/asm/kvm.h
rename to kvm/include/powerpc/asm/kvm.h
diff --git a/kvm/kernel/arch/powerpc/include/asm/kvm_44x.h 
b/kvm/include/powerpc/asm/kvm_44x.h
similarity index 100%
rename from kvm/kernel/arch/powerpc/include/asm/kvm_44x.h
rename to kvm/include/powerpc/asm/kvm_44x.h
diff --git a/kvm/kernel/arch/powerpc/include/asm/kvm_asm.h 
b/kvm/include/powerpc/asm/kvm_asm.h
similarity index 100%
rename from kvm/kernel/arch/powerpc/include/asm/kvm_asm.h
rename to kvm/include/powerpc/asm/kvm_asm.h
diff --git a/kvm/kernel/arch/powerpc/include/asm/kvm_e500.h 
b/kvm/include/powerpc/asm/kvm_e500.h
similarity index 100%
rename from kvm/kernel/arch/powerpc/include/asm/kvm_e500.h
rename to kvm/include/powerpc/asm/kvm_e500.h
diff --git a/kvm/kernel/arch/powerpc/include/asm/kvm_host.h 
b/kvm/include/powerpc/asm/kvm_host.h
similarity index 100%
rename from kvm/kernel/arch/powerpc/include/asm/kvm_host.h
rename to kvm/include/powerpc/asm/kvm_host.h
diff --git a/kvm/kernel/arch/powerpc/include/asm/kvm_para.h 
b/kvm/include/powerpc/asm/kvm_para.h
similarity index 100%
rename from kvm/kernel/arch/powerpc/include/asm/kvm_para.h
rename to kvm/include/powerpc/asm/kvm_para.h
diff --git a/kvm/kernel/arch/powerpc/include/asm/kvm_ppc.h 
b/kvm/include/powerpc/asm/kvm_ppc.h
similarity index 100%
rename from kvm/kernel/arch/powerpc/include/asm/kvm_ppc.h
rename to kvm/include/powerpc/asm/kvm_ppc.h
diff --git a/kvm/kernel/arch/x86/include/asm/kvm.h b/kvm/include/x86/asm/kvm.h
similarity index 100%
rename from kvm/kernel/arch/x86/include/asm/kvm.h
rename to kvm/include/x86/asm/kvm.h
diff --git a/kvm/kernel/arch/x86/include/asm/kvm_host.h 
b/kvm/include/x86/asm/kvm_host.h
similarity index 100%
rename from kvm/kernel/arch/x86/include/asm/kvm_host.h
rename to kvm/include/x86/asm/kvm_host.h
diff --git a/kvm/kernel/arch/x86/include/asm/kvm_para.h 
b/kvm/include/x86/asm/kvm_para.h
similarity index 100%
rename from kvm/kernel/arch/x86/include/asm/kvm_para.h
rename to kvm/include/x86/asm/kvm_para.h
diff --git a/kvm/kernel/arch/x86/include/asm/kvm_x86_emulate.h 
b/kvm/include/x86/asm/kvm_x86_emulate.h
similarity index 100%
rename from kvm/kernel/arch/x86/include/asm/kvm_x86_emulate.h
rename to kvm/include/x86/asm/kvm_x86_emulate.h
diff --git a/kvm/kernel/arch/x86/include/asm/svm.h b/kvm/include/x86/asm/svm.h
similarity index 100%
rename from kvm/kernel/arch/x86/include/asm/svm.h
rename to kvm/include/x86/asm/svm.h
diff --git a/kvm/kernel/arch/x86/include/asm/virtext.h 
b/kvm/include/x86/asm/virtext.h
similarity index 100%
rename from kvm/kernel/arch/x86/include/asm/virtext.h
rename to kvm/include/x86/asm/virtext.h
diff --git a/kvm/kernel/arch/x86/include/asm/vmx.h b/kvm/include/x86/asm/vmx.h
similarity index 100%
rename from kvm/kernel/arch/x86/include/asm/vmx.h
rename to kvm/include/x86/asm/vmx.h
--
To unsubscribe from this list: send the line "unsubscribe kvm-commits" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to