diff options
| -rw-r--r-- | Makefile.objs | 10 | ||||
| -rw-r--r-- | migration/Makefile.objs | 10 | ||||
| -rw-r--r-- | migration/block-migration.c (renamed from block-migration.c) | 0 | ||||
| -rw-r--r-- | migration/migration-exec.c (renamed from migration-exec.c) | 0 | ||||
| -rw-r--r-- | migration/migration-fd.c (renamed from migration-fd.c) | 0 | ||||
| -rw-r--r-- | migration/migration-rdma.c (renamed from migration-rdma.c) | 0 | ||||
| -rw-r--r-- | migration/migration-tcp.c (renamed from migration-tcp.c) | 0 | ||||
| -rw-r--r-- | migration/migration-unix.c (renamed from migration-unix.c) | 0 | ||||
| -rw-r--r-- | migration/migration.c (renamed from migration.c) | 0 | ||||
| -rw-r--r-- | migration/qemu-file-stdio.c (renamed from qemu-file-stdio.c) | 0 | ||||
| -rw-r--r-- | migration/qemu-file-unix.c (renamed from qemu-file-unix.c) | 0 | ||||
| -rw-r--r-- | migration/qemu-file.c (renamed from qemu-file.c) | 0 | ||||
| -rw-r--r-- | migration/vmstate.c (renamed from vmstate.c) | 0 | ||||
| -rw-r--r-- | migration/xbzrle.c (renamed from xbzrle.c) | 0 | ||||
| -rw-r--r-- | tests/Makefile | 10 |
15 files changed, 18 insertions, 12 deletions
diff --git a/Makefile.objs b/Makefile.objs index 18fd35cf15..abeb902b58 100644 --- a/Makefile.objs +++ b/Makefile.objs @@ -48,15 +48,9 @@ common-obj-$(CONFIG_POSIX) += os-posix.o common-obj-$(CONFIG_LINUX) += fsdev/ -common-obj-y += migration.o migration-tcp.o -common-obj-y += vmstate.o -common-obj-y += qemu-file.o qemu-file-unix.o qemu-file-stdio.o -common-obj-$(CONFIG_RDMA) += migration-rdma.o +common-obj-y += migration/ common-obj-y += qemu-char.o #aio.o -common-obj-y += block-migration.o -common-obj-y += page_cache.o xbzrle.o - -common-obj-$(CONFIG_POSIX) += migration-exec.o migration-unix.o migration-fd.o +common-obj-y += page_cache.o common-obj-$(CONFIG_SPICE) += spice-qemu-char.o diff --git a/migration/Makefile.objs b/migration/Makefile.objs new file mode 100644 index 0000000000..63dbe93447 --- /dev/null +++ b/migration/Makefile.objs @@ -0,0 +1,10 @@ +common-obj-y += migration.o migration-tcp.o +common-obj-y += vmstate.o +common-obj-y += qemu-file.o qemu-file-unix.o qemu-file-stdio.o +common-obj-$(CONFIG_RDMA) += migration-rdma.o +common-obj-y += xbzrle.o + +common-obj-$(CONFIG_POSIX) += migration-exec.o migration-unix.o migration-fd.o + +common-obj-y += block-migration.o + diff --git a/block-migration.c b/migration/block-migration.c index 74d9eb125c..74d9eb125c 100644 --- a/block-migration.c +++ b/migration/block-migration.c diff --git a/migration-exec.c b/migration/migration-exec.c index 479024752f..479024752f 100644 --- a/migration-exec.c +++ b/migration/migration-exec.c diff --git a/migration-fd.c b/migration/migration-fd.c index d2e523af74..d2e523af74 100644 --- a/migration-fd.c +++ b/migration/migration-fd.c diff --git a/migration-rdma.c b/migration/migration-rdma.c index b32dbdfccd..b32dbdfccd 100644 --- a/migration-rdma.c +++ b/migration/migration-rdma.c diff --git a/migration-tcp.c b/migration/migration-tcp.c index 91c9cf381e..91c9cf381e 100644 --- a/migration-tcp.c +++ b/migration/migration-tcp.c diff --git a/migration-unix.c b/migration/migration-unix.c index 1cdadfbc83..1cdadfbc83 100644 --- a/migration-unix.c +++ b/migration/migration-unix.c diff --git a/migration.c b/migration/migration.c index c49a05a165..c49a05a165 100644 --- a/migration.c +++ b/migration/migration.c diff --git a/qemu-file-stdio.c b/migration/qemu-file-stdio.c index 285068b303..285068b303 100644 --- a/qemu-file-stdio.c +++ b/migration/qemu-file-stdio.c diff --git a/qemu-file-unix.c b/migration/qemu-file-unix.c index 9682396d97..9682396d97 100644 --- a/qemu-file-unix.c +++ b/migration/qemu-file-unix.c diff --git a/qemu-file.c b/migration/qemu-file.c index f938e36fe8..f938e36fe8 100644 --- a/qemu-file.c +++ b/migration/qemu-file.c diff --git a/vmstate.c b/migration/vmstate.c index 3dde574c0f..3dde574c0f 100644 --- a/vmstate.c +++ b/migration/vmstate.c diff --git a/xbzrle.c b/migration/xbzrle.c index 8e220bf25b..8e220bf25b 100644 --- a/xbzrle.c +++ b/migration/xbzrle.c diff --git a/tests/Makefile b/tests/Makefile index 16f0e4c805..faba9cb58d 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -48,8 +48,11 @@ check-unit-y += tests/test-hbitmap$(EXESUF) check-unit-y += tests/test-x86-cpuid$(EXESUF) # all code tested by test-x86-cpuid is inside topology.h gcov-files-test-x86-cpuid-y = +ifeq ($(CONFIG_SOFTMMU),y) check-unit-y += tests/test-xbzrle$(EXESUF) -gcov-files-test-xbzrle-y = xbzrle.c +gcov-files-test-xbzrle-y = migration/xbzrle.c +check-unit-$(CONFIG_POSIX) += tests/test-vmstate$(EXESUF) +endif check-unit-y += tests/test-cutils$(EXESUF) gcov-files-test-cutils-y += util/cutils.c check-unit-y += tests/test-mul64$(EXESUF) @@ -61,7 +64,6 @@ check-unit-y += tests/test-bitops$(EXESUF) check-unit-$(CONFIG_HAS_GLIB_SUBPROCESS_TESTS) += tests/test-qdev-global-props$(EXESUF) check-unit-y += tests/check-qom-interface$(EXESUF) gcov-files-check-qom-interface-y = qom/object.c -check-unit-$(CONFIG_POSIX) += tests/test-vmstate$(EXESUF) check-unit-y += tests/test-qemu-opts$(EXESUF) gcov-files-test-qemu-opts-y = qom/test-qemu-opts.c @@ -247,7 +249,7 @@ tests/test-thread-pool$(EXESUF): tests/test-thread-pool.o $(block-obj-y) libqemu tests/test-iov$(EXESUF): tests/test-iov.o libqemuutil.a tests/test-hbitmap$(EXESUF): tests/test-hbitmap.o libqemuutil.a libqemustub.a tests/test-x86-cpuid$(EXESUF): tests/test-x86-cpuid.o -tests/test-xbzrle$(EXESUF): tests/test-xbzrle.o xbzrle.o page_cache.o libqemuutil.a +tests/test-xbzrle$(EXESUF): tests/test-xbzrle.o migration/xbzrle.o page_cache.o libqemuutil.a tests/test-cutils$(EXESUF): tests/test-cutils.o util/cutils.o tests/test-int128$(EXESUF): tests/test-int128.o tests/test-qdev-global-props$(EXESUF): tests/test-qdev-global-props.o \ @@ -258,7 +260,7 @@ tests/test-qdev-global-props$(EXESUF): tests/test-qdev-global-props.o \ $(test-qapi-obj-y) \ libqemuutil.a libqemustub.a tests/test-vmstate$(EXESUF): tests/test-vmstate.o \ - vmstate.o qemu-file.o qemu-file-unix.o \ + migration/vmstate.o migration/qemu-file.o migration/qemu-file-unix.o \ libqemuutil.a libqemustub.a tests/test-qapi-types.c tests/test-qapi-types.h :\ |