* [PATCH] net: Use id_generate() in the network subsystem, too
@ 2021-02-15 9:02 Thomas Huth
2021-02-15 21:28 ` Marc-André Lureau
2021-03-09 20:48 ` Laurent Vivier
0 siblings, 2 replies; 3+ messages in thread
From: Thomas Huth @ 2021-02-15 9:02 UTC (permalink / raw)
To: Jason Wang, qemu-devel; +Cc: qemu-trivial, Markus Armbruster
We already got a global function called id_generate() to create unique
IDs within QEMU. Let's use it in the network subsytem, too, instead of
inventing our own ID scheme here.
Signed-off-by: Thomas Huth <thuth@redhat.com>
---
include/qemu/id.h | 1 +
net/net.c | 6 +++---
util/id.c | 1 +
3 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/include/qemu/id.h b/include/qemu/id.h
index b55c406e69..46b759b284 100644
--- a/include/qemu/id.h
+++ b/include/qemu/id.h
@@ -5,6 +5,7 @@ typedef enum IdSubSystems {
ID_QDEV,
ID_BLOCK,
ID_CHR,
+ ID_NET,
ID_MAX /* last element, used as array size */
} IdSubSystems;
diff --git a/net/net.c b/net/net.c
index fb7b7dcc25..ca30df963d 100644
--- a/net/net.c
+++ b/net/net.c
@@ -43,6 +43,7 @@
#include "qemu/cutils.h"
#include "qemu/config-file.h"
#include "qemu/ctype.h"
+#include "qemu/id.h"
#include "qemu/iov.h"
#include "qemu/qemu-print.h"
#include "qemu/main-loop.h"
@@ -1111,8 +1112,7 @@ static int net_client_init(QemuOpts *opts, bool is_netdev, Error **errp)
/* Create an ID for -net if the user did not specify one */
if (!is_netdev && !qemu_opts_id(opts)) {
- static int idx;
- qemu_opts_set_id(opts, g_strdup_printf("__org.qemu.net%i", idx++));
+ qemu_opts_set_id(opts, id_generate(ID_NET));
}
if (visit_type_Netdev(v, NULL, &object, errp)) {
@@ -1467,7 +1467,7 @@ static int net_param_nic(void *dummy, QemuOpts *opts, Error **errp)
/* Create an ID if the user did not specify one */
nd_id = g_strdup(qemu_opts_id(opts));
if (!nd_id) {
- nd_id = g_strdup_printf("__org.qemu.nic%i", idx);
+ nd_id = id_generate(ID_NET);
qemu_opts_set_id(opts, nd_id);
}
diff --git a/util/id.c b/util/id.c
index 5addb4460e..ded41c5025 100644
--- a/util/id.c
+++ b/util/id.c
@@ -35,6 +35,7 @@ static const char *const id_subsys_str[ID_MAX] = {
[ID_QDEV] = "qdev",
[ID_BLOCK] = "block",
[ID_CHR] = "chr",
+ [ID_NET] = "net",
};
/*
--
2.27.0
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH] net: Use id_generate() in the network subsystem, too
2021-02-15 9:02 [PATCH] net: Use id_generate() in the network subsystem, too Thomas Huth
@ 2021-02-15 21:28 ` Marc-André Lureau
2021-03-09 20:48 ` Laurent Vivier
1 sibling, 0 replies; 3+ messages in thread
From: Marc-André Lureau @ 2021-02-15 21:28 UTC (permalink / raw)
To: Thomas Huth; +Cc: qemu trival, Jason Wang, QEMU, Markus Armbruster
[-- Attachment #1: Type: text/plain, Size: 2424 bytes --]
On Mon, Feb 15, 2021 at 1:03 PM Thomas Huth <thuth@redhat.com> wrote:
> We already got a global function called id_generate() to create unique
> IDs within QEMU. Let's use it in the network subsytem, too, instead of
> inventing our own ID scheme here.
>
> Signed-off-by: Thomas Huth <thuth@redhat.com>
>
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
---
> include/qemu/id.h | 1 +
> net/net.c | 6 +++---
> util/id.c | 1 +
> 3 files changed, 5 insertions(+), 3 deletions(-)
>
> diff --git a/include/qemu/id.h b/include/qemu/id.h
> index b55c406e69..46b759b284 100644
> --- a/include/qemu/id.h
> +++ b/include/qemu/id.h
> @@ -5,6 +5,7 @@ typedef enum IdSubSystems {
> ID_QDEV,
> ID_BLOCK,
> ID_CHR,
> + ID_NET,
> ID_MAX /* last element, used as array size */
> } IdSubSystems;
>
> diff --git a/net/net.c b/net/net.c
> index fb7b7dcc25..ca30df963d 100644
> --- a/net/net.c
> +++ b/net/net.c
> @@ -43,6 +43,7 @@
> #include "qemu/cutils.h"
> #include "qemu/config-file.h"
> #include "qemu/ctype.h"
> +#include "qemu/id.h"
> #include "qemu/iov.h"
> #include "qemu/qemu-print.h"
> #include "qemu/main-loop.h"
> @@ -1111,8 +1112,7 @@ static int net_client_init(QemuOpts *opts, bool
> is_netdev, Error **errp)
>
> /* Create an ID for -net if the user did not specify one */
> if (!is_netdev && !qemu_opts_id(opts)) {
> - static int idx;
> - qemu_opts_set_id(opts, g_strdup_printf("__org.qemu.net%i",
> idx++));
> + qemu_opts_set_id(opts, id_generate(ID_NET));
> }
>
> if (visit_type_Netdev(v, NULL, &object, errp)) {
> @@ -1467,7 +1467,7 @@ static int net_param_nic(void *dummy, QemuOpts
> *opts, Error **errp)
> /* Create an ID if the user did not specify one */
> nd_id = g_strdup(qemu_opts_id(opts));
> if (!nd_id) {
> - nd_id = g_strdup_printf("__org.qemu.nic%i", idx);
> + nd_id = id_generate(ID_NET);
> qemu_opts_set_id(opts, nd_id);
> }
>
> diff --git a/util/id.c b/util/id.c
> index 5addb4460e..ded41c5025 100644
> --- a/util/id.c
> +++ b/util/id.c
> @@ -35,6 +35,7 @@ static const char *const id_subsys_str[ID_MAX] = {
> [ID_QDEV] = "qdev",
> [ID_BLOCK] = "block",
> [ID_CHR] = "chr",
> + [ID_NET] = "net",
> };
>
> /*
> --
> 2.27.0
>
>
>
--
Marc-André Lureau
[-- Attachment #2: Type: text/html, Size: 3534 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH] net: Use id_generate() in the network subsystem, too
2021-02-15 9:02 [PATCH] net: Use id_generate() in the network subsystem, too Thomas Huth
2021-02-15 21:28 ` Marc-André Lureau
@ 2021-03-09 20:48 ` Laurent Vivier
1 sibling, 0 replies; 3+ messages in thread
From: Laurent Vivier @ 2021-03-09 20:48 UTC (permalink / raw)
To: Thomas Huth, Jason Wang, qemu-devel; +Cc: qemu-trivial, Markus Armbruster
Le 15/02/2021 à 10:02, Thomas Huth a écrit :
> We already got a global function called id_generate() to create unique
> IDs within QEMU. Let's use it in the network subsytem, too, instead of
> inventing our own ID scheme here.
>
> Signed-off-by: Thomas Huth <thuth@redhat.com>
> ---
> include/qemu/id.h | 1 +
> net/net.c | 6 +++---
> util/id.c | 1 +
> 3 files changed, 5 insertions(+), 3 deletions(-)
>
> diff --git a/include/qemu/id.h b/include/qemu/id.h
> index b55c406e69..46b759b284 100644
> --- a/include/qemu/id.h
> +++ b/include/qemu/id.h
> @@ -5,6 +5,7 @@ typedef enum IdSubSystems {
> ID_QDEV,
> ID_BLOCK,
> ID_CHR,
> + ID_NET,
> ID_MAX /* last element, used as array size */
> } IdSubSystems;
>
> diff --git a/net/net.c b/net/net.c
> index fb7b7dcc25..ca30df963d 100644
> --- a/net/net.c
> +++ b/net/net.c
> @@ -43,6 +43,7 @@
> #include "qemu/cutils.h"
> #include "qemu/config-file.h"
> #include "qemu/ctype.h"
> +#include "qemu/id.h"
> #include "qemu/iov.h"
> #include "qemu/qemu-print.h"
> #include "qemu/main-loop.h"
> @@ -1111,8 +1112,7 @@ static int net_client_init(QemuOpts *opts, bool is_netdev, Error **errp)
>
> /* Create an ID for -net if the user did not specify one */
> if (!is_netdev && !qemu_opts_id(opts)) {
> - static int idx;
> - qemu_opts_set_id(opts, g_strdup_printf("__org.qemu.net%i", idx++));
> + qemu_opts_set_id(opts, id_generate(ID_NET));
> }
>
> if (visit_type_Netdev(v, NULL, &object, errp)) {
> @@ -1467,7 +1467,7 @@ static int net_param_nic(void *dummy, QemuOpts *opts, Error **errp)
> /* Create an ID if the user did not specify one */
> nd_id = g_strdup(qemu_opts_id(opts));
> if (!nd_id) {
> - nd_id = g_strdup_printf("__org.qemu.nic%i", idx);
> + nd_id = id_generate(ID_NET);
> qemu_opts_set_id(opts, nd_id);
> }
>
> diff --git a/util/id.c b/util/id.c
> index 5addb4460e..ded41c5025 100644
> --- a/util/id.c
> +++ b/util/id.c
> @@ -35,6 +35,7 @@ static const char *const id_subsys_str[ID_MAX] = {
> [ID_QDEV] = "qdev",
> [ID_BLOCK] = "block",
> [ID_CHR] = "chr",
> + [ID_NET] = "net",
> };
>
> /*
>
Applied to my trivial-patches branch.
Thanks,
Laurent
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2021-03-09 21:09 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-02-15 9:02 [PATCH] net: Use id_generate() in the network subsystem, too Thomas Huth
2021-02-15 21:28 ` Marc-André Lureau
2021-03-09 20:48 ` Laurent Vivier
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).