External/libvirt
1
0
Fork 0
Code

netdev: Use automatic mutex management

Browse Source 
Signed-off-by: Tim Wiederhake <twiederh@redhat.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
This commit is contained in:
Tim Wiederhake 2022-02-16 16:15:02 +01:00
parent 72adccb10e
commit 79e6bf3c45
1 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/util/virnetdev.c
View File

@ -3568,12 +3568,10 @@ virNetDevReserveName(const char *name)
idstr = name + strlen(virNetDevGenNames[type].prefix); idstr = name + strlen(virNetDevGenNames[type].prefix);
if (virStrToLong_ui(idstr, NULL, 10, &id) >= 0) { if (virStrToLong_ui(idstr, NULL, 10, &id) >= 0) {
virMutexLock(&virNetDevGenNames[type].mutex); VIR_LOCK_GUARD lock = virLockGuardLock(&virNetDevGenNames[type].mutex);
if (virNetDevGenNames[type].lastID < (int)id) if (virNetDevGenNames[type].lastID < (int)id)
virNetDevGenNames[type].lastID = id; virNetDevGenNames[type].lastID = id;
virMutexUnlock(&virNetDevGenNames[type].mutex);
} }
} }
@ -3599,7 +3597,6 @@ virNetDevReserveName(const char *name)
int int
virNetDevGenerateName(char **ifname, virNetDevGenNameType type) virNetDevGenerateName(char **ifname, virNetDevGenNameType type)
{ {
int id;
const char *prefix = virNetDevGenNames[type].prefix; const char *prefix = virNetDevGenNames[type].prefix;
double maxIDd = pow(10, IFNAMSIZ - 1 - strlen(prefix)); double maxIDd = pow(10, IFNAMSIZ - 1 - strlen(prefix));
int maxID = INT_MAX; int maxID = INT_MAX;
@ -3617,16 +3614,15 @@ virNetDevGenerateName(char **ifname, virNetDevGenNameType type)
do { do {
g_autofree char *try = NULL; g_autofree char *try = NULL;
int id = 0;
virMutexLock(&virNetDevGenNames[type].mutex); VIR_WITH_OBJECT_LOCK_GUARD(&virNetDevGenNames[type].mutex) {
id = ++virNetDevGenNames[type].lastID;
id = ++virNetDevGenNames[type].lastID; /* reset before overflow */
if (virNetDevGenNames[type].lastID >= maxID)
/* reset before overflow */ virNetDevGenNames[type].lastID = -1;
if (virNetDevGenNames[type].lastID >= maxID) }
virNetDevGenNames[type].lastID = -1;
virMutexUnlock(&virNetDevGenNames[type].mutex);
if (*ifname) if (*ifname)
try = g_strdup_printf(*ifname, id); try = g_strdup_printf(*ifname, id);