mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2025-02-02 09:55:18 +00:00
netlink: Fix build with libnl-3
Commit 642973135c54b93242c4548ef27d591b52b0994c added three direct references to nl_handle_* instead of using our aliases which hide differences between libnl-3 and libnl-1.
This commit is contained in:
parent
b736e72255
commit
d9d39e6209
@ -98,7 +98,7 @@ static int nextWatch = 1;
|
|||||||
# define NETLINK_EVENT_ALLOC_EXTENT 10
|
# define NETLINK_EVENT_ALLOC_EXTENT 10
|
||||||
|
|
||||||
static virNetlinkEventSrvPrivatePtr server = NULL;
|
static virNetlinkEventSrvPrivatePtr server = NULL;
|
||||||
static struct nl_handle *placeholder_nlhandle = NULL;
|
static virNetlinkHandle *placeholder_nlhandle = NULL;
|
||||||
|
|
||||||
/* Function definitions */
|
/* Function definitions */
|
||||||
|
|
||||||
@ -130,7 +130,7 @@ virNetlinkStartup(void)
|
|||||||
{
|
{
|
||||||
if (placeholder_nlhandle)
|
if (placeholder_nlhandle)
|
||||||
return 0;
|
return 0;
|
||||||
placeholder_nlhandle = nl_handle_alloc();
|
placeholder_nlhandle = virNetlinkAlloc();
|
||||||
if (!placeholder_nlhandle) {
|
if (!placeholder_nlhandle) {
|
||||||
virReportSystemError(errno, "%s",
|
virReportSystemError(errno, "%s",
|
||||||
_("cannot allocate placeholder nlhandle for netlink"));
|
_("cannot allocate placeholder nlhandle for netlink"));
|
||||||
@ -149,7 +149,7 @@ void
|
|||||||
virNetlinkShutdown(void)
|
virNetlinkShutdown(void)
|
||||||
{
|
{
|
||||||
if (placeholder_nlhandle) {
|
if (placeholder_nlhandle) {
|
||||||
nl_handle_destroy(placeholder_nlhandle);
|
virNetlinkFree(placeholder_nlhandle);
|
||||||
placeholder_nlhandle = NULL;
|
placeholder_nlhandle = NULL;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user