Replace a dumb function in commands-bsd.c by the code of HW address getting.
Reviewed-by: Marc-André Lureau <marcandre.lur...@redhat.com> Signed-off-by: Alexander Ivanov <alexander.iva...@virtuozzo.com> --- qga/commands-bsd.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/qga/commands-bsd.c b/qga/commands-bsd.c index 40f7ec7600..5f423a4710 100644 --- a/qga/commands-bsd.c +++ b/qga/commands-bsd.c @@ -20,6 +20,8 @@ #include <sys/param.h> #include <sys/ucred.h> #include <sys/mount.h> +#include <net/if_dl.h> +#include <net/ethernet.h> #include <paths.h> #if defined(CONFIG_FSFREEZE) || defined(CONFIG_FSTRIM) @@ -179,7 +181,19 @@ GuestCpuStatsList *qmp_guest_get_cpustats(Error **errp) int guest_get_hw_addr(struct ifaddrs *ifa, unsigned char *buf, bool *obtained, Error **errp) { + struct sockaddr_dl *sdp; + *obtained = false; + if (ifa->ifa_addr->sa_family != AF_LINK) { + /* We can get HW address only for AF_LINK family. */ + g_debug("failed to get MAC address of %s", ifa->ifa_name); + return 0; + } + + sdp = (struct sockaddr_dl *)ifa->ifa_addr; + memcpy(buf, sdp->sdl_data + sdp->sdl_nlen, ETHER_ADDR_LEN); + *obtained = true; + return 0; } #endif /* HAVE_GETIFADDRS */ -- 2.34.1