openkylin
/
qemu
mirror of https://gitee.com/openkylin/qemu.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

rdma: fix up include directives 

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>
This commit is contained in:
Michael S. Tsirkin 2018-03-21 17:22:07 +02:00 committed by Marcel Apfelbaum
parent 79cfdca7aa
commit 0efc9511aa
12 changed files with 39 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
hw/rdma/rdma_backend.c
View File

@ -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>

2
hw/rdma/rdma_backend.h
View File

@ -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"

2
hw/rdma/rdma_backend_defs.h
View File

@ -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;

6
hw/rdma/rdma_rm.c
View File

@ -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"

2
hw/rdma/rdma_rm.h
View File

@ -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"

6
hw/rdma/rdma_utils.h
View File

@ -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__,\

8
hw/rdma/vmw/pvrdma.h
View File

@ -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 */

8
hw/rdma/vmw/pvrdma_cmd.c
View File

@ -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"
@ -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)

8
hw/rdma/vmw/pvrdma_dev_ring.c
View File

@ -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,

2
hw/rdma/vmw/pvrdma_dev_ring.h
View File

@ -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

24
hw/rdma/vmw/pvrdma_main.c
View File

@ -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"
@ -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[] = {

4
hw/rdma/vmw/pvrdma_qp_ops.c
View File

@ -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 {