Eliminate all the code re-use which checks for priv->agentError or priv->agent. Signed-off-by: Martin Kletzander <mkletzan@redhat.com> --- src/qemu/qemu_domain.c | 22 +++++++++ src/qemu/qemu_domain.h | 4 ++ src/qemu/qemu_driver.c | 121 ++++++------------------------------------------- 3 files changed, 40 insertions(+), 107 deletions(-) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index bc0b8f7..4465bef 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -2465,3 +2465,25 @@ cleanup: virDomainDefFree(migratableDefDst); return ret; } + +bool +qemuDomainAgentAvailable(qemuDomainObjPrivatePtr priv, + bool reportError) +{ + if (priv->agentError) { + if (reportError) { + virReportError(VIR_ERR_AGENT_UNRESPONSIVE, "%s", + _("QEMU guest agent is not " + "available due to an error")); + } + return false; + } + if (!priv->agent) { + if (reportError) { + virReportError(VIR_ERR_ARGUMENT_UNSUPPORTED, "%s", + _("QEMU guest agent is not configured")); + } + return false; + } + return true; +} diff --git a/src/qemu/qemu_domain.h b/src/qemu/qemu_domain.h index 0bed50b..b2830c4 100644 --- a/src/qemu/qemu_domain.h +++ b/src/qemu/qemu_domain.h @@ -376,4 +376,8 @@ int qemuDomainUpdateDeviceList(virQEMUDriverPtr driver, bool qemuDomainDefCheckABIStability(virQEMUDriverPtr driver, virDomainDefPtr src, virDomainDefPtr dst); + +bool qemuDomainAgentAvailable(qemuDomainObjPrivatePtr priv, + bool reportError); + #endif /* __QEMU_DOMAIN_H__ */ diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 89f443f..99a2840 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -1798,6 +1798,7 @@ static int qemuDomainShutdownFlags(virDomainPtr dom, unsigned int flags) { qemuDomainObjPrivatePtr priv; bool useAgent = false, agentRequested, acpiRequested; bool isReboot = false; + bool agentForced; int agentFlag = QEMU_AGENT_SHUTDOWN_POWERDOWN; virCheckFlags(VIR_DOMAIN_SHUTDOWN_ACPI_POWER_BTN | @@ -1824,25 +1825,11 @@ static int qemuDomainShutdownFlags(virDomainPtr dom, unsigned int flags) { if (virDomainShutdownFlagsEnsureACL(dom->conn, vm->def, flags) < 0) goto cleanup; - if (priv->agentError) { - if (agentRequested && !acpiRequested) { - virReportError(VIR_ERR_AGENT_UNRESPONSIVE, "%s", - _("QEMU guest agent is not " - "available due to an error")); + agentForced = agentRequested && !acpiRequested; + if (!qemuDomainAgentAvailable(priv, agentForced)) { + if (agentForced) goto cleanup; - } else { - useAgent = false; - } - } - - if (!priv->agent) { - if (agentRequested && !acpiRequested) { - virReportError(VIR_ERR_ARGUMENT_UNSUPPORTED, "%s", - _("QEMU guest agent is not configured")); - goto cleanup; - } else { - useAgent = false; - } + useAgent = false; } if (qemuDomainObjBeginJob(driver, vm, QEMU_JOB_MODIFY) < 0) @@ -1930,18 +1917,8 @@ qemuDomainReboot(virDomainPtr dom, unsigned int flags) priv->agent)) useAgent = true; - if (useAgent) { - if (priv->agentError) { - virReportError(VIR_ERR_AGENT_UNRESPONSIVE, "%s", - _("QEMU guest agent is not " - "available due to an error")); - goto cleanup; - } - if (!priv->agent) { - virReportError(VIR_ERR_ARGUMENT_UNSUPPORTED, "%s", - _("QEMU guest agent is not configured")); - goto cleanup; - } + if (useAgent && !qemuDomainAgentAvailable(priv, true)) { + goto cleanup; } else { #if WITH_YAJL if (virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_MONITOR_JSON)) { @@ -4187,18 +4164,8 @@ qemuDomainSetVcpusFlags(virDomainPtr dom, unsigned int nvcpus, goto endjob; } - if (priv->agentError) { - virReportError(VIR_ERR_AGENT_UNRESPONSIVE, "%s", - _("QEMU guest agent is not " - "available due to an error")); - goto endjob; - } - - if (!priv->agent) { - virReportError(VIR_ERR_ARGUMENT_UNSUPPORTED, "%s", - _("QEMU guest agent is not configured")); + if (!qemuDomainAgentAvailable(priv, true)) goto endjob; - } if (nvcpus > vm->def->vcpus) { virReportError(VIR_ERR_INVALID_ARG, @@ -4925,18 +4892,8 @@ qemuDomainGetVcpusFlags(virDomainPtr dom, unsigned int flags) if (qemuDomainObjBeginJob(driver, vm, QEMU_JOB_QUERY) < 0) goto cleanup; - if (priv->agentError) { - virReportError(VIR_ERR_AGENT_UNRESPONSIVE, "%s", - _("QEMU guest agent is not " - "available due to an error")); - goto endjob; - } - - if (!priv->agent) { - virReportError(VIR_ERR_ARGUMENT_UNSUPPORTED, "%s", - _("QEMU guest agent is not configured")); + if (!qemuDomainAgentAvailable(priv, true)) goto endjob; - } if (!virDomainObjIsActive(vm)) { virReportError(VIR_ERR_OPERATION_INVALID, "%s", @@ -12044,17 +12001,8 @@ qemuDomainSnapshotFSFreeze(virDomainObjPtr vm) { qemuDomainObjPrivatePtr priv = vm->privateData; int freezed; - if (priv->agentError) { - virReportError(VIR_ERR_AGENT_UNRESPONSIVE, "%s", - _("QEMU guest agent is not " - "available due to an error")); - return -1; - } - if (!priv->agent) { - virReportError(VIR_ERR_ARGUMENT_UNSUPPORTED, "%s", - _("QEMU guest agent is not configured")); + if (!qemuDomainAgentAvailable(priv, true)) return -1; - } qemuDomainObjEnterAgent(vm); freezed = qemuAgentFSFreeze(priv->agent); @@ -12070,19 +12018,8 @@ qemuDomainSnapshotFSThaw(virDomainObjPtr vm, bool report) int thawed; virErrorPtr err = NULL; - if (priv->agentError) { - if (report) - virReportError(VIR_ERR_AGENT_UNRESPONSIVE, "%s", - _("QEMU guest agent is not " - "available due to an error")); - return -1; - } - if (!priv->agent) { - if (report) - virReportError(VIR_ERR_ARGUMENT_UNSUPPORTED, "%s", - _("QEMU guest agent is not configured")); + if (!qemuDomainAgentAvailable(priv, report)) return -1; - } qemuDomainObjEnterAgent(vm); if (!report) @@ -16227,18 +16164,8 @@ qemuDomainPMSuspendForDuration(virDomainPtr dom, } } - if (priv->agentError) { - virReportError(VIR_ERR_AGENT_UNRESPONSIVE, "%s", - _("QEMU guest agent is not " - "available due to an error")); - goto cleanup; - } - - if (!priv->agent) { - virReportError(VIR_ERR_ARGUMENT_UNSUPPORTED, "%s", - _("QEMU guest agent is not configured")); + if (!qemuDomainAgentAvailable(priv, true)) goto cleanup; - } if (qemuDomainObjBeginJob(driver, vm, QEMU_JOB_MODIFY) < 0) goto cleanup; @@ -16360,18 +16287,8 @@ qemuDomainQemuAgentCommand(virDomainPtr domain, goto cleanup; } - if (priv->agentError) { - virReportError(VIR_ERR_AGENT_UNRESPONSIVE, "%s", - _("QEMU guest agent is not " - "available due to an error")); - goto cleanup; - } - - if (!priv->agent) { - virReportError(VIR_ERR_ARGUMENT_UNSUPPORTED, "%s", - _("QEMU guest agent is not configured")); + if (!qemuDomainAgentAvailable(priv, true)) goto cleanup; - } if (qemuDomainObjBeginJob(driver, vm, QEMU_JOB_MODIFY) < 0) goto cleanup; @@ -16432,18 +16349,8 @@ qemuDomainFSTrim(virDomainPtr dom, goto cleanup; } - if (!priv->agent) { - virReportError(VIR_ERR_ARGUMENT_UNSUPPORTED, "%s", - _("QEMU guest agent is not configured")); - goto cleanup; - } - - if (priv->agentError) { - virReportError(VIR_ERR_AGENT_UNRESPONSIVE, "%s", - _("QEMU guest agent is not " - "available due to an error")); + if (!qemuDomainAgentAvailable(priv, true)) goto cleanup; - } if (qemuDomainObjBeginJob(driver, vm, QEMU_JOB_MODIFY) < 0) goto cleanup; -- 1.9.0

Although not explicitly requested, we are using K&R (or Kernel) indentation for curly braces around functions in HACKING file and most of the code. The rest is inconsistent and this patch is trying to fix the most of it. Found by: git grep -nH -e '^\s*\*\?[_a-zA-Z0-9]\+\(,\? \*\?[_a-zA-Z0-9]\+\)\+) \?{$' \ -e '^\s*[_a-zA-Z0-9]\+\( [_a-zA-Z0-9]\+\)*(\*\?[_a-zA-Z0-9]\+\(,\? \*\?[_a-zA-Z0-9]\+\)\+) \?{$ and skipped foreach constructs which were found as well. Signed-off-by: Martin Kletzander <mkletzan@redhat.com> --- daemon/libvirtd-config.c | 5 +- docs/internals/command.html.in | 3 +- examples/dominfo/info1.c | 7 +- src/conf/domain_conf.c | 6 +- src/conf/domain_nwfilter.c | 13 ++- src/conf/interface_conf.c | 54 ++++++---- src/conf/nwfilter_conf.c | 21 ++-- src/conf/nwfilter_params.c | 3 +- src/interface/interface_backend_netcf.c | 5 +- src/libxl/libxl_driver.c | 3 +- src/lxc/lxc_driver.c | 27 +++-- src/network/bridge_driver.c | 45 +++++--- src/nwfilter/nwfilter_driver.c | 26 +++-- src/nwfilter/nwfilter_learnipaddr.c | 38 ++++--- src/openvz/openvz_conf.c | 15 ++- src/openvz/openvz_driver.c | 42 +++++--- src/qemu/qemu_agent.c | 5 +- src/qemu/qemu_command.c | 6 +- src/qemu/qemu_driver.c | 72 ++++++++----- src/qemu/qemu_migration.c | 3 +- src/qemu/qemu_monitor.c | 3 +- src/qemu/qemu_monitor_json.c | 3 +- src/qemu/qemu_monitor_text.c | 17 +-- src/rpc/virnetserver.c | 8 +- src/rpc/virnetserverclient.c | 5 +- src/rpc/virnettlscontext.c | 5 +- src/secret/secret_driver.c | 8 +- src/security/security_stack.c | 5 +- src/storage/storage_backend_fs.c | 12 ++- src/storage/storage_driver.c | 72 ++++++++----- src/test/test_driver.c | 135 ++++++++++++++++-------- src/uml/uml_driver.c | 69 ++++++++----- src/util/virconf.c | 5 +- src/util/virdbus.c | 8 +- src/util/virerror.c | 3 +- src/util/vireventpoll.c | 20 ++-- src/util/virhook.c | 8 +- src/util/virrandom.c | 5 +- src/util/virsocketaddr.c | 26 +++-- src/util/virthread.c | 5 +- src/util/virutil.c | 17 +-- src/util/viruuid.c | 5 +- src/vbox/vbox_tmpl.c | 177 +++++++++++++++++++++----------- src/xen/xen_driver.c | 6 +- src/xen/xm_internal.c | 8 +- src/xenapi/xenapi_utils.c | 5 +- src/xenxs/xen_xm.c | 32 ++++-- tests/commandhelper.c | 5 +- tests/qemuargv2xmltest.c | 3 +- tests/testutils.c | 6 +- tests/virshtest.c | 54 ++++++---- tests/virusbtest.c | 3 +- tests/xencapstest.c | 33 ++++-- 53 files changed, 775 insertions(+), 400 deletions(-) diff --git a/daemon/libvirtd-config.c b/daemon/libvirtd-config.c index 856a038..7a1f3c2 100644 --- a/daemon/libvirtd-config.c +++ b/daemon/libvirtd-config.c @@ -1,7 +1,7 @@ /* * libvirtd-config.c: daemon start of day, guest process & i/o management * - * Copyright (C) 2006-2012 Red Hat, Inc. + * Copyright (C) 2006-2012, 2014 Red Hat, Inc. * Copyright (C) 2006 Daniel P. Berrange * * This library is free software; you can redistribute it and/or @@ -156,7 +156,8 @@ checkType(virConfValuePtr p, const char *filename, } while (0) -static int remoteConfigGetAuth(virConfPtr conf, const char *key, int *auth, const char *filename) { +static int remoteConfigGetAuth(virConfPtr conf, const char *key, int *auth, const char *filename) +{ virConfValuePtr p; p = virConfGetValue(conf, key); diff --git a/docs/internals/command.html.in b/docs/internals/command.html.in index f5c28af..fc767d9 100644 --- a/docs/internals/command.html.in +++ b/docs/internals/command.html.in @@ -560,7 +560,8 @@ <pre> int runhook(const char *drvstr, const char *id, const char *opstr, const char *subopstr, - const char *extra) { + const char *extra) +{ int ret; char *path; virCommandPtr cmd; diff --git a/examples/dominfo/info1.c b/examples/dominfo/info1.c index 4d578bc..13c45ec 100644 --- a/examples/dominfo/info1.c +++ b/examples/dominfo/info1.c @@ -19,7 +19,8 @@ * extract the domain 0 information */ static void -getDomainInfo(int id) { +getDomainInfo(int id) +{ virConnectPtr conn = NULL; /* the hypervisor connection */ virDomainPtr dom = NULL; /* the domain being checked */ virDomainInfo info; /* the information being fetched */ @@ -55,8 +56,8 @@ error: virConnectClose(conn); } -int main() { - +int main() +{ getDomainInfo(0); return 0; diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 92b1324..1bf1268 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -6185,7 +6185,8 @@ virDomainNetGenerateMAC(virDomainXMLOptionPtr xmlopt, static virDomainFSDefPtr virDomainFSDefParseXML(xmlNodePtr node, xmlXPathContextPtr ctxt, - unsigned int flags) { + unsigned int flags) +{ virDomainFSDefPtr def; xmlNodePtr cur, save_node = ctxt->node; char *type = NULL; @@ -7005,7 +7006,8 @@ error: } static int -virDomainChrDefaultTargetType(int devtype) { +virDomainChrDefaultTargetType(int devtype) +{ switch ((enum virDomainChrDeviceType) devtype) { case VIR_DOMAIN_CHR_DEVICE_TYPE_CHANNEL: virReportError(VIR_ERR_XML_ERROR, diff --git a/src/conf/domain_nwfilter.c b/src/conf/domain_nwfilter.c index 688a200..6330f67 100644 --- a/src/conf/domain_nwfilter.c +++ b/src/conf/domain_nwfilter.c @@ -1,6 +1,7 @@ /* * domain_nwfilter.c: * + * Copyright (C) 2014 Red Hat, Inc. * Copyright (C) 2010 IBM Corporation * * This library is free software; you can redistribute it and/or @@ -31,14 +32,16 @@ static virDomainConfNWFilterDriverPtr nwfilterDriver; void -virDomainConfNWFilterRegister(virDomainConfNWFilterDriverPtr driver) { +virDomainConfNWFilterRegister(virDomainConfNWFilterDriverPtr driver) +{ nwfilterDriver = driver; } int virDomainConfNWFilterInstantiate(virConnectPtr conn, const unsigned char *vmuuid, - virDomainNetDefPtr net) { + virDomainNetDefPtr net) +{ if (nwfilterDriver != NULL) return nwfilterDriver->instantiateFilter(conn, vmuuid, net); /* driver module not available -- don't indicate failure */ @@ -46,13 +49,15 @@ virDomainConfNWFilterInstantiate(virConnectPtr conn, } void -virDomainConfNWFilterTeardown(virDomainNetDefPtr net) { +virDomainConfNWFilterTeardown(virDomainNetDefPtr net) +{ if (nwfilterDriver != NULL) nwfilterDriver->teardownFilter(net); } void -virDomainConfVMNWFilterTeardown(virDomainObjPtr vm) { +virDomainConfVMNWFilterTeardown(virDomainObjPtr vm) +{ size_t i; if (nwfilterDriver != NULL) { diff --git a/src/conf/interface_conf.c b/src/conf/interface_conf.c index 9f065bf..83cc0a9 100644 --- a/src/conf/interface_conf.c +++ b/src/conf/interface_conf.c @@ -44,7 +44,8 @@ static int virInterfaceDefDevFormat(virBufferPtr buf, const virInterfaceDef *def); static -void virInterfaceIpDefFree(virInterfaceIpDefPtr def) { +void virInterfaceIpDefFree(virInterfaceIpDefPtr def) +{ if (def == NULL) return; VIR_FREE(def->address); @@ -52,7 +53,8 @@ void virInterfaceIpDefFree(virInterfaceIpDefPtr def) { } static -void virInterfaceProtocolDefFree(virInterfaceProtocolDefPtr def) { +void virInterfaceProtocolDefFree(virInterfaceProtocolDefPtr def) +{ size_t i; if (def == NULL) @@ -112,7 +114,8 @@ void virInterfaceDefFree(virInterfaceDefPtr def) static int virInterfaceDefParseName(virInterfaceDefPtr def, - xmlXPathContextPtr ctxt) { + xmlXPathContextPtr ctxt) +{ char *tmp; tmp = virXPathString("string(./@name)", ctxt); @@ -127,7 +130,8 @@ virInterfaceDefParseName(virInterfaceDefPtr def, static int virInterfaceDefParseMtu(virInterfaceDefPtr def, - xmlXPathContextPtr ctxt) { + xmlXPathContextPtr ctxt) +{ unsigned long mtu; int ret; @@ -144,7 +148,8 @@ virInterfaceDefParseMtu(virInterfaceDefPtr def, static int virInterfaceDefParseStartMode(virInterfaceDefPtr def, - xmlXPathContextPtr ctxt) { + xmlXPathContextPtr ctxt) +{ char *tmp; tmp = virXPathString("string(./start/@mode)", ctxt); @@ -167,7 +172,8 @@ virInterfaceDefParseStartMode(virInterfaceDefPtr def, } static int -virInterfaceDefParseBondMode(xmlXPathContextPtr ctxt) { +virInterfaceDefParseBondMode(xmlXPathContextPtr ctxt) +{ char *tmp; int ret = 0; @@ -198,7 +204,8 @@ virInterfaceDefParseBondMode(xmlXPathContextPtr ctxt) { } static int -virInterfaceDefParseBondMiiCarrier(xmlXPathContextPtr ctxt) { +virInterfaceDefParseBondMiiCarrier(xmlXPathContextPtr ctxt) +{ char *tmp; int ret = 0; @@ -219,7 +226,8 @@ virInterfaceDefParseBondMiiCarrier(xmlXPathContextPtr ctxt) { } static int -virInterfaceDefParseBondArpValid(xmlXPathContextPtr ctxt) { +virInterfaceDefParseBondArpValid(xmlXPathContextPtr ctxt) +{ char *tmp; int ret = 0; @@ -243,7 +251,8 @@ virInterfaceDefParseBondArpValid(xmlXPathContextPtr ctxt) { static int virInterfaceDefParseDhcp(virInterfaceProtocolDefPtr def, - xmlNodePtr dhcp, xmlXPathContextPtr ctxt) { + xmlNodePtr dhcp, xmlXPathContextPtr ctxt) +{ xmlNodePtr save; char *tmp; int ret = 0; @@ -273,7 +282,8 @@ virInterfaceDefParseDhcp(virInterfaceProtocolDefPtr def, static int virInterfaceDefParseIp(virInterfaceIpDefPtr def, - xmlXPathContextPtr ctxt) { + xmlXPathContextPtr ctxt) +{ int ret = 0; char *tmp; long l; @@ -296,7 +306,8 @@ virInterfaceDefParseIp(virInterfaceIpDefPtr def, static int virInterfaceDefParseProtoIPv4(virInterfaceProtocolDefPtr def, - xmlXPathContextPtr ctxt) { + xmlXPathContextPtr ctxt) +{ xmlNodePtr dhcp; xmlNodePtr *ipNodes = NULL; int nIpNodes, ret = -1; @@ -346,7 +357,8 @@ error: static int virInterfaceDefParseProtoIPv6(virInterfaceProtocolDefPtr def, - xmlXPathContextPtr ctxt) { + xmlXPathContextPtr ctxt) +{ xmlNodePtr dhcp, autoconf; xmlNodePtr *ipNodes = NULL; int nIpNodes, ret = -1; @@ -400,7 +412,8 @@ error: static int virInterfaceDefParseIfAdressing(virInterfaceDefPtr def, - xmlXPathContextPtr ctxt) { + xmlXPathContextPtr ctxt) +{ xmlNodePtr save; xmlNodePtr *protoNodes = NULL; int nProtoNodes, pp, ret = -1; @@ -469,7 +482,8 @@ error: static int virInterfaceDefParseBridge(virInterfaceDefPtr def, - xmlXPathContextPtr ctxt) { + xmlXPathContextPtr ctxt) +{ xmlNodePtr *interfaces = NULL; xmlNodePtr bridge; virInterfaceDefPtr itf; @@ -510,7 +524,8 @@ error: static int virInterfaceDefParseBondItfs(virInterfaceDefPtr def, - xmlXPathContextPtr ctxt) { + xmlXPathContextPtr ctxt) +{ xmlNodePtr *interfaces = NULL; xmlNodePtr bond = ctxt->node; virInterfaceDefPtr itf; @@ -556,7 +571,8 @@ error: static int virInterfaceDefParseBond(virInterfaceDefPtr def, - xmlXPathContextPtr ctxt) { + xmlXPathContextPtr ctxt) +{ int res; def->data.bond.mode = virInterfaceDefParseBondMode(ctxt); @@ -627,7 +643,8 @@ virInterfaceDefParseBond(virInterfaceDefPtr def, static int virInterfaceDefParseVlan(virInterfaceDefPtr def, - xmlXPathContextPtr ctxt) { + xmlXPathContextPtr ctxt) +{ def->data.vlan.tag = virXPathString("string(./@tag)", ctxt); if (def->data.vlan.tag == NULL) { virReportError(VIR_ERR_XML_ERROR, @@ -646,7 +663,8 @@ virInterfaceDefParseVlan(virInterfaceDefPtr def, } static virInterfaceDefPtr -virInterfaceDefParseXML(xmlXPathContextPtr ctxt, int parentIfType) { +virInterfaceDefParseXML(xmlXPathContextPtr ctxt, int parentIfType) +{ virInterfaceDefPtr def; int type; char *tmp; diff --git a/src/conf/nwfilter_conf.c b/src/conf/nwfilter_conf.c index 2ea4d2e..efe5f5e 100644 --- a/src/conf/nwfilter_conf.c +++ b/src/conf/nwfilter_conf.c @@ -280,7 +280,8 @@ intMapGetByString(const struct int_map *intmap, const char *str, int casecmp, void -virNWFilterRuleDefFree(virNWFilterRuleDefPtr def) { +virNWFilterRuleDefFree(virNWFilterRuleDefPtr def) +{ size_t i; if (!def) return; @@ -299,7 +300,8 @@ virNWFilterRuleDefFree(virNWFilterRuleDefPtr def) { static void -virNWFilterIncludeDefFree(virNWFilterIncludeDefPtr inc) { +virNWFilterIncludeDefFree(virNWFilterIncludeDefPtr inc) +{ if (!inc) return; virNWFilterHashTableFree(inc->params); @@ -309,7 +311,8 @@ virNWFilterIncludeDefFree(virNWFilterIncludeDefPtr inc) { static void -virNWFilterEntryFree(virNWFilterEntryPtr entry) { +virNWFilterEntryFree(virNWFilterEntryPtr entry) +{ if (!entry) return; @@ -320,7 +323,8 @@ virNWFilterEntryFree(virNWFilterEntryPtr entry) { void -virNWFilterDefFree(virNWFilterDefPtr def) { +virNWFilterDefFree(virNWFilterDefPtr def) +{ size_t i; if (!def) return; @@ -2493,7 +2497,8 @@ err_exit: } static virNWFilterDefPtr -virNWFilterDefParseXML(xmlXPathContextPtr ctxt) { +virNWFilterDefParseXML(xmlXPathContextPtr ctxt) +{ virNWFilterDefPtr ret; xmlNodePtr curr = ctxt->node; char *uuid = NULL; @@ -2622,7 +2627,8 @@ virNWFilterDefParseXML(xmlXPathContextPtr ctxt) { virNWFilterDefPtr virNWFilterDefParseNode(xmlDocPtr xml, - xmlNodePtr root) { + xmlNodePtr root) +{ xmlXPathContextPtr ctxt = NULL; virNWFilterDefPtr def = NULL; @@ -2650,7 +2656,8 @@ cleanup: static virNWFilterDefPtr virNWFilterDefParse(const char *xmlStr, - const char *filename) { + const char *filename) +{ virNWFilterDefPtr def = NULL; xmlDocPtr xml; diff --git a/src/conf/nwfilter_params.c b/src/conf/nwfilter_params.c index a78c407..699f6a5 100644 --- a/src/conf/nwfilter_params.c +++ b/src/conf/nwfilter_params.c @@ -684,7 +684,8 @@ virNWFilterHashTableFree(virNWFilterHashTablePtr table) virNWFilterHashTablePtr -virNWFilterHashTableCreate(int n) { +virNWFilterHashTableCreate(int n) +{ virNWFilterHashTablePtr ret; if (VIR_ALLOC(ret) < 0) diff --git a/src/interface/interface_backend_netcf.c b/src/interface/interface_backend_netcf.c index b4c1fe9..de69e82 100644 --- a/src/interface/interface_backend_netcf.c +++ b/src/interface/interface_backend_netcf.c @@ -2,7 +2,7 @@ * interface_backend_netcf.c: backend driver methods to handle physical * interface configuration using the netcf library. * - * Copyright (C) 2006-2013 Red Hat, Inc. + * Copyright (C) 2006-2014 Red Hat, Inc. * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -898,7 +898,8 @@ cleanup: return ret; } -static int netcfInterfaceUndefine(virInterfacePtr ifinfo) { +static int netcfInterfaceUndefine(virInterfacePtr ifinfo) +{ virNetcfDriverStatePtr driver = ifinfo->conn->interfacePrivateData; struct netcf_if *iface = NULL; virInterfaceDefPtr def = NULL; diff --git a/src/libxl/libxl_driver.c b/src/libxl/libxl_driver.c index 09ae075..750e9b2 100644 --- a/src/libxl/libxl_driver.c +++ b/src/libxl/libxl_driver.c @@ -171,7 +171,8 @@ cleanup: } static char * -libxlDomainManagedSavePath(libxlDriverPrivatePtr driver, virDomainObjPtr vm) { +libxlDomainManagedSavePath(libxlDriverPrivatePtr driver, virDomainObjPtr vm) +{ char *ret; libxlDriverConfigPtr cfg = libxlDriverConfigGet(driver); diff --git a/src/lxc/lxc_driver.c b/src/lxc/lxc_driver.c index 0ab1ba2..d9b7647 100644 --- a/src/lxc/lxc_driver.c +++ b/src/lxc/lxc_driver.c @@ -383,7 +383,8 @@ cleanup: return ret; } -static int lxcConnectListDomains(virConnectPtr conn, int *ids, int nids) { +static int lxcConnectListDomains(virConnectPtr conn, int *ids, int nids) +{ virLXCDriverPtr driver = conn->privateData; int n; @@ -396,7 +397,8 @@ static int lxcConnectListDomains(virConnectPtr conn, int *ids, int nids) { return n; } -static int lxcConnectNumOfDomains(virConnectPtr conn) { +static int lxcConnectNumOfDomains(virConnectPtr conn) +{ virLXCDriverPtr driver = conn->privateData; int n; @@ -410,7 +412,8 @@ static int lxcConnectNumOfDomains(virConnectPtr conn) { } static int lxcConnectListDefinedDomains(virConnectPtr conn, - char **const names, int nnames) { + char **const names, int nnames) +{ virLXCDriverPtr driver = conn->privateData; int n; @@ -424,7 +427,8 @@ static int lxcConnectListDefinedDomains(virConnectPtr conn, } -static int lxcConnectNumOfDefinedDomains(virConnectPtr conn) { +static int lxcConnectNumOfDefinedDomains(virConnectPtr conn) +{ virLXCDriverPtr driver = conn->privateData; int n; @@ -676,7 +680,8 @@ cleanup: return ret; } -static int lxcDomainSetMaxMemory(virDomainPtr dom, unsigned long newmax) { +static int lxcDomainSetMaxMemory(virDomainPtr dom, unsigned long newmax) +{ virDomainObjPtr vm; int ret = -1; @@ -701,7 +706,8 @@ cleanup: return ret; } -static int lxcDomainSetMemory(virDomainPtr dom, unsigned long newmem) { +static int lxcDomainSetMemory(virDomainPtr dom, unsigned long newmem) +{ virDomainObjPtr vm; int ret = -1; virLXCDomainObjPrivatePtr priv; @@ -1129,7 +1135,8 @@ lxcDomainCreateXMLWithFiles(virConnectPtr conn, const char *xml, unsigned int nfiles, int *files, - unsigned int flags) { + unsigned int flags) +{ virLXCDriverPtr driver = conn->privateData; virDomainObjPtr vm = NULL; virDomainDefPtr def = NULL; @@ -1205,7 +1212,8 @@ cleanup: static virDomainPtr lxcDomainCreateXML(virConnectPtr conn, const char *xml, - unsigned int flags) { + unsigned int flags) +{ return lxcDomainCreateXMLWithFiles(conn, xml, 0, NULL, flags); } @@ -3101,7 +3109,8 @@ lxcDomainInterfaceStats(virDomainPtr dom, #endif static int lxcDomainGetAutostart(virDomainPtr dom, - int *autostart) { + int *autostart) +{ virDomainObjPtr vm; int ret = -1; diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c index c797f8f..5f5d6eb 100644 --- a/src/network/bridge_driver.c +++ b/src/network/bridge_driver.c @@ -378,7 +378,8 @@ networkFindActiveConfigs(virNetworkDriverStatePtr driver) static void -networkAutostartConfigs(virNetworkDriverStatePtr driver) { +networkAutostartConfigs(virNetworkDriverStatePtr driver) +{ size_t i; for (i = 0; i < driver->networks.count; i++) { @@ -396,7 +397,8 @@ networkAutostartConfigs(virNetworkDriverStatePtr driver) { #if HAVE_FIREWALLD static DBusHandlerResult firewalld_dbus_filter_bridge(DBusConnection *connection ATTRIBUTE_UNUSED, - DBusMessage *message, void *user_data) { + DBusMessage *message, void *user_data) +{ virNetworkDriverStatePtr _driverState = user_data; if (dbus_message_is_signal(message, DBUS_INTERFACE_DBUS, @@ -2171,7 +2173,8 @@ static int networkShutdownNetwork(virNetworkDriverStatePtr driver, static virNetworkPtr networkLookupByUUID(virConnectPtr conn, - const unsigned char *uuid) { + const unsigned char *uuid) +{ virNetworkDriverStatePtr driver = conn->networkPrivateData; virNetworkObjPtr network; virNetworkPtr ret = NULL; @@ -2197,7 +2200,8 @@ cleanup: } static virNetworkPtr networkLookupByName(virConnectPtr conn, - const char *name) { + const char *name) +{ virNetworkDriverStatePtr driver = conn->networkPrivateData; virNetworkObjPtr network; virNetworkPtr ret = NULL; @@ -2235,12 +2239,14 @@ static virDrvOpenStatus networkOpen(virConnectPtr conn, return VIR_DRV_OPEN_SUCCESS; } -static int networkClose(virConnectPtr conn) { +static int networkClose(virConnectPtr conn) +{ conn->networkPrivateData = NULL; return 0; } -static int networkConnectNumOfNetworks(virConnectPtr conn) { +static int networkConnectNumOfNetworks(virConnectPtr conn) +{ int nactive = 0; size_t i; virNetworkDriverStatePtr driver = conn->networkPrivateData; @@ -2295,7 +2301,8 @@ static int networkConnectListNetworks(virConnectPtr conn, char **const names, in return -1; } -static int networkConnectNumOfDefinedNetworks(virConnectPtr conn) { +static int networkConnectNumOfDefinedNetworks(virConnectPtr conn) +{ int ninactive = 0; size_t i; virNetworkDriverStatePtr driver = conn->networkPrivateData; @@ -2621,7 +2628,8 @@ networkValidate(virNetworkDriverStatePtr driver, return 0; } -static virNetworkPtr networkCreateXML(virConnectPtr conn, const char *xml) { +static virNetworkPtr networkCreateXML(virConnectPtr conn, const char *xml) +{ virNetworkDriverStatePtr driver = conn->networkPrivateData; virNetworkDefPtr def; virNetworkObjPtr network = NULL; @@ -2671,7 +2679,8 @@ cleanup: return ret; } -static virNetworkPtr networkDefineXML(virConnectPtr conn, const char *xml) { +static virNetworkPtr networkDefineXML(virConnectPtr conn, const char *xml) +{ virNetworkDriverStatePtr driver = conn->networkPrivateData; virNetworkDefPtr def = NULL; bool freeDef = true; @@ -2736,7 +2745,8 @@ cleanup: } static int -networkUndefine(virNetworkPtr net) { +networkUndefine(virNetworkPtr net) +{ virNetworkDriverStatePtr driver = net->conn->networkPrivateData; virNetworkObjPtr network; int ret = -1; @@ -2967,7 +2977,8 @@ cleanup: return ret; } -static int networkCreate(virNetworkPtr net) { +static int networkCreate(virNetworkPtr net) +{ virNetworkDriverStatePtr driver = net->conn->networkPrivateData; virNetworkObjPtr network; int ret = -1; @@ -3001,7 +3012,8 @@ cleanup: return ret; } -static int networkDestroy(virNetworkPtr net) { +static int networkDestroy(virNetworkPtr net) +{ virNetworkDriverStatePtr driver = net->conn->networkPrivateData; virNetworkObjPtr network; int ret = -1; @@ -3105,7 +3117,8 @@ cleanup: } static int networkGetAutostart(virNetworkPtr net, - int *autostart) { + int *autostart) +{ virNetworkObjPtr network; int ret = -1; @@ -3125,7 +3138,8 @@ cleanup: } static int networkSetAutostart(virNetworkPtr net, - int autostart) { + int autostart) +{ virNetworkDriverStatePtr driver = net->conn->networkPrivateData; virNetworkObjPtr network; char *configFile = NULL, *autostartLink = NULL; @@ -3252,7 +3266,8 @@ int networkRegister(void) { * Creates an implicit interface pool of VF's when a PF dev is given */ static int -networkCreateInterfacePool(virNetworkDefPtr netdef) { +networkCreateInterfacePool(virNetworkDefPtr netdef) +{ size_t num_virt_fns = 0; char **vfname = NULL; virPCIDeviceAddressPtr *virt_fns; diff --git a/src/nwfilter/nwfilter_driver.c b/src/nwfilter/nwfilter_driver.c index 2e89d07..b6e76da 100644 --- a/src/nwfilter/nwfilter_driver.c +++ b/src/nwfilter/nwfilter_driver.c @@ -2,7 +2,7 @@ * nwfilter_driver.c: core driver for network filter APIs * (based on storage_driver.c) * - * Copyright (C) 2006-2011 Red Hat, Inc. + * Copyright (C) 2006-2011, 2014 Red Hat, Inc. * Copyright (C) 2006-2008 Daniel P. Berrange * Copyright (C) 2010 IBM Corporation * Copyright (C) 2010 Stefan Berger @@ -354,7 +354,8 @@ nwfilterStateCleanup(void) { static virNWFilterPtr nwfilterLookupByUUID(virConnectPtr conn, - const unsigned char *uuid) { + const unsigned char *uuid) +{ virNWFilterDriverStatePtr driver = conn->nwfilterPrivateData; virNWFilterObjPtr nwfilter; virNWFilterPtr ret = NULL; @@ -383,7 +384,8 @@ cleanup: static virNWFilterPtr nwfilterLookupByName(virConnectPtr conn, - const char *name) { + const char *name) +{ virNWFilterDriverStatePtr driver = conn->nwfilterPrivateData; virNWFilterObjPtr nwfilter; virNWFilterPtr ret = NULL; @@ -426,14 +428,16 @@ nwfilterOpen(virConnectPtr conn, static int -nwfilterClose(virConnectPtr conn) { +nwfilterClose(virConnectPtr conn) +{ conn->nwfilterPrivateData = NULL; return 0; } static int -nwfilterConnectNumOfNWFilters(virConnectPtr conn) { +nwfilterConnectNumOfNWFilters(virConnectPtr conn) +{ virNWFilterDriverStatePtr driver = conn->nwfilterPrivateData; size_t i; int n; @@ -457,7 +461,8 @@ nwfilterConnectNumOfNWFilters(virConnectPtr conn) { static int nwfilterConnectListNWFilters(virConnectPtr conn, char **const names, - int nnames) { + int nnames) +{ virNWFilterDriverStatePtr driver = conn->nwfilterPrivateData; int got = 0; size_t i; @@ -493,7 +498,8 @@ nwfilterConnectListNWFilters(virConnectPtr conn, static int nwfilterConnectListAllNWFilters(virConnectPtr conn, virNWFilterPtr **filters, - unsigned int flags) { + unsigned int flags) +{ virNWFilterDriverStatePtr driver = conn->nwfilterPrivateData; virNWFilterPtr *tmp_filters = NULL; int nfilters = 0; @@ -592,7 +598,8 @@ cleanup: static int -nwfilterUndefine(virNWFilterPtr obj) { +nwfilterUndefine(virNWFilterPtr obj) +{ virNWFilterDriverStatePtr driver = obj->conn->nwfilterPrivateData; virNWFilterObjPtr nwfilter; int ret = -1; @@ -680,7 +687,8 @@ nwfilterInstantiateFilter(virConnectPtr conn, static void -nwfilterTeardownFilter(virDomainNetDefPtr net) { +nwfilterTeardownFilter(virDomainNetDefPtr net) +{ if ((net->ifname) && (net->filter)) virNWFilterTeardownFilter(net); } diff --git a/src/nwfilter/nwfilter_learnipaddr.c b/src/nwfilter/nwfilter_learnipaddr.c index e071ff4..38ca3ac 100644 --- a/src/nwfilter/nwfilter_learnipaddr.c +++ b/src/nwfilter/nwfilter_learnipaddr.c @@ -2,7 +2,7 @@ * nwfilter_learnipaddr.c: support for learning IP address used by a VM * on an interface * - * Copyright (C) 2011, 2013 Red Hat, Inc. + * Copyright (C) 2011, 2013, 2014 Red Hat, Inc. * Copyright (C) 2010 IBM Corp. * Copyright (C) 2010 Stefan Berger * @@ -136,7 +136,8 @@ static bool threadsTerminate = false; int -virNWFilterLockIface(const char *ifname) { +virNWFilterLockIface(const char *ifname) +{ virNWFilterIfaceLockPtr ifaceLock; virMutexLock(&ifaceMapLock); @@ -186,13 +187,15 @@ virNWFilterLockIface(const char *ifname) { static void -freeIfaceLock(void *payload, const void *name ATTRIBUTE_UNUSED) { +freeIfaceLock(void *payload, const void *name ATTRIBUTE_UNUSED) +{ VIR_FREE(payload); } void -virNWFilterUnlockIface(const char *ifname) { +virNWFilterUnlockIface(const char *ifname) +{ virNWFilterIfaceLockPtr ifaceLock; virMutexLock(&ifaceMapLock); @@ -212,7 +215,8 @@ virNWFilterUnlockIface(const char *ifname) { static void -virNWFilterIPAddrLearnReqFree(virNWFilterIPAddrLearnReqPtr req) { +virNWFilterIPAddrLearnReqFree(virNWFilterIPAddrLearnReqPtr req) +{ if (!req) return; @@ -226,7 +230,8 @@ virNWFilterIPAddrLearnReqFree(virNWFilterIPAddrLearnReqPtr req) { #if HAVE_LIBPCAP static int -virNWFilterRegisterLearnReq(virNWFilterIPAddrLearnReqPtr req) { +virNWFilterRegisterLearnReq(virNWFilterIPAddrLearnReqPtr req) +{ int res = -1; IFINDEX2STR(ifindex_str, req->ifindex); @@ -244,7 +249,8 @@ virNWFilterRegisterLearnReq(virNWFilterIPAddrLearnReqPtr req) { #endif int -virNWFilterTerminateLearnReq(const char *ifname) { +virNWFilterTerminateLearnReq(const char *ifname) +{ int rc = -1; int ifindex; virNWFilterIPAddrLearnReqPtr req; @@ -279,7 +285,8 @@ virNWFilterTerminateLearnReq(const char *ifname) { virNWFilterIPAddrLearnReqPtr -virNWFilterLookupLearnReq(int ifindex) { +virNWFilterLookupLearnReq(int ifindex) +{ void *res; IFINDEX2STR(ifindex_str, ifindex); @@ -294,7 +301,8 @@ virNWFilterLookupLearnReq(int ifindex) { static void -freeLearnReqEntry(void *payload, const void *name ATTRIBUTE_UNUSED) { +freeLearnReqEntry(void *payload, const void *name ATTRIBUTE_UNUSED) +{ virNWFilterIPAddrLearnReqFree(payload); } @@ -302,7 +310,8 @@ freeLearnReqEntry(void *payload, const void *name ATTRIBUTE_UNUSED) { #ifdef HAVE_LIBPCAP static virNWFilterIPAddrLearnReqPtr -virNWFilterDeregisterLearnReq(int ifindex) { +virNWFilterDeregisterLearnReq(int ifindex) +{ virNWFilterIPAddrLearnReqPtr res; IFINDEX2STR(ifindex_str, ifindex); @@ -322,7 +331,8 @@ virNWFilterDeregisterLearnReq(int ifindex) { static void procDHCPOpts(struct dhcp *dhcp, int dhcp_opts_len, uint32_t *vmaddr, uint32_t *bcastaddr, - enum howDetect *howDetected) { + enum howDetect *howDetected) +{ struct dhcp_option *dhcpopt = &dhcp->options[0]; while (dhcp_opts_len >= 2) { @@ -681,7 +691,8 @@ virNWFilterLearnIPAddress(virNWFilterTechDriverPtr techdriver, const char *filtername, virNWFilterHashTablePtr filterparams, virNWFilterDriverStatePtr driver, - enum howDetect howDetect) { + enum howDetect howDetect) +{ int rc; virNWFilterIPAddrLearnReqPtr req = NULL; virNWFilterHashTablePtr ht = NULL; @@ -820,7 +831,8 @@ virNWFilterLearnInit(void) { void -virNWFilterLearnThreadsTerminate(bool allowNewThreads) { +virNWFilterLearnThreadsTerminate(bool allowNewThreads) +{ threadsTerminate = true; while (virHashSize(pendingLearnReq) != 0) diff --git a/src/openvz/openvz_conf.c b/src/openvz/openvz_conf.c index 11f048b..20c9a6f 100644 --- a/src/openvz/openvz_conf.c +++ b/src/openvz/openvz_conf.c @@ -205,7 +205,8 @@ no_memory: int openvzReadNetworkConf(virDomainDefPtr def, - int veid) { + int veid) +{ int ret; virDomainNetDefPtr net = NULL; char *temp = NULL; @@ -378,7 +379,8 @@ openvz_replace(const char* str, static int openvzReadFSConf(virDomainDefPtr def, - int veid) { + int veid) +{ int ret; virDomainFSDefPtr fs = NULL; char *veid_str = NULL; @@ -545,7 +547,8 @@ openvzFreeDriver(struct openvz_driver *driver) -int openvzLoadDomains(struct openvz_driver *driver) { +int openvzLoadDomains(struct openvz_driver *driver) +{ int veid, ret; char *status; char uuidstr[VIR_UUID_STRING_BUFLEN]; @@ -1063,7 +1066,8 @@ cleanup: } static int -openvzSetUUID(int vpsid){ +openvzSetUUID(int vpsid) +{ unsigned char uuid[VIR_UUID_BUFLEN]; if (virUUIDGenerate(uuid)) { @@ -1128,7 +1132,8 @@ static int openvzAssignUUIDs(void) * */ -int openvzGetVEID(const char *name) { +int openvzGetVEID(const char *name) +{ virCommandPtr cmd; char *outbuf; char *temp; diff --git a/src/openvz/openvz_driver.c b/src/openvz/openvz_driver.c index c10fa05..f25b0f8 100644 --- a/src/openvz/openvz_driver.c +++ b/src/openvz/openvz_driver.c @@ -297,7 +297,8 @@ error: static virDomainPtr openvzDomainLookupByID(virConnectPtr conn, - int id) { + int id) +{ struct openvz_driver *driver = conn->privateData; virDomainObjPtr vm; virDomainPtr dom = NULL; @@ -321,7 +322,8 @@ cleanup: return dom; } -static int openvzConnectGetVersion(virConnectPtr conn, unsigned long *version) { +static int openvzConnectGetVersion(virConnectPtr conn, unsigned long *version) +{ struct openvz_driver *driver = conn->privateData; openvzDriverLock(driver); *version = driver->version; @@ -361,7 +363,8 @@ cleanup: static virDomainPtr openvzDomainLookupByUUID(virConnectPtr conn, - const unsigned char *uuid) { + const unsigned char *uuid) +{ struct openvz_driver *driver = conn->privateData; virDomainObjPtr vm; virDomainPtr dom = NULL; @@ -386,7 +389,8 @@ cleanup: } static virDomainPtr openvzDomainLookupByName(virConnectPtr conn, - const char *name) { + const char *name) +{ struct openvz_driver *driver = conn->privateData; virDomainObjPtr vm; virDomainPtr dom = NULL; @@ -411,7 +415,8 @@ cleanup: } static int openvzDomainGetInfo(virDomainPtr dom, - virDomainInfoPtr info) { + virDomainInfoPtr info) +{ struct openvz_driver *driver = dom->conn->privateData; virDomainObjPtr vm; int state; @@ -577,7 +582,8 @@ static void openvzSetProgramSentinal(const char **prog, const char *key) } } -static int openvzDomainSuspend(virDomainPtr dom) { +static int openvzDomainSuspend(virDomainPtr dom) +{ struct openvz_driver *driver = dom->conn->privateData; virDomainObjPtr vm; const char *prog[] = {VZCTL, "--quiet", "chkpnt", PROGRAM_SENTINEL, "--suspend", NULL}; @@ -615,7 +621,8 @@ cleanup: return ret; } -static int openvzDomainResume(virDomainPtr dom) { +static int openvzDomainResume(virDomainPtr dom) +{ struct openvz_driver *driver = dom->conn->privateData; virDomainObjPtr vm; const char *prog[] = {VZCTL, "--quiet", "chkpnt", PROGRAM_SENTINEL, "--resume", NULL}; @@ -655,7 +662,8 @@ cleanup: static int openvzDomainShutdownFlags(virDomainPtr dom, - unsigned int flags) { + unsigned int flags) +{ struct openvz_driver *driver = dom->conn->privateData; virDomainObjPtr vm; const char *prog[] = {VZCTL, "--quiet", "stop", PROGRAM_SENTINEL, NULL}; @@ -1474,7 +1482,8 @@ cleanup: return VIR_DRV_OPEN_ERROR; }; -static int openvzConnectClose(virConnectPtr conn) { +static int openvzConnectClose(virConnectPtr conn) +{ struct openvz_driver *driver = conn->privateData; openvzFreeDriver(driver); @@ -1487,12 +1496,14 @@ static const char *openvzConnectGetType(virConnectPtr conn ATTRIBUTE_UNUSED) { return "OpenVZ"; } -static int openvzConnectIsEncrypted(virConnectPtr conn ATTRIBUTE_UNUSED) { +static int openvzConnectIsEncrypted(virConnectPtr conn ATTRIBUTE_UNUSED) +{ /* Encryption is not relevant / applicable to way we talk to openvz */ return 0; } -static int openvzConnectIsSecure(virConnectPtr conn ATTRIBUTE_UNUSED) { +static int openvzConnectIsSecure(virConnectPtr conn ATTRIBUTE_UNUSED) +{ /* We run CLI tools directly so this is secure */ return 1; } @@ -1515,7 +1526,8 @@ static char *openvzConnectGetCapabilities(virConnectPtr conn) { } static int openvzConnectListDomains(virConnectPtr conn ATTRIBUTE_UNUSED, - int *ids, int nids) { + int *ids, int nids) +{ int got = 0; int veid; int outfd = -1; @@ -1557,7 +1569,8 @@ cleanup: return rc; } -static int openvzConnectNumOfDomains(virConnectPtr conn) { +static int openvzConnectNumOfDomains(virConnectPtr conn) +{ struct openvz_driver *driver = conn->privateData; int n; @@ -1669,7 +1682,8 @@ Version: 2.2 return 0; } -static int openvzConnectNumOfDefinedDomains(virConnectPtr conn) { +static int openvzConnectNumOfDefinedDomains(virConnectPtr conn) +{ struct openvz_driver *driver = conn->privateData; int n; diff --git a/src/qemu/qemu_agent.c b/src/qemu/qemu_agent.c index 553bff9..01acf22 100644 --- a/src/qemu/qemu_agent.c +++ b/src/qemu/qemu_agent.c @@ -1,7 +1,7 @@ /* * qemu_agent.c: interaction with QEMU guest agent * - * Copyright (C) 2006-2013 Red Hat, Inc. + * Copyright (C) 2006-2014 Red Hat, Inc. * Copyright (C) 2006 Daniel P. Berrange * * This library is free software; you can redistribute it and/or @@ -572,7 +572,8 @@ static void qemuAgentUpdateWatch(qemuAgentPtr mon) static void -qemuAgentIO(int watch, int fd, int events, void *opaque) { +qemuAgentIO(int watch, int fd, int events, void *opaque) +{ qemuAgentPtr mon = opaque; bool error = false; bool eof = false; diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 778d051..64fd748 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -1869,7 +1869,8 @@ cleanup: } static bool -qemuDomainSupportsPCI(virDomainDefPtr def) { +qemuDomainSupportsPCI(virDomainDefPtr def) +{ if ((def->os.arch != VIR_ARCH_ARMV7L) && (def->os.arch != VIR_ARCH_AARCH64)) return true; @@ -11193,7 +11194,8 @@ error: static void -qemuParseCommandLineBootDevs(virDomainDefPtr def, const char *str) { +qemuParseCommandLineBootDevs(virDomainDefPtr def, const char *str) +{ int n, b = 0; for (n = 0; str[n] && b < VIR_DOMAIN_BOOT_LAST; n++) { diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 99a2840..064ce7c 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -1199,7 +1199,8 @@ qemuConnectGetSysinfo(virConnectPtr conn, unsigned int flags) return virBufferContentAndReset(&buf); } -static int qemuConnectGetMaxVcpus(virConnectPtr conn ATTRIBUTE_UNUSED, const char *type) { +static int qemuConnectGetMaxVcpus(virConnectPtr conn ATTRIBUTE_UNUSED, const char *type) +{ if (virConnectGetMaxVcpusEnsureACL(conn) < 0) return -1; @@ -1319,7 +1320,8 @@ qemuGetProcessInfo(unsigned long long *cpuTime, int *lastCpu, long *vm_rss, static virDomainPtr qemuDomainLookupByID(virConnectPtr conn, - int id) { + int id) +{ virQEMUDriverPtr driver = conn->privateData; virDomainObjPtr vm; virDomainPtr dom = NULL; @@ -1345,7 +1347,8 @@ cleanup: } static virDomainPtr qemuDomainLookupByUUID(virConnectPtr conn, - const unsigned char *uuid) { + const unsigned char *uuid) +{ virQEMUDriverPtr driver = conn->privateData; virDomainObjPtr vm; virDomainPtr dom = NULL; @@ -1373,7 +1376,8 @@ cleanup: } static virDomainPtr qemuDomainLookupByName(virConnectPtr conn, - const char *name) { + const char *name) +{ virQEMUDriverPtr driver = conn->privateData; virDomainObjPtr vm; virDomainPtr dom = NULL; @@ -1456,7 +1460,8 @@ cleanup: return ret; } -static int qemuConnectGetVersion(virConnectPtr conn, unsigned long *version) { +static int qemuConnectGetVersion(virConnectPtr conn, unsigned long *version) +{ virQEMUDriverPtr driver = conn->privateData; int ret = -1; unsigned int qemuVersion = 0; @@ -1491,7 +1496,8 @@ static char *qemuConnectGetHostname(virConnectPtr conn) } -static int qemuConnectListDomains(virConnectPtr conn, int *ids, int nids) { +static int qemuConnectListDomains(virConnectPtr conn, int *ids, int nids) +{ virQEMUDriverPtr driver = conn->privateData; int n; @@ -1504,7 +1510,8 @@ static int qemuConnectListDomains(virConnectPtr conn, int *ids, int nids) { return n; } -static int qemuConnectNumOfDomains(virConnectPtr conn) { +static int qemuConnectNumOfDomains(virConnectPtr conn) +{ virQEMUDriverPtr driver = conn->privateData; int n; @@ -1540,7 +1547,8 @@ qemuCanonicalizeMachine(virDomainDefPtr def, virQEMUCapsPtr qemuCaps) static virDomainPtr qemuDomainCreateXML(virConnectPtr conn, const char *xml, - unsigned int flags) { + unsigned int flags) +{ virQEMUDriverPtr driver = conn->privateData; virDomainDefPtr def = NULL; virDomainObjPtr vm = NULL; @@ -1646,7 +1654,8 @@ cleanup: } -static int qemuDomainSuspend(virDomainPtr dom) { +static int qemuDomainSuspend(virDomainPtr dom) +{ virQEMUDriverPtr driver = dom->conn->privateData; virDomainObjPtr vm; int ret = -1; @@ -1727,7 +1736,8 @@ cleanup: } -static int qemuDomainResume(virDomainPtr dom) { +static int qemuDomainResume(virDomainPtr dom) +{ virQEMUDriverPtr driver = dom->conn->privateData; virDomainObjPtr vm; int ret = -1; @@ -1791,7 +1801,8 @@ cleanup: return ret; } -static int qemuDomainShutdownFlags(virDomainPtr dom, unsigned int flags) { +static int qemuDomainShutdownFlags(virDomainPtr dom, unsigned int flags) +{ virQEMUDriverPtr driver = dom->conn->privateData; virDomainObjPtr vm; int ret = -1; @@ -2153,7 +2164,8 @@ cleanup: } static int qemuDomainSetMemoryFlags(virDomainPtr dom, unsigned long newmem, - unsigned int flags) { + unsigned int flags) +{ virQEMUDriverPtr driver = dom->conn->privateData; qemuDomainObjPrivatePtr priv; virDomainObjPtr vm; @@ -2650,7 +2662,8 @@ struct _virQEMUSaveHeader { }; static inline void -bswap_header(virQEMUSaveHeaderPtr hdr) { +bswap_header(virQEMUSaveHeaderPtr hdr) +{ hdr->version = bswap_32(hdr->version); hdr->xml_len = bswap_32(hdr->xml_len); hdr->was_running = bswap_32(hdr->was_running); @@ -4246,7 +4259,8 @@ qemuDomainPinVcpuFlags(virDomainPtr dom, unsigned int vcpu, unsigned char *cpumap, int maplen, - unsigned int flags) { + unsigned int flags) +{ virQEMUDriverPtr driver = dom->conn->privateData; virDomainObjPtr vm; @@ -4422,7 +4436,8 @@ static int qemuDomainPinVcpu(virDomainPtr dom, unsigned int vcpu, unsigned char *cpumap, - int maplen) { + int maplen) +{ return qemuDomainPinVcpuFlags(dom, vcpu, cpumap, maplen, VIR_DOMAIN_AFFECT_LIVE); } @@ -4432,7 +4447,8 @@ qemuDomainGetVcpuPinInfo(virDomainPtr dom, int ncpumaps, unsigned char *cpumaps, int maplen, - unsigned int flags) { + unsigned int flags) +{ virQEMUDriverPtr driver = dom->conn->privateData; virDomainObjPtr vm = NULL; @@ -4756,7 +4772,8 @@ qemuDomainGetVcpus(virDomainPtr dom, virVcpuInfoPtr info, int maxinfo, unsigned char *cpumaps, - int maplen) { + int maplen) +{ virDomainObjPtr vm; size_t i; int v, maxcpu, hostcpus; @@ -5949,7 +5966,8 @@ cleanup: return ret; } -static int qemuConnectNumOfDefinedDomains(virConnectPtr conn) { +static int qemuConnectNumOfDefinedDomains(virConnectPtr conn) +{ virQEMUDriverPtr driver = conn->privateData; int ret = -1; @@ -6097,7 +6115,8 @@ qemuDomainCreate(virDomainPtr dom) return qemuDomainCreateWithFlags(dom, 0); } -static virDomainPtr qemuDomainDefineXML(virConnectPtr conn, const char *xml) { +static virDomainPtr qemuDomainDefineXML(virConnectPtr conn, const char *xml) +{ virQEMUDriverPtr driver = conn->privateData; virDomainDefPtr def = NULL; virDomainDefPtr oldDef = NULL; @@ -7287,7 +7306,8 @@ static int qemuDomainDetachDevice(virDomainPtr dom, const char *xml) } static int qemuDomainGetAutostart(virDomainPtr dom, - int *autostart) { + int *autostart) +{ virDomainObjPtr vm; int ret = -1; @@ -7307,7 +7327,8 @@ cleanup: } static int qemuDomainSetAutostart(virDomainPtr dom, - int autostart) { + int autostart) +{ virQEMUDriverPtr driver = dom->conn->privateData; virDomainObjPtr vm; char *configFile = NULL, *autostartLink = NULL; @@ -11438,7 +11459,8 @@ cleanup: static int qemuDomainGetJobInfo(virDomainPtr dom, - virDomainJobInfoPtr info) { + virDomainJobInfoPtr info) +{ virDomainObjPtr vm; int ret = -1; qemuDomainObjPrivatePtr priv; @@ -11625,7 +11647,8 @@ cleanup: } -static int qemuDomainAbortJob(virDomainPtr dom) { +static int qemuDomainAbortJob(virDomainPtr dom) +{ virQEMUDriverPtr driver = dom->conn->privateData; virDomainObjPtr vm; int ret = -1; @@ -11997,7 +12020,8 @@ cleanup: static int -qemuDomainSnapshotFSFreeze(virDomainObjPtr vm) { +qemuDomainSnapshotFSFreeze(virDomainObjPtr vm) +{ qemuDomainObjPrivatePtr priv = vm->privateData; int freezed; diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index 0bbec2e..65996b8 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -4339,7 +4339,8 @@ qemuMigrationPerform(virQEMUDriverPtr driver, } static int -qemuMigrationVPAssociatePortProfiles(virDomainDefPtr def) { +qemuMigrationVPAssociatePortProfiles(virDomainDefPtr def) +{ size_t i; int last_good_net = -1; virDomainNetDefPtr net; diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c index b2af0ae..646772c 100644 --- a/src/qemu/qemu_monitor.c +++ b/src/qemu/qemu_monitor.c @@ -594,7 +594,8 @@ static void qemuMonitorUpdateWatch(qemuMonitorPtr mon) static void -qemuMonitorIO(int watch, int fd, int events, void *opaque) { +qemuMonitorIO(int watch, int fd, int events, void *opaque) +{ qemuMonitorPtr mon = opaque; bool error = false; bool eof = false; diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c index dbc04f6..63f89c8 100644 --- a/src/qemu/qemu_monitor_json.c +++ b/src/qemu/qemu_monitor_json.c @@ -291,7 +291,8 @@ cleanup: static int qemuMonitorJSONCommand(qemuMonitorPtr mon, virJSONValuePtr cmd, - virJSONValuePtr *reply) { + virJSONValuePtr *reply) +{ return qemuMonitorJSONCommandWithFd(mon, cmd, -1, reply); } diff --git a/src/qemu/qemu_monitor_text.c b/src/qemu/qemu_monitor_text.c index f4992f1..57942eb 100644 --- a/src/qemu/qemu_monitor_text.c +++ b/src/qemu/qemu_monitor_text.c @@ -1,7 +1,7 @@ /* * qemu_monitor_text.c: interaction with QEMU monitor console * - * Copyright (C) 2006-2013 Red Hat, Inc. + * Copyright (C) 2006-2014 Red Hat, Inc. * Copyright (C) 2006 Daniel P. Berrange * * This library is free software; you can redistribute it and/or @@ -361,7 +361,8 @@ qemuMonitorSendDiskPassphrase(qemuMonitorPtr mon, int qemuMonitorTextStartCPUs(qemuMonitorPtr mon, - virConnectPtr conn) { + virConnectPtr conn) +{ char *reply; if (qemuMonitorTextCommandWithHandler(mon, "cont", @@ -376,7 +377,8 @@ qemuMonitorTextStartCPUs(qemuMonitorPtr mon, int -qemuMonitorTextStopCPUs(qemuMonitorPtr mon) { +qemuMonitorTextStopCPUs(qemuMonitorPtr mon) +{ char *info; int ret; @@ -431,7 +433,8 @@ cleanup: } -int qemuMonitorTextSystemPowerdown(qemuMonitorPtr mon) { +int qemuMonitorTextSystemPowerdown(qemuMonitorPtr mon) +{ char *info; int ret; @@ -441,7 +444,8 @@ int qemuMonitorTextSystemPowerdown(qemuMonitorPtr mon) { return ret; } -int qemuMonitorTextSetLink(qemuMonitorPtr mon, const char *name, enum virDomainNetInterfaceLinkState state) { +int qemuMonitorTextSetLink(qemuMonitorPtr mon, const char *name, enum virDomainNetInterfaceLinkState state) +{ char *info = NULL; char *cmd = NULL; const char *st_str = NULL; @@ -483,7 +487,8 @@ error: return -1; } -int qemuMonitorTextSystemReset(qemuMonitorPtr mon) { +int qemuMonitorTextSystemReset(qemuMonitorPtr mon) +{ char *info; int ret; diff --git a/src/rpc/virnetserver.c b/src/rpc/virnetserver.c index bcabfcd..942b627 100644 --- a/src/rpc/virnetserver.c +++ b/src/rpc/virnetserver.c @@ -1,7 +1,7 @@ /* * virnetserver.c: generic network RPC server * - * Copyright (C) 2006-2012 Red Hat, Inc. + * Copyright (C) 2006-2012, 2014 Red Hat, Inc. * Copyright (C) 2006 Daniel P. Berrange * * This library is free software; you can redistribute it and/or @@ -858,7 +858,8 @@ static void virNetServerSignalEvent(int watch, int fd ATTRIBUTE_UNUSED, int events ATTRIBUTE_UNUSED, - void *opaque) { + void *opaque) +{ virNetServerPtr srv = opaque; siginfo_t siginfo; size_t i; @@ -1029,7 +1030,8 @@ int virNetServerSetTLSContext(virNetServerPtr srv, static void virNetServerAutoShutdownTimer(int timerid ATTRIBUTE_UNUSED, - void *opaque) { + void *opaque) +{ virNetServerPtr srv = opaque; virObjectLock(srv); diff --git a/src/rpc/virnetserverclient.c b/src/rpc/virnetserverclient.c index 52b4941..c51a7b4 100644 --- a/src/rpc/virnetserverclient.c +++ b/src/rpc/virnetserverclient.c @@ -1,7 +1,7 @@ /* * virnetserverclient.c: generic network RPC server client * - * Copyright (C) 2006-2013 Red Hat, Inc. + * Copyright (C) 2006-2014 Red Hat, Inc. * Copyright (C) 2006 Daniel P. Berrange * * This library is free software; you can redistribute it and/or @@ -138,7 +138,8 @@ static int virNetServerClientSendMessageLocked(virNetServerClientPtr client, * @client: a locked client object */ static int -virNetServerClientCalculateHandleMode(virNetServerClientPtr client) { +virNetServerClientCalculateHandleMode(virNetServerClientPtr client) +{ int mode = 0; diff --git a/src/rpc/virnettlscontext.c b/src/rpc/virnettlscontext.c index cd69794..2b8734b 100644 --- a/src/rpc/virnettlscontext.c +++ b/src/rpc/virnettlscontext.c @@ -1,7 +1,7 @@ /* * virnettlscontext.c: TLS encryption/x509 handling * - * Copyright (C) 2010-2013 Red Hat, Inc. + * Copyright (C) 2010-2014 Red Hat, Inc. * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -122,7 +122,8 @@ virNetTLSContextCheckCertFile(const char *type, const char *file, bool allowMiss static void virNetTLSLog(int level ATTRIBUTE_UNUSED, - const char *str ATTRIBUTE_UNUSED) { + const char *str ATTRIBUTE_UNUSED) +{ VIR_DEBUG("%d %s", level, str); } diff --git a/src/secret/secret_driver.c b/src/secret/secret_driver.c index 9f7f946..dca7492 100644 --- a/src/secret/secret_driver.c +++ b/src/secret/secret_driver.c @@ -1,7 +1,7 @@ /* * secret_driver.c: local driver for secret manipulation API * - * Copyright (C) 2009-2012 Red Hat, Inc. + * Copyright (C) 2009-2012, 2014 Red Hat, Inc. * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -535,7 +535,8 @@ secretOpen(virConnectPtr conn, virConnectAuthPtr auth ATTRIBUTE_UNUSED, } static int -secretClose(virConnectPtr conn) { +secretClose(virConnectPtr conn) +{ conn->secretPrivateData = NULL; return 0; } @@ -629,7 +630,8 @@ secretUsageIDForDef(virSecretDefPtr def) static int secretConnectListAllSecrets(virConnectPtr conn, virSecretPtr **secrets, - unsigned int flags) { + unsigned int flags) +{ virSecretDriverStatePtr driver = conn->secretPrivateData; virSecretPtr *tmp_secrets = NULL; int nsecrets = 0; diff --git a/src/security/security_stack.c b/src/security/security_stack.c index 0d42b21..a998995 100644 --- a/src/security/security_stack.c +++ b/src/security/security_stack.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010-2013 Red Hat, Inc. + * Copyright (C) 2010-2014 Red Hat, Inc. * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -529,7 +529,8 @@ virSecurityStackSetHugepages(virSecurityManagerPtr mgr, } static char *virSecurityStackGetMountOptions(virSecurityManagerPtr mgr ATTRIBUTE_UNUSED, - virDomainDefPtr vm ATTRIBUTE_UNUSED) { + virDomainDefPtr vm ATTRIBUTE_UNUSED) +{ return NULL; } diff --git a/src/storage/storage_backend_fs.c b/src/storage/storage_backend_fs.c index bab02dd..788550b 100644 --- a/src/storage/storage_backend_fs.c +++ b/src/storage/storage_backend_fs.c @@ -328,7 +328,8 @@ virStorageBackendFileSystemNetFindPoolSources(virConnectPtr conn ATTRIBUTE_UNUSE * Return 0 if not mounted, 1 if mounted, -1 on error */ static int -virStorageBackendFileSystemIsMounted(virStoragePoolObjPtr pool) { +virStorageBackendFileSystemIsMounted(virStoragePoolObjPtr pool) +{ FILE *mtab; struct mntent ent; char buf[1024]; @@ -361,7 +362,8 @@ virStorageBackendFileSystemIsMounted(virStoragePoolObjPtr pool) { * Returns 0 if successfully mounted, -1 on error */ static int -virStorageBackendFileSystemMount(virStoragePoolObjPtr pool) { +virStorageBackendFileSystemMount(virStoragePoolObjPtr pool) +{ char *src = NULL; /* 'mount -t auto' doesn't seem to auto determine nfs (or cifs), * while plain 'mount' does. We have to craft separate argvs to @@ -465,7 +467,8 @@ cleanup: * Returns 0 if successfully unmounted, -1 on error */ static int -virStorageBackendFileSystemUnmount(virStoragePoolObjPtr pool) { +virStorageBackendFileSystemUnmount(virStoragePoolObjPtr pool) +{ virCommandPtr cmd = NULL; int ret = -1; int rc; @@ -560,7 +563,8 @@ virStorageBackendFileSystemStart(virConnectPtr conn ATTRIBUTE_UNUSED, #if WITH_BLKID static virStoragePoolProbeResult virStorageBackendFileSystemProbe(const char *device, - const char *format) { + const char *format) +{ virStoragePoolProbeResult ret = FILESYSTEM_PROBE_ERROR; blkid_probe probe = NULL; diff --git a/src/storage/storage_driver.c b/src/storage/storage_driver.c index 7dbff6c..00fe0ee 100644 --- a/src/storage/storage_driver.c +++ b/src/storage/storage_driver.c @@ -66,7 +66,8 @@ static void storageDriverUnlock(virStorageDriverStatePtr driver) } static void -storageDriverAutostart(virStorageDriverStatePtr driver) { +storageDriverAutostart(virStorageDriverStatePtr driver) +{ size_t i; virConnectPtr conn = NULL; @@ -258,7 +259,8 @@ storageStateCleanup(void) { static virStoragePoolPtr storagePoolLookupByUUID(virConnectPtr conn, - const unsigned char *uuid) { + const unsigned char *uuid) +{ virStorageDriverStatePtr driver = conn->storagePrivateData; virStoragePoolObjPtr pool; virStoragePoolPtr ret = NULL; @@ -287,7 +289,8 @@ cleanup: static virStoragePoolPtr storagePoolLookupByName(virConnectPtr conn, - const char *name) { + const char *name) +{ virStorageDriverStatePtr driver = conn->storagePrivateData; virStoragePoolObjPtr pool; virStoragePoolPtr ret = NULL; @@ -315,7 +318,8 @@ cleanup: } static virStoragePoolPtr -storagePoolLookupByVolume(virStorageVolPtr vol) { +storagePoolLookupByVolume(virStorageVolPtr vol) +{ virStorageDriverStatePtr driver = vol->conn->storagePrivateData; virStoragePoolObjPtr pool; virStoragePoolPtr ret = NULL; @@ -357,13 +361,15 @@ storageOpen(virConnectPtr conn, } static int -storageClose(virConnectPtr conn) { +storageClose(virConnectPtr conn) +{ conn->storagePrivateData = NULL; return 0; } static int -storageConnectNumOfStoragePools(virConnectPtr conn) { +storageConnectNumOfStoragePools(virConnectPtr conn) +{ virStorageDriverStatePtr driver = conn->storagePrivateData; size_t i; int nactive = 0; @@ -388,7 +394,8 @@ storageConnectNumOfStoragePools(virConnectPtr conn) { static int storageConnectListStoragePools(virConnectPtr conn, char **const names, - int nnames) { + int nnames) +{ virStorageDriverStatePtr driver = conn->storagePrivateData; int got = 0; size_t i; @@ -422,7 +429,8 @@ storageConnectListStoragePools(virConnectPtr conn, } static int -storageConnectNumOfDefinedStoragePools(virConnectPtr conn) { +storageConnectNumOfDefinedStoragePools(virConnectPtr conn) +{ virStorageDriverStatePtr driver = conn->storagePrivateData; size_t i; int nactive = 0; @@ -447,7 +455,8 @@ storageConnectNumOfDefinedStoragePools(virConnectPtr conn) { static int storageConnectListDefinedStoragePools(virConnectPtr conn, char **const names, - int nnames) { + int nnames) +{ virStorageDriverStatePtr driver = conn->storagePrivateData; int got = 0; size_t i; @@ -684,7 +693,8 @@ cleanup: } static int -storagePoolUndefine(virStoragePoolPtr obj) { +storagePoolUndefine(virStoragePoolPtr obj) +{ virStorageDriverStatePtr driver = obj->conn->storagePrivateData; virStoragePoolObjPtr pool; int ret = -1; @@ -793,7 +803,8 @@ cleanup: static int storagePoolBuild(virStoragePoolPtr obj, - unsigned int flags) { + unsigned int flags) +{ virStorageDriverStatePtr driver = obj->conn->storagePrivateData; virStoragePoolObjPtr pool; virStorageBackendPtr backend; @@ -835,7 +846,8 @@ cleanup: static int -storagePoolDestroy(virStoragePoolPtr obj) { +storagePoolDestroy(virStoragePoolPtr obj) +{ virStorageDriverStatePtr driver = obj->conn->storagePrivateData; virStoragePoolObjPtr pool; virStorageBackendPtr backend; @@ -897,7 +909,8 @@ cleanup: static int storagePoolDelete(virStoragePoolPtr obj, - unsigned int flags) { + unsigned int flags) +{ virStorageDriverStatePtr driver = obj->conn->storagePrivateData; virStoragePoolObjPtr pool; virStorageBackendPtr backend; @@ -1014,7 +1027,8 @@ cleanup: static int storagePoolGetInfo(virStoragePoolPtr obj, - virStoragePoolInfoPtr info) { + virStoragePoolInfoPtr info) +{ virStorageDriverStatePtr driver = obj->conn->storagePrivateData; virStoragePoolObjPtr pool; int ret = -1; @@ -1090,7 +1104,8 @@ cleanup: static int storagePoolGetAutostart(virStoragePoolPtr obj, - int *autostart) { + int *autostart) +{ virStorageDriverStatePtr driver = obj->conn->storagePrivateData; virStoragePoolObjPtr pool; int ret = -1; @@ -1123,7 +1138,8 @@ cleanup: static int storagePoolSetAutostart(virStoragePoolPtr obj, - int autostart) { + int autostart) +{ virStorageDriverStatePtr driver = obj->conn->storagePrivateData; virStoragePoolObjPtr pool; int ret = -1; @@ -1185,7 +1201,8 @@ cleanup: static int -storagePoolNumOfVolumes(virStoragePoolPtr obj) { +storagePoolNumOfVolumes(virStoragePoolPtr obj) +{ virStorageDriverStatePtr driver = obj->conn->storagePrivateData; virStoragePoolObjPtr pool; int ret = -1; @@ -1225,7 +1242,8 @@ cleanup: static int storagePoolListVolumes(virStoragePoolPtr obj, char **const names, - int maxnames) { + int maxnames) +{ virStorageDriverStatePtr driver = obj->conn->storagePrivateData; virStoragePoolObjPtr pool; size_t i; @@ -1276,7 +1294,8 @@ storagePoolListVolumes(virStoragePoolPtr obj, static int storagePoolListAllVolumes(virStoragePoolPtr pool, virStorageVolPtr **vols, - unsigned int flags) { + unsigned int flags) +{ virStorageDriverStatePtr driver = pool->conn->storagePrivateData; virStoragePoolObjPtr obj; size_t i; @@ -1349,7 +1368,8 @@ storagePoolListAllVolumes(virStoragePoolPtr pool, static virStorageVolPtr storageVolLookupByName(virStoragePoolPtr obj, - const char *name) { + const char *name) +{ virStorageDriverStatePtr driver = obj->conn->storagePrivateData; virStoragePoolObjPtr pool; virStorageVolDefPtr vol; @@ -1395,7 +1415,8 @@ cleanup: static virStorageVolPtr storageVolLookupByKey(virConnectPtr conn, - const char *key) { + const char *key) +{ virStorageDriverStatePtr driver = conn->storagePrivateData; size_t i; virStorageVolPtr ret = NULL; @@ -1434,7 +1455,8 @@ cleanup: static virStorageVolPtr storageVolLookupByPath(virConnectPtr conn, - const char *path) { + const char *path) +{ virStorageDriverStatePtr driver = conn->storagePrivateData; size_t i; virStorageVolPtr ret = NULL; @@ -2457,7 +2479,8 @@ storageVolWipe(virStorageVolPtr obj, static int storageVolGetInfo(virStorageVolPtr obj, - virStorageVolInfoPtr info) { + virStorageVolInfoPtr info) +{ virStorageDriverStatePtr driver = obj->conn->storagePrivateData; virStoragePoolObjPtr pool; virStorageBackendPtr backend; @@ -2570,7 +2593,8 @@ cleanup: } static char * -storageVolGetPath(virStorageVolPtr obj) { +storageVolGetPath(virStorageVolPtr obj) +{ virStorageDriverStatePtr driver = obj->conn->storagePrivateData; virStoragePoolObjPtr pool; virStorageVolDefPtr vol; diff --git a/src/test/test_driver.c b/src/test/test_driver.c index 181a15a..a640a85 100644 --- a/src/test/test_driver.c +++ b/src/test/test_driver.c @@ -317,7 +317,8 @@ testBuildXMLConfig(void) static virCapsPtr -testBuildCapabilities(virConnectPtr conn) { +testBuildCapabilities(virConnectPtr conn) +{ testConnPtr privconn = conn->privateData; virCapsPtr caps; virCapsGuestPtr guest; @@ -502,7 +503,8 @@ testDomObjFromDomain(virDomainPtr domain) } static char * -testDomainGenerateIfname(virDomainDefPtr domdef) { +testDomainGenerateIfname(virDomainDefPtr domdef) +{ int maxif = 1024; int ifctr; size_t i; @@ -849,7 +851,8 @@ error: static char *testBuildFilename(const char *relativeTo, - const char *filename) { + const char *filename) +{ char *offset; int baseLen; char *ret; @@ -2493,7 +2496,8 @@ static char *testDomainGetOSType(virDomainPtr dom ATTRIBUTE_UNUSED) { return ret; } -static unsigned long long testDomainGetMaxMemory(virDomainPtr domain) { +static unsigned long long testDomainGetMaxMemory(virDomainPtr domain) +{ testConnPtr privconn = domain->conn->privateData; virDomainObjPtr privdom; unsigned long long ret = 0; @@ -2896,7 +2900,8 @@ cleanup: return ret; } -static int testConnectNumOfDefinedDomains(virConnectPtr conn) { +static int testConnectNumOfDefinedDomains(virConnectPtr conn) +{ testConnPtr privconn = conn->privateData; int count; @@ -2909,7 +2914,8 @@ static int testConnectNumOfDefinedDomains(virConnectPtr conn) { static int testConnectListDefinedDomains(virConnectPtr conn, char **const names, - int maxnames) { + int maxnames) +{ testConnPtr privconn = conn->privateData; int n; @@ -2924,7 +2930,8 @@ static int testConnectListDefinedDomains(virConnectPtr conn, } static virDomainPtr testDomainDefineXML(virConnectPtr conn, - const char *xml) { + const char *xml) +{ testConnPtr privconn = conn->privateData; virDomainPtr ret = NULL; virDomainDefPtr def; @@ -3038,7 +3045,8 @@ cleanup: static int testNodeGetCellsFreeMemory(virConnectPtr conn, unsigned long long *freemems, - int startCell, int maxCells) { + int startCell, int maxCells) +{ testConnPtr privconn = conn->privateData; int cell; size_t i; @@ -3064,7 +3072,8 @@ cleanup: } -static int testDomainCreateWithFlags(virDomainPtr domain, unsigned int flags) { +static int testDomainCreateWithFlags(virDomainPtr domain, unsigned int flags) +{ testConnPtr privconn = domain->conn->privateData; virDomainObjPtr privdom; virObjectEventPtr event = NULL; @@ -3106,7 +3115,8 @@ cleanup: return ret; } -static int testDomainCreate(virDomainPtr domain) { +static int testDomainCreate(virDomainPtr domain) +{ return testDomainCreateWithFlags(domain, 0); } @@ -3473,7 +3483,8 @@ static virDrvOpenStatus testNetworkOpen(virConnectPtr conn, return VIR_DRV_OPEN_SUCCESS; } -static int testNetworkClose(virConnectPtr conn) { +static int testNetworkClose(virConnectPtr conn) +{ conn->networkPrivateData = NULL; return 0; } @@ -3528,7 +3539,8 @@ cleanup: } -static int testConnectNumOfNetworks(virConnectPtr conn) { +static int testConnectNumOfNetworks(virConnectPtr conn) +{ testConnPtr privconn = conn->privateData; int numActive = 0; size_t i; @@ -3572,7 +3584,8 @@ error: return -1; } -static int testConnectNumOfDefinedNetworks(virConnectPtr conn) { +static int testConnectNumOfDefinedNetworks(virConnectPtr conn) +{ testConnPtr privconn = conn->privateData; int numInactive = 0; size_t i; @@ -3676,7 +3689,8 @@ cleanup: } -static virNetworkPtr testNetworkCreateXML(virConnectPtr conn, const char *xml) { +static virNetworkPtr testNetworkCreateXML(virConnectPtr conn, const char *xml) +{ testConnPtr privconn = conn->privateData; virNetworkDefPtr def; virNetworkObjPtr net = NULL; @@ -3742,7 +3756,8 @@ cleanup: return ret; } -static int testNetworkUndefine(virNetworkPtr network) { +static int testNetworkUndefine(virNetworkPtr network) +{ testConnPtr privconn = network->conn->privateData; virNetworkObjPtr privnet; int ret = -1; @@ -3829,7 +3844,8 @@ cleanup: return ret; } -static int testNetworkCreate(virNetworkPtr network) { +static int testNetworkCreate(virNetworkPtr network) +{ testConnPtr privconn = network->conn->privateData; virNetworkObjPtr privnet; int ret = -1; @@ -3865,7 +3881,8 @@ cleanup: return ret; } -static int testNetworkDestroy(virNetworkPtr network) { +static int testNetworkDestroy(virNetworkPtr network) +{ testConnPtr privconn = network->conn->privateData; virNetworkObjPtr privnet; int ret = -1; @@ -3958,7 +3975,8 @@ cleanup: } static int testNetworkGetAutostart(virNetworkPtr network, - int *autostart) { + int *autostart) +{ testConnPtr privconn = network->conn->privateData; virNetworkObjPtr privnet; int ret = -1; @@ -3983,7 +4001,8 @@ cleanup: } static int testNetworkSetAutostart(virNetworkPtr network, - int autostart) { + int autostart) +{ testConnPtr privconn = network->conn->privateData; virNetworkObjPtr privnet; int ret = -1; @@ -4441,7 +4460,8 @@ cleanup: */ -static int testStoragePoolObjSetDefaults(virStoragePoolObjPtr pool) { +static int testStoragePoolObjSetDefaults(virStoragePoolObjPtr pool) +{ pool->def->capacity = defaultPoolCap; pool->def->allocation = defaultPoolAlloc; @@ -4463,7 +4483,8 @@ static virDrvOpenStatus testStorageOpen(virConnectPtr conn, return VIR_DRV_OPEN_SUCCESS; } -static int testStorageClose(virConnectPtr conn) { +static int testStorageClose(virConnectPtr conn) +{ conn->storagePrivateData = NULL; return 0; } @@ -4471,7 +4492,8 @@ static int testStorageClose(virConnectPtr conn) { static virStoragePoolPtr testStoragePoolLookupByUUID(virConnectPtr conn, - const unsigned char *uuid) { + const unsigned char *uuid) +{ testConnPtr privconn = conn->privateData; virStoragePoolObjPtr pool; virStoragePoolPtr ret = NULL; @@ -4496,7 +4518,8 @@ cleanup: static virStoragePoolPtr testStoragePoolLookupByName(virConnectPtr conn, - const char *name) { + const char *name) +{ testConnPtr privconn = conn->privateData; virStoragePoolObjPtr pool; virStoragePoolPtr ret = NULL; @@ -4520,12 +4543,14 @@ cleanup: } static virStoragePoolPtr -testStoragePoolLookupByVolume(virStorageVolPtr vol) { +testStoragePoolLookupByVolume(virStorageVolPtr vol) +{ return testStoragePoolLookupByName(vol->conn, vol->pool); } static int -testConnectNumOfStoragePools(virConnectPtr conn) { +testConnectNumOfStoragePools(virConnectPtr conn) +{ testConnPtr privconn = conn->privateData; int numActive = 0; size_t i; @@ -4542,7 +4567,8 @@ testConnectNumOfStoragePools(virConnectPtr conn) { static int testConnectListStoragePools(virConnectPtr conn, char **const names, - int nnames) { + int nnames) +{ testConnPtr privconn = conn->privateData; int n = 0; size_t i; @@ -4570,7 +4596,8 @@ error: } static int -testConnectNumOfDefinedStoragePools(virConnectPtr conn) { +testConnectNumOfDefinedStoragePools(virConnectPtr conn) +{ testConnPtr privconn = conn->privateData; int numInactive = 0; size_t i; @@ -4590,7 +4617,8 @@ testConnectNumOfDefinedStoragePools(virConnectPtr conn) { static int testConnectListDefinedStoragePools(virConnectPtr conn, char **const names, - int nnames) { + int nnames) +{ testConnPtr privconn = conn->privateData; int n = 0; size_t i; @@ -4856,7 +4884,8 @@ cleanup: } static int -testStoragePoolUndefine(virStoragePoolPtr pool) { +testStoragePoolUndefine(virStoragePoolPtr pool) +{ testConnPtr privconn = pool->conn->privateData; virStoragePoolObjPtr privpool; int ret = -1; @@ -4921,7 +4950,8 @@ cleanup: static int -testStoragePoolDestroy(virStoragePoolPtr pool) { +testStoragePoolDestroy(virStoragePoolPtr pool) +{ testConnPtr privconn = pool->conn->privateData; virStoragePoolObjPtr privpool; int ret = -1; @@ -5028,7 +5058,8 @@ cleanup: static int testStoragePoolGetInfo(virStoragePoolPtr pool, - virStoragePoolInfoPtr info) { + virStoragePoolInfoPtr info) +{ testConnPtr privconn = pool->conn->privateData; virStoragePoolObjPtr privpool; int ret = -1; @@ -5089,7 +5120,8 @@ cleanup: static int testStoragePoolGetAutostart(virStoragePoolPtr pool, - int *autostart) { + int *autostart) +{ testConnPtr privconn = pool->conn->privateData; virStoragePoolObjPtr privpool; int ret = -1; @@ -5119,7 +5151,8 @@ cleanup: static int testStoragePoolSetAutostart(virStoragePoolPtr pool, - int autostart) { + int autostart) +{ testConnPtr privconn = pool->conn->privateData; virStoragePoolObjPtr privpool; int ret = -1; @@ -5152,7 +5185,8 @@ cleanup: static int -testStoragePoolNumOfVolumes(virStoragePoolPtr pool) { +testStoragePoolNumOfVolumes(virStoragePoolPtr pool) +{ testConnPtr privconn = pool->conn->privateData; virStoragePoolObjPtr privpool; int ret = -1; @@ -5184,7 +5218,8 @@ cleanup: static int testStoragePoolListVolumes(virStoragePoolPtr pool, char **const names, - int maxnames) { + int maxnames) +{ testConnPtr privconn = pool->conn->privateData; virStoragePoolObjPtr privpool; size_t i = 0; @@ -5230,7 +5265,8 @@ testStoragePoolListVolumes(virStoragePoolPtr pool, static int testStoragePoolListAllVolumes(virStoragePoolPtr obj, virStorageVolPtr **vols, - unsigned int flags) { + unsigned int flags) +{ testConnPtr privconn = obj->conn->privateData; virStoragePoolObjPtr pool; size_t i; @@ -5296,7 +5332,8 @@ testStoragePoolListAllVolumes(virStoragePoolPtr obj, static virStorageVolPtr testStorageVolLookupByName(virStoragePoolPtr pool, - const char *name ATTRIBUTE_UNUSED) { + const char *name ATTRIBUTE_UNUSED) +{ testConnPtr privconn = pool->conn->privateData; virStoragePoolObjPtr privpool; virStorageVolDefPtr privvol; @@ -5340,7 +5377,8 @@ cleanup: static virStorageVolPtr testStorageVolLookupByKey(virConnectPtr conn, - const char *key) { + const char *key) +{ testConnPtr privconn = conn->privateData; size_t i; virStorageVolPtr ret = NULL; @@ -5375,7 +5413,8 @@ testStorageVolLookupByKey(virConnectPtr conn, static virStorageVolPtr testStorageVolLookupByPath(virConnectPtr conn, - const char *path) { + const char *path) +{ testConnPtr privconn = conn->privateData; size_t i; virStorageVolPtr ret = NULL; @@ -5625,7 +5664,8 @@ cleanup: } -static int testStorageVolumeTypeForPool(int pooltype) { +static int testStorageVolumeTypeForPool(int pooltype) +{ switch (pooltype) { case VIR_STORAGE_POOL_DIR: @@ -5639,7 +5679,8 @@ static int testStorageVolumeTypeForPool(int pooltype) { static int testStorageVolGetInfo(virStorageVolPtr vol, - virStorageVolInfoPtr info) { + virStorageVolInfoPtr info) +{ testConnPtr privconn = vol->conn->privateData; virStoragePoolObjPtr privpool; virStorageVolDefPtr privvol; @@ -5727,7 +5768,8 @@ cleanup: } static char * -testStorageVolGetPath(virStorageVolPtr vol) { +testStorageVolGetPath(virStorageVolPtr vol) +{ testConnPtr privconn = vol->conn->privateData; virStoragePoolObjPtr privpool; virStorageVolDefPtr privvol; @@ -5781,7 +5823,8 @@ static virDrvOpenStatus testNodeDeviceOpen(virConnectPtr conn, return VIR_DRV_OPEN_SUCCESS; } -static int testNodeDeviceClose(virConnectPtr conn) { +static int testNodeDeviceClose(virConnectPtr conn) +{ conn->nodeDevicePrivateData = NULL; return 0; } @@ -6250,7 +6293,8 @@ static virDrvOpenStatus testSecretOpen(virConnectPtr conn, return VIR_DRV_OPEN_SUCCESS; } -static int testSecretClose(virConnectPtr conn) { +static int testSecretClose(virConnectPtr conn) +{ conn->secretPrivateData = NULL; return 0; } @@ -6269,7 +6313,8 @@ static virDrvOpenStatus testNWFilterOpen(virConnectPtr conn, return VIR_DRV_OPEN_SUCCESS; } -static int testNWFilterClose(virConnectPtr conn) { +static int testNWFilterClose(virConnectPtr conn) +{ conn->nwfilterPrivateData = NULL; return 0; } diff --git a/src/uml/uml_driver.c b/src/uml/uml_driver.c index 3496e52..4e0c16d 100644 --- a/src/uml/uml_driver.c +++ b/src/uml/uml_driver.c @@ -207,7 +207,8 @@ umlAutostartDomain(virDomainObjPtr vm, } static void -umlAutostartConfigs(struct uml_driver *driver) { +umlAutostartConfigs(struct uml_driver *driver) +{ /* XXX: Figure out a better way todo this. The domain * startup code needs a connection handle in order * to lookup the bridge associated with a virtual @@ -857,7 +858,8 @@ static int umlMonitorAddress(const struct uml_driver *driver, } static int umlOpenMonitor(struct uml_driver *driver, - virDomainObjPtr vm) { + virDomainObjPtr vm) +{ struct sockaddr_un addr; struct stat sb; int retries = 0; @@ -1005,7 +1007,8 @@ error: } -static void umlCleanupTapDevices(virDomainObjPtr vm) { +static void umlCleanupTapDevices(virDomainObjPtr vm) +{ size_t i; for (i = 0; i < vm->def->nnets; i++) { @@ -1022,7 +1025,8 @@ static void umlCleanupTapDevices(virDomainObjPtr vm) { static int umlStartVMDaemon(virConnectPtr conn, struct uml_driver *driver, virDomainObjPtr vm, - bool autoDestroy) { + bool autoDestroy) +{ int ret = -1; char *logfile; int logfd = -1; @@ -1243,7 +1247,8 @@ static virDrvOpenStatus umlConnectOpen(virConnectPtr conn, return VIR_DRV_OPEN_SUCCESS; } -static int umlConnectClose(virConnectPtr conn) { +static int umlConnectClose(virConnectPtr conn) +{ struct uml_driver *driver = conn->privateData; umlDriverLock(driver); @@ -1341,7 +1346,8 @@ static int umlGetProcessInfo(unsigned long long *cpuTime, pid_t pid) static virDomainPtr umlDomainLookupByID(virConnectPtr conn, - int id) { + int id) +{ struct uml_driver *driver = (struct uml_driver *)conn->privateData; virDomainObjPtr vm; virDomainPtr dom = NULL; @@ -1368,7 +1374,8 @@ cleanup: } static virDomainPtr umlDomainLookupByUUID(virConnectPtr conn, - const unsigned char *uuid) { + const unsigned char *uuid) +{ struct uml_driver *driver = (struct uml_driver *)conn->privateData; virDomainObjPtr vm; virDomainPtr dom = NULL; @@ -1395,7 +1402,8 @@ cleanup: } static virDomainPtr umlDomainLookupByName(virConnectPtr conn, - const char *name) { + const char *name) +{ struct uml_driver *driver = (struct uml_driver *)conn->privateData; virDomainObjPtr vm; virDomainPtr dom = NULL; @@ -1498,7 +1506,8 @@ cleanup: return ret; } -static int umlConnectGetVersion(virConnectPtr conn, unsigned long *version) { +static int umlConnectGetVersion(virConnectPtr conn, unsigned long *version) +{ struct uml_driver *driver = conn->privateData; struct utsname ut; int ret = -1; @@ -1536,7 +1545,8 @@ static char *umlConnectGetHostname(virConnectPtr conn) } -static int umlConnectListDomains(virConnectPtr conn, int *ids, int nids) { +static int umlConnectListDomains(virConnectPtr conn, int *ids, int nids) +{ struct uml_driver *driver = conn->privateData; int n; @@ -1550,7 +1560,8 @@ static int umlConnectListDomains(virConnectPtr conn, int *ids, int nids) { return n; } -static int umlConnectNumOfDomains(virConnectPtr conn) { +static int umlConnectNumOfDomains(virConnectPtr conn) +{ struct uml_driver *driver = conn->privateData; int n; @@ -1565,7 +1576,8 @@ static int umlConnectNumOfDomains(virConnectPtr conn) { return n; } static virDomainPtr umlDomainCreateXML(virConnectPtr conn, const char *xml, - unsigned int flags) { + unsigned int flags) +{ struct uml_driver *driver = conn->privateData; virDomainDefPtr def; virDomainObjPtr vm = NULL; @@ -1620,7 +1632,8 @@ cleanup: static int umlDomainShutdownFlags(virDomainPtr dom, - unsigned int flags) { + unsigned int flags) +{ struct uml_driver *driver = dom->conn->privateData; virDomainObjPtr vm; char *info = NULL; @@ -1770,7 +1783,8 @@ cleanup: return ret; } -static int umlDomainSetMaxMemory(virDomainPtr dom, unsigned long newmax) { +static int umlDomainSetMaxMemory(virDomainPtr dom, unsigned long newmax) +{ struct uml_driver *driver = dom->conn->privateData; virDomainObjPtr vm; int ret = -1; @@ -1806,7 +1820,8 @@ cleanup: return ret; } -static int umlDomainSetMemory(virDomainPtr dom, unsigned long newmem) { +static int umlDomainSetMemory(virDomainPtr dom, unsigned long newmem) +{ struct uml_driver *driver = dom->conn->privateData; virDomainObjPtr vm; int ret = -1; @@ -1849,7 +1864,8 @@ cleanup: } static int umlDomainGetInfo(virDomainPtr dom, - virDomainInfoPtr info) { + virDomainInfoPtr info) +{ struct uml_driver *driver = dom->conn->privateData; virDomainObjPtr vm; int ret = -1; @@ -1975,7 +1991,8 @@ static int umlConnectListDefinedDomains(virConnectPtr conn, return n; } -static int umlConnectNumOfDefinedDomains(virConnectPtr conn) { +static int umlConnectNumOfDefinedDomains(virConnectPtr conn) +{ struct uml_driver *driver = conn->privateData; int n; @@ -1991,7 +2008,8 @@ static int umlConnectNumOfDefinedDomains(virConnectPtr conn) { } -static int umlDomainCreateWithFlags(virDomainPtr dom, unsigned int flags) { +static int umlDomainCreateWithFlags(virDomainPtr dom, unsigned int flags) +{ struct uml_driver *driver = dom->conn->privateData; virDomainObjPtr vm; virObjectEventPtr event = NULL; @@ -2030,11 +2048,13 @@ cleanup: return ret; } -static int umlDomainCreate(virDomainPtr dom) { +static int umlDomainCreate(virDomainPtr dom) +{ return umlDomainCreateWithFlags(dom, 0); } -static virDomainPtr umlDomainDefineXML(virConnectPtr conn, const char *xml) { +static virDomainPtr umlDomainDefineXML(virConnectPtr conn, const char *xml) +{ struct uml_driver *driver = conn->privateData; virDomainDefPtr def; virDomainObjPtr vm = NULL; @@ -2295,7 +2315,8 @@ cleanup: } -static int umlDomainDetachDevice(virDomainPtr dom, const char *xml) { +static int umlDomainDetachDevice(virDomainPtr dom, const char *xml) +{ struct uml_driver *driver = dom->conn->privateData; virDomainObjPtr vm; virDomainDeviceDefPtr dev = NULL; @@ -2365,7 +2386,8 @@ umlDomainDetachDeviceFlags(virDomainPtr dom, static int umlDomainGetAutostart(virDomainPtr dom, - int *autostart) { + int *autostart) +{ struct uml_driver *driver = dom->conn->privateData; virDomainObjPtr vm; int ret = -1; @@ -2393,7 +2415,8 @@ cleanup: } static int umlDomainSetAutostart(virDomainPtr dom, - int autostart) { + int autostart) +{ struct uml_driver *driver = dom->conn->privateData; virDomainObjPtr vm; char *configFile = NULL, *autostartLink = NULL; diff --git a/src/util/virconf.c b/src/util/virconf.c index 63aa569..8b063a5 100644 --- a/src/util/virconf.c +++ b/src/util/virconf.c @@ -1,7 +1,7 @@ /* * virconf.c: parser for a subset of the Python encoded Xen configuration files * - * Copyright (C) 2006-2013 Red Hat, Inc. + * Copyright (C) 2006-2014 Red Hat, Inc. * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -706,7 +706,8 @@ virConfParseStatement(virConfParserCtxtPtr ctxt) */ static virConfPtr virConfParse(const char *filename, const char *content, int len, - unsigned int flags) { + unsigned int flags) +{ virConfParserCtxt ctxt; ctxt.filename = filename; diff --git a/src/util/virdbus.c b/src/util/virdbus.c index 9bddbfc..e469654 100644 --- a/src/util/virdbus.c +++ b/src/util/virdbus.c @@ -1,7 +1,7 @@ /* * virdbus.c: helper for using DBus * - * Copyright (C) 2012-2013 Red Hat, Inc. + * Copyright (C) 2012-2014 Red Hat, Inc. * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -215,7 +215,8 @@ static int virDBusTranslateWatchFlags(int dbus_flags) } -static void virDBusWatchFree(void *data) { +static void virDBusWatchFree(void *data) +{ struct virDBusWatch *info = data; VIR_FREE(info); } @@ -294,7 +295,8 @@ static const char virDBusBasicTypes[] = { DBUS_TYPE_SIGNATURE, }; -static bool virDBusIsBasicType(char c) { +static bool virDBusIsBasicType(char c) +{ return !!memchr(virDBusBasicTypes, c, ARRAY_CARDINALITY(virDBusBasicTypes)); } diff --git a/src/util/virerror.c b/src/util/virerror.c index 3eb4f5d..136d1b4 100644 --- a/src/util/virerror.c +++ b/src/util/virerror.c @@ -41,7 +41,8 @@ virErrorFunc virErrorHandler = NULL; /* global error handler */ void *virUserData = NULL; /* associated data */ virErrorLogPriorityFunc virErrorLogPriorityFilter = NULL; -static virLogPriority virErrorLevelPriority(virErrorLevel level) { +static virLogPriority virErrorLevelPriority(virErrorLevel level) +{ switch (level) { case VIR_ERR_NONE: return VIR_LOG_INFO; diff --git a/src/util/vireventpoll.c b/src/util/vireventpoll.c index 8a4c8bc..0ee653d 100644 --- a/src/util/vireventpoll.c +++ b/src/util/vireventpoll.c @@ -1,7 +1,7 @@ /* * vireventpoll.c: Poll based event loop for monitoring file handles * - * Copyright (C) 2007, 2010-2013 Red Hat, Inc. + * Copyright (C) 2007, 2010-2014 Red Hat, Inc. * Copyright (C) 2007 Daniel P. Berrange * * This library is free software; you can redistribute it and/or @@ -103,7 +103,8 @@ static int nextTimer = 1; int virEventPollAddHandle(int fd, int events, virEventHandleCallback cb, void *opaque, - virFreeCallback ff) { + virFreeCallback ff) +{ int watch; virMutexLock(&eventLoop.lock); if (eventLoop.handlesCount == eventLoop.handlesAlloc) { @@ -139,7 +140,8 @@ int virEventPollAddHandle(int fd, int events, return watch; } -void virEventPollUpdateHandle(int watch, int events) { +void virEventPollUpdateHandle(int watch, int events) +{ size_t i; bool found = false; PROBE(EVENT_POLL_UPDATE_HANDLE, @@ -173,7 +175,8 @@ void virEventPollUpdateHandle(int watch, int events) { * For this reason we only ever set a flag in the existing list. * Actual deletion will be done out-of-band */ -int virEventPollRemoveHandle(int watch) { +int virEventPollRemoveHandle(int watch) +{ size_t i; PROBE(EVENT_POLL_REMOVE_HANDLE, "watch=%d", @@ -293,7 +296,8 @@ void virEventPollUpdateTimeout(int timer, int frequency) * For this reason we only ever set a flag in the existing list. * Actual deletion will be done out-of-band */ -int virEventPollRemoveTimeout(int timer) { +int virEventPollRemoveTimeout(int timer) +{ size_t i; PROBE(EVENT_POLL_REMOVE_TIMEOUT, "timer=%d", @@ -326,7 +330,8 @@ int virEventPollRemoveTimeout(int timer) { * no timeout is pending * returns: 0 on success, -1 on error */ -static int virEventPollCalculateTimeout(int *timeout) { +static int virEventPollCalculateTimeout(int *timeout) +{ unsigned long long then = 0; size_t i; EVENT_DEBUG("Calculate expiry of %zu timers", eventLoop.timeoutsCount); @@ -466,7 +471,8 @@ static int virEventPollDispatchTimeouts(void) * * Returns 0 upon success, -1 if an error occurred */ -static int virEventPollDispatchHandles(int nfds, struct pollfd *fds) { +static int virEventPollDispatchHandles(int nfds, struct pollfd *fds) +{ size_t i, n; VIR_DEBUG("Dispatch %d", nfds); diff --git a/src/util/virhook.c b/src/util/virhook.c index 0f5d0c5..22e7cec 100644 --- a/src/util/virhook.c +++ b/src/util/virhook.c @@ -1,7 +1,7 @@ /* * virhook.c: implementation of the synchronous hooks support * - * Copyright (C) 2010-2013 Red Hat, Inc. + * Copyright (C) 2010-2014 Red Hat, Inc. * Copyright (C) 2010 Daniel Veillard * * This library is free software; you can redistribute it and/or @@ -105,7 +105,8 @@ static int virHooksFound = -1; * Returns 1 if found, 0 if not found, and -1 in case of error */ static int -virHookCheck(int no, const char *driver) { +virHookCheck(int no, const char *driver) +{ char *path; int ret; @@ -175,7 +176,8 @@ virHookInitialize(void) { * Returns 1 if present, 0 otherwise */ int -virHookPresent(int driver) { +virHookPresent(int driver) +{ if ((driver < VIR_HOOK_DRIVER_DAEMON) || (driver >= VIR_HOOK_DRIVER_LAST)) return 0; diff --git a/src/util/virrandom.c b/src/util/virrandom.c index 491a3af..6b3bb31 100644 --- a/src/util/virrandom.c +++ b/src/util/virrandom.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012-2013 Red Hat, Inc. + * Copyright (C) 2012-2014 Red Hat, Inc. * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -163,7 +163,8 @@ uint32_t virRandomInt(uint32_t max) int virRandomGenerateWWN(char **wwn, - const char *virt_type) { + const char *virt_type) +{ const char *oui = NULL; if (!virt_type) { diff --git a/src/util/virsocketaddr.c b/src/util/virsocketaddr.c index 3f270e2..8ffdf14 100644 --- a/src/util/virsocketaddr.c +++ b/src/util/virsocketaddr.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2013 Red Hat, Inc. + * Copyright (C) 2009-2014 Red Hat, Inc. * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -116,7 +116,8 @@ virSocketAddrParseInternal(struct addrinfo **res, * * Returns the length of the network address or -1 in case of error. */ -int virSocketAddrParse(virSocketAddrPtr addr, const char *val, int family) { +int virSocketAddrParse(virSocketAddrPtr addr, const char *val, int family) +{ int len; struct addrinfo *res; @@ -150,7 +151,8 @@ int virSocketAddrParse(virSocketAddrPtr addr, const char *val, int family) { * Returns the length of the network address or -1 in case of error. */ int -virSocketAddrParseIPv4(virSocketAddrPtr addr, const char *val) { +virSocketAddrParseIPv4(virSocketAddrPtr addr, const char *val) +{ return virSocketAddrParse(addr, val, AF_INET); } @@ -164,7 +166,8 @@ virSocketAddrParseIPv4(virSocketAddrPtr addr, const char *val) { * Returns the length of the network address or -1 in case of error. */ int -virSocketAddrParseIPv6(virSocketAddrPtr addr, const char *val) { +virSocketAddrParseIPv6(virSocketAddrPtr addr, const char *val) +{ return virSocketAddrParse(addr, val, AF_INET6); } @@ -355,7 +358,8 @@ error: * Returns 0 on success, -1 on failure */ int -virSocketAddrSetPort(virSocketAddrPtr addr, int port) { +virSocketAddrSetPort(virSocketAddrPtr addr, int port) +{ if (addr == NULL) return -1; @@ -380,7 +384,8 @@ virSocketAddrSetPort(virSocketAddrPtr addr, int port) { * Returns -1 if @addr is invalid */ int -virSocketAddrGetPort(virSocketAddrPtr addr) { +virSocketAddrGetPort(virSocketAddrPtr addr) +{ if (addr == NULL) return -1; @@ -401,7 +406,8 @@ virSocketAddrGetPort(virSocketAddrPtr addr) { * * Returns 0 in case of success and -1 in case of error */ -int virSocketAddrIsNetmask(virSocketAddrPtr netmask) { +int virSocketAddrIsNetmask(virSocketAddrPtr netmask) +{ int n = virSocketAddrGetNumNetmaskBits(netmask); if (n < 0) return -1; @@ -549,7 +555,8 @@ virSocketAddrBroadcastByPrefix(const virSocketAddr *addr, * -1 in case of error */ int virSocketAddrCheckNetmask(virSocketAddrPtr addr1, virSocketAddrPtr addr2, - virSocketAddrPtr netmask) { + virSocketAddrPtr netmask) +{ size_t i; if ((addr1 == NULL) || (addr2 == NULL) || (netmask == NULL)) @@ -605,7 +612,8 @@ int virSocketAddrCheckNetmask(virSocketAddrPtr addr1, virSocketAddrPtr addr2, * * Returns the size of the range or -1 in case of failure */ -int virSocketAddrGetRange(virSocketAddrPtr start, virSocketAddrPtr end) { +int virSocketAddrGetRange(virSocketAddrPtr start, virSocketAddrPtr end) +{ int ret = 0; size_t i; diff --git a/src/util/virthread.c b/src/util/virthread.c index d3dfd16..f0e14fc 100644 --- a/src/util/virthread.c +++ b/src/util/virthread.c @@ -1,7 +1,7 @@ /* * virthread.c: basic thread synchronization primitives * - * Copyright (C) 2009-2010 Red Hat, Inc. + * Copyright (C) 2009-2010, 2014 Red Hat, Inc. * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -83,7 +83,8 @@ void virMutexDestroy(virMutexPtr m) pthread_mutex_destroy(&m->lock); } -void virMutexLock(virMutexPtr m){ +void virMutexLock(virMutexPtr m) +{ pthread_mutex_lock(&m->lock); } diff --git a/src/util/virutil.c b/src/util/virutil.c index b6106fc..e0c8a45 100644 --- a/src/util/virutil.c +++ b/src/util/virutil.c @@ -1,7 +1,7 @@ /* * virutil.c: common, generic utility functions * - * Copyright (C) 2006-2013 Red Hat, Inc. + * Copyright (C) 2006-2014 Red Hat, Inc. * Copyright (C) 2006 Daniel P. Berrange * Copyright (C) 2006, 2007 Binary Karma * Copyright (C) 2006 Shuveb Hussain @@ -92,7 +92,8 @@ verify(sizeof(gid_t) <= sizeof(unsigned int) && #ifndef WIN32 -int virSetInherit(int fd, bool inherit) { +int virSetInherit(int fd, bool inherit) +{ int fflags; if ((fflags = fcntl(fd, F_GETFD)) < 0) return -1; @@ -118,11 +119,13 @@ int virSetInherit(int fd ATTRIBUTE_UNUSED, bool inherit ATTRIBUTE_UNUSED) #endif /* WIN32 */ -int virSetBlocking(int fd, bool blocking) { +int virSetBlocking(int fd, bool blocking) +{ return set_nonblocking_flag(fd, !blocking); } -int virSetNonBlock(int fd) { +int virSetNonBlock(int fd) +{ return virSetBlocking(fd, false); } @@ -500,7 +503,8 @@ const char *virEnumToString(const char *const*types, * @param name The name of the device * @return name's index, or -1 on failure */ -int virDiskNameToIndex(const char *name) { +int virDiskNameToIndex(const char *name) +{ const char *ptr = NULL; int idx = 0; static char const* const drive_prefix[] = {"fd", "hd", "vd", "sd", "xvd", "ubd"}; @@ -1487,7 +1491,8 @@ bool virIsDevMapperDevice(const char *dev_name ATTRIBUTE_UNUSED) #endif bool -virValidateWWN(const char *wwn) { +virValidateWWN(const char *wwn) +{ size_t i; const char *p = wwn; diff --git a/src/util/viruuid.c b/src/util/viruuid.c index 48f5e2e..f24002e 100644 --- a/src/util/viruuid.c +++ b/src/util/viruuid.c @@ -1,7 +1,7 @@ /* * viruuid.c: helper APIs for dealing with UUIDs * - * Copyright (C) 2007-2013 Red Hat, Inc. + * Copyright (C) 2007-2014 Red Hat, Inc. * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -147,7 +147,8 @@ virUUIDGenerate(unsigned char *uuid) * Returns 0 in case of success and -1 in case of error. */ int -virUUIDParse(const char *uuidstr, unsigned char *uuid) { +virUUIDParse(const char *uuidstr, unsigned char *uuid) +{ const char *cur; size_t i; diff --git a/src/vbox/vbox_tmpl.c b/src/vbox/vbox_tmpl.c index 382d7b4..4bdd881 100644 --- a/src/vbox/vbox_tmpl.c +++ b/src/vbox/vbox_tmpl.c @@ -281,17 +281,20 @@ static virDomainPtr vboxDomainDefineXML(virConnectPtr conn, const char *xml); static int vboxDomainCreate(virDomainPtr dom); static int vboxDomainUndefineFlags(virDomainPtr dom, unsigned int flags); -static void vboxDriverLock(vboxGlobalData *data) { +static void vboxDriverLock(vboxGlobalData *data) +{ virMutexLock(&data->lock); } -static void vboxDriverUnlock(vboxGlobalData *data) { +static void vboxDriverUnlock(vboxGlobalData *data) +{ virMutexUnlock(&data->lock); } #if VBOX_API_VERSION == 2002000 -static void nsIDtoChar(unsigned char *uuid, const nsID *iid) { +static void nsIDtoChar(unsigned char *uuid, const nsID *iid) +{ char uuidstrsrc[VIR_UUID_STRING_BUFLEN]; char uuidstrdst[VIR_UUID_STRING_BUFLEN]; unsigned char uuidinterim[VIR_UUID_BUFLEN]; @@ -331,7 +334,8 @@ static void nsIDtoChar(unsigned char *uuid, const nsID *iid) { ignore_value(virUUIDParse(uuidstrdst, uuid)); } -static void nsIDFromChar(nsID *iid, const unsigned char *uuid) { +static void nsIDFromChar(nsID *iid, const unsigned char *uuid) +{ char uuidstrsrc[VIR_UUID_STRING_BUFLEN]; char uuidstrdst[VIR_UUID_STRING_BUFLEN]; unsigned char uuidinterim[VIR_UUID_BUFLEN]; @@ -618,7 +622,8 @@ static char *vboxGenerateMediumName(PRUint32 storageBus, PRInt32 devicePort, PRInt32 deviceSlot, PRUint32 *aMaxPortPerInst, - PRUint32 *aMaxSlotPerPort) { + PRUint32 *aMaxSlotPerPort) +{ const char *prefix = NULL; char *name = NULL; int total = 0; @@ -731,7 +736,8 @@ static bool vboxGetDeviceDetails(const char *deviceName, static bool vboxGetMaxPortSlotValues(IVirtualBox *vbox, PRUint32 *maxPortPerInst, - PRUint32 *maxSlotPerPort) { + PRUint32 *maxSlotPerPort) +{ ISystemProperties *sysProps = NULL; if (!vbox) @@ -776,7 +782,8 @@ static bool vboxGetMaxPortSlotValues(IVirtualBox *vbox, /** * Converts Utf-16 string to int */ -static int PRUnicharToInt(PRUnichar *strUtf16) { +static int PRUnicharToInt(PRUnichar *strUtf16) +{ char *strUtf8 = NULL; int ret = 0; @@ -954,7 +961,8 @@ cleanup: return -1; } -static int vboxExtractVersion(vboxGlobalData *data) { +static int vboxExtractVersion(vboxGlobalData *data) +{ int ret = -1; PRUnichar *versionUtf16 = NULL; nsresult rc; @@ -982,7 +990,8 @@ static int vboxExtractVersion(vboxGlobalData *data) { return ret; } -static void vboxUninitialize(vboxGlobalData *data) { +static void vboxUninitialize(vboxGlobalData *data) +{ if (!data) return; @@ -1075,7 +1084,8 @@ static virDrvOpenStatus vboxConnectOpen(virConnectPtr conn, return VIR_DRV_OPEN_SUCCESS; } -static int vboxConnectClose(virConnectPtr conn) { +static int vboxConnectClose(virConnectPtr conn) +{ vboxGlobalData *data = conn->privateData; VIR_DEBUG("%s: in vboxClose", conn->driver->name); @@ -1085,7 +1095,8 @@ static int vboxConnectClose(virConnectPtr conn) { return 0; } -static int vboxConnectGetVersion(virConnectPtr conn, unsigned long *version) { +static int vboxConnectGetVersion(virConnectPtr conn, unsigned long *version) +{ vboxGlobalData *data = conn->privateData; VIR_DEBUG("%s: in vboxGetVersion", conn->driver->name); @@ -1103,12 +1114,14 @@ static char *vboxConnectGetHostname(virConnectPtr conn ATTRIBUTE_UNUSED) } -static int vboxConnectIsSecure(virConnectPtr conn ATTRIBUTE_UNUSED) { +static int vboxConnectIsSecure(virConnectPtr conn ATTRIBUTE_UNUSED) +{ /* Driver is using local, non-network based transport */ return 1; } -static int vboxConnectIsEncrypted(virConnectPtr conn ATTRIBUTE_UNUSED) { +static int vboxConnectIsEncrypted(virConnectPtr conn ATTRIBUTE_UNUSED) +{ /* No encryption is needed, or used on the local transport*/ return 0; } @@ -1118,7 +1131,8 @@ static int vboxConnectIsAlive(virConnectPtr conn ATTRIBUTE_UNUSED) return 1; } -static int vboxConnectGetMaxVcpus(virConnectPtr conn, const char *type ATTRIBUTE_UNUSED) { +static int vboxConnectGetMaxVcpus(virConnectPtr conn, const char *type ATTRIBUTE_UNUSED) +{ VBOX_OBJECT_CHECK(conn, int, -1); PRUint32 maxCPUCount = 0; @@ -1150,7 +1164,8 @@ static char *vboxConnectGetCapabilities(virConnectPtr conn) { return ret; } -static int vboxConnectListDomains(virConnectPtr conn, int *ids, int nids) { +static int vboxConnectListDomains(virConnectPtr conn, int *ids, int nids) +{ VBOX_OBJECT_CHECK(conn, int, -1); vboxArray machines = VBOX_ARRAY_INITIALIZER; PRUint32 state; @@ -1188,7 +1203,8 @@ cleanup: return ret; } -static int vboxConnectNumOfDomains(virConnectPtr conn) { +static int vboxConnectNumOfDomains(virConnectPtr conn) +{ VBOX_OBJECT_CHECK(conn, int, -1); vboxArray machines = VBOX_ARRAY_INITIALIZER; PRUint32 state; @@ -1224,7 +1240,8 @@ cleanup: } static virDomainPtr vboxDomainCreateXML(virConnectPtr conn, const char *xml, - unsigned int flags) { + unsigned int flags) +{ /* VirtualBox currently doesn't have support for running * virtual machines without actually defining them and thus * for time being just define new machine and start it. @@ -1250,7 +1267,8 @@ static virDomainPtr vboxDomainCreateXML(virConnectPtr conn, const char *xml, return dom; } -static virDomainPtr vboxDomainLookupByID(virConnectPtr conn, int id) { +static virDomainPtr vboxDomainLookupByID(virConnectPtr conn, int id) +{ VBOX_OBJECT_CHECK(conn, virDomainPtr, NULL); vboxArray machines = VBOX_ARRAY_INITIALIZER; vboxIID iid = VBOX_IID_INITIALIZER; @@ -1317,7 +1335,8 @@ static virDomainPtr vboxDomainLookupByID(virConnectPtr conn, int id) { return ret; } -static virDomainPtr vboxDomainLookupByUUID(virConnectPtr conn, const unsigned char *uuid) { +static virDomainPtr vboxDomainLookupByUUID(virConnectPtr conn, const unsigned char *uuid) +{ VBOX_OBJECT_CHECK(conn, virDomainPtr, NULL); vboxArray machines = VBOX_ARRAY_INITIALIZER; vboxIID iid = VBOX_IID_INITIALIZER; @@ -1388,7 +1407,8 @@ static virDomainPtr vboxDomainLookupByUUID(virConnectPtr conn, const unsigned ch return ret; } -static virDomainPtr vboxDomainLookupByName(virConnectPtr conn, const char *name) { +static virDomainPtr vboxDomainLookupByName(virConnectPtr conn, const char *name) +{ VBOX_OBJECT_CHECK(conn, virDomainPtr, NULL); vboxArray machines = VBOX_ARRAY_INITIALIZER; vboxIID iid = VBOX_IID_INITIALIZER; @@ -1457,7 +1477,8 @@ static virDomainPtr vboxDomainLookupByName(virConnectPtr conn, const char *name) } -static int vboxDomainIsActive(virDomainPtr dom) { +static int vboxDomainIsActive(virDomainPtr dom) +{ VBOX_OBJECT_CHECK(dom->conn, int, -1); vboxArray machines = VBOX_ARRAY_INITIALIZER; vboxIID iid = VBOX_IID_INITIALIZER; @@ -1549,7 +1570,8 @@ cleanup: } -static int vboxDomainIsUpdated(virDomainPtr dom ATTRIBUTE_UNUSED) { +static int vboxDomainIsUpdated(virDomainPtr dom ATTRIBUTE_UNUSED) +{ /* VBox domains never have a persistent state that differs from * current state. However, we do want to check for existence. */ VBOX_OBJECT_CHECK(dom->conn, int, -1); @@ -1573,7 +1595,8 @@ cleanup: return ret; } -static int vboxDomainSuspend(virDomainPtr dom) { +static int vboxDomainSuspend(virDomainPtr dom) +{ VBOX_OBJECT_CHECK(dom->conn, int, -1); IMachine *machine = NULL; vboxIID iid = VBOX_IID_INITIALIZER; @@ -1624,7 +1647,8 @@ cleanup: return ret; } -static int vboxDomainResume(virDomainPtr dom) { +static int vboxDomainResume(virDomainPtr dom) +{ VBOX_OBJECT_CHECK(dom->conn, int, -1); IMachine *machine = NULL; vboxIID iid = VBOX_IID_INITIALIZER; @@ -1677,7 +1701,8 @@ cleanup: } static int vboxDomainShutdownFlags(virDomainPtr dom, - unsigned int flags) { + unsigned int flags) +{ VBOX_OBJECT_CHECK(dom->conn, int, -1); IMachine *machine = NULL; vboxIID iid = VBOX_IID_INITIALIZER; @@ -1729,7 +1754,8 @@ cleanup: return ret; } -static int vboxDomainShutdown(virDomainPtr dom) { +static int vboxDomainShutdown(virDomainPtr dom) +{ return vboxDomainShutdownFlags(dom, 0); } @@ -1863,7 +1889,8 @@ static char *vboxDomainGetOSType(virDomainPtr dom ATTRIBUTE_UNUSED) { return osType; } -static int vboxDomainSetMemory(virDomainPtr dom, unsigned long memory) { +static int vboxDomainSetMemory(virDomainPtr dom, unsigned long memory) +{ VBOX_OBJECT_CHECK(dom->conn, int, -1); IMachine *machine = NULL; vboxIID iid = VBOX_IID_INITIALIZER; @@ -1919,7 +1946,8 @@ cleanup: return ret; } -static virDomainState vboxConvertState(enum MachineState state) { +static virDomainState vboxConvertState(enum MachineState state) +{ switch (state) { case MachineState_Running: return VIR_DOMAIN_RUNNING; @@ -1940,7 +1968,8 @@ static virDomainState vboxConvertState(enum MachineState state) { } } -static int vboxDomainGetInfo(virDomainPtr dom, virDomainInfoPtr info) { +static int vboxDomainGetInfo(virDomainPtr dom, virDomainInfoPtr info) +{ VBOX_OBJECT_CHECK(dom->conn, int, -1); vboxArray machines = VBOX_ARRAY_INITIALIZER; char *machineName = NULL; @@ -2055,7 +2084,8 @@ cleanup: return ret; } -static int vboxDomainSave(virDomainPtr dom, const char *path ATTRIBUTE_UNUSED) { +static int vboxDomainSave(virDomainPtr dom, const char *path ATTRIBUTE_UNUSED) +{ VBOX_OBJECT_CHECK(dom->conn, int, -1); IConsole *console = NULL; vboxIID iid = VBOX_IID_INITIALIZER; @@ -3501,7 +3531,8 @@ cleanup: return ret; } -static int vboxConnectNumOfDefinedDomains(virConnectPtr conn) { +static int vboxConnectNumOfDefinedDomains(virConnectPtr conn) +{ VBOX_OBJECT_CHECK(conn, int, -1); vboxArray machines = VBOX_ARRAY_INITIALIZER; PRUint32 state = MachineState_Null; @@ -3702,7 +3733,8 @@ vboxStartMachine(virDomainPtr dom, int maxDomID, IMachine *machine, return ret; } -static int vboxDomainCreateWithFlags(virDomainPtr dom, unsigned int flags) { +static int vboxDomainCreateWithFlags(virDomainPtr dom, unsigned int flags) +{ VBOX_OBJECT_CHECK(dom->conn, int, -1); vboxArray machines = VBOX_ARRAY_INITIALIZER; unsigned char uuid[VIR_UUID_BUFLEN] = {0}; @@ -3769,7 +3801,8 @@ cleanup: return ret; } -static int vboxDomainCreate(virDomainPtr dom) { +static int vboxDomainCreate(virDomainPtr dom) +{ return vboxDomainCreateWithFlags(dom, 0); } @@ -5055,7 +5088,8 @@ vboxAttachSharedFolder(virDomainDefPtr def, vboxGlobalData *data, IMachine *mach } } -static virDomainPtr vboxDomainDefineXML(virConnectPtr conn, const char *xml) { +static virDomainPtr vboxDomainDefineXML(virConnectPtr conn, const char *xml) +{ VBOX_OBJECT_CHECK(conn, virDomainPtr, NULL); IMachine *machine = NULL; IBIOSSettings *bios = NULL; @@ -5429,7 +5463,8 @@ vboxDomainUndefine(virDomainPtr dom) static int vboxDomainAttachDeviceImpl(virDomainPtr dom, const char *xml, - int mediaChangeOnly ATTRIBUTE_UNUSED) { + int mediaChangeOnly ATTRIBUTE_UNUSED) +{ VBOX_OBJECT_CHECK(dom->conn, int, -1); IMachine *machine = NULL; vboxIID iid = VBOX_IID_INITIALIZER; @@ -5624,7 +5659,8 @@ cleanup: return ret; } -static int vboxDomainAttachDevice(virDomainPtr dom, const char *xml) { +static int vboxDomainAttachDevice(virDomainPtr dom, const char *xml) +{ return vboxDomainAttachDeviceImpl(dom, xml, 0); } @@ -5644,7 +5680,8 @@ vboxDomainAttachDeviceFlags(virDomainPtr dom, const char *xml, } static int vboxDomainUpdateDeviceFlags(virDomainPtr dom, const char *xml, - unsigned int flags) { + unsigned int flags) +{ virCheckFlags(VIR_DOMAIN_AFFECT_CURRENT | VIR_DOMAIN_AFFECT_LIVE | VIR_DOMAIN_AFFECT_CONFIG, -1); @@ -5658,7 +5695,8 @@ static int vboxDomainUpdateDeviceFlags(virDomainPtr dom, const char *xml, return vboxDomainAttachDeviceImpl(dom, xml, 1); } -static int vboxDomainDetachDevice(virDomainPtr dom, const char *xml) { +static int vboxDomainDetachDevice(virDomainPtr dom, const char *xml) +{ VBOX_OBJECT_CHECK(dom->conn, int, -1); IMachine *machine = NULL; vboxIID iid = VBOX_IID_INITIALIZER; @@ -7275,7 +7313,8 @@ static IVirtualBoxCallback *vboxAllocCallbackObj(void) { static void vboxReadCallback(int watch ATTRIBUTE_UNUSED, int fd, int events ATTRIBUTE_UNUSED, - void *opaque ATTRIBUTE_UNUSED) { + void *opaque ATTRIBUTE_UNUSED) +{ if (fd >= 0) { g_pVBoxGlobalData->vboxQueue->vtbl->ProcessPendingEvents(g_pVBoxGlobalData->vboxQueue); } else { @@ -7390,7 +7429,8 @@ static int vboxConnectDomainEventRegisterAny(virConnectPtr conn, int eventID, virConnectDomainEventGenericCallback callback, void *opaque, - virFreeCallback freecb) { + virFreeCallback freecb) +{ VBOX_OBJECT_CHECK(conn, int, -1); int vboxRet = -1; nsresult rc; @@ -7513,13 +7553,15 @@ cleanup: return VIR_DRV_OPEN_DECLINED; } -static int vboxNetworkClose(virConnectPtr conn) { +static int vboxNetworkClose(virConnectPtr conn) +{ VIR_DEBUG("network uninitialized"); conn->networkPrivateData = NULL; return 0; } -static int vboxConnectNumOfNetworks(virConnectPtr conn) { +static int vboxConnectNumOfNetworks(virConnectPtr conn) +{ VBOX_OBJECT_HOST_CHECK(conn, int, 0); vboxArray networkInterfaces = VBOX_ARRAY_INITIALIZER; size_t i = 0; @@ -7597,7 +7639,8 @@ static int vboxConnectListNetworks(virConnectPtr conn, char **const names, int n return ret; } -static int vboxConnectNumOfDefinedNetworks(virConnectPtr conn) { +static int vboxConnectNumOfDefinedNetworks(virConnectPtr conn) +{ VBOX_OBJECT_HOST_CHECK(conn, int, 0); vboxArray networkInterfaces = VBOX_ARRAY_INITIALIZER; size_t i = 0; @@ -7719,7 +7762,8 @@ vboxNetworkLookupByUUID(virConnectPtr conn, const unsigned char *uuid) return ret; } -static virNetworkPtr vboxNetworkLookupByName(virConnectPtr conn, const char *name) { +static virNetworkPtr vboxNetworkLookupByName(virConnectPtr conn, const char *name) +{ VBOX_OBJECT_HOST_CHECK(conn, virNetworkPtr, NULL); PRUnichar *nameUtf16 = NULL; IHostNetworkInterface *networkInterface = NULL; @@ -7755,7 +7799,8 @@ static virNetworkPtr vboxNetworkLookupByName(virConnectPtr conn, const char *nam return ret; } -static virNetworkPtr vboxNetworkDefineCreateXML(virConnectPtr conn, const char *xml, bool start) { +static virNetworkPtr vboxNetworkDefineCreateXML(virConnectPtr conn, const char *xml, bool start) +{ VBOX_OBJECT_HOST_CHECK(conn, virNetworkPtr, NULL); PRUnichar *networkInterfaceNameUtf16 = NULL; char *networkInterfaceNameUtf8 = NULL; @@ -7961,15 +8006,18 @@ cleanup: return ret; } -static virNetworkPtr vboxNetworkCreateXML(virConnectPtr conn, const char *xml) { +static virNetworkPtr vboxNetworkCreateXML(virConnectPtr conn, const char *xml) +{ return vboxNetworkDefineCreateXML(conn, xml, true); } -static virNetworkPtr vboxNetworkDefineXML(virConnectPtr conn, const char *xml) { +static virNetworkPtr vboxNetworkDefineXML(virConnectPtr conn, const char *xml) +{ return vboxNetworkDefineCreateXML(conn, xml, false); } -static int vboxNetworkUndefineDestroy(virNetworkPtr network, bool removeinterface) { +static int vboxNetworkUndefineDestroy(virNetworkPtr network, bool removeinterface) +{ VBOX_OBJECT_HOST_CHECK(network->conn, int, -1); char *networkNameUtf8 = NULL; PRUnichar *networkInterfaceNameUtf16 = NULL; @@ -8053,11 +8101,13 @@ cleanup: return ret; } -static int vboxNetworkUndefine(virNetworkPtr network) { +static int vboxNetworkUndefine(virNetworkPtr network) +{ return vboxNetworkUndefineDestroy(network, true); } -static int vboxNetworkCreate(virNetworkPtr network) { +static int vboxNetworkCreate(virNetworkPtr network) +{ VBOX_OBJECT_HOST_CHECK(network->conn, int, -1); char *networkNameUtf8 = NULL; PRUnichar *networkInterfaceNameUtf16 = NULL; @@ -8124,7 +8174,8 @@ cleanup: return ret; } -static int vboxNetworkDestroy(virNetworkPtr network) { +static int vboxNetworkDestroy(virNetworkPtr network) +{ return vboxNetworkUndefineDestroy(network, false); } @@ -8314,13 +8365,15 @@ static virDrvOpenStatus vboxStorageOpen(virConnectPtr conn, return VIR_DRV_OPEN_SUCCESS; } -static int vboxStorageClose(virConnectPtr conn) { +static int vboxStorageClose(virConnectPtr conn) +{ VIR_DEBUG("vbox storage uninitialized"); conn->storagePrivateData = NULL; return 0; } -static int vboxConnectNumOfStoragePools(virConnectPtr conn ATTRIBUTE_UNUSED) { +static int vboxConnectNumOfStoragePools(virConnectPtr conn ATTRIBUTE_UNUSED) +{ /** Currently only one pool supported, the default one * given by ISystemProperties::defaultHardDiskFolder() @@ -8339,7 +8392,8 @@ static int vboxConnectListStoragePools(virConnectPtr conn ATTRIBUTE_UNUSED, return numActive; } -static virStoragePoolPtr vboxStoragePoolLookupByName(virConnectPtr conn, const char *name) { +static virStoragePoolPtr vboxStoragePoolLookupByName(virConnectPtr conn, const char *name) +{ virStoragePoolPtr ret = NULL; /** Current limitation of the function: since @@ -8358,7 +8412,8 @@ static virStoragePoolPtr vboxStoragePoolLookupByName(virConnectPtr conn, const c return ret; } -static int vboxStoragePoolNumOfVolumes(virStoragePoolPtr pool) { +static int vboxStoragePoolNumOfVolumes(virStoragePoolPtr pool) +{ VBOX_OBJECT_CHECK(pool->conn, int, -1); vboxArray hardDisks = VBOX_ARRAY_INITIALIZER; PRUint32 hardDiskAccessible = 0; @@ -8439,7 +8494,8 @@ static int vboxStoragePoolListVolumes(virStoragePoolPtr pool, char **const names return ret; } -static virStorageVolPtr vboxStorageVolLookupByName(virStoragePoolPtr pool, const char *name) { +static virStorageVolPtr vboxStorageVolLookupByName(virStoragePoolPtr pool, const char *name) +{ VBOX_OBJECT_CHECK(pool->conn, virStorageVolPtr, NULL); vboxArray hardDisks = VBOX_ARRAY_INITIALIZER; nsresult rc; @@ -8502,7 +8558,8 @@ static virStorageVolPtr vboxStorageVolLookupByName(virStoragePoolPtr pool, const return ret; } -static virStorageVolPtr vboxStorageVolLookupByKey(virConnectPtr conn, const char *key) { +static virStorageVolPtr vboxStorageVolLookupByKey(virConnectPtr conn, const char *key) +{ VBOX_OBJECT_CHECK(conn, virStorageVolPtr, NULL); vboxIID hddIID = VBOX_IID_INITIALIZER; unsigned char uuid[VIR_UUID_BUFLEN]; @@ -8566,7 +8623,8 @@ static virStorageVolPtr vboxStorageVolLookupByKey(virConnectPtr conn, const char return ret; } -static virStorageVolPtr vboxStorageVolLookupByPath(virConnectPtr conn, const char *path) { +static virStorageVolPtr vboxStorageVolLookupByPath(virConnectPtr conn, const char *path) +{ VBOX_OBJECT_CHECK(conn, virStorageVolPtr, NULL); PRUnichar *hddPathUtf16 = NULL; IHardDisk *hardDisk = NULL; @@ -8919,7 +8977,8 @@ static int vboxStorageVolDelete(virStorageVolPtr vol, return ret; } -static int vboxStorageVolGetInfo(virStorageVolPtr vol, virStorageVolInfoPtr info) { +static int vboxStorageVolGetInfo(virStorageVolPtr vol, virStorageVolInfoPtr info) +{ VBOX_OBJECT_CHECK(vol->conn, int, -1); IHardDisk *hardDisk = NULL; unsigned char uuid[VIR_UUID_BUFLEN]; diff --git a/src/xen/xen_driver.c b/src/xen/xen_driver.c index 9204f88..a44be41 100644 --- a/src/xen/xen_driver.c +++ b/src/xen/xen_driver.c @@ -161,7 +161,8 @@ static virDomainDefPtr xenGetDomainDefForDom(virDomainPtr dom) * until reboot which might be false in future Xen implementations. */ static void -xenNumaInit(virConnectPtr conn) { +xenNumaInit(virConnectPtr conn) +{ virNodeInfo nodeInfo; xenUnifiedPrivatePtr priv; int ret; @@ -1913,7 +1914,8 @@ cleanup: } static int -xenUnifiedDomainUndefine(virDomainPtr dom) { +xenUnifiedDomainUndefine(virDomainPtr dom) +{ return xenUnifiedDomainUndefineFlags(dom, 0); } diff --git a/src/xen/xm_internal.c b/src/xen/xm_internal.c index 603b71a..47074a6 100644 --- a/src/xen/xm_internal.c +++ b/src/xen/xm_internal.c @@ -1,7 +1,7 @@ /* * xm_internal.c: helper routines for dealing with inactive domains * - * Copyright (C) 2006-2007, 2009-2013 Red Hat, Inc. + * Copyright (C) 2006-2007, 2009-2014 Red Hat, Inc. * Copyright (C) 2006 Daniel P. Berrange * * This library is free software; you can redistribute it and/or @@ -92,7 +92,8 @@ static int xenInotifyActive(virConnectPtr conn) /* Release memory associated with a cached config object */ -static void xenXMConfigFree(void *payload, const void *key ATTRIBUTE_UNUSED) { +static void xenXMConfigFree(void *payload, const void *key ATTRIBUTE_UNUSED) +{ xenXMConfCachePtr entry = (xenXMConfCachePtr)payload; virDomainDefFree(entry->def); VIR_FREE(entry->filename); @@ -1115,7 +1116,8 @@ struct xenXMListIteratorContext { }; static void -xenXMListIterator(void *payload ATTRIBUTE_UNUSED, const void *name, void *data) { +xenXMListIterator(void *payload ATTRIBUTE_UNUSED, const void *name, void *data) +{ struct xenXMListIteratorContext *ctx = data; virDomainDefPtr def = NULL; diff --git a/src/xenapi/xenapi_utils.c b/src/xenapi/xenapi_utils.c index 427fc21..bf335ea 100644 --- a/src/xenapi/xenapi_utils.c +++ b/src/xenapi/xenapi_utils.c @@ -1,6 +1,6 @@ /* * xenapi_utils.c: Xen API driver -- utils parts. - * Copyright (C) 2011-2013 Red Hat, Inc. + * Copyright (C) 2011-2014 Red Hat, Inc. * Copyright (C) 2009, 2010 Citrix Ltd. * * This library is free software; you can redistribute it and/or @@ -179,7 +179,8 @@ createXenAPIBootOrderString(int nboot, int *bootDevs) /* convert boot order string to libvirt boot order enum */ enum virDomainBootOrder -map2LibvirtBootOrder(char c) { +map2LibvirtBootOrder(char c) +{ switch (c) { case 'a': return VIR_DOMAIN_BOOT_FLOPPY; diff --git a/src/xenxs/xen_xm.c b/src/xenxs/xen_xm.c index a70c5e3..f94b03f 100644 --- a/src/xenxs/xen_xm.c +++ b/src/xenxs/xen_xm.c @@ -1,7 +1,7 @@ /* * xen_xm.c: Xen XM parsing functions * - * Copyright (C) 2006-2007, 2009-2010, 2012-2013 Red Hat, Inc. + * Copyright (C) 2006-2007, 2009-2010, 2012-2014 Red Hat, Inc. * Copyright (C) 2011 Univention GmbH * Copyright (C) 2006 Daniel P. Berrange * @@ -44,7 +44,8 @@ static int xenXMConfigGetBool(virConfPtr conf, const char *name, int *value, - int def) { + int def) +{ virConfValuePtr val; *value = 0; @@ -70,7 +71,8 @@ static int xenXMConfigGetBool(virConfPtr conf, static int xenXMConfigGetULong(virConfPtr conf, const char *name, unsigned long *value, - unsigned long def) { + unsigned long def) +{ virConfValuePtr val; *value = 0; @@ -102,7 +104,8 @@ static int xenXMConfigGetULong(virConfPtr conf, static int xenXMConfigGetULongLong(virConfPtr conf, const char *name, unsigned long long *value, - unsigned long long def) { + unsigned long long def) +{ virConfValuePtr val; *value = 0; @@ -134,7 +137,8 @@ static int xenXMConfigGetULongLong(virConfPtr conf, static int xenXMConfigGetString(virConfPtr conf, const char *name, const char **value, - const char *def) { + const char *def) +{ virConfValuePtr val; *value = NULL; @@ -158,7 +162,8 @@ static int xenXMConfigGetString(virConfPtr conf, static int xenXMConfigCopyStringInternal(virConfPtr conf, const char *name, char **value, - int allowMissing) { + int allowMissing) +{ virConfValuePtr val; *value = NULL; @@ -201,7 +206,8 @@ static int xenXMConfigCopyStringOpt(virConfPtr conf, /* Convenience method to grab a string UUID from the config file object */ -static int xenXMConfigGetUUID(virConfPtr conf, const char *name, unsigned char *uuid) { +static int xenXMConfigGetUUID(virConfPtr conf, const char *name, unsigned char *uuid) +{ virConfValuePtr val; if (!uuid || !name || !conf) { @@ -248,7 +254,8 @@ static int xenXMConfigGetUUID(virConfPtr conf, const char *name, unsigned char * */ virDomainDefPtr xenParseXM(virConfPtr conf, int xendConfigVersion, - virCapsPtr caps) { + virCapsPtr caps) +{ const char *str; int hvm = 0; int val; @@ -1139,7 +1146,8 @@ cleanup: static -int xenXMConfigSetInt(virConfPtr conf, const char *setting, long long l) { +int xenXMConfigSetInt(virConfPtr conf, const char *setting, long long l) +{ virConfValuePtr value = NULL; if ((long) l != l) { @@ -1159,7 +1167,8 @@ int xenXMConfigSetInt(virConfPtr conf, const char *setting, long long l) { static -int xenXMConfigSetString(virConfPtr conf, const char *setting, const char *str) { +int xenXMConfigSetString(virConfPtr conf, const char *setting, const char *str) +{ virConfValuePtr value = NULL; if (VIR_ALLOC(value) < 0) @@ -1478,7 +1487,8 @@ verify(MAX_VIRT_CPUS <= sizeof(1UL) * CHAR_BIT); virConfPtr xenFormatXM(virConnectPtr conn, virDomainDefPtr def, - int xendConfigVersion) { + int xendConfigVersion) +{ virConfPtr conf = NULL; int hvm = 0, vmlocaltime = 0; size_t i; diff --git a/tests/commandhelper.c b/tests/commandhelper.c index 296fbbb..32b8512 100644 --- a/tests/commandhelper.c +++ b/tests/commandhelper.c @@ -1,7 +1,7 @@ /* * commandhelper.c: Auxiliary program for commandtest * - * Copyright (C) 2010-2013 Red Hat, Inc. + * Copyright (C) 2010-2014 Red Hat, Inc. * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -37,7 +37,8 @@ # define VIR_FROM_THIS VIR_FROM_NONE -static int envsort(const void *a, const void *b) { +static int envsort(const void *a, const void *b) +{ const char *const*astrptr = a; const char *const*bstrptr = b; const char *astr = *astrptr; diff --git a/tests/qemuargv2xmltest.c b/tests/qemuargv2xmltest.c index e75c85d..7ec0376 100644 --- a/tests/qemuargv2xmltest.c +++ b/tests/qemuargv2xmltest.c @@ -36,7 +36,8 @@ static int blankProblemElements(char *data) static int testCompareXMLToArgvFiles(const char *xml, const char *cmdfile, - bool expect_warning) { + bool expect_warning) +{ char *expectxml = NULL; char *actualxml = NULL; char *cmd = NULL; diff --git a/tests/testutils.c b/tests/testutils.c index ede6239..8b5e61a 100644 --- a/tests/testutils.c +++ b/tests/testutils.c @@ -360,7 +360,8 @@ virtTestLoadFile(const char *file, char **buf) #ifndef WIN32 static void virtTestCaptureProgramExecChild(const char *const argv[], - int pipefd) { + int pipefd) +{ size_t i; int open_max; int stdinfd = -1; @@ -627,7 +628,8 @@ virtTestLogContentAndReset(void) static unsigned int -virTestGetFlag(const char *name) { +virTestGetFlag(const char *name) +{ char *flagStr; unsigned int flag; diff --git a/tests/virshtest.c b/tests/virshtest.c index 6510208..4844b59 100644 --- a/tests/virshtest.c +++ b/tests/virshtest.c @@ -42,7 +42,8 @@ static const char *domname_fc4 = "fc4\n\n"; static const char *domstate_fc4 = "running\n\n"; static int testFilterLine(char *buffer, - const char *toRemove) { + const char *toRemove) +{ char *start; char *end; @@ -93,7 +94,8 @@ static char *custom_uri; "--connect", \ custom_uri -static int testCompareListDefault(const void *data ATTRIBUTE_UNUSED) { +static int testCompareListDefault(const void *data ATTRIBUTE_UNUSED) +{ const char *const argv[] = { VIRSH_DEFAULT, "list", NULL }; const char *exp = "\ Id Name State\n\ @@ -103,7 +105,8 @@ static int testCompareListDefault(const void *data ATTRIBUTE_UNUSED) { return testCompareOutputLit(exp, NULL, argv); } -static int testCompareListCustom(const void *data ATTRIBUTE_UNUSED) { +static int testCompareListCustom(const void *data ATTRIBUTE_UNUSED) +{ const char *const argv[] = { VIRSH_CUSTOM, "list", NULL }; const char *exp = "\ Id Name State\n\ @@ -114,7 +117,8 @@ static int testCompareListCustom(const void *data ATTRIBUTE_UNUSED) { return testCompareOutputLit(exp, NULL, argv); } -static int testCompareNodeinfoDefault(const void *data ATTRIBUTE_UNUSED) { +static int testCompareNodeinfoDefault(const void *data ATTRIBUTE_UNUSED) +{ const char *const argv[] = { VIRSH_DEFAULT, "nodeinfo", NULL }; const char *exp = "\ CPU model: i686\n\ @@ -129,7 +133,8 @@ Memory size: 3145728 KiB\n\ return testCompareOutputLit(exp, NULL, argv); } -static int testCompareNodeinfoCustom(const void *data ATTRIBUTE_UNUSED) { +static int testCompareNodeinfoCustom(const void *data ATTRIBUTE_UNUSED) +{ const char *const argv[] = { VIRSH_CUSTOM, "nodeinfo", @@ -148,73 +153,85 @@ Memory size: 8192000 KiB\n\ return testCompareOutputLit(exp, NULL, argv); } -static int testCompareDominfoByID(const void *data ATTRIBUTE_UNUSED) { +static int testCompareDominfoByID(const void *data ATTRIBUTE_UNUSED) +{ const char *const argv[] = { VIRSH_CUSTOM, "dominfo", "2", NULL }; const char *exp = dominfo_fc4; return testCompareOutputLit(exp, "\nCPU time:", argv); } -static int testCompareDominfoByUUID(const void *data ATTRIBUTE_UNUSED) { +static int testCompareDominfoByUUID(const void *data ATTRIBUTE_UNUSED) +{ const char *const argv[] = { VIRSH_CUSTOM, "dominfo", DOM_UUID, NULL }; const char *exp = dominfo_fc4; return testCompareOutputLit(exp, "\nCPU time:", argv); } -static int testCompareDominfoByName(const void *data ATTRIBUTE_UNUSED) { +static int testCompareDominfoByName(const void *data ATTRIBUTE_UNUSED) +{ const char *const argv[] = { VIRSH_CUSTOM, "dominfo", "fc4", NULL }; const char *exp = dominfo_fc4; return testCompareOutputLit(exp, "\nCPU time:", argv); } -static int testCompareDomuuidByID(const void *data ATTRIBUTE_UNUSED) { +static int testCompareDomuuidByID(const void *data ATTRIBUTE_UNUSED) +{ const char *const argv[] = { VIRSH_CUSTOM, "domuuid", "2", NULL }; const char *exp = domuuid_fc4; return testCompareOutputLit(exp, NULL, argv); } -static int testCompareDomuuidByName(const void *data ATTRIBUTE_UNUSED) { +static int testCompareDomuuidByName(const void *data ATTRIBUTE_UNUSED) +{ const char *const argv[] = { VIRSH_CUSTOM, "domuuid", "fc4", NULL }; const char *exp = domuuid_fc4; return testCompareOutputLit(exp, NULL, argv); } -static int testCompareDomidByName(const void *data ATTRIBUTE_UNUSED) { +static int testCompareDomidByName(const void *data ATTRIBUTE_UNUSED) +{ const char *const argv[] = { VIRSH_CUSTOM, "domid", "fc4", NULL }; const char *exp = domid_fc4; return testCompareOutputLit(exp, NULL, argv); } -static int testCompareDomidByUUID(const void *data ATTRIBUTE_UNUSED) { +static int testCompareDomidByUUID(const void *data ATTRIBUTE_UNUSED) +{ const char *const argv[] = { VIRSH_CUSTOM, "domid", DOM_UUID, NULL }; const char *exp = domid_fc4; return testCompareOutputLit(exp, NULL, argv); } -static int testCompareDomnameByID(const void *data ATTRIBUTE_UNUSED) { +static int testCompareDomnameByID(const void *data ATTRIBUTE_UNUSED) +{ const char *const argv[] = { VIRSH_CUSTOM, "domname", "2", NULL }; const char *exp = domname_fc4; return testCompareOutputLit(exp, NULL, argv); } -static int testCompareDomnameByUUID(const void *data ATTRIBUTE_UNUSED) { +static int testCompareDomnameByUUID(const void *data ATTRIBUTE_UNUSED) +{ const char *const argv[] = { VIRSH_CUSTOM, "domname", DOM_UUID, NULL }; const char *exp = domname_fc4; return testCompareOutputLit(exp, NULL, argv); } -static int testCompareDomstateByID(const void *data ATTRIBUTE_UNUSED) { +static int testCompareDomstateByID(const void *data ATTRIBUTE_UNUSED) +{ const char *const argv[] = { VIRSH_CUSTOM, "domstate", "2", NULL }; const char *exp = domstate_fc4; return testCompareOutputLit(exp, NULL, argv); } -static int testCompareDomstateByUUID(const void *data ATTRIBUTE_UNUSED) { +static int testCompareDomstateByUUID(const void *data ATTRIBUTE_UNUSED) +{ const char *const argv[] = { VIRSH_CUSTOM, "domstate", DOM_UUID, NULL }; const char *exp = domstate_fc4; return testCompareOutputLit(exp, NULL, argv); } -static int testCompareDomstateByName(const void *data ATTRIBUTE_UNUSED) { +static int testCompareDomstateByName(const void *data ATTRIBUTE_UNUSED) +{ const char *const argv[] = { VIRSH_CUSTOM, "domstate", "fc4", NULL }; const char *exp = domstate_fc4; return testCompareOutputLit(exp, NULL, argv); @@ -225,7 +242,8 @@ struct testInfo { const char *result; }; -static int testCompareEcho(const void *data) { +static int testCompareEcho(const void *data) +{ const struct testInfo *info = data; return testCompareOutputLit(info->result, NULL, info->argv); } diff --git a/tests/virusbtest.c b/tests/virusbtest.c index bb849b5..b66c7d0 100644 --- a/tests/virusbtest.c +++ b/tests/virusbtest.c @@ -137,7 +137,8 @@ cleanup: static int testCheckNdevs(const char* occasion, size_t got, - size_t expected) { + size_t expected) +{ if (got != expected) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s: got %zu devices, expected %zu", diff --git a/tests/xencapstest.c b/tests/xencapstest.c index ed1fee5..ebea205 100644 --- a/tests/xencapstest.c +++ b/tests/xencapstest.c @@ -69,21 +69,24 @@ testCompareFiles(virArch hostmachine, const char *xml_rel, return ret; } -static int testXeni686(const void *data ATTRIBUTE_UNUSED) { +static int testXeni686(const void *data ATTRIBUTE_UNUSED) +{ return testCompareFiles(VIR_ARCH_I686, "xencapsdata/xen-i686.xml", "xencapsdata/xen-i686.cpuinfo", "xencapsdata/xen-i686.caps"); } -static int testXeni686PAE(const void *data ATTRIBUTE_UNUSED) { +static int testXeni686PAE(const void *data ATTRIBUTE_UNUSED) +{ return testCompareFiles(VIR_ARCH_I686, "xencapsdata/xen-i686-pae.xml", "xencapsdata/xen-i686-pae.cpuinfo", "xencapsdata/xen-i686-pae.caps"); } -static int testXeni686PAEHVM(const void *data ATTRIBUTE_UNUSED) { +static int testXeni686PAEHVM(const void *data ATTRIBUTE_UNUSED) +{ return testCompareFiles(VIR_ARCH_I686, "xencapsdata/xen-i686-pae-hvm.xml", "xencapsdata/xen-i686-pae-hvm.cpuinfo", @@ -93,7 +96,8 @@ static int testXeni686PAEHVM(const void *data ATTRIBUTE_UNUSED) { /* No PAE + HVM is non-sensical - all VMX capable CPUs have PAE */ /* -static int testXeni686HVM(const void *data ATTRIBUTE_UNUSED) { +static int testXeni686HVM(const void *data ATTRIBUTE_UNUSED) +{ return testCompareFiles(VIR_ARCH_I686, "xencapsdata/xen-i686-hvm.xml", "xencapsdata/xen-i686.cpuinfo", @@ -101,46 +105,53 @@ static int testXeni686HVM(const void *data ATTRIBUTE_UNUSED) { } */ -static int testXenx86_64(const void *data ATTRIBUTE_UNUSED) { +static int testXenx86_64(const void *data ATTRIBUTE_UNUSED) +{ return testCompareFiles(VIR_ARCH_X86_64, "xencapsdata/xen-x86_64.xml", "xencapsdata/xen-x86_64.cpuinfo", "xencapsdata/xen-x86_64.caps"); } -static int testXenx86_64HVM(const void *data ATTRIBUTE_UNUSED) { +static int testXenx86_64HVM(const void *data ATTRIBUTE_UNUSED) +{ return testCompareFiles(VIR_ARCH_X86_64, "xencapsdata/xen-x86_64-hvm.xml", "xencapsdata/xen-x86_64-hvm.cpuinfo", "xencapsdata/xen-x86_64-hvm.caps"); } -static int testXenia64(const void *data ATTRIBUTE_UNUSED) { +static int testXenia64(const void *data ATTRIBUTE_UNUSED) +{ return testCompareFiles(VIR_ARCH_ITANIUM, "xencapsdata/xen-ia64.xml", "xencapsdata/xen-ia64.cpuinfo", "xencapsdata/xen-ia64.caps"); } -static int testXenia64BE(const void *data ATTRIBUTE_UNUSED) { +static int testXenia64BE(const void *data ATTRIBUTE_UNUSED) +{ return testCompareFiles(VIR_ARCH_ITANIUM, "xencapsdata/xen-ia64-be.xml", "xencapsdata/xen-ia64-be.cpuinfo", "xencapsdata/xen-ia64-be.caps"); } -static int testXenia64HVM(const void *data ATTRIBUTE_UNUSED) { +static int testXenia64HVM(const void *data ATTRIBUTE_UNUSED) +{ return testCompareFiles(VIR_ARCH_ITANIUM, "xencapsdata/xen-ia64-hvm.xml", "xencapsdata/xen-ia64-hvm.cpuinfo", "xencapsdata/xen-ia64-hvm.caps"); } -static int testXenia64BEHVM(const void *data ATTRIBUTE_UNUSED) { +static int testXenia64BEHVM(const void *data ATTRIBUTE_UNUSED) +{ return testCompareFiles(VIR_ARCH_ITANIUM, "xencapsdata/xen-ia64-be-hvm.xml", "xencapsdata/xen-ia64-be-hvm.cpuinfo", "xencapsdata/xen-ia64-be-hvm.caps"); } -static int testXenppc64(const void *data ATTRIBUTE_UNUSED) { +static int testXenppc64(const void *data ATTRIBUTE_UNUSED) +{ return testCompareFiles(VIR_ARCH_PPC64, "xencapsdata/xen-ppc64.xml", "xencapsdata/xen-ppc64.cpuinfo", -- 1.9.0

This patch is not trying to fix every switch, just the ones I worked with last time, because some of these were especially unreadable. Covers enums virDomainGraphicsType and virDomainChrType (where applicable). Also sort it's cases by their value. Signed-off-by: Martin Kletzander <mkletzan@redhat.com> --- src/conf/domain_conf.c | 22 +++++++++++++--------- src/qemu/qemu_command.c | 4 +++- 2 files changed, 16 insertions(+), 10 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 1bf1268..e566140 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -1178,7 +1178,7 @@ void virDomainGraphicsDefFree(virDomainGraphicsDefPtr def) if (!def) return; - switch (def->type) { + switch ((enum virDomainGraphicsType)def->type) { case VIR_DOMAIN_GRAPHICS_TYPE_VNC: VIR_FREE(def->data.vnc.socket); VIR_FREE(def->data.vnc.keymap); @@ -1201,6 +1201,10 @@ void virDomainGraphicsDefFree(virDomainGraphicsDefPtr def) VIR_FREE(def->data.spice.keymap); virDomainGraphicsAuthDefClear(&def->data.spice.auth); break; + + case VIR_DOMAIN_GRAPHICS_TYPE_LAST: + /* coverity[dead_error_begin] */ + break; } for (i = 0; i < def->nListens; i++) @@ -1575,7 +1579,7 @@ virDomainChrSourceDefIsEqual(const virDomainChrSourceDef *src, if (tgt->type != src->type) return false; - switch (src->type) { + switch ((enum virDomainChrType)src->type) { case VIR_DOMAIN_CHR_TYPE_PTY: case VIR_DOMAIN_CHR_TYPE_DEV: case VIR_DOMAIN_CHR_TYPE_FILE: @@ -1604,16 +1608,15 @@ virDomainChrSourceDefIsEqual(const virDomainChrSourceDef *src, tgt->data.spiceport.channel); break; + case VIR_DOMAIN_CHR_TYPE_NULL: case VIR_DOMAIN_CHR_TYPE_VC: case VIR_DOMAIN_CHR_TYPE_STDIO: case VIR_DOMAIN_CHR_TYPE_SPICEVMC: + case VIR_DOMAIN_CHR_TYPE_LAST: /* nada */ - return true; + break; } - /* This should happen only on new, - * yet unhandled type */ - return false; } @@ -7269,11 +7272,11 @@ virDomainChrSourceDefParseXML(virDomainChrSourceDefPtr def, } switch ((enum virDomainChrType) def->type) { - case VIR_DOMAIN_CHR_TYPE_LAST: case VIR_DOMAIN_CHR_TYPE_NULL: + case VIR_DOMAIN_CHR_TYPE_VC: case VIR_DOMAIN_CHR_TYPE_STDIO: case VIR_DOMAIN_CHR_TYPE_SPICEVMC: - case VIR_DOMAIN_CHR_TYPE_VC: + case VIR_DOMAIN_CHR_TYPE_LAST: break; case VIR_DOMAIN_CHR_TYPE_PTY: @@ -15724,11 +15727,12 @@ virDomainChrSourceDefFormat(virBufferPtr buf, } virBufferAddLit(buf, ">\n"); - switch (def->type) { + switch ((enum virDomainChrType)def->type) { case VIR_DOMAIN_CHR_TYPE_NULL: case VIR_DOMAIN_CHR_TYPE_VC: case VIR_DOMAIN_CHR_TYPE_STDIO: case VIR_DOMAIN_CHR_TYPE_SPICEVMC: + case VIR_DOMAIN_CHR_TYPE_LAST: /* nada */ break; diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 64fd748..d89c440 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -6021,7 +6021,7 @@ qemuBuildChrArgStr(virDomainChrSourceDefPtr dev, const char *prefix) if (prefix) virBufferAdd(&buf, prefix, strlen(prefix)); - switch (dev->type) { + switch ((enum virDomainChrType)dev->type) { case VIR_DOMAIN_CHR_TYPE_NULL: virBufferAddLit(&buf, "null"); break; @@ -6089,7 +6089,9 @@ qemuBuildChrArgStr(virDomainChrSourceDefPtr dev, const char *prefix) dev->data.nix.listen ? ",server,nowait" : ""); break; + case VIR_DOMAIN_CHR_TYPE_SPICEVMC: case VIR_DOMAIN_CHR_TYPE_SPICEPORT: + case VIR_DOMAIN_CHR_TYPE_LAST: break; } -- 1.9.0

Signed-off-by: Martin Kletzander <mkletzan@redhat.com> --- src/conf/domain_conf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index e566140..2a7d78f 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -6495,7 +6495,7 @@ error: } #define NET_MODEL_CHARS \ - "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ091234567890_-" + "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789_-" /* Parse the XML definition for a network interface * @param node XML nodeset to parse for net definition -- 1.9.0