]> git.ipfire.org Git - thirdparty/libvirt.git/commitdiff
util: re-add conditional for ifi_iqdrops field for macOS
authorDaniel P. Berrangé <berrange@redhat.com>
Fri, 4 Sep 2020 09:13:48 +0000 (10:13 +0100)
committerDaniel P. Berrangé <berrange@redhat.com>
Fri, 4 Sep 2020 10:19:08 +0000 (11:19 +0100)
The conditional was removed in

  commit ebbf8ebe4fa6f9d43b40673f0f2dad6bf50e2085
  Author: Ján Tomko <jtomko@redhat.com>
  Date:   Tue Sep 1 22:56:37 2020 +0200

    util: virnetdevtap: stats: fix txdrop on FreeBSD

That commit was correct about this no longer being required for FreeBSD,
but missed that the code is also built on macOS.

Rather than testing for this field in meson though, we can simply use
a platform conditional test in the code.

Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
src/util/virnetdevtap.c

index cc6f254aa1a7d8932da852ba0c9d5a85856553bd..ab5959c646ef6809b135245f6c277030d65061d3 100644 (file)
@@ -974,12 +974,20 @@ virNetDevTapInterfaceStats(const char *ifname,
                 stats->rx_bytes = ifd->ifi_obytes;
                 stats->rx_packets = ifd->ifi_opackets;
                 stats->rx_errs = ifd->ifi_oerrors;
+# ifndef __APPLE__
                 stats->rx_drop = ifd->ifi_oqdrops;
+# else
+                stats->rx_drop = 0;
+# endif
             } else {
                 stats->tx_bytes = ifd->ifi_obytes;
                 stats->tx_packets = ifd->ifi_opackets;
                 stats->tx_errs = ifd->ifi_oerrors;
+# ifndef __APPLE__
                 stats->tx_drop = ifd->ifi_oqdrops;
+# else
+                stats->tx_drop = 0;
+# endif
                 stats->rx_bytes = ifd->ifi_ibytes;
                 stats->rx_packets = ifd->ifi_ipackets;
                 stats->rx_errs = ifd->ifi_ierrors;