[dpdk-dev] net/virtio-user: Fix missing brackets in if condition

Message ID 1468315825-24089-1-git-send-email-maxime.coquelin@redhat.com (mailing list archive)
State Accepted, archived
Headers

Commit Message

Maxime Coquelin July 12, 2016, 9:30 a.m. UTC
  The error is reported using test build script:

$ scripts/test-build.sh x86_64-native-linuxapp-gcc
...
drivers/net/virtio/virtio_user_ethdev.c: In function ‘virtio_user_pmd_devinit’:
drivers/net/virtio/virtio_user_ethdev.c:345:2: error: this ‘if’ clause does not guard... [-Werror=misleading-indentation]
  if (rte_kvargs_count(kvlist, VIRTIO_USER_ARG_PATH) == 1)
    ^~

Fixes: 404bd6bfe360 ("net/virtio-user: fix return value not checked")

Cc: Jianfeng Tan <jianfeng.tan@intel.com>
Signed-off-by: Maxime Coquelin <maxime.coquelin@redhat.com>
---
 drivers/net/virtio/virtio_user_ethdev.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
  

Comments

Thomas Monjalon July 12, 2016, 9:35 a.m. UTC | #1
Hi,

2016-07-12 11:30, Maxime Coquelin:
> The error is reported using test build script:
> 
> $ scripts/test-build.sh x86_64-native-linuxapp-gcc
> ...
> drivers/net/virtio/virtio_user_ethdev.c: In function ‘virtio_user_pmd_devinit’:
> drivers/net/virtio/virtio_user_ethdev.c:345:2: error: this ‘if’ clause does not guard... [-Werror=misleading-indentation]

Are you using gcc 6 ?
  
Maxime Coquelin July 12, 2016, 9:36 a.m. UTC | #2
On 07/12/2016 11:35 AM, Thomas Monjalon wrote:
> Hi,
>
> 2016-07-12 11:30, Maxime Coquelin:
>> The error is reported using test build script:
>>
>> $ scripts/test-build.sh x86_64-native-linuxapp-gcc
>> ...
>> drivers/net/virtio/virtio_user_ethdev.c: In function ‘virtio_user_pmd_devinit’:
>> drivers/net/virtio/virtio_user_ethdev.c:345:2: error: this ‘if’ clause does not guard... [-Werror=misleading-indentation]
> Are you using gcc 6 ?
Yes:
$ gcc --version
gcc (GCC) 6.1.1 20160621 (Red Hat 6.1.1-3)
  
Yuanhan Liu July 12, 2016, 12:11 p.m. UTC | #3
On Tue, Jul 12, 2016 at 11:30:25AM +0200, Maxime Coquelin wrote:
> The error is reported using test build script:
> 
> $ scripts/test-build.sh x86_64-native-linuxapp-gcc
> ...
> drivers/net/virtio/virtio_user_ethdev.c: In function ‘virtio_user_pmd_devinit’:
> drivers/net/virtio/virtio_user_ethdev.c:345:2: error: this ‘if’ clause does not guard... [-Werror=misleading-indentation]
>   if (rte_kvargs_count(kvlist, VIRTIO_USER_ARG_PATH) == 1)
>     ^~
> 
> Fixes: 404bd6bfe360 ("net/virtio-user: fix return value not checked")
> 
> Cc: Jianfeng Tan <jianfeng.tan@intel.com>
> Signed-off-by: Maxime Coquelin <maxime.coquelin@redhat.com>

Acked-by: Yuanhan Liu <yuanhan.liu@linux.intel.com>

Thanks for the fix.

	--yliu
  
Jan Viktorin July 14, 2016, 4:31 p.m. UTC | #4
On Tue, 12 Jul 2016 11:30:25 +0200
Maxime Coquelin <maxime.coquelin@redhat.com> wrote:

> The error is reported using test build script:

I recommend to note that the error is reported only by GCC 6+.

> 
> $ scripts/test-build.sh x86_64-native-linuxapp-gcc
> ...
> drivers/net/virtio/virtio_user_ethdev.c: In function ‘virtio_user_pmd_devinit’:
> drivers/net/virtio/virtio_user_ethdev.c:345:2: error: this ‘if’ clause does not guard... [-Werror=misleading-indentation]
>   if (rte_kvargs_count(kvlist, VIRTIO_USER_ARG_PATH) == 1)
>     ^~
> 
> Fixes: 404bd6bfe360 ("net/virtio-user: fix return value not checked")
> 
> Cc: Jianfeng Tan <jianfeng.tan@intel.com>
> Signed-off-by: Maxime Coquelin <maxime.coquelin@redhat.com>
> Acked-by: Yuanhan Liu <yuanhan.liu@linux.intel.com>
> 
Reviewed-by: Jan Viktorin <viktorin@rehivetech.com>
  
Yuanhan Liu July 15, 2016, 1:29 a.m. UTC | #5
On Thu, Jul 14, 2016 at 06:31:11PM +0200, viktorin@rehivetech.com wrote:
> On Tue, 12 Jul 2016 11:30:25 +0200
> Maxime Coquelin <maxime.coquelin@redhat.com> wrote:
> 
> > The error is reported using test build script:
> 
> I recommend to note that the error is reported only by GCC 6+.

Agreed!

	--yliu
> 
> > 
> > $ scripts/test-build.sh x86_64-native-linuxapp-gcc
> > ...
> > drivers/net/virtio/virtio_user_ethdev.c: In function ‘virtio_user_pmd_devinit’:
> > drivers/net/virtio/virtio_user_ethdev.c:345:2: error: this ‘if’ clause does not guard... [-Werror=misleading-indentation]
> >   if (rte_kvargs_count(kvlist, VIRTIO_USER_ARG_PATH) == 1)
> >     ^~
> > 
> > Fixes: 404bd6bfe360 ("net/virtio-user: fix return value not checked")
> > 
> > Cc: Jianfeng Tan <jianfeng.tan@intel.com>
> > Signed-off-by: Maxime Coquelin <maxime.coquelin@redhat.com>
> > Acked-by: Yuanhan Liu <yuanhan.liu@linux.intel.com>
> > 
> Reviewed-by: Jan Viktorin <viktorin@rehivetech.com>
  
Thomas Monjalon July 15, 2016, 8:18 p.m. UTC | #6
2016-07-12 20:11, Yuanhan Liu:
> On Tue, Jul 12, 2016 at 11:30:25AM +0200, Maxime Coquelin wrote:
> > The error is reported using test build script:
> > 
> > $ scripts/test-build.sh x86_64-native-linuxapp-gcc
> > ...
> > drivers/net/virtio/virtio_user_ethdev.c: In function ‘virtio_user_pmd_devinit’:
> > drivers/net/virtio/virtio_user_ethdev.c:345:2: error: this ‘if’ clause does not guard... [-Werror=misleading-indentation]
> >   if (rte_kvargs_count(kvlist, VIRTIO_USER_ARG_PATH) == 1)
> >     ^~
> > 
> > Fixes: 404bd6bfe360 ("net/virtio-user: fix return value not checked")
> > 
> > Cc: Jianfeng Tan <jianfeng.tan@intel.com>
> > Signed-off-by: Maxime Coquelin <maxime.coquelin@redhat.com>
> 
> Acked-by: Yuanhan Liu <yuanhan.liu@linux.intel.com>
> 
> Thanks for the fix.

Applied, thanks
  

Patch

diff --git a/drivers/net/virtio/virtio_user_ethdev.c b/drivers/net/virtio/virtio_user_ethdev.c
index 782d7d3..6b4f66e 100644
--- a/drivers/net/virtio/virtio_user_ethdev.c
+++ b/drivers/net/virtio/virtio_user_ethdev.c
@@ -342,7 +342,7 @@  virtio_user_pmd_devinit(const char *name, const char *params)
 		goto end;
 	}
 
-	if (rte_kvargs_count(kvlist, VIRTIO_USER_ARG_PATH) == 1)
+	if (rte_kvargs_count(kvlist, VIRTIO_USER_ARG_PATH) == 1) {
 		ret = rte_kvargs_process(kvlist, VIRTIO_USER_ARG_PATH,
 					 &get_string_arg, &path);
 		if (ret < 0) {
@@ -350,7 +350,7 @@  virtio_user_pmd_devinit(const char *name, const char *params)
 				     VIRTIO_USER_ARG_PATH);
 			goto end;
 		}
-	else {
+	} else {
 		PMD_INIT_LOG(ERR, "arg %s is mandatory for virtio-user\n",
 			  VIRTIO_USER_ARG_QUEUE_SIZE);
 		goto end;