aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnthony Xu <anthony.xu@intel.com>2017-04-05 16:21:29 -0700
committerStefano Stabellini <sstabellini@kernel.org>2017-04-25 11:04:34 -0700
commit56e2cd24527867ac65aa86fc1820e5b700ccfa03 (patch)
tree10c14e23ff8b86fe739e0375177b061267bd986e
parentd6a3f64ad3e8136758bc71e47f860974204c7a12 (diff)
downloadqemu-56e2cd24527867ac65aa86fc1820e5b700ccfa03.zip
qemu-56e2cd24527867ac65aa86fc1820e5b700ccfa03.tar.gz
qemu-56e2cd24527867ac65aa86fc1820e5b700ccfa03.tar.bz2
move xen-common.c to hw/xen/
move xen-common.c to hw/xen/ Signed-off -by: Anthony Xu <anthony.xu@intel.com> Reviewed-by: Stefano Stabellini <sstabellini@kernel.org>
-rw-r--r--Makefile.target2
-rw-r--r--hw/xen/Makefile.objs2
-rw-r--r--hw/xen/xen-common.c (renamed from xen-common.c)0
-rw-r--r--stubs/Makefile.objs1
-rw-r--r--stubs/xen-common.c (renamed from xen-common-stub.c)0
5 files changed, 2 insertions, 3 deletions
diff --git a/Makefile.target b/Makefile.target
index 7df2b8c..48c027f 100644
--- a/Makefile.target
+++ b/Makefile.target
@@ -150,9 +150,7 @@ obj-y += migration/ram.o migration/savevm.o
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
diff --git a/hw/xen/Makefile.objs b/hw/xen/Makefile.objs
index 4be3ec9..64a70bc 100644
--- a/hw/xen/Makefile.objs
+++ b/hw/xen/Makefile.objs
@@ -1,5 +1,5 @@
# xen backend driver support
-common-obj-$(CONFIG_XEN) += xen_backend.o xen_devconfig.o xen_pvdev.o
+common-obj-$(CONFIG_XEN) += xen_backend.o xen_devconfig.o xen_pvdev.o xen-common.o
obj-$(CONFIG_XEN_PCI_PASSTHROUGH) += xen-host-pci-device.o
obj-$(CONFIG_XEN_PCI_PASSTHROUGH) += xen_pt.o xen_pt_config_init.o xen_pt_graphics.o xen_pt_msi.o
diff --git a/xen-common.c b/hw/xen/xen-common.c
index ae76150..ae76150 100644
--- a/xen-common.c
+++ b/hw/xen/xen-common.c
diff --git a/stubs/Makefile.objs b/stubs/Makefile.objs
index 224f04b..6c80613 100644
--- a/stubs/Makefile.objs
+++ b/stubs/Makefile.objs
@@ -37,3 +37,4 @@ stub-obj-y += target-monitor-defs.o
stub-obj-y += target-get-monitor-def.o
stub-obj-y += pc_madt_cpu_entry.o
stub-obj-y += vmgenid.o
+stub-obj-y += xen-common.o
diff --git a/xen-common-stub.c b/stubs/xen-common.c
index 09fce2d..09fce2d 100644
--- a/xen-common-stub.c
+++ b/stubs/xen-common.c