Hello community, here is the log from the commit of package lttng-modules for openSUSE:Factory checked in at 2018-01-24 15:32:35 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/lttng-modules (Old) and /work/SRC/openSUSE:Factory/.lttng-modules.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "lttng-modules" Wed Jan 24 15:32:35 2018 rev:3 rq:568860 version:2.10.4 Changes: -------- --- /work/SRC/openSUSE:Factory/lttng-modules/lttng-modules.changes 2017-12-31 01:14:18.811200044 +0100 +++ /work/SRC/openSUSE:Factory/.lttng-modules.new/lttng-modules.changes 2018-01-24 15:32:36.864441216 +0100 @@ -1,0 +2,7 @@ +Wed Jan 24 10:09:10 UTC 2018 - [email protected] + +- Add lttng-modules-2.10.4-fix-kvm.patch: Update KVM + instrumentation for Linux 4.15 (commits 3363052, d9f561b, + 5ccd696, bda29b7). + +------------------------------------------------------------------- New: ---- lttng-modules-2.10.4-fix-kvm.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ lttng-modules.spec ++++++ --- /var/tmp/diff_new_pack.5HTEGe/_old 2018-01-24 15:32:37.840395573 +0100 +++ /var/tmp/diff_new_pack.5HTEGe/_new 2018-01-24 15:32:37.844395386 +0100 @@ -1,7 +1,7 @@ # # spec file for package lttng-modules # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -36,6 +36,8 @@ Source4: Module.supported # PATCH-FIX-SLE btrfs-constify-tracepoint-arguments.patch bsc#1044912 [email protected] Patch0: btrfs-constify-tracepoint-arguments.patch +# PATCH-FIX-UPSTREAM lttng-modules-2.10.4-fix-kvm.patch [email protected] -- Update KVM instrumentation for Linux 4.15 (commits 3363052, d9f561b, 5ccd696, bda29b7). +Patch1: lttng-modules-2.10.4-fix-kvm.patch BuildRequires: kernel-devel BuildRequires: kernel-source BuildRequires: kernel-syms @@ -63,6 +65,7 @@ %if (0%{?suse_version} < 1320 || 0%{?suse_version} > 1320) && !0%{?is_opensuse} %patch0 -p1 %endif +%patch1 -p1 set -- * mkdir source ++++++ lttng-modules-2.10.4-fix-kvm.patch ++++++ --- a/instrumentation/events/lttng-module/kvm.h +++ b/instrumentation/events/lttng-module/kvm.h @@ -84,6 +84,28 @@ LTTNG_TRACEPOINT_EVENT(kvm_ack_irq, { KVM_TRACE_MMIO_READ, "read" }, \ { KVM_TRACE_MMIO_WRITE, "write" } +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,15,0) \ + || LTTNG_KERNEL_RANGE(4,14,14, 4,15,0) \ + || LTTNG_KERNEL_RANGE(4,9,77, 4,10,0) \ + || LTTNG_KERNEL_RANGE(4,4,112, 4,5,0) \ + || LTTNG_KERNEL_RANGE(3,16,52, 3,17,0) \ + || LTTNG_KERNEL_RANGE(3,2,97, 3,3,0) \ + || LTTNG_DEBIAN_KERNEL_RANGE(4,9,65,0,3,0, 4,10,0,0,0,0)) + +LTTNG_TRACEPOINT_EVENT(kvm_mmio, + TP_PROTO(int type, int len, u64 gpa, void *val), + TP_ARGS(type, len, gpa, val), + + TP_FIELDS( + ctf_integer(u32, type, type) + ctf_integer(u32, len, len) + ctf_integer(u64, gpa, gpa) + ctf_sequence_hex(unsigned char, val, val, u32, len) + ) +) + +#else + LTTNG_TRACEPOINT_EVENT(kvm_mmio, TP_PROTO(int type, int len, u64 gpa, u64 val), TP_ARGS(type, len, gpa, val), @@ -96,6 +118,8 @@ LTTNG_TRACEPOINT_EVENT(kvm_mmio, ) ) +#endif + #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,34)) #define kvm_fpu_load_symbol \
