summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFernando Fernandez Mancera <ffmancera@riseup.net>2020-11-17 18:49:51 +0100
committerThomas Haller <thaller@redhat.com>2020-11-18 10:21:57 +0100
commitf40ec3344d6805d0804eeb69929e326e3a4a8f01 (patch)
treeffab01e6baa4fc825ac13c10b581e058a8456a66
parent23972add8c8a09868827432def4170bb91c07c56 (diff)
downloadNetworkManager-f40ec3344d6805d0804eeb69929e326e3a4a8f01.tar.gz
utils: introduce new NML_DBUS_META_INTERFACE_PRIO_INSTANTIATE_20
This patch is replacing NML_DBUS_META_INTERFACE_PRIO_INSTANTIATE_LOW with NML_DBUS_META_INTERFACE_PRIO_INSTANTIATE_10 and NML_DBUS_META_INTERFACE_PRIO_INSTANTIATE_HIGH with NML_DBUS_META_INTERFACE_PRIO_INSTANTIATE_30. In addition it is introducing NML_DBUS_META_INTERFACE_PRIO_INSTANTIATE_20 which is a middle point between the existing priorities. This new priority is needed due to Veth support incoming. It will be used to prevent the creation a NMDeviceWired instance. Signed-off-by: Fernando Fernandez Mancera <ffmancera@riseup.net> [thaller@redhat.com: split original patch]
-rw-r--r--libnm/nm-libnm-utils.h3
-rw-r--r--libnm/tests/test-libnm.c1
2 files changed, 3 insertions, 1 deletions
diff --git a/libnm/nm-libnm-utils.h b/libnm/nm-libnm-utils.h
index 963fe70e77..def9e6ddab 100644
--- a/libnm/nm-libnm-utils.h
+++ b/libnm/nm-libnm-utils.h
@@ -224,7 +224,8 @@ typedef enum {
NML_DBUS_META_INTERFACE_PRIO_NMCLIENT = 1,
NML_DBUS_META_INTERFACE_PRIO_PARENT_TYPE = 2,
NML_DBUS_META_INTERFACE_PRIO_INSTANTIATE_10 = 3,
- NML_DBUS_META_INTERFACE_PRIO_INSTANTIATE_30 = 4,
+ NML_DBUS_META_INTERFACE_PRIO_INSTANTIATE_20 = 4,
+ NML_DBUS_META_INTERFACE_PRIO_INSTANTIATE_30 = 5,
} NMLDBusMetaInteracePrio;
/*****************************************************************************/
diff --git a/libnm/tests/test-libnm.c b/libnm/tests/test-libnm.c
index 64f1a4c349..06f0d5bd4f 100644
--- a/libnm/tests/test-libnm.c
+++ b/libnm/tests/test-libnm.c
@@ -2825,6 +2825,7 @@ test_nml_dbus_meta(void)
NML_DBUS_META_INTERFACE_PRIO_NMCLIENT,
NML_DBUS_META_INTERFACE_PRIO_PARENT_TYPE,
NML_DBUS_META_INTERFACE_PRIO_INSTANTIATE_10,
+ NML_DBUS_META_INTERFACE_PRIO_INSTANTIATE_20,
NML_DBUS_META_INTERFACE_PRIO_INSTANTIATE_30));
g_assert(mif->get_type_fcn);