[src/trunk]: src/sys/rump Nuke the DOMAINADD() macro and just call domain_att...

[pooka <pooka%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/cd507e2ff33b
branches:  trunk
changeset: 801880:cd507e2ff33b
user:      pooka <pooka%NetBSD.org@localhost>
date:      Fri Aug 22 11:34:28 2014 +0000

description:
Nuke the DOMAINADD() macro and just call domain_attach(), now that things
work correctly that way.

diffstat:

 sys/rump/librump/rumpnet/rump_net_private.h       |   9 +--------
 sys/rump/net/lib/liblocal/local_component.c       |   6 +++---
 sys/rump/net/lib/libnet/net_component.c           |  10 +++++-----
 sys/rump/net/lib/libnetbt/netbt_component.c       |   6 +++---
 sys/rump/net/lib/libnetinet/netinet_component.c   |   8 ++++----
 sys/rump/net/lib/libnetinet6/netinet6_component.c |   6 +++---
 sys/rump/net/lib/libnetmpls/netmpls_component.c   |   6 +++---
 sys/rump/net/lib/libsockin/sockin_component.c     |   8 ++++----
 8 files changed, 26 insertions(+), 33 deletions(-)

diffs (214 lines):

diff -r af8ee50e2607 -r cd507e2ff33b sys/rump/librump/rumpnet/rump_net_private.h
--- a/sys/rump/librump/rumpnet/rump_net_private.h       Fri Aug 22 11:28:03 2014 +0000
+++ b/sys/rump/librump/rumpnet/rump_net_private.h       Fri Aug 22 11:34:28 2014 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: rump_net_private.h,v 1.9 2014/02/14 01:43:13 pooka Exp $       */
+/*     $NetBSD: rump_net_private.h,v 1.10 2014/08/22 11:34:28 pooka Exp $      */
 
 /*
  * Copyright (c) 2008 Antti Kantee.  All Rights Reserved.
@@ -30,13 +30,6 @@
 
 void           rump_netisr_register(int, void (*)(void));
 
-#define DOMAINADD(dom)                                                 \
-do {                                                                   \
-       if (!pffinddomain(dom.dom_family)) {                            \
-               domain_attach(&dom);                                    \
-        }                                                              \
-} while (/*CONSTCOND*/0)
-
 #include "rumpnet_if_priv.h"
 
 #endif /* _SYS_RUMP_NET_PRIVATE_H_ */
diff -r af8ee50e2607 -r cd507e2ff33b sys/rump/net/lib/liblocal/local_component.c
--- a/sys/rump/net/lib/liblocal/local_component.c       Fri Aug 22 11:28:03 2014 +0000
+++ b/sys/rump/net/lib/liblocal/local_component.c       Fri Aug 22 11:34:28 2014 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: local_component.c,v 1.1 2014/03/13 02:04:59 pooka Exp $        */
+/*     $NetBSD: local_component.c,v 1.2 2014/08/22 11:34:28 pooka Exp $        */
 
 /*
  * Copyright (c) 2009 Antti Kantee.  All Rights Reserved.
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: local_component.c,v 1.1 2014/03/13 02:04:59 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: local_component.c,v 1.2 2014/08/22 11:34:28 pooka Exp $");
 
 #include <sys/param.h>
 #include <sys/domain.h>
@@ -41,5 +41,5 @@
 {
        extern struct domain unixdomain;
 
-       DOMAINADD(unixdomain);
+       domain_attach(&unixdomain);
 }
diff -r af8ee50e2607 -r cd507e2ff33b sys/rump/net/lib/libnet/net_component.c
--- a/sys/rump/net/lib/libnet/net_component.c   Fri Aug 22 11:28:03 2014 +0000
+++ b/sys/rump/net/lib/libnet/net_component.c   Fri Aug 22 11:34:28 2014 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: net_component.c,v 1.1 2014/03/13 02:06:32 pooka Exp $  */
+/*     $NetBSD: net_component.c,v 1.2 2014/08/22 11:34:28 pooka Exp $  */
 
 /*
  * Copyright (c) 2009 Antti Kantee.  All Rights Reserved.
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: net_component.c,v 1.1 2014/03/13 02:06:32 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: net_component.c,v 1.2 2014/08/22 11:34:28 pooka Exp $");
 
 #include <sys/param.h>
 #include <sys/domain.h>
@@ -51,9 +51,9 @@
 {
        extern struct domain routedomain, compat_50_routedomain, linkdomain;
 
-       DOMAINADD(linkdomain);
-       DOMAINADD(routedomain);
-       DOMAINADD(compat_50_routedomain);
+       domain_attach(&linkdomain);
+       domain_attach(&routedomain);
+       domain_attach(&compat_50_routedomain);
 }
 
 RUMP_COMPONENT(RUMP_COMPONENT_NET_IF)
diff -r af8ee50e2607 -r cd507e2ff33b sys/rump/net/lib/libnetbt/netbt_component.c
--- a/sys/rump/net/lib/libnetbt/netbt_component.c       Fri Aug 22 11:28:03 2014 +0000
+++ b/sys/rump/net/lib/libnetbt/netbt_component.c       Fri Aug 22 11:34:28 2014 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: netbt_component.c,v 1.1 2014/03/13 02:06:16 pooka Exp $        */
+/*     $NetBSD: netbt_component.c,v 1.2 2014/08/22 11:34:28 pooka Exp $        */
 
 /*
  * Copyright (c) 2010 Antti Kantee.  All Rights Reserved.
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: netbt_component.c,v 1.1 2014/03/13 02:06:16 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbt_component.c,v 1.2 2014/08/22 11:34:28 pooka Exp $");
 
 #include <sys/param.h>
 #include <sys/domain.h>
@@ -39,5 +39,5 @@
 {
        extern struct domain btdomain;
 
-       DOMAINADD(btdomain);
+       domain_attach(&btdomain);
 }
diff -r af8ee50e2607 -r cd507e2ff33b sys/rump/net/lib/libnetinet/netinet_component.c
--- a/sys/rump/net/lib/libnetinet/netinet_component.c   Fri Aug 22 11:28:03 2014 +0000
+++ b/sys/rump/net/lib/libnetinet/netinet_component.c   Fri Aug 22 11:34:28 2014 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: netinet_component.c,v 1.3 2014/07/01 05:49:19 rtr Exp $        */
+/*     $NetBSD: netinet_component.c,v 1.4 2014/08/22 11:34:28 pooka Exp $      */
 
 /*
  * Copyright (c) 2009 Antti Kantee.  All Rights Reserved.
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: netinet_component.c,v 1.3 2014/07/01 05:49:19 rtr Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netinet_component.c,v 1.4 2014/08/22 11:34:28 pooka Exp $");
 
 #include <sys/param.h>
 #include <sys/domain.h>
@@ -51,8 +51,8 @@
 {
        extern struct domain arpdomain, inetdomain;
 
-       DOMAINADD(arpdomain);
-       DOMAINADD(inetdomain);
+       domain_attach(&arpdomain);
+       domain_attach(&inetdomain);
 
        carpattach(1);
 
diff -r af8ee50e2607 -r cd507e2ff33b sys/rump/net/lib/libnetinet6/netinet6_component.c
--- a/sys/rump/net/lib/libnetinet6/netinet6_component.c Fri Aug 22 11:28:03 2014 +0000
+++ b/sys/rump/net/lib/libnetinet6/netinet6_component.c Fri Aug 22 11:34:28 2014 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: netinet6_component.c,v 1.2 2014/06/05 23:48:17 rmind Exp $     */
+/*     $NetBSD: netinet6_component.c,v 1.3 2014/08/22 11:34:28 pooka Exp $     */
 
 /*
  * Copyright (c) 2013 Antti Kantee.  All Rights Reserved.
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: netinet6_component.c,v 1.2 2014/06/05 23:48:17 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netinet6_component.c,v 1.3 2014/08/22 11:34:28 pooka Exp $");
 
 #include <sys/param.h>
 #include <sys/domain.h>
@@ -48,7 +48,7 @@
 {
        extern struct domain inet6domain;
 
-       DOMAINADD(inet6domain);
+       domain_attach(&inet6domain);
 }
 
 RUMP_COMPONENT(RUMP_COMPONENT_NET_IFCFG)
diff -r af8ee50e2607 -r cd507e2ff33b sys/rump/net/lib/libnetmpls/netmpls_component.c
--- a/sys/rump/net/lib/libnetmpls/netmpls_component.c   Fri Aug 22 11:28:03 2014 +0000
+++ b/sys/rump/net/lib/libnetmpls/netmpls_component.c   Fri Aug 22 11:34:28 2014 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: netmpls_component.c,v 1.1 2014/03/13 02:05:29 pooka Exp $ */
+/* $NetBSD: netmpls_component.c,v 1.2 2014/08/22 11:34:28 pooka Exp $ */
 
 /*
  * Copyright (c) 2009 Antti Kantee.  All Rights Reserved.
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: netmpls_component.c,v 1.1 2014/03/13 02:05:29 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netmpls_component.c,v 1.2 2014/08/22 11:34:28 pooka Exp $");
 
 #include <sys/param.h>
 #include <sys/domain.h>
@@ -52,7 +52,7 @@
 {
        extern struct domain mplsdomain;
 
-       DOMAINADD(mplsdomain);
+       domain_attach(&mplsdomain);
 
        rump_netisr_register(NETISR_MPLS, mplsintr);
 }
diff -r af8ee50e2607 -r cd507e2ff33b sys/rump/net/lib/libsockin/sockin_component.c
--- a/sys/rump/net/lib/libsockin/sockin_component.c     Fri Aug 22 11:28:03 2014 +0000
+++ b/sys/rump/net/lib/libsockin/sockin_component.c     Fri Aug 22 11:34:28 2014 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: sockin_component.c,v 1.1 2014/03/13 02:05:49 pooka Exp $       */
+/*     $NetBSD: sockin_component.c,v 1.2 2014/08/22 11:34:28 pooka Exp $       */
 
 /*
  * Copyright (c) 2009 Antti Kantee.  All Rights Reserved.
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sockin_component.c,v 1.1 2014/03/13 02:05:49 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sockin_component.c,v 1.2 2014/08/22 11:34:28 pooka Exp $");
 
 #include <sys/param.h>
 #include <sys/domain.h>
@@ -42,6 +42,6 @@
        extern struct domain sockindomain;
        extern struct domain sockin6domain;
 
-       DOMAINADD(sockindomain);
-       DOMAINADD(sockin6domain);
+       domain_attach(&sockindomain);
+       domain_attach(&sockin6domain);
 }