colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

libnm: change "sriov.preserve-on-down" symbols version to 1.54

Browse Source 
The "sriov.preserve-on-down" libnm symbols were backported to the 1.54
branch before the final release. Change their version on main to be
"1.54".

https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/merge_requests/2229
This commit is contained in:
Beniamino Galvani
2025-06-24 09:54:27 +02:00
parent 7bb898fa12
commit 5ab04c8f56
4 changed files with 9 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
NEWS
View File

@@ -9,10 +9,6 @@ the later release.
USE AT YOUR OWN RISK. NOT RECOMMENDED FOR PRODUCTION USE! USE AT YOUR OWN RISK. NOT RECOMMENDED FOR PRODUCTION USE!
* nmcli now supports viewing and managing WireGuard peers. * nmcli now supports viewing and managing WireGuard peers.
* Add a new "sriov.preserve-on-down" property that controls whether
NetworkManager preserves the SR-IOV parameters set on the device
when the connection is deactivated, or whether it resets them to
their default value.
============================================= =============================================
NetworkManager-1.54 NetworkManager-1.54
@@ -28,6 +24,10 @@ Overview of changes since NetworkManager-1.52
* Add support for configuring the loopback interface in nmtui. * Add support for configuring the loopback interface in nmtui.
* Most of the properties of ovs-bridge and ovs-port connections can * Most of the properties of ovs-bridge and ovs-port connections can
now be reapplied at runtime without bringing the connection down. now be reapplied at runtime without bringing the connection down.
* Add a new "sriov.preserve-on-down" property that controls whether
NetworkManager preserves the SR-IOV parameters set on the device
when the connection is deactivated, or whether it resets them to
their default value.
============================================= =============================================
NetworkManager-1.52 NetworkManager-1.52

6
src/libnm-client-impl/libnm.ver
View File

@@ -2073,10 +2073,6 @@ global:
nm_setting_prefix_delegation_get_subnet_id; nm_setting_prefix_delegation_get_subnet_id;
nm_setting_prefix_delegation_get_type; nm_setting_prefix_delegation_get_type;
nm_setting_prefix_delegation_new; nm_setting_prefix_delegation_new;
} libnm_1_52_0;
libnm_1_56_0 {
global:
nm_setting_sriov_get_preserve_on_down; nm_setting_sriov_get_preserve_on_down;
nm_sriov_preserve_on_down_get_type; nm_sriov_preserve_on_down_get_type;
} libnm_1_54_0; } libnm_1_52_0;

4
src/libnm-core-impl/nm-setting-sriov.c
View File

@@ -834,7 +834,7 @@ nm_setting_sriov_clear_vfs(NMSettingSriov *setting)
* *
* Returns: the value contained in the #NMSettingSriov:preserve-on-down property. * Returns: the value contained in the #NMSettingSriov:preserve-on-down property.
* *
* Since: 1.56 * Since: 1.54
*/ */
NMSriovPreserveOnDown NMSriovPreserveOnDown
nm_setting_sriov_get_preserve_on_down(NMSettingSriov *setting) nm_setting_sriov_get_preserve_on_down(NMSettingSriov *setting)
@@ -1496,7 +1496,7 @@ nm_setting_sriov_class_init(NMSettingSriovClass *klass)
* looks up a global default value in the configuration; in case no such value is * looks up a global default value in the configuration; in case no such value is
* defined, it uses %NM_SRIOV_PRESERVE_ON_DOWN_NO as fallback. * defined, it uses %NM_SRIOV_PRESERVE_ON_DOWN_NO as fallback.
* *
* Since: 1.56 * Since: 1.54
*/ */
_nm_setting_property_define_direct_enum(properties_override, _nm_setting_property_define_direct_enum(properties_override,
obj_properties, obj_properties,

4
src/libnm-core-public/nm-setting-sriov.h
View File

@@ -65,7 +65,7 @@ typedef enum {
* @NM_SRIOV_PRESERVE_ON_DOWN_YES: preserve the SR-IOV parameters set on * @NM_SRIOV_PRESERVE_ON_DOWN_YES: preserve the SR-IOV parameters set on
* the device when the connection is deactivated * the device when the connection is deactivated
* *
* Since: 1.56 * Since: 1.54
*/ */
typedef enum { typedef enum {
NM_SRIOV_PRESERVE_ON_DOWN_DEFAULT = -1, NM_SRIOV_PRESERVE_ON_DOWN_DEFAULT = -1,
@@ -140,7 +140,7 @@ NM_AVAILABLE_IN_1_14
gboolean nm_setting_sriov_remove_vf_by_index(NMSettingSriov *setting, guint index); gboolean nm_setting_sriov_remove_vf_by_index(NMSettingSriov *setting, guint index);
NM_AVAILABLE_IN_1_14 NM_AVAILABLE_IN_1_14
void nm_setting_sriov_clear_vfs(NMSettingSriov *setting); void nm_setting_sriov_clear_vfs(NMSettingSriov *setting);
NM_AVAILABLE_IN_1_56 NM_AVAILABLE_IN_1_54
NMSriovPreserveOnDown nm_setting_sriov_get_preserve_on_down(NMSettingSriov *setting); NMSriovPreserveOnDown nm_setting_sriov_get_preserve_on_down(NMSettingSriov *setting);
NM_AVAILABLE_IN_1_14 NM_AVAILABLE_IN_1_14
NMTernary nm_setting_sriov_get_autoprobe_drivers(NMSettingSriov *setting); NMTernary nm_setting_sriov_get_autoprobe_drivers(NMSettingSriov *setting);