1. Patchew
  2. QEMU
  3. View series

[Qemu-devel] [PATCH for-2.10] net/tap: Replace tap-haiku.c and tap-aix.c by a generic tap-stub.c

Thomas Huth posted 1 patch 7 years ago
Patches applied successfully (tree, apply log)
git fetch https://github.com/patchew-project/qemu tags/patchew/1491221116-11776-1-git-send-email-thuth@redhat.com
Test checkpatch passed
Test docker passed
Test s390x passed
net/Makefile.objs             | 15 ++++----
net/tap-haiku.c               | 87 -------------------------------------------
net/{tap-aix.c => tap-stub.c} |  3 +-
3 files changed, 9 insertions(+), 96 deletions(-)
delete mode 100644 net/tap-haiku.c
rename net/{tap-aix.c => tap-stub.c} (97%)
[Qemu-devel] [PATCH for-2.10] net/tap: Replace tap-haiku.c and tap-aix.c by a generic tap-stub.c
Posted by Thomas Huth 7 years ago 
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>
---
 net/Makefile.objs             | 15 ++++----
 net/tap-haiku.c               | 87 -------------------------------------------
 net/{tap-aix.c => tap-stub.c} |  3 +-
 3 files changed, 9 insertions(+), 96 deletions(-)
 delete mode 100644 net/tap-haiku.c
 rename net/{tap-aix.c => tap-stub.c} (97%)

diff --git a/net/Makefile.objs b/net/Makefile.objs
index 2e2fd43..67ba5e2 100644
--- a/net/Makefile.objs
+++ b/net/Makefile.objs
@@ -3,13 +3,7 @@ common-obj-y += socket.o
 common-obj-y += dump.o
 common-obj-y += eth.o
 common-obj-$(CONFIG_L2TPV3) += l2tpv3.o
-common-obj-$(CONFIG_POSIX) += tap.o vhost-user.o
-common-obj-$(CONFIG_LINUX) += tap-linux.o
-common-obj-$(CONFIG_WIN32) += tap-win32.o
-common-obj-$(CONFIG_BSD) += tap-bsd.o
-common-obj-$(CONFIG_SOLARIS) += tap-solaris.o
-common-obj-$(CONFIG_AIX) += tap-aix.o
-common-obj-$(CONFIG_HAIKU) += tap-haiku.o
+common-obj-$(CONFIG_POSIX) += vhost-user.o
 common-obj-$(CONFIG_SLIRP) += slirp.o
 common-obj-$(CONFIG_VDE) += vde.o
 common-obj-$(CONFIG_NETMAP) += netmap.o
@@ -20,3 +14,10 @@ common-obj-y += colo-compare.o
 common-obj-y += colo.o
 common-obj-y += filter-rewriter.o
 common-obj-y += filter-replay.o
+
+tap-obj-$(CONFIG_LINUX) = tap-linux.o
+tap-obj-$(CONFIG_BSD) = tap-bsd.o
+tap-obj-$(CONFIG_SOLARIS) = tap-solaris.o
+tap-obj-y ?= tap-stub.o
+common-obj-$(CONFIG_POSIX) += tap.o $(tap-obj-y)
+common-obj-$(CONFIG_WIN32) += tap-win32.o
diff --git a/net/tap-haiku.c b/net/tap-haiku.c
deleted file mode 100644
index b27e57e..0000000
--- a/net/tap-haiku.c
+++ /dev/null
@@ -1,87 +0,0 @@
-/*
- * QEMU System Emulator
- *
- * Copyright (c) 2003-2008 Fabrice Bellard
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
- * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-
-#include "qemu/osdep.h"
-#include "qapi/error.h"
-#include "tap_int.h"
-
-int tap_open(char *ifname, int ifname_size, int *vnet_hdr,
-             int vnet_hdr_required, int mq_required, Error **errp)
-{
-    error_setg(errp, "no tap on Haiku");
-    return -1;
-}
-
-void tap_set_sndbuf(int fd, const NetdevTapOptions *tap, Error **errp)
-{
-}
-
-int tap_probe_vnet_hdr(int fd)
-{
-    return 0;
-}
-
-int tap_probe_has_ufo(int fd)
-{
-    return 0;
-}
-
-int tap_probe_vnet_hdr_len(int fd, int len)
-{
-    return 0;
-}
-
-void tap_fd_set_vnet_hdr_len(int fd, int len)
-{
-}
-
-int tap_fd_set_vnet_le(int fd, int is_le)
-{
-    return -EINVAL;
-}
-
-int tap_fd_set_vnet_be(int fd, int is_be)
-{
-    return -EINVAL;
-}
-
-void tap_fd_set_offload(int fd, int csum, int tso4,
-                        int tso6, int ecn, int ufo)
-{
-}
-
-int tap_fd_enable(int fd)
-{
-    return -1;
-}
-
-int tap_fd_disable(int fd)
-{
-    return -1;
-}
-
-int tap_fd_get_ifname(int fd, char *ifname)
-{
-    return -1;
-}
diff --git a/net/tap-aix.c b/net/tap-stub.c
similarity index 97%
rename from net/tap-aix.c
rename to net/tap-stub.c
index 0e6da63..a9ab8f8 100644
--- a/net/tap-aix.c
+++ b/net/tap-stub.c
@@ -29,7 +29,7 @@
 int tap_open(char *ifname, int ifname_size, int *vnet_hdr,
              int vnet_hdr_required, int mq_required, Error **errp)
 {
-    error_setg(errp, "no tap on AIX");
+    error_setg(errp, "tap is not supported in this build");
     return -1;
 }
 
@@ -85,4 +85,3 @@ int tap_fd_get_ifname(int fd, char *ifname)
 {
     return -1;
 }
-
-- 
1.8.3.1
Re: [Qemu-devel] [PATCH for-2.10] net/tap: Replace tap-haiku.c and tap-aix.c by a generic tap-stub.c
Posted by Philippe Mathieu-Daudé 7 years ago 
On 04/03/2017 09:05 AM, Thomas Huth wrote:
> 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>

> ---
>  net/Makefile.objs             | 15 ++++----
>  net/tap-haiku.c               | 87 -------------------------------------------
>  net/{tap-aix.c => tap-stub.c} |  3 +-
>  3 files changed, 9 insertions(+), 96 deletions(-)
>  delete mode 100644 net/tap-haiku.c
>  rename net/{tap-aix.c => tap-stub.c} (97%)
>
> diff --git a/net/Makefile.objs b/net/Makefile.objs
> index 2e2fd43..67ba5e2 100644
> --- a/net/Makefile.objs
> +++ b/net/Makefile.objs
> @@ -3,13 +3,7 @@ common-obj-y += socket.o
>  common-obj-y += dump.o
>  common-obj-y += eth.o
>  common-obj-$(CONFIG_L2TPV3) += l2tpv3.o
> -common-obj-$(CONFIG_POSIX) += tap.o vhost-user.o
> -common-obj-$(CONFIG_LINUX) += tap-linux.o
> -common-obj-$(CONFIG_WIN32) += tap-win32.o
> -common-obj-$(CONFIG_BSD) += tap-bsd.o
> -common-obj-$(CONFIG_SOLARIS) += tap-solaris.o
> -common-obj-$(CONFIG_AIX) += tap-aix.o
> -common-obj-$(CONFIG_HAIKU) += tap-haiku.o
> +common-obj-$(CONFIG_POSIX) += vhost-user.o
>  common-obj-$(CONFIG_SLIRP) += slirp.o
>  common-obj-$(CONFIG_VDE) += vde.o
>  common-obj-$(CONFIG_NETMAP) += netmap.o
> @@ -20,3 +14,10 @@ common-obj-y += colo-compare.o
>  common-obj-y += colo.o
>  common-obj-y += filter-rewriter.o
>  common-obj-y += filter-replay.o
> +
> +tap-obj-$(CONFIG_LINUX) = tap-linux.o
> +tap-obj-$(CONFIG_BSD) = tap-bsd.o
> +tap-obj-$(CONFIG_SOLARIS) = tap-solaris.o
> +tap-obj-y ?= tap-stub.o
> +common-obj-$(CONFIG_POSIX) += tap.o $(tap-obj-y)
> +common-obj-$(CONFIG_WIN32) += tap-win32.o
> diff --git a/net/tap-haiku.c b/net/tap-haiku.c
> deleted file mode 100644
> index b27e57e..0000000
> --- a/net/tap-haiku.c
> +++ /dev/null
> @@ -1,87 +0,0 @@
> -/*
> - * QEMU System Emulator
> - *
> - * Copyright (c) 2003-2008 Fabrice Bellard
> - *
> - * Permission is hereby granted, free of charge, to any person obtaining a copy
> - * of this software and associated documentation files (the "Software"), to deal
> - * in the Software without restriction, including without limitation the rights
> - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
> - * copies of the Software, and to permit persons to whom the Software is
> - * furnished to do so, subject to the following conditions:
> - *
> - * The above copyright notice and this permission notice shall be included in
> - * all copies or substantial portions of the Software.
> - *
> - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
> - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
> - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
> - * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
> - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
> - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
> - * THE SOFTWARE.
> - */
> -
> -#include "qemu/osdep.h"
> -#include "qapi/error.h"
> -#include "tap_int.h"
> -
> -int tap_open(char *ifname, int ifname_size, int *vnet_hdr,
> -             int vnet_hdr_required, int mq_required, Error **errp)
> -{
> -    error_setg(errp, "no tap on Haiku");
> -    return -1;
> -}
> -
> -void tap_set_sndbuf(int fd, const NetdevTapOptions *tap, Error **errp)
> -{
> -}
> -
> -int tap_probe_vnet_hdr(int fd)
> -{
> -    return 0;
> -}
> -
> -int tap_probe_has_ufo(int fd)
> -{
> -    return 0;
> -}
> -
> -int tap_probe_vnet_hdr_len(int fd, int len)
> -{
> -    return 0;
> -}
> -
> -void tap_fd_set_vnet_hdr_len(int fd, int len)
> -{
> -}
> -
> -int tap_fd_set_vnet_le(int fd, int is_le)
> -{
> -    return -EINVAL;
> -}
> -
> -int tap_fd_set_vnet_be(int fd, int is_be)
> -{
> -    return -EINVAL;
> -}
> -
> -void tap_fd_set_offload(int fd, int csum, int tso4,
> -                        int tso6, int ecn, int ufo)
> -{
> -}
> -
> -int tap_fd_enable(int fd)
> -{
> -    return -1;
> -}
> -
> -int tap_fd_disable(int fd)
> -{
> -    return -1;
> -}
> -
> -int tap_fd_get_ifname(int fd, char *ifname)
> -{
> -    return -1;
> -}
> diff --git a/net/tap-aix.c b/net/tap-stub.c
> similarity index 97%
> rename from net/tap-aix.c
> rename to net/tap-stub.c
> index 0e6da63..a9ab8f8 100644
> --- a/net/tap-aix.c
> +++ b/net/tap-stub.c
> @@ -29,7 +29,7 @@
>  int tap_open(char *ifname, int ifname_size, int *vnet_hdr,
>               int vnet_hdr_required, int mq_required, Error **errp)
>  {
> -    error_setg(errp, "no tap on AIX");
> +    error_setg(errp, "tap is not supported in this build");
>      return -1;
>  }
>
> @@ -85,4 +85,3 @@ int tap_fd_get_ifname(int fd, char *ifname)
>  {
>      return -1;
>  }
> -
>
Re: [Qemu-devel] [PATCH for-2.10] net/tap: Replace tap-haiku.c and tap-aix.c by a generic tap-stub.c
Posted by Thomas Huth 6 years, 11 months ago 
On 03.04.2017 14:22, Philippe Mathieu-Daudé wrote:
> On 04/03/2017 09:05 AM, Thomas Huth wrote:
>> 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>
> 
>> ---
>>  net/Makefile.objs             | 15 ++++----
>>  net/tap-haiku.c               | 87
>> -------------------------------------------
>>  net/{tap-aix.c => tap-stub.c} |  3 +-
>>  3 files changed, 9 insertions(+), 96 deletions(-)
>>  delete mode 100644 net/tap-haiku.c
>>  rename net/{tap-aix.c => tap-stub.c} (97%)
>>
>> diff --git a/net/Makefile.objs b/net/Makefile.objs
>> index 2e2fd43..67ba5e2 100644
>> --- a/net/Makefile.objs
>> +++ b/net/Makefile.objs
>> @@ -3,13 +3,7 @@ common-obj-y += socket.o
>>  common-obj-y += dump.o
>>  common-obj-y += eth.o
>>  common-obj-$(CONFIG_L2TPV3) += l2tpv3.o
>> -common-obj-$(CONFIG_POSIX) += tap.o vhost-user.o
>> -common-obj-$(CONFIG_LINUX) += tap-linux.o
>> -common-obj-$(CONFIG_WIN32) += tap-win32.o
>> -common-obj-$(CONFIG_BSD) += tap-bsd.o
>> -common-obj-$(CONFIG_SOLARIS) += tap-solaris.o
>> -common-obj-$(CONFIG_AIX) += tap-aix.o
>> -common-obj-$(CONFIG_HAIKU) += tap-haiku.o
>> +common-obj-$(CONFIG_POSIX) += vhost-user.o
>>  common-obj-$(CONFIG_SLIRP) += slirp.o
>>  common-obj-$(CONFIG_VDE) += vde.o
>>  common-obj-$(CONFIG_NETMAP) += netmap.o
>> @@ -20,3 +14,10 @@ common-obj-y += colo-compare.o
>>  common-obj-y += colo.o
>>  common-obj-y += filter-rewriter.o
>>  common-obj-y += filter-replay.o
>> +
>> +tap-obj-$(CONFIG_LINUX) = tap-linux.o
>> +tap-obj-$(CONFIG_BSD) = tap-bsd.o
>> +tap-obj-$(CONFIG_SOLARIS) = tap-solaris.o
>> +tap-obj-y ?= tap-stub.o
>> +common-obj-$(CONFIG_POSIX) += tap.o $(tap-obj-y)
>> +common-obj-$(CONFIG_WIN32) += tap-win32.o
>> diff --git a/net/tap-haiku.c b/net/tap-haiku.c
>> deleted file mode 100644
>> index b27e57e..0000000
>> --- a/net/tap-haiku.c
>> +++ /dev/null
>> @@ -1,87 +0,0 @@
>> -/*
>> - * QEMU System Emulator
>> - *
>> - * Copyright (c) 2003-2008 Fabrice Bellard
>> - *
>> - * Permission is hereby granted, free of charge, to any person
>> obtaining a copy
>> - * of this software and associated documentation files (the
>> "Software"), to deal
>> - * in the Software without restriction, including without limitation
>> the rights
>> - * to use, copy, modify, merge, publish, distribute, sublicense,
>> and/or sell
>> - * copies of the Software, and to permit persons to whom the Software is
>> - * furnished to do so, subject to the following conditions:
>> - *
>> - * The above copyright notice and this permission notice shall be
>> included in
>> - * all copies or substantial portions of the Software.
>> - *
>> - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
>> EXPRESS OR
>> - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
>> MERCHANTABILITY,
>> - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT
>> SHALL
>> - * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES
>> OR OTHER
>> - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
>> ARISING FROM,
>> - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
>> DEALINGS IN
>> - * THE SOFTWARE.
>> - */
>> -
>> -#include "qemu/osdep.h"
>> -#include "qapi/error.h"
>> -#include "tap_int.h"
>> -
>> -int tap_open(char *ifname, int ifname_size, int *vnet_hdr,
>> -             int vnet_hdr_required, int mq_required, Error **errp)
>> -{
>> -    error_setg(errp, "no tap on Haiku");
>> -    return -1;
>> -}
>> -
>> -void tap_set_sndbuf(int fd, const NetdevTapOptions *tap, Error **errp)
>> -{
>> -}
>> -
>> -int tap_probe_vnet_hdr(int fd)
>> -{
>> -    return 0;
>> -}
>> -
>> -int tap_probe_has_ufo(int fd)
>> -{
>> -    return 0;
>> -}
>> -
>> -int tap_probe_vnet_hdr_len(int fd, int len)
>> -{
>> -    return 0;
>> -}
>> -
>> -void tap_fd_set_vnet_hdr_len(int fd, int len)
>> -{
>> -}
>> -
>> -int tap_fd_set_vnet_le(int fd, int is_le)
>> -{
>> -    return -EINVAL;
>> -}
>> -
>> -int tap_fd_set_vnet_be(int fd, int is_be)
>> -{
>> -    return -EINVAL;
>> -}
>> -
>> -void tap_fd_set_offload(int fd, int csum, int tso4,
>> -                        int tso6, int ecn, int ufo)
>> -{
>> -}
>> -
>> -int tap_fd_enable(int fd)
>> -{
>> -    return -1;
>> -}
>> -
>> -int tap_fd_disable(int fd)
>> -{
>> -    return -1;
>> -}
>> -
>> -int tap_fd_get_ifname(int fd, char *ifname)
>> -{
>> -    return -1;
>> -}
>> diff --git a/net/tap-aix.c b/net/tap-stub.c
>> similarity index 97%
>> rename from net/tap-aix.c
>> rename to net/tap-stub.c
>> index 0e6da63..a9ab8f8 100644
>> --- a/net/tap-aix.c
>> +++ b/net/tap-stub.c
>> @@ -29,7 +29,7 @@
>>  int tap_open(char *ifname, int ifname_size, int *vnet_hdr,
>>               int vnet_hdr_required, int mq_required, Error **errp)
>>  {
>> -    error_setg(errp, "no tap on AIX");
>> +    error_setg(errp, "tap is not supported in this build");
>>      return -1;
>>  }
>>
>> @@ -85,4 +85,3 @@ int tap_fd_get_ifname(int fd, char *ifname)
>>  {
>>      return -1;
>>  }
>> -
>>

Ping?

 Thomas
Re: [Qemu-devel] [PATCH for-2.10] net/tap: Replace tap-haiku.c and tap-aix.c by a generic tap-stub.c
Posted by Jason Wang 6 years, 11 months ago 

On 2017年04月26日 15:23, Thomas Huth wrote:
> On 03.04.2017 14:22, Philippe Mathieu-Daudé wrote:
>> On 04/03/2017 09:05 AM, Thomas Huth wrote:
>>> 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>
>>
>>> ---
>>>   net/Makefile.objs             | 15 ++++----
>>>   net/tap-haiku.c               | 87
>>> -------------------------------------------
>>>   net/{tap-aix.c => tap-stub.c} |  3 +-
>>>   3 files changed, 9 insertions(+), 96 deletions(-)
>>>   delete mode 100644 net/tap-haiku.c
>>>   rename net/{tap-aix.c => tap-stub.c} (97%)
>>>
>>> diff --git a/net/Makefile.objs b/net/Makefile.objs
>>> index 2e2fd43..67ba5e2 100644
>>> --- a/net/Makefile.objs
>>> +++ b/net/Makefile.objs
>>> @@ -3,13 +3,7 @@ common-obj-y += socket.o
>>>   common-obj-y += dump.o
>>>   common-obj-y += eth.o
>>>   common-obj-$(CONFIG_L2TPV3) += l2tpv3.o
>>> -common-obj-$(CONFIG_POSIX) += tap.o vhost-user.o
>>> -common-obj-$(CONFIG_LINUX) += tap-linux.o
>>> -common-obj-$(CONFIG_WIN32) += tap-win32.o
>>> -common-obj-$(CONFIG_BSD) += tap-bsd.o
>>> -common-obj-$(CONFIG_SOLARIS) += tap-solaris.o
>>> -common-obj-$(CONFIG_AIX) += tap-aix.o
>>> -common-obj-$(CONFIG_HAIKU) += tap-haiku.o
>>> +common-obj-$(CONFIG_POSIX) += vhost-user.o
>>>   common-obj-$(CONFIG_SLIRP) += slirp.o
>>>   common-obj-$(CONFIG_VDE) += vde.o
>>>   common-obj-$(CONFIG_NETMAP) += netmap.o
>>> @@ -20,3 +14,10 @@ common-obj-y += colo-compare.o
>>>   common-obj-y += colo.o
>>>   common-obj-y += filter-rewriter.o
>>>   common-obj-y += filter-replay.o
>>> +
>>> +tap-obj-$(CONFIG_LINUX) = tap-linux.o
>>> +tap-obj-$(CONFIG_BSD) = tap-bsd.o
>>> +tap-obj-$(CONFIG_SOLARIS) = tap-solaris.o
>>> +tap-obj-y ?= tap-stub.o
>>> +common-obj-$(CONFIG_POSIX) += tap.o $(tap-obj-y)
>>> +common-obj-$(CONFIG_WIN32) += tap-win32.o
>>> diff --git a/net/tap-haiku.c b/net/tap-haiku.c
>>> deleted file mode 100644
>>> index b27e57e..0000000
>>> --- a/net/tap-haiku.c
>>> +++ /dev/null
>>> @@ -1,87 +0,0 @@
>>> -/*
>>> - * QEMU System Emulator
>>> - *
>>> - * Copyright (c) 2003-2008 Fabrice Bellard
>>> - *
>>> - * Permission is hereby granted, free of charge, to any person
>>> obtaining a copy
>>> - * of this software and associated documentation files (the
>>> "Software"), to deal
>>> - * in the Software without restriction, including without limitation
>>> the rights
>>> - * to use, copy, modify, merge, publish, distribute, sublicense,
>>> and/or sell
>>> - * copies of the Software, and to permit persons to whom the Software is
>>> - * furnished to do so, subject to the following conditions:
>>> - *
>>> - * The above copyright notice and this permission notice shall be
>>> included in
>>> - * all copies or substantial portions of the Software.
>>> - *
>>> - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
>>> EXPRESS OR
>>> - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
>>> MERCHANTABILITY,
>>> - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT
>>> SHALL
>>> - * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES
>>> OR OTHER
>>> - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
>>> ARISING FROM,
>>> - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
>>> DEALINGS IN
>>> - * THE SOFTWARE.
>>> - */
>>> -
>>> -#include "qemu/osdep.h"
>>> -#include "qapi/error.h"
>>> -#include "tap_int.h"
>>> -
>>> -int tap_open(char *ifname, int ifname_size, int *vnet_hdr,
>>> -             int vnet_hdr_required, int mq_required, Error **errp)
>>> -{
>>> -    error_setg(errp, "no tap on Haiku");
>>> -    return -1;
>>> -}
>>> -
>>> -void tap_set_sndbuf(int fd, const NetdevTapOptions *tap, Error **errp)
>>> -{
>>> -}
>>> -
>>> -int tap_probe_vnet_hdr(int fd)
>>> -{
>>> -    return 0;
>>> -}
>>> -
>>> -int tap_probe_has_ufo(int fd)
>>> -{
>>> -    return 0;
>>> -}
>>> -
>>> -int tap_probe_vnet_hdr_len(int fd, int len)
>>> -{
>>> -    return 0;
>>> -}
>>> -
>>> -void tap_fd_set_vnet_hdr_len(int fd, int len)
>>> -{
>>> -}
>>> -
>>> -int tap_fd_set_vnet_le(int fd, int is_le)
>>> -{
>>> -    return -EINVAL;
>>> -}
>>> -
>>> -int tap_fd_set_vnet_be(int fd, int is_be)
>>> -{
>>> -    return -EINVAL;
>>> -}
>>> -
>>> -void tap_fd_set_offload(int fd, int csum, int tso4,
>>> -                        int tso6, int ecn, int ufo)
>>> -{
>>> -}
>>> -
>>> -int tap_fd_enable(int fd)
>>> -{
>>> -    return -1;
>>> -}
>>> -
>>> -int tap_fd_disable(int fd)
>>> -{
>>> -    return -1;
>>> -}
>>> -
>>> -int tap_fd_get_ifname(int fd, char *ifname)
>>> -{
>>> -    return -1;
>>> -}
>>> diff --git a/net/tap-aix.c b/net/tap-stub.c
>>> similarity index 97%
>>> rename from net/tap-aix.c
>>> rename to net/tap-stub.c
>>> index 0e6da63..a9ab8f8 100644
>>> --- a/net/tap-aix.c
>>> +++ b/net/tap-stub.c
>>> @@ -29,7 +29,7 @@
>>>   int tap_open(char *ifname, int ifname_size, int *vnet_hdr,
>>>                int vnet_hdr_required, int mq_required, Error **errp)
>>>   {
>>> -    error_setg(errp, "no tap on AIX");
>>> +    error_setg(errp, "tap is not supported in this build");
>>>       return -1;
>>>   }
>>>
>>> @@ -85,4 +85,3 @@ int tap_fd_get_ifname(int fd, char *ifname)
>>>   {
>>>       return -1;
>>>   }
>>> -
>>>
> Ping?
>
>   Thomas

Applied.

Thanks

Patchew 2.1-devel-0870f84

© 2016 - 2024 Red Hat, Inc.