On Thu, Feb 23, 2017 at 05:15 PM +0100, Michal Privoznik <mpriv...@redhat.com> wrote: > After eca76884ea in case of error in qemuDomainSetPrivatePaths() > in pretended start we jump to stop. I've changed this during > review from 'cleanup' which turned out to be correct. Well, sort > of. We can't call qemuProcessStop() as it decrements > driver->nactive and we did not increment it. However, it calls > virDomainObjRemoveTransientDef() which is basically the only > function we need to call. So call that function and goto cleanup; > > Signed-off-by: Michal Privoznik <mpriv...@redhat.com> > --- > src/qemu/qemu_process.c | 6 ++++-- > 1 file changed, 4 insertions(+), 2 deletions(-) > > diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c > index df1fa0371..9306e0e18 100644 > --- a/src/qemu/qemu_process.c > +++ b/src/qemu/qemu_process.c > @@ -4758,8 +4758,10 @@ qemuProcessInit(virQEMUDriverPtr driver, > goto cleanup; > > if (flags & VIR_QEMU_PROCESS_START_PRETEND) { > - if (qemuDomainSetPrivatePaths(driver, vm) < 0) > - goto stop; > + if (qemuDomainSetPrivatePaths(driver, vm) < 0) { > + virDomainObjRemoveTransientDef(vm);
I'm not sure if this is needed (I think every caller of qemuProcessInit will unref/free @vm/the transient domain in case of returning -1) but at least it's not wrong and probably more safe :) > + } > } else { > vm->def->id = qemuDriverAllocateID(driver); > qemuDomainSetFakeReboot(driver, vm, false); > -- > 2.11.0 > Beste Grüße / Kind regards Marc Hartmayer IBM Deutschland Research & Development GmbH Vorsitzende des Aufsichtsrats: Martina Koederitz Geschäftsführung: Dirk Wittkopp Sitz der Gesellschaft: Böblingen Registergericht: Amtsgericht Stuttgart, HRB 243294 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list