Skip to content

Commit

Permalink
rdma: fix up include directives
Browse files Browse the repository at this point in the history
Our rule right now is to use <> for external headers only.
RDMA code violates that, fix it up.

Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Reviewed-by: Marcel Apfelbaum <marcel@redhat.com>
Signed-off-by: Marcel Apfelbaum <marcel@redhat.com>
  • Loading branch information
mstsirkin authored and marcel-apf committed Mar 23, 2018
1 parent 79cfdca commit 0efc951
Show file tree
Hide file tree
Showing 12 changed files with 39 additions and 39 deletions.
6 changes: 3 additions & 3 deletions hw/rdma/rdma_backend.c
Expand Up @@ -13,9 +13,9 @@
*
*/

#include <qemu/osdep.h>
#include <qemu/error-report.h>
#include <qapi/error.h>
#include "qemu/osdep.h"
#include "qemu/error-report.h"
#include "qapi/error.h"

#include <infiniband/verbs.h>

Expand Down
2 changes: 1 addition & 1 deletion hw/rdma/rdma_backend.h
Expand Up @@ -16,7 +16,7 @@
#ifndef RDMA_BACKEND_H
#define RDMA_BACKEND_H

#include <qapi/error.h>
#include "qapi/error.h"
#include "rdma_rm_defs.h"
#include "rdma_backend_defs.h"

Expand Down
2 changes: 1 addition & 1 deletion hw/rdma/rdma_backend_defs.h
Expand Up @@ -17,7 +17,7 @@
#define RDMA_BACKEND_DEFS_H

#include <infiniband/verbs.h>
#include <qemu/thread.h>
#include "qemu/thread.h"

typedef struct RdmaDeviceResources RdmaDeviceResources;

Expand Down
6 changes: 3 additions & 3 deletions hw/rdma/rdma_rm.c
Expand Up @@ -13,9 +13,9 @@
*
*/

#include <qemu/osdep.h>
#include <qapi/error.h>
#include <cpu.h>
#include "qemu/osdep.h"
#include "qapi/error.h"
#include "cpu.h"

#include "rdma_utils.h"
#include "rdma_backend.h"
Expand Down
2 changes: 1 addition & 1 deletion hw/rdma/rdma_rm.h
Expand Up @@ -16,7 +16,7 @@
#ifndef RDMA_RM_H
#define RDMA_RM_H

#include <qapi/error.h>
#include "qapi/error.h"
#include "rdma_backend_defs.h"
#include "rdma_rm_defs.h"

Expand Down
6 changes: 3 additions & 3 deletions hw/rdma/rdma_utils.h
Expand Up @@ -17,9 +17,9 @@
#ifndef RDMA_UTILS_H
#define RDMA_UTILS_H

#include <qemu/osdep.h>
#include <include/hw/pci/pci.h>
#include <include/sysemu/dma.h>
#include "qemu/osdep.h"
#include "hw/pci/pci.h"
#include "sysemu/dma.h"

#define pr_info(fmt, ...) \
fprintf(stdout, "%s: %-20s (%3d): " fmt, "pvrdma", __func__, __LINE__,\
Expand Down
8 changes: 4 additions & 4 deletions hw/rdma/vmw/pvrdma.h
Expand Up @@ -16,14 +16,14 @@
#ifndef PVRDMA_PVRDMA_H
#define PVRDMA_PVRDMA_H

#include <hw/pci/pci.h>
#include <hw/pci/msix.h>
#include "hw/pci/pci.h"
#include "hw/pci/msix.h"

#include "../rdma_backend_defs.h"
#include "../rdma_rm_defs.h"

#include <standard-headers/drivers/infiniband/hw/vmw_pvrdma/pvrdma_ring.h>
#include <standard-headers/drivers/infiniband/hw/vmw_pvrdma/pvrdma_dev_api.h>
#include "standard-headers/drivers/infiniband/hw/vmw_pvrdma/pvrdma_ring.h"
#include "standard-headers/drivers/infiniband/hw/vmw_pvrdma/pvrdma_dev_api.h"
#include "pvrdma_dev_ring.h"

/* BARs */
Expand Down
8 changes: 4 additions & 4 deletions hw/rdma/vmw/pvrdma_cmd.c
Expand Up @@ -13,9 +13,9 @@
*
*/

#include <qemu/osdep.h>
#include <qemu/error-report.h>
#include <cpu.h>
#include "qemu/osdep.h"
#include "qemu/error-report.h"
#include "cpu.h"
#include <linux/types.h>
#include "hw/hw.h"
#include "hw/pci/pci.h"
Expand All @@ -26,7 +26,7 @@
#include "../rdma_utils.h"

#include "pvrdma.h"
#include <standard-headers/rdma/vmw_pvrdma-abi.h>
#include "standard-headers/rdma/vmw_pvrdma-abi.h"

static void *pvrdma_map_to_pdir(PCIDevice *pdev, uint64_t pdir_dma,
uint32_t nchunks, size_t length)
Expand Down
8 changes: 4 additions & 4 deletions hw/rdma/vmw/pvrdma_dev_ring.c
Expand Up @@ -13,12 +13,12 @@
*
*/

#include <qemu/osdep.h>
#include <hw/pci/pci.h>
#include <cpu.h>
#include "qemu/osdep.h"
#include "hw/pci/pci.h"
#include "cpu.h"

#include "../rdma_utils.h"
#include <standard-headers/drivers/infiniband/hw/vmw_pvrdma/pvrdma_ring.h>
#include "standard-headers/drivers/infiniband/hw/vmw_pvrdma/pvrdma_ring.h"
#include "pvrdma_dev_ring.h"

int pvrdma_ring_init(PvrdmaRing *ring, const char *name, PCIDevice *dev,
Expand Down
2 changes: 1 addition & 1 deletion hw/rdma/vmw/pvrdma_dev_ring.h
Expand Up @@ -16,7 +16,7 @@
#ifndef PVRDMA_DEV_RING_H
#define PVRDMA_DEV_RING_H

#include <qemu/typedefs.h>
#include "qemu/typedefs.h"

#define MAX_RING_NAME_SZ 32

Expand Down
24 changes: 12 additions & 12 deletions hw/rdma/vmw/pvrdma_main.c
Expand Up @@ -13,16 +13,16 @@
*
*/

#include <qemu/osdep.h>
#include <qapi/error.h>
#include <hw/hw.h>
#include <hw/pci/pci.h>
#include <hw/pci/pci_ids.h>
#include <hw/pci/msi.h>
#include <hw/pci/msix.h>
#include <hw/qdev-core.h>
#include <hw/qdev-properties.h>
#include <cpu.h>
#include "qemu/osdep.h"
#include "qapi/error.h"
#include "hw/hw.h"
#include "hw/pci/pci.h"
#include "hw/pci/pci_ids.h"
#include "hw/pci/msi.h"
#include "hw/pci/msix.h"
#include "hw/qdev-core.h"
#include "hw/qdev-properties.h"
#include "cpu.h"
#include "trace.h"

#include "../rdma_rm.h"
Expand All @@ -31,8 +31,8 @@

#include <infiniband/verbs.h>
#include "pvrdma.h"
#include <standard-headers/rdma/vmw_pvrdma-abi.h>
#include <standard-headers/drivers/infiniband/hw/vmw_pvrdma/pvrdma_dev_api.h>
#include "standard-headers/rdma/vmw_pvrdma-abi.h"
#include "standard-headers/drivers/infiniband/hw/vmw_pvrdma/pvrdma_dev_api.h"
#include "pvrdma_qp_ops.h"

static Property pvrdma_dev_properties[] = {
Expand Down
4 changes: 2 additions & 2 deletions hw/rdma/vmw/pvrdma_qp_ops.c
Expand Up @@ -13,14 +13,14 @@
*
*/

#include <qemu/osdep.h>
#include "qemu/osdep.h"

#include "../rdma_utils.h"
#include "../rdma_rm.h"
#include "../rdma_backend.h"

#include "pvrdma.h"
#include <standard-headers/rdma/vmw_pvrdma-abi.h>
#include "standard-headers/rdma/vmw_pvrdma-abi.h"
#include "pvrdma_qp_ops.h"

typedef struct CompHandlerCtx {
Expand Down

0 comments on commit 0efc951

Please sign in to comment.