[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH PULL 14/31] hw/pvrdma: Make sure PCI function 0 is v
From: |
Marcel Apfelbaum |
Subject: |
[Qemu-devel] [PATCH PULL 14/31] hw/pvrdma: Make sure PCI function 0 is vmxnet3 |
Date: |
Sat, 22 Dec 2018 11:50:19 +0200 |
From: Yuval Shaia <address@hidden>
Guest driver enforces it, we should also.
Signed-off-by: Yuval Shaia <address@hidden>
Reviewed-by: Marcel Apfelbaum <address@hidden>
Signed-off-by: Marcel Apfelbaum <address@hidden>
---
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);
--
2.17.1
- [Qemu-devel] [PATCH PULL 00/31] RDMA queue, Marcel Apfelbaum, 2018/12/22
- [Qemu-devel] [PATCH PULL 01/31] hw/pvrdma: Check the correct return value, Marcel Apfelbaum, 2018/12/22
- [Qemu-devel] [PATCH PULL 04/31] hw/rdma: Return qpn 1 if ibqp is NULL, Marcel Apfelbaum, 2018/12/22
- [Qemu-devel] [PATCH PULL 05/31] hw/rdma: Abort send-op if fail to create addr handler, Marcel Apfelbaum, 2018/12/22
- [Qemu-devel] [PATCH PULL 03/31] hw/rdma: Add ability to force notification without re-arm, Marcel Apfelbaum, 2018/12/22
- [Qemu-devel] [PATCH PULL 08/31] hw/pvrdma: Make default pkey 0xFFFF, Marcel Apfelbaum, 2018/12/22
- [Qemu-devel] [PATCH PULL 07/31] hw/pvrdma: Make function reset_device return void, Marcel Apfelbaum, 2018/12/22
- [Qemu-devel] [PATCH PULL 02/31] contrib/rdmacm-mux: Add implementation of RDMA User MAD multiplexer, Marcel Apfelbaum, 2018/12/22
- [Qemu-devel] [PATCH PULL 09/31] hw/pvrdma: Set the correct opcode for recv completion, Marcel Apfelbaum, 2018/12/22
- [Qemu-devel] [PATCH PULL 13/31] vmxnet3: Move some definitions to header file, Marcel Apfelbaum, 2018/12/22
- [Qemu-devel] [PATCH PULL 14/31] hw/pvrdma: Make sure PCI function 0 is vmxnet3,
Marcel Apfelbaum <=
- [Qemu-devel] [PATCH PULL 10/31] hw/pvrdma: Set the correct opcode for send completion, Marcel Apfelbaum, 2018/12/22
- [Qemu-devel] [PATCH PULL 06/31] hw/rdma: Add support for MAD packets, Marcel Apfelbaum, 2018/12/22
- [Qemu-devel] [PATCH PULL 11/31] qapi: Define new QMP message for pvrdma, Marcel Apfelbaum, 2018/12/22
- [Qemu-devel] [PATCH PULL 12/31] hw/pvrdma: Add support to allow guest to configure GID table, Marcel Apfelbaum, 2018/12/22
- [Qemu-devel] [PATCH PULL 15/31] hw/rdma: Initialize node_guid from vmxnet3 mac address, Marcel Apfelbaum, 2018/12/22
- [Qemu-devel] [PATCH PULL 16/31] hw/pvrdma: Make device state depend on Ethernet function state, Marcel Apfelbaum, 2018/12/22
- [Qemu-devel] [PATCH PULL 17/31] hw/pvrdma: Fill all CQE fields, Marcel Apfelbaum, 2018/12/22
- [Qemu-devel] [PATCH PULL 18/31] hw/pvrdma: Fill error code in command's response, Marcel Apfelbaum, 2018/12/22
- [Qemu-devel] [PATCH PULL 19/31] hw/rdma: Remove unneeded code that handles more that one port, Marcel Apfelbaum, 2018/12/22
- [Qemu-devel] [PATCH PULL 21/31] hw/pvrdma: Clean device's resource when system is shutdown, Marcel Apfelbaum, 2018/12/22