[Qemu-devel] [PULL 0/1] RDMA queue

[Qemu-devel] [PULL 0/1] RDMA queue

[Marcel Apfelbaum]

The following changes since commit a05f8ecd88f15273d033b6f044b850a8af84a5b8:

  Merge remote-tracking branch 'remotes/alistair/tags/pull-riscv-to-apply-20201217-1' into staging (2020-12-18 11:12:35 +0000)

are available in the Git repository at:

  https://github.com/marcel-apf/qemu tags/rdma-pull-request

for you to fetch changes up to eed31bc5e2e9cc68626d51e7a10914dc52c370f8:

  contrib/rdmacm-mux: Fix error condition in hash_tbl_search_fd_by_ifid() (2020-12-18 20:15:42 +0200)

----------------------------------------------------------------
RDMA queue

*  bug fix in contrib/rdmacm-mux

----------------------------------------------------------------
AlexChen (1):
      contrib/rdmacm-mux: Fix error condition in hash_tbl_search_fd_by_ifid()

 contrib/rdmacm-mux/main.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

-- 
2.17.2

[Qemu-devel] [PULL 1/1] contrib/rdmacm-mux: Fix error condition in hash_tbl_search_fd_by_ifid()

[Marcel Apfelbaum]

From: AlexChen <alex.chen@huawei.com>

When fd is not found according to ifid, the _hash_tbl_search_fd_by_ifid()
returns 0 and assigns the result to *fd, so We have to check that *fd is 0,
not that fd is 0.

Reported-by: Euler Robot <euler.robot@huawei.com>
Signed-off-by: AlexChen <alex.chen@huawei.com>
Message-Id: <5F9AC6FF.4000301@huawei.com>
Reviewed-by: Marcel Apfelbaum <marcel.apfelbaum@gmail.com>
Signed-off-by: Marcel Apfelbaum <marcel.apfelbaum@gmail.com>
---
 contrib/rdmacm-mux/main.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/contrib/rdmacm-mux/main.c b/contrib/rdmacm-mux/main.c
index bd82abbad3..771ca01e03 100644
--- a/contrib/rdmacm-mux/main.c
+++ b/contrib/rdmacm-mux/main.c
@@ -186,7 +186,7 @@ static int hash_tbl_search_fd_by_ifid(int *fd, __be64 *gid_ifid)
     *fd = _hash_tbl_search_fd_by_ifid(gid_ifid);
     pthread_rwlock_unlock(&server.lock);
 
-    if (!fd) {
+    if (!*fd) {
         syslog(LOG_WARNING, "Can't find matching for ifid 0x%llx\n", *gid_ifid);
         return -ENOENT;
     }
-- 
2.17.2

Re: [Qemu-devel] [PULL 0/1] RDMA queue

[Peter Maydell]

On Fri, 18 Dec 2020 at 19:00, Marcel Apfelbaum
<marcel.apfelbaum@gmail.com> wrote:
>
> The following changes since commit a05f8ecd88f15273d033b6f044b850a8af84a5b8:
>
>   Merge remote-tracking branch 'remotes/alistair/tags/pull-riscv-to-apply-20201217-1' into staging (2020-12-18 11:12:35 +0000)
>
> are available in the Git repository at:
>
>   https://github.com/marcel-apf/qemu tags/rdma-pull-request
>
> for you to fetch changes up to eed31bc5e2e9cc68626d51e7a10914dc52c370f8:
>
>   contrib/rdmacm-mux: Fix error condition in hash_tbl_search_fd_by_ifid() (2020-12-18 20:15:42 +0200)
>
> ----------------------------------------------------------------
> RDMA queue
>
> *  bug fix in contrib/rdmacm-mux
>


Applied, thanks.

Please update the changelog at https://wiki.qemu.org/ChangeLog/6.0
for any user-visible changes.

-- PMM