@@ -54,20 +54,20 @@ CTRL_SRCS-y += xc_devicemodel_compat.c
GUEST_SRCS-y :=
GUEST_SRCS-y += xg_private.c
GUEST_SRCS-y += xg_domain.c
-GUEST_SRCS-y += xc_suspend.c
+GUEST_SRCS-y += xg_suspend.c
ifeq ($(CONFIG_MIGRATE),y)
-GUEST_SRCS-y += xc_sr_common.c
-GUEST_SRCS-$(CONFIG_X86) += xc_sr_common_x86.c
-GUEST_SRCS-$(CONFIG_X86) += xc_sr_common_x86_pv.c
-GUEST_SRCS-$(CONFIG_X86) += xc_sr_restore_x86_pv.c
-GUEST_SRCS-$(CONFIG_X86) += xc_sr_restore_x86_hvm.c
-GUEST_SRCS-$(CONFIG_X86) += xc_sr_save_x86_pv.c
-GUEST_SRCS-$(CONFIG_X86) += xc_sr_save_x86_hvm.c
-GUEST_SRCS-y += xc_sr_restore.c
-GUEST_SRCS-y += xc_sr_save.c
-GUEST_SRCS-y += xc_offline_page.c
+GUEST_SRCS-y += xg_sr_common.c
+GUEST_SRCS-$(CONFIG_X86) += xg_sr_common_x86.c
+GUEST_SRCS-$(CONFIG_X86) += xg_sr_common_x86_pv.c
+GUEST_SRCS-$(CONFIG_X86) += xg_sr_restore_x86_pv.c
+GUEST_SRCS-$(CONFIG_X86) += xg_sr_restore_x86_hvm.c
+GUEST_SRCS-$(CONFIG_X86) += xg_sr_save_x86_pv.c
+GUEST_SRCS-$(CONFIG_X86) += xg_sr_save_x86_hvm.c
+GUEST_SRCS-y += xg_sr_restore.c
+GUEST_SRCS-y += xg_sr_save.c
+GUEST_SRCS-y += xg_offline_page.c
else
-GUEST_SRCS-y += xc_nomigrate.c
+GUEST_SRCS-y += xg_nomigrate.c
endif
vpath %.c ../../xen/common/libelf
@@ -88,25 +88,26 @@ GUEST_SRCS-y += cpuid.c msr.c
endif
# new domain builder
-GUEST_SRCS-y += xc_dom_core.c xc_dom_boot.c
-GUEST_SRCS-y += xc_dom_elfloader.c
-GUEST_SRCS-$(CONFIG_X86) += xc_dom_bzimageloader.c
-GUEST_SRCS-$(CONFIG_X86) += xc_dom_decompress_lz4.c
-GUEST_SRCS-$(CONFIG_X86) += xc_dom_hvmloader.c
-GUEST_SRCS-$(CONFIG_ARM) += xc_dom_armzimageloader.c
-GUEST_SRCS-y += xc_dom_binloader.c
-GUEST_SRCS-y += xc_dom_compat_linux.c
-
-GUEST_SRCS-$(CONFIG_X86) += xc_dom_x86.c
-GUEST_SRCS-$(CONFIG_X86) += xc_cpuid_x86.c
-GUEST_SRCS-$(CONFIG_ARM) += xc_dom_arm.c
+GUEST_SRCS-y += xg_dom_core.c
+GUEST_SRCS-y += xg_dom_boot.c
+GUEST_SRCS-y += xg_dom_elfloader.c
+GUEST_SRCS-$(CONFIG_X86) += xg_dom_bzimageloader.c
+GUEST_SRCS-$(CONFIG_X86) += xg_dom_decompress_lz4.c
+GUEST_SRCS-$(CONFIG_X86) += xg_dom_hvmloader.c
+GUEST_SRCS-$(CONFIG_ARM) += xg_dom_armzimageloader.c
+GUEST_SRCS-y += xg_dom_binloader.c
+GUEST_SRCS-y += xg_dom_compat_linux.c
+
+GUEST_SRCS-$(CONFIG_X86) += xg_dom_x86.c
+GUEST_SRCS-$(CONFIG_X86) += xg_cpuid_x86.c
+GUEST_SRCS-$(CONFIG_ARM) += xg_dom_arm.c
ifeq ($(CONFIG_LIBXC_MINIOS),y)
-GUEST_SRCS-y += xc_dom_decompress_unsafe.c
-GUEST_SRCS-y += xc_dom_decompress_unsafe_bzip2.c
-GUEST_SRCS-y += xc_dom_decompress_unsafe_lzma.c
-GUEST_SRCS-y += xc_dom_decompress_unsafe_lzo1x.c
-GUEST_SRCS-y += xc_dom_decompress_unsafe_xz.c
+GUEST_SRCS-y += xg_dom_decompress_unsafe.c
+GUEST_SRCS-y += xg_dom_decompress_unsafe_bzip2.c
+GUEST_SRCS-y += xg_dom_decompress_unsafe_lzma.c
+GUEST_SRCS-y += xg_dom_decompress_unsafe_lzo1x.c
+GUEST_SRCS-y += xg_dom_decompress_unsafe_xz.c
endif
-include $(XEN_TARGET_ARCH)/Makefile
similarity index 100%
rename from tools/libxc/xc_cpuid_x86.c
rename to tools/libxc/xg_cpuid_x86.c
similarity index 100%
rename from tools/libxc/xc_dom_arm.c
rename to tools/libxc/xg_dom_arm.c
similarity index 100%
rename from tools/libxc/xc_dom_armzimageloader.c
rename to tools/libxc/xg_dom_armzimageloader.c
similarity index 100%
rename from tools/libxc/xc_dom_binloader.c
rename to tools/libxc/xg_dom_binloader.c
similarity index 100%
rename from tools/libxc/xc_dom_boot.c
rename to tools/libxc/xg_dom_boot.c
similarity index 100%
rename from tools/libxc/xc_dom_bzimageloader.c
rename to tools/libxc/xg_dom_bzimageloader.c
similarity index 100%
rename from tools/libxc/xc_dom_compat_linux.c
rename to tools/libxc/xg_dom_compat_linux.c
similarity index 100%
rename from tools/libxc/xc_dom_core.c
rename to tools/libxc/xg_dom_core.c
similarity index 100%
rename from tools/libxc/xc_dom_decompress_lz4.c
rename to tools/libxc/xg_dom_decompress_lz4.c
similarity index 100%
rename from tools/libxc/xc_dom_decompress_unsafe.c
rename to tools/libxc/xg_dom_decompress_unsafe.c
similarity index 100%
rename from tools/libxc/xc_dom_decompress_unsafe_bzip2.c
rename to tools/libxc/xg_dom_decompress_unsafe_bzip2.c
similarity index 100%
rename from tools/libxc/xc_dom_decompress_unsafe_lzma.c
rename to tools/libxc/xg_dom_decompress_unsafe_lzma.c
similarity index 100%
rename from tools/libxc/xc_dom_decompress_unsafe_lzo1x.c
rename to tools/libxc/xg_dom_decompress_unsafe_lzo1x.c
similarity index 100%
rename from tools/libxc/xc_dom_decompress_unsafe_xz.c
rename to tools/libxc/xg_dom_decompress_unsafe_xz.c
similarity index 100%
rename from tools/libxc/xc_dom_elfloader.c
rename to tools/libxc/xg_dom_elfloader.c
similarity index 100%
rename from tools/libxc/xc_dom_hvmloader.c
rename to tools/libxc/xg_dom_hvmloader.c
similarity index 100%
rename from tools/libxc/xc_dom_x86.c
rename to tools/libxc/xg_dom_x86.c
similarity index 100%
rename from tools/libxc/xc_nomigrate.c
rename to tools/libxc/xg_nomigrate.c
similarity index 100%
rename from tools/libxc/xc_offline_page.c
rename to tools/libxc/xg_offline_page.c
similarity index 100%
rename from tools/libxc/xc_sr_common.c
rename to tools/libxc/xg_sr_common.c
similarity index 100%
rename from tools/libxc/xc_sr_common_x86.c
rename to tools/libxc/xg_sr_common_x86.c
similarity index 100%
rename from tools/libxc/xc_sr_common_x86_pv.c
rename to tools/libxc/xg_sr_common_x86_pv.c
similarity index 100%
rename from tools/libxc/xc_sr_restore.c
rename to tools/libxc/xg_sr_restore.c
similarity index 100%
rename from tools/libxc/xc_sr_restore_x86_hvm.c
rename to tools/libxc/xg_sr_restore_x86_hvm.c
similarity index 100%
rename from tools/libxc/xc_sr_restore_x86_pv.c
rename to tools/libxc/xg_sr_restore_x86_pv.c
similarity index 100%
rename from tools/libxc/xc_sr_save.c
rename to tools/libxc/xg_sr_save.c
similarity index 100%
rename from tools/libxc/xc_sr_save_x86_hvm.c
rename to tools/libxc/xg_sr_save_x86_hvm.c
similarity index 100%
rename from tools/libxc/xc_sr_save_x86_pv.c
rename to tools/libxc/xg_sr_save_x86_pv.c
similarity index 100%
rename from tools/libxc/xc_suspend.c
rename to tools/libxc/xg_suspend.c
Some sources of libxenguest are named xg_*.c and some xc_*.c. Rename the xc_*.c files to xg_*.c. Signed-off-by: Juergen Gross <jgross@suse.com> --- tools/libxc/Makefile | 59 ++++++++++--------- .../libxc/{xc_cpuid_x86.c => xg_cpuid_x86.c} | 0 tools/libxc/{xc_dom_arm.c => xg_dom_arm.c} | 0 ...imageloader.c => xg_dom_armzimageloader.c} | 0 ...{xc_dom_binloader.c => xg_dom_binloader.c} | 0 tools/libxc/{xc_dom_boot.c => xg_dom_boot.c} | 0 ...bzimageloader.c => xg_dom_bzimageloader.c} | 0 ...m_compat_linux.c => xg_dom_compat_linux.c} | 0 tools/libxc/{xc_dom_core.c => xg_dom_core.c} | 0 ...compress_lz4.c => xg_dom_decompress_lz4.c} | 0 ...ss_unsafe.c => xg_dom_decompress_unsafe.c} | 0 ...ip2.c => xg_dom_decompress_unsafe_bzip2.c} | 0 ...lzma.c => xg_dom_decompress_unsafe_lzma.c} | 0 ...o1x.c => xg_dom_decompress_unsafe_lzo1x.c} | 0 ...afe_xz.c => xg_dom_decompress_unsafe_xz.c} | 0 ...{xc_dom_elfloader.c => xg_dom_elfloader.c} | 0 ...{xc_dom_hvmloader.c => xg_dom_hvmloader.c} | 0 tools/libxc/{xc_dom_x86.c => xg_dom_x86.c} | 0 .../libxc/{xc_nomigrate.c => xg_nomigrate.c} | 0 .../{xc_offline_page.c => xg_offline_page.c} | 0 .../libxc/{xc_sr_common.c => xg_sr_common.c} | 0 ...{xc_sr_common_x86.c => xg_sr_common_x86.c} | 0 ..._common_x86_pv.c => xg_sr_common_x86_pv.c} | 0 .../{xc_sr_restore.c => xg_sr_restore.c} | 0 ...tore_x86_hvm.c => xg_sr_restore_x86_hvm.c} | 0 ...estore_x86_pv.c => xg_sr_restore_x86_pv.c} | 0 tools/libxc/{xc_sr_save.c => xg_sr_save.c} | 0 ...sr_save_x86_hvm.c => xg_sr_save_x86_hvm.c} | 0 ...c_sr_save_x86_pv.c => xg_sr_save_x86_pv.c} | 0 tools/libxc/{xc_suspend.c => xg_suspend.c} | 0 30 files changed, 30 insertions(+), 29 deletions(-) rename tools/libxc/{xc_cpuid_x86.c => xg_cpuid_x86.c} (100%) rename tools/libxc/{xc_dom_arm.c => xg_dom_arm.c} (100%) rename tools/libxc/{xc_dom_armzimageloader.c => xg_dom_armzimageloader.c} (100%) rename tools/libxc/{xc_dom_binloader.c => xg_dom_binloader.c} (100%) rename tools/libxc/{xc_dom_boot.c => xg_dom_boot.c} (100%) rename tools/libxc/{xc_dom_bzimageloader.c => xg_dom_bzimageloader.c} (100%) rename tools/libxc/{xc_dom_compat_linux.c => xg_dom_compat_linux.c} (100%) rename tools/libxc/{xc_dom_core.c => xg_dom_core.c} (100%) rename tools/libxc/{xc_dom_decompress_lz4.c => xg_dom_decompress_lz4.c} (100%) rename tools/libxc/{xc_dom_decompress_unsafe.c => xg_dom_decompress_unsafe.c} (100%) rename tools/libxc/{xc_dom_decompress_unsafe_bzip2.c => xg_dom_decompress_unsafe_bzip2.c} (100%) rename tools/libxc/{xc_dom_decompress_unsafe_lzma.c => xg_dom_decompress_unsafe_lzma.c} (100%) rename tools/libxc/{xc_dom_decompress_unsafe_lzo1x.c => xg_dom_decompress_unsafe_lzo1x.c} (100%) rename tools/libxc/{xc_dom_decompress_unsafe_xz.c => xg_dom_decompress_unsafe_xz.c} (100%) rename tools/libxc/{xc_dom_elfloader.c => xg_dom_elfloader.c} (100%) rename tools/libxc/{xc_dom_hvmloader.c => xg_dom_hvmloader.c} (100%) rename tools/libxc/{xc_dom_x86.c => xg_dom_x86.c} (100%) rename tools/libxc/{xc_nomigrate.c => xg_nomigrate.c} (100%) rename tools/libxc/{xc_offline_page.c => xg_offline_page.c} (100%) rename tools/libxc/{xc_sr_common.c => xg_sr_common.c} (100%) rename tools/libxc/{xc_sr_common_x86.c => xg_sr_common_x86.c} (100%) rename tools/libxc/{xc_sr_common_x86_pv.c => xg_sr_common_x86_pv.c} (100%) rename tools/libxc/{xc_sr_restore.c => xg_sr_restore.c} (100%) rename tools/libxc/{xc_sr_restore_x86_hvm.c => xg_sr_restore_x86_hvm.c} (100%) rename tools/libxc/{xc_sr_restore_x86_pv.c => xg_sr_restore_x86_pv.c} (100%) rename tools/libxc/{xc_sr_save.c => xg_sr_save.c} (100%) rename tools/libxc/{xc_sr_save_x86_hvm.c => xg_sr_save_x86_hvm.c} (100%) rename tools/libxc/{xc_sr_save_x86_pv.c => xg_sr_save_x86_pv.c} (100%) rename tools/libxc/{xc_suspend.c => xg_suspend.c} (100%)