d/numam-dpdk
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

vhost: remove virtio-net.h

Browse Source 
It barely has anything useful there, just 2 functions prototype. Here
move them to vhost-net.h, and delete it.

Signed-off-by: Yuanhan Liu <yuanhan.liu@linux.intel.com>
Tested-by: Rich Lane <rich.lane@bigswitch.com>
Acked-by: Rich Lane <rich.lane@bigswitch.com>
This commit is contained in:
Yuanhan Liu 2016-04-30 13:25:42 +08:00
parent 758e3471b4
commit f0fa04e35e
6 changed files with 3 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/librte_vhost/vhost-net.h
View File

@ -220,6 +220,9 @@ gpa_to_vva(struct virtio_net *dev, uint64_t guest_pa)
return vhost_va; return vhost_va;
} }
struct virtio_net_device_ops const *notify_ops;
struct virtio_net *get_device(int vid);
int vhost_new_device(void); int vhost_new_device(void);
void vhost_destroy_device(int); void vhost_destroy_device(int);

1
lib/librte_vhost/vhost_cuse/virtio-net-cdev.c
View File

@ -54,7 +54,6 @@
#include "rte_virtio_net.h" #include "rte_virtio_net.h"
#include "vhost-net.h" #include "vhost-net.h"
#include "virtio-net-cdev.h" #include "virtio-net-cdev.h"
#include "virtio-net.h"
#include "eventfd_copy.h" #include "eventfd_copy.h"
/* Line size for reading maps file. */ /* Line size for reading maps file. */

1
lib/librte_vhost/vhost_rxtx.c
View File

@ -46,7 +46,6 @@
#include <rte_arp.h> #include <rte_arp.h>
#include "vhost-net.h" #include "vhost-net.h"
#include "virtio-net.h"
#define MAX_PKT_BURST 32 #define MAX_PKT_BURST 32
#define VHOST_LOG_PAGE 4096 #define VHOST_LOG_PAGE 4096

1
lib/librte_vhost/vhost_user/virtio-net-user.c
View File

@ -43,7 +43,6 @@
#include <rte_common.h> #include <rte_common.h>
#include <rte_log.h> #include <rte_log.h>
#include "virtio-net.h"
#include "virtio-net-user.h" #include "virtio-net-user.h"
#include "vhost-net-user.h" #include "vhost-net-user.h"
#include "vhost-net.h" #include "vhost-net.h"

1
lib/librte_vhost/virtio-net.c
View File

@ -53,7 +53,6 @@
#include <rte_virtio_net.h> #include <rte_virtio_net.h>
#include "vhost-net.h" #include "vhost-net.h"
#include "virtio-net.h"
#define MAX_VHOST_DEVICE 1024 #define MAX_VHOST_DEVICE 1024
static struct virtio_net *vhost_devices[MAX_VHOST_DEVICE]; static struct virtio_net *vhost_devices[MAX_VHOST_DEVICE];

43
lib/librte_vhost/virtio-net.h
View File

@ -1,43 +0,0 @@
/*-
* BSD LICENSE
*
* Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
*
* * Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* * Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
* * Neither the name of Intel Corporation nor the names of its
* contributors may be used to endorse or promote products derived
* from this software without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
* A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
* OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#ifndef _VIRTIO_NET_H
#define _VIRTIO_NET_H
#include "vhost-net.h"
#include "rte_virtio_net.h"
struct virtio_net_device_ops const *notify_ops;
struct virtio_net *get_device(int vid);
#endif