[libvirt] [PATCH] Move all the QEMU migration code to a new file

Daniel P. Berrange berrange at redhat.com
Mon Jan 31 11:06:11 UTC 2011


On Sat, Jan 29, 2011 at 11:44:39AM -0700, Eric Blake wrote:
> On 01/28/2011 06:22 AM, Daniel P. Berrange wrote:
> > The introduction of the v3 migration protocol, along with
> > support for migration cookies, will significantly expand
> > the size of the migration code. Move it all to a separate
> > file to make it more manageable
> > 
> > The functions are not moved 100%. The API entry points
> > remain in the main QEMU driver, but once the public
> > virDomainPtr is resolved to the internal virDomainObjPtr,
> > all following code is moved.
> > 
> > This will allow the new v3 API entry points to call into the
> > same shared internal migration functions
> > 
> > * src/qemu/qemu_domain.c, src/qemu/qemu_domain.h: Add
> >   qemuDomainFormatXML helper method
> > * src/qemu/qemu_driver.c: Remove all migration code
> > * src/qemu/qemu_migration.c, src/qemu/qemu_migration.h: Add
> >   all migration code.
> > ---
> >  src/Makefile.am           |    3 +-
> >  src/qemu/qemu_domain.c    |   39 ++
> >  src/qemu/qemu_domain.h    |    4 +
> >  src/qemu/qemu_driver.c    | 1296 ++-------------------------------------------
> >  src/qemu/qemu_migration.c | 1295 ++++++++++++++++++++++++++++++++++++++++++++
> >  src/qemu/qemu_migration.h |   63 +++
> >  6 files changed, 1444 insertions(+), 1256 deletions(-)
> >  create mode 100644 src/qemu/qemu_migration.c
> >  create mode 100644 src/qemu/qemu_migration.h
> 
> The diffstat makes this look like a cleaner diff than the qemu_process
> split, so it should be easier to review.
> 
> > -		qemu/qemu_process.c qemu/qemu_process.h	\
> > +		qemu/qemu_process.c qemu/qemu_process.h		\
> > +		qemu/qemu_migration.c qemu/qemu_migration.h	\
> 
> However, this means that you depend on the qemu_process split to happen
> first, and that one had issues, so I'm not reviewing this one yet (but I
> do like the idea of the patch).

The 2 line fix I posted to the other patch shouldn't
invalidate this patch

Daniel




More information about the libvir-list mailing list