From patchwork Sun Aug 19 20:22:58 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcel Apfelbaum X-Patchwork-Id: 959677 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="sSiSXGKe"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 41vDH82L7Hz9s8T for ; Mon, 20 Aug 2018 22:52:36 +1000 (AEST) Received: from localhost ([::1]:46917 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1frjfd-0005W4-TO for incoming@patchwork.ozlabs.org; Mon, 20 Aug 2018 08:52:33 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44003) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1frjYr-0000Cp-3u for qemu-devel@nongnu.org; Mon, 20 Aug 2018 08:45:34 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1frjYp-0000k9-HO for qemu-devel@nongnu.org; Mon, 20 Aug 2018 08:45:33 -0400 Received: from mail-wr1-x42a.google.com ([2a00:1450:4864:20::42a]:42212) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1frjYn-0000ho-92 for qemu-devel@nongnu.org; Mon, 20 Aug 2018 08:45:31 -0400 Received: by mail-wr1-x42a.google.com with SMTP id e7-v6so12871063wrs.9 for ; Mon, 20 Aug 2018 05:45:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=FF47ysipW5bdpdJVsg+t2YDCni+3o7HkFAqkOyWgLBM=; b=sSiSXGKe4Y7jBuo6rJHeBUHlXLO0WbzY+MYcfTiXnJn11mjbOajPmmsRw3BweIzZpf KVqcG+vYtVMoPyjvd40C/L9Sp4yj6Y6XbBAAqTccv6p3vigzGfiG7ddvXse7+LmDdUYr 360difOfYETyR2yfQlPKboBwPacHjNJ6KbsJPS7+BNwSDvIEAzQIyHS3Jph/x2yBl7QZ WpxQnmAbSVsuAOmCb0G2V24fmXmE6o7x/Ae93D6F8dk07PKLU5AQgqkDdY2stLoVL0ip 27x2TKmdjcyJfXFeCM94mSuvnUEGnXJ00zPXiza9ZAbZHlHud0meb5ycYDLAFdarv55G 8oMQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=FF47ysipW5bdpdJVsg+t2YDCni+3o7HkFAqkOyWgLBM=; b=YG6QJh1t8UtLxERYSPUD1uTqSQ8s3Gx+/kWbhZAD5HKJnndgmtTJhqYG7LiTrZwv5r 1DoT3c06QzSGE4EWi6/94bc2ynDCrxYjYkDx8ndylzJYp8yejyLUAcZRKntYyr4mbuev B7TXimx7BZQO2syRLDxj+a9mkNIpBvlnCmTI/5MdaOXH7YQN2IWR/xrc70HwgtjdKts3 JeIUdLpLW8i/C25lBw5f29T/jiuXJWY5LX696VLcQPG39ugJUBI6u79wsz0juxnoUbGT kgUGZOZvn6ixMo0V7sVu71PPmGEN3MLljTR0bZqkVoxhY6g2FdjflthByfC8USOvgOTv 9tyw== X-Gm-Message-State: AOUpUlHsUuroZVuO8FI/ESujIH28kZhQuiBrnsE2bGLysgFsWi46QHna UmHMAVPL64wVO5Gql9mZShu4VPwb X-Google-Smtp-Source: ANB0VdZ6s5jar1NnXnT4pEzO4nMgguLu1VIVQE4/+QGkjhmkAF0yiuWhD/UTiPW0c+GGCVbCycOApA== X-Received: by 2002:adf:a196:: with SMTP id u22-v6mr1326512wru.50.1534769125654; Mon, 20 Aug 2018 05:45:25 -0700 (PDT) Received: from localhost.localdomain ([176.228.154.53]) by smtp.gmail.com with ESMTPSA id g2-v6sm26704613wrd.71.2018.08.20.05.45.24 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 20 Aug 2018 05:45:25 -0700 (PDT) From: Marcel Apfelbaum To: qemu-devel@nongnu.org, peter.maydell@linaro.org Date: Sun, 19 Aug 2018 23:22:58 +0300 Message-Id: <20180819202300.10590-14-marcel.apfelbaum@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180819202300.10590-1-marcel.apfelbaum@gmail.com> References: <20180819202300.10590-1-marcel.apfelbaum@gmail.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::42a Subject: [Qemu-devel] [PATCH PULL 13/15] hw/rdma: Add reference to pci_dev in backend_dev X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: thuth@redhat.com, yuval.shaia@oracle.com Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Yuval Shaia The field backend_dev->dev is not initialized, fix it. Signed-off-by: Yuval Shaia Message-Id: <20180805153518.2983-14-yuval.shaia@oracle.com> Reviewed-by: Marcel Apfelbaum Signed-off-by: Marcel Apfelbaum --- hw/rdma/rdma_backend.c | 6 +++++- hw/rdma/rdma_backend.h | 2 +- hw/rdma/vmw/pvrdma_main.c | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/hw/rdma/rdma_backend.c b/hw/rdma/rdma_backend.c index d29acc505b..d7a4bbd91f 100644 --- a/hw/rdma/rdma_backend.c +++ b/hw/rdma/rdma_backend.c @@ -744,7 +744,7 @@ static int init_device_caps(RdmaBackendDev *backend_dev, return 0; } -int rdma_backend_init(RdmaBackendDev *backend_dev, +int rdma_backend_init(RdmaBackendDev *backend_dev, PCIDevice *pdev, RdmaDeviceResources *rdma_dev_res, const char *backend_device_name, uint8_t port_num, uint8_t backend_gid_idx, struct ibv_device_attr *dev_attr, @@ -756,6 +756,10 @@ int rdma_backend_init(RdmaBackendDev *backend_dev, struct ibv_device **dev_list; struct ibv_port_attr port_attr; + memset(backend_dev, 0, sizeof(*backend_dev)); + + backend_dev->dev = pdev; + backend_dev->backend_gid_idx = backend_gid_idx; backend_dev->port_num = port_num; backend_dev->rdma_dev_res = rdma_dev_res; diff --git a/hw/rdma/rdma_backend.h b/hw/rdma/rdma_backend.h index 3049a73962..86e8fe8ab6 100644 --- a/hw/rdma/rdma_backend.h +++ b/hw/rdma/rdma_backend.h @@ -46,7 +46,7 @@ static inline uint32_t rdma_backend_mr_rkey(const RdmaBackendMR *mr) return mr->ibmr ? mr->ibmr->rkey : 0; } -int rdma_backend_init(RdmaBackendDev *backend_dev, +int rdma_backend_init(RdmaBackendDev *backend_dev, PCIDevice *pdev, RdmaDeviceResources *rdma_dev_res, const char *backend_device_name, uint8_t port_num, uint8_t backend_gid_idx, struct ibv_device_attr *dev_attr, diff --git a/hw/rdma/vmw/pvrdma_main.c b/hw/rdma/vmw/pvrdma_main.c index 3d448bffc4..ca5fa8d981 100644 --- a/hw/rdma/vmw/pvrdma_main.c +++ b/hw/rdma/vmw/pvrdma_main.c @@ -611,7 +611,7 @@ static void pvrdma_realize(PCIDevice *pdev, Error **errp) goto out; } - rc = rdma_backend_init(&dev->backend_dev, &dev->rdma_dev_res, + rc = rdma_backend_init(&dev->backend_dev, pdev, &dev->rdma_dev_res, dev->backend_device_name, dev->backend_port_num, dev->backend_gid_idx, &dev->dev_attr, errp); if (rc) {