On Mon, Aug 17, 2020 at 10:37:21AM +0530, Prathamesh Chavan wrote: > Dependency on qemu-specific `diskPrivatePtr` was removed > by moving the funcitons `qemuDomainObjPrivateXMLParseJobNBD` > and `qemuDomainObjPrivateXMLFormatNBDMigration` to > `qemu_domain`, and moving their calls inside > the `parseJob` and `formatJob` callback functions. Mentioning diskPrivatePtr here is a little bit confusing to me, I'd simply say that both parsing and formatting of NBD is qemu specific and collides with our effort to convert qemu_domainjob module to a hypervisor agnostic one. > > Signed-off-by: Prathamesh Chavan <pc44800@xxxxxxxxx> > --- Overall, I agree with this change, so Reviewed-by: Erik Skultety <eskultet@xxxxxxxxxx> ... > > diff --git a/src/qemu/qemu_domainjob.c b/src/qemu/qemu_domainjob.c > index 18abc0d986..ae4ac9e0c1 100644 > --- a/src/qemu/qemu_domainjob.c > +++ b/src/qemu/qemu_domainjob.c > @@ -19,7 +19,7 @@ > #include <config.h> > > #include "qemu_domain.h" > -#include "qemu_migration.h" > +#include "virmigration.h" If we skip ^this hunk, the patch can be merged independently, it's up to you Prathamesh whether you want to add more changes or we you want to come up with a follow-up patch. Erik