Skip to contentSkip to conversation

xen: Fix ring.h header

PATCH In review Anthony PERARD 2 participants 2 messages Jul 4, 2019 – Jul 9, 2019

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 xen: Fix ring.h header

The xen_[rw]?mb() macros defined in ring.h can't be used and the fact that there are gated behind __XEN_INTERFACE_VERSION__ means that it needs to be defined somewhere. QEMU doesn't implement interfaces with the Xen hypervisor so defining __XEN_INTERFACE_VERSION__ is pointless. This leads to:
include/hw/xen/io/ring.h:47:5: error: "__XEN_INTERFACE_VERSION__"
is not defined, evaluates to 0 [-Werror=undef]

Cleanup ring.h. The xen_*mb() macros are already defined in xenctrl.h which is included in xen_common.h.

---

Notes:
A similar patch have been sent to the canonical version:
https://lists.xenproject.org/archives/html/xen-devel/2019-07/msg00370.html

 include/hw/xen/interface/io/ring.h | 6 ------
 1 file changed, 6 deletions(-)
include/hw/xen/interface/io/ring.h +0 -6
index 1adacf09f9..704990a2c9 100644
@@ -42,12 +42,6 @@
  * and grant_table.h from the Xen public headers.
  */
 
-#if __XEN_INTERFACE_VERSION__ < 0x00030208
-#define xen_mb()  mb()
-#define xen_rmb() rmb()
-#define xen_wmb() wmb()
-#endif
-
 typedef unsigned int RING_IDX;
 
 /* Round a 32-bit unsigned constant down to the nearest power of two. */
Signature · 7 lines
Anthony PERARD


_______________________________________________
Xen-devel mailing list
[email protected]
https://lists.xenproject.org/mailman/listinfo/xen-devel
Reviewed-by on v1 1/1
#1 lore raw
Quoted 11 lines · Anthony PERARD

The xen_[rw]?mb() macros defined in ring.h can't be used and the fact that there are gated behind __XEN_INTERFACE_VERSION__ means that it needs to be defined somewhere. QEMU doesn't implement interfaces with the Xen hypervisor so defining __XEN_INTERFACE_VERSION__ is pointless. This leads to:
include/hw/xen/io/ring.h:47:5: error: "__XEN_INTERFACE_VERSION__"
is not defined, evaluates to 0 [-Werror=undef]

Cleanup ring.h. The xen_*mb() macros are already defined in xenctrl.h which is included in xen_common.h.

Quoted 7 lines

---

Notes:
A similar patch have been sent to the canonical version:
https://lists.xenproject.org/archives/html/xen-devel/2019-07/msg00370.html

That patch has an additional hunk:

@@ -33,6 +33,13 @@
* - standard integers types (uint8_t, uint16_t, etc)
* They are provided by stdint.h of the standard headers.
*
+ * Before using the different macros, you need to provide the following
+ * macros:
+ * - xen_mb() a memory barrier
+ * - xen_rmb() a read memory barrier
+ * - xen_wmb() a write memory barrier
+ * Example of those can be found in xenctrl.h.
+ *
* In addition, if you intend to use the FLEX macros, you also need to
* provide the following, before invoking the FLEX macros:
* - size_t

Suggest to include it in this patch, because (1) it's useful (I think), and (2) it reduces differences to upstream Xen's version.

Quoted 11 lines
 include/hw/xen/interface/io/ring.h | 6 ------
 1 file changed, 6 deletions(-)
include/hw/xen/interface/io/ring.h +0 -0
index 1adacf09f9..704990a2c9 100644
@@ -42,12 +42,6 @@
  * and grant_table.h from the Xen public headers.
  */

include/hw/xen/interface/io/ring.h line 47

Quoted 10 lines
include/hw/xen/interface/io/ring.h +0 -6
 
-#if __XEN_INTERFACE_VERSION__ < 0x00030208
-#define xen_mb()  mb()
-#define xen_rmb() rmb()
-#define xen_wmb() wmb()
-#endif
-
 typedef unsigned int RING_IDX;
 
 /* Round a 32-bit unsigned constant down to the nearest power of two. */

Regardless of my suggestion:

_______________________________________________
Xen-devel mailing list
[email protected]
https://lists.xenproject.org/mailman/listinfo/xen-devel