aboutsummaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authorThomas Huth <thuth@redhat.com>2021-02-15 10:02:25 +0100
committerLaurent Vivier <laurent@vivier.eu>2021-03-09 21:47:45 +0100
commit27eb3722e439ccf7ef37ec39592acc9ebc5c687f (patch)
treeac6323fadca53d83eecc870027ea0b4a47f4720c /net
parent33b2b388a54e69ba307356eb8cfdd9894112ae3f (diff)
downloadqemu-27eb3722e439ccf7ef37ec39592acc9ebc5c687f.zip
qemu-27eb3722e439ccf7ef37ec39592acc9ebc5c687f.tar.gz
qemu-27eb3722e439ccf7ef37ec39592acc9ebc5c687f.tar.bz2
net: Use id_generate() in the network subsystem, too
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>
Diffstat (limited to 'net')
-rw-r--r--net/net.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/net/net.c b/net/net.c
index fb7b7dc..ca30df9 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);
}