[Qemu-devel] [PULL] Migration pull for 2.3

[Qemu-devel] [PULL] Migration pull for 2.3

[Amit Shah]

The following changes since commit 7fb8da2b8861795e0013e6ee97acd0363d868a35:

  Open 2.3 development tree (2014-12-09 21:48:34 +0000)

are available in the git repository at:

  git://git.kernel.org/pub/scm/virt/qemu/amit/migration.git tags/for-2.3-1

for you to fetch changes up to 26b6d4a4c837aeb3655090696d385d1d02f2d313:

  MAINTAINERS: Update for migrated migration code (2014-12-11 12:48:06 +0530)

----------------------------------------------------------------
Migration pull for 2.3.  Mostly moving the code to the migration/
directory, and updating MAINTAINERS.

I've also folded my other MAINTAINERS update patches into this, as
they're small by themselves.

----------------------------------------------------------------
Amit Shah (4):
      MAINTAINERS: Add myself to migration maintainers
      MAINTAINERS: migration: add vmstate static checker files
      MAINTAINERS: add entry for virtio-rng
      MAINTAINERS: add include files to virtio-serial entry

Dr. David Alan Gilbert (5):
      Start migrating migration code into a migration directory
      Remove migration- pre/post fixes off files in migration/ dir
      Split struct QEMUFile out
      Split the QEMU buffered file code out
      MAINTAINERS: Update for migrated migration code

Michael S. Tsirkin (3):
      exec: add wrapper for host pointer access
      cpu: assert host pointer offset within block
      cpu: verify that block->host is set

zhanghailiang (1):
      qmp-command.hx: add missing docs for migration capabilites

 MAINTAINERS                                      |  14 ++-
 Makefile.objs                                    |  10 +-
 exec.c                                           |  10 +-
 include/exec/cpu-all.h                           |   7 ++
 migration/Makefile.objs                          |  10 ++
 block-migration.c => migration/block.c           |   0
 migration-exec.c => migration/exec.c             |   0
 migration-fd.c => migration/fd.c                 |   0
 migration.c => migration/migration.c             |   0
 qemu-file.c => migration/qemu-file-buf.c         | 511 +-------------------------------------------------------------------------
 migration/qemu-file-internal.h                   |  53 ++++++++
 qemu-file-stdio.c => migration/qemu-file-stdio.c |   0
 qemu-file-unix.c => migration/qemu-file-unix.c   |   0
 migration/qemu-file.c                            | 519 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 migration-rdma.c => migration/rdma.c             |   0
 migration-tcp.c => migration/tcp.c               |   0
 migration-unix.c => migration/unix.c             |   0
 vmstate.c => migration/vmstate.c                 |   0
 xbzrle.c => migration/xbzrle.c                   |   0
 qmp-commands.hx                                  |   6 +
 tests/Makefile                                   |   7 +-
 21 files changed, 619 insertions(+), 528 deletions(-)
 create mode 100644 migration/Makefile.objs
 rename block-migration.c => migration/block.c (100%)
 rename migration-exec.c => migration/exec.c (100%)
 rename migration-fd.c => migration/fd.c (100%)
 rename migration.c => migration/migration.c (100%)
 rename qemu-file.c => migration/qemu-file-buf.c (51%)
 create mode 100644 migration/qemu-file-internal.h
 rename qemu-file-stdio.c => migration/qemu-file-stdio.c (100%)
 rename qemu-file-unix.c => migration/qemu-file-unix.c (100%)
 create mode 100644 migration/qemu-file.c
 rename migration-rdma.c => migration/rdma.c (100%)
 rename migration-tcp.c => migration/tcp.c (100%)
 rename migration-unix.c => migration/unix.c (100%)
 rename vmstate.c => migration/vmstate.c (100%)
 rename xbzrle.c => migration/xbzrle.c (100%)


		Amit

Re: [Qemu-devel] [PULL] Migration pull for 2.3

[Peter Maydell]

On 11 December 2014 at 07:23, Amit Shah <amit.shah@redhat.com> wrote:
> The following changes since commit 7fb8da2b8861795e0013e6ee97acd0363d868a35:
>
>   Open 2.3 development tree (2014-12-09 21:48:34 +0000)
>
> are available in the git repository at:
>
>   git://git.kernel.org/pub/scm/virt/qemu/amit/migration.git tags/for-2.3-1
>
> for you to fetch changes up to 26b6d4a4c837aeb3655090696d385d1d02f2d313:
>
>   MAINTAINERS: Update for migrated migration code (2014-12-11 12:48:06 +0530)
>
> ----------------------------------------------------------------
> Migration pull for 2.3.  Mostly moving the code to the migration/
> directory, and updating MAINTAINERS.
>
> I've also folded my other MAINTAINERS update patches into this, as
> they're small by themselves.

Hi. I'm afraid "make check" fails to build on a linux-static config:

  CC    tests/test-xbzrle.o
  CC    migration/xbzrle.o
cc1: error: migration: No such file or directory [-Werror]
cc1: all warnings being treated as errors
make: *** [migration/xbzrle.o] Error 1

The configure line for this build config is:
exec '../../configure' '--cc=ccache gcc' '--enable-debug' '--static'
'--disable-system'

The problem is that the test wants to include the .o from migration/

gcov-files-test-xbzrle-y = migration/xbzrle.c

but that .o isn't built (and the migration/ directory in
the build tree doesn't exist at all), because the line
common-obj-y += migration/
in Makefile.objs is inside an ifeq ($(CONFIG_SOFTMMU),y)
guard.

This used to work because the test makefile would cause the
xbzrle.o file to get built even on a non-softmmu build
(via the dependency), but that no longer works because
cc won't build into an output directory that doesn't exist.

The simplest fix might be to make this test only run if
CONFIG_SOFTMMU, I guess.

thanks
-- PMM

Re: [Qemu-devel] [PULL] Migration pull for 2.3

[Dr. David Alan Gilbert]

* Peter Maydell (peter.maydell@linaro.org) wrote:
> On 11 December 2014 at 07:23, Amit Shah <amit.shah@redhat.com> wrote:
> > The following changes since commit 7fb8da2b8861795e0013e6ee97acd0363d868a35:
> >
> >   Open 2.3 development tree (2014-12-09 21:48:34 +0000)
> >
> > are available in the git repository at:
> >
> >   git://git.kernel.org/pub/scm/virt/qemu/amit/migration.git tags/for-2.3-1
> >
> > for you to fetch changes up to 26b6d4a4c837aeb3655090696d385d1d02f2d313:
> >
> >   MAINTAINERS: Update for migrated migration code (2014-12-11 12:48:06 +0530)
> >
> > ----------------------------------------------------------------
> > Migration pull for 2.3.  Mostly moving the code to the migration/
> > directory, and updating MAINTAINERS.
> >
> > I've also folded my other MAINTAINERS update patches into this, as
> > they're small by themselves.
> 
> Hi. I'm afraid "make check" fails to build on a linux-static config:
> 
>   CC    tests/test-xbzrle.o
>   CC    migration/xbzrle.o
> cc1: error: migration: No such file or directory [-Werror]
> cc1: all warnings being treated as errors
> make: *** [migration/xbzrle.o] Error 1
> 
> The configure line for this build config is:
> exec '../../configure' '--cc=ccache gcc' '--enable-debug' '--static'
> '--disable-system'
> 
> The problem is that the test wants to include the .o from migration/
> 
> gcov-files-test-xbzrle-y = migration/xbzrle.c
> 
> but that .o isn't built (and the migration/ directory in
> the build tree doesn't exist at all), because the line
> common-obj-y += migration/
> in Makefile.objs is inside an ifeq ($(CONFIG_SOFTMMU),y)
> guard.
> 
> This used to work because the test makefile would cause the
> xbzrle.o file to get built even on a non-softmmu build
> (via the dependency), but that no longer works because
> cc won't build into an output directory that doesn't exist.
> 
> The simplest fix might be to make this test only run if
> CONFIG_SOFTMMU, I guess.

OK, thanks for spotting that; I'll guard that test as you suggest.

> 
> thanks
> -- PMM

Dave
--
Dr. David Alan Gilbert / dgilbert@redhat.com / Manchester, UK