[PATCH v1] wireshark: fix build with with 2.4.0

Olaf Hering posted 1 patch 3 years, 5 months ago
Test syntax-check failed
Patches applied successfully (tree, apply log)
git fetch https://github.com/patchew-project/libvirt tags/patchew/20201113104329.22919-1-olaf@aepfle.de
tools/wireshark/src/packet-libvirt.c | 1 +
1 file changed, 1 insertion(+)
[PATCH v1] wireshark: fix build with with 2.4.0
Posted by Olaf Hering 3 years, 5 months ago
wireshark/epan/proto.h uses WS_NORETURN, which is defined in wireshark/config.h,
without including this header first.

Fixes commit caa9560c150b3df46965582388d0a8a0bafa97ae

Signed-off-by: Olaf Hering <olaf@aepfle.de>
---
 tools/wireshark/src/packet-libvirt.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tools/wireshark/src/packet-libvirt.c b/tools/wireshark/src/packet-libvirt.c
index f43919b05d..5bddeb3763 100644
--- a/tools/wireshark/src/packet-libvirt.c
+++ b/tools/wireshark/src/packet-libvirt.c
@@ -18,6 +18,7 @@
  */
 #include <config.h>
 
+#include <wireshark/config.h>
 #include <wireshark/epan/proto.h>
 #include <wireshark/epan/packet.h>
 #include <wireshark/epan/dissectors/packet-tcp.h>

Re: [PATCH v1] wireshark: fix build with with 2.4.0
Posted by Daniel P. Berrangé 3 years, 5 months ago
On Fri, Nov 13, 2020 at 11:43:29AM +0100, Olaf Hering wrote:
> wireshark/epan/proto.h uses WS_NORETURN, which is defined in wireshark/config.h,
> without including this header first.

What platform still ships this old 2.4.0 version ?

> 
> Fixes commit caa9560c150b3df46965582388d0a8a0bafa97ae
> 
> Signed-off-by: Olaf Hering <olaf@aepfle.de>
> ---
>  tools/wireshark/src/packet-libvirt.c | 1 +
>  1 file changed, 1 insertion(+)

Regards,
Daniel
-- 
|: https://berrange.com      -o-    https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org         -o-            https://fstop138.berrange.com :|
|: https://entangle-photo.org    -o-    https://www.instagram.com/dberrange :|

Re: [PATCH v1] wireshark: fix build with with 2.4.0
Posted by Olaf Hering 3 years, 5 months ago
Am Fri, 13 Nov 2020 10:46:15 +0000
schrieb Daniel P. Berrangé <berrange@redhat.com>:

> What platform still ships this old 2.4.0 version ?

This version is what meson.build expects. SLE12 has it.

Olaf
Re: [PATCH v1] wireshark: fix build with with 2.4.0
Posted by Daniel P. Berrangé 3 years, 5 months ago
On Fri, Nov 13, 2020 at 11:47:30AM +0100, Olaf Hering wrote:
> Am Fri, 13 Nov 2020 10:46:15 +0000
> schrieb Daniel P. Berrangé <berrange@redhat.com>:
> 
> > What platform still ships this old 2.4.0 version ?
> 
> This version is what meson.build expects. SLE12 has it.

SLE12 is no longer considered a supported platform by libvirt, since it
has been more than 2 years since the release of SLE15.

Regards,
Daniel
-- 
|: https://berrange.com      -o-    https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org         -o-            https://fstop138.berrange.com :|
|: https://entangle-photo.org    -o-    https://www.instagram.com/dberrange :|

Re: [PATCH v1] wireshark: fix build with with 2.4.0
Posted by Olaf Hering 3 years, 5 months ago
Am Fri, 13 Nov 2020 10:53:41 +0000
schrieb Daniel P. Berrangé <berrange@redhat.com>:

> SLE12 is no longer considered a supported platform by libvirt, since it
> has been more than 2 years since the release of SLE15.

That might be all true.

This patch is for wireshark. Not for SLE12.

Olaf
Re: [PATCH v1] wireshark: fix build with with 2.4.0
Posted by Daniel P. Berrangé 3 years, 5 months ago
On Fri, Nov 13, 2020 at 12:04:43PM +0100, Olaf Hering wrote:
> Am Fri, 13 Nov 2020 10:53:41 +0000
> schrieb Daniel P. Berrangé <berrange@redhat.com>:
> 
> > SLE12 is no longer considered a supported platform by libvirt, since it
> > has been more than 2 years since the release of SLE15.
> 
> That might be all true.
> 
> This patch is for wireshark. Not for SLE12.

The probem is simply that the min version is wrong - it should be 2.6.0
instead I believe, as it looks like that is the oldest version on the
targetted distros (RHEL-7 is excepted as we don't support wireshark 1.x
at all). Once I've validated the CI pipeline, I'll bump the min version
which will avoid the build failure.

Regards,
Daniel
-- 
|: https://berrange.com      -o-    https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org         -o-            https://fstop138.berrange.com :|
|: https://entangle-photo.org    -o-    https://www.instagram.com/dberrange :|