Differential D17425 Diff 47340 src/settings/dcbsetting.cpp

Changeset View

Standalone View

View Options

src/settings/dcbsetting.cpp

  • This file was added.
1​/*
2​ Copyright Pranav Gade <pranavgade20@gmail.com>
3​
4​ This library is free software; you can redistribute it and/or
5​ modify it under the terms of the GNU Lesser General Public
6​ License as published by the Free Software Foundation; either
7​ version 2.1 of the License, or (at your option) version 3, or any
8​ later version accepted by the membership of KDE e.V. (or its
9​ successor approved by the membership of KDE e.V.), which shall
10​ act as a proxy defined in Section 6 of version 3 of the license.
11​
12​ This library is distributed in the hope that it will be useful,
13​ but WITHOUT ANY WARRANTY; without even the implied warranty of
14​ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
15​ Lesser General Public License for more details.
16​
17​ You should have received a copy of the GNU Lesser General Public
18​ License along with this library. If not, see <http://www.gnu.org/licenses/>.
19​*/
20​
21​#include "dcbsetting.h"
22​#include "dcbsetting_p.h"
23​
24​#include <QDebug>
25​
26​NetworkManager::DcbSettingPrivate::DcbSettingPrivate()
27​ : name(NM_SETTING_DCB_SETTING_NAME)
28​ , appFcoeMode(NM_SETTING_DCB_FCOE_MODE_FABRIC)
29​ , appFcoePriority(-1)
30​ , appFipPriority(-1)
31​ , appIscsiPriority(-1)
32​ , priorityFlowControl({0, 0, 0, 0, 0, 0, 0, 0})
jgrulichUnsubmitted
Done

You can initialize also all the lists here, because they have default values as well.

jgrulich: You can initialize also all the lists here, because they have default values as well.
pranavgadeAuthorUnsubmitted
Done

how do i do that?
i am getting this error:
error: class ‘NetworkManager::DcbSettingPrivate’ does not have any field named ‘setPriorityFlowControl’

pranavgade: how do i do that? i am getting this error: error: class ‘NetworkManager::DcbSettingPrivate’…
jgrulichUnsubmitted
Done

something like priorityFlowControl({0, 0, 0, 0, 0, 0, 0, 0, 0}) should work, or not? Same for othe lists.

jgrulich: something like priorityFlowControl({0, 0, 0, 0, 0, 0, 0, 0, 0}) should work, or not? Same for…
33​ , priorityBandwidth({0, 0, 0, 0, 0, 0, 0, 0})
34​ , priorityGroupBandwidth({0, 0, 0, 0, 0, 0, 0, 0})
35​ , priorityGroupId({0, 0, 0, 0, 0, 0, 0, 0})
36​ , priorityStrictBandwidth({0, 0, 0, 0, 0, 0, 0, 0})
37​ , priorityTrafficClass({0, 0, 0, 0, 0, 0, 0, 0})
38​{ }
39​
40​NetworkManager::DcbSetting::DcbSetting()
41​ : Setting(Setting::Dcb)
42​ , d_ptr(new DcbSettingPrivate())
43​{ }
44​
45​NetworkManager::DcbSetting::DcbSetting(const Ptr &other)
46​ : Setting(other)
47​ , d_ptr(new DcbSettingPrivate())
48​{
49​ setAppFcoeMode(other->appFcoeMode());
50​ setAppFcoePriority(other->appFcoePriority());
51​ setAppFipPriority(other->appFipPriority());
52​ setAppIscsiPriority(other->appIscsiPriority());
53​ setAppFcoeFlags(other->appFcoeFlags());
54​ setAppFipFlags(other->appFipFlags());
jgrulichUnsubmitted
Done

Not this way.

jgrulich: Not this way.
55​ setAppIscsiFlags(other->appIscsiFlags());
56​ setPriorityGroupFlags(other->priorityGroupFlags());
57​ setPriorityFlowControlFlags(other->priorityFlowControlFlags());
58​ setPriorityFlowControl(other->priorityFlowControl());
59​ setPriorityBandwidth(other->priorityBandwidth());
60​ setPriorityGroupBandwidth(other->priorityGroupBandwidth());
jgrulichUnsubmitted
Done

This is odd, maybe we should introduce getters and setters for the whole list, this would simplify it and you can use it also in fromMap() and toMap()

jgrulich: This is odd, maybe we should introduce getters and setters for the whole list, this would…
pranavgadeAuthorUnsubmitted
Done

Yeah, that would help.
Do you think I should do that?

pranavgade: Yeah, that would help. Do you think I should do that?
jgrulichUnsubmitted
Done

Yes please.

jgrulich: Yes please.
pranavgadeAuthorUnsubmitted
Done

Okay, im on it
But on the other hand, it will add 12 functions unnecessarily

pranavgade: Okay, im on it But on the other hand, it will add 12 functions unnecessarily
61​ setPriorityGroupId(other->priorityGroupId());
62​ setPriorityStrictBandwidth(other->priorityStrictBandwidth());
63​ setPriorityTrafficClass(other->priorityTrafficClass());
64​}
65​
66​NetworkManager::DcbSetting::~DcbSetting()
67​{
68​ delete d_ptr;
69​}
70​
71​QString NetworkManager::DcbSetting::name() const
72​{
73​ Q_D(const DcbSetting);
74​
75​ return d->name;
76​}
77​
78​void NetworkManager::DcbSetting::setAppFcoeMode(const QString &mode)
79​{
80​ Q_D(DcbSetting);
81​
82​ d->appFcoeMode = mode;
83​}
84​
85​QString NetworkManager::DcbSetting::appFcoeMode() const
86​{
87​ Q_D(const DcbSetting);
88​
89​ return d->appFcoeMode;
90​}
91​
92​void NetworkManager::DcbSetting::setAppFcoePriority(qint32 priority)
93​{
94​ Q_D(DcbSetting);
95​
96​ d->appFcoePriority = priority;
97​}
98​
99​qint32 NetworkManager::DcbSetting::appFcoePriority() const
100​{
101​ Q_D(const DcbSetting);
102​
103​ return d->appFcoePriority;
104​}
105​
106​void NetworkManager::DcbSetting::setAppFipPriority(qint32 priority)
107​{
108​ Q_D(DcbSetting);
109​
110​ d->appFipPriority = priority;
111​}
112​
113​qint32 NetworkManager::DcbSetting::appFipPriority() const
114​{
115​ Q_D(const DcbSetting);
116​
117​ return d->appFipPriority;
118​}
119​
120​void NetworkManager::DcbSetting::setAppIscsiPriority(qint32 priority)
121​{
122​ Q_D(DcbSetting);
123​
124​ d->appIscsiPriority = priority;
125​}
126​
127​qint32 NetworkManager::DcbSetting::appIscsiPriority() const
128​{
129​ Q_D(const DcbSetting);
130​
131​ return d->appIscsiPriority;
132​}
133​
134​void NetworkManager::DcbSetting::setAppFcoeFlags(NetworkManager::DcbSetting::DcbFlags flags)
135​{
136​ Q_D(DcbSetting);
137​
138​ d->appFcoeFlags = flags;
139​}
140​
141​NetworkManager::DcbSetting::DcbFlags NetworkManager::DcbSetting::appFcoeFlags() const
142​{
143​ Q_D(const DcbSetting);
144​
145​ return d->appFcoeFlags;
146​}
147​
148​void NetworkManager::DcbSetting::setAppFipFlags(NetworkManager::DcbSetting::DcbFlags flags)
149​{
150​ Q_D(DcbSetting);
151​
152​ d->appFipFlags = flags;
153​}
154​
155​NetworkManager::DcbSetting::DcbFlags NetworkManager::DcbSetting::appFipFlags() const
156​{
157​ Q_D(const DcbSetting);
158​
159​ return d->appFipFlags;
160​}
161​
162​void NetworkManager::DcbSetting::setAppIscsiFlags(NetworkManager::DcbSetting::DcbFlags flags)
163​{
164​ Q_D(DcbSetting);
165​
166​ d->appIscsiFlags = flags;
167​}
168​
169​NetworkManager::DcbSetting::DcbFlags NetworkManager::DcbSetting::appIscsiFlags() const
170​{
171​ Q_D(const DcbSetting);
172​
173​ return d->appIscsiFlags;
174​}
175​
176​void NetworkManager::DcbSetting::setPriorityGroupFlags(NetworkManager::DcbSetting::DcbFlags flags)
177​{
178​ Q_D(DcbSetting);
179​
180​ d->priorityGroupFlags = flags;
181​}
182​
183​NetworkManager::DcbSetting::DcbFlags NetworkManager::DcbSetting::priorityGroupFlags() const
184​{
185​ Q_D(const DcbSetting);
186​
187​ return d->priorityGroupFlags;
188​}
189​
190​void NetworkManager::DcbSetting::setPriorityFlowControlFlags(NetworkManager::DcbSetting::DcbFlags flags)
191​{
192​ Q_D(DcbSetting);
193​
194​ d->priorityFlowControlFlags = flags;
195​}
196​
197​NetworkManager::DcbSetting::DcbFlags NetworkManager::DcbSetting::priorityFlowControlFlags() const
198​{
jgrulichUnsubmitted
Done

If you initialize the list at the beginning, you will not need to have this check and also do this weird thing below. Simply have the first check and otherwise you can do just d->priorityFlowControl[userPriority] = enabled.

jgrulich: If you initialize the list at the beginning, you will not need to have this check and also do…
pranavgadeAuthorUnsubmitted
Done

I think it is better to have this as a safety measure, and initialising so many values manually wold take 8*6=48 lines in the beginning of the file

pranavgade: I think it is better to have this as a safety measure, and initialising so many values manually…
jgrulichUnsubmitted
Done

It should simple by just:

Q_D(DcbSetting)

if (userPriority < 8) {
   d->priorityFlowControl[userPriority] = enabled;
}
jgrulich: It should simple by just: ``` Q_D(DcbSetting) if (userPriority < 8) { d…
199​ Q_D(const DcbSetting);
200​
201​ return d->priorityFlowControlFlags;
202​}
203​
204​void NetworkManager::DcbSetting::setPriorityFlowControl(quint32 userPriority, bool enabled)
205​{
206​ Q_D(DcbSetting);
207​
208​ if (userPriority < 8) {
209​ d->priorityFlowControl[userPriority] = enabled;
210​ }
211​}
212​
213​bool NetworkManager::DcbSetting::priorityFlowControl(quint32 userPriority) const
jgrulichUnsubmitted
Done

Check just if userPriority is < 8.

jgrulich: Check just if userPriority is < 8.
pranavgadeAuthorUnsubmitted
Done

that may lead to a malloc assertion error sometimes, and thus a crash which is confusing to understand

pranavgade: that may lead to a malloc assertion error sometimes, and thus a crash which is confusing to…
jgrulichUnsubmitted
Done

Not if you initialize it at the beginning as it should be.

jgrulich: Not if you initialize it at the beginning as it should be.
214​{
215​ Q_D(const DcbSetting);
216​
217​ if (userPriority < 8) {
218​ return d->priorityFlowControl.value(userPriority);
219​ }
220​ return false;
221​}
jgrulichUnsubmitted
Done

You can remove the else branch and have just return false.

jgrulich: You can remove the else branch and have just return false.
222​
jgrulichUnsubmitted
Done

Return false.

jgrulich: Return false.
223​void NetworkManager::DcbSetting::setPriorityFlowControl(const UIntList &list)
224​{
225​ Q_D(DcbSetting);
jgrulichUnsubmitted
Done

Same as for setPriorityFlowControl()

jgrulich: Same as for setPriorityFlowControl()
226​
227​ d->priorityFlowControl = list;
228​}
229​
230​UIntList NetworkManager::DcbSetting::priorityFlowControl() const
231​{
232​ Q_D(const DcbSetting);
233​
234​ return d->priorityFlowControl;
235​}
236​
237​void NetworkManager::DcbSetting::setPriorityBandwidth(quint32 userPriority, quint32 bandwidthPercent)
238​{
239​ Q_D(DcbSetting);
240​
jgrulichUnsubmitted
Done

Same as for priorityFlowControl()

jgrulich: Same as for priorityFlowControl()
241​ if (userPriority < 8) {
242​ d->priorityBandwidth[userPriority] = bandwidthPercent;
243​ }
244​}
245​
246​quint32 NetworkManager::DcbSetting::priorityBandwidth(quint32 userPriority) const
247​{
248​ Q_D(const DcbSetting);
249​
250​ if (userPriority < 8) {
251​ return d->priorityBandwidth.value(userPriority);
252​ }
jgrulichUnsubmitted
Done

Same here.

jgrulich: Same here.
253​ return 0;
254​}
255​
jgrulichUnsubmitted
Done

You can remove the else branch and have just return 0.

jgrulich: You can remove the else branch and have just return 0.
256​void NetworkManager::DcbSetting::setPriorityBandwidth(const UIntList &list)
257​{
258​ Q_D(DcbSetting);
259​
260​ d->priorityBandwidth = list;
261​}
262​
263​UIntList NetworkManager::DcbSetting::priorityBandwidth() const
264​{
265​ Q_D(const DcbSetting);
266​
267​ return d->priorityBandwidth;
jgrulichUnsubmitted
Done

Same here.

jgrulich: Same here.
268​}
269​
270​void NetworkManager::DcbSetting::setPriorityGroupBandwidth(quint32 groupId, quint32 bandwidthPercent)
271​{
272​ Q_D(DcbSetting);
273​
274​ if (groupId < 8) {
275​ d->priorityGroupBandwidth[groupId] = bandwidthPercent;
276​ }
277​}
278​
jgrulichUnsubmitted
Done

Here.

jgrulich: Here.
279​quint32 NetworkManager::DcbSetting::priorityGroupBandwidth(quint32 groupId) const
280​{
281​ Q_D(const DcbSetting);
282​
283​ if (groupId < 8) {
284​ return d->priorityGroupBandwidth.value(groupId);
285​ }
286​ return 0;
287​}
288​
289​void NetworkManager::DcbSetting::setPriorityGroupBandwidth(const UIntList &list)
jgrulichUnsubmitted
Done

You can remove the else branch and have just return 0.

jgrulich: You can remove the else branch and have just return 0.
290​{
291​ Q_D(DcbSetting);
292​
293​ d->priorityGroupBandwidth = list;
294​}
295​
jgrulichUnsubmitted
Done

Here.

jgrulich: Here.
296​UIntList NetworkManager::DcbSetting::priorityGroupBandwidth() const
297​{
298​ Q_D(const DcbSetting);
299​
300​ return d->priorityGroupBandwidth;
301​}
302​
jgrulichUnsubmitted
Done

Return false.

jgrulich: Return false.
303​void NetworkManager::DcbSetting::setPriorityGroupId(quint32 userPriority, quint32 groupId)
304​{
305​ Q_D(DcbSetting);
jgrulichUnsubmitted
Done

Also here.

jgrulich: Also here.
306​
307​ if (userPriority < 8) {
308​ d->priorityGroupId[userPriority] = groupId;
309​ }
310​}
311​
312​quint32 NetworkManager::DcbSetting::priorityGroupId(quint32 userPriority) const
313​{
314​ Q_D(const DcbSetting);
315​
316​ if (userPriority < 8) {
317​ return d->priorityGroupId.value(userPriority);
318​ }
319​ return 0;
320​}
321​
jgrulichUnsubmitted
Done

Also here.

jgrulich: Also here.
322​void NetworkManager::DcbSetting::setPriorityGroupId(const UIntList &list)
323​{
jgrulichUnsubmitted
Done

You can remove the else branch and have just return 0.

jgrulich: You can remove the else branch and have just return 0.
324​ Q_D(DcbSetting);
325​
326​ d->priorityGroupId = list;
327​}
328​
329​UIntList NetworkManager::DcbSetting::priorityGroupId() const
330​{
331​ Q_D(const DcbSetting);
jgrulichUnsubmitted
Done

Also here.

jgrulich: Also here.
332​
333​ return d->priorityGroupId;
334​}
335​
336​void NetworkManager::DcbSetting::setPriorityStrictBandwidth(quint32 userPriority, bool strict)
337​{
338​ Q_D(DcbSetting);
339​
340​ if (userPriority < 8) {
341​ d->priorityStrictBandwidth[userPriority] = strict;
342​ }
343​}
344​
345​bool NetworkManager::DcbSetting::priorityStrictBandwidth(quint32 userPriority) const
346​{
347​ Q_D(const DcbSetting);
348​
jgrulichUnsubmitted
Done

And last one.

jgrulich: And last one.
349​ if (userPriority < 8) {
350​ return d->priorityStrictBandwidth.value(userPriority);
351​ }
352​ return false;
353​}
354​
355​void NetworkManager::DcbSetting::setPriorityStrictBandwidth(const UIntList &list)
356​{
357​ Q_D(DcbSetting);
jgrulichUnsubmitted
Done

Remove comments.

jgrulich: Remove comments.
jgrulichUnsubmitted
Done

You can remove the else branch and have just return false.

jgrulich: You can remove the else branch and have just return false.
358​
359​ d->priorityStrictBandwidth = list;
360​}
361​
362​UIntList NetworkManager::DcbSetting::priorityStrictBandwidth() const
363​{
364​ Q_D(const DcbSetting);
365​
366​ return d->priorityStrictBandwidth;
367​}
368​
369​void NetworkManager::DcbSetting::setPriorityTrafficClass(quint32 userPriority, quint32 trafficClass)
370​{
371​ Q_D(DcbSetting);
372​
373​ if (userPriority < 8) {
374​ d->priorityTrafficClass[userPriority] = trafficClass;
375​ }
376​}
377​
378​quint32 NetworkManager::DcbSetting::priorityTrafficClass(quint32 userPriority) const
379​{
380​ Q_D(const DcbSetting);
381​
382​ if (userPriority < 8) {
383​ return d->priorityTrafficClass.value(userPriority);
384​ }
385​ return 0;
386​}
387​
388​void NetworkManager::DcbSetting::setPriorityTrafficClass(const UIntList &list)
389​{
390​ Q_D(DcbSetting);
391​
jgrulichUnsubmitted
Done

You can remove the else branch and have just return 0.

jgrulich: You can remove the else branch and have just return 0.
392​ d->priorityTrafficClass = list;
393​}
394​
jgrulichUnsubmitted
Done

You can directly assign whole UintList. Same for the rest of options below.

jgrulich: You can directly assign whole UintList. Same for the rest of options below.
pranavgadeAuthorUnsubmitted
Done

I get a type casting error

pranavgade: I get a type casting error
jgrulichUnsubmitted
Done

You can have Q_D(DcbSetting) at the beginning of fromMap() function and then instead of setFoo() have d->foo = list.

jgrulich: You can have Q_D(DcbSetting) at the beginning of fromMap() function and then instead of setFoo…
395​UIntList NetworkManager::DcbSetting::priorityTrafficClass() const
396​{
397​ Q_D(const DcbSetting);
398​
399​ return d->priorityTrafficClass;
400​}
401​
402​void NetworkManager::DcbSetting::fromMap(const QVariantMap &setting)
403​{
404​ if (setting.contains(QLatin1String(NM_SETTING_DCB_APP_FCOE_MODE))) {
405​ setAppFcoeMode(setting.value(QLatin1String(NM_SETTING_DCB_APP_FCOE_MODE)).toString());
406​ }
407​
408​ if (setting.contains(QLatin1String(NM_SETTING_DCB_APP_FCOE_PRIORITY))) {
409​ setAppFcoePriority(setting.value(QLatin1String(NM_SETTING_DCB_APP_FCOE_PRIORITY)).toInt());
410​ }
411​
412​ if (setting.contains(QLatin1String(NM_SETTING_DCB_APP_FIP_PRIORITY))) {
413​ setAppFipPriority(setting.value(QLatin1String(NM_SETTING_DCB_APP_FIP_PRIORITY)).toInt());
414​ }
415​
416​ if (setting.contains(QLatin1String(NM_SETTING_DCB_APP_ISCSI_PRIORITY))) {
417​ setAppIscsiPriority(setting.value(QLatin1String(NM_SETTING_DCB_APP_ISCSI_PRIORITY)).toInt());
418​ }
419​
420​ if (setting.contains(QLatin1String(NM_SETTING_DCB_APP_FCOE_FLAGS))) {
421​ setAppFcoeFlags(static_cast<DcbFlags>(setting.value(QLatin1String(NM_SETTING_DCB_APP_FCOE_FLAGS)).toUInt()));
422​ }
423​
424​ if (setting.contains(QLatin1String(NM_SETTING_DCB_APP_FIP_FLAGS))) {
425​ setAppFipFlags(static_cast<DcbFlags>(setting.value(QLatin1String(NM_SETTING_DCB_APP_FIP_FLAGS)).toUInt()));
426​ }
427​
428​ if (setting.contains(QLatin1String(NM_SETTING_DCB_APP_ISCSI_FLAGS))) {
jgrulichUnsubmitted
Done

Remove comments.

jgrulich: Remove comments.
pranavgadeAuthorUnsubmitted
Done

oops, i was debugging it

pranavgade: oops, i was debugging it
429​ setAppIscsiFlags(static_cast<DcbFlags>(setting.value(QLatin1String(NM_SETTING_DCB_APP_ISCSI_FLAGS)).toUInt()));
jgrulichUnsubmitted
Done

Shouldn't it save appFcoeMode() instead?

jgrulich: Shouldn't it save appFcoeMode() instead?
pranavgadeAuthorUnsubmitted
Done

yeah, i uploaded some unfinished code

pranavgade: yeah, i uploaded some unfinished code
430​ }
431​
432​ if (setting.contains(QLatin1String(NM_SETTING_DCB_PRIORITY_GROUP_FLAGS))) {
433​ setPriorityGroupFlags(static_cast<DcbFlags>(setting.value(QLatin1String(NM_SETTING_DCB_PRIORITY_GROUP_FLAGS)).toUInt()));
434​ }
435​
436​ if (setting.contains(QLatin1String(NM_SETTING_DCB_PRIORITY_FLOW_CONTROL_FLAGS))) {
437​ setPriorityFlowControlFlags(static_cast<DcbFlags>(setting.value(QLatin1String(NM_SETTING_DCB_PRIORITY_FLOW_CONTROL_FLAGS)).toUInt()));
438​ }
439​
440​ if (setting.contains(QLatin1String(NM_SETTING_DCB_PRIORITY_FLOW_CONTROL))) {
441​ setPriorityFlowControl(qdbus_cast<UIntList>(setting.value(QLatin1String(NM_SETTING_DCB_PRIORITY_FLOW_CONTROL))));
442​ }
443​
444​ if (setting.contains(QLatin1String(NM_SETTING_DCB_PRIORITY_BANDWIDTH))) {
445​ setPriorityBandwidth(qdbus_cast<UIntList>(setting.value(QLatin1String(NM_SETTING_DCB_PRIORITY_BANDWIDTH))));
446​ }
447​
448​ if (setting.contains(QLatin1String(NM_SETTING_DCB_PRIORITY_GROUP_BANDWIDTH))) {
jgrulichUnsubmitted
Done

You can probably insert flags all the time.

jgrulich: You can probably insert flags all the time.
449​ setPriorityGroupBandwidth(qdbus_cast<UIntList>(setting.value(QLatin1String(NM_SETTING_DCB_PRIORITY_GROUP_BANDWIDTH))));
450​ }
451​
452​ if (setting.contains(QLatin1String(NM_SETTING_DCB_PRIORITY_GROUP_ID))) {
453​ setPriorityGroupId(qdbus_cast<UIntList>(setting.value(QLatin1String(NM_SETTING_DCB_PRIORITY_GROUP_ID))));
454​ }
455​
456​ if (setting.contains(QLatin1String(NM_SETTING_DCB_PRIORITY_STRICT_BANDWIDTH))) {
457​ setPriorityStrictBandwidth(qdbus_cast<UIntList>(setting.value(QLatin1String(NM_SETTING_DCB_PRIORITY_STRICT_BANDWIDTH))));
458​ }
459​
460​ if (setting.contains(QLatin1String(NM_SETTING_DCB_PRIORITY_TRAFFIC_CLASS))) {
461​ setPriorityTrafficClass(qdbus_cast<UIntList>(setting.value(QLatin1String(NM_SETTING_DCB_PRIORITY_TRAFFIC_CLASS))));
462​ }
463​}
464​
465​QVariantMap NetworkManager::DcbSetting::toMap() const
jgrulichUnsubmitted
Done

You can directly push the list there. Same for the lists below.

jgrulich: You can directly push the list there. Same for the lists below.
pranavgadeAuthorUnsubmitted
Done

How?

pranavgade: How?
jgrulichUnsubmitted
Done

Oh, right, you don't have methods for that. In that case you can again use Q_D(const DcbSetting) and push there d->priorityFlowControl and others.

jgrulich: Oh, right, you don't have methods for that. In that case you can again use Q_D(const…
pranavgadeAuthorUnsubmitted
Done

I can use Q_D in fromMap, but i get this error in toMap:

error: invalid conversion from ‘const NetworkManager::DcbSettingPrivate*’ to ‘NetworkManager::DcbSettingPrivate*’ [-fpermissive] Q_D(DcbSetting);

so, changed frommap, but keeping this as is.

pranavgade: I can use Q_D in fromMap, but i get this error in toMap: error: invalid conversion from ‘const…
466​{
467​ QVariantMap setting;
468​
469​ if (!appFcoeMode().isEmpty()) {
470​ setting.insert(QLatin1String(NM_SETTING_DCB_APP_FCOE_MODE), appFcoeMode());
471​ }
472​
473​ if (appFcoePriority() >= 0) {
474​ setting.insert(QLatin1String(NM_SETTING_DCB_APP_FCOE_PRIORITY), appFcoePriority());
475​ }
476​
477​ if (appFipPriority() >= 0) {
478​ setting.insert(QLatin1String(NM_SETTING_DCB_APP_FIP_PRIORITY), appFipPriority());
479​ }
480​
481​ if (appIscsiPriority() >= 0) {
482​ setting.insert(QLatin1String(NM_SETTING_DCB_APP_ISCSI_PRIORITY), appIscsiPriority());
483​ }
484​
485​ setting.insert(QLatin1String(NM_SETTING_DCB_APP_FCOE_FLAGS), (int)appFcoeFlags());
486​ setting.insert(QLatin1String(NM_SETTING_DCB_APP_FIP_FLAGS), (int)appFipFlags());
487​ setting.insert(QLatin1String(NM_SETTING_DCB_APP_ISCSI_FLAGS), (int)appIscsiFlags());
488​ setting.insert(QLatin1String(NM_SETTING_DCB_PRIORITY_GROUP_FLAGS), (int)priorityGroupFlags());
489​ setting.insert(QLatin1String(NM_SETTING_DCB_PRIORITY_FLOW_CONTROL_FLAGS), (int)priorityFlowControlFlags());
490​
491​ setting.insert(QLatin1String(NM_SETTING_DCB_PRIORITY_FLOW_CONTROL), QVariant::fromValue(priorityFlowControl()));
492​ setting.insert(QLatin1String(NM_SETTING_DCB_PRIORITY_BANDWIDTH), QVariant::fromValue(priorityBandwidth()));
jgrulichUnsubmitted
Done

I think all those should be added all the time, checking whether the last one is higher can sometime avoid adding them to the map when one of previous ones is set to non-default value.

jgrulich: I think all those should be added all the time, checking whether the last one is higher can…
493​ setting.insert(QLatin1String(NM_SETTING_DCB_PRIORITY_GROUP_BANDWIDTH), QVariant::fromValue(priorityGroupBandwidth()));
494​ setting.insert(QLatin1String(NM_SETTING_DCB_PRIORITY_GROUP_ID), QVariant::fromValue(priorityGroupId()));
495​ setting.insert(QLatin1String(NM_SETTING_DCB_PRIORITY_STRICT_BANDWIDTH), QVariant::fromValue(priorityStrictBandwidth()));
496​ setting.insert(QLatin1String(NM_SETTING_DCB_PRIORITY_TRAFFIC_CLASS), QVariant::fromValue(priorityTrafficClass()));
497​
498​ return setting;
499​}
500​
501​QDebug NetworkManager::operator <<(QDebug dbg, const NetworkManager::DcbSetting &setting)
502​{
503​ dbg.nospace() << "type: " << setting.typeAsString(setting.type()) << '\n';
504​ dbg.nospace() << "initialized: " << !setting.isNull() << '\n';
505​
506​ dbg.nospace() << NM_SETTING_DCB_APP_FCOE_MODE << ": " << setting.appFcoeMode() << '\n';
507​ dbg.nospace() << NM_SETTING_DCB_APP_FCOE_PRIORITY << ": " << setting.appFcoePriority() << '\n';
508​ dbg.nospace() << NM_SETTING_DCB_APP_FIP_PRIORITY << ": " << setting.appFipPriority() << '\n';
509​ dbg.nospace() << NM_SETTING_DCB_APP_ISCSI_PRIORITY << ": " << setting.appIscsiPriority() << '\n';
510​ dbg.nospace() << NM_SETTING_DCB_APP_FCOE_FLAGS << ": " << setting.appFcoeFlags() << '\n';
511​ dbg.nospace() << NM_SETTING_DCB_APP_FIP_FLAGS << ": " << setting.appFipFlags() << '\n';
512​ dbg.nospace() << NM_SETTING_DCB_APP_ISCSI_FLAGS << ": " << setting.appIscsiFlags() << '\n';
513​ dbg.nospace() << NM_SETTING_DCB_PRIORITY_GROUP_FLAGS << ": " << setting.priorityGroupFlags() << '\n';
514​ dbg.nospace() << NM_SETTING_DCB_PRIORITY_FLOW_CONTROL_FLAGS << ": " << setting.priorityFlowControlFlags() << '\n';
515​
516​ dbg.nospace() << NM_SETTING_DCB_PRIORITY_FLOW_CONTROL << ": ";
517​ Q_FOREACH (const quint32 enabled, setting.priorityFlowControl()) {
518​ dbg.nospace() << enabled << ' ';
519​ }
520​ dbg.nospace() << '\n';
521​
522​ dbg.nospace() << NM_SETTING_DCB_PRIORITY_BANDWIDTH << ": ";
523​ Q_FOREACH (const quint32 bandwidthPercent, setting.priorityBandwidth()) {
524​ dbg.nospace() << bandwidthPercent << ' ';
525​ }
526​ dbg.nospace() << '\n';
527​
528​ dbg.nospace() << NM_SETTING_DCB_PRIORITY_GROUP_BANDWIDTH << ": ";
jgrulichUnsubmitted
Done

You don't print priorityBandwith, priororityGroupBandwidth and others.

jgrulich: You don't print priorityBandwith, priororityGroupBandwidth and others.
529​ Q_FOREACH (const quint32 bandwidthPercent, setting.priorityGroupBandwidth()) {
530​ dbg.nospace() << bandwidthPercent << ' ';
531​ }
532​ dbg.nospace() << '\n';
533​
534​ dbg.nospace() << NM_SETTING_DCB_PRIORITY_GROUP_ID << ": ";
535​ Q_FOREACH (const quint32 groupId, setting.priorityGroupId()) {
536​ dbg.nospace() << groupId << ' ';
537​ }
538​ dbg.nospace() << '\n';
539​
540​ dbg.nospace() << NM_SETTING_DCB_PRIORITY_STRICT_BANDWIDTH << ": ";
541​ Q_FOREACH (const quint32 strict, setting.priorityStrictBandwidth()) {
542​ dbg.nospace() << strict << ' ';
543​ }
544​ dbg.nospace() << '\n';
545​
546​ dbg.nospace() << NM_SETTING_DCB_PRIORITY_TRAFFIC_CLASS << ": ";
547​ Q_FOREACH (const quint32 trafficClass, setting.priorityTrafficClass()) {
548​ dbg.nospace() << trafficClass << ' ';
549​ }
550​ dbg.nospace() << '\n';
551​
552​ return dbg.maybeSpace();
553​}