[libvirt] [PATCH] build: Fix build failure on mingw32 platform
--- I'm not sure if we prefer indentions inside the block between "#ifdef __linux__" ... "#else" clause. nodeinfo.c uses both (indentions/no indentions). --- src/nodeinfo.c | 12 ++++++++---- 1 files changed, 8 insertions(+), 4 deletions(-) diff --git a/src/nodeinfo.c b/src/nodeinfo.c index 7af6512..1ec3ada 100644 --- a/src/nodeinfo.c +++ b/src/nodeinfo.c @@ -971,13 +971,14 @@ cleanup: int nodeSetMemoryParameters(virConnectPtr conn ATTRIBUTE_UNUSED, - virTypedParameterPtr params, - int nparams, + virTypedParameterPtr params ATTRIBUTE_UNUSED, + int nparams ATTRIBUTE_UNUSED, unsigned int flags) { virCheckFlags(0, -1); #ifdef __linux__ + { int ret = 0; int i; @@ -1010,6 +1011,7 @@ nodeSetMemoryParameters(virConnectPtr conn ATTRIBUTE_UNUSED, } return ret; + } #else virReportError(VIR_ERR_NO_SUPPORT, "%s", _("node set memory parameters not implemented" @@ -1066,13 +1068,14 @@ cleanup: #define NODE_MEMORY_PARAMETERS_NUM 7 int nodeGetMemoryParameters(virConnectPtr conn ATTRIBUTE_UNUSED, - virTypedParameterPtr params, - int *nparams, + virTypedParameterPtr params ATTRIBUTE_UNUSED, + int *nparams ATTRIBUTE_UNUSED, unsigned int flags) { virCheckFlags(VIR_TYPED_PARAM_STRING_OKAY, -1); #ifdef __linux__ + { unsigned int pages_to_scan; unsigned int sleep_millisecs; unsigned long long pages_shared; @@ -1174,6 +1177,7 @@ nodeGetMemoryParameters(virConnectPtr conn ATTRIBUTE_UNUSED, } return 0; + } #else virReportError(VIR_ERR_NO_SUPPORT, "%s", _("node get memory parameters not implemented" -- 1.7.7.3
For the title, s/mingw32/non-linux/. On 2012年09月17日 22:11, Osier Yang wrote:
--- I'm not sure if we prefer indentions inside the block between "#ifdef __linux__" ... "#else" clause. nodeinfo.c uses both (indentions/no indentions). --- src/nodeinfo.c | 12 ++++++++---- 1 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/src/nodeinfo.c b/src/nodeinfo.c index 7af6512..1ec3ada 100644 --- a/src/nodeinfo.c +++ b/src/nodeinfo.c @@ -971,13 +971,14 @@ cleanup:
int nodeSetMemoryParameters(virConnectPtr conn ATTRIBUTE_UNUSED, - virTypedParameterPtr params, - int nparams, + virTypedParameterPtr params ATTRIBUTE_UNUSED, + int nparams ATTRIBUTE_UNUSED, unsigned int flags) { virCheckFlags(0, -1);
#ifdef __linux__ + { int ret = 0; int i;
@@ -1010,6 +1011,7 @@ nodeSetMemoryParameters(virConnectPtr conn ATTRIBUTE_UNUSED, }
return ret; + } #else virReportError(VIR_ERR_NO_SUPPORT, "%s", _("node set memory parameters not implemented" @@ -1066,13 +1068,14 @@ cleanup: #define NODE_MEMORY_PARAMETERS_NUM 7 int nodeGetMemoryParameters(virConnectPtr conn ATTRIBUTE_UNUSED, - virTypedParameterPtr params, - int *nparams, + virTypedParameterPtr params ATTRIBUTE_UNUSED, + int *nparams ATTRIBUTE_UNUSED, unsigned int flags) { virCheckFlags(VIR_TYPED_PARAM_STRING_OKAY, -1);
#ifdef __linux__ + { unsigned int pages_to_scan; unsigned int sleep_millisecs; unsigned long long pages_shared; @@ -1174,6 +1177,7 @@ nodeGetMemoryParameters(virConnectPtr conn ATTRIBUTE_UNUSED, }
return 0; + } #else virReportError(VIR_ERR_NO_SUPPORT, "%s", _("node get memory parameters not implemented"
On 09/17/2012 08:11 AM, Osier Yang wrote:
--- I'm not sure if we prefer indentions inside the block between "#ifdef __linux__" ... "#else" clause. nodeinfo.c uses both (indentions/no indentions).
Adding {} is pointless, unless you are trying to shut up a compiler warning about 'goto' crossing a scope. We are requiring C99, which allows declarations after statements.
+++ b/src/nodeinfo.c @@ -971,13 +971,14 @@ cleanup:
int nodeSetMemoryParameters(virConnectPtr conn ATTRIBUTE_UNUSED, - virTypedParameterPtr params, - int nparams, + virTypedParameterPtr params ATTRIBUTE_UNUSED, + int nparams ATTRIBUTE_UNUSED, unsigned int flags)
ACK to this part.
{ virCheckFlags(0, -1);
#ifdef __linux__ + { int ret = 0; int i;
@@ -1010,6 +1011,7 @@ nodeSetMemoryParameters(virConnectPtr conn ATTRIBUTE_UNUSED, }
return ret; + } #else
NACK to this part, the {} add nothing, and look stupid unless you reindent and make the patch twice as large.
nodeGetMemoryParameters(virConnectPtr conn ATTRIBUTE_UNUSED, - virTypedParameterPtr params, - int *nparams, + virTypedParameterPtr params ATTRIBUTE_UNUSED, + int *nparams ATTRIBUTE_UNUSED, unsigned int flags)
ACK to this part.
{ virCheckFlags(VIR_TYPED_PARAM_STRING_OKAY, -1);
#ifdef __linux__ + { unsigned int pages_to_scan; unsigned int sleep_millisecs; unsigned long long pages_shared; @@ -1174,6 +1177,7 @@ nodeGetMemoryParameters(virConnectPtr conn ATTRIBUTE_UNUSED, }
return 0; + }
NACK to this part. -- Eric Blake eblake@redhat.com +1-919-301-3266 Libvirt virtualization library http://libvirt.org
On 2012年09月18日 05:11, Eric Blake wrote:
On 09/17/2012 08:11 AM, Osier Yang wrote:
--- I'm not sure if we prefer indentions inside the block between "#ifdef __linux__" ... "#else" clause. nodeinfo.c uses both (indentions/no indentions).
Adding {} is pointless, unless you are trying to shut up a compiler warning about 'goto' crossing a scope. We are requiring C99, which allows declarations after statements.
+++ b/src/nodeinfo.c @@ -971,13 +971,14 @@ cleanup:
int nodeSetMemoryParameters(virConnectPtr conn ATTRIBUTE_UNUSED, - virTypedParameterPtr params, - int nparams, + virTypedParameterPtr params ATTRIBUTE_UNUSED, + int nparams ATTRIBUTE_UNUSED, unsigned int flags)
ACK to this part.
{ virCheckFlags(0, -1);
#ifdef __linux__ + { int ret = 0; int i;
@@ -1010,6 +1011,7 @@ nodeSetMemoryParameters(virConnectPtr conn ATTRIBUTE_UNUSED, }
return ret; + } #else
NACK to this part, the {} add nothing, and look stupid unless you reindent and make the patch twice as large.
nodeGetMemoryParameters(virConnectPtr conn ATTRIBUTE_UNUSED, - virTypedParameterPtr params, - int *nparams, + virTypedParameterPtr params ATTRIBUTE_UNUSED, + int *nparams ATTRIBUTE_UNUSED, unsigned int flags)
ACK to this part.
{ virCheckFlags(VIR_TYPED_PARAM_STRING_OKAY, -1);
#ifdef __linux__ + { unsigned int pages_to_scan; unsigned int sleep_millisecs; unsigned long long pages_shared; @@ -1174,6 +1177,7 @@ nodeGetMemoryParameters(virConnectPtr conn ATTRIBUTE_UNUSED, }
return 0; + }
NACK to this part.
Pushed without {} addition.
participants (2)
-
Eric Blake -
Osier Yang