[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 08/22] net: Use id_generate() in the network subsystem, too
From: |
Laurent Vivier |
Subject: |
[PULL 08/22] net: Use id_generate() in the network subsystem, too |
Date: |
Wed, 10 Mar 2021 22:44:50 +0100 |
From: Thomas Huth <thuth@redhat.com>
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>
Message-Id: <20210215090225.1046239-1-thuth@redhat.com>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
---
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 b55c406e69db..46b759b284f3 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 fb7b7dcc2528..ca30df963d77 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 5addb4460ea0..ded41c5025e4 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.29.2
- [PULL 00/22] Trivial branch for 6.0 patches, Laurent Vivier, 2021/03/10
- [PULL 03/22] hw/elf_ops: Fix a typo, Laurent Vivier, 2021/03/10
- [PULL 01/22] Various spelling fixes, Laurent Vivier, 2021/03/10
- [PULL 07/22] MAINTAINERS: Fix the location of tools manuals, Laurent Vivier, 2021/03/10
- [PULL 02/22] scsi: Silence gcc warning, Laurent Vivier, 2021/03/10
- [PULL 06/22] vhost_user_gpu: Drop dead check for g_malloc() failure, Laurent Vivier, 2021/03/10
- [PULL 05/22] backends/dbus-vmstate: Fix short read error handling, Laurent Vivier, 2021/03/10
- [PULL 08/22] net: Use id_generate() in the network subsystem, too,
Laurent Vivier <=
- [PULL 09/22] fuzz-test: remove unneccessary debugging flags, Laurent Vivier, 2021/03/10
- [PULL 10/22] exec/memory: Use struct Object typedef, Laurent Vivier, 2021/03/10
- [PULL 11/22] virtio-gpu: Adjust code space style, Laurent Vivier, 2021/03/10
- [PULL 04/22] target/hexagon/gen_tcg_funcs: Fix a typo, Laurent Vivier, 2021/03/10
- [PULL 12/22] ui: Replace the word 'whitelist', Laurent Vivier, 2021/03/10
- [PULL 18/22] hw/lm32/Kconfig: Introduce CONFIG_LM32_EVR for lm32-evr/uclinux boards, Laurent Vivier, 2021/03/10
- [PULL 14/22] seccomp: Replace the word 'blacklist', Laurent Vivier, 2021/03/10
- [PULL 13/22] scripts/tracetool: Replace the word 'whitelist', Laurent Vivier, 2021/03/10
- [PULL 17/22] qemu-common.h: Update copyright string to 2021, Laurent Vivier, 2021/03/10
- [PULL 15/22] qemu-options: Replace the word 'blacklist', Laurent Vivier, 2021/03/10