Hello community, here is the log from the commit of package ibsim for openSUSE:Factory checked in at 2019-10-11 15:21:38 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ibsim (Old) and /work/SRC/openSUSE:Factory/.ibsim.new.2352 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ibsim" Fri Oct 11 15:21:38 2019 rev:10 rq:737383 version:0.8 Changes: -------- --- /work/SRC/openSUSE:Factory/ibsim/ibsim.changes 2019-04-19 18:39:42.079285171 +0200 +++ /work/SRC/openSUSE:Factory/.ibsim.new.2352/ibsim.changes 2019-10-11 15:21:49.323360557 +0200 @@ -1,0 +2,7 @@ +Fri Oct 11 06:39:41 UTC 2019 - Nicolas Morey-Chaisemartin <[email protected]> + +- Add patches to fix support with rdma-core >= 25 + - umad2sim-Do-not-use-umad.h-deprecated-functions.patch + - umad2sim-define-UMAD_DEV_DIR-if-not-set.patch + +------------------------------------------------------------------- New: ---- umad2sim-Do-not-use-umad.h-deprecated-functions.patch umad2sim-define-UMAD_DEV_DIR-if-not-set.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ibsim.spec ++++++ --- /var/tmp/diff_new_pack.xtQ1HT/_old 2019-10-11 15:21:51.119355619 +0200 +++ /var/tmp/diff_new_pack.xtQ1HT/_new 2019-10-11 15:21:51.123355608 +0200 @@ -28,6 +28,8 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build Source: ibsim-%{version}%{git_ver}.tar.gz Patch1: ibsim-fix_type_punning.patch +Patch2: umad2sim-Do-not-use-umad.h-deprecated-functions.patch +Patch3: umad2sim-define-UMAD_DEV_DIR-if-not-set.patch Url: https://github.com/linux-rdma/ibsim BuildRequires: infiniband-diags-devel BuildRequires: libibumad-devel @@ -41,6 +43,8 @@ %prep %setup -q -n %{name}-%{version}%{git_ver} %patch1 +%patch2 +%patch3 %build export CFLAGS="${CFLAGS:-%{optflags}}" ++++++ umad2sim-Do-not-use-umad.h-deprecated-functions.patch ++++++ commit 27ac4f9fc31e0c9310795c6709f80d87115f2db5 Author: Nicolas Morey-Chaisemartin <[email protected]> Date: Wed Apr 17 10:06:07 2019 +0200 umad2sim: Do not use umad.h deprecated functions ntohll and htonll are deprecated in libibumad. Use the glibc functions instead Also, remove no longer needed includes Signed-off-by: Nicolas Morey-Chaisemartin <[email protected]> Signed-off-by: Hal Rosenstock <[email protected]> diff --git umad2sim/umad2sim.c umad2sim/umad2sim.c index 46510b011cca..023ae797a378 100644 --- umad2sim/umad2sim.c +++ umad2sim/umad2sim.c @@ -35,7 +35,6 @@ #define _GNU_SOURCE -#include <sys/types.h> #include <sys/stat.h> #include <sys/poll.h> #include <sys/ioctl.h> @@ -49,7 +48,6 @@ #include <string.h> #include <dirent.h> #include <dlfcn.h> -#include <netinet/in.h> #include <infiniband/umad.h> #include <infiniband/mad.h> @@ -442,7 +440,7 @@ static ssize_t umad2sim_read(struct umad2sim_dev *dev, void *buf, size_t count) umad->status = ntohl(req.status); umad->timeout_ms = 0; umad->retries = 0; - umad->length = umad_size() + ntohll(req.length); + umad->length = umad_size() + be64toh(req.length); umad->addr.qpn = req.sqp; umad->addr.qkey = 0; // agent->qkey; @@ -506,7 +504,7 @@ static ssize_t umad2sim_write(struct umad2sim_dev *dev, cnt = sizeof(req.mad); memcpy(req.mad, umad_get_mad(umad), cnt); - req.length = htonll(cnt); + req.length = htobe64(cnt); if (!mad_get_field(req.mad, 0, IB_MAD_RESPONSE_F)) { uint64_t trid = mad_get_field64(req.mad, 0, IB_MAD_TRID_F); ++++++ umad2sim-define-UMAD_DEV_DIR-if-not-set.patch ++++++ commit a9a631a8a421da862682ed56f8436b1eff40f6b1 Author: Nicolas Morey-Chaisemartin <[email protected]> Date: Fri Oct 11 08:38:23 2019 +0200 umad2sim: define UMAD_DEV_DIR if not set Signed-off-by: Nicolas Morey-Chaisemartin <[email protected]> diff --git umad2sim/umad2sim.c umad2sim/umad2sim.c index 023ae797a378..3465f47d5714 100644 --- umad2sim/umad2sim.c +++ umad2sim/umad2sim.c @@ -67,6 +67,10 @@ #define IB_PORT_EXT_SPEED_SUPPORTED_MASK (1<<14) +#ifndef UMAD_DEV_DIR +#define UMAD_DEV_DIR "/dev/infiniband" +#endif + struct ib_user_mad_reg_req { uint32_t id; uint32_t method_mask[4];
