Re: [libvirt] [PATCH 1/3] libxl: rename cleanup_dom label

>> On 3/29/2016 at 08:54 AM, in message

Rename cleanup_dom label to destroy_dom, which better describes what it does. Signed-off-by: Jim Fehlig <jfehlig(a)suse.com&gt; --- src/libxl/libxl_domain.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/libxl/libxl_domain.c b/src/libxl/libxl_domain.c index c8d09b1..ead3d09 100644 --- a/src/libxl/libxl_domain.c +++ b/src/libxl/libxl_domain.c @@ -1102,22 +1102,22 @@ libxlDomainStart(libxlDriverPrivatePtr driver, virDomainObjPtr vm, /* Always enable domain death events */ if (libxl_evenable_domain_death(cfg->ctx, vm->def->id, 0, &priv->deathW)) - goto cleanup_dom; + goto destroy_dom; libxlDomainCreateIfaceNames(vm->def, &d_config); if ((dom_xml = virDomainDefFormat(vm->def, cfg->caps, 0)) == NULL) - goto cleanup_dom; + goto destroy_dom; if (libxl_userdata_store(cfg->ctx, domid, "libvirt-xml", (uint8_t *)dom_xml, strlen(dom_xml) + 1)) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("libxenlight failed to store userdata")); - goto cleanup_dom; + goto destroy_dom; } if (libxlDomainSetVcpuAffinities(driver, vm) < 0) - goto cleanup_dom; + goto destroy_dom; if (!start_paused) { libxl_domain_unpause(cfg->ctx, domid); @@ -1127,7 +1127,7 @@ libxlDomainStart(libxlDriverPrivatePtr driver, virDomainObjPtr vm, } if (virDomainSaveStatus(driver->xmlopt, cfg->stateDir, vm, cfg->caps) < 0) - goto cleanup_dom; + goto destroy_dom; if (virAtomicIntInc(&driver->nactive) == 1 && driver->inhibitCallback) driver->inhibitCallback(true, driver->inhibitOpaque); @@ -1142,7 +1142,7 @@ libxlDomainStart(libxlDriverPrivatePtr driver, virDomainObjPtr vm, ret = 0; goto cleanup; - cleanup_dom: + destroy_dom: ret = -1; if (priv->deathW) { libxl_evdisable_domain_death(cfg->ctx, priv->deathW);