aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJuan Quintela <quintela@redhat.com>2017-04-20 12:37:23 +0200
committerJuan Quintela <quintela@redhat.com>2017-05-17 12:04:59 +0200
commitaa3544c371748fdc2c012c2aaeeac8c66b4f0808 (patch)
tree0ddb30a25c994464db9010c0a7e55ab78b02b21a
parent795c40b8bdbe3fd04bb976416e1bdcf5e3fe997e (diff)
migration: Move page_cache.c to migration/
It is only used by migration, so move it there. Signed-off-by: Juan Quintela <quintela@redhat.com> Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
-rw-r--r--Makefile.objs1
-rw-r--r--migration/Makefile.objs2
-rw-r--r--migration/page_cache.c (renamed from page_cache.c)0
-rw-r--r--migration/page_cache.h (renamed from include/migration/page_cache.h)0
-rw-r--r--tests/Makefile.include2
5 files changed, 2 insertions, 3 deletions
diff --git a/Makefile.objs b/Makefile.objs
index 6167e7b17d..2100845ce2 100644
--- a/Makefile.objs
+++ b/Makefile.objs
@@ -49,7 +49,6 @@ common-obj-$(CONFIG_POSIX) += os-posix.o
common-obj-$(CONFIG_LINUX) += fsdev/
common-obj-y += migration/
-common-obj-y += page_cache.o #aio.o
common-obj-$(CONFIG_SPICE) += spice-qemu-char.o
diff --git a/migration/Makefile.objs b/migration/Makefile.objs
index 480dd493a9..c1920b6fc0 100644
--- a/migration/Makefile.objs
+++ b/migration/Makefile.objs
@@ -1,7 +1,7 @@
common-obj-y += migration.o socket.o fd.o exec.o
common-obj-y += tls.o
common-obj-y += colo-comm.o colo.o colo-failover.o
-common-obj-y += vmstate.o
+common-obj-y += vmstate.o page_cache.o
common-obj-y += qemu-file.o
common-obj-y += qemu-file-channel.o
common-obj-y += xbzrle.o postcopy-ram.o
diff --git a/page_cache.c b/migration/page_cache.c
index 5f8578736e..5f8578736e 100644
--- a/page_cache.c
+++ b/migration/page_cache.c
diff --git a/include/migration/page_cache.h b/migration/page_cache.h
index 10ed53274c..10ed53274c 100644
--- a/include/migration/page_cache.h
+++ b/migration/page_cache.h
diff --git a/tests/Makefile.include b/tests/Makefile.include
index 16ff8f399f..4277597e93 100644
--- a/tests/Makefile.include
+++ b/tests/Makefile.include
@@ -554,7 +554,7 @@ tests/test-thread-pool$(EXESUF): tests/test-thread-pool.o $(test-block-obj-y)
tests/test-iov$(EXESUF): tests/test-iov.o $(test-util-obj-y)
tests/test-hbitmap$(EXESUF): tests/test-hbitmap.o $(test-util-obj-y)
tests/test-x86-cpuid$(EXESUF): tests/test-x86-cpuid.o
-tests/test-xbzrle$(EXESUF): tests/test-xbzrle.o migration/xbzrle.o page_cache.o $(test-util-obj-y)
+tests/test-xbzrle$(EXESUF): tests/test-xbzrle.o migration/xbzrle.o migration/page_cache.o $(test-util-obj-y)
tests/test-cutils$(EXESUF): tests/test-cutils.o util/cutils.o
tests/test-int128$(EXESUF): tests/test-int128.o
tests/rcutorture$(EXESUF): tests/rcutorture.o $(test-util-obj-y)