@@ -147,8 +147,6 @@ LIBS := $(libs_softmmu) $(LIBS)
# xen support
obj-$(CONFIG_XEN) += xen-common.o
obj-$(CONFIG_XEN_I386) += xen-hvm.o xen-mapcache.o
-obj-$(call lnot,$(CONFIG_XEN)) += xen-common-stub.o
-obj-$(call lnot,$(CONFIG_XEN_I386)) += xen-hvm-stub.o
# Hardware support
ifeq ($(TARGET_NAME), sparc64)
similarity index 100%
rename from xen-hvm-stub.c
rename to stubs/xen-hvm.c
similarity index 100%
rename from xen-common-stub.c
rename to stubs/xen.c
@@ -50,3 +50,5 @@ stub-obj-y += smbios_type_38.o
stub-obj-y += ipmi.o
stub-obj-y += pc_madt_cpu_entry.o
stub-obj-y += migration-colo.o
+stub-obj-y += xen.o
+stub-obj-y += xen-hvm.o
Move xen stubs to stubs/ so they are handled automatically by libqemustub.a. Cc: Stefano Stabellini <sstabellini@kernel.org> Cc: Anthony Perard <anthony.perard@citrix.com> Cc: xen-devel@lists.xensource.com Cc: Paolo Bonzini <pbonzini@redhat.com> Signed-off-by: Eduardo Habkost <ehabkost@redhat.com> --- Makefile.target | 2 -- xen-hvm-stub.c => stubs/xen-hvm.c | 0 xen-common-stub.c => stubs/xen.c | 0 stubs/Makefile.objs | 2 ++ 4 files changed, 2 insertions(+), 2 deletions(-) rename xen-hvm-stub.c => stubs/xen-hvm.c (100%) rename xen-common-stub.c => stubs/xen.c (100%)