Re: [libvirt] [PATCH 11/11] Add handling for reboots of LXC containers

On Tue, Jul 24, 2012 at 14:22:53 +0100, Daniel P. Berrange wrote: > +static int > +virLXCProcessReboot(virLXCDriverPtr driver, > + virDomainObjPtr vm) > +{ > + virConnectPtr conn = virLXCProcessAutoDestroyGetConn(driver, vm); > + int reason = vm->state.reason; > + bool autodestroy = false; > + int ret = -1; > + virDomainDefPtr savedDef; > + > + if (conn) { > + virConnectRef(conn); > + autodestroy = true; > + } else { > + conn = virConnectOpen("lxc:///"); > + /* Ignoring NULL conn which is mostly harmless here */ So why do we even try to connect here?

> @@ -496,19 +571,38 @@ static void virLXCProcessMonitorEOFNotify(virLXCMonitorPtr mon ATTRIBUTE_UNUSED, > { > virLXCDriverPtr driver = lxc_driver; > virDomainEventPtr event = NULL; > + virLXCDomainObjPrivatePtr priv; > > lxcDriverLock(driver); > virDomainObjLock(vm); > lxcDriverUnlock(driver); > > - virLXCProcessStop(driver, vm, VIR_DOMAIN_SHUTOFF_SHUTDOWN); > - event = virDomainEventNewFromObj(vm, > - VIR_DOMAIN_EVENT_STOPPED, > - VIR_DOMAIN_EVENT_STOPPED_SHUTDOWN); > - virDomainAuditStop(vm, "shutdown"); > - if (!vm->persistent) { > - virDomainRemoveInactive(&driver->domains, vm); > - vm = NULL; > + priv = vm->privateData; > + if (!priv->wantReboot) { > + virLXCProcessStop(driver, vm, VIR_DOMAIN_SHUTOFF_SHUTDOWN); > + event = virDomainEventNewFromObj(vm, > + VIR_DOMAIN_EVENT_STOPPED, > + VIR_DOMAIN_EVENT_STOPPED_SHUTDOWN); > + virDomainAuditStop(vm, "shutdown"); > + if (!vm->persistent) { > + virDomainRemoveInactive(&driver->domains, vm); > + vm = NULL; > + } > + } else { > + int ret =virLXCProcessReboot(driver, vm); s/=/= / > + virDomainAuditStop(vm, "reboot"); Should we audit stopped domain before calling virLXCProcessReboot?