From: Ross Philipson <ross.philipson@citrix.com>
Date: Sun, 1 Nov 2009 21:31:15 +0000 (-0500)
Subject: Modified to allow test driver to be created as a module.
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=8c0326c20c84eb0b64c4d457224280369eb68e90;p=xenclient%2Flinux-2.6.27-pq.git

Modified to allow test driver to be created as a module.

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

diff --git a/master/v2v-async b/master/v2v-async
index e83f8a2..d5eed06 100644
--- a/master/v2v-async
+++ b/master/v2v-async
@@ -423,10 +423,10 @@ index c623a2d..4af02ee 100644
      printk(KERN_ERR "v2v: " fmt, ##args)
  
  #endif /* !V2V_PRIVATE_H__ */
-diff --git a/drivers/xen/v2v/v2vdrv.c b/drivers/xen/v2v/v2vdrv.c
+diff --git a/drivers/xen/v2v/v2vsamp.c b/drivers/xen/v2v/v2vsamp.c
 index 0c362bb..dfa8a43 100644
---- a/drivers/xen/v2v/v2vdrv.c
-+++ b/drivers/xen/v2v/v2vdrv.c
+--- a/drivers/xen/v2v/v2vsamp.c
++++ b/drivers/xen/v2v/v2vsamp.c
 @@ -49,11 +49,13 @@
  
  static const char v2vdrv_usage[] = \
diff --git a/master/v2v-core b/master/v2v-core
index 8bd90d3..3afb6ad 100644
--- a/master/v2v-core
+++ b/master/v2v-core
@@ -19,7 +19,7 @@ index 873e5a3..408e7eb 100644
  obj-$(CONFIG_XEN_NETDEV_ACCEL_SFC_FRONTEND)	+= sfc_netfront/
  obj-$(CONFIG_XEN_NETDEV_ACCEL_SFC_BACKEND)	+= sfc_netback/
  obj-$(CONFIG_XEN_ACPI_WMI_WRAPPER)              += acpi-wmi/
-+obj-y				+= v2v/
++obj-$(CONFIG_XEN_V2V)          += v2v/
 diff --git a/drivers/xen/v2v/Kconfig b/drivers/xen/v2v/Kconfig
 new file mode 100644
 index 0000000..5966234
@@ -31,23 +31,23 @@ index 0000000..5966234
 +#
 +
 +config XEN_V2V
-+        tristate "Xen V2V communications driver"
++        bool "Xen V2V communications driver"
 +        depends on XEN
-+	default y
++        default y
 +        help
 +          Xen interdomain communication services.
 +
 +config XEN_V2V_DEBUG
-+	bool "Xen V2V Debugging"
++        bool "Xen V2V Debugging"
 +        depends on XEN_V2V
-+	default n
++        default n
 +        help
 +          V2V debugging and messages.
 +
 +config XEN_V2V_DRV
 +        tristate "Xen V2V sample communications client driver"
 +        depends on XEN_V2V
-+	default n
++        default n
 +        help
 +          Sample for Xen V2V interdomain communication services.
 diff --git a/drivers/xen/v2v/Makefile b/drivers/xen/v2v/Makefile
@@ -55,10 +55,13 @@ new file mode 100644
 index 0000000..f3442d9
 --- /dev/null
 +++ b/drivers/xen/v2v/Makefile
-@@ -0,0 +1,5 @@
+@@ -0,0 +1,8 @@
++obj-y += v2v.o v2vutl.o
 +
-+obj-$(CONFIG_XEN_V2V) += v2v.o v2vutl.o
-+obj-$(CONFIG_XEN_V2V_DRV) += v2vdrv.o v2vops.o
++obj-$(CONFIG_XEN_V2V_DRV) += v2vdrv.o
++
++v2vdrv-objs = 
++v2vdrv-objs += v2vsamp.o v2vops.o
 +
 +ccflags-$(CONFIG_XEN_V2V_DEBUG) += -DDEBUG
 diff --git a/drivers/xen/v2v/v2v.c b/drivers/xen/v2v/v2v.c
@@ -1658,14 +1661,14 @@ index 0000000..c623a2d
 +    printk(KERN_ERR "v2v: " fmt, ##args)
 +
 +#endif /* !V2V_PRIVATE_H__ */
-diff --git a/drivers/xen/v2v/v2vdrv.c b/drivers/xen/v2v/v2vdrv.c
+diff --git a/drivers/xen/v2v/v2vsamp.c b/drivers/xen/v2v/v2vsamp.c
 new file mode 100644
 index 0000000..0c362bb
 --- /dev/null
-+++ b/drivers/xen/v2v/v2vdrv.c
++++ b/drivers/xen/v2v/v2vsamp.c
 @@ -0,0 +1,369 @@
 +/******************************************************************************
-+ * drivers/xen/v2v/v2vdrv.c
++ * drivers/xen/v2v/v2vsamp.c
 + *
 + * V2V sample client driver.
 + *