Instead, include them from upstream files Signed-off-by: Glauber Costa <glommer@xxxxxxxxxx> --- Makefile.target | 5 ++--- kvm-all.c | 2 ++ target-i386/kvm.c | 2 ++ 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/Makefile.target b/Makefile.target index 11a6da8..1c0f4ea 100644 --- a/Makefile.target +++ b/Makefile.target @@ -160,7 +160,6 @@ ifeq ($(ARCH),sparc64) CPPFLAGS+=-I$(SRC_PATH)/tcg/sparc endif -libobj-$(CONFIG_KVM) += qemu-kvm.o ifdef CONFIG_SOFTFLOAT libobj-y += fpu/softfloat.o else @@ -171,13 +170,13 @@ libobj-y += op_helper.o helper.o ifeq ($(TARGET_ARCH), i386) libobj-y += helper.o -libobj-$(CONFIG_KVM) += qemu-kvm-x86.o kvm-tpr-opt.o +libobj-$(CONFIG_KVM) += kvm-tpr-opt.o libobj-$(CONFIG_KVM) += qemu-kvm-helper.o endif ifeq ($(TARGET_ARCH), x86_64) libobj-y += helper.o -libobj-$(CONFIG_KVM) += qemu-kvm-x86.o kvm-tpr-opt.o +libobj-$(CONFIG_KVM) += kvm-tpr-opt.o libobj-$(CONFIG_KVM) += qemu-kvm-helper.o endif diff --git a/kvm-all.c b/kvm-all.c index 4c2fdf5..e42b1f6 100644 --- a/kvm-all.c +++ b/kvm-all.c @@ -1029,3 +1029,5 @@ void kvm_remove_all_breakpoints(CPUState *current_env) } #endif /* !KVM_CAP_SET_GUEST_DEBUG */ #endif + +#include "qemu-kvm.c" diff --git a/target-i386/kvm.c b/target-i386/kvm.c index d26161a..6e9d938 100644 --- a/target-i386/kvm.c +++ b/target-i386/kvm.c @@ -961,3 +961,5 @@ void kvm_arch_update_guest_debug(CPUState *env, struct kvm_guest_debug *dbg) } #endif /* KVM_CAP_SET_GUEST_DEBUG */ #endif + +#include "qemu-kvm-x86.c" -- 1.6.2.2 -- To unsubscribe from this list: send the line "unsubscribe kvm" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
