diff options
Diffstat (limited to 'libnm-core/nm-setting-sriov.c')
| -rw-r--r-- | libnm-core/nm-setting-sriov.c | 30 |
1 files changed, 17 insertions, 13 deletions
diff --git a/libnm-core/nm-setting-sriov.c b/libnm-core/nm-setting-sriov.c index 4dd43ae1..9ef68cce 100644 --- a/libnm-core/nm-setting-sriov.c +++ b/libnm-core/nm-setting-sriov.c @@ -99,13 +99,15 @@ nm_sriov_vf_new (guint index) { NMSriovVF *vf; - vf = g_slice_new0 (NMSriovVF); - vf->refcount = 1; - vf->index = index; - vf->attributes = g_hash_table_new_full (nm_str_hash, - g_str_equal, - g_free, - (GDestroyNotify) g_variant_unref); + vf = g_slice_new (NMSriovVF); + *vf = (NMSriovVF) { + .refcount = 1, + .index = index, + .attributes = g_hash_table_new_full (nm_str_hash, + g_str_equal, + g_free, + (GDestroyNotify) g_variant_unref), + }; return vf; } @@ -147,7 +149,7 @@ nm_sriov_vf_unref (NMSriovVF *vf) if (vf->vlans) g_hash_table_unref (vf->vlans); g_free (vf->vlan_ids); - g_slice_free (NMSriovVF, vf); + nm_g_slice_free (vf); } } @@ -221,10 +223,12 @@ vf_add_vlan (NMSriovVF *vf, { VFVlan *vlan; - vlan = g_slice_new0 (VFVlan); - vlan->id = vlan_id; - vlan->qos = qos; - vlan->protocol = protocol; + vlan = g_slice_new (VFVlan); + *vlan = (VFVlan) { + .id = vlan_id, + .qos = qos, + .protocol = protocol, + }; if (!vf->vlans) vf->vlans = _vf_vlan_create_hash (); @@ -550,7 +554,7 @@ vlan_id_compare (gconstpointer a, gconstpointer b, gpointer user_data) * * Returns the VLANs currently configured on the VF. * - * Returns: (transfer none): a list of VLAN ids configured on the VF. + * Returns: (transfer none) (array length=length): a list of VLAN ids configured on the VF. * * Since: 1.14 */ |