Commit 197053e2 authored by Marcel Apfelbaum's avatar Marcel Apfelbaum
Browse files

hw/rdma: fix clang compilation errors 



Fix some enum castings and extra parentheses.

Reported-by: default avatarMichael S. Tsirkin <mst@redhat.com>
Signed-off-by: default avatarMarcel Apfelbaum <marcel@redhat.com>
Message-Id: <20180321140316.96045-1-marcel@redhat.com>
Reviewed-by: default avatarYuval Shaia <yuval.shaia@oracle.com>
parent 9edc19c9

hw/rdma/vmw/pvrdma_cmd.c

+3 −2
Original line number Diff line number Diff line
@@ -73,7 +73,7 @@ static void *pvrdma_map_to_pdir(PCIDevice *pdev, uint64_t pdir_dma, 
    tbl_idx = 1;

    addr_idx = 1;

    while (addr_idx < nchunks) {

        if ((tbl_idx == (TARGET_PAGE_SIZE / sizeof(uint64_t)))) {

        if (tbl_idx == TARGET_PAGE_SIZE / sizeof(uint64_t)) {

            tbl_idx = 0;

            dir_idx++;

            pr_dbg("Mapping to table %d\n", dir_idx);
@@ -507,7 +507,8 @@ static int modify_qp(PVRDMADev *dev, union pvrdma_cmd_req *req, 
    rsp->hdr.err = rdma_rm_modify_qp(&dev->rdma_dev_res, &dev->backend_dev,

                                 cmd->qp_handle, cmd->attr_mask,

                                 (union ibv_gid *)&cmd->attrs.ah_attr.grh.dgid,

                                 cmd->attrs.dest_qp_num, cmd->attrs.qp_state,

                                 cmd->attrs.dest_qp_num,

                                 (enum ibv_qp_state)cmd->attrs.qp_state,

                                 cmd->attrs.qkey, cmd->attrs.rq_psn,

                                 cmd->attrs.sq_psn);

hw/rdma/vmw/pvrdma_main.c

+2 −2
Original line number Diff line number Diff line
@@ -91,7 +91,7 @@ static int init_dev_ring(PvrdmaRing *ring, struct pvrdma_ring **ring_state, 
        goto out_free_tbl;

    }

    /* RX ring is the second */

    (struct pvrdma_ring *)(*ring_state)++;

    (*ring_state)++;

    rc = pvrdma_ring_init(ring, name, pci_dev,

                          (struct pvrdma_ring *)*ring_state,

                          (num_pages - 1) * TARGET_PAGE_SIZE /
@@ -292,7 +292,7 @@ static void init_ports(PVRDMADev *dev, Error **errp) 
    memset(dev->rdma_dev_res.ports, 0, sizeof(dev->rdma_dev_res.ports));



    for (i = 0; i < MAX_PORTS; i++) {

        dev->rdma_dev_res.ports[i].state = PVRDMA_PORT_DOWN;

        dev->rdma_dev_res.ports[i].state = IBV_PORT_DOWN;



        dev->rdma_dev_res.ports[i].pkey_tbl =

            g_malloc0(sizeof(*dev->rdma_dev_res.ports[i].pkey_tbl) *