[src/trunk]: src/sys/rump/net/lib/libvirtif component.c -> virtif_component.c...

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

details:   https://anonhg.NetBSD.org/src/rev/7b47256e3a4a
branches:  trunk
changeset: 327612:7b47256e3a4a
user:      pooka <pooka%NetBSD.org@localhost>
date:      Wed Mar 12 23:42:33 2014 +0000

description:
component.c -> virtif_component.c, just to decrease risk of conflicts.
No runtime change.

diffstat:

 sys/rump/net/lib/libvirtif/Makefile.virtif    |   4 +-
 sys/rump/net/lib/libvirtif/component.c        |  48 ---------------------------
 sys/rump/net/lib/libvirtif/virtif_component.c |  47 ++++++++++++++++++++++++++
 3 files changed, 49 insertions(+), 50 deletions(-)

diffs (120 lines):

diff -r 9380f105c950 -r 7b47256e3a4a sys/rump/net/lib/libvirtif/Makefile.virtif
--- a/sys/rump/net/lib/libvirtif/Makefile.virtif        Wed Mar 12 23:40:58 2014 +0000
+++ b/sys/rump/net/lib/libvirtif/Makefile.virtif        Wed Mar 12 23:42:33 2014 +0000
@@ -1,11 +1,11 @@
-#      $NetBSD: Makefile.virtif,v 1.1 2014/03/12 23:40:58 pooka Exp $
+#      $NetBSD: Makefile.virtif,v 1.2 2014/03/12 23:42:33 pooka Exp $
 #
 
 .if !defined(VIRTIF)
 .error Define VIRTIF when including ${.PARSEFILE}
 .endif
 
-SRCS=  if_virt.c component.c
+SRCS=  if_virt.c virtif_component.c
 
 VIRTIFDIR:=    ${.PARSEDIR}
 .PATH:         ${VIRTIFDIR}
diff -r 9380f105c950 -r 7b47256e3a4a sys/rump/net/lib/libvirtif/component.c
--- a/sys/rump/net/lib/libvirtif/component.c    Wed Mar 12 23:40:58 2014 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,48 +0,0 @@
-/*     $NetBSD: component.c,v 1.4 2013/07/04 11:46:51 pooka Exp $      */
-
-/*
- * Copyright (c) 2009 Antti Kantee.  All Rights Reserved.
- *
- * Development of this software was supported by The Nokia Foundation
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. 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.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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.
- */
-
-#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: component.c,v 1.4 2013/07/04 11:46:51 pooka Exp $");
-
-#include <sys/param.h>
-#include <sys/domain.h>
-#include <sys/protosw.h>
-
-#include <net/if.h>
-
-#include "rump_private.h"
-#include "rump_net_private.h"
-#include "if_virt.h"
-
-RUMP_COMPONENT(RUMP_COMPONENT_NET_IF)
-{
-       extern struct if_clone VIF_CLONER; /* XXX */
-
-       if_clone_attach(&VIF_CLONER);
-}
diff -r 9380f105c950 -r 7b47256e3a4a sys/rump/net/lib/libvirtif/virtif_component.c
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/sys/rump/net/lib/libvirtif/virtif_component.c     Wed Mar 12 23:42:33 2014 +0000
@@ -0,0 +1,47 @@
+/*     $NetBSD: virtif_component.c,v 1.1 2014/03/12 23:42:33 pooka Exp $       */
+
+/*
+ * Copyright (c) 2009 Antti Kantee.  All Rights Reserved.
+ *
+ * Development of this software was supported by The Nokia Foundation
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. 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.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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.
+ */
+
+#include <sys/cdefs.h>
+__KERNEL_RCSID(0, "$NetBSD: virtif_component.c,v 1.1 2014/03/12 23:42:33 pooka Exp $");
+
+#include <sys/param.h>
+#include <sys/domain.h>
+#include <sys/protosw.h>
+
+#include <net/if.h>
+
+#include "rump_private.h"
+#include "if_virt.h"
+
+RUMP_COMPONENT(RUMP_COMPONENT_NET_IF)
+{
+       extern struct if_clone VIF_CLONER; /* XXX */
+
+       if_clone_attach(&VIF_CLONER);
+}