Made ring file into vring. Added v2v-core back in.

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

diff --git a/master/series b/master/series
index 27ea9dbc6bea07c4eb685b397030c1c88f0df763..630d3ec4c751ccd0a38ee42681d9e24ee52042fd 100644 (file)
--- a/master/series
+++ b/master/series
@@ -323,3 +323,4 @@ blktap2-smp-map-unmap
 bridge-carrier-follows-prio0.patch
 bsg-add-global-sgio-mutex.patch
 itpm
+v2v-core

diff --git a/master/v2v-core b/master/v2v-core
index 4378276c2d2dde17a9bcb950bf17c4f7dcfff66e..8bd90d3f15a9b765526f177c220962f76369607a 100644 (file)
--- a/master/v2v-core
+++ b/master/v2v-core
@@ -109,7 +109,7 @@ index 0000000..39488f8
 +#include <xen/evtchn.h>
 +#include <xen/gnttab.h>
 +#include <xen/v2v.h>
-+#include <xen/interface/io/uring.h>
++#include <xen/interface/io/vring.h>
 +#include "v2v_private.h"
 +
 +#define CONSUMER_SPIN_LIMIT 2048
@@ -2182,7 +2182,7 @@ index 0000000..ff06deb
 +#include <linux/random.h>
 +#include <xen/xenbus.h>
 +#include <xen/v2v.h>
-+#include <xen/interface/io/uring.h>
++#include <xen/interface/io/vring.h>
 +#include "v2vdrv.h"
 +
 +/************************** GENERAL **************************/
@@ -3068,16 +3068,16 @@ index 0000000..3dc36c7
 +    free_vm_area(vm_area);
 +}
 +
-diff --git a/include/xen/interface/io/uring.h b/include/xen/interface/io/uring.h
+diff --git a/include/xen/interface/io/vring.h b/include/xen/interface/io/vring.h
 new file mode 100644
 index 0000000..9efa886
 --- /dev/null
-+++ b/include/xen/interface/io/uring.h
++++ b/include/xen/interface/io/vring.h
 @@ -0,0 +1,417 @@
 +/******************************************************************************
-+ * include/xen/interface/io/uring.h
++ * include/xen/interface/io/vring.h
 + *
-+ * Shared producer-consumer ring pair macros.
++ * Shared V2V producer-consumer ring pair macros.
 + *
 + * Copyright (c) 2009 Steven Smith
 + * Copyright (c) 2009 Citrix Systems, Inc.