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: netlink: Replace virNetDevPutExtraHeader with nlmsg_append

Browse Source 
nlmsg_append from the libnl library provides exactly the same
functionality, so we should rely on that instead. This also allows us to
drop the aforementioned function completely.

Signed-off-by: Shi Lei <shi_lei@massclouds.com>
Reviewed-by: Erik Skultety <eskultet@redhat.com>
This commit is contained in:
Shi Lei 2018-09-07 16:14:46 +08:00 committed by Erik Skultety
parent f9a59e051c
commit 74cd6a538d
1 changed files with 12 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
src/util/virnetdev.c
View File

@ -3163,28 +3163,6 @@ virNetDevGetEthtoolFeatures(virBitmapPtr bitmap,
# if HAVE_DECL_DEVLINK_CMD_ESWITCH_GET # if HAVE_DECL_DEVLINK_CMD_ESWITCH_GET
/**
* virNetDevPutExtraHeader
* reserve and prepare room for an extra header
* This function sets to zero the room that is required to put the extra
* header after the initial Netlink header. This function also increases
* the nlmsg_len field.
*
* @nlh: pointer to Netlink header
* @size: size of the extra header that we want to put
*
* Returns pointer to the start of the extended header
*/
static void *
virNetDevPutExtraHeader(struct nlmsghdr *nlh,
size_t size)
{
char *ptr = (char *)nlh + nlh->nlmsg_len;
size_t len = NLMSG_ALIGN(size);
nlh->nlmsg_len += len;
return ptr;
}
/** /**
* virNetDevGetFamilyId: * virNetDevGetFamilyId:
@ -3199,7 +3177,11 @@ virNetDevGetFamilyId(const char *family_name)
{ {
struct nl_msg *nl_msg = NULL; struct nl_msg *nl_msg = NULL;
struct nlmsghdr *resp = NULL; struct nlmsghdr *resp = NULL;
struct genlmsghdr* gmsgh = NULL; struct genlmsghdr gmsgh = {
.cmd = CTRL_CMD_GETFAMILY,
.version = DEVLINK_GENL_VERSION,
.reserved = 0,
};
struct nlattr *tb[CTRL_ATTR_MAX + 1] = {NULL, }; struct nlattr *tb[CTRL_ATTR_MAX + 1] = {NULL, };
unsigned int recvbuflen; unsigned int recvbuflen;
uint32_t family_id = 0; uint32_t family_id = 0;
@ -3210,12 +3192,9 @@ virNetDevGetFamilyId(const char *family_name)
goto cleanup; goto cleanup;
} }
if (!(gmsgh = virNetDevPutExtraHeader(nlmsg_hdr(nl_msg), sizeof(struct genlmsghdr)))) if (nlmsg_append(nl_msg, &gmsgh, sizeof(gmsgh), NLMSG_ALIGNTO) < 0)
goto cleanup; goto cleanup;
gmsgh->cmd = CTRL_CMD_GETFAMILY;
gmsgh->version = DEVLINK_GENL_VERSION;
if (nla_put_string(nl_msg, CTRL_ATTR_FAMILY_NAME, family_name) < 0) { if (nla_put_string(nl_msg, CTRL_ATTR_FAMILY_NAME, family_name) < 0) {
virReportError(VIR_ERR_INTERNAL_ERROR, "%s", virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
_("allocated netlink buffer is too small")); _("allocated netlink buffer is too small"));
@ -3262,7 +3241,11 @@ virNetDevSwitchdevFeature(const char *ifname,
unsigned int recvbuflen; unsigned int recvbuflen;
struct nlattr *tb[DEVLINK_ATTR_MAX + 1] = {NULL, }; struct nlattr *tb[DEVLINK_ATTR_MAX + 1] = {NULL, };
virPCIDevicePtr pci_device_ptr = NULL; virPCIDevicePtr pci_device_ptr = NULL;
struct genlmsghdr* gmsgh = NULL; struct genlmsghdr gmsgh = {
.cmd = DEVLINK_CMD_ESWITCH_GET,
.version = DEVLINK_GENL_VERSION,
.reserved = 0,
};
const char *pci_name; const char *pci_name;
char *pfname = NULL; char *pfname = NULL;
int is_vf = -1; int is_vf = -1;
@ -3292,12 +3275,9 @@ virNetDevSwitchdevFeature(const char *ifname,
goto cleanup; goto cleanup;
} }
if (!(gmsgh = virNetDevPutExtraHeader(nlmsg_hdr(nl_msg), sizeof(struct genlmsghdr)))) if (nlmsg_append(nl_msg, &gmsgh, sizeof(gmsgh), NLMSG_ALIGNTO) < 0)
goto cleanup; goto cleanup;
gmsgh->cmd = DEVLINK_CMD_ESWITCH_GET;
gmsgh->version = DEVLINK_GENL_VERSION;
pci_name = virPCIDeviceGetName(pci_device_ptr); pci_name = virPCIDeviceGetName(pci_device_ptr);
if (nla_put(nl_msg, DEVLINK_ATTR_BUS_NAME, strlen("pci")+1, "pci") < 0 || if (nla_put(nl_msg, DEVLINK_ATTR_BUS_NAME, strlen("pci")+1, "pci") < 0 ||