3:18 a.m.
There shouldn't be any functional change. Only some formatting nits fixed.
Michal Privoznik (5):
vz_driver: Reformat
vz_network: Reformat
vz_sdk: Reformat
vz_storage: Reformat
vz_utils: Reformat
src/vz/vz_driver.c | 86 ++++++++++-----------
src/vz/vz_network.c | 26 +++----
src/vz/vz_sdk.c | 209 ++++++++++++++++++++++++++--------------------------
src/vz/vz_storage.c | 58 +++++++--------
src/vz/vz_utils.h | 20 ++---
5 files changed, 199 insertions(+), 200 deletions(-)
--
2.3.6
3:18 a.m.
New subject: [libvirt] [PATCH 1/5] vz_driver: Reformat
Honour our formatting style. Adjust indentation so it matches the
rest of our code.
Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com>
---
src/vz/vz_driver.c | 86 +++++++++++++++++++++++++++---------------------------
1 file changed, 43 insertions(+), 43 deletions(-)
diff --git a/src/vz/vz_driver.c b/src/vz/vz_driver.c
index d9ddd4f..77cdafd 100644
--- a/src/vz/vz_driver.c
+++ b/src/vz/vz_driver.c
@@ -190,8 +190,8 @@ vzConnectGetCapabilities(virConnectPtr conn)
static int
vzDomainDefPostParse(virDomainDefPtr def,
- virCapsPtr caps ATTRIBUTE_UNUSED,
- void *opaque ATTRIBUTE_UNUSED)
+ virCapsPtr caps ATTRIBUTE_UNUSED,
+ void *opaque ATTRIBUTE_UNUSED)
{
/* memory hotplug tunables are not supported by this driver */
if (virDomainDefCheckUnsupportedMemoryHotplug(def) < 0)
@@ -202,9 +202,9 @@ vzDomainDefPostParse(virDomainDefPtr def,
static int
vzDomainDeviceDefPostParse(virDomainDeviceDefPtr dev,
- const virDomainDef *def,
- virCapsPtr caps ATTRIBUTE_UNUSED,
- void *opaque ATTRIBUTE_UNUSED)
+ const virDomainDef *def,
+ virCapsPtr caps ATTRIBUTE_UNUSED,
+ void *opaque ATTRIBUTE_UNUSED)
{
int ret = -1;
@@ -256,7 +256,7 @@ vzOpenDefault(virConnectPtr conn)
goto error;
if (!(privconn->xmlopt = virDomainXMLOptionNew(&vzDomainDefParserConfig,
- NULL, NULL)))
+ NULL, NULL)))
goto error;
if (!(privconn->domains = virDomainObjListNew()))
@@ -289,8 +289,8 @@ vzOpenDefault(virConnectPtr conn)
static virDrvOpenStatus
vzConnectOpen(virConnectPtr conn,
- virConnectAuthPtr auth ATTRIBUTE_UNUSED,
- unsigned int flags)
+ virConnectAuthPtr auth ATTRIBUTE_UNUSED,
+ unsigned int flags)
{
int ret;
@@ -474,8 +474,8 @@ vzConnectNumOfDefinedDomains(virConnectPtr conn)
static int
vzConnectListAllDomains(virConnectPtr conn,
- virDomainPtr **domains,
- unsigned int flags)
+ virDomainPtr **domains,
+ unsigned int flags)
{
vzConnPtr privconn = conn->privateData;
int ret = -1;
@@ -629,7 +629,7 @@ vzDomainIsPersistent(virDomainPtr domain)
static int
vzDomainGetState(virDomainPtr domain,
- int *state, int *reason, unsigned int flags)
+ int *state, int *reason, unsigned int flags)
{
virDomainObjPtr privdom;
int ret = -1;
@@ -779,7 +779,7 @@ vzDomainDefineXML(virConnectPtr conn, const char *xml)
static int
vzNodeGetInfo(virConnectPtr conn ATTRIBUTE_UNUSED,
- virNodeInfoPtr nodeinfo)
+ virNodeInfoPtr nodeinfo)
{
return nodeGetInfo(nodeinfo);
}
@@ -804,9 +804,9 @@ static int vzConnectIsAlive(virConnectPtr conn ATTRIBUTE_UNUSED)
static char *
vzConnectBaselineCPU(virConnectPtr conn ATTRIBUTE_UNUSED,
- const char **xmlCPUs,
- unsigned int ncpus,
- unsigned int flags)
+ const char **xmlCPUs,
+ unsigned int ncpus,
+ unsigned int flags)
{
virCheckFlags(VIR_CONNECT_BASELINE_CPU_EXPAND_FEATURES, NULL);
@@ -816,10 +816,10 @@ vzConnectBaselineCPU(virConnectPtr conn ATTRIBUTE_UNUSED,
static int
vzDomainGetVcpus(virDomainPtr domain,
- virVcpuInfoPtr info,
- int maxinfo,
- unsigned char *cpumaps,
- int maplen)
+ virVcpuInfoPtr info,
+ int maxinfo,
+ unsigned char *cpumaps,
+ int maplen)
{
virDomainObjPtr privdom = NULL;
size_t i;
@@ -878,20 +878,20 @@ vzDomainGetVcpus(virDomainPtr domain,
static int
vzNodeGetCPUMap(virConnectPtr conn ATTRIBUTE_UNUSED,
- unsigned char **cpumap,
- unsigned int *online,
- unsigned int flags)
+ unsigned char **cpumap,
+ unsigned int *online,
+ unsigned int flags)
{
return nodeGetCPUMap(cpumap, online, flags);
}
static int
vzConnectDomainEventRegisterAny(virConnectPtr conn,
- virDomainPtr domain,
- int eventID,
- virConnectDomainEventGenericCallback callback,
- void *opaque,
- virFreeCallback freecb)
+ virDomainPtr domain,
+ int eventID,
+ virConnectDomainEventGenericCallback callback,
+ void *opaque,
+ virFreeCallback freecb)
{
int ret = -1;
vzConnPtr privconn = conn->privateData;
@@ -905,7 +905,7 @@ vzConnectDomainEventRegisterAny(virConnectPtr conn,
static int
vzConnectDomainEventDeregisterAny(virConnectPtr conn,
- int callbackID)
+ int callbackID)
{
vzConnPtr privconn = conn->privateData;
int ret = -1;
@@ -971,7 +971,7 @@ vzDomainCreateWithFlags(virDomainPtr domain, unsigned int flags)
static int
vzDomainUndefineFlags(virDomainPtr domain,
- unsigned int flags)
+ unsigned int flags)
{
vzConnPtr privconn = domain->conn->privateData;
virDomainObjPtr dom = NULL;
@@ -984,7 +984,7 @@ vzDomainUndefineFlags(virDomainPtr domain,
ret = prlsdkUnregisterDomain(privconn, dom);
if (ret)
- virObjectUnlock(dom);
+ virObjectUnlock(dom);
return ret;
}
@@ -1069,7 +1069,7 @@ vzDomainManagedSaveRemove(virDomainPtr domain, unsigned int flags)
}
static int vzDomainAttachDeviceFlags(virDomainPtr dom, const char *xml,
- unsigned int flags)
+ unsigned int flags)
{
int ret = -1;
vzConnPtr privconn = dom->conn->privateData;
@@ -1141,11 +1141,11 @@ static int vzDomainAttachDeviceFlags(virDomainPtr dom, const char
*xml,
static int vzDomainAttachDevice(virDomainPtr dom, const char *xml)
{
return vzDomainAttachDeviceFlags(dom, xml,
- VIR_DOMAIN_AFFECT_CONFIG |
VIR_DOMAIN_AFFECT_LIVE);
+ VIR_DOMAIN_AFFECT_CONFIG | VIR_DOMAIN_AFFECT_LIVE);
}
static int vzDomainDetachDeviceFlags(virDomainPtr dom, const char *xml,
- unsigned int flags)
+ unsigned int flags)
{
int ret = -1;
vzConnPtr privconn = dom->conn->privateData;
@@ -1218,7 +1218,7 @@ static int vzDomainDetachDeviceFlags(virDomainPtr dom, const char
*xml,
static int vzDomainDetachDevice(virDomainPtr dom, const char *xml)
{
return vzDomainDetachDeviceFlags(dom, xml,
- VIR_DOMAIN_AFFECT_CONFIG |
VIR_DOMAIN_AFFECT_LIVE);
+ VIR_DOMAIN_AFFECT_CONFIG | VIR_DOMAIN_AFFECT_LIVE);
}
static unsigned long long
@@ -1237,7 +1237,7 @@ vzDomainGetMaxMemory(virDomainPtr domain)
static int
vzDomainBlockStats(virDomainPtr domain, const char *path,
- virDomainBlockStatsPtr stats)
+ virDomainBlockStatsPtr stats)
{
virDomainObjPtr dom = NULL;
int ret = -1;
@@ -1257,7 +1257,7 @@ vzDomainBlockStats(virDomainPtr domain, const char *path,
} else {
virDomainBlockStatsStruct s;
-#define PARALLELS_ZERO_STATS(VAR, TYPE, NAME) \
+#define PARALLELS_ZERO_STATS(VAR, TYPE, NAME) \
stats->VAR = 0;
PARALLELS_BLOCK_STATS_FOREACH(PARALLELS_ZERO_STATS)
@@ -1269,10 +1269,10 @@ vzDomainBlockStats(virDomainPtr domain, const char *path,
goto cleanup;
#define PARALLELS_SUM_STATS(VAR, TYPE, NAME) \
- if (s.VAR != -1) \
- stats->VAR += s.VAR;
+ if (s.VAR != -1) \
+ stats->VAR += s.VAR;
- PARALLELS_BLOCK_STATS_FOREACH(PARALLELS_SUM_STATS)
+ PARALLELS_BLOCK_STATS_FOREACH(PARALLELS_SUM_STATS)
#undef PARALLELS_SUM_STATS
}
@@ -1289,10 +1289,10 @@ vzDomainBlockStats(virDomainPtr domain, const char *path,
static int
vzDomainBlockStatsFlags(virDomainPtr domain,
- const char *path,
- virTypedParameterPtr params,
- int *nparams,
- unsigned int flags)
+ const char *path,
+ virTypedParameterPtr params,
+ int *nparams,
+ unsigned int flags)
{
virDomainBlockStatsStruct stats;
int ret = -1;
--
2.3.6
3:18 a.m.
New subject: [libvirt] [PATCH 2/5] vz_network: Reformat
Honour our formatting style. Adjust indentation so it matches the
rest of our code.
Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com>
---
src/vz/vz_network.c | 26 +++++++++++++-------------
1 file changed, 13 insertions(+), 13 deletions(-)
diff --git a/src/vz/vz_network.c b/src/vz/vz_network.c
index 3a5a3ff..8c97812 100644
--- a/src/vz/vz_network.c
+++ b/src/vz/vz_network.c
@@ -36,9 +36,9 @@
#define VIR_FROM_THIS VIR_FROM_PARALLELS
#define PARALLELS_ROUTED_NETWORK_UUID "eb593dd1-6846-45b0-84a0-de0729286982"
-#define vzParseError() \
- virReportErrorHelper(VIR_FROM_TEST, VIR_ERR_OPERATION_FAILED, __FILE__, \
- __FUNCTION__, __LINE__, _("Can't parse prlctl
output"))
+#define vzParseError() \
+ virReportErrorHelper(VIR_FROM_TEST, VIR_ERR_OPERATION_FAILED, __FILE__, \
+ __FUNCTION__, __LINE__, _("Can't parse prlctl
output"))
static int vzGetBridgedNetInfo(virNetworkDefPtr def, virJSONValuePtr jobj)
{
@@ -328,7 +328,7 @@ static int vzLoadNetworks(vzConnPtr privconn)
virDrvOpenStatus
vzNetworkOpen(virConnectPtr conn,
- unsigned int flags)
+ unsigned int flags)
{
vzConnPtr privconn = conn->privateData;
@@ -373,8 +373,8 @@ static int vzConnectNumOfNetworks(virConnectPtr conn)
}
static int vzConnectListNetworks(virConnectPtr conn,
- char **const names,
- int nnames)
+ char **const names,
+ int nnames)
{
vzConnPtr privconn = conn->privateData;
int got;
@@ -395,8 +395,8 @@ static int vzConnectNumOfDefinedNetworks(virConnectPtr conn)
}
static int vzConnectListDefinedNetworks(virConnectPtr conn,
- char **const names,
- int nnames)
+ char **const names,
+ int nnames)
{
vzConnPtr privconn = conn->privateData;
int got;
@@ -407,8 +407,8 @@ static int vzConnectListDefinedNetworks(virConnectPtr conn,
}
static int vzConnectListAllNetworks(virConnectPtr conn,
- virNetworkPtr **nets,
- unsigned int flags)
+ virNetworkPtr **nets,
+ unsigned int flags)
{
vzConnPtr privconn = conn->privateData;
@@ -418,7 +418,7 @@ static int vzConnectListAllNetworks(virConnectPtr conn,
}
static virNetworkPtr vzNetworkLookupByUUID(virConnectPtr conn,
- const unsigned char *uuid)
+ const unsigned char *uuid)
{
vzConnPtr privconn = conn->privateData;
virNetworkObjPtr network;
@@ -439,7 +439,7 @@ static virNetworkPtr vzNetworkLookupByUUID(virConnectPtr conn,
}
static virNetworkPtr vzNetworkLookupByName(virConnectPtr conn,
- const char *name)
+ const char *name)
{
vzConnPtr privconn = conn->privateData;
virNetworkObjPtr network;
@@ -460,7 +460,7 @@ static virNetworkPtr vzNetworkLookupByName(virConnectPtr conn,
}
static char *vzNetworkGetXMLDesc(virNetworkPtr net,
- unsigned int flags)
+ unsigned int flags)
{
vzConnPtr privconn = net->conn->privateData;
virNetworkObjPtr network;
--
2.3.6
3:18 a.m.
New subject: [libvirt] [PATCH 3/5] vz_sdk: Reformat
Honour our formatting style. Adjust indentation so it matches the
rest of our code.
Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com>
---
src/vz/vz_sdk.c | 209 ++++++++++++++++++++++++++++----------------------------
1 file changed, 104 insertions(+), 105 deletions(-)
diff --git a/src/vz/vz_sdk.c b/src/vz/vz_sdk.c
index 388ea19..93427d7 100644
--- a/src/vz/vz_sdk.c
+++ b/src/vz/vz_sdk.c
@@ -77,7 +77,7 @@ logPrlErrorHelper(PRL_RESULT err, const char *filename,
#define logPrlError(code) \
logPrlErrorHelper(code, __FILE__, \
- __FUNCTION__, __LINE__)
+ __FUNCTION__, __LINE__)
#define prlsdkCheckRetGoto(ret, label) \
do { \
@@ -129,7 +129,7 @@ logPrlEventErrorHelper(PRL_HANDLE event, const char *filename,
#define logPrlEventError(event) \
logPrlEventErrorHelper(event, __FILE__, \
- __FUNCTION__, __LINE__)
+ __FUNCTION__, __LINE__)
static PRL_RESULT
getJobResultHelper(PRL_HANDLE job, unsigned int timeout, PRL_HANDLE *result,
@@ -181,7 +181,7 @@ getJobResultHelper(PRL_HANDLE job, unsigned int timeout, PRL_HANDLE
*result,
#define getJobResult(job, result) \
getJobResultHelper(job, JOB_INFINIT_WAIT_TIMEOUT, \
- result, __FILE__, __FUNCTION__, __LINE__)
+ result, __FILE__, __FUNCTION__, __LINE__)
static PRL_RESULT
waitJobHelper(PRL_HANDLE job, unsigned int timeout,
@@ -199,7 +199,7 @@ waitJobHelper(PRL_HANDLE job, unsigned int timeout,
#define waitJob(job) \
waitJobHelper(job, JOB_INFINIT_WAIT_TIMEOUT, __FILE__, \
- __FUNCTION__, __LINE__)
+ __FUNCTION__, __LINE__)
int
@@ -1352,8 +1352,8 @@ prlsdkLoadDomain(vzConnPtr privconn,
goto error;
if (def->ngraphics > 0) {
- int bus = IS_CT(def) ? VIR_DOMAIN_INPUT_BUS_PARALLELS:
- VIR_DOMAIN_INPUT_BUS_PS2;
+ int bus = IS_CT(def) ? VIR_DOMAIN_INPUT_BUS_PARALLELS :
+ VIR_DOMAIN_INPUT_BUS_PS2;
if (virDomainDefMaybeAddInput(def,
VIR_DOMAIN_INPUT_TYPE_MOUSE,
@@ -1377,7 +1377,7 @@ prlsdkLoadDomain(vzConnPtr privconn,
if (!(dom = virDomainObjListAdd(privconn->domains, def,
privconn->xmlopt,
0, NULL)))
- goto error;
+ goto error;
}
/* dom is locked here */
@@ -1609,7 +1609,7 @@ prlsdkHandleVmConfigEvent(vzConnPtr privconn,
goto cleanup;
prlsdkSendEvent(privconn, dom, VIR_DOMAIN_EVENT_DEFINED,
- VIR_DOMAIN_EVENT_DEFINED_UPDATED);
+ VIR_DOMAIN_EVENT_DEFINED_UPDATED);
cleanup:
virObjectUnlock(dom);
@@ -1618,7 +1618,7 @@ prlsdkHandleVmConfigEvent(vzConnPtr privconn,
static void
prlsdkHandleVmAddedEvent(vzConnPtr privconn,
- unsigned char *uuid)
+ unsigned char *uuid)
{
virDomainObjPtr dom = NULL;
@@ -1627,7 +1627,7 @@ prlsdkHandleVmAddedEvent(vzConnPtr privconn,
return;
prlsdkSendEvent(privconn, dom, VIR_DOMAIN_EVENT_DEFINED,
- VIR_DOMAIN_EVENT_DEFINED_ADDED);
+ VIR_DOMAIN_EVENT_DEFINED_ADDED);
virObjectUnlock(dom);
return;
@@ -1646,7 +1646,7 @@ prlsdkHandleVmRemovedEvent(vzConnPtr privconn,
return;
prlsdkSendEvent(privconn, dom, VIR_DOMAIN_EVENT_UNDEFINED,
- VIR_DOMAIN_EVENT_UNDEFINED_REMOVED);
+ VIR_DOMAIN_EVENT_UNDEFINED_REMOVED);
virDomainObjListRemove(privconn->domains, dom);
return;
@@ -1656,8 +1656,8 @@ prlsdkHandleVmRemovedEvent(vzConnPtr privconn,
static PRL_RESULT
prlsdkHandlePerfEvent(vzConnPtr privconn,
- PRL_HANDLE event,
- unsigned char *uuid)
+ PRL_HANDLE event,
+ unsigned char *uuid)
{
virDomainObjPtr dom = NULL;
vzDomObjPtr privdom = NULL;
@@ -1668,7 +1668,7 @@ prlsdkHandlePerfEvent(vzConnPtr privconn,
goto cleanup;
privdom = dom->privateData;
- // delayed event after unsubscribe
+ /* delayed event after unsubscribe */
if (privdom->cache.count == -1)
goto cleanup;
@@ -1679,12 +1679,12 @@ prlsdkHandlePerfEvent(vzConnPtr privconn,
job = PrlVm_UnsubscribeFromPerfStats(privdom->sdkdom);
if (PRL_FAILED(waitJob(job)))
goto cleanup;
- // change state to unsubscribed
+ /* change state to unsubscribed */
privdom->cache.count = -1;
} else {
++privdom->cache.count;
privdom->cache.stats = event;
- // thus we get own of event handle
+ /* thus we get own of event handle */
event = PRL_INVALID_HANDLE;
virCondSignal(&privdom->cache.cond);
}
@@ -1716,27 +1716,27 @@ prlsdkHandleVmEvent(vzConnPtr privconn, PRL_HANDLE prlEvent)
goto cleanup;
switch (prlEventType) {
- case PET_DSP_EVT_VM_STATE_CHANGED:
- prlsdkHandleVmStateEvent(privconn, prlEvent, uuid);
- break;
- case PET_DSP_EVT_VM_CONFIG_CHANGED:
- prlsdkHandleVmConfigEvent(privconn, uuid);
- break;
- case PET_DSP_EVT_VM_CREATED:
- case PET_DSP_EVT_VM_ADDED:
- prlsdkHandleVmAddedEvent(privconn, uuid);
- break;
- case PET_DSP_EVT_VM_DELETED:
- case PET_DSP_EVT_VM_UNREGISTERED:
- prlsdkHandleVmRemovedEvent(privconn, uuid);
- break;
- case PET_DSP_EVT_VM_PERFSTATS:
- prlsdkHandlePerfEvent(privconn, prlEvent, uuid);
- // above function takes own of event
- prlEvent = PRL_INVALID_HANDLE;
- break;
- default:
- virReportError(VIR_ERR_INTERNAL_ERROR,
+ case PET_DSP_EVT_VM_STATE_CHANGED:
+ prlsdkHandleVmStateEvent(privconn, prlEvent, uuid);
+ break;
+ case PET_DSP_EVT_VM_CONFIG_CHANGED:
+ prlsdkHandleVmConfigEvent(privconn, uuid);
+ break;
+ case PET_DSP_EVT_VM_CREATED:
+ case PET_DSP_EVT_VM_ADDED:
+ prlsdkHandleVmAddedEvent(privconn, uuid);
+ break;
+ case PET_DSP_EVT_VM_DELETED:
+ case PET_DSP_EVT_VM_UNREGISTERED:
+ prlsdkHandleVmRemovedEvent(privconn, uuid);
+ break;
+ case PET_DSP_EVT_VM_PERFSTATS:
+ prlsdkHandlePerfEvent(privconn, prlEvent, uuid);
+ /* above function takes own of event */
+ prlEvent = PRL_INVALID_HANDLE;
+ break;
+ default:
+ virReportError(VIR_ERR_INTERNAL_ERROR,
_("Can't handle event of type %d"), prlEventType);
}
@@ -1767,13 +1767,13 @@ prlsdkEventsHandler(PRL_HANDLE prlEvent, PRL_VOID_PTR opaque)
prlsdkCheckRetGoto(pret, cleanup);
switch (prlIssuerType) {
- case PIE_VIRTUAL_MACHINE:
- prlsdkHandleVmEvent(privconn, prlEvent);
- // above function takes own of event
- prlEvent = PRL_INVALID_HANDLE;
- break;
- default:
- VIR_DEBUG("Skipping event of issuer type %d", prlIssuerType);
+ case PIE_VIRTUAL_MACHINE:
+ prlsdkHandleVmEvent(privconn, prlEvent);
+ /* above function takes own of event */
+ prlEvent = PRL_INVALID_HANDLE;
+ break;
+ default:
+ VIR_DEBUG("Skipping event of issuer type %d", prlIssuerType);
}
cleanup:
@@ -1787,8 +1787,8 @@ int prlsdkSubscribeToPCSEvents(vzConnPtr privconn)
PRL_RESULT pret = PRL_ERR_UNINITIALIZED;
pret = PrlSrv_RegEventHandler(privconn->server,
- prlsdkEventsHandler,
- privconn);
+ prlsdkEventsHandler,
+ privconn);
prlsdkCheckRetGoto(pret, error);
return 0;
@@ -1800,8 +1800,8 @@ void prlsdkUnsubscribeFromPCSEvents(vzConnPtr privconn)
{
PRL_RESULT ret = PRL_ERR_UNINITIALIZED;
ret = PrlSrv_UnregEventHandler(privconn->server,
- prlsdkEventsHandler,
- privconn);
+ prlsdkEventsHandler,
+ privconn);
if (PRL_FAILED(ret))
logPrlError(ret);
}
@@ -1925,14 +1925,14 @@ prlsdkCheckUnsupportedParams(PRL_HANDLE sdkdom, virDomainDefPtr
def)
if (virDomainDefGetMemoryActual(def) != def->mem.cur_balloon) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
- _("changing balloon parameters is not supported "
- "by vz driver"));
- return -1;
+ _("changing balloon parameters is not supported "
+ "by vz driver"));
+ return -1;
}
if (virDomainDefGetMemoryActual(def) % (1 << 10) != 0) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
- _("Memory size should be multiple of 1Mb."));
+ _("Memory size should be multiple of 1Mb."));
return -1;
}
@@ -1950,7 +1950,7 @@ prlsdkCheckUnsupportedParams(PRL_HANDLE sdkdom, virDomainDefPtr
def)
if (def->vcpus != def->maxvcpus) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
- _("current vcpus must be equal to maxvcpus"));
+ _("current vcpus must be equal to maxvcpus"));
return -1;
}
@@ -1972,7 +1972,7 @@ prlsdkCheckUnsupportedParams(PRL_HANDLE sdkdom, virDomainDefPtr
def)
}
if (def->cputune.vcpupin) {
- for (i = 0; i < def->vcpus; i++) {
+ for (i = 0; i < def->vcpus; i++) {
if (!virBitmapEqual(def->cpumask,
def->cputune.vcpupin[i]->cpumask)) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
@@ -1990,10 +1990,10 @@ prlsdkCheckUnsupportedParams(PRL_HANDLE sdkdom, virDomainDefPtr
def)
*/
if ((virDomainNumatuneGetMode(def->numa, -1, &memMode) == 0 &&
memMode == VIR_DOMAIN_NUMATUNE_MEM_STRICT) ||
- virDomainNumatuneHasPerNodeBinding(def->numa)) {
+ virDomainNumatuneHasPerNodeBinding(def->numa)) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
- _("numa parameters are not supported "
- "by vz driver"));
+ _("numa parameters are not supported "
+ "by vz driver"));
return -1;
}
@@ -2107,10 +2107,10 @@ prlsdkCheckUnsupportedParams(PRL_HANDLE sdkdom, virDomainDefPtr
def)
/* there may be one auto-input */
if (def->ninputs != 0 &&
(def->ninputs != 2 &&
- def->inputs[0]->type != VIR_DOMAIN_INPUT_TYPE_MOUSE &&
- def->inputs[0]->bus != VIR_DOMAIN_INPUT_BUS_PS2 &&
- def->inputs[1]->type != VIR_DOMAIN_INPUT_TYPE_KBD &&
- def->inputs[1]->bus != VIR_DOMAIN_INPUT_BUS_PS2)) {
+ def->inputs[0]->type != VIR_DOMAIN_INPUT_TYPE_MOUSE &&
+ def->inputs[0]->bus != VIR_DOMAIN_INPUT_BUS_PS2 &&
+ def->inputs[1]->type != VIR_DOMAIN_INPUT_TYPE_KBD &&
+ def->inputs[1]->bus != VIR_DOMAIN_INPUT_BUS_PS2)) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
_("changing input devices parameters is not supported "
@@ -2267,7 +2267,7 @@ static int prlsdkCheckGraphicsUnsupportedParams(virDomainDefPtr
def)
}
if (gr->data.vnc.auth.connected == VIR_DOMAIN_GRAPHICS_AUTH_CONNECTED_FAIL ||
- gr->data.vnc.auth.connected == VIR_DOMAIN_GRAPHICS_AUTH_CONNECTED_KEEP) {
+ gr->data.vnc.auth.connected == VIR_DOMAIN_GRAPHICS_AUTH_CONNECTED_KEEP) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
_("vz driver doesn't support "
"given action in case of password change."));
@@ -2477,8 +2477,8 @@ static int prlsdkCheckDiskUnsupportedParams(virDomainDiskDefPtr
disk)
return -1;
}
- if (disk->blockio.logical_block_size ||
- disk->blockio.physical_block_size) {
+ if (disk->blockio.logical_block_size ||
+ disk->blockio.physical_block_size) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
_("Setting disk block sizes is not "
"supported by vz driver."));
@@ -2707,8 +2707,7 @@ static int prlsdkAddSerial(PRL_HANDLE sdkdom, virDomainChrDefPtr
chr)
PRL_RESULT pret;
PRL_HANDLE sdkchr = PRL_INVALID_HANDLE;
PRL_VM_DEV_EMULATION_TYPE emutype;
- PRL_SERIAL_PORT_SOCKET_OPERATION_MODE socket_mode =
- PSP_SERIAL_SOCKET_SERVER;
+ PRL_SERIAL_PORT_SOCKET_OPERATION_MODE socket_mode = PSP_SERIAL_SOCKET_SERVER;
char *path;
int ret = -1;
@@ -2817,8 +2816,8 @@ static int prlsdkAddNet(PRL_HANDLE sdkdom,
if (isCt) {
if (net->model)
- VIR_WARN("Setting network adapter for containers is not "
- "supported by vz driver.");
+ VIR_WARN("Setting network adapter for containers is not "
+ "supported by vz driver.");
} else {
if (STREQ(net->model, "rtl8139")) {
pret = PrlVmDevNet_SetAdapterType(sdknet, PNT_RTL);
@@ -2828,8 +2827,8 @@ static int prlsdkAddNet(PRL_HANDLE sdkdom,
pret = PrlVmDevNet_SetAdapterType(sdknet, PNT_VIRTIO);
} else {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
- _("Specified network adapter model is not "
- "supported by vz driver."));
+ _("Specified network adapter model is not "
+ "supported by vz driver."));
goto cleanup;
}
prlsdkCheckRetGoto(pret, cleanup);
@@ -3099,8 +3098,8 @@ static int prlsdkAddDisk(PRL_HANDLE sdkdom,
virDomainDiskGetFormat(disk) != VIR_STORAGE_FILE_PLOOP) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("Invalid format of "
- "disk %s, vz driver supports only "
- "images in ploop format."), disk->src->path);
+ "disk %s, vz driver
supports only "
+ "images in ploop
format."), disk->src->path);
goto cleanup;
}
@@ -3112,8 +3111,8 @@ static int prlsdkAddDisk(PRL_HANDLE sdkdom,
virDomainDiskGetFormat(disk) != VIR_STORAGE_FILE_AUTO)) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("Invalid format "
- "of disk %s, it should be either not set, or set "
- "to raw or auto."), disk->src->path);
+ "of disk %s, it should be
either not set, or set "
+ "to raw or auto."),
disk->src->path);
goto cleanup;
}
emutype = PDT_USE_REAL_DEVICE;
@@ -3132,15 +3131,15 @@ static int prlsdkAddDisk(PRL_HANDLE sdkdom,
if (drive->controller > 0) {
/* We have only one controller of each type */
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("Invalid drive "
- "address of disk %s, vz driver supports "
- "only one controller."), disk->dst);
+ "address of disk %s, vz driver
supports "
+ "only one controller."),
disk->dst);
goto cleanup;
}
if (drive->target > 0) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("Invalid drive "
- "address of disk %s, vz driver supports "
- "only target 0."), disk->dst);
+ "address of disk %s, vz driver
supports "
+ "only target 0."),
disk->dst);
goto cleanup;
}
@@ -3148,8 +3147,8 @@ static int prlsdkAddDisk(PRL_HANDLE sdkdom,
case VIR_DOMAIN_DISK_BUS_IDE:
if (drive->unit > 1) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("Invalid drive "
- "address of disk %s, vz driver supports "
- "only units 0-1 for IDE bus."), disk->dst);
+ "address of disk %s, vz
driver supports "
+ "only units 0-1 for IDE
bus."), disk->dst);
goto cleanup;
}
sdkbus = PMS_IDE_DEVICE;
@@ -3159,8 +3158,8 @@ static int prlsdkAddDisk(PRL_HANDLE sdkdom,
case VIR_DOMAIN_DISK_BUS_SCSI:
if (drive->bus > 0) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("Invalid drive "
- "address of disk %s, vz driver supports "
- "only bus 0 for SCSI bus."), disk->dst);
+ "address of disk %s, vz
driver supports "
+ "only bus 0 for SCSI
bus."), disk->dst);
goto cleanup;
}
sdkbus = PMS_SCSI_DEVICE;
@@ -3170,8 +3169,8 @@ static int prlsdkAddDisk(PRL_HANDLE sdkdom,
case VIR_DOMAIN_DISK_BUS_SATA:
if (drive->bus > 0) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("Invalid drive "
- "address of disk %s, vz driver supports "
- "only bus 0 for SATA bus."), disk->dst);
+ "address of disk %s, vz
driver supports "
+ "only bus 0 for SATA
bus."), disk->dst);
goto cleanup;
}
sdkbus = PMS_SATA_DEVICE;
@@ -3190,8 +3189,8 @@ static int prlsdkAddDisk(PRL_HANDLE sdkdom,
if (STRNEQ(dst, disk->dst)) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("Invalid drive "
- "address of disk %s, vz driver supports "
- "only defaults address to logical device name."),
disk->dst);
+ "address of disk %s, vz driver
supports "
+ "only defaults address to
logical device name."), disk->dst);
goto cleanup;
}
@@ -3426,17 +3425,17 @@ prlsdkDoApplyConfig(virConnectPtr conn,
VIR_FREE(mask);
switch (def->os.arch) {
- case VIR_ARCH_X86_64:
- pret = PrlVmCfg_SetCpuMode(sdkdom, PCM_CPU_MODE_64);
- break;
- case VIR_ARCH_I686:
- pret = PrlVmCfg_SetCpuMode(sdkdom, PCM_CPU_MODE_32);
- break;
- default:
- virReportError(VIR_ERR_INTERNAL_ERROR,
- _("Unknown CPU mode: %s"),
- virArchToString(def->os.arch));
- goto error;
+ case VIR_ARCH_X86_64:
+ pret = PrlVmCfg_SetCpuMode(sdkdom, PCM_CPU_MODE_64);
+ break;
+ case VIR_ARCH_I686:
+ pret = PrlVmCfg_SetCpuMode(sdkdom, PCM_CPU_MODE_32);
+ break;
+ default:
+ virReportError(VIR_ERR_INTERNAL_ERROR,
+ _("Unknown CPU mode: %s"),
+ virArchToString(def->os.arch));
+ goto error;
}
prlsdkCheckRetGoto(pret, error);
@@ -3453,7 +3452,7 @@ prlsdkDoApplyConfig(virConnectPtr conn,
for (i = 0; i < def->nnets; i++) {
if (prlsdkAddNet(sdkdom, conn->privateData, def->nets[i], IS_CT(def)) <
0)
- goto error;
+ goto error;
}
if (prlsdkApplyGraphicsParams(sdkdom, def) < 0)
@@ -3495,7 +3494,7 @@ prlsdkDoApplyConfig(virConnectPtr conn,
for (i = 0; i < def->nnets; i++)
prlsdkDelNet(conn->privateData, def->nets[i]);
- return -1;
+ return -1;
}
int
@@ -3640,7 +3639,7 @@ prlsdkUnregisterDomain(vzConnPtr privconn, virDomainObjPtr dom)
size_t i;
for (i = 0; i < dom->def->nnets; i++)
- prlsdkDelNet(privconn, dom->def->nets[i]);
+ prlsdkDelNet(privconn, dom->def->nets[i]);
job = PrlVm_Unreg(privdom->sdkdom);
if (PRL_FAILED(waitJob(job)))
@@ -3705,7 +3704,7 @@ prlsdkGetStatsParam(virDomainObjPtr dom, const char *name, long long
*val)
unsigned long long now;
if (privdom->cache.stats != PRL_INVALID_HANDLE) {
- // reset count to keep subscribtion
+ /* reset count to keep subscribtion */
privdom->cache.count = 0;
return prlsdkExtractStatsParam(privdom->cache.stats, name, val);
}
@@ -3716,8 +3715,8 @@ prlsdkGetStatsParam(virDomainObjPtr dom, const char *name, long long
*val)
goto error;
}
- // change state to subscribed in case of unsubscribed
- // or reset count so we stop unsubscribe attempts
+ /* change state to subscribed in case of unsubscribed
+ or reset count so we stop unsubscribe attempts */
privdom->cache.count = 0;
if (virTimeMillisNow(&now) < 0) {
@@ -3727,7 +3726,7 @@ prlsdkGetStatsParam(virDomainObjPtr dom, const char *name, long long
*val)
while (privdom->cache.stats == PRL_INVALID_HANDLE) {
if (virCondWaitUntil(&privdom->cache.cond, &dom->parent.lock,
- now + PARALLELS_STATISTICS_TIMEOUT) < 0) {
+ now + PARALLELS_STATISTICS_TIMEOUT) < 0) {
if (errno == ETIMEDOUT) {
virReportError(VIR_ERR_OPERATION_TIMEOUT, "%s",
_("Timeout on waiting statistics event."));
@@ -3770,7 +3769,7 @@ prlsdkGetBlockStats(virDomainObjPtr dom, virDomainDiskDefPtr disk,
virDomainBloc
break;
default:
virReportError(VIR_ERR_INTERNAL_ERROR,
- _("Unknown disk bus: %X"), disk->bus);
+ _("Unknown disk bus: %X"), disk->bus);
goto cleanup;
}
--
2.3.6
3:18 a.m.
New subject: [libvirt] [PATCH 4/5] vz_storage: Reformat
Honour our formatting style. Adjust indentation so it matches the
rest of our code.
Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com>
---
src/vz/vz_storage.c | 58 ++++++++++++++++++++++++++---------------------------
1 file changed, 29 insertions(+), 29 deletions(-)
diff --git a/src/vz/vz_storage.c b/src/vz/vz_storage.c
index 7183db4..1e82195 100644
--- a/src/vz/vz_storage.c
+++ b/src/vz/vz_storage.c
@@ -48,7 +48,7 @@
static virStorageVolDefPtr
vzStorageVolDefineXML(virStoragePoolObjPtr pool, const char *xmldesc,
- const char *xmlfile, bool is_new);
+ const char *xmlfile, bool is_new);
static virStorageVolPtr
vzStorageVolLookupByPath(virConnectPtr conn, const char *path);
@@ -245,8 +245,8 @@ vzPoolAddByDomain(virConnectPtr conn, virDomainObjPtr dom)
}
static int vzDiskDescParseNode(xmlDocPtr xml,
- xmlNodePtr root,
- virStorageVolDefPtr def)
+ xmlNodePtr root,
+ virStorageVolDefPtr def)
{
xmlXPathContextPtr ctxt = NULL;
int ret = -1;
@@ -296,10 +296,10 @@ static int vzDiskDescParse(const char *path, virStorageVolDefPtr
def)
}
static int vzAddDiskVolume(virStoragePoolObjPtr pool,
- virDomainObjPtr dom,
- const char *diskName,
- const char *diskPath,
- const char *diskDescPath)
+ virDomainObjPtr dom,
+ const char *diskName,
+ const char *diskPath,
+ const char *diskDescPath)
{
virStorageVolDefPtr def = NULL;
@@ -332,7 +332,7 @@ static int vzAddDiskVolume(virStoragePoolObjPtr pool,
}
static int vzFindVmVolumes(virStoragePoolObjPtr pool,
- virDomainObjPtr dom)
+ virDomainObjPtr dom)
{
vzDomObjPtr pdom = dom->privateData;
DIR *dir;
@@ -376,7 +376,7 @@ static int vzFindVmVolumes(virStoragePoolObjPtr pool,
/* here we know, that ent->d_name is a disk image directory */
if (vzAddDiskVolume(pool, dom, ent->d_name,
- diskPath, diskDescPath))
+ diskPath, diskDescPath))
goto cleanup;
}
if (direrr < 0)
@@ -393,7 +393,7 @@ static int vzFindVmVolumes(virStoragePoolObjPtr pool,
static int
vzPoolsAdd(virDomainObjPtr dom,
- void *opaque)
+ void *opaque)
{
virConnectPtr conn = opaque;
virStoragePoolObjPtr pool;
@@ -464,7 +464,7 @@ static int vzLoadPools(virConnectPtr conn)
virDrvOpenStatus
vzStorageOpen(virConnectPtr conn,
- unsigned int flags)
+ unsigned int flags)
{
vzConnPtr privconn = conn->privateData;
virStorageDriverStatePtr storageState;
@@ -564,7 +564,7 @@ vzConnectNumOfDefinedStoragePools(virConnectPtr conn)
static int
vzConnectListDefinedStoragePools(virConnectPtr conn,
- char **const names, int nnames)
+ char **const names, int nnames)
{
vzConnPtr privconn = conn->privateData;
int n = 0;
@@ -704,7 +704,7 @@ vzStoragePoolGetAlloc(virStoragePoolDefPtr def)
static virStoragePoolPtr
vzStoragePoolDefineXML(virConnectPtr conn,
- const char *xml, unsigned int flags)
+ const char *xml, unsigned int flags)
{
vzConnPtr privconn = conn->privateData;
virStoragePoolDefPtr def;
@@ -1040,7 +1040,7 @@ vzStoragePoolNumOfVolumes(virStoragePoolPtr pool)
static int
vzStoragePoolListVolumes(virStoragePoolPtr pool,
- char **const names, int maxnames)
+ char **const names, int maxnames)
{
vzConnPtr privconn = pool->conn->privateData;
virStoragePoolObjPtr privpool;
@@ -1061,7 +1061,7 @@ vzStoragePoolListVolumes(virStoragePoolPtr pool,
if (!virStoragePoolObjIsActive(privpool)) {
virReportError(VIR_ERR_OPERATION_INVALID,
- _("storage pool '%s' is not active"), pool->name);
+ _("storage pool '%s' is not active"),
pool->name);
goto error;
}
@@ -1084,7 +1084,7 @@ vzStoragePoolListVolumes(virStoragePoolPtr pool,
static virStorageVolPtr
vzStorageVolLookupByName(virStoragePoolPtr pool,
- const char *name)
+ const char *name)
{
vzConnPtr privconn = pool->conn->privateData;
virStoragePoolObjPtr privpool;
@@ -1207,8 +1207,8 @@ vzStorageVolLookupByPath(virConnectPtr conn, const char *path)
static virStorageVolDefPtr
vzStorageVolDefineXML(virStoragePoolObjPtr pool,
- const char *xmldesc,
- const char *xmlfile, bool is_new)
+ const char *xmldesc,
+ const char *xmlfile, bool is_new)
{
virStorageVolDefPtr privvol = NULL;
virStorageVolDefPtr ret = NULL;
@@ -1277,7 +1277,7 @@ vzStorageVolDefineXML(virStoragePoolObjPtr pool,
static virStorageVolPtr
vzStorageVolCreateXML(virStoragePoolPtr pool,
- const char *xmldesc, unsigned int flags)
+ const char *xmldesc, unsigned int flags)
{
vzConnPtr privconn = pool->conn->privateData;
virStoragePoolObjPtr privpool;
@@ -1316,9 +1316,9 @@ vzStorageVolCreateXML(virStoragePoolPtr pool,
static virStorageVolPtr
vzStorageVolCreateXMLFrom(virStoragePoolPtr pool,
- const char *xmldesc,
- virStorageVolPtr clonevol,
- unsigned int flags)
+ const char *xmldesc,
+ virStorageVolPtr clonevol,
+ unsigned int flags)
{
vzConnPtr privconn = pool->conn->privateData;
virStoragePoolObjPtr privpool;
@@ -1399,7 +1399,7 @@ vzStorageVolCreateXMLFrom(virStoragePoolPtr pool,
}
int vzStorageVolDefRemove(virStoragePoolObjPtr privpool,
- virStorageVolDefPtr privvol)
+ virStorageVolDefPtr privvol)
{
int ret = -1;
char *xml_path = NULL;
@@ -1486,12 +1486,12 @@ vzStorageVolTypeForPool(int pooltype)
{
switch (pooltype) {
- case VIR_STORAGE_POOL_DIR:
- case VIR_STORAGE_POOL_FS:
- case VIR_STORAGE_POOL_NETFS:
- return VIR_STORAGE_VOL_FILE;
- default:
- return VIR_STORAGE_VOL_BLOCK;
+ case VIR_STORAGE_POOL_DIR:
+ case VIR_STORAGE_POOL_FS:
+ case VIR_STORAGE_POOL_NETFS:
+ return VIR_STORAGE_VOL_FILE;
+ default:
+ return VIR_STORAGE_VOL_BLOCK;
}
}
--
2.3.6
3:18 a.m.
New subject: [libvirt] [PATCH 5/5] vz_utils: Reformat
Honour our formatting style. Adjust indentation so it matches the
rest of our code.
Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com>
---
src/vz/vz_utils.h | 20 ++++++++++----------
1 file changed, 10 insertions(+), 10 deletions(-)
diff --git a/src/vz/vz_utils.h b/src/vz/vz_utils.h
index 9b46bf9..db09647 100644
--- a/src/vz/vz_utils.h
+++ b/src/vz/vz_utils.h
@@ -35,7 +35,7 @@
# define vzParseError() \
virReportErrorHelper(VIR_FROM_TEST, VIR_ERR_OPERATION_FAILED, __FILE__, \
- __FUNCTION__, __LINE__, _("Can't parse prlctl
output"))
+ __FUNCTION__, __LINE__, _("Can't parse prlctl
output"))
# define IS_CT(def) (def->os.type == VIR_DOMAIN_OSTYPE_EXE)
@@ -77,8 +77,8 @@ typedef struct _vzConn *vzConnPtr;
struct _vzCountersCache {
PRL_HANDLE stats;
virCond cond;
- // -1 - unsubscribed
- // > -1 - subscribed
+ /* = -1 - unsubscribed
+ > -1 - subscribed */
int count;
};
@@ -115,14 +115,14 @@ char * vzAddFileExt(const char *path, const char *ext);
void vzDriverLock(vzConnPtr driver);
void vzDriverUnlock(vzConnPtr driver);
virStorageVolPtr vzStorageVolLookupByPathLocked(virConnectPtr conn,
- const char *path);
+ const char *path);
int vzStorageVolDefRemove(virStoragePoolObjPtr privpool,
- virStorageVolDefPtr privvol);
+ virStorageVolDefPtr privvol);
-# define PARALLELS_BLOCK_STATS_FOREACH(OP) \
- OP(rd_req, VIR_DOMAIN_BLOCK_STATS_READ_REQ, "read_requests") \
- OP(rd_bytes, VIR_DOMAIN_BLOCK_STATS_READ_BYTES, "read_total") \
- OP(wr_req, VIR_DOMAIN_BLOCK_STATS_WRITE_REQ, "write_requests") \
- OP(wr_bytes, VIR_DOMAIN_BLOCK_STATS_WRITE_BYTES, "write_total")
+# define PARALLELS_BLOCK_STATS_FOREACH(OP) \
+ OP(rd_req, VIR_DOMAIN_BLOCK_STATS_READ_REQ, "read_requests") \
+ OP(rd_bytes, VIR_DOMAIN_BLOCK_STATS_READ_BYTES, "read_total") \
+ OP(wr_req, VIR_DOMAIN_BLOCK_STATS_WRITE_REQ, "write_requests") \
+ OP(wr_bytes, VIR_DOMAIN_BLOCK_STATS_WRITE_BYTES, "write_total")
#endif
--
2.3.6
4:10 a.m.
On Thu, Jun 25, 2015 at 10:18:13AM +0200, Michal Privoznik wrote:
There shouldn't be any functional change. Only some formatting
nits fixed.
Michal Privoznik (5):
vz_driver: Reformat
vz_network: Reformat
vz_sdk: Reformat
vz_storage: Reformat
vz_utils: Reformat
src/vz/vz_driver.c | 86 ++++++++++-----------
src/vz/vz_network.c | 26 +++----
src/vz/vz_sdk.c | 209 ++++++++++++++++++++++++++--------------------------
src/vz/vz_storage.c | 58 +++++++--------
src/vz/vz_utils.h | 20 ++---
5 files changed, 199 insertions(+), 200 deletions(-)
Whitespace-mostly, ACK series.
--
2.3.6
--
libvir-list mailing list
libvir-list(a)redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list
4:19 a.m.
25.06.2015 11:18, Michal Privoznik пишет:
There shouldn't be any functional change. Only some formatting
nits fixed.
Michal Privoznik (5):
vz_driver: Reformat
vz_network: Reformat
vz_sdk: Reformat
vz_storage: Reformat
vz_utils: Reformat
src/vz/vz_driver.c | 86 ++++++++++-----------
src/vz/vz_network.c | 26 +++----
src/vz/vz_sdk.c | 209 ++++++++++++++++++++++++++--------------------------
src/vz/vz_storage.c | 58 +++++++--------
src/vz/vz_utils.h | 20 ++---
5 files changed, 199 insertions(+), 200 deletions(-)
ACK. Michal, thank you for this work.
Maxim Nestratov
4:46 a.m.
25.06.2015 12:19, Maxim Nestratov пишет:
25.06.2015 11:18, Michal Privoznik пишет:
> There shouldn't be any functional change. Only some formatting nits
> fixed.
>
> Michal Privoznik (5):
> vz_driver: Reformat
> vz_network: Reformat
> vz_sdk: Reformat
> vz_storage: Reformat
> vz_utils: Reformat
>
> src/vz/vz_driver.c | 86 ++++++++++-----------
> src/vz/vz_network.c | 26 +++----
> src/vz/vz_sdk.c | 209
> ++++++++++++++++++++++++++--------------------------
> src/vz/vz_storage.c | 58 +++++++--------
> src/vz/vz_utils.h | 20 ++---
> 5 files changed, 199 insertions(+), 200 deletions(-)
>
ACK. Michal, thank you for this work.
Maxim Nestratov
--
libvir-list mailing list
libvir-list(a)redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list
By the way, Michal, how did you
spot all these nits? Is there any tool
to do it automatically? make syntax-check doesn't seem to be able to
catch all this stuff.
8:21 a.m.
On 25.06.2015 11:46, Maxim Nestratov wrote:
25.06.2015 12:19, Maxim Nestratov пишет:
> 25.06.2015 11:18, Michal Privoznik пишет:
>> There shouldn't be any functional change. Only some formatting nits
>> fixed.
>>
>> Michal Privoznik (5):
>> vz_driver: Reformat
>> vz_network: Reformat
>> vz_sdk: Reformat
>> vz_storage: Reformat
>> vz_utils: Reformat
>>
>> src/vz/vz_driver.c | 86 ++++++++++-----------
>> src/vz/vz_network.c | 26 +++----
>> src/vz/vz_sdk.c | 209
>> ++++++++++++++++++++++++++--------------------------
>> src/vz/vz_storage.c | 58 +++++++--------
>> src/vz/vz_utils.h | 20 ++---
>> 5 files changed, 199 insertions(+), 200 deletions(-)
>>
> ACK. Michal, thank you for this work.
>
> Maxim Nestratov
>
> --
> libvir-list mailing list
> libvir-list(a)redhat.com
> https://www.redhat.com/mailman/listinfo/libvir-list
By the way, Michal, how did you spot all these nits? Is there any
tool
to do it automatically? make syntax-check doesn't seem to be able to
catch all this stuff.
I've just noticed that there are some irregularities in the code. So
I've opened in in vim and run reformat over the whole files. (gg shift+V
shift+g =) Then I've fixed some small nits that vim formatted badly.
Michal
8:24 a.m.
25.06.2015 16:21, Michal Privoznik пишет:
On 25.06.2015 11:46, Maxim Nestratov wrote:
> 25.06.2015 12:19, Maxim Nestratov пишет:
>> 25.06.2015 11:18, Michal Privoznik пишет:
>>> There shouldn't be any functional change. Only some formatting nits
>>> fixed.
>>>
>>> Michal Privoznik (5):
>>> vz_driver: Reformat
>>> vz_network: Reformat
>>> vz_sdk: Reformat
>>> vz_storage: Reformat
>>> vz_utils: Reformat
>>>
>>> src/vz/vz_driver.c | 86 ++++++++++-----------
>>> src/vz/vz_network.c | 26 +++----
>>> src/vz/vz_sdk.c | 209
>>> ++++++++++++++++++++++++++--------------------------
>>> src/vz/vz_storage.c | 58 +++++++--------
>>> src/vz/vz_utils.h | 20 ++---
>>> 5 files changed, 199 insertions(+), 200 deletions(-)
>>>
>> ACK. Michal, thank you for this work.
>>
>> Maxim Nestratov
>>
>> --
>> libvir-list mailing list
>> libvir-list(a)redhat.com
>> https://www.redhat.com/mailman/listinfo/libvir-list
> By the way, Michal, how did you spot all these nits? Is there any tool
> to do it automatically? make syntax-check doesn't seem to be able to
> catch all this stuff.
I've just noticed that there are some irregularities in the code. So
I've opened in in vim and run reformat over the whole files. (gg shift+V
shift+g =) Then I've fixed some small nits that vim formatted badly.
Michal
I see. Thanks again.
3430
days inactive
3430
days old
10 comments
3 participants
participants (3)
-
Martin Kletzander -
Maxim Nestratov -
Michal Privoznik