Everything after hostdev setup needs to jump to cleanup on error. Signed-off-by: Cole Robinson <crobinso(a)redhat.com&gt; --- src/qemu/qemu_driver.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 582fdee..80f96b7 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -3295,7 +3295,7 @@ static int qemudStartVMDaemon(virConnectPtr conn, if (driver->securityDriver && driver->securityDriver->domainGenSecurityLabel && driver->securityDriver->domainGenSecurityLabel(vm) < 0) - return -1; + goto cleanup;

This only exists for a certain cleanup path in StartVMDaemon, but is unneeded since domain_conf.c handles this for us automatically. Signed-off-by: Cole Robinson <crobinso(a)redhat.com&gt; --- src/qemu/qemu_driver.c | 4 ---- 1 files changed, 0 insertions(+), 4 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 80f96b7..61aacfb 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -3581,10 +3581,6 @@ cleanup: driver->securityDriver->domainReleaseSecurityLabel) driver->securityDriver->domainReleaseSecurityLabel(vm); qemuRemoveCgroup(driver, vm, 1); - if ((vm->def->ngraphics == 1) && - vm->def->graphics[0]->type == VIR_DOMAIN_GRAPHICS_TYPE_VNC && - vm->def->graphics[0]->data.vnc.autoport) - vm->def->graphics[0]->data.vnc.port = -1; if (logfile != -1) close(logfile); vm->def->id = -1;

Clients that require this already seem to do so. Calling this function with pid < 1 also should not cause problems. Signed-off-by: Cole Robinson <crobinso(a)redhat.com&gt; --- src/qemu/qemu_driver.c | 7 +++---- 1 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 61aacfb..d2f1a36 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -3608,10 +3608,8 @@ static void qemudShutdownVMDaemon(struct qemud_driver *driver, virDomainDefPtr def; int i; - if (!virDomainObjIsActive(vm)) - return; - - VIR_DEBUG("Shutting down VM '%s' migrated=%d", vm->def->name, migrated); + VIR_DEBUG("Shutting down VM '%s' pid=%d migrated=%d", + vm->def->name, vm->pid, migrated); /* This method is routinely used in clean up paths. Disable error * reporting so we don't squash a legit error. */ @@ -3634,6 +3632,7 @@ static void qemudShutdownVMDaemon(struct qemud_driver *driver, } } + /* This will safely handle a non-running guest with pid=0 or pid=-1*/ if (virKillProcess(vm->pid, 0) == 0 && virKillProcess(vm->pid, SIGTERM) < 0) virReportSystemError(errno,

On 05/17/2010 11:17 AM, Cole Robinson wrote: > The current cleanup: in StartVMDaemon path is a poor duplication. > qemuShutdownVMDaemon can handle teardown for inactive VMs, so let's use it. > > Signed-off-by: Cole Robinson <crobinso(a)redhat.com&gt; > --- > src/qemu/qemu_driver.c | 18 +----------------- > 1 files changed, 1 insertions(+), 17 deletions(-) > > diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c > index d2f1a36..114917d 100644 > --- a/src/qemu/qemu_driver.c > +++ b/src/qemu/qemu_driver.c > @@ -3569,23 +3569,7 @@ static int qemudStartVMDaemon(virConnectPtr conn, > return 0; > > cleanup: > - /* We jump here if we failed to start the VM for any reason > - * XXX investigate if we can kill this block and safely call > - * qemudShutdownVMDaemon even though no PID is running */ > - qemuDomainReAttachHostDevices(driver, vm->def); > - > - if (driver->securityDriver && > - driver->securityDriver->domainRestoreSecurityAllLabel) > - driver->securityDriver->domainRestoreSecurityAllLabel(vm, 0); > - if (driver->securityDriver && > - driver->securityDriver->domainReleaseSecurityLabel) > - driver->securityDriver->domainReleaseSecurityLabel(vm); > - qemuRemoveCgroup(driver, vm, 1); > - if (logfile != -1) > - close(logfile); > - vm->def->id = -1; > - return -1; > - > + /* We jump here if we failed to start the VM for any reason */ > abort: > /* We jump here if we failed to initialize the now running VM > * killing it off and pretend we never started it */ Agree with the proposed change being safe, but it is incomplete. Now that cleanup: has no code, but falls through immediately to abort:, I'd rather see these merged into one label. Probably cleanup: is the better name, which means changing all the 'goto abort;'.