External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-02-08 20:51:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

vboxDumpNetwork: use virMacAddrParseHex

Browse Source 
Use the virMacAddrParse helper that does not require colon-separated
values instead of using extra code to format it that way.

Signed-off-by: Ján Tomko <jtomko@redhat.com>
This commit is contained in:
Ján Tomko 2018-02-23 14:31:50 +01:00
parent 4226024bfb
commit 6a4b096c66
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/vbox/vbox_common.c
View File

@ -3701,7 +3701,6 @@ vboxDumpNetwork(vboxDriverPtr data, INetworkAdapter *adapter)
PRUint32 adapterType = NetworkAdapterType_Null; PRUint32 adapterType = NetworkAdapterType_Null;
PRUnichar *MACAddressUtf16 = NULL; PRUnichar *MACAddressUtf16 = NULL;
char *MACAddress = NULL; char *MACAddress = NULL;
char macaddr[VIR_MAC_STRING_BUFLEN] = {0};
virDomainNetDefPtr net = NULL; virDomainNetDefPtr net = NULL;
if (VIR_ALLOC(net) < 0) if (VIR_ALLOC(net) < 0)
@ -3780,18 +3779,19 @@ vboxDumpNetwork(vboxDriverPtr data, INetworkAdapter *adapter)
gVBoxAPI.UINetworkAdapter.GetMACAddress(adapter, &MACAddressUtf16); gVBoxAPI.UINetworkAdapter.GetMACAddress(adapter, &MACAddressUtf16);
VBOX_UTF16_TO_UTF8(MACAddressUtf16, &MACAddress); VBOX_UTF16_TO_UTF8(MACAddressUtf16, &MACAddress);
snprintf(macaddr, VIR_MAC_STRING_BUFLEN,
"%c%c:%c%c:%c%c:%c%c:%c%c:%c%c",
MACAddress[0], MACAddress[1], MACAddress[2], MACAddress[3],
MACAddress[4], MACAddress[5], MACAddress[6], MACAddress[7],
MACAddress[8], MACAddress[9], MACAddress[10], MACAddress[11]);
/* XXX some real error handling here some day ... */
ignore_value(virMacAddrParse(macaddr, &net->mac));
VBOX_UTF16_FREE(MACAddressUtf16); VBOX_UTF16_FREE(MACAddressUtf16);
if (virMacAddrParseHex(MACAddress, &net->mac) < 0) {
VBOX_UTF8_FREE(MACAddress);
goto error;
}
VBOX_UTF8_FREE(MACAddress); VBOX_UTF8_FREE(MACAddress);
return net; return net;
error:
virDomainNetDefFree(net);
return NULL;
} }
static int static int