From: Ross Philipson <ross.philipson@citrix.com>
Date: Thu, 1 Oct 2009 10:25:11 +0000 (-0400)
Subject: Fixed license/comments and counter increment bug.
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=cca3411047594629b319ad38352ede41e56fe993;p=xenclient%2Flinux-2.6.27-pq.git

Fixed license/comments and counter increment bug.

 Changes to be committed:
	modified:   master/v2v-core
---

diff --git a/master/v2v-core b/master/v2v-core
index d326137..4378276 100644
--- a/master/v2v-core
+++ b/master/v2v-core
@@ -22,7 +22,7 @@ index 873e5a3..408e7eb 100644
 +obj-y				+= v2v/
 diff --git a/drivers/xen/v2v/Kconfig b/drivers/xen/v2v/Kconfig
 new file mode 100644
-index 0000000..afcbba2
+index 0000000..5966234
 --- /dev/null
 +++ b/drivers/xen/v2v/Kconfig
 @@ -0,0 +1,24 @@
@@ -52,7 +52,7 @@ index 0000000..afcbba2
 +          Sample for Xen V2V interdomain communication services.
 diff --git a/drivers/xen/v2v/Makefile b/drivers/xen/v2v/Makefile
 new file mode 100644
-index 0000000..7d6e45e
+index 0000000..f3442d9
 --- /dev/null
 +++ b/drivers/xen/v2v/Makefile
 @@ -0,0 +1,5 @@
@@ -63,15 +63,16 @@ index 0000000..7d6e45e
 +ccflags-$(CONFIG_XEN_V2V_DEBUG) += -DDEBUG
 diff --git a/drivers/xen/v2v/v2v.c b/drivers/xen/v2v/v2v.c
 new file mode 100644
-index 0000000..104c31d
+index 0000000..39488f8
 --- /dev/null
 +++ b/drivers/xen/v2v/v2v.c
-@@ -0,0 +1,1501 @@
+@@ -0,0 +1,1502 @@
 +/******************************************************************************
-+ * drivers/xen/v2v/v2vutl.c
++ * drivers/xen/v2v/v2v.c
 + *
 + * V2V interdomain communication driver.
 + * 
++ * Copyright (c) 2009 Steven Smith
 + * Copyright (c) 2009 Ross Philipson
 + * Copyright (c) 2009 Citrix Systems, Inc.
 + *
@@ -1357,7 +1358,7 @@ index 0000000..104c31d
 +            counter < CONSUMER_SPIN_LIMIT) {
 +            channel->nc2_rings.local_endpoint->consumer_spinning = 1;
 +            while (channel->nc2_rings.remote_endpoint->producer_active &&
-+                   counter < CONSUMER_SPIN_LIMIT)
++                   counter++ < CONSUMER_SPIN_LIMIT)
 +                ;
 +            channel->nc2_rings.local_endpoint->consumer_spinning = 0;
 +            /* The write to local_endpoint->consumer_spinning needs to
@@ -1570,15 +1571,16 @@ index 0000000..104c31d
 +
 diff --git a/drivers/xen/v2v/v2v_private.h b/drivers/xen/v2v/v2v_private.h
 new file mode 100644
-index 0000000..b2f2a90
+index 0000000..c623a2d
 --- /dev/null
 +++ b/drivers/xen/v2v/v2v_private.h
-@@ -0,0 +1,82 @@
+@@ -0,0 +1,83 @@
 +/******************************************************************************
 + * drivers/xen/v2v/v2v_private.h
 + *
 + * V2V interdomain communication internal definitions.
 + * 
++ * Copyright (c) 2009 Steven Smith
 + * Copyright (c) 2009 Ross Philipson
 + * Copyright (c) 2009 Citrix Systems, Inc.
 + *
@@ -2836,15 +2838,16 @@ index 0000000..ff06deb
 +
 diff --git a/drivers/xen/v2v/v2vutl.c b/drivers/xen/v2v/v2vutl.c
 new file mode 100644
-index 0000000..7eb95d5
+index 0000000..3dc36c7
 --- /dev/null
 +++ b/drivers/xen/v2v/v2vutl.c
-@@ -0,0 +1,225 @@
+@@ -0,0 +1,226 @@
 +/******************************************************************************
 + * drivers/xen/v2v/v2v.c
 + *
 + * V2V interdomain communication driver utilities.
 + * 
++ * Copyright (c) 2009 Steven Smith
 + * Copyright (c) 2009 Ross Philipson
 + * Copyright (c) 2009 Citrix Systems, Inc.
 + *
@@ -3067,21 +3070,30 @@ index 0000000..7eb95d5
 +
 diff --git a/include/xen/interface/io/uring.h b/include/xen/interface/io/uring.h
 new file mode 100644
-index 0000000..5d9d60a
+index 0000000..9efa886
 --- /dev/null
 +++ b/include/xen/interface/io/uring.h
-@@ -0,0 +1,411 @@
+@@ -0,0 +1,417 @@
 +/******************************************************************************
-+ * uring.h
++ * include/xen/interface/io/uring.h
 + *
 + * Shared producer-consumer ring pair macros.
 + *
++ * Copyright (c) 2009 Steven Smith
++ * Copyright (c) 2009 Citrix Systems, Inc.
++ *
++ * This program is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU General Public License version 2
++ * as published by the Free Software Foundation; or, when distributed
++ * separately from the Linux kernel or incorporated into other
++ * software packages, subject to the following license:
++ *
 + * 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:
++ * of this source file (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.
@@ -3091,12 +3103,9 @@ index 0000000..5d9d60a
 + * 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.
-+ *
-+ * Copyright (c) 2009 Citrix Systems, Inc.
++ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
++ * IN THE SOFTWARE.
 + */
-+
 +#ifndef __XEN_PUBLIC_IO_URING_H__
 +#define __XEN_PUBLIC_IO_URING_H__
 +
@@ -3484,15 +3493,17 @@ index 0000000..5d9d60a
 +#endif /* __XEN_PUBLIC_IO_URING_H__ */
 diff --git a/include/xen/v2v.h b/include/xen/v2v.h
 new file mode 100644
-index 0000000..77f4472
+index 0000000..abef7be
 --- /dev/null
 +++ b/include/xen/v2v.h
-@@ -0,0 +1,366 @@
+@@ -0,0 +1,368 @@
 +/******************************************************************************
 + * include/xen/v2v.h
 + *
 + * V2V interdomain communication API.
 + *
++ * Copyright (c) 2009 Steven Smith
++ * Copyright (c) 2009 Ross Philipson
 + * Copyright (c) 2009 Citrix Systems, Inc.
 + *
 + * This program is free software; you can redistribute it and/or