Skip to contentSkip to conversation

eal: fix C++ build (struct member: virtual)

PATCH In review Christoph Gysin 4 participants 9 messages Sep 26, 2015 – Oct 22, 2015

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 eal: fix C++ build (struct member: virtual)

'virtual' is a keyword and can't be used if the code is to compile with C++ compilers.

If rte_devargs.h was included in C++ code, compilation with clang++ failed with an error. g++ did not fail, but only because of a bug that treats it as an anonymous struct with a decl-specifier which it ignores.

This simply renames the member to 'virt'.

---
 app/test/test_devargs.c                     | 4 ++--
 lib/librte_eal/common/eal_common_dev.c      | 4 ++--
 lib/librte_eal/common/eal_common_devargs.c  | 8 ++++----
 lib/librte_eal/common/include/rte_devargs.h | 2 +-
 4 files changed, 9 insertions(+), 9 deletions(-)
app/test/test_devargs.c +2 -2
index f7fc59c..049f32d 100644
@@ -91,8 +91,8 @@ test_devargs(void)
 	if (rte_eal_devargs_add(RTE_DEVTYPE_VIRTUAL, "eth_ring1,k1=val,k2=val2") < 0)
 		goto fail;
 	devargs = TAILQ_FIRST(&devargs_list);
-	if (strncmp(devargs->virtual.drv_name, "eth_ring1",
-			sizeof(devargs->virtual.drv_name)) != 0)
+	if (strncmp(devargs->virt.drv_name, "eth_ring1",
+			sizeof(devargs->virt.drv_name)) != 0)
 		goto fail;
 	if (!devargs->args || strcmp(devargs->args, "k1=val,k2=val2") != 0)
 		goto fail;
lib/librte_eal/common/eal_common_dev.c +2 -2
index 4089d66..a8a4146 100644
@@ -107,10 +107,10 @@ rte_eal_dev_init(void)
 		if (devargs->type != RTE_DEVTYPE_VIRTUAL)
 			continue;
 
-		if (rte_eal_vdev_init(devargs->virtual.drv_name,
+		if (rte_eal_vdev_init(devargs->virt.drv_name,
 					devargs->args)) {
 			RTE_LOG(ERR, EAL, "failed to initialize %s device\n",
-					devargs->virtual.drv_name);
+					devargs->virt.drv_name);
 			return -1;
 		}
 	}
lib/librte_eal/common/eal_common_devargs.c +4 -4
index ec56165..5d075d0 100644
@@ -107,9 +107,9 @@ rte_eal_devargs_add(enum rte_devtype devtype, const char *devargs_str)
 		break;
 	case RTE_DEVTYPE_VIRTUAL:
 		/* save driver name */
-		ret = snprintf(devargs->virtual.drv_name,
-			       sizeof(devargs->virtual.drv_name), "%s", buf);
-		if (ret < 0 || ret >= (int)sizeof(devargs->virtual.drv_name))
+		ret = snprintf(devargs->virt.drv_name,
+			       sizeof(devargs->virt.drv_name), "%s", buf);
+		if (ret < 0 || ret >= (int)sizeof(devargs->virt.drv_name))
 			goto fail;
 
 		break;
@@ -169,7 +169,7 @@ rte_eal_devargs_dump(FILE *f)
 			       devargs->args);
 		else if (devargs->type == RTE_DEVTYPE_VIRTUAL)
 			fprintf(f, "  VIRTUAL %s %s\n",
-			       devargs->virtual.drv_name,
+			       devargs->virt.drv_name,
 			       devargs->args);
 		else
 			fprintf(f, "  UNKNOWN %s\n", devargs->args);
lib/librte_eal/common/include/rte_devargs.h +1 -1
index 7084ae2..53c59f5 100644
@@ -86,7 +86,7 @@ struct rte_devargs {
 		struct {
 			/** Driver name. */
 			char drv_name[32];
-		} virtual;
+		} virt;
 	};
 	/** Arguments string as given by user or "" for no argument. */
 	char *args;
Signature · 1 line
2.5.3
#1 lore raw

Hello Christoph,

Quoted 10 lines · Christoph Gysin

'virtual' is a keyword and can't be used if the code is to compile with C++ compilers.

If rte_devargs.h was included in C++ code, compilation with clang++ failed with an error. g++ did not fail, but only because of a bug that treats it as an anonymous struct with a decl-specifier which it ignores.

This simply renames the member to 'virt'.

Ack with your signed-off.

Signature · 1 line
David Marchand
#2 lore raw

PATCH 1/1 eal: fix C++ build (struct member: virtual)

'virtual' is a keyword and can't be used if the code is to compile with C++ compilers.

If rte_devargs.h was included in C++ code, compilation with clang++ failed with an error. g++ did not fail, but only because of a bug that treats it as an anonymous struct with a decl-specifier which it ignores.

This simply renames the member to 'virt'.

---
 app/test/test_devargs.c                     | 4 ++--
 lib/librte_eal/common/eal_common_dev.c      | 4 ++--
 lib/librte_eal/common/eal_common_devargs.c  | 8 ++++----
 lib/librte_eal/common/include/rte_devargs.h | 2 +-
 4 files changed, 9 insertions(+), 9 deletions(-)
app/test/test_devargs.c +2 -2
index f7fc59c..049f32d 100644
@@ -91,8 +91,8 @@ test_devargs(void)
 	if (rte_eal_devargs_add(RTE_DEVTYPE_VIRTUAL, "eth_ring1,k1=val,k2=val2") < 0)
 		goto fail;
 	devargs = TAILQ_FIRST(&devargs_list);
-	if (strncmp(devargs->virtual.drv_name, "eth_ring1",
-			sizeof(devargs->virtual.drv_name)) != 0)
+	if (strncmp(devargs->virt.drv_name, "eth_ring1",
+			sizeof(devargs->virt.drv_name)) != 0)
 		goto fail;
 	if (!devargs->args || strcmp(devargs->args, "k1=val,k2=val2") != 0)
 		goto fail;
lib/librte_eal/common/eal_common_dev.c +2 -2
index 4089d66..a8a4146 100644
@@ -107,10 +107,10 @@ rte_eal_dev_init(void)
 		if (devargs->type != RTE_DEVTYPE_VIRTUAL)
 			continue;
 
-		if (rte_eal_vdev_init(devargs->virtual.drv_name,
+		if (rte_eal_vdev_init(devargs->virt.drv_name,
 					devargs->args)) {
 			RTE_LOG(ERR, EAL, "failed to initialize %s device\n",
-					devargs->virtual.drv_name);
+					devargs->virt.drv_name);
 			return -1;
 		}
 	}
lib/librte_eal/common/eal_common_devargs.c +4 -4
index ec56165..5d075d0 100644
@@ -107,9 +107,9 @@ rte_eal_devargs_add(enum rte_devtype devtype, const char *devargs_str)
 		break;
 	case RTE_DEVTYPE_VIRTUAL:
 		/* save driver name */
-		ret = snprintf(devargs->virtual.drv_name,
-			       sizeof(devargs->virtual.drv_name), "%s", buf);
-		if (ret < 0 || ret >= (int)sizeof(devargs->virtual.drv_name))
+		ret = snprintf(devargs->virt.drv_name,
+			       sizeof(devargs->virt.drv_name), "%s", buf);
+		if (ret < 0 || ret >= (int)sizeof(devargs->virt.drv_name))
 			goto fail;
 
 		break;
@@ -169,7 +169,7 @@ rte_eal_devargs_dump(FILE *f)
 			       devargs->args);
 		else if (devargs->type == RTE_DEVTYPE_VIRTUAL)
 			fprintf(f, "  VIRTUAL %s %s\n",
-			       devargs->virtual.drv_name,
+			       devargs->virt.drv_name,
 			       devargs->args);
 		else
 			fprintf(f, "  UNKNOWN %s\n", devargs->args);
lib/librte_eal/common/include/rte_devargs.h +1 -1
index 7084ae2..53c59f5 100644
@@ -86,7 +86,7 @@ struct rte_devargs {
 		struct {
 			/** Driver name. */
 			char drv_name[32];
-		} virtual;
+		} virt;
 	};
 	/** Arguments string as given by user or "" for no argument. */
 	char *args;
Signature · 1 line
2.5.3
#3 lore raw

I added the Signed-off, is there anything else missing?

Any chance to get this merged?

Quoted 92 lines · Christoph Gysin

'virtual' is a keyword and can't be used if the code is to compile with C++ compilers.

If rte_devargs.h was included in C++ code, compilation with clang++ failed with an error. g++ did not fail, but only because of a bug that treats it as an anonymous struct with a decl-specifier which it ignores.

This simply renames the member to 'virt'.

---
 app/test/test_devargs.c                     | 4 ++--
 lib/librte_eal/common/eal_common_dev.c      | 4 ++--
 lib/librte_eal/common/eal_common_devargs.c  | 8 ++++----
 lib/librte_eal/common/include/rte_devargs.h | 2 +-
 4 files changed, 9 insertions(+), 9 deletions(-)
app/test/test_devargs.c +2 -2
index f7fc59c..049f32d 100644
@@ -91,8 +91,8 @@ test_devargs(void)
        if (rte_eal_devargs_add(RTE_DEVTYPE_VIRTUAL, "eth_ring1,k1=val,k2=val2") < 0)
                goto fail;
        devargs = TAILQ_FIRST(&devargs_list);
-       if (strncmp(devargs->virtual.drv_name, "eth_ring1",
-                       sizeof(devargs->virtual.drv_name)) != 0)
+       if (strncmp(devargs->virt.drv_name, "eth_ring1",
+                       sizeof(devargs->virt.drv_name)) != 0)
                goto fail;
        if (!devargs->args || strcmp(devargs->args, "k1=val,k2=val2") != 0)
                goto fail;
lib/librte_eal/common/eal_common_dev.c +2 -2
index 4089d66..a8a4146 100644
@@ -107,10 +107,10 @@ rte_eal_dev_init(void)
                if (devargs->type != RTE_DEVTYPE_VIRTUAL)
                        continue;
 
-               if (rte_eal_vdev_init(devargs->virtual.drv_name,
+               if (rte_eal_vdev_init(devargs->virt.drv_name,
                                        devargs->args)) {
                        RTE_LOG(ERR, EAL, "failed to initialize %s device\n",
-                                       devargs->virtual.drv_name);
+                                       devargs->virt.drv_name);
                        return -1;
                }
        }
lib/librte_eal/common/eal_common_devargs.c +4 -4
index ec56165..5d075d0 100644
@@ -107,9 +107,9 @@ rte_eal_devargs_add(enum rte_devtype devtype, const char *devargs_str)
                break;
        case RTE_DEVTYPE_VIRTUAL:
                /* save driver name */
-               ret = snprintf(devargs->virtual.drv_name,
-                              sizeof(devargs->virtual.drv_name), "%s", buf);
-               if (ret < 0 || ret >= (int)sizeof(devargs->virtual.drv_name))
+               ret = snprintf(devargs->virt.drv_name,
+                              sizeof(devargs->virt.drv_name), "%s", buf);
+               if (ret < 0 || ret >= (int)sizeof(devargs->virt.drv_name))
                        goto fail;
 
                break;
@@ -169,7 +169,7 @@ rte_eal_devargs_dump(FILE *f)
                               devargs->args);
                else if (devargs->type == RTE_DEVTYPE_VIRTUAL)
                        fprintf(f, "  VIRTUAL %s %s\n",
-                              devargs->virtual.drv_name,
+                              devargs->virt.drv_name,
                               devargs->args);
                else
                        fprintf(f, "  UNKNOWN %s\n", devargs->args);
lib/librte_eal/common/include/rte_devargs.h +1 -2
index 7084ae2..53c59f5 100644
@@ -86,7 +86,7 @@ struct rte_devargs {
                struct {
                        /** Driver name. */
                        char drv_name[32];
-               } virtual;
+               } virt;
        };
        /** Arguments string as given by user or "" for no argument. */
        char *args;
--

2.5.3

Signature · 1 line
echo mailto: NOSPAM !#$.'<*>'|sed 's. ..'|tr "<*> !#:2" org@fr33z3
Acked-by on v1 1/1
#4 lore raw
In reply to Christoph Gysin
Quoted 16 lines

-----Original Message-----
From: dev [mailto:[email protected]] On Behalf Of Christoph Gysin
Sent: Tuesday, September 29, 2015 7:53 AM
To: [email protected]
Subject: [dpdk-dev] [PATCH] eal: fix C++ build (struct member: virtual)

'virtual' is a keyword and can't be used if the code is to compile with C++ compilers.

If rte_devargs.h was included in C++ code, compilation with clang++ failed with an error. g++ did not fail, but only because of a bug that treats it as an anonymous struct with a decl-specifier which it ignores.

Quoted 4 lines

This simply renames the member to 'virt'.

---

Christoph, please also copy David Marchand for further updates of this patch, as David is the maintainer of this component. Whenever in doubt about the maintainer, you can check file MAINTAINERS from DPDK root folder.

Regards,
Cristian

#5 lore raw

Hi David

Is there anything I can do to help getting this merged?

Thanks,
Chris

Quoted 28 lines · Cristian
Quoted 16 lines

-----Original Message-----
From: dev [mailto:[email protected]] On Behalf Of Christoph Gysin
Sent: Tuesday, September 29, 2015 7:53 AM
To: [email protected]
Subject: [dpdk-dev] [PATCH] eal: fix C++ build (struct member: virtual)

'virtual' is a keyword and can't be used if the code is to compile with C++ compilers.

If rte_devargs.h was included in C++ code, compilation with clang++ failed with an error. g++ did not fail, but only because of a bug that treats it as an anonymous struct with a decl-specifier which it ignores.

Quoted 4 lines

This simply renames the member to 'virt'.

---

Christoph, please also copy David Marchand for further updates of this patch, as David is the maintainer of this component. Whenever in doubt about the maintainer, you can check file MAINTAINERS from DPDK root folder.

Regards,
Cristian

Signature · 1 line
echo mailto: NOSPAM !#$.'<*>'|sed 's. ..'|tr "<*> !#:2" org@fr33z3
#6 lore raw

Hello Christoph,

On Tue, Oct 13, 2015 at 11:10 AM, Christoph Gysin <[email protected]

Quoted 5 lines

wrote:

Is there anything I can do to help getting this merged?

This is ok for me, cc-ing Thomas.

Signature · 1 line
David Marchand
#7 lore raw
Quoted 11 lines · David Marchand

Hello Christoph,

Quoted 3 lines · Christoph Gysin

Is there anything I can do to help getting this merged?

This is ok for me, cc-ing Thomas.

Thought I already did, but just in case,

Signature · 1 line
David Marchand
#8 lore raw

2015-10-13 14:23, David Marchand:

Quoted 8 lines

On Tue, Oct 13, 2015 at 11:13 AM, David Marchand <[email protected]>

Quoted 4 lines
Quoted 1 line · [email protected]> wrote:

Is there anything I can do to help getting this merged?

This is ok for me, cc-ing Thomas.

Thought I already did, but just in case,

Applied, thanks
The release notes has been updated to notify the API change.