rpms/xenner/devel xenner-xen_rmb.diff, NONE, 1.1 xenner.spec, 1.27, 1.28

[Gerd Hoffmann]

Author: kraxel

Update of /cvs/pkgs/rpms/xenner/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24804

Modified Files:
	xenner.spec 
Added Files:
	xenner-xen_rmb.diff 
Log Message:
- fix rmb build failure

xenner-xen_rmb.diff:

--- NEW FILE xenner-xen_rmb.diff ---
Index: blkbackd.c
===================================================================
RCS file: /home/cvsroot/xenner/blkbackd.c,v
retrieving revision 1.42
diff -u -p -r1.42 blkbackd.c
--- blkbackd.c	14 Aug 2008 16:24:39 -0000	1.42
+++ blkbackd.c	29 Aug 2008 14:42:02 -0000
@@ -783,7 +783,7 @@ static void *blk_thread_main(void *arg)
 	    break;
 	rc = blkdev->rings.common.req_cons;
 	rp = blkdev->rings.common.sring->req_prod;
-	rmb(); /* Ensure we see queued requests up to 'rp'. */
+	xen_rmb(); /* Ensure we see queued requests up to 'rp'. */
 
 	/* Limit #of requests we queue up for I/O so we ack requests
 	 * faster if busy.  Improves backend/frontend parallelism and
Index: netbackd.c
===================================================================
RCS file: /home/cvsroot/xenner/netbackd.c,v
retrieving revision 1.30
diff -u -p -r1.30 netbackd.c
--- netbackd.c	14 Aug 2008 14:41:53 -0000	1.30
+++ netbackd.c	29 Aug 2008 14:42:02 -0000
@@ -161,7 +161,7 @@ static void *net_tx_thread(void *arg)
 
 	rc = netdev->tx_ring.req_cons;
 	rp = netdev->tx_ring.sring->req_prod;
-	rmb(); /* Ensure we see queued requests up to 'rp'. */
+	xen_rmb(); /* Ensure we see queued requests up to 'rp'. */
 
 	while ((rc != rp)) {
 	    if (RING_REQUEST_CONS_OVERFLOW(&netdev->tx_ring, rc))
@@ -283,7 +283,7 @@ static void *net_rx_thread(void *arg)
 
 	rc = netdev->rx_ring.req_cons;
 	rp = netdev->rx_ring.sring->req_prod;
-	rmb(); /* Ensure we see queued requests up to 'rp'. */
+	xen_rmb(); /* Ensure we see queued requests up to 'rp'. */
 	d2printf("%s: %d %d\n", __FUNCTION__, rc, rp);
 
 	if (rc == rp || RING_REQUEST_CONS_OVERFLOW(&netdev->rx_ring, rc)) {
Index: xenbackd.h
===================================================================
RCS file: /home/cvsroot/xenner/xenbackd.h,v
retrieving revision 1.9
diff -u -p -r1.9 xenbackd.h
--- xenbackd.h	4 Jan 2008 13:20:12 -0000	1.9
+++ xenbackd.h	29 Aug 2008 14:42:02 -0000
@@ -1,3 +1,4 @@
+#include <stddef.h>
 #include <xen/elfnote.h>
 #include <xen/elfstructs.h>
 
@@ -5,10 +6,15 @@
 
 /* ------------------------------------------------------------- */
 
-#ifndef offsetof
-#define offsetof(TYPE, MEMBER) ((size_t) &((TYPE *)0)->MEMBER)
+#include <xen/xen-compat.h>
+#if __XEN_LATEST_INTERFACE_VERSION__ < 0x00030208
+# define xen_mb()  mb()
+# define xen_rmb() rmb()
+# define xen_wmb() wmb()
 #endif
 
+/* ------------------------------------------------------------- */
+
 #define container_of(ptr, type, member) ({                      \
         const typeof( ((type *)0)->member ) *__mptr = (ptr);    \
         (type *)( (char *)__mptr - offsetof(type,member) );})
@@ -53,7 +59,7 @@ struct xendev {
     int                evtchnd;
     int                gnttabdev;
     struct xs_handle   *xs;
-    
+
     struct devops      *ops;
     struct list_head   next;
 };


Index: xenner.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xenner/devel/xenner.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- xenner.spec	29 Aug 2008 14:27:39 -0000	1.27
+++ xenner.spec	29 Aug 2008 14:44:21 -0000	1.28
@@ -5,6 +5,7 @@
 Summary:      Xen emulator for kvm
 Group:        Applications/Emulators
 Source0:      %{name}-%{version}.tar.gz
+Patch0:       %{name}-xen_rmb.diff
 URL:          http://dl.bytesex.org/releases/%{name}/%{name}-%{version}.tar.gz
 Requires:     xen-runtime
 Provides:     xen-hypervisor-abi = 3.2
@@ -23,6 +24,7 @@
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 export CFLAGS="%{optflags}"