All of lore.kernel.org
 help / color / mirror / Atom feed
* [Qemu-devel] [PATCH v2] tap-bsd: OpenBSD uses tap(4) now
@ 2016-10-07  1:28 Brad Smith
  2016-10-15 21:44 ` Brad Smith
  2016-10-20  2:28 ` Jason Wang
  0 siblings, 2 replies; 3+ messages in thread
From: Brad Smith @ 2016-10-07  1:28 UTC (permalink / raw)
  To: qemu-devel, jasowang

Update the tap-bsd code now that OpenBSD uses tap(4).

Signed-off-by: Brad Smith <brad@comstyle.com>
---
v2: Allow the code to deal with newer vs older OpenBSD releases

diff --git a/net/tap-bsd.c b/net/tap-bsd.c
index c506ac3..6c96922 100644
--- a/net/tap-bsd.c
+++ b/net/tap-bsd.c
@@ -35,6 +35,10 @@
 #include <net/if_tap.h>
 #endif
 
+#if defined(__OpenBSD__)
+#include <sys/param.h>
+#endif
+
 #ifndef __FreeBSD__
 int tap_open(char *ifname, int ifname_size, int *vnet_hdr,
              int vnet_hdr_required, int mq_required, Error **errp)
@@ -55,7 +59,7 @@ int tap_open(char *ifname, int ifname_size, int *vnet_hdr,
         if (*ifname) {
             snprintf(dname, sizeof dname, "/dev/%s", ifname);
         } else {
-#if defined(__OpenBSD__)
+#if defined(__OpenBSD__) && OpenBSD < 201605
             snprintf(dname, sizeof dname, "/dev/tun%d", i);
 #else
             snprintf(dname, sizeof dname, "/dev/tap%d", i);

^ permalink raw reply related	[flat|nested] 3+ messages in thread

* Re: [Qemu-devel] [PATCH v2] tap-bsd: OpenBSD uses tap(4) now
  2016-10-07  1:28 [Qemu-devel] [PATCH v2] tap-bsd: OpenBSD uses tap(4) now Brad Smith
@ 2016-10-15 21:44 ` Brad Smith
  2016-10-20  2:28 ` Jason Wang
  1 sibling, 0 replies; 3+ messages in thread
From: Brad Smith @ 2016-10-15 21:44 UTC (permalink / raw)
  To: qemu-devel, jasowang

On 10/06/16 21:28, Brad Smith wrote:
> Update the tap-bsd code now that OpenBSD uses tap(4).
>
> Signed-off-by: Brad Smith <brad@comstyle.com>
> ---
> v2: Allow the code to deal with newer vs older OpenBSD releases

ping.

> diff --git a/net/tap-bsd.c b/net/tap-bsd.c
> index c506ac3..6c96922 100644
> --- a/net/tap-bsd.c
> +++ b/net/tap-bsd.c
> @@ -35,6 +35,10 @@
>  #include <net/if_tap.h>
>  #endif
>
> +#if defined(__OpenBSD__)
> +#include <sys/param.h>
> +#endif
> +
>  #ifndef __FreeBSD__
>  int tap_open(char *ifname, int ifname_size, int *vnet_hdr,
>               int vnet_hdr_required, int mq_required, Error **errp)
> @@ -55,7 +59,7 @@ int tap_open(char *ifname, int ifname_size, int *vnet_hdr,
>          if (*ifname) {
>              snprintf(dname, sizeof dname, "/dev/%s", ifname);
>          } else {
> -#if defined(__OpenBSD__)
> +#if defined(__OpenBSD__) && OpenBSD < 201605
>              snprintf(dname, sizeof dname, "/dev/tun%d", i);
>  #else
>              snprintf(dname, sizeof dname, "/dev/tap%d", i);
>

^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [Qemu-devel] [PATCH v2] tap-bsd: OpenBSD uses tap(4) now
  2016-10-07  1:28 [Qemu-devel] [PATCH v2] tap-bsd: OpenBSD uses tap(4) now Brad Smith
  2016-10-15 21:44 ` Brad Smith
@ 2016-10-20  2:28 ` Jason Wang
  1 sibling, 0 replies; 3+ messages in thread
From: Jason Wang @ 2016-10-20  2:28 UTC (permalink / raw)
  To: Brad Smith, qemu-devel



On 2016年10月07日 09:28, Brad Smith wrote:
> Update the tap-bsd code now that OpenBSD uses tap(4).
>
> Signed-off-by: Brad Smith <brad@comstyle.com>
> ---
> v2: Allow the code to deal with newer vs older OpenBSD releases
>
> diff --git a/net/tap-bsd.c b/net/tap-bsd.c
> index c506ac3..6c96922 100644
> --- a/net/tap-bsd.c
> +++ b/net/tap-bsd.c
> @@ -35,6 +35,10 @@
>   #include <net/if_tap.h>
>   #endif
>   
> +#if defined(__OpenBSD__)
> +#include <sys/param.h>
> +#endif
> +
>   #ifndef __FreeBSD__
>   int tap_open(char *ifname, int ifname_size, int *vnet_hdr,
>                int vnet_hdr_required, int mq_required, Error **errp)
> @@ -55,7 +59,7 @@ int tap_open(char *ifname, int ifname_size, int *vnet_hdr,
>           if (*ifname) {
>               snprintf(dname, sizeof dname, "/dev/%s", ifname);
>           } else {
> -#if defined(__OpenBSD__)
> +#if defined(__OpenBSD__) && OpenBSD < 201605
>               snprintf(dname, sizeof dname, "/dev/tun%d", i);
>   #else
>               snprintf(dname, sizeof dname, "/dev/tap%d", i);

Applied, thanks.

^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2016-10-20  2:28 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-10-07  1:28 [Qemu-devel] [PATCH v2] tap-bsd: OpenBSD uses tap(4) now Brad Smith
2016-10-15 21:44 ` Brad Smith
2016-10-20  2:28 ` Jason Wang

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.