Message ID | 20170425220451.6028-9-quintela@redhat.com |
---|---|
State | New |
Headers | show |
* Juan Quintela (quintela@redhat.com) wrote: > 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> > --- > Makefile.objs | 1 - > migration/Makefile.objs | 2 +- > page_cache.c => migration/page_cache.c | 0 > {include/migration => migration}/page_cache.h | 0 > tests/Makefile.include | 2 +- > 5 files changed, 2 insertions(+), 3 deletions(-) > rename page_cache.c => migration/page_cache.c (100%) > rename {include/migration => migration}/page_cache.h (100%) > > diff --git a/Makefile.objs b/Makefile.objs > index 6167e7b..2100845 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 c83ca92..ce8ce12 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 channel.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 > similarity index 100% > rename from page_cache.c > rename to migration/page_cache.c > diff --git a/include/migration/page_cache.h b/migration/page_cache.h > similarity index 100% > rename from include/migration/page_cache.h > rename to migration/page_cache.h > diff --git a/tests/Makefile.include b/tests/Makefile.include > index 579ec07..0f98c04 100644 > --- a/tests/Makefile.include > +++ b/tests/Makefile.include > @@ -549,7 +549,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) > -- > 2.9.3 > -- Dr. David Alan Gilbert / dgilbert@redhat.com / Manchester, UK
diff --git a/Makefile.objs b/Makefile.objs index 6167e7b..2100845 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 c83ca92..ce8ce12 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 channel.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 similarity index 100% rename from page_cache.c rename to migration/page_cache.c diff --git a/include/migration/page_cache.h b/migration/page_cache.h similarity index 100% rename from include/migration/page_cache.h rename to migration/page_cache.h diff --git a/tests/Makefile.include b/tests/Makefile.include index 579ec07..0f98c04 100644 --- a/tests/Makefile.include +++ b/tests/Makefile.include @@ -549,7 +549,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)
It is only used by migration, so move it there. Signed-off-by: Juan Quintela <quintela@redhat.com> --- Makefile.objs | 1 - migration/Makefile.objs | 2 +- page_cache.c => migration/page_cache.c | 0 {include/migration => migration}/page_cache.h | 0 tests/Makefile.include | 2 +- 5 files changed, 2 insertions(+), 3 deletions(-) rename page_cache.c => migration/page_cache.c (100%) rename {include/migration => migration}/page_cache.h (100%)