On Fri, Sep 18, 2015 at 18:05:44 +0300, Nikolay Shirokovskiy wrote: > p2p plain and direct function are good candidates for code reuse. Their main > function is same - to branch among different versions of migration protocol and > implementation of this function is also same. Also they have other common > functionality in lesser aspects. So let's merge them. > > But as they have different signatures we have to get to convention on how to > pass direct migration 'uri' in 'dconnuri' and 'miguri'. Fortunately we alreay > have such convention in parameters passed to toURI2 function, just let's follow > it. 'uri' is passed in miguri and dconnuri is ignored. > > Signed-off-by: Nikolay Shirokovskiy <nshirokovskiy@xxxxxxxxxxxxx> > --- > src/libvirt-domain.c | 148 ++++++++++++++++---------------------------------- > 1 files changed, 46 insertions(+), 102 deletions(-) > > diff --git a/src/libvirt-domain.c b/src/libvirt-domain.c > index d164782..f52c3bf 100644 > --- a/src/libvirt-domain.c > +++ b/src/libvirt-domain.c > @@ -3319,27 +3319,35 @@ virDomainMigrateCheckNotLocal(const char *dconnuri) > * In normal migration, the libvirt client co-ordinates communication > * between the 2 libvirtd instances on source & dest hosts. > * > - * In this peer-2-peer migration alternative, the libvirt client > - * only talks to the source libvirtd instance. The source libvirtd > - * then opens its own connection to the destination and co-ordinates > - * migration itself. > + * This function incapsulates 2 alternatives to the above case. s/incapsulates/encapsulates/ ACK Jirka -- libvir-list mailing list libvir-list@xxxxxxxxxx https://www.redhat.com/mailman/listinfo/libvir-list