External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-03-20 07:59:00 +00:00
Code

util: provide non-netlink/libnl alternative for virNetDevGetMaster()

Browse Source 
Lack of this one function (which is called for each active tap device
every time libvirtd is started) is the one thing preventing a
"WITHOUT_LIBNL" build of libvirt from being useful. With this
alternate implementation, guests using standard tap devices will work
properly even when libvirt is built without libnl support.

Signed-off-by: Laine Stump <laine@redhat.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
This commit is contained in:
Laine Stump 2020-09-30 17:56:00 -04:00
parent 717615856c
commit 49a58cb9c9
1 changed files with 22 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/util/virnetdev.c
View File

@ -915,10 +915,31 @@ virNetDevGetMaster(const char *ifname, char **master)
return 0; return 0;
} }
#elif defined(__linux__)
/* libnl isn't available, so we can't use netlink.
* Fall back to using sysfs
*/
int
virNetDevGetMaster(const char *ifname, char **master)
{
g_autofree char *path = NULL;
g_autofree char *canonical = NULL;
if (virNetDevSysfsFile(&path, ifname, "master") < 0)
return -1;
if (!(canonical = virFileCanonicalizePath(path)))
return -1;
*master = g_path_get_basename(canonical);
VIR_DEBUG("IFLA_MASTER for %s is %s", ifname, *master ? *master : "(none)");
return 0;
}
#else #else
int int
virNetDevGetMaster(const char *ifname G_GNUC_UNUSED, virNetDevGetMaster(const char *ifname G_GNUC_UNUSED,
char **master G_GNUC_UNUSED) char **master G_GNUC_UNUSED)