gmane.comp.emulators.libvirt
http://blog.gmane.org/gmane.comp.emulators.libvirt
hourly11901-01-01T00:00+00:00Gmanehttp://gmane.org/img/gmane-25t.png
http://gmane.org
[libvirt] [PATCH 0/2] More semicolon cleanups
http://permalink.gmane.org/gmane.comp.emulators.libvirt/79252
<pre>In response to:
https://www.redhat.com/archives/libvir-list/2013-May/msg01791.html
Eric Blake (2):
syntax: prefer space after semicolon in for loop
syntax-check: mandate space after mid-line semicolon
HACKING | 23 +++++++++++++++++++++++
build-aux/bracket-spacing.pl | 12 ++++++++++++
cfg.mk | 2 +-
docs/hacking.html.in | 29 +++++++++++++++++++++++++++++
examples/domsuspend/suspend.c | 2 +-
python/libvirt-override.c | 38 +++++++++++++++++++-------------------
src/conf/interface_conf.c | 14 +++++++-------
src/security/virt-aa-helper.c | 2 +-
src/util/virconf.c | 4 ++--
src/util/virhook.c | 2 +-
src/util/virlog.c | 10 +++++-----
src/util/virsocketaddr.c | 12 ++++++------
src/util/virsysinfo.c | 4 ++--
src/util/viruuid.c | 4 ++--
src/vbox/vbox_tmpl.c | 11 ++++++++---
src/xen/xen_hypervisor.c | 3 ++-
tools/virsh-domain-monitor.c | 6 +++---
tools/virsh-domain.c | 6 +++---
18 files changed, 127 insertions(+), 57 deletions(-)
</pre>Eric Blake2013-05-24T17:19:35[libvirt] [PATCH 1/2] syntax: prefer space after semicolon in forloop
http://permalink.gmane.org/gmane.comp.emulators.libvirt/79251
<pre>I noticed several unusual spacings in for loops, and decided to
fix them up. See the next commit for the syntax check that found
all of these.
* examples/domsuspend/suspend.c (main): Fix spacing.
* python/libvirt-override.c: Likewise.
* src/conf/interface_conf.c: Likewise.
* src/security/virt-aa-helper.c: Likewise.
* src/util/virconf.c: Likewise.
* src/util/virhook.c: Likewise.
* src/util/virlog.c: Likewise.
* src/util/virsocketaddr.c: Likewise.
* src/util/virsysinfo.c: Likewise.
* src/util/viruuid.c: Likewise.
* src/vbox/vbox_tmpl.c: Likewise.
* src/xen/xen_hypervisor.c: Likewise.
* tools/virsh-domain-monitor.c (vshDomainStateToString): Drop
default case, to let compiler check us.
* tools/virsh-domain.c (vshDomainVcpuStateToString): Likewise.
Signed-off-by: Eric Blake <eblake< at >redhat.com>
---
examples/domsuspend/suspend.c | 2 +-
python/libvirt-override.c | 38 +++++++++++++++++++-------------------
src/conf/interface_conf.c | 14 +++++++-------
src/security/virt-aa-helper.c | 2 +-
src/util/virconf.c | 4 ++--
src/util/virhook.c | 2 +-
src/util/virlog.c | 10 +++++-----
src/util/virsocketaddr.c | 12 ++++++------
src/util/virsysinfo.c | 4 ++--
src/util/viruuid.c | 4 ++--
src/vbox/vbox_tmpl.c | 11 ++++++++---
src/xen/xen_hypervisor.c | 3 ++-
tools/virsh-domain-monitor.c | 6 +++---
tools/virsh-domain.c | 6 +++---
14 files changed, 62 insertions(+), 56 deletions(-)
diff --git a/examples/domsuspend/suspend.c b/examples/domsuspend/suspend.c
index a6311d1..d9f56bb 100644
--- a/examples/domsuspend/suspend.c
+++ b/examples/domsuspend/suspend.c
< at >< at > -113,7 +113,7 < at >< at > int main(int argc, char **argv) {
fprintf(stderr, "Failed to list the domains\n");
goto error;
}
- for (j = 0;j < i;j++) {
+ for (j = 0; j < i; j++) {
if (ids[j] != 0) {
id = ids[j];
break;
diff --git a/python/libvirt-override.c b/python/libvirt-override.c
index 6ed2624..b6462c2 100644
--- a/python/libvirt-override.c
+++ b/python/libvirt-override.c
< at >< at > -2176,7 +2176,7 < at >< at > libvirt_virConnectListDomainsID(PyObject *self ATTRIBUTE_UNUSED,
py_retval = PyList_New(c_retval);
if (ids) {
- for (i = 0;i < c_retval;i++) {
+ for (i = 0; i < c_retval; i++) {
PyList_SetItem(py_retval, i, libvirt_intWrap(ids[i]));
}
VIR_FREE(ids);
< at >< at > -2266,7 +2266,7 < at >< at > libvirt_virConnectListDefinedDomains(PyObject *self ATTRIBUTE_UNUSED,
py_retval = PyList_New(c_retval);
if (names) {
- for (i = 0;i < c_retval;i++) {
+ for (i = 0; i < c_retval; i++) {
PyList_SetItem(py_retval, i, libvirt_constcharPtrWrap(names[i]));
VIR_FREE(names[i]);
}
< at >< at > -2745,7 +2745,7 < at >< at > libvirt_virConnectListNetworks(PyObject *self ATTRIBUTE_UNUSED,
py_retval = PyList_New(c_retval);
if (names) {
- for (i = 0;i < c_retval;i++) {
+ for (i = 0; i < c_retval; i++) {
PyList_SetItem(py_retval, i, libvirt_constcharPtrWrap(names[i]));
VIR_FREE(names[i]);
}
< at >< at > -2790,7 +2790,7 < at >< at > libvirt_virConnectListDefinedNetworks(PyObject *self ATTRIBUTE_UNUSED,
py_retval = PyList_New(c_retval);
if (names) {
- for (i = 0;i < c_retval;i++) {
+ for (i = 0; i < c_retval; i++) {
PyList_SetItem(py_retval, i, libvirt_constcharPtrWrap(names[i]));
VIR_FREE(names[i]);
}
< at >< at > -2997,7 +2997,7 < at >< at > libvirt_virNodeGetCellsFreeMemory(PyObject *self ATTRIBUTE_UNUSED, PyObject *arg
return VIR_PY_NONE;
}
py_retval = PyList_New(c_retval);
- for (i = 0;i < c_retval;i++) {
+ for (i = 0; i < c_retval; i++) {
PyList_SetItem(py_retval, i,
libvirt_longlongWrap((long long) freeMems[i]));
}
< at >< at > -3165,7 +3165,7 < at >< at > libvirt_virConnectListStoragePools(PyObject *self ATTRIBUTE_UNUSED,
py_retval = PyList_New(c_retval);
if (py_retval == NULL) {
if (names) {
- for (i = 0;i < c_retval;i++)
+ for (i = 0; i < c_retval; i++)
VIR_FREE(names[i]);
VIR_FREE(names);
}
< at >< at > -3173,7 +3173,7 < at >< at > libvirt_virConnectListStoragePools(PyObject *self ATTRIBUTE_UNUSED,
}
if (names) {
- for (i = 0;i < c_retval;i++) {
+ for (i = 0; i < c_retval; i++) {
PyList_SetItem(py_retval, i, libvirt_constcharPtrWrap(names[i]));
VIR_FREE(names[i]);
}
< at >< at > -3218,7 +3218,7 < at >< at > libvirt_virConnectListDefinedStoragePools(PyObject *self ATTRIBUTE_UNUSED,
py_retval = PyList_New(c_retval);
if (py_retval == NULL) {
if (names) {
- for (i = 0;i < c_retval;i++)
+ for (i = 0; i < c_retval; i++)
VIR_FREE(names[i]);
VIR_FREE(names);
}
< at >< at > -3226,7 +3226,7 < at >< at > libvirt_virConnectListDefinedStoragePools(PyObject *self ATTRIBUTE_UNUSED,
}
if (names) {
- for (i = 0;i < c_retval;i++) {
+ for (i = 0; i < c_retval; i++) {
PyList_SetItem(py_retval, i, libvirt_constcharPtrWrap(names[i]));
VIR_FREE(names[i]);
}
< at >< at > -3317,7 +3317,7 < at >< at > libvirt_virStoragePoolListVolumes(PyObject *self ATTRIBUTE_UNUSED,
py_retval = PyList_New(c_retval);
if (py_retval == NULL) {
if (names) {
- for (i = 0;i < c_retval;i++)
+ for (i = 0; i < c_retval; i++)
VIR_FREE(names[i]);
VIR_FREE(names);
}
< at >< at > -3325,7 +3325,7 < at >< at > libvirt_virStoragePoolListVolumes(PyObject *self ATTRIBUTE_UNUSED,
}
if (names) {
- for (i = 0;i < c_retval;i++) {
+ for (i = 0; i < c_retval; i++) {
PyList_SetItem(py_retval, i, libvirt_constcharPtrWrap(names[i]));
VIR_FREE(names[i]);
}
< at >< at > -3578,7 +3578,7 < at >< at > libvirt_virNodeListDevices(PyObject *self ATTRIBUTE_UNUSED,
py_retval = PyList_New(c_retval);
if (names) {
- for (i = 0;i < c_retval;i++) {
+ for (i = 0; i < c_retval; i++) {
PyList_SetItem(py_retval, i, libvirt_constcharPtrWrap(names[i]));
VIR_FREE(names[i]);
}
< at >< at > -3668,7 +3668,7 < at >< at > libvirt_virNodeDeviceListCaps(PyObject *self ATTRIBUTE_UNUSED,
py_retval = PyList_New(c_retval);
if (names) {
- for (i = 0;i < c_retval;i++) {
+ for (i = 0; i < c_retval; i++) {
PyList_SetItem(py_retval, i, libvirt_constcharPtrWrap(names[i]));
VIR_FREE(names[i]);
}
< at >< at > -3787,7 +3787,7 < at >< at > libvirt_virConnectListSecrets(PyObject *self ATTRIBUTE_UNUSED,
py_retval = PyList_New(c_retval);
if (uuids) {
- for (i = 0;i < c_retval;i++) {
+ for (i = 0; i < c_retval; i++) {
PyList_SetItem(py_retval, i, libvirt_constcharPtrWrap(uuids[i]));
VIR_FREE(uuids[i]);
}
< at >< at > -4006,7 +4006,7 < at >< at > libvirt_virConnectListNWFilters(PyObject *self ATTRIBUTE_UNUSED,
py_retval = PyList_New(c_retval);
if (uuids) {
- for (i = 0;i < c_retval;i++) {
+ for (i = 0; i < c_retval; i++) {
PyList_SetItem(py_retval, i, libvirt_constcharPtrWrap(uuids[i]));
VIR_FREE(uuids[i]);
}
< at >< at > -4097,7 +4097,7 < at >< at > libvirt_virConnectListInterfaces(PyObject *self ATTRIBUTE_UNUSED,
py_retval = PyList_New(c_retval);
if (py_retval == NULL) {
if (names) {
- for (i = 0;i < c_retval;i++)
+ for (i = 0; i < c_retval; i++)
VIR_FREE(names[i]);
VIR_FREE(names);
}
< at >< at > -4105,7 +4105,7 < at >< at > libvirt_virConnectListInterfaces(PyObject *self ATTRIBUTE_UNUSED,
}
if (names) {
- for (i = 0;i < c_retval;i++) {
+ for (i = 0; i < c_retval; i++) {
PyList_SetItem(py_retval, i, libvirt_constcharPtrWrap(names[i]));
VIR_FREE(names[i]);
}
< at >< at > -4151,7 +4151,7 < at >< at > libvirt_virConnectListDefinedInterfaces(PyObject *self ATTRIBUTE_UNUSED,
py_retval = PyList_New(c_retval);
if (py_retval == NULL) {
if (names) {
- for (i = 0;i < c_retval;i++)
+ for (i = 0; i < c_retval; i++)
VIR_FREE(names[i]);
VIR_FREE(names);
}
< at >< at > -4159,7 +4159,7 < at >< at > libvirt_virConnectListDefinedInterfaces(PyObject *self ATTRIBUTE_UNUSED,
}
if (names) {
- for (i = 0;i < c_retval;i++) {
+ for (i = 0; i < c_retval; i++) {
PyList_SetItem(py_retval, i, libvirt_constcharPtrWrap(names[i]));
VIR_FREE(names[i]);
}
diff --git a/src/conf/interface_conf.c b/src/conf/interface_conf.c
index d8100ed..025a454 100644
--- a/src/conf/interface_conf.c
+++ b/src/conf/interface_conf.c
< at >< at > -1,7 +1,7 < at >< at >
/*
* interface_conf.c: interfaces XML handling
*
- * Copyright (C) 2006-2010 Red Hat, Inc.
+ * Copyright (C) 2006-2010, 2013 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
< at >< at > -80,7 +80,7 < at >< at > void virInterfaceDefFree(virInterfaceDefPtr def)
switch (def->type) {
case VIR_INTERFACE_TYPE_BRIDGE:
VIR_FREE(def->data.bridge.delay);
- for (i = 0;i < def->data.bridge.nbItf;i++) {
+ for (i = 0; i < def->data.bridge.nbItf; i++) {
if (def->data.bridge.itf[i] == NULL)
break; /* to cope with half parsed data on errors */
virInterfaceDefFree(def->data.bridge.itf[i]);
< at >< at > -89,7 +89,7 < at >< at > void virInterfaceDefFree(virInterfaceDefPtr def)
break;
case VIR_INTERFACE_TYPE_BOND:
VIR_FREE(def->data.bond.target);
- for (i = 0;i < def->data.bond.nbItf;i++) {
+ for (i = 0; i < def->data.bond.nbItf; i++) {
if (def->data.bond.itf[i] == NULL)
break; /* to cope with half parsed data on errors */
virInterfaceDefFree(def->data.bond.itf[i]);
< at >< at > -504,7 +504,7 < at >< at > virInterfaceDefParseBridge(virInterfaceDefPtr def,
}
def->data.bridge.nbItf = nbItf;
- for (i = 0; i < nbItf;i++) {
+ for (i = 0; i < nbItf; i++) {
ctxt->node = interfaces[i];
itf = virInterfaceDefParseXML(ctxt, VIR_INTERFACE_TYPE_BRIDGE);
if (itf == NULL) {
< at >< at > -551,7 +551,7 < at >< at > virInterfaceDefParseBondItfs(virInterfaceDefPtr def,
}
def->data.bond.nbItf = nbItf;
- for (i = 0; i < nbItf;i++) {
+ for (i = 0; i < nbItf; i++) {
ctxt->node = interfaces[i];
itf = virInterfaceDefParseXML(ctxt, VIR_INTERFACE_TYPE_BOND);
if (itf == NULL) {
< at >< at > -886,7 +886,7 < at >< at > virInterfaceBridgeDefFormat(virBufferPtr buf,
virBufferAsprintf(buf, " delay='%s'", def->data.bridge.delay);
virBufferAddLit(buf, ">\n");
- for (i = 0;i < def->data.bridge.nbItf;i++) {
+ for (i = 0; i < def->data.bridge.nbItf; i++) {
if (virInterfaceDefDevFormat(buf,
def->data.bridge.itf[i], level+2) < 0)
ret = -1;
< at >< at > -948,7 +948,7 < at >< at > virInterfaceBondDefFormat(virBufferPtr buf,
virBufferAddLit(buf, " validate='all'");
virBufferAddLit(buf, "/>\n");
}
- for (i = 0;i < def->data.bond.nbItf;i++) {
+ for (i = 0; i < def->data.bond.nbItf; i++) {
if (virInterfaceDefDevFormat(buf, def->data.bond.itf[i], level+2) < 0)
ret = -1;
}
diff --git a/src/security/virt-aa-helper.c b/src/security/virt-aa-helper.c
index f16a35b..02359fc 100644
--- a/src/security/virt-aa-helper.c
+++ b/src/security/virt-aa-helper.c
< at >< at > -71,7 +71,7 < at >< at > typedef struct {
char *files; /* list of files */
virDomainDefPtr def; /* VM definition */
virCapsPtr caps; /* VM capabilities */
- virDomainXMLOptionPtr xmlopt;/* XML parser data */
+ virDomainXMLOptionPtr xmlopt; /* XML parser data */
char *hvm; /* type of hypervisor (eg hvm, xen) */
virArch arch; /* machine architecture */
char *newfile; /* newly added file */
diff --git a/src/util/virconf.c b/src/util/virconf.c
index c578bf4..ef76369 100644
--- a/src/util/virconf.c
+++ b/src/util/virconf.c
< at >< at > -1,7 +1,7 < at >< at >
/*
* virconf.c: parser for a subset of the Python encoded Xen configuration files
*
- * Copyright (C) 2006-2012 Red Hat, Inc.
+ * Copyright (C) 2006-2013 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
< at >< at > -67,7 +67,7 < at >< at > struct _virConfParserCtxt {
#define SKIP_BLANKS_AND_EOL \
do { while ((ctxt->cur < ctxt->end) && (c_isblank(CUR) || IS_EOL(CUR))) { \
if (CUR == '\n') ctxt->line++; \
- ctxt->cur++;}} while (0)
+ ctxt->cur++; } } while (0)
#define SKIP_BLANKS \
do { while ((ctxt->cur < ctxt->end) && (c_isblank(CUR))) \
ctxt->cur++; } while (0)
diff --git a/src/util/virhook.c b/src/util/virhook.c
index 508c268..507eae2 100644
--- a/src/util/virhook.c
+++ b/src/util/virhook.c
< at >< at > -142,7 +142,7 < at >< at > virHookInitialize(void) {
int i, res, ret = 0;
virHooksFound = 0;
- for (i = 0;i < VIR_HOOK_DRIVER_LAST;i++) {
+ for (i = 0; i < VIR_HOOK_DRIVER_LAST; i++) {
res = virHookCheck(i, virHookDriverTypeToString(i));
if (res < 0)
return -1;
diff --git a/src/util/virlog.c b/src/util/virlog.c
index 348bddc..f456cb9 100644
--- a/src/util/virlog.c
+++ b/src/util/virlog.c
< at >< at > -371,7 +371,7 < at >< at > virLogDumpAllFD(const char *msg, int len)
if (len <= 0)
len = strlen(msg);
- for (i = 0; i < virLogNbOutputs;i++) {
+ for (i = 0; i < virLogNbOutputs; i++) {
if (virLogOutputs[i].f == virLogOutputToFd) {
int fd = (intptr_t) virLogOutputs[i].data;
< at >< at > -514,7 +514,7 < at >< at > virLogResetFilters(void)
{
int i;
- for (i = 0; i < virLogNbFilters;i++)
+ for (i = 0; i < virLogNbFilters; i++)
VIR_FREE(virLogFilters[i].match);
VIR_FREE(virLogFilters);
virLogNbFilters = 0;
< at >< at > -550,7 +550,7 < at >< at > virLogDefineFilter(const char *match,
return -1;
virLogLock();
- for (i = 0;i < virLogNbFilters;i++) {
+ for (i = 0; i < virLogNbFilters; i++) {
if (STREQ(virLogFilters[i].match, match)) {
virLogFilters[i].priority = priority;
goto cleanup;
< at >< at > -597,7 +597,7 < at >< at > virLogFiltersCheck(const char *input,
int i;
virLogLock();
- for (i = 0;i < virLogNbFilters;i++) {
+ for (i = 0; i < virLogNbFilters; i++) {
if (strstr(input, virLogFilters[i].match)) {
ret = virLogFilters[i].priority;
*flags = virLogFilters[i].flags;
< at >< at > -621,7 +621,7 < at >< at > virLogResetOutputs(void)
{
int i;
- for (i = 0;i < virLogNbOutputs;i++) {
+ for (i = 0; i < virLogNbOutputs; i++) {
if (virLogOutputs[i].c != NULL)
virLogOutputs[i].c(virLogOutputs[i].data);
VIR_FREE(virLogOutputs[i].name);
diff --git a/src/util/virsocketaddr.c b/src/util/virsocketaddr.c
index 1a6714e..1071b00 100644
--- a/src/util/virsocketaddr.c
+++ b/src/util/virsocketaddr.c
< at >< at > -49,7 +49,7 < at >< at > static int virSocketAddrGetIPv4Addr(virSocketAddrPtr addr, virSocketAddrIPv4Ptr
val = ntohl(addr->data.inet4.sin_addr.s_addr);
- for (i = 0;i < 4;i++) {
+ for (i = 0; i < 4; i++) {
(*tab)[3 - i] = val & 0xFF;
val >>= 8;
}
< at >< at > -63,7 +63,7 < at >< at > static int virSocketAddrGetIPv6Addr(virSocketAddrPtr addr, virSocketAddrIPv6Ptr
if ((addr == NULL) || (tab == NULL) || (addr->data.stor.ss_family != AF_INET6))
return -1;
- for (i = 0;i < 8;i++) {
+ for (i = 0; i < 8; i++) {
(*tab)[i] = ((addr->data.inet6.sin6_addr.s6_addr[2 * i] << 8) |
addr->data.inet6.sin6_addr.s6_addr[2 * i + 1]);
}
< at >< at > -530,7 +530,7 < at >< at > int virSocketAddrCheckNetmask(virSocketAddrPtr addr1, virSocketAddrPtr addr2,
(virSocketAddrGetIPv4Addr(netmask, &tm) < 0))
return -1;
- for (i = 0;i < 4;i++) {
+ for (i = 0; i < 4; i++) {
if ((t1[i] & tm[i]) != (t2[i] & tm[i]))
return 0;
}
< at >< at > -543,7 +543,7 < at >< at > int virSocketAddrCheckNetmask(virSocketAddrPtr addr1, virSocketAddrPtr addr2,
(virSocketAddrGetIPv6Addr(netmask, &tm) < 0))
return -1;
- for (i = 0;i < 8;i++) {
+ for (i = 0; i < 8; i++) {
if ((t1[i] & tm[i]) != (t2[i] & tm[i]))
return 0;
}
< at >< at > -581,7 +581,7 < at >< at > int virSocketAddrGetRange(virSocketAddrPtr start, virSocketAddrPtr end) {
(virSocketAddrGetIPv4Addr(end, &t2) < 0))
return -1;
- for (i = 0;i < 2;i++) {
+ for (i = 0; i < 2; i++) {
if (t1[i] != t2[i])
return -1;
}
< at >< at > -596,7 +596,7 < at >< at > int virSocketAddrGetRange(virSocketAddrPtr start, virSocketAddrPtr end) {
(virSocketAddrGetIPv6Addr(end, &t2) < 0))
return -1;
- for (i = 0;i < 7;i++) {
+ for (i = 0; i < 7; i++) {
if (t1[i] != t2[i])
return -1;
}
diff --git a/src/util/virsysinfo.c b/src/util/virsysinfo.c
index 4868a5f..c6d3a71 100644
--- a/src/util/virsysinfo.c
+++ b/src/util/virsysinfo.c
< at >< at > -91,7 +91,7 < at >< at > void virSysinfoDefFree(virSysinfoDefPtr def)
VIR_FREE(def->system_sku);
VIR_FREE(def->system_family);
- for (i = 0;i < def->nprocessor;i++) {
+ for (i = 0; i < def->nprocessor; i++) {
VIR_FREE(def->processor[i].processor_socket_destination);
VIR_FREE(def->processor[i].processor_type);
VIR_FREE(def->processor[i].processor_family);
< at >< at > -105,7 +105,7 < at >< at > void virSysinfoDefFree(virSysinfoDefPtr def)
VIR_FREE(def->processor[i].processor_part_number);
}
VIR_FREE(def->processor);
- for (i = 0;i < def->nmemory;i++) {
+ for (i = 0; i < def->nmemory; i++) {
VIR_FREE(def->memory[i].memory_size);
VIR_FREE(def->memory[i].memory_form_factor);
VIR_FREE(def->memory[i].memory_locator);
diff --git a/src/util/viruuid.c b/src/util/viruuid.c
index 8f82187..9f4bb13 100644
--- a/src/util/viruuid.c
+++ b/src/util/viruuid.c
< at >< at > -1,7 +1,7 < at >< at >
/*
* viruuid.h: helper APIs for dealing with UUIDs
*
- * Copyright (C) 2007-2012 Red Hat, Inc.
+ * Copyright (C) 2007-2013 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
< at >< at > -160,7 +160,7 < at >< at > virUUIDParse(const char *uuidstr, unsigned char *uuid) {
while (c_isspace(*cur))
cur++;
- for (i = 0;i < VIR_UUID_BUFLEN;) {
+ for (i = 0; i < VIR_UUID_BUFLEN;) {
uuid[i] = 0;
if (*cur == 0)
goto error;
diff --git a/src/vbox/vbox_tmpl.c b/src/vbox/vbox_tmpl.c
index d37888c..9ddb3ad 100644
--- a/src/vbox/vbox_tmpl.c
+++ b/src/vbox/vbox_tmpl.c
< at >< at > -2938,7 +2938,7 < at >< at > sharedFoldersCleanup:
}
/* Now get the details about the network cards here */
- for (i = 0;(netAdpIncCnt < def->nnets) && (i < netAdpCnt); i++) {
+ for (i = 0; netAdpIncCnt < def->nnets && i < netAdpCnt; i++) {
INetworkAdapter *adapter = NULL;
machine->vtbl->GetNetworkAdapter(machine, i, &adapter);
< at >< at > -3216,7 +3216,9 < at >< at > sharedFoldersCleanup:
}
/* Now get the details about the serial ports here */
- for (i = 0;(serialPortIncCount < def->nserials) && (i < serialPortCount); i++) {
+ for (i = 0;
+ serialPortIncCount < def->nserials && i < serialPortCount;
+ i++) {
ISerialPort *serialPort = NULL;
machine->vtbl->GetSerialPort(machine, i, &serialPort);
< at >< at > -3300,7 +3302,10 < at >< at > sharedFoldersCleanup:
}
/* Now get the details about the parallel ports here */
- for (i = 0;(parallelPortIncCount < def->nparallels) && (i < parallelPortCount); i++) {
+ for (i = 0;
+ parallelPortIncCount < def->nparallels &&
+ i < parallelPortCount;
+ i++) {
IParallelPort *parallelPort = NULL;
machine->vtbl->GetParallelPort(machine, i, &parallelPort);
diff --git a/src/xen/xen_hypervisor.c b/src/xen/xen_hypervisor.c
index 11ba516..cfc8139 100644
--- a/src/xen/xen_hypervisor.c
+++ b/src/xen/xen_hypervisor.c
< at >< at > -2873,7 +2873,8 < at >< at > xenHypervisorNodeGetCellsFreeMemory(virConnectPtr conn,
memset(&op_sys, 0, sizeof(op_sys));
op_sys.cmd = XEN_V2_OP_GETAVAILHEAP;
- for (i = startCell, j = 0;(i < priv->nbNodeCells) && (j < maxCells);i++,j++) {
+ for (i = startCell, j = 0;
+ i < priv->nbNodeCells && j < maxCells; i++, j++) {
if (hv_versions.sys_interface >= 5)
op_sys.u.availheap5.node = i;
else
diff --git a/tools/virsh-domain-monitor.c b/tools/virsh-domain-monitor.c
index 5ed89d1..b284154 100644
--- a/tools/virsh-domain-monitor.c
+++ b/tools/virsh-domain-monitor.c
< at >< at > -1,7 +1,7 < at >< at >
/*
* virsh-domain-monitor.c: Commands to monitor domain status
*
- * Copyright (C) 2005, 2007-2012 Red Hat, Inc.
+ * Copyright (C) 2005, 2007-2013 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
< at >< at > -156,8 +156,8 < at >< at > vshDomainStateToString(int state)
case VIR_DOMAIN_PMSUSPENDED:
return N_("pmsuspended");
case VIR_DOMAIN_NOSTATE:
- default:
- ;/*FALLTHROUGH*/
+ case VIR_DOMAIN_LAST:
+ break;
}
return N_("no state"); /* = dom0 state */
}
diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c
index 0402aef..4fdf4ba 100644
--- a/tools/virsh-domain.c
+++ b/tools/virsh-domain.c
< at >< at > -114,15 +114,15 < at >< at > vshCommandOptDomainBy(vshControl *ctl, const vshCmd *cmd,
static const char *
vshDomainVcpuStateToString(int state)
{
- switch (state) {
+ switch ((virVcpuState) state) {
case VIR_VCPU_OFFLINE:
return N_("offline");
case VIR_VCPU_BLOCKED:
return N_("idle");
case VIR_VCPU_RUNNING:
return N_("running");
- default:
- ;/*FALLTHROUGH*/
+ case VIR_VCPU_LAST:
+ break;
}
return N_("no state");
}
</pre>Eric Blake2013-05-24T17:19:36[libvirt] [PATCH 2/2] syntax-check: mandate space after mid-linesemicolon
http://permalink.gmane.org/gmane.comp.emulators.libvirt/79250
<pre>Enforce the style cleanup in the previous patch.
* build-aux/bracket-spacing.pl: Enforce trailing spacing.
* cfg.mk (bracket-spacing-check): Tweak error wording.
* docs/hacking.html.in: Document the rule.
* HACKING: Regenerate.
Signed-off-by: Eric Blake <eblake< at >redhat.com>
---
HACKING | 23 +++++++++++++++++++++++
build-aux/bracket-spacing.pl | 12 ++++++++++++
cfg.mk | 2 +-
docs/hacking.html.in | 29 +++++++++++++++++++++++++++++
4 files changed, 65 insertions(+), 1 deletion(-)
diff --git a/HACKING b/HACKING
index 2bd6d69..42f76b6 100644
--- a/HACKING
+++ b/HACKING
< at >< at > -318,6 +318,29 < at >< at > immediately prior to any closing bracket. E.g.
int foo(int wizz); // Good
+Semicolons
+==========
+Semicolons should never have a space beforehand. Inside the condition of a
+"for" loop, there should always be a space or line break after each semicolon,
+except for the special case of an infinite loop (although more infinite loops
+use "while"). While not enforced, loop counters generally use post-increment.
+
+ for (i = 0 ;i < limit ; ++i) { // Bad
+ for (i = 0; i < limit; i++) { // Good
+ for (;;) { // ok
+ while (1) { // Better
+
+Empty loop bodies are better represented with curly braces and a comment,
+although use of a semicolon is not currently rejected.
+
+ while ((rc = waitpid(pid, &st, 0) == -1) && // ok
+ errno == EINTR);
+ while ((rc = waitpid(pid, &st, 0) == -1) && // Better
+ errno == EINTR) {
+ /* nothing */
+ }
+
+
Curly braces
============
Omit the curly braces around an "if", "while", "for" etc. body only when that
diff --git a/build-aux/bracket-spacing.pl b/build-aux/bracket-spacing.pl
index 2eeeeb4..de40040 100755
--- a/build-aux/bracket-spacing.pl
+++ b/build-aux/bracket-spacing.pl
< at >< at > -1,6 +1,7 < at >< at >
#!/usr/bin/perl
#
# bracket-spacing.pl: Report any usage of 'function (..args..)'
+# Also check for other syntax issues, such as correct use of ';'
#
# This library is free software; you can redistribute it and/or
# modify it under the terms of the GNU Lesser General Public
< at >< at > -31,6 +32,9 < at >< at > foreach my $file (< at >ARGV) {
while (defined (my $line = <FILE>)) {
my $data = $line;
+ # Kill any quoted ; or "
+ $data =~ s,'[";]','X',g;
+
# Kill any quoted strings
$data =~ s,"([^\\\"]|\\.)*","XXX",g;
< at >< at > -125,6 +129,14 < at >< at > foreach my $file (< at >ARGV) {
$ret = 1;
last;
}
+
+ # Require EOL, macro line continuation, or whitespace after ":".
+ # Allow "for (;;)" as an exception.
+ while ($data =~ /;[^ \\\n;)]/) {
+ print "$file:$.: $line";
+ $ret = 1;
+ last;
+ }
}
close FILE;
}
diff --git a/cfg.mk b/cfg.mk
index 55359e8..6e8b6d4 100644
--- a/cfg.mk
+++ b/cfg.mk
< at >< at > -845,7 +845,7 < at >< at > syntax-check: $(top_srcdir)/HACKING bracket-spacing-check
bracket-spacing-check:
$(AM_V_GEN)files=`$(VC_LIST) | grep '\.c$$'`; \
$(PERL) $(top_srcdir)/build-aux/bracket-spacing.pl $$files || \
- (echo $(ME): incorrect whitespace around brackets, see HACKING for rules && exit 1)
+ (echo "$(ME): incorrect whitespace, see HACKING for rules" && exit 1)
# sc_po_check can fail if generated files are not built first
sc_po_check: \
diff --git a/docs/hacking.html.in b/docs/hacking.html.in
index 78959f3..08b8b4c 100644
--- a/docs/hacking.html.in
+++ b/docs/hacking.html.in
< at >< at > -377,6 +377,35 < at >< at >
int foo(int wizz); // Good
</pre>
+ <h2><a name="semicolon">Semicolons</a></h2>
+
+ <p>
+ Semicolons should never have a space beforehand. Inside the
+ condition of a <code>for</code> loop, there should always be a
+ space or line break after each semicolon, except for the special
+ case of an infinite loop (although more infinite loops
+ use <code>while</code>). While not enforced, loop counters
+ generally use post-increment.
+ </p>
+ <pre>
+ for (i = 0 ;i &lt; limit ; ++i) { // Bad
+ for (i = 0; i &lt; limit; i++) { // Good
+ for (;;) { // ok
+ while (1) { // Better
+</pre>
+ <p>
+ Empty loop bodies are better represented with curly braces and a
+ comment, although use of a semicolon is not currently rejected.
+ </p>
+ <pre>
+ while ((rc = waitpid(pid, &amp;st, 0) == -1) &amp;&amp; // ok
+ errno == EINTR);
+ while ((rc = waitpid(pid, &amp;st, 0) == -1) &amp;&amp; // Better
+ errno == EINTR) {
+ /* nothing */
+ }
+</pre>
+
<h2><a name="curly_braces">Curly braces</a></h2>
<p>
</pre>Eric Blake2013-05-24T17:19:37Re: [libvirt] [PATCH] spec: Build vbox packages only for x86architectures
http://permalink.gmane.org/gmane.comp.emulators.libvirt/79249
<pre>
ACK and pushed.
</pre>Eric Blake2013-05-24T16:11:49Re: [libvirt] two hostdev devices problem
http://permalink.gmane.org/gmane.comp.emulators.libvirt/79247
<pre>
First - I just got confirmation from the libnl maintainer that the bug I
mentioned causing problems with max_vfs > 50 *is* an issue in libnl
3.2.16 - it is fixed in libnl 3.2.22. Try to upgrade to that version and
it should solve at least some of your problems.
Interesting.
So now I'm curious about something - can you try adding a vlan tag to
your networks and see if the vlan tag is set properly when max_vfs is a
low number (10 or 7):
<network>
<name>vnet0</name>
<uuid>ec49896a-a0b5-4944-a81f-9f0cdf578871</uuid>
<vlan>
<tag id='42'/>
</vlan>
<forward mode='hostdev' managed='yes'>
<pf dev='eth0'/>
</forward>
</network>
(you will have to do "virsh net-destroy vnet0; virsh net-start vnet0"
after making the modification to the network). If the vlan tag is
successfully set, it will show up next to the mac address for the VF in
the output of "ip link show dev $PF".
(BTW, it may get a bit confusing if you leave your networks named as
"vnet0" and "vnet1" - although it's a different namespace, libvirt uses
"vnetN" (where n is 0 - whatever) as the name for the tap device
associated with each guest interface).
To summarize:
1) when you have max_vfs = 10, you can assign the devices and mac
addresses are set properly, i.e. everything works.
2) when you have max_vfs = 35, you can assign the devices, but the mac
addresses are not set properly.
3) when you have max_vfs = 63, you can't assign the devices because you
get this error:
internal error missing IFLA_VF_INFO in netlink response
Is this correct?
Okay, so that's not the problem.
</pre>Laine Stump2013-05-24T15:49:45Re: [libvirt] Ongoing work on lock contention in qemu driver?
http://permalink.gmane.org/gmane.comp.emulators.libvirt/79246
<pre>
To verify that this is worthwhile, I disabled the apparmor driver
entirely. My 20 VM creation test ran about 10s faster (down from 35s
to 25s).
After giving this approach a little more thought, I think an
incremental series of patches is a good way to go. The responsibility
of locking could be pushed down into the security drivers. At first,
all of the drivers would lock where their managers' locked. Then each
driver could be updated to do more fine-grained locking. I'm going to
work on a patch to push the locking down into the drivers, then I'm
going to work on a patch for better locking in the apparmor driver.
After removing the security driver contention, this was still a
substantial bottleneck: virConnectDefineXML could still take a few
seconds. I removed the contention by keeping a copy of the domain
definition's name in the domain object. Since the name is immutable
and the domain object is protected by the list lock, the list
traversal can read the name without taking any additional locks. This
patch reduced virConnectDefineXML to tens of milliseconds.
</pre>Peter Feiner2013-05-24T15:37:04Re: [libvirt] [PATCH] qemuOpenVhostNet: Decrease vhostfdSize on open failure
http://permalink.gmane.org/gmane.comp.emulators.libvirt/79245
<pre>
This will still go back through the loop again and try to open another.
I would instead just set vhostfdSize = i (in case there were any
successful opens) and break out of the loop.
And again you'll need to decide what is an error and what gets just a
warning - if someone asks for 3 queues and gets none, that should lead
to continuing without any error or even warning. But if they request 2
and only get one, is that an error, or do we warn and continue? or just
silently continue? (I don't have the answer, I'm just asking the
question :-)
</pre>Laine Stump2013-05-24T14:42:55Re: [libvirt] [PATCH 06/12] storage_conf: Fix the error type
http://permalink.gmane.org/gmane.comp.emulators.libvirt/79244
<pre>Thanks, 1/12 ~ 6/12 are pushed.
</pre>Osier Yang2013-05-24T14:35:54Re: [libvirt] [PATCH] syntax-check: ignore all quoted strings in bracket-spacing
http://permalink.gmane.org/gmane.comp.emulators.libvirt/79243
<pre>
Hmm, our semicolon check enforces no leading spaces, but we could
probably improve it to also enforce trailing space in a for loop. For
example, this looks odd:
src/conf/interface_conf.c: for (i = 0; i < nbItf;i++) {
compared to
for (i = 0; i < nbItf; i++) {
</pre>Eric Blake2013-05-24T14:26:26Re: [libvirt] [PATCH 12/12] storage_conf: Use uid_t/gid_t instead of int to cast the value
http://permalink.gmane.org/gmane.comp.emulators.libvirt/79242
<pre>
Once you have made this check...
...the cast here is redundant. You could write 'perms->uid = val'.
Likewise.
ACK with that simplification, and with your followup that explicitly
allows -1.
</pre>Eric Blake2013-05-24T14:11:33Re: [libvirt] [PATCH 10/12] storage_conf: Use VIR_STRDUP instead of strdup
http://permalink.gmane.org/gmane.comp.emulators.libvirt/79241
<pre>
I think this was independently fixed by the STRDUP patch series.
</pre>Eric Blake2013-05-24T14:09:05Re: [libvirt] [PATCH 0/2] Fix the display of *virsh vcpuinfo*command.
http://permalink.gmane.org/gmane.comp.emulators.libvirt/79240
<pre>
[uggh; yet another victim of git's stupidity in using "In-reply-to: <y>"
if you answer the 'git send-email' question incorrectly - just hit enter
rather than filling in a response to that question]
Would you mind resending this as a top-level thread, so that it gets
properly threaded? My mail client split 0/2 and 2/2 into an old series,
and 1/2 somewhere else.
I'm a bit worried about backward compatibility; if there are existing
scripts that parse the output, will they be confused if we introduce a
third symbol? Then again, offline host cpus are indeed a different
beast than cpus that the guest has been assigned to, so I think we can
make this change.
</pre>Eric Blake2013-05-24T14:03:18Re: [libvirt] [PATCH] syntax-check: ignore all quoted strings in bracket-spacing
http://permalink.gmane.org/gmane.comp.emulators.libvirt/79239
<pre>
Thanks, fixed and pushed now.
Jan
</pre>Ján Tomko2013-05-24T14:01:30Re: [libvirt] [PATCH] syntax-check: ignore all quoted strings in bracket-spacing
http://permalink.gmane.org/gmane.comp.emulators.libvirt/79238
<pre>
Nice. I've used that trick in cfg.mk as well.
You used '+' instead of '*'; that gives us a chance of a false positive,
if we have both an empty string and another string on the same line:
str = cond ? "" : " ; ";
because your replacement would result in a rewrite to:
str = cond ? ""XXX" ; ";
With *, the rewrite would be:
str = cond ? "XXX" : "XXX";
ACK if you fix the regex.
</pre>Eric Blake2013-05-24T13:53:55[libvirt] [PATCH] spec: Build vbox packages only for x86architectures
http://permalink.gmane.org/gmane.comp.emulators.libvirt/79237
<pre>Commit 6ab6bc19f03513fd87d29ecfd405bb7f4a7de114 has introduced separate
daemon/driver packages for vbox. These should only be built for x86
architectures which is done hereby.
Signed-off-by: Viktor Mihajlovski <mihajlov< at >linux.vnet.ibm.com>
---
libvirt.spec.in | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/libvirt.spec.in b/libvirt.spec.in
index e1c5f49..7abe9fe 100644
--- a/libvirt.spec.in
+++ b/libvirt.spec.in
< at >< at > -130,6 +130,11 < at >< at >
%define with_libxl 0
%endif
+# vbox is available only on i386 x86_64
+%ifnarch %{ix86} x86_64
+ %define with_vbox 0
+%endif
+
# Numactl is not available on s390[x] and ARM
%ifarch s390 s390x %{arm}
%define with_numactl 0
</pre>Viktor Mihajlovski2013-05-24T13:44:19Re: [libvirt] [PATCH 2/2] Adapt to new VIR_STRNDUP behavior
http://permalink.gmane.org/gmane.comp.emulators.libvirt/79236
<pre>
ACK.
</pre>Eric Blake2013-05-24T13:39:45Re: [libvirt] [PATCH 2/2] Adapt to new VIR_STRNDUP behavior
http://permalink.gmane.org/gmane.comp.emulators.libvirt/79235
<pre>
It would be undefined behavior according to the C standard. Pointer
subtraction is only well-defined within the bounds of a single object;
your object (in C terminology) starts at 'curr' and ends at the NUL byte
that terminates 'curr'. NULL falls outside that bounds. 'next - curr'
is not guaranteed to be negative, since C says the behavior is
undefined. Stick with the long form.
</pre>Eric Blake2013-05-24T13:37:24Re: [libvirt] [PATCH 1/2] virStrndup: Accept negative values as string length
http://permalink.gmane.org/gmane.comp.emulators.libvirt/79234
<pre>
s/That is/That is,/
and again.
Memory leak. VIR_FREE(dst) before doing another dup into it.
ACK with those fixes.
</pre>Eric Blake2013-05-24T13:35:11Re: [libvirt] [PATCH v2] Fix blkdeviotune for shutoff domain
http://permalink.gmane.org/gmane.comp.emulators.libvirt/79233
<pre>
Thanks, pushed.
Martin
</pre>Martin Kletzander2013-05-24T13:30:30Re: [libvirt] two hostdev devices problem
http://permalink.gmane.org/gmane.comp.emulators.libvirt/79232
<pre>Hi,
even lower number?
No,
When max_fs=10, macs in VM are OK.
Phisical interfaces:
eth0 Link encap:Ethernet HWaddr b8:ca:3a:5b:a6:38
UP BROADCAST RUNNING SLAVE MULTICAST MTU:1500 Metric:1
eth1 Link encap:Ethernet HWaddr b8:ca:3a:5b:a6:38
UP BROADCAST RUNNING SLAVE MULTICAST MTU:1500 Metric:1
Domain config:
<interface type="network">
<alias name="hostdev0"/>
<source network="vnet0"/>
<mac address="52:54:0a:b1:48:fc"/>
</interface>
<interface type="network">
<alias name="hostdev1"/>
<source network="vnet1"/>
<mac address="52:54:0a:b1:48:fc"/>
</interface>
Networks defined:
<network>
<name>vnet0</name>
<uuid>ec49896a-a0b5-4944-a81f-9f0cdf578871</uuid>
<forward mode='hostdev' managed='yes'>
<pf dev='eth0'/>
</forward>
</network>
<network>
<name>vnet1</name>
<uuid>6c8319e8-8b53-4382-9f4e-2400819b00a9</uuid>
<forward mode='hostdev' managed='yes'>
<pf dev='eth1'/>
</forward>
</network>
Regards
Dominik
2013/5/24 Laine Stump <laine< at >laine.org>:
--
Pozdrawiam
Dominik
</pre>Dominik Mostowiec2013-05-24T13:16:31Re: [libvirt] [PATCH 2/2] Adapt to new VIR_STRNDUP behavior
http://permalink.gmane.org/gmane.comp.emulators.libvirt/79231
<pre>
Or we can even go with 'VIR_STRNDUP(arg, curr, next - curr) < 0' but
that's not so easy to read. The rationale behind is: I intentionally
made VIR_STRNDUP to accept *any* negative value, not just -1. Because if
strrchr(cur, '\n') just a few lines above fails, next is just NULL.
Deducting from NULL will get a negative value. Which will make
VIR_STRNDUP duplicate the while string. But I worry that it would be an
ugly code, wouldn't it?
Michal
</pre>Michal Privoznik2013-05-24T12:57:59Search EngineSearch the mailing list at Gmanequery
http://search.gmane.org/?group=$group=gmane.comp.emulators.libvirt