ligang/vpp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

vlib: move pci api types from vnet/pci to vlib/pci

Browse Source 
Type: fix

Signed-off-by: Jakub Grajciar <jgrajcia@cisco.com>
Change-Id: I1a60809a8bbbbb8ac8b65ab990d51aae1229647f
Signed-off-by: Jakub Grajciar <jgrajcia@cisco.com>
This commit is contained in:
Jakub Grajciar
2020-03-30 08:12:57 +02:00
committed by Damjan Marion
parent e6b4a5ac14
commit 53f06a0148
8 changed files with 12 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/cmake/api.cmake
View File

@ -150,6 +150,5 @@ function(vpp_add_api_files name dir component)
endfunction()
add_custom_target(api_headers
DEPENDS vlibmemory_api_headers vnet_api_headers vpp_api_headers
DEPENDS vlibmemory_api_headers vnet_api_headers vpp_api_headers vlib_api_headers
)

7
src/vlib/CMakeLists.txt
View File

@ -63,6 +63,7 @@ add_vpp_library(vlib
node_cli.c
node_format.c
pci/pci.c
pci/pci_types_api.c
physmem.c
punt.c
punt_node.c
@ -103,6 +104,7 @@ add_vpp_library(vlib
node.h
pci/pci_config.h
pci/pci.h
pci/pci_types_api.h
physmem_funcs.h
physmem.h
punt.h
@ -116,5 +118,10 @@ add_vpp_library(vlib
vlib.h
vmbus/vmbus.h
API_FILES
pci/pci_types.api
LINK_LIBRARIES vppinfra svm ${VMBUS_LIBS} ${CMAKE_DL_LIBS}
DEPENDS api_headers
)

0
src/vnet/pci/pci_types.api → src/vlib/pci/pci_types.api
View File

16
src/vnet/pci/pci_types_api.c → src/vlib/pci/pci_types_api.c
View File

@ -14,21 +14,9 @@
*/
#include <vlibapi/api_types.h>
#include <vnet/pci/pci_types_api.h>
#include <vlib/pci/pci_types_api.h>
#define vl_typedefs /* define message structures */
#include <vnet/vnet_all_api_h.h>
#undef vl_typedefs
#define vl_endianfun /* define message structures */
#include <vnet/vnet_all_api_h.h>
#undef vl_endianfun
/* instantiate all the print functions we know about */
#define vl_print(handle, ...) vlib_cli_output (handle, __VA_ARGS__)
#define vl_printfun
#include <vnet/vnet_all_api_h.h>
#undef vl_printfun
#include <vlib/pci/pci_types.api_types.h>
void
pci_address_decode (const vl_api_pci_address_t * in, vlib_pci_addr_t * out)

0
src/vnet/pci/pci_types_api.h → src/vlib/pci/pci_types_api.h
View File

14
src/vnet/CMakeLists.txt
View File

@ -1515,20 +1515,6 @@ list(APPEND VNET_HEADERS
list(APPEND VNET_API_FILES syslog/syslog.api)
##############################################################################
# PCI
##############################################################################
list (APPEND VNET_SOURCES
pci/pci_types_api.c
)
list(APPEND VNET_HEADERS
pci/pci_types_api.h
)
list(APPEND VNET_API_FILES pci/pci_types.api)
##############################################################################
# Tunnel Endpoint Information Base
##############################################################################

2
src/vnet/devices/virtio/virtio.api
View File

@ -17,7 +17,7 @@ option version = "2.0.0";
import "vnet/interface_types.api";
import "vnet/ethernet/ethernet_types.api";
import "vnet/pci/pci_types.api";
import "vlib/pci/pci_types.api";
/** \brief Initialize a new virtio pci interface with the given parameters

2
src/vnet/devices/virtio/virtio_api.c
View File

@ -25,7 +25,7 @@
#include <vnet/ip/ip.h>
#include <vnet/devices/virtio/virtio.h>
#include <vnet/devices/virtio/pci.h>
#include <vnet/pci/pci_types_api.h>
#include <vlib/pci/pci_types_api.h>
#include <vnet/vnet_msg_enum.h>