From patchwork Sat Dec 22 09:50:19 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcel Apfelbaum X-Patchwork-Id: 1017817 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::12; helo=lists.nongnu.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="tR8TF+AV"; dkim-atps=neutral Received: from lists.nongnu.org (lists.nongnu.org [IPv6:2001:4830:134:3::12]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 43MLcB2jdyz9sPd for ; Sat, 22 Dec 2018 21:01:14 +1100 (AEDT) Received: from localhost ([::1]:49749 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gae5n-0005Zq-Qg for incoming@patchwork.ozlabs.org; Sat, 22 Dec 2018 05:01:11 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41674) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gadvy-0006G4-9a for qemu-devel@nongnu.org; Sat, 22 Dec 2018 04:51:03 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gadvx-0006Rq-GM for qemu-devel@nongnu.org; Sat, 22 Dec 2018 04:51:02 -0500 Received: from mail-wm1-x342.google.com ([2a00:1450:4864:20::342]:40012) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gadvx-0006RT-Ad for qemu-devel@nongnu.org; Sat, 22 Dec 2018 04:51:01 -0500 Received: by mail-wm1-x342.google.com with SMTP id f188so7860807wmf.5 for ; Sat, 22 Dec 2018 01:51:01 -0800 (PST) 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=+lbu8Whjdwd0P/q1lJ6uz6K3myvpLKWj70uidx29BqE=; b=tR8TF+AVK4fT4ihTB6xs1ZvIIGQsMDDvTQOCHJnrkW0UwOxdf46WzjbdgMGVkj+2jX /oQabLB9WkJSIo1HZQuGdr6IBAjcsSBsrAG26NKBs2lRrcoFJvn3BqvkfD/FGeXOYJBg 25AbbWBYYkffqX7WqdOsReP8yl4vwI2n/6nzu/5dlDnuQaUE4udu3xbBj7WLCiTi/HM6 DI1YD9aO5Y5AiLOuaEPAYLyMjZMRLb2kur3uh+ccICilQDfG3uXD9nyUYQhWwEBMDLe2 hIYdlEYphGcYQScpuK+86gno1VBeycOLJPI0Caywl2dj7p209E27340S5VEtaQSOouH4 lAMQ== 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=+lbu8Whjdwd0P/q1lJ6uz6K3myvpLKWj70uidx29BqE=; b=f58jELHpHRFZA7b6kaEdNvC45+lnBnDfSYCyF1LbOUWC4NHm/X9n2atoWYaCZ9egNT xUs63aaw+c44uJIfYZz3t0TA8khGecUqWHTysmNDgHtOPiQxhpD3AmBgwtojh0SVz8iG scZTGOSrKemw2Qt/7ohl1tk5QUNe9liZ7/M5V/q3Y7q41Buikeg8jmbfBAROaCrJbUZK za6Yf/gHqmzRDzSkRzBU/jtfLjEvlExmpI0RpveoiqQL5ymdrom6LgbneysoOk4bJDzu Tc5tVUF76ismHXs9c/S0xL3hRIzz1+gZn7GjCOWDXqIcT7PR8wk6SId8+SSVn6GP7L0w 7EBw== X-Gm-Message-State: AJcUukehnFdexHXxJPHeTFneKzB20TdoMfFk1s0wlC770Yfr6lOg+Rsn nGlpv7L2GdkSH52LXJ6929Jnrp1n X-Google-Smtp-Source: ALg8bN4zhQZBCHz3pL4gJCh/Xruzar/YaqSeVe7za0Wes0hvzKiHZstE6zKfM3dijLu9AeGNZqxQGQ== X-Received: by 2002:a1c:8c05:: with SMTP id o5mr5629708wmd.29.1545472260182; Sat, 22 Dec 2018 01:51:00 -0800 (PST) Received: from localhost.localdomain ([176.228.155.165]) by smtp.gmail.com with ESMTPSA id s3sm9557371wmj.23.2018.12.22.01.50.58 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Sat, 22 Dec 2018 01:50:59 -0800 (PST) From: Marcel Apfelbaum To: qemu-devel@nongnu.org, peter.maydell@linaro.org Date: Sat, 22 Dec 2018 11:50:19 +0200 Message-Id: <20181222095036.29743-15-marcel.apfelbaum@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20181222095036.29743-1-marcel.apfelbaum@gmail.com> References: <20181222095036.29743-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::342 Subject: [Qemu-devel] [PATCH PULL 14/31] hw/pvrdma: Make sure PCI function 0 is vmxnet3 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: yuval.shaia@oracle.com, pjp@fedoraproject.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Yuval Shaia Guest driver enforces it, we should also. Signed-off-by: Yuval Shaia Reviewed-by: Marcel Apfelbaum Signed-off-by: Marcel Apfelbaum --- hw/rdma/vmw/pvrdma.h | 2 ++ hw/rdma/vmw/pvrdma_main.c | 12 ++++++++++++ 2 files changed, 14 insertions(+) diff --git a/hw/rdma/vmw/pvrdma.h b/hw/rdma/vmw/pvrdma.h index b019cb843a..10a3c4fb7c 100644 --- a/hw/rdma/vmw/pvrdma.h +++ b/hw/rdma/vmw/pvrdma.h @@ -20,6 +20,7 @@ #include "hw/pci/pci.h" #include "hw/pci/msix.h" #include "chardev/char-fe.h" +#include "hw/net/vmxnet3_defs.h" #include "../rdma_backend_defs.h" #include "../rdma_rm_defs.h" @@ -85,6 +86,7 @@ typedef struct PVRDMADev { RdmaBackendDev backend_dev; RdmaDeviceResources rdma_dev_res; CharBackend mad_chr; + VMXNET3State *func0; } PVRDMADev; #define PVRDMA_DEV(dev) OBJECT_CHECK(PVRDMADev, (dev), PVRDMA_HW_NAME) diff --git a/hw/rdma/vmw/pvrdma_main.c b/hw/rdma/vmw/pvrdma_main.c index ac8c092db0..b35b5dc5f0 100644 --- a/hw/rdma/vmw/pvrdma_main.c +++ b/hw/rdma/vmw/pvrdma_main.c @@ -565,6 +565,7 @@ static void pvrdma_realize(PCIDevice *pdev, Error **errp) PVRDMADev *dev = PVRDMA_DEV(pdev); Object *memdev_root; bool ram_shared = false; + PCIDevice *func0; init_pr_dbg(); @@ -576,6 +577,17 @@ static void pvrdma_realize(PCIDevice *pdev, Error **errp) return; } + func0 = pci_get_function_0(pdev); + /* Break if not vmxnet3 device in slot 0 */ + if (strcmp(object_get_typename(&func0->qdev.parent_obj), TYPE_VMXNET3)) { + pr_dbg("func0 type is %s\n", + object_get_typename(&func0->qdev.parent_obj)); + error_setg(errp, "Device on %x.0 must be %s", PCI_SLOT(pdev->devfn), + TYPE_VMXNET3); + return; + } + dev->func0 = VMXNET3(func0); + memdev_root = object_resolve_path("/objects", NULL); if (memdev_root) { object_child_foreach(memdev_root, pvrdma_check_ram_shared, &ram_shared);