jcs.org
qemu with hax to log dma reads & writes
jcs.org/2018/11/12/vfio
net/tap: Replace tap-haiku.c and tap-aix.c by a generic tap-stub.c
The files tap-haiku.c and tap-aix.c are identical (except one line
of error message). We should avoid such code duplication, so replace
these by a generic tap-stub.c file instead.
Signed-off-by: Thomas Huth <thuth@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Signed-off-by: Jason Wang <jasowang@redhat.com>
authored by
Thomas Huth
and committed by
Jason Wang
4348300e
56821559
+9
-96
+8
-7
net/Makefile.objs
+8
-7
net/Makefile.objs
···
3
3
common-obj-y += dump.o
4
4
common-obj-y += eth.o
5
5
common-obj-$(CONFIG_L2TPV3) += l2tpv3.o
6
-
common-obj-$(CONFIG_POSIX) += tap.o vhost-user.o
7
-
common-obj-$(CONFIG_LINUX) += tap-linux.o
8
-
common-obj-$(CONFIG_WIN32) += tap-win32.o
9
-
common-obj-$(CONFIG_BSD) += tap-bsd.o
10
-
common-obj-$(CONFIG_SOLARIS) += tap-solaris.o
11
-
common-obj-$(CONFIG_AIX) += tap-aix.o
12
-
common-obj-$(CONFIG_HAIKU) += tap-haiku.o
6
+
common-obj-$(CONFIG_POSIX) += vhost-user.o
13
7
common-obj-$(CONFIG_SLIRP) += slirp.o
14
8
common-obj-$(CONFIG_VDE) += vde.o
15
9
common-obj-$(CONFIG_NETMAP) += netmap.o
···
20
14
common-obj-y += colo.o
21
15
common-obj-y += filter-rewriter.o
22
16
common-obj-y += filter-replay.o
17
+
18
+
tap-obj-$(CONFIG_LINUX) = tap-linux.o
19
+
tap-obj-$(CONFIG_BSD) = tap-bsd.o
20
+
tap-obj-$(CONFIG_SOLARIS) = tap-solaris.o
21
+
tap-obj-y ?= tap-stub.o
22
+
common-obj-$(CONFIG_POSIX) += tap.o $(tap-obj-y)
23
+
common-obj-$(CONFIG_WIN32) += tap-win32.o
-88
net/tap-aix.c
-88
net/tap-aix.c
···
1
-
/*
2
-
* QEMU System Emulator
3
-
*
4
-
* Copyright (c) 2003-2008 Fabrice Bellard
5
-
*
6
-
* Permission is hereby granted, free of charge, to any person obtaining a copy
7
-
* of this software and associated documentation files (the "Software"), to deal
8
-
* in the Software without restriction, including without limitation the rights
9
-
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
10
-
* copies of the Software, and to permit persons to whom the Software is
11
-
* furnished to do so, subject to the following conditions:
12
-
*
13
-
* The above copyright notice and this permission notice shall be included in
14
-
* all copies or substantial portions of the Software.
15
-
*
16
-
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
17
-
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
18
-
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
19
-
* THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
20
-
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
21
-
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
22
-
* THE SOFTWARE.
23
-
*/
24
-
25
-
#include "qemu/osdep.h"
26
-
#include "qapi/error.h"
27
-
#include "tap_int.h"
28
-
29
-
int tap_open(char *ifname, int ifname_size, int *vnet_hdr,
30
-
int vnet_hdr_required, int mq_required, Error **errp)
31
-
{
32
-
error_setg(errp, "no tap on AIX");
33
-
return -1;
34
-
}
35
-
36
-
void tap_set_sndbuf(int fd, const NetdevTapOptions *tap, Error **errp)
37
-
{
38
-
}
39
-
40
-
int tap_probe_vnet_hdr(int fd)
41
-
{
42
-
return 0;
43
-
}
44
-
45
-
int tap_probe_has_ufo(int fd)
46
-
{
47
-
return 0;
48
-
}
49
-
50
-
int tap_probe_vnet_hdr_len(int fd, int len)
51
-
{
52
-
return 0;
53
-
}
54
-
55
-
void tap_fd_set_vnet_hdr_len(int fd, int len)
56
-
{
57
-
}
58
-
59
-
int tap_fd_set_vnet_le(int fd, int is_le)
60
-
{
61
-
return -EINVAL;
62
-
}
63
-
64
-
int tap_fd_set_vnet_be(int fd, int is_be)
65
-
{
66
-
return -EINVAL;
67
-
}
68
-
69
-
void tap_fd_set_offload(int fd, int csum, int tso4,
70
-
int tso6, int ecn, int ufo)
71
-
{
72
-
}
73
-
74
-
int tap_fd_enable(int fd)
75
-
{
76
-
return -1;
77
-
}
78
-
79
-
int tap_fd_disable(int fd)
80
-
{
81
-
return -1;
82
-
}
83
-
84
-
int tap_fd_get_ifname(int fd, char *ifname)
85
-
{
86
-
return -1;
87
-
}
88
-
+1
-1
net/tap-haiku.c
net/tap-stub.c
+1
-1
net/tap-haiku.c
net/tap-stub.c