8:45 p.m.
Commit 370608b added new functions:
- virNetDevMacVLanReleaseName,
- virNetDevMacVLanReserveName.
Add stubbed versions of them to fix build without macvtap.
---
src/util/virnetdevmacvlan.c | 17 +++++++++++++++++
1 file changed, 17 insertions(+)
diff --git a/src/util/virnetdevmacvlan.c b/src/util/virnetdevmacvlan.c
index da71eef..9293510 100644
--- a/src/util/virnetdevmacvlan.c
+++ b/src/util/virnetdevmacvlan.c
@@ -1330,4 +1330,21 @@ int virNetDevMacVLanVPortProfileRegisterCallback(const char *ifname
ATTRIBUTE_UN
_("Cannot create macvlan devices on this platform"));
return -1;
}
+
+int
+virNetDevMacVLanReserveName(const char *name ATTRIBUTE_UNUSED,
+ bool quietFail ATTRIBUTE_UNUSED)
+{
+ virReportSystemError(ENOSYS, "%s",
+ _("The macvlan devices are not supported on this
platform"));
+ return -1;
+}
+
+int
+virNetDevMacVLanReleaseName(const char *name ATTRIBUTE_UNUSED)
+{
+ virReportSystemError(ENOSYS, "%s",
+ _("The macvlan devices are not supported on this
platform"));
+ return -1;
+}
#endif /* ! WITH_MACVTAP */
--
2.4.6
3:33 a.m.
On 27.01.2016 03:45, Roman Bogorodskiy wrote:
Commit 370608b added new functions:
- virNetDevMacVLanReleaseName,
- virNetDevMacVLanReserveName.
Add stubbed versions of them to fix build without macvtap.
---
src/util/virnetdevmacvlan.c | 17 +++++++++++++++++
1 file changed, 17 insertions(+)
diff --git a/src/util/virnetdevmacvlan.c b/src/util/virnetdevmacvlan.c
index da71eef..9293510 100644
--- a/src/util/virnetdevmacvlan.c
+++ b/src/util/virnetdevmacvlan.c
@@ -1330,4 +1330,21 @@ int virNetDevMacVLanVPortProfileRegisterCallback(const char
*ifname ATTRIBUTE_UN
_("Cannot create macvlan devices on this
platform"));
return -1;
}
+
+int
+virNetDevMacVLanReserveName(const char *name ATTRIBUTE_UNUSED,
+ bool quietFail ATTRIBUTE_UNUSED)
+{
+ virReportSystemError(ENOSYS, "%s",
+ _("The macvlan devices are not supported on this
platform"));
+ return -1;
+}
+
+int
+virNetDevMacVLanReleaseName(const char *name ATTRIBUTE_UNUSED)
+{
+ virReportSystemError(ENOSYS, "%s",
+ _("The macvlan devices are not supported on this
platform"));
+ return -1;
+}
#endif /* ! WITH_MACVTAP */
Oh, sorry. I started working on the same patch as soon as I got to the
office and haven't checked for the e-mails just to find out that you
already have a patch for that.
Next time you may as well just push the patch. There are basically two
rules under which a patch can be pushed without review:
1) Trivial - patch is just trivial (e.g. fixing an indentation, or a
typo and stuff like that). Although, several trivial changes when
combined create a non-trivial patch. So it's okay to push if commit is
fixing few whitespaces, but fixing spelling from british to american in
whole codebase will require proper review.
2) Build breaker - if the fix is obvious and moreover it fixes a broken
build, you may just push the patch. This situation is a good example of
such case. Although the fix is trivial too.
Anyway, in both cases you must send the patch you've pushed to the list
and note in comments that it's already pushed. The reason for that is so
that upstream can check if the fix was good and if somebody has a better
idea they can propose it.
Once again, sorry for taking over credit from you.
Michal
7:14 a.m.
Michal Privoznik wrote:
On 27.01.2016 03:45, Roman Bogorodskiy wrote:
> Commit 370608b added new functions:
>
> - virNetDevMacVLanReleaseName,
> - virNetDevMacVLanReserveName.
>
> Add stubbed versions of them to fix build without macvtap.
> ---
Oh, sorry. I started working on the same patch as soon as I got to the
office and haven't checked for the e-mails just to find out that you
already have a patch for that.
Next time you may as well just push the patch. There are basically two
rules under which a patch can be pushed without review:
1) Trivial - patch is just trivial (e.g. fixing an indentation, or a
typo and stuff like that). Although, several trivial changes when
combined create a non-trivial patch. So it's okay to push if commit is
fixing few whitespaces, but fixing spelling from british to american in
whole codebase will require proper review.
2) Build breaker - if the fix is obvious and moreover it fixes a broken
build, you may just push the patch. This situation is a good example of
such case. Although the fix is trivial too.
Anyway, in both cases you must send the patch you've pushed to the list
and note in comments that it's already pushed. The reason for that is so
that upstream can check if the fix was good and if somebody has a better
idea they can propose it.
Once again, sorry for taking over credit from you.
Ah, it's fine.
I'm aware of these rules and sometimes do push stuff right away, though
this time I was about to go to bed and wasn't planning to do anything
more, so it wasn't blocking me in any way, so I decided to just send it
over to make sure I didn't make any sleepy typo. ;-)
Roman Bogorodskiy
6:39 a.m.
On 01/26/2016 09:45 PM, Roman Bogorodskiy wrote:
Commit 370608b added new functions:
- virNetDevMacVLanReleaseName,
- virNetDevMacVLanReserveName.
Add stubbed versions of them to fix build without macvtap.
Oops. Sorry about that! And thanks to both you and Michal for making
patches.
3256
days inactive
3256
days old
3 comments
3 participants
participants (3)
-
Laine Stump -
Michal Privoznik -
Roman Bogorodskiy