]> xenbits.xensource.com Git - libvirt.git/commitdiff
Make use of PERF_COUNT_HW_REF_CPU_CYCLES conditional
authorDaniel P. Berrange <berrange@redhat.com>
Fri, 16 Dec 2016 10:30:27 +0000 (10:30 +0000)
committerDaniel P. Berrange <berrange@redhat.com>
Fri, 16 Dec 2016 10:47:05 +0000 (10:47 +0000)
The PERF_COUNT_HW_REF_CPU_CYCLES constant is not available
on all Linux distros libvirt targets, so its use must be
made conditional. Other constant have existed long enough
that we can assume they exist, as we don't support very
old distros like RHEL-5 any more.

Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
src/util/virperf.c

index 49ec2584985f0d311e0e9be122ed4e2e508d3bd8..f64692bf39c49ec9edacbd40e8411ec3a898ebed 100644 (file)
@@ -104,8 +104,14 @@ static struct virPerfEventAttr attrs[] = {
      .attrType = PERF_TYPE_HARDWARE,
      .attrConfig = PERF_COUNT_HW_STALLED_CYCLES_BACKEND},
     {.type = VIR_PERF_EVENT_REF_CPU_CYCLES,
+# ifdef PERF_COUNT_HW_REF_CPU_CYCLES
      .attrType = PERF_TYPE_HARDWARE,
-     .attrConfig = PERF_COUNT_HW_REF_CPU_CYCLES},
+     .attrConfig = PERF_COUNT_HW_REF_CPU_CYCLES
+# else
+     .attrType = 0,
+     .attrConfig = 0,
+# endif
+    },
 };
 typedef struct virPerfEventAttr *virPerfEventAttrPtr;