From 171f2c4ce34be0d5b61a2750375dd57dbbff293b Mon Sep 17 00:00:00 2001
From: Thomas Haller <thaller@redhat.com>
Date: Wed, 9 Nov 2022 12:21:22 +0100
Subject: [PATCH] libnm: skip "name" property for
 "gen-metadata-nm-settings-libnm-core.xml"

---
 .../gen-metadata-nm-settings-libnm-core.c     |   3 +
 ...gen-metadata-nm-settings-libnm-core.xml.in | 208 ------------------
 2 files changed, 3 insertions(+), 208 deletions(-)

diff --git a/src/libnm-core-impl/gen-metadata-nm-settings-libnm-core.c b/src/libnm-core-impl/gen-metadata-nm-settings-libnm-core.c
index 2d4f4406cb..49b9cdd51e 100644
--- a/src/libnm-core-impl/gen-metadata-nm-settings-libnm-core.c
+++ b/src/libnm-core-impl/gen-metadata-nm-settings-libnm-core.c
@@ -97,6 +97,9 @@ main(int argc, char *argv[])
         for (prop_idx = 0; prop_idx < sis->property_infos_len; prop_idx++) {
             const NMSettInfoProperty *sip = &sis->property_infos[prop_idx];
 
+            if (nm_streq(sip->name, NM_SETTING_NAME))
+                continue;
+
             g_print("%s<property", _indent_level(2 * INDENT));
             g_print(" name=%s", _xml_escape_attr(&sbuf1, sip->name));
             if (sip->is_deprecated)
diff --git a/src/libnm-core-impl/gen-metadata-nm-settings-libnm-core.xml.in b/src/libnm-core-impl/gen-metadata-nm-settings-libnm-core.xml.in
index 3fce88347d..e1bfd9d6a0 100644
--- a/src/libnm-core-impl/gen-metadata-nm-settings-libnm-core.xml.in
+++ b/src/libnm-core-impl/gen-metadata-nm-settings-libnm-core.xml.in
@@ -40,10 +40,6 @@
     <setting name="6lowpan"
              gtype="NMSetting6Lowpan"
              >
-        <property name="name"
-                  dbus-type="s"
-                  gprop-type="gchararray"
-                  />
         <property name="parent"
                   dbus-type="s"
                   gprop-type="gchararray"
@@ -60,10 +56,6 @@
                   dbus-type="ay"
                   gprop-type="gchararray"
                   />
-        <property name="name"
-                  dbus-type="s"
-                  gprop-type="gchararray"
-                  />
         <property name="ssid"
                   dbus-type="ay"
                   gprop-type="GBytes"
@@ -125,10 +117,6 @@
                   dbus-type="u"
                   gprop-type="guint"
                   />
-        <property name="name"
-                  dbus-type="s"
-                  gprop-type="gchararray"
-                  />
         <property name="powersave"
                   dbus-type="u"
                   gprop-type="guint"
@@ -191,10 +179,6 @@
                   dbus-type="s"
                   gprop-type="gchararray"
                   />
-        <property name="name"
-                  dbus-type="s"
-                  gprop-type="gchararray"
-                  />
         <property name="pairwise"
                   dbus-type="as"
                   gprop-type="GStrv"
@@ -318,10 +302,6 @@
                   dbus-type="s"
                   gprop-type="gchararray"
                   />
-        <property name="name"
-                  dbus-type="s"
-                  gprop-type="gchararray"
-                  />
         <property name="optional"
                   dbus-type="b"
                   gprop-type="gboolean"
@@ -510,10 +490,6 @@
                   dbus-type="u"
                   gprop-type="guint"
                   />
-        <property name="name"
-                  dbus-type="s"
-                  gprop-type="gchararray"
-                  />
         <property name="port"
                   dbus-type="s"
                   gprop-type="gchararray"
@@ -550,10 +526,6 @@
                   dbus-type="s"
                   gprop-type="gchararray"
                   />
-        <property name="name"
-                  dbus-type="s"
-                  gprop-type="gchararray"
-                  />
         <property name="password"
                   is-secret="1"
                   dbus-type="s"
@@ -588,10 +560,6 @@
                   dbus-type="ay"
                   gprop-type="gchararray"
                   />
-        <property name="name"
-                  dbus-type="s"
-                  gprop-type="gchararray"
-                  />
         <property name="type"
                   dbus-type="s"
                   gprop-type="gchararray"
@@ -604,10 +572,6 @@
                   dbus-type="s"
                   dbus-deprecated="1"
                   />
-        <property name="name"
-                  dbus-type="s"
-                  gprop-type="gchararray"
-                  />
         <property name="options"
                   dbus-type="a{ss}"
                   gprop-type="GHashTable"
@@ -616,10 +580,6 @@
     <setting name="bond-port"
              gtype="NMSettingBondPort"
              >
-        <property name="name"
-                  dbus-type="s"
-                  gprop-type="gchararray"
-                  />
         <property name="queue-id"
                   dbus-type="u"
                   gprop-type="guint"
@@ -713,10 +673,6 @@
                   dbus-type="t"
                   gprop-type="guint64"
                   />
-        <property name="name"
-                  dbus-type="s"
-                  gprop-type="gchararray"
-                  />
         <property name="priority"
                   dbus-type="u"
                   gprop-type="guint"
@@ -753,10 +709,6 @@
                   dbus-type="b"
                   gprop-type="gboolean"
                   />
-        <property name="name"
-                  dbus-type="s"
-                  gprop-type="gchararray"
-                  />
         <property name="path-cost"
                   dbus-type="u"
                   gprop-type="guint"
@@ -777,10 +729,6 @@
                   dbus-type="u"
                   gprop-type="guint"
                   />
-        <property name="name"
-                  dbus-type="s"
-                  gprop-type="gchararray"
-                  />
         <property name="number"
                   dbus-type="s"
                   gprop-type="gchararray"
@@ -871,10 +819,6 @@
                   dbus-type="i"
                   gprop-type="gint"
                   />
-        <property name="name"
-                  dbus-type="s"
-                  gprop-type="gchararray"
-                  />
         <property name="permissions"
                   dbus-type="as"
                   gprop-type="GStrv"
@@ -951,10 +895,6 @@
                   dbus-type="i"
                   gprop-type="gint"
                   />
-        <property name="name"
-                  dbus-type="s"
-                  gprop-type="gchararray"
-                  />
         <property name="priority-bandwidth"
                   dbus-type="au"
                   gprop-type="GArray"
@@ -991,26 +931,14 @@
     <setting name="dummy"
              gtype="NMSettingDummy"
              >
-        <property name="name"
-                  dbus-type="s"
-                  gprop-type="gchararray"
-                  />
     </setting>
     <setting name="ethtool"
              gtype="NMSettingEthtool"
              >
-        <property name="name"
-                  dbus-type="s"
-                  gprop-type="gchararray"
-                  />
     </setting>
     <setting name="generic"
              gtype="NMSettingGeneric"
              >
-        <property name="name"
-                  dbus-type="s"
-                  gprop-type="gchararray"
-                  />
     </setting>
     <setting name="gsm"
              gtype="NMSettingGsm"
@@ -1039,10 +967,6 @@
                   dbus-type="u"
                   gprop-type="guint"
                   />
-        <property name="name"
-                  dbus-type="s"
-                  gprop-type="gchararray"
-                  />
         <property name="network-id"
                   dbus-type="s"
                   gprop-type="gchararray"
@@ -1100,10 +1024,6 @@
                   dbus-type="i"
                   gprop-type="NMTernary"
                   />
-        <property name="name"
-                  dbus-type="s"
-                  gprop-type="gchararray"
-                  />
         <property name="only-from-default"
                   dbus-type="i"
                   gprop-type="NMTernary"
@@ -1124,10 +1044,6 @@
                   dbus-type="u"
                   gprop-type="guint"
                   />
-        <property name="name"
-                  dbus-type="s"
-                  gprop-type="gchararray"
-                  />
         <property name="p-key"
                   dbus-type="i"
                   gprop-type="gint"
@@ -1172,10 +1088,6 @@
                   dbus-type="u"
                   gprop-type="guint"
                   />
-        <property name="name"
-                  dbus-type="s"
-                  gprop-type="gchararray"
-                  />
         <property name="output-key"
                   dbus-type="s"
                   gprop-type="gchararray"
@@ -1300,10 +1212,6 @@
                   dbus-type="s"
                   gprop-type="gchararray"
                   />
-        <property name="name"
-                  dbus-type="s"
-                  gprop-type="gchararray"
-                  />
         <property name="never-default"
                   dbus-type="b"
                   gprop-type="gboolean"
@@ -1427,10 +1335,6 @@
                   dbus-type="u"
                   gprop-type="guint"
                   />
-        <property name="name"
-                  dbus-type="s"
-                  gprop-type="gchararray"
-                  />
         <property name="never-default"
                   dbus-type="b"
                   gprop-type="gboolean"
@@ -1492,10 +1396,6 @@
                   dbus-type="i"
                   gprop-type="gint"
                   />
-        <property name="name"
-                  dbus-type="s"
-                  gprop-type="gchararray"
-                  />
         <property name="parent"
                   dbus-type="s"
                   gprop-type="gchararray"
@@ -1520,10 +1420,6 @@
                   dbus-type="u"
                   gprop-type="guint"
                   />
-        <property name="name"
-                  dbus-type="s"
-                  gprop-type="gchararray"
-                  />
         <property name="parent"
                   dbus-type="s"
                   gprop-type="gchararray"
@@ -1552,10 +1448,6 @@
                   dbus-type="as"
                   gprop-type="GStrv"
                   />
-        <property name="name"
-                  dbus-type="s"
-                  gprop-type="gchararray"
-                  />
         <property name="path"
                   dbus-type="as"
                   gprop-type="GStrv"
@@ -1576,10 +1468,6 @@
                   dbus-type="b"
                   gprop-type="gboolean"
                   />
-        <property name="name"
-                  dbus-type="s"
-                  gprop-type="gchararray"
-                  />
         <property name="rstp-enable"
                   dbus-type="b"
                   gprop-type="gboolean"
@@ -1600,10 +1488,6 @@
                   dbus-type="u"
                   gprop-type="guint"
                   />
-        <property name="name"
-                  dbus-type="s"
-                  gprop-type="gchararray"
-                  />
     </setting>
     <setting name="ovs-external-ids"
              gtype="NMSettingOvsExternalIDs"
@@ -1612,18 +1496,10 @@
                   dbus-type="a{ss}"
                   gprop-type="GHashTable"
                   />
-        <property name="name"
-                  dbus-type="s"
-                  gprop-type="gchararray"
-                  />
     </setting>
     <setting name="ovs-interface"
              gtype="NMSettingOvsInterface"
              >
-        <property name="name"
-                  dbus-type="s"
-                  gprop-type="gchararray"
-                  />
         <property name="ofport-request"
                   dbus-type="u"
                   gprop-type="guint"
@@ -1636,10 +1512,6 @@
     <setting name="ovs-patch"
              gtype="NMSettingOvsPatch"
              >
-        <property name="name"
-                  dbus-type="s"
-                  gprop-type="gchararray"
-                  />
         <property name="peer"
                   dbus-type="s"
                   gprop-type="gchararray"
@@ -1664,10 +1536,6 @@
                   dbus-type="s"
                   gprop-type="gchararray"
                   />
-        <property name="name"
-                  dbus-type="s"
-                  gprop-type="gchararray"
-                  />
         <property name="tag"
                   dbus-type="u"
                   gprop-type="guint"
@@ -1708,10 +1576,6 @@
                   dbus-type="u"
                   gprop-type="guint"
                   />
-        <property name="name"
-                  dbus-type="s"
-                  gprop-type="gchararray"
-                  />
         <property name="no-vj-comp"
                   dbus-type="b"
                   gprop-type="gboolean"
@@ -1760,10 +1624,6 @@
     <setting name="pppoe"
              gtype="NMSettingPppoe"
              >
-        <property name="name"
-                  dbus-type="s"
-                  gprop-type="gchararray"
-                  />
         <property name="parent"
                   dbus-type="s"
                   gprop-type="gchararray"
@@ -1798,10 +1658,6 @@
                   dbus-type="i"
                   gprop-type="gint"
                   />
-        <property name="name"
-                  dbus-type="s"
-                  gprop-type="gchararray"
-                  />
         <property name="pac-script"
                   dbus-type="s"
                   gprop-type="gchararray"
@@ -1822,10 +1678,6 @@
                   dbus-type="u"
                   gprop-type="guint"
                   />
-        <property name="name"
-                  dbus-type="s"
-                  gprop-type="gchararray"
-                  />
         <property name="parity"
                   dbus-type="y"
                   gprop-type="NMSettingSerialParity"
@@ -1846,10 +1698,6 @@
                   dbus-type="i"
                   gprop-type="NMTernary"
                   />
-        <property name="name"
-                  dbus-type="s"
-                  gprop-type="gchararray"
-                  />
         <property name="total-vfs"
                   dbus-type="u"
                   gprop-type="guint"
@@ -1862,10 +1710,6 @@
     <setting name="tc"
              gtype="NMSettingTCConfig"
              >
-        <property name="name"
-                  dbus-type="s"
-                  gprop-type="gchararray"
-                  />
         <property name="qdiscs"
                   dbus-type="aa{sv}"
                   gprop-type="GPtrArray"
@@ -1898,10 +1742,6 @@
                   dbus-type="i"
                   gprop-type="gint"
                   />
-        <property name="name"
-                  dbus-type="s"
-                  gprop-type="gchararray"
-                  />
         <property name="notify-peers-count"
                   dbus-type="i"
                   gprop-type="gint"
@@ -1970,10 +1810,6 @@
                   dbus-type="aa{sv}"
                   gprop-type="GPtrArray"
                   />
-        <property name="name"
-                  dbus-type="s"
-                  gprop-type="gchararray"
-                  />
         <property name="prio"
                   dbus-type="i"
                   gprop-type="gint"
@@ -2002,10 +1838,6 @@
                   dbus-type="b"
                   gprop-type="gboolean"
                   />
-        <property name="name"
-                  dbus-type="s"
-                  gprop-type="gchararray"
-                  />
         <property name="owner"
                   dbus-type="s"
                   gprop-type="gchararray"
@@ -2026,18 +1858,10 @@
                   dbus-type="a{ss}"
                   gprop-type="GHashTable"
                   />
-        <property name="name"
-                  dbus-type="s"
-                  gprop-type="gchararray"
-                  />
     </setting>
     <setting name="veth"
              gtype="NMSettingVeth"
              >
-        <property name="name"
-                  dbus-type="s"
-                  gprop-type="gchararray"
-                  />
         <property name="peer"
                   dbus-type="s"
                   gprop-type="gchararray"
@@ -2066,10 +1890,6 @@
                   dbus-type="s"
                   dbus-deprecated="1"
                   />
-        <property name="name"
-                  dbus-type="s"
-                  gprop-type="gchararray"
-                  />
         <property name="parent"
                   dbus-type="s"
                   gprop-type="gchararray"
@@ -2082,10 +1902,6 @@
                   dbus-type="a{ss}"
                   gprop-type="GHashTable"
                   />
-        <property name="name"
-                  dbus-type="s"
-                  gprop-type="gchararray"
-                  />
         <property name="persistent"
                   dbus-type="b"
                   gprop-type="gboolean"
@@ -2111,10 +1927,6 @@
     <setting name="vrf"
              gtype="NMSettingVrf"
              >
-        <property name="name"
-                  dbus-type="s"
-                  gprop-type="gchararray"
-                  />
         <property name="table"
                   dbus-type="u"
                   gprop-type="guint"
@@ -2155,10 +1967,6 @@
                   dbus-type="s"
                   gprop-type="gchararray"
                   />
-        <property name="name"
-                  dbus-type="s"
-                  gprop-type="gchararray"
-                  />
         <property name="parent"
                   dbus-type="s"
                   gprop-type="gchararray"
@@ -2195,10 +2003,6 @@
     <setting name="wifi-p2p"
              gtype="NMSettingWifiP2P"
              >
-        <property name="name"
-                  dbus-type="s"
-                  gprop-type="gchararray"
-                  />
         <property name="peer"
                   dbus-type="s"
                   gprop-type="gchararray"
@@ -2220,10 +2024,6 @@
                   dbus-type="ay"
                   gprop-type="gchararray"
                   />
-        <property name="name"
-                  dbus-type="s"
-                  gprop-type="gchararray"
-                  />
         <property name="network-name"
                   is-deprecated="1"
                   dbus-type="s"
@@ -2253,10 +2053,6 @@
                   dbus-type="u"
                   gprop-type="guint"
                   />
-        <property name="name"
-                  dbus-type="s"
-                  gprop-type="gchararray"
-                  />
         <property name="peer-routes"
                   dbus-type="b"
                   gprop-type="gboolean"
@@ -2286,10 +2082,6 @@
                   dbus-type="s"
                   gprop-type="gchararray"
                   />
-        <property name="name"
-                  dbus-type="s"
-                  gprop-type="gchararray"
-                  />
         <property name="page"
                   dbus-type="i"
                   gprop-type="gint"