[libvirt] [PATCH 20/24] Indent top-level labels by one space in src/xen/

--- src/xen/xen_driver.c | 112 +++++++++++++++++++++++------------------------ src/xen/xen_hypervisor.c | 4 +- src/xen/xen_inotify.c | 4 +- src/xen/xend_internal.c | 46 +++++++++---------- src/xen/xm_internal.c | 28 ++++++------ src/xen/xs_internal.c | 12 ++--- 6 files changed, 103 insertions(+), 103 deletions(-) diff --git a/src/xen/xen_driver.c b/src/xen/xen_driver.c index 2199cb0..0fca7be 100644 --- a/src/xen/xen_driver.c +++ b/src/xen/xen_driver.c @@ -248,7 +248,7 @@ xenDomainUsedCpus(virDomainPtr dom, virDomainDefPtr def) res = virBitmapFormat(cpulist); } -done: + done: virBitmapFree(cpulist); VIR_FREE(cpumap); VIR_FREE(cpuinfo); @@ -523,7 +523,7 @@ xenUnifiedConnectOpen(virConnectPtr conn, virConnectAuthPtr auth, unsigned int f return VIR_DRV_OPEN_SUCCESS; -error: + error: VIR_DEBUG("Failed to activate a mandatory sub-driver"); #if WITH_XEN_INOTIFY if (priv->opened[XEN_UNIFIED_INOTIFY_OFFSET]) @@ -764,7 +764,7 @@ xenUnifiedDomainCreateXML(virConnectPtr conn, if (ret) ret->id = def->id; -cleanup: + cleanup: virDomainDefFree(def); return ret; } @@ -786,7 +786,7 @@ xenUnifiedDomainLookupByID(virConnectPtr conn, int id) ret->id = def->id; -cleanup: + cleanup: virDomainDefFree(def); return ret; } @@ -809,7 +809,7 @@ xenUnifiedDomainLookupByUUID(virConnectPtr conn, ret->id = def->id; -cleanup: + cleanup: virDomainDefFree(def); return ret; } @@ -832,7 +832,7 @@ xenUnifiedDomainLookupByName(virConnectPtr conn, ret->id = def->id; -cleanup: + cleanup: virDomainDefFree(def); return ret; } @@ -849,7 +849,7 @@ xenUnifiedDomainIsActive(virDomainPtr dom) ret = def->id == -1 ? 0 : 1; -cleanup: + cleanup: virDomainDefFree(def); return ret; } @@ -893,7 +893,7 @@ xenUnifiedDomainIsPersistent(virDomainPtr dom) } } -cleanup: + cleanup: virDomainDefFree(def); return ret; @@ -919,7 +919,7 @@ xenUnifiedDomainSuspend(virDomainPtr dom) ret = xenDaemonDomainSuspend(dom->conn, def); -cleanup: + cleanup: virDomainDefFree(def); return ret; } @@ -938,7 +938,7 @@ xenUnifiedDomainResume(virDomainPtr dom) ret = xenDaemonDomainResume(dom->conn, def); -cleanup: + cleanup: virDomainDefFree(def); return ret; } @@ -960,7 +960,7 @@ xenUnifiedDomainShutdownFlags(virDomainPtr dom, ret = xenDaemonDomainShutdown(dom->conn, def); -cleanup: + cleanup: virDomainDefFree(def); return ret; } @@ -987,7 +987,7 @@ xenUnifiedDomainReboot(virDomainPtr dom, unsigned int flags) ret = xenDaemonDomainReboot(dom->conn, def); -cleanup: + cleanup: virDomainDefFree(def); return ret; } @@ -1009,7 +1009,7 @@ xenUnifiedDomainDestroyFlags(virDomainPtr dom, ret = xenDaemonDomainDestroy(dom->conn, def); -cleanup: + cleanup: virDomainDefFree(def); return ret; } @@ -1045,7 +1045,7 @@ xenUnifiedDomainGetOSType(virDomainPtr dom) ret = xenHypervisorDomainGetOSType(dom->conn, def); } -cleanup: + cleanup: virDomainDefFree(def); return ret; } @@ -1073,7 +1073,7 @@ xenUnifiedDomainGetMaxMemory(virDomainPtr dom) ret = xenHypervisorGetMaxMemory(dom->conn, def); } -cleanup: + cleanup: virDomainDefFree(def); return ret; } @@ -1100,7 +1100,7 @@ xenUnifiedDomainSetMaxMemory(virDomainPtr dom, unsigned long memory) ret = xenHypervisorSetMaxMemory(dom->conn, def, memory); } -cleanup: + cleanup: virDomainDefFree(def); return ret; } @@ -1123,7 +1123,7 @@ xenUnifiedDomainSetMemory(virDomainPtr dom, unsigned long memory) else ret = xenDaemonDomainSetMemory(dom->conn, def, memory); -cleanup: + cleanup: virDomainDefFree(def); return ret; } @@ -1150,7 +1150,7 @@ xenUnifiedDomainGetInfo(virDomainPtr dom, virDomainInfoPtr info) ret = xenHypervisorGetDomainInfo(dom->conn, def, info); } -cleanup: + cleanup: virDomainDefFree(def); return ret; } @@ -1182,7 +1182,7 @@ xenUnifiedDomainGetState(virDomainPtr dom, ret = xenHypervisorGetDomainState(dom->conn, def, state, reason); } -cleanup: + cleanup: virDomainDefFree(def); return ret; } @@ -1210,7 +1210,7 @@ xenUnifiedDomainSaveFlags(virDomainPtr dom, const char *to, const char *dxml, ret = xenDaemonDomainSave(dom->conn, def, to); -cleanup: + cleanup: virDomainDefFree(def); return ret; } @@ -1255,7 +1255,7 @@ xenUnifiedDomainManagedSave(virDomainPtr dom, unsigned int flags) ret = xenDaemonDomainSave(dom->conn, def, name); -cleanup: + cleanup: VIR_FREE(name); virDomainDefFree(def); return ret; @@ -1282,7 +1282,7 @@ xenUnifiedDomainHasManagedSaveImage(virDomainPtr dom, unsigned int flags) ret = virFileExists(name); -cleanup: + cleanup: VIR_FREE(name); virDomainDefFree(def); return ret; @@ -1309,7 +1309,7 @@ xenUnifiedDomainManagedSaveRemove(virDomainPtr dom, unsigned int flags) ret = unlink(name); -cleanup: + cleanup: VIR_FREE(name); return ret; } @@ -1350,7 +1350,7 @@ xenUnifiedDomainCoreDump(virDomainPtr dom, const char *to, unsigned int flags) ret = xenDaemonDomainCoreDump(dom->conn, def, to, flags); -cleanup: + cleanup: virDomainDefFree(def); return ret; } @@ -1396,7 +1396,7 @@ xenUnifiedDomainSetVcpusFlags(virDomainPtr dom, unsigned int nvcpus, else ret = xenDaemonDomainSetVcpusFlags(dom->conn, def, nvcpus, flags); -cleanup: + cleanup: virDomainDefFree(def); return ret; } @@ -1439,7 +1439,7 @@ xenUnifiedDomainPinVcpu(virDomainPtr dom, unsigned int vcpu, ret = xenHypervisorPinVcpu(dom->conn, def, vcpu, cpumap, maplen); } -cleanup: + cleanup: virDomainDefFree(def); return ret; } @@ -1488,7 +1488,7 @@ xenUnifiedDomainGetVcpus(virDomainPtr dom, ret = xenUnifiedDomainGetVcpusInternal(dom, def, info, maxinfo, cpumaps, maplen); -cleanup: + cleanup: virDomainDefFree(def); return ret; } @@ -1534,7 +1534,7 @@ xenUnifiedDomainGetVcpusFlags(virDomainPtr dom, unsigned int flags) ret = xenUnifiedDomainGetVcpusFlagsInternal(dom, def, flags); -cleanup: + cleanup: virDomainDefFree(def); return ret; } @@ -1574,7 +1574,7 @@ xenUnifiedDomainGetXMLDesc(virDomainPtr dom, unsigned int flags) if (def) ret = virDomainDefFormat(def, flags); -cleanup: + cleanup: virDomainDefFree(def); virDomainDefFree(minidef); return ret; @@ -1628,7 +1628,7 @@ xenUnifiedConnectDomainXMLFromNative(virConnectPtr conn, ret = virDomainDefFormat(def, 0); -cleanup: + cleanup: virDomainDefFree(def); if (conf) virConfFree(conf); @@ -1682,7 +1682,7 @@ xenUnifiedConnectDomainXMLToNative(virConnectPtr conn, ret = xenFormatSxpr(conn, def, priv->xendConfigVersion); } -cleanup: + cleanup: virDomainDefFree(def); if (conf) virConfFree(conf); @@ -1731,7 +1731,7 @@ xenUnifiedDomainMigratePerform(virDomainPtr dom, cookie, cookielen, uri, flags, dname, resource); -cleanup: + cleanup: virDomainDefFree(def); return ret; } @@ -1774,7 +1774,7 @@ xenUnifiedDomainMigrateFinish(virConnectPtr dconn, if (ret) ret->id = minidef->id; -cleanup: + cleanup: virDomainDefFree(def); virDomainDefFree(minidef); return ret; @@ -1845,7 +1845,7 @@ xenUnifiedDomainCreateWithFlags(virDomainPtr dom, unsigned int flags) if (ret >= 0) dom->id = def->id; -cleanup: + cleanup: virDomainDefFree(def); VIR_FREE(name); return ret; @@ -1886,7 +1886,7 @@ xenUnifiedDomainDefineXML(virConnectPtr conn, const char *xml) if (ret) ret->id = -1; -cleanup: + cleanup: virDomainDefFree(def); return ret; } @@ -1911,7 +1911,7 @@ xenUnifiedDomainUndefineFlags(virDomainPtr dom, unsigned int flags) else ret = xenDaemonDomainUndefine(dom->conn, def); -cleanup: + cleanup: virDomainDefFree(def); return ret; } @@ -1949,7 +1949,7 @@ xenUnifiedDomainAttachDevice(virDomainPtr dom, const char *xml) else ret = xenDaemonAttachDeviceFlags(dom->conn, def, xml, flags); -cleanup: + cleanup: virDomainDefFree(def); return ret; } @@ -1973,7 +1973,7 @@ xenUnifiedDomainAttachDeviceFlags(virDomainPtr dom, const char *xml, else ret = xenDaemonAttachDeviceFlags(dom->conn, def, xml, flags); -cleanup: + cleanup: virDomainDefFree(def); return ret; } @@ -2005,7 +2005,7 @@ xenUnifiedDomainDetachDevice(virDomainPtr dom, const char *xml) else ret = xenDaemonDetachDeviceFlags(dom->conn, def, xml, flags); -cleanup: + cleanup: virDomainDefFree(def); return ret; } @@ -2029,7 +2029,7 @@ xenUnifiedDomainDetachDeviceFlags(virDomainPtr dom, const char *xml, else ret = xenDaemonDetachDeviceFlags(dom->conn, def, xml, flags); -cleanup: + cleanup: virDomainDefFree(def); return ret; } @@ -2049,7 +2049,7 @@ xenUnifiedDomainUpdateDeviceFlags(virDomainPtr dom, const char *xml, ret = xenDaemonUpdateDeviceFlags(dom->conn, def, xml, flags); -cleanup: + cleanup: virDomainDefFree(def); return ret; } @@ -2072,7 +2072,7 @@ xenUnifiedDomainGetAutostart(virDomainPtr dom, int *autostart) else ret = xenDaemonDomainGetAutostart(dom->conn, def, autostart); -cleanup: + cleanup: virDomainDefFree(def); return ret; } @@ -2095,7 +2095,7 @@ xenUnifiedDomainSetAutostart(virDomainPtr dom, int autostart) else ret = xenDaemonDomainSetAutostart(dom->conn, def, autostart); -cleanup: + cleanup: virDomainDefFree(def); return ret; } @@ -2124,7 +2124,7 @@ xenUnifiedDomainGetSchedulerType(virDomainPtr dom, int *nparams) ret = xenHypervisorGetSchedulerType(dom->conn, nparams); } -cleanup: + cleanup: virDomainDefFree(def); return ret; } @@ -2158,7 +2158,7 @@ xenUnifiedDomainGetSchedulerParametersFlags(virDomainPtr dom, ret = xenHypervisorGetSchedulerParameters(dom->conn, def, params, nparams); } -cleanup: + cleanup: virDomainDefFree(def); return ret; } @@ -2201,7 +2201,7 @@ xenUnifiedDomainSetSchedulerParametersFlags(virDomainPtr dom, ret = xenHypervisorSetSchedulerParameters(dom->conn, def, params, nparams); } -cleanup: + cleanup: virDomainDefFree(def); return ret; } @@ -2230,7 +2230,7 @@ xenUnifiedDomainBlockStats(virDomainPtr dom, const char *path, ret = xenHypervisorDomainBlockStats(dom->conn, def, path, stats); -cleanup: + cleanup: virDomainDefFree(def); return ret; } @@ -2250,7 +2250,7 @@ xenUnifiedDomainInterfaceStats(virDomainPtr dom, const char *path, ret = xenHypervisorDomainInterfaceStats(def, path, stats); -cleanup: + cleanup: virDomainDefFree(def); return ret; } @@ -2277,7 +2277,7 @@ xenUnifiedDomainBlockPeek(virDomainPtr dom, const char *path, else ret = xenDaemonDomainBlockPeek(dom->conn, def, path, offset, size, buffer); -cleanup: + cleanup: virDomainDefFree(def); return ret; } @@ -2463,7 +2463,7 @@ xenUnifiedNodeDeviceGetPciInfo(virNodeDevicePtr dev, } ret = 0; -out: + out: virNodeDeviceDefFree(def); VIR_FREE(xml); return ret; @@ -2500,7 +2500,7 @@ xenUnifiedNodeDeviceDetachFlags(virNodeDevicePtr dev, goto out; ret = 0; -out: + out: virPCIDeviceFree(pci); return ret; } @@ -2560,7 +2560,7 @@ xenUnifiedNodeDeviceAssignedDomainId(virNodeDevicePtr dev) VIR_FREE(xref); VIR_FREE(bdf); -out: + out: VIR_FREE(ids); return ret; @@ -2593,7 +2593,7 @@ xenUnifiedNodeDeviceReAttach(virNodeDevicePtr dev) goto out; ret = 0; -out: + out: virPCIDeviceFree(pci); return ret; } @@ -2616,7 +2616,7 @@ xenUnifiedNodeDeviceReset(virNodeDevicePtr dev) goto out; ret = 0; -out: + out: virPCIDeviceFree(pci); return ret; } @@ -2673,7 +2673,7 @@ xenUnifiedDomainOpenConsole(virDomainPtr dom, goto cleanup; ret = 0; -cleanup: + cleanup: virDomainDefFree(def); return ret; } @@ -2889,7 +2889,7 @@ xenUnifiedAddDomainInfo(xenUnifiedDomainInfoListPtr list, goto error; return 0; -error: + error: if (info) VIR_FREE(info->name); VIR_FREE(info); diff --git a/src/xen/xen_hypervisor.c b/src/xen/xen_hypervisor.c index e8eaeeb..2e35edf 100644 --- a/src/xen/xen_hypervisor.c +++ b/src/xen/xen_hypervisor.c @@ -2275,7 +2275,7 @@ get_cpu_flags(virConnectPtr conn, const char **hvm, int *pae, int *longmode) ret = 1; -out: + out: VIR_FORCE_CLOSE(fd); return ret; } @@ -2537,7 +2537,7 @@ xenHypervisorMakeCapabilities(virConnectPtr conn) if (virNodeSuspendGetTargetMask(&caps->host.powerMgmt) < 0) VIR_WARN("Failed to get host power management capabilities"); -cleanup: + cleanup: VIR_FORCE_FCLOSE(cpuinfo); VIR_FORCE_FCLOSE(capabilities); diff --git a/src/xen/xen_inotify.c b/src/xen/xen_inotify.c index af8915f..7c2d133 100644 --- a/src/xen/xen_inotify.c +++ b/src/xen/xen_inotify.c @@ -251,7 +251,7 @@ xenInotifyEvent(int watch ATTRIBUTE_UNUSED, xenUnifiedLock(priv); -reread: + reread: got = read(fd, buf, sizeof(buf)); if (got == -1) { if (errno == EINTR) @@ -320,7 +320,7 @@ reread: } -cleanup: + cleanup: xenUnifiedUnlock(priv); } diff --git a/src/xen/xend_internal.c b/src/xen/xend_internal.c index 55604bc..af41bcc 100644 --- a/src/xen/xend_internal.c +++ b/src/xen/xend_internal.c @@ -586,7 +586,7 @@ sexpr_get(virConnectPtr xend, const char *fmt, ...) res = string2sexpr(buffer); -cleanup: + cleanup: VIR_FREE(buffer); return res; } @@ -785,11 +785,11 @@ xenDaemonListDomainsOld(virConnectPtr xend) ret[i] = NULL; - error: + error: sexpr_free(root); return ret; -no_memory: + no_memory: for (i = 0; i < count; i++) VIR_FREE(ret[i]); VIR_FREE(ret); @@ -865,7 +865,7 @@ xenDaemonDomainLookupByName_ids(virConnectPtr xend, } } - error: + error: sexpr_free(root); return ret; } @@ -1107,9 +1107,9 @@ sexpr_to_xend_topology(const struct sexpr *root, virCapsPtr caps) return 0; - parse_error: + parse_error: virReportError(VIR_ERR_XEN_CALL, "%s", _("topology syntax error")); - error: + error: virCapabilitiesClearHostNUMACellCPUTopology(cpuInfo, nb_cpus); VIR_FREE(cpuInfo); return -1; @@ -1153,7 +1153,7 @@ sexpr_to_domain(virConnectPtr conn, const struct sexpr *root) return virDomainDefNew(name, uuid, id); -error: + error: virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("failed to parse Xend domain information")); virObjectUnref(ret); @@ -1237,7 +1237,7 @@ xenDaemonOpen(virConnectPtr conn, done: ret = 0; -failed: + failed: VIR_FREE(port); return ret; } @@ -1601,7 +1601,7 @@ xenDaemonDomainFetch(virConnectPtr conn, int domid, const char *name, vncport))) goto cleanup; -cleanup: + cleanup: sexpr_free(root); return def; @@ -1711,7 +1711,7 @@ xenDaemonLookupByName(virConnectPtr conn, const char *domname) ret = sexpr_to_domain(conn, root); -error: + error: sexpr_free(root); return ret; } @@ -1914,7 +1914,7 @@ xenDaemonDomainPinVcpu(virConnectPtr conn, return ret; -cleanup: + cleanup: virDomainDefFree(def); return -1; } @@ -2186,7 +2186,7 @@ xenDaemonCreateXML(virConnectPtr conn, virDomainDefPtr def) return 0; - error: + error: /* Make sure we don't leave a still-born domain around */ if (def->id != -1) xenDaemonDomainDestroy(conn, def); @@ -2333,7 +2333,7 @@ xenDaemonAttachDeviceFlags(virConnectPtr conn, } } -cleanup: + cleanup: VIR_FREE(sexpr); virDomainDefFree(def); virDomainDeviceDefFree(dev); @@ -2438,7 +2438,7 @@ xenDaemonUpdateDeviceFlags(virConnectPtr conn, "config", sexpr, "dev", ref, NULL); } -cleanup: + cleanup: VIR_FREE(sexpr); virDomainDefFree(def); virDomainDeviceDefFree(dev); @@ -2536,7 +2536,7 @@ xenDaemonDetachDeviceFlags(virConnectPtr conn, NULL); } -cleanup: + cleanup: virDomainDefFree(def); virDomainDeviceDefFree(dev); @@ -2627,7 +2627,7 @@ xenDaemonDomainSetAutostart(virConnectPtr conn, } ret = 0; - error: + error: virBufferFreeAndReset(&buffer); VIR_FREE(content); sexpr_free(root); @@ -2840,7 +2840,7 @@ xenDaemonDomainDefineXML(virConnectPtr conn, virDomainDefPtr def) ret = 0; -cleanup: + cleanup: return ret; } @@ -2897,7 +2897,7 @@ xenDaemonNumOfDefinedDomains(virConnectPtr conn) ret++; } -error: + error: sexpr_free(root); return ret; } @@ -2932,11 +2932,11 @@ xenDaemonListDefinedDomains(virConnectPtr conn, break; } -cleanup: + cleanup: sexpr_free(root); return ret; -error: + error: for (i = 0; i < ret; ++i) VIR_FREE(names[i]); @@ -2996,7 +2996,7 @@ xenDaemonGetSchedulerType(virConnectPtr conn, goto error; } -error: + error: sexpr_free(root); return schedulertype; @@ -3102,7 +3102,7 @@ xenDaemonGetSchedulerParameters(virConnectPtr conn, goto error; } -error: + error: sexpr_free(root); VIR_FREE(sched_type); return ret; @@ -3209,7 +3209,7 @@ xenDaemonSetSchedulerParameters(virConnectPtr conn, goto error; } -error: + error: sexpr_free(root); VIR_FREE(sched_type); return ret; diff --git a/src/xen/xm_internal.c b/src/xen/xm_internal.c index 846b79c..52d2a1e 100644 --- a/src/xen/xm_internal.c +++ b/src/xen/xm_internal.c @@ -491,7 +491,7 @@ xenXMDomainGetInfo(virConnectPtr conn, xenUnifiedUnlock(priv); return 0; -error: + error: xenUnifiedUnlock(priv); return -1; } @@ -525,7 +525,7 @@ xenXMDomainGetXMLDesc(virConnectPtr conn, priv->xmlopt, false); -cleanup: + cleanup: xenUnifiedUnlock(priv); return ret; } @@ -570,7 +570,7 @@ xenXMDomainSetMemory(virConnectPtr conn, goto cleanup; ret = 0; -cleanup: + cleanup: xenUnifiedUnlock(priv); return ret; } @@ -614,7 +614,7 @@ xenXMDomainSetMaxMemory(virConnectPtr conn, goto cleanup; ret = 0; -cleanup: + cleanup: xenUnifiedUnlock(priv); return ret; } @@ -641,7 +641,7 @@ xenXMDomainGetMaxMemory(virConnectPtr conn, ret = entry->def->mem.max_balloon; -cleanup: + cleanup: xenUnifiedUnlock(priv); return ret; } @@ -719,7 +719,7 @@ xenXMDomainSetVcpusFlags(virConnectPtr conn, goto cleanup; ret = 0; -cleanup: + cleanup: xenUnifiedUnlock(priv); return ret; } @@ -765,7 +765,7 @@ xenXMDomainGetVcpusFlags(virConnectPtr conn, ret = ((flags & VIR_DOMAIN_VCPU_MAXIMUM) ? entry->def->maxvcpus : entry->def->vcpus); -cleanup: + cleanup: xenUnifiedUnlock(priv); return ret; } @@ -849,7 +849,7 @@ xenXMDomainLookupByName(virConnectPtr conn, const char *domname) ret = virDomainDefNew(domname, entry->def->uuid, -1); -cleanup: + cleanup: xenUnifiedUnlock(priv); return ret; } @@ -892,7 +892,7 @@ xenXMDomainLookupByUUID(virConnectPtr conn, const unsigned char *uuid) ret = virDomainDefNew(entry->def->name, uuid, -1); -cleanup: + cleanup: xenUnifiedUnlock(priv); return ret; } @@ -1104,7 +1104,7 @@ xenXMDomainUndefine(virConnectPtr conn, ret = 0; -cleanup: + cleanup: xenUnifiedUnlock(priv); return ret; } @@ -1179,7 +1179,7 @@ xenXMListDefinedDomains(virConnectPtr conn, char **const names, int maxnames) ret = ctx.count; -cleanup: + cleanup: xenUnifiedUnlock(priv); return ret; } @@ -1201,7 +1201,7 @@ xenXMNumOfDefinedDomains(virConnectPtr conn) ret = virHashSize(priv->nameConfigMap); -cleanup: + cleanup: xenUnifiedUnlock(priv); return ret; } @@ -1444,7 +1444,7 @@ xenXMDomainGetAutostart(virDomainDefPtr def, ret = 0; -cleanup: + cleanup: VIR_FREE(linkname); VIR_FREE(config); return ret; @@ -1481,7 +1481,7 @@ xenXMDomainSetAutostart(virDomainDefPtr def, } ret = 0; -cleanup: + cleanup: VIR_FREE(linkname); VIR_FREE(config); diff --git a/src/xen/xs_internal.c b/src/xen/xs_internal.c index 8040bc3..0f7b7d2 100644 --- a/src/xen/xs_internal.c +++ b/src/xen/xs_internal.c @@ -242,7 +242,7 @@ xenStoreNumOfDomains(virConnectPtr conn) if (xenHypervisorHasDomain(conn, (int)id)) realnum++; } -out: + out: VIR_FREE(idlist); ret = realnum; } @@ -287,7 +287,7 @@ xenStoreDoListDomains(virConnectPtr conn, ids[ret++] = (int) id; } -out: + out: VIR_FREE(idlist); return ret; } @@ -673,7 +673,7 @@ xenStoreAddWatch(virConnectPtr conn, return xs_watch(priv->xshandle, watch->path, watch->token); - error: + error: if (watch) { VIR_FREE(watch->path); VIR_FREE(watch->token); @@ -773,7 +773,7 @@ xenStoreWatchEvent(int watch ATTRIBUTE_UNUSED, sw->cb(conn, path, token, sw->opaque); VIR_FREE(event); -cleanup: + cleanup: xenUnifiedUnlock(priv); } @@ -797,7 +797,7 @@ xenStoreDomainIntroduced(virConnectPtr conn, xenUnifiedPrivatePtr priv = opaque; -retry: + retry: new_domain_cnt = xenStoreNumOfDomains(conn); if (new_domain_cnt < 0) return -1; @@ -880,7 +880,7 @@ xenStoreDomainReleased(virConnectPtr conn, if (!priv->activeDomainList->count) return 0; -retry: + retry: new_domain_cnt = xenStoreNumOfDomains(conn); if (new_domain_cnt < 0) return -1; -- 1.8.3.2